fix: trpc mutation route should return undefined when result is not readable (#227)

Author: ymc9

package.json

@@ -1,14 +1,14 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",
         "test": "pnpm -r run test --silent",
         "lint": "pnpm -r lint",
-        "publish-all": "pnpm --filter \"./packages/**\" -r publish",
-        "publish-dev": "pnpm --filter \"./packages/**\" -r publish --tag dev",
-        "publish-canary": "pnpm --filter \"./packages/**\" -r publish --tag canary"
+        "publish-all": "pnpm --filter \"./packages/**\" -r publish --access public",
+        "publish-dev": "pnpm --filter \"./packages/**\" -r publish --access public --tag dev",
+        "publish-canary": "pnpm --filter \"./packages/**\" -r publish --access public --tag canary"
     },
     "keywords": [],
     "author": "",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/next/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/next",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "displayName": "ZenStack Next.js integration",
     "description": "ZenStack Next.js integration",
     "homepage": "https://zenstack.dev",

packages/plugins/react/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/react",
     "displayName": "ZenStack plugin and runtime for ReactJS",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "description": "ZenStack plugin and runtime for ReactJS",
     "main": "index.js",
     "repository": {

packages/plugins/react/src/react-hooks-generator.ts

@@ -1,5 +1,5 @@
 import { DMMF } from '@prisma/generator-helper';
-import { PluginError, PluginOptions } from '@zenstackhq/sdk';
+import { CrudFailureReason, PluginError, PluginOptions } from '@zenstackhq/sdk';
 import { DataModel, isDataModel, Model } from '@zenstackhq/sdk/ast';
 import { camelCase, paramCase } from 'change-case';
 import * as path from 'path';
@@ -35,7 +35,7 @@ function wrapReadbackErrorCheck(code: string) {
     return `try {
         ${code}
     } catch (err: any) {
-        if (err.info?.prisma && err.info?.code === 'P2004' && err.info?.reason === 'RESULT_NOT_READABLE') {
+        if (err.info?.prisma && err.info?.code === 'P2004' && err.info?.reason === '${CrudFailureReason.RESULT_NOT_READABLE}') {
             // unable to readback data
             return undefined;
         } else {

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {

packages/plugins/trpc/src/helpers.ts

@@ -1,4 +1,5 @@
 import { DMMF } from '@prisma/generator-helper';
+import { CrudFailureReason } from '@zenstackhq/sdk';
 import { CodeBlockWriter, SourceFile } from 'ts-morph';
 import { uncapitalizeFirstLetter } from './utils/uncapitalizeFirstLetter';
 
@@ -24,11 +25,30 @@ export function generateProcedure(
     baseOpType: string
 ) {
     const procType = getProcedureTypeByOpName(baseOpType);
-    writer.write(`
-        ${opType}: procedure.input(${typeName}).${procType}(({ctx, input}) => db(ctx).${uncapitalizeFirstLetter(
-        modelName
-    )}.${opType.replace('One', '')}(input)),
+    const prismaMethod = opType.replace('One', '');
+
+    if (procType === 'query') {
+        writer.write(`
+        ${opType}: procedure.input(${typeName}).query(({ctx, input}) => db(ctx).${uncapitalizeFirstLetter(
+            modelName
+        )}.${prismaMethod}(input)),
     `);
+    } else if (procType === 'mutation') {
+        writer.write(`
+        ${opType}: procedure.input(${typeName}).mutation(async ({ctx, input}) => {
+            try {
+                return await db(ctx).${uncapitalizeFirstLetter(modelName)}.${prismaMethod}(input);
+            } catch (err: any) {
+                if (err.code === 'P2004' && err.meta?.reason === '${CrudFailureReason.RESULT_NOT_READABLE}') {
+                    // unable to readback data
+                    return undefined;
+                } else {
+                    throw err;
+                }
+            }
+        }),
+    `);
+    }
 }
 
 export function generateRouterSchemaImports(sourceFile: SourceFile, name: string) {

packages/runtime/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

packages/runtime/src/enhancements/policy/policy-utils.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { PrismaClientKnownRequestError, PrismaClientUnknownRequestError } from '@prisma/client/runtime';
-import { AUXILIARY_FIELDS, TRANSACTION_FIELD_NAME } from '@zenstackhq/sdk';
+import { AUXILIARY_FIELDS, CrudFailureReason, TRANSACTION_FIELD_NAME } from '@zenstackhq/sdk';
 import { camelCase } from 'change-case';
 import cuid from 'cuid';
 import deepcopy from 'deepcopy';
@@ -647,7 +647,7 @@ export class PolicyUtil {
     deniedByPolicy(model: string, operation: PolicyOperationKind, extra?: string) {
         return new PrismaClientKnownRequestError(
             `denied by policy: ${model} entities failed '${operation}' check${extra ? ', ' + extra : ''}`,
-            { clientVersion: getVersion(), code: 'P2004', meta: { reason: 'RESULT_NOT_READABLE' } }
+            { clientVersion: getVersion(), code: 'P2004', meta: { reason: CrudFailureReason.RESULT_NOT_READABLE } }
         );
     }
 

packages/schema/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-    "version": "1.0.0-alpha.49",
+    "version": "1.0.0-alpha.52",
     "author": {
         "name": "ZenStack Team"
     },