@zenstackhq/runtime 1.3.1 → 1.4.0

package/cross/index.d.mts

@@ -1,7 +1,7 @@
 /**
  * Callback for @see ModelDataVisitor.
  */
-type ModelDataVisitorCallback = (model: string, data: any, scalarData: any) => void;
+declare type ModelDataVisitorCallback = (model: string, data: any, scalarData: any) => void;
 /**
  * Visitor that traverses data returned by a Prisma query.
  */
@@ -17,7 +17,7 @@ declare class ModelDataVisitor {
 /**
  * Runtime information of a data model or field attribute
  */
-type RuntimeAttribute = {
+declare type RuntimeAttribute = {
     name: string;
     args: Array<{
         name?: string;
@@ -27,7 +27,7 @@ type RuntimeAttribute = {
 /**
  * Runtime information of a data model field
  */
-type FieldInfo = {
+declare type FieldInfo = {
     /**
      * Field name
      */
@@ -77,14 +77,14 @@ type FieldInfo = {
  * Metadata for a model-level unique constraint
  * e.g.: @@unique([a, b])
  */
-type UniqueConstraint = {
+declare type UniqueConstraint = {
     name: string;
     fields: string[];
 };
 /**
  * ZModel data model metadata
  */
-type ModelMeta = {
+declare type ModelMeta = {
     /**
      * Model fields
      */
@@ -105,7 +105,11 @@ type ModelMeta = {
 /**
  * Resolves a model field to its metadata. Returns undefined if not found.
  */
-declare function resolveField(modelMeta: ModelMeta, model: string, field: string): FieldInfo | undefined;
+declare function resolveField(modelMeta: ModelMeta, model: string, field: string): FieldInfo;
+/**
+ * Resolves a model field to its metadata. Throws an error if not found.
+ */
+declare function requireField(modelMeta: ModelMeta, model: string, field: string): FieldInfo;
 /**
  * Gets all fields of a model.
  */
@@ -126,7 +130,7 @@ declare function getFields(modelMeta: ModelMeta, model: string): Record<string,
  */
 declare function applyMutation(queryModel: string, queryOp: string, queryData: any, mutationModel: string, mutationOp: PrismaWriteActionType, mutationArgs: any, modelMeta: ModelMeta, logging: boolean): Promise<any>;
 
-type NestedReadVisitorCallback = {
+declare type NestedReadVisitorCallback = {
     field?: (model: string, field: FieldInfo | undefined, kind: 'include' | 'select' | undefined, args: unknown) => void | boolean;
 };
 /**
@@ -147,13 +151,13 @@ declare const PrismaWriteActions: readonly ["create", "createMany", "connectOrCr
 /**
  * Prisma write operation kinds
  */
-type PrismaWriteActionType = (typeof PrismaWriteActions)[number];
+declare type PrismaWriteActionType = (typeof PrismaWriteActions)[number];
 /**
  * Maybe promise
  */
-type MaybePromise<T> = T | Promise<T> | PromiseLike<T>;
+declare type MaybePromise<T> = T | Promise<T> | PromiseLike<T>;
 
-type NestingPathItem = {
+declare type NestingPathItem = {
     field?: FieldInfo;
     model: string;
     where: any;
@@ -162,7 +166,7 @@ type NestingPathItem = {
 /**
  * Context for visiting
  */
-type NestedWriteVisitorContext = {
+declare type NestedWriteVisitorContext = {
     /**
      * Parent data, can be used to replace fields
      */
@@ -181,7 +185,7 @@ type NestedWriteVisitorContext = {
  * that the visitor should continue traversing its children, or false to stop. It can also return an object
  * to let the visitor traverse it instead of its original children.
  */
-type NestedWriterVisitorCallback = {
+declare type NestedWriterVisitorCallback = {
     create?: (model: string, args: any[], context: NestedWriteVisitorContext) => MaybePromise<boolean | object | void>;
     createMany?: (model: string, args: {
         data: any;
@@ -247,7 +251,7 @@ declare function getModelFields(data: object): string[];
 /**
  * Array or scalar
  */
-type Enumerable<T> = T | Array<T>;
+declare type Enumerable<T> = T | Array<T>;
 /**
  * Uniformly enumerates an array or scalar.
  */
@@ -258,4 +262,4 @@ declare function enumerate<T>(x: Enumerable<T>): T[];
 declare function zip<T1, T2>(x: Enumerable<T1>, y: Enumerable<T2>): Array<[T1, T2]>;
 declare function getIdFields(modelMeta: ModelMeta, model: string, throwIfNotFound?: boolean): FieldInfo[];
 
-export { Enumerable, FieldInfo, MaybePromise, ModelDataVisitor, ModelDataVisitorCallback, ModelMeta, NestedReadVisitor, NestedReadVisitorCallback, NestedWriteVisitor, NestedWriteVisitorContext, NestedWriterVisitorCallback, PrismaWriteActionType, PrismaWriteActions, RuntimeAttribute, UniqueConstraint, applyMutation, enumerate, getFields, getIdFields, getModelFields, getMutatedModels, getReadModels, resolveField, zip };
+export { Enumerable, FieldInfo, MaybePromise, ModelDataVisitor, ModelDataVisitorCallback, ModelMeta, NestedReadVisitor, NestedReadVisitorCallback, NestedWriteVisitor, NestedWriteVisitorContext, NestedWriterVisitorCallback, PrismaWriteActionType, PrismaWriteActions, RuntimeAttribute, UniqueConstraint, applyMutation, enumerate, getFields, getIdFields, getModelFields, getMutatedModels, getReadModels, requireField, resolveField, zip };

package/cross/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * Callback for @see ModelDataVisitor.
  */
-type ModelDataVisitorCallback = (model: string, data: any, scalarData: any) => void;
+declare type ModelDataVisitorCallback = (model: string, data: any, scalarData: any) => void;
 /**
  * Visitor that traverses data returned by a Prisma query.
  */
@@ -17,7 +17,7 @@ declare class ModelDataVisitor {
 /**
  * Runtime information of a data model or field attribute
  */
-type RuntimeAttribute = {
+declare type RuntimeAttribute = {
     name: string;
     args: Array<{
         name?: string;
@@ -27,7 +27,7 @@ type RuntimeAttribute = {
 /**
  * Runtime information of a data model field
  */
-type FieldInfo = {
+declare type FieldInfo = {
     /**
      * Field name
      */
@@ -77,14 +77,14 @@ type FieldInfo = {
  * Metadata for a model-level unique constraint
  * e.g.: @@unique([a, b])
  */
-type UniqueConstraint = {
+declare type UniqueConstraint = {
     name: string;
     fields: string[];
 };
 /**
  * ZModel data model metadata
  */
-type ModelMeta = {
+declare type ModelMeta = {
     /**
      * Model fields
      */
@@ -105,7 +105,11 @@ type ModelMeta = {
 /**
  * Resolves a model field to its metadata. Returns undefined if not found.
  */
-declare function resolveField(modelMeta: ModelMeta, model: string, field: string): FieldInfo | undefined;
+declare function resolveField(modelMeta: ModelMeta, model: string, field: string): FieldInfo;
+/**
+ * Resolves a model field to its metadata. Throws an error if not found.
+ */
+declare function requireField(modelMeta: ModelMeta, model: string, field: string): FieldInfo;
 /**
  * Gets all fields of a model.
  */
@@ -126,7 +130,7 @@ declare function getFields(modelMeta: ModelMeta, model: string): Record<string,
  */
 declare function applyMutation(queryModel: string, queryOp: string, queryData: any, mutationModel: string, mutationOp: PrismaWriteActionType, mutationArgs: any, modelMeta: ModelMeta, logging: boolean): Promise<any>;
 
-type NestedReadVisitorCallback = {
+declare type NestedReadVisitorCallback = {
     field?: (model: string, field: FieldInfo | undefined, kind: 'include' | 'select' | undefined, args: unknown) => void | boolean;
 };
 /**
@@ -147,13 +151,13 @@ declare const PrismaWriteActions: readonly ["create", "createMany", "connectOrCr
 /**
  * Prisma write operation kinds
  */
-type PrismaWriteActionType = (typeof PrismaWriteActions)[number];
+declare type PrismaWriteActionType = (typeof PrismaWriteActions)[number];
 /**
  * Maybe promise
  */
-type MaybePromise<T> = T | Promise<T> | PromiseLike<T>;
+declare type MaybePromise<T> = T | Promise<T> | PromiseLike<T>;
 
-type NestingPathItem = {
+declare type NestingPathItem = {
     field?: FieldInfo;
     model: string;
     where: any;
@@ -162,7 +166,7 @@ type NestingPathItem = {
 /**
  * Context for visiting
  */
-type NestedWriteVisitorContext = {
+declare type NestedWriteVisitorContext = {
     /**
      * Parent data, can be used to replace fields
      */
@@ -181,7 +185,7 @@ type NestedWriteVisitorContext = {
  * that the visitor should continue traversing its children, or false to stop. It can also return an object
  * to let the visitor traverse it instead of its original children.
  */
-type NestedWriterVisitorCallback = {
+declare type NestedWriterVisitorCallback = {
     create?: (model: string, args: any[], context: NestedWriteVisitorContext) => MaybePromise<boolean | object | void>;
     createMany?: (model: string, args: {
         data: any;
@@ -247,7 +251,7 @@ declare function getModelFields(data: object): string[];
 /**
  * Array or scalar
  */
-type Enumerable<T> = T | Array<T>;
+declare type Enumerable<T> = T | Array<T>;
 /**
  * Uniformly enumerates an array or scalar.
  */
@@ -258,4 +262,4 @@ declare function enumerate<T>(x: Enumerable<T>): T[];
 declare function zip<T1, T2>(x: Enumerable<T1>, y: Enumerable<T2>): Array<[T1, T2]>;
 declare function getIdFields(modelMeta: ModelMeta, model: string, throwIfNotFound?: boolean): FieldInfo[];
 
-export { Enumerable, FieldInfo, MaybePromise, ModelDataVisitor, ModelDataVisitorCallback, ModelMeta, NestedReadVisitor, NestedReadVisitorCallback, NestedWriteVisitor, NestedWriteVisitorContext, NestedWriterVisitorCallback, PrismaWriteActionType, PrismaWriteActions, RuntimeAttribute, UniqueConstraint, applyMutation, enumerate, getFields, getIdFields, getModelFields, getMutatedModels, getReadModels, resolveField, zip };
+export { Enumerable, FieldInfo, MaybePromise, ModelDataVisitor, ModelDataVisitorCallback, ModelMeta, NestedReadVisitor, NestedReadVisitorCallback, NestedWriteVisitor, NestedWriteVisitorContext, NestedWriterVisitorCallback, PrismaWriteActionType, PrismaWriteActions, RuntimeAttribute, UniqueConstraint, applyMutation, enumerate, getFields, getIdFields, getModelFields, getMutatedModels, getReadModels, requireField, resolveField, zip };

package/cross/index.js

@@ -78,6 +78,7 @@ __export(cross_exports, {
   getModelFields: () => getModelFields,
   getMutatedModels: () => getMutatedModels,
   getReadModels: () => getReadModels,
+  requireField: () => requireField,
   resolveField: () => resolveField,
   zip: () => zip
 });
@@ -120,6 +121,13 @@ function resolveField(modelMeta, model, field) {
   var _a;
   return (_a = modelMeta.fields[(0, import_lower_case_first.lowerCaseFirst)(model)]) == null ? void 0 : _a[field];
 }
+function requireField(modelMeta, model, field) {
+  const f = resolveField(modelMeta, model, field);
+  if (!f) {
+    throw new Error(`Field ${model}.${field} cannot be resolved`);
+  }
+  return f;
+}
 function getFields(modelMeta, model) {
   return modelMeta.fields[(0, import_lower_case_first.lowerCaseFirst)(model)];
 }
@@ -156,17 +164,21 @@ function applyMutation(queryModel, queryOp, queryData, mutationModel, mutationOp
         }
       },
       update: (model, args) => {
-        const r = updateMutate(queryModel, resultData, model, args, modelMeta, logging);
-        if (r) {
-          resultData = r;
-          updated = true;
+        if (model === queryModel) {
+          const r = updateMutate(queryModel, resultData, model, args, modelMeta, logging);
+          if (r) {
+            resultData = r;
+            updated = true;
+          }
         }
       },
       delete: (model, args) => {
-        const r = deleteMutate(queryModel, resultData, model, args, modelMeta, logging);
-        if (r) {
-          resultData = r;
-          updated = true;
+        if (model === queryModel) {
+          const r = deleteMutate(queryModel, resultData, model, args, modelMeta, logging);
+          if (r) {
+            resultData = r;
+            updated = true;
+          }
         }
       }
     });
@@ -209,12 +221,12 @@ function createMutate(queryModel, queryOp, currentData, newData, modelMeta, logg
   idFields.forEach((f) => {
     if (insert[f.name] === void 0) {
       if (f.type === "Int" || f.type === "BigInt") {
-        const currMax = Math.max(
+        const currMax = Array.isArray(currentData) ? Math.max(
           ...[...currentData].map((item) => {
             const idv = parseInt(item[f.name]);
             return isNaN(idv) ? 0 : idv;
           })
-        );
+        ) : 0;
         insert[f.name] = currMax + 1;
       } else {
         insert[f.name] = (0, import_uuid.v4)();
@@ -225,7 +237,7 @@ function createMutate(queryModel, queryOp, currentData, newData, modelMeta, logg
   if (logging) {
     console.log(`Optimistic create for ${queryModel}:`, insert);
   }
-  return [insert, ...currentData];
+  return [insert, ...Array.isArray(currentData) ? currentData : []];
 }
 function updateMutate(queryModel, currentData, mutateModel, mutateArgs, modelMeta, logging) {
   if (!currentData) {
@@ -436,54 +448,55 @@ var NestedWriteVisitor = class {
       if (!data) {
         return;
       }
-      const context = { parent, field, nestingPath: [...nestingPath] };
       const toplevel = field == void 0;
+      const context = { parent, field, nestingPath: [...nestingPath] };
+      const pushNewContext = (field2, model2, where, unique = false) => {
+        return __spreadProps(__spreadValues({}, context), { nestingPath: [...context.nestingPath, { field: field2, model: model2, where, unique }] });
+      };
       switch (action) {
         case "create":
-          context.nestingPath.push({ field, model, where: {}, unique: false });
           for (const item of enumerate(data)) {
+            const newContext = pushNewContext(field, model, {});
             let callbackResult;
             if (this.callback.create) {
-              callbackResult = yield this.callback.create(model, item, context);
+              callbackResult = yield this.callback.create(model, item, newContext);
             }
             if (callbackResult !== false) {
               const subPayload = typeof callbackResult === "object" ? callbackResult : item;
-              yield this.visitSubPayload(model, action, subPayload, context.nestingPath);
+              yield this.visitSubPayload(model, action, subPayload, newContext.nestingPath);
             }
           }
           break;
         case "createMany":
           if (data) {
-            context.nestingPath.push({ field, model, where: {}, unique: false });
+            const newContext = pushNewContext(field, model, {});
             let callbackResult;
             if (this.callback.createMany) {
-              callbackResult = yield this.callback.createMany(model, data, context);
+              callbackResult = yield this.callback.createMany(model, data, newContext);
             }
             if (callbackResult !== false) {
               const subPayload = typeof callbackResult === "object" ? callbackResult : data.data;
-              yield this.visitSubPayload(model, action, subPayload, context.nestingPath);
+              yield this.visitSubPayload(model, action, subPayload, newContext.nestingPath);
             }
           }
           break;
         case "connectOrCreate":
-          context.nestingPath.push({ field, model, where: data.where, unique: false });
           for (const item of enumerate(data)) {
+            const newContext = pushNewContext(field, model, item.where);
             let callbackResult;
             if (this.callback.connectOrCreate) {
-              callbackResult = yield this.callback.connectOrCreate(model, item, context);
+              callbackResult = yield this.callback.connectOrCreate(model, item, newContext);
             }
             if (callbackResult !== false) {
               const subPayload = typeof callbackResult === "object" ? callbackResult : item.create;
-              yield this.visitSubPayload(model, action, subPayload, context.nestingPath);
+              yield this.visitSubPayload(model, action, subPayload, newContext.nestingPath);
             }
           }
           break;
         case "connect":
           if (this.callback.connect) {
             for (const item of enumerate(data)) {
-              const newContext = __spreadProps(__spreadValues({}, context), {
-                nestingPath: [...context.nestingPath, { field, model, where: item, unique: true }]
-              });
+              const newContext = pushNewContext(field, model, item, true);
               yield this.callback.connect(model, item, newContext);
             }
           }
@@ -491,61 +504,56 @@ var NestedWriteVisitor = class {
         case "disconnect":
           if (this.callback.disconnect) {
             for (const item of enumerate(data)) {
-              const newContext = __spreadProps(__spreadValues({}, context), {
-                nestingPath: [
-                  ...context.nestingPath,
-                  { field, model, where: item, unique: typeof item === "object" }
-                ]
-              });
+              const newContext = pushNewContext(field, model, item, typeof item === "object");
               yield this.callback.disconnect(model, item, newContext);
             }
           }
           break;
         case "set":
           if (this.callback.set) {
-            context.nestingPath.push({ field, model, where: {}, unique: false });
-            yield this.callback.set(model, data, context);
+            const newContext = pushNewContext(field, model, {});
+            yield this.callback.set(model, data, newContext);
           }
           break;
         case "update":
-          context.nestingPath.push({ field, model, where: data.where, unique: false });
           for (const item of enumerate(data)) {
+            const newContext = pushNewContext(field, model, item.where);
             let callbackResult;
             if (this.callback.update) {
-              callbackResult = yield this.callback.update(model, item, context);
+              callbackResult = yield this.callback.update(model, item, newContext);
             }
             if (callbackResult !== false) {
               const subPayload = typeof callbackResult === "object" ? callbackResult : typeof item.data === "object" ? item.data : item;
-              yield this.visitSubPayload(model, action, subPayload, context.nestingPath);
+              yield this.visitSubPayload(model, action, subPayload, newContext.nestingPath);
             }
           }
           break;
         case "updateMany":
-          context.nestingPath.push({ field, model, where: data.where, unique: false });
           for (const item of enumerate(data)) {
+            const newContext = pushNewContext(field, model, item.where);
             let callbackResult;
             if (this.callback.updateMany) {
-              callbackResult = yield this.callback.updateMany(model, item, context);
+              callbackResult = yield this.callback.updateMany(model, item, newContext);
             }
             if (callbackResult !== false) {
               const subPayload = typeof callbackResult === "object" ? callbackResult : item;
-              yield this.visitSubPayload(model, action, subPayload, context.nestingPath);
+              yield this.visitSubPayload(model, action, subPayload, newContext.nestingPath);
             }
           }
           break;
         case "upsert": {
-          context.nestingPath.push({ field, model, where: data.where, unique: false });
           for (const item of enumerate(data)) {
+            const newContext = pushNewContext(field, model, item.where);
             let callbackResult;
             if (this.callback.upsert) {
-              callbackResult = yield this.callback.upsert(model, item, context);
+              callbackResult = yield this.callback.upsert(model, item, newContext);
             }
             if (callbackResult !== false) {
               if (typeof callbackResult === "object") {
-                yield this.visitSubPayload(model, action, callbackResult, context.nestingPath);
+                yield this.visitSubPayload(model, action, callbackResult, newContext.nestingPath);
               } else {
-                yield this.visitSubPayload(model, action, item.create, context.nestingPath);
-                yield this.visitSubPayload(model, action, item.update, context.nestingPath);
+                yield this.visitSubPayload(model, action, item.create, newContext.nestingPath);
+                yield this.visitSubPayload(model, action, item.update, newContext.nestingPath);
               }
             }
           }
@@ -554,12 +562,7 @@ var NestedWriteVisitor = class {
         case "delete": {
           if (this.callback.delete) {
             for (const item of enumerate(data)) {
-              const newContext = __spreadProps(__spreadValues({}, context), {
-                nestingPath: [
-                  ...context.nestingPath,
-                  { field, model, where: toplevel ? item.where : item, unique: false }
-                ]
-              });
+              const newContext = pushNewContext(field, model, toplevel ? item.where : item);
               yield this.callback.delete(model, item, newContext);
             }
           }
@@ -568,12 +571,7 @@ var NestedWriteVisitor = class {
         case "deleteMany":
           if (this.callback.deleteMany) {
             for (const item of enumerate(data)) {
-              const newContext = __spreadProps(__spreadValues({}, context), {
-                nestingPath: [
-                  ...context.nestingPath,
-                  { field, model, where: toplevel ? item.where : item, unique: false }
-                ]
-              });
+              const newContext = pushNewContext(field, model, toplevel ? item.where : item);
               yield this.callback.deleteMany(model, item, newContext);
             }
           }
@@ -692,6 +690,7 @@ function collectDeleteCascades(model, modelMeta, result, visited) {
   getModelFields,
   getMutatedModels,
   getReadModels,
+  requireField,
   resolveField,
   zip
 });