@danielhritcu/zenstack-orm 3.5.12 → 3.5.14

package/dist/index.cjs

@@ -3328,7 +3328,7 @@ var BaseOperationHandler = class {
       ...data
     };
     for (const sel of plan.selections) {
-      const sourceValue = result[sel.sourceField];
+      const sourceValue = this.normalizeVirtualRelationValue(result[sel.sourceField]);
       if (sel.kind === "filtered") {
         let value = sel.single ? Array.isArray(sourceValue) ? sourceValue[0] ?? null : sourceValue ?? null : sourceValue;
         if (sel.discriminatorWhere && value != null) {
@@ -3345,7 +3345,18 @@ var BaseOperationHandler = class {
     }
     return result;
   }
+  normalizeVirtualRelationValue(value) {
+    if (typeof value !== "string") {
+      return value;
+    }
+    try {
+      return JSON.parse(value);
+    } catch {
+      return value;
+    }
+  }
   extractThroughValue(value, path) {
+    value = this.normalizeVirtualRelationValue(value);
     if (path.length === 0) return value ?? null;
     const [segment, ...rest] = path;
     if (Array.isArray(value)) {
@@ -6249,14 +6260,32 @@ var ZodSchemaFactory = class {
     return import_zod2.z.strictObject(fields);
   }
   addExtResultFields(model, fields) {
+    const keys = [
+      (0, import_common_helpers9.lowerCaseFirst)(model),
+      model
+    ];
+    const schemaExtResult = this.schema.plugins?.extResult;
+    for (const key of keys) {
+      const modelConfig = schemaExtResult?.[key];
+      if (modelConfig) {
+        for (const field of Object.keys(modelConfig)) {
+          fields[field] = import_zod2.z.boolean().optional();
+        }
+        break;
+      }
+    }
     for (const plugin of this.plugins) {
       const resultConfig = plugin.result;
       if (resultConfig) {
-        const modelConfig = resultConfig[(0, import_common_helpers9.lowerCaseFirst)(model)];
-        if (modelConfig) {
+        for (const key of keys) {
+          const modelConfig = resultConfig[key];
+          if (!modelConfig) {
+            continue;
+          }
           for (const field of Object.keys(modelConfig)) {
             fields[field] = import_zod2.z.boolean().optional();
           }
+          break;
         }
       }
     }
@@ -10075,7 +10104,7 @@ __name(isProcedureIncluded, "isProcedureIncluded");
 function createModelCrudHandler(client, model, inputValidator, resultProcessor) {
   const plugins = client.$options.plugins ?? [];
   const schema = client.$schema;
-  const hasAnyExtResult = hasExtResultFieldDefs(plugins);
+  const hasAnyExtResult = hasExtResultFieldDefs(schema, plugins);
   const createPromise = /* @__PURE__ */ __name((operation, nominalOperation, args, handler, postProcess = false, throwIfNoResult = false, metadata = {}) => {
     return createZenStackPromise(async (txClient) => {
       let proceed = /* @__PURE__ */ __name(async (_args) => {
@@ -10339,30 +10368,62 @@ var EXT_RESULT_OPERATIONS = /* @__PURE__ */ new Set([
   "upsert",
   "delete"
 ]);
-function hasExtResultFieldDefs(plugins) {
-  return plugins.some((p) => p.result && Object.keys(p.result).length > 0);
+function getSchemaExtResultConfig(schema) {
+  const config = schema.plugins?.extResult;
+  return config && typeof config === "object" ? config : void 0;
+}
+__name(getSchemaExtResultConfig, "getSchemaExtResultConfig");
+function getExtResultModelConfigs(schema, model, plugins) {
+  const configs = [];
+  const keys = [
+    (0, import_common_helpers15.lowerCaseFirst)(model),
+    model
+  ];
+  const schemaConfig = getSchemaExtResultConfig(schema);
+  for (const key of keys) {
+    const modelConfig = schemaConfig?.[key];
+    if (modelConfig && typeof modelConfig === "object") {
+      configs.push({
+        owner: "schema",
+        config: modelConfig
+      });
+      break;
+    }
+  }
+  for (const plugin of plugins) {
+    const resultConfig = plugin.result;
+    for (const key of keys) {
+      const modelConfig = resultConfig?.[key];
+      if (modelConfig && typeof modelConfig === "object") {
+        configs.push({
+          owner: `plugin "${plugin.id}"`,
+          config: modelConfig
+        });
+        break;
+      }
+    }
+  }
+  return configs;
+}
+__name(getExtResultModelConfigs, "getExtResultModelConfigs");
+function hasExtResultFieldDefs(schema, plugins) {
+  return !!getSchemaExtResultConfig(schema) || plugins.some((p) => p.result && Object.keys(p.result).length > 0);
 }
 __name(hasExtResultFieldDefs, "hasExtResultFieldDefs");
 function collectExtResultFieldDefs(model, schema, plugins) {
   const defs = /* @__PURE__ */ new Map();
-  for (const plugin of plugins) {
-    const resultConfig = plugin.result;
-    if (resultConfig) {
-      const modelConfig = resultConfig[(0, import_common_helpers15.lowerCaseFirst)(model)];
-      if (modelConfig) {
-        for (const [fieldName, fieldDef] of Object.entries(modelConfig)) {
-          if (getField(schema, model, fieldName)) {
-            throw new Error(`Plugin "${plugin.id}" registers ext result field "${fieldName}" on model "${model}" which conflicts with an existing model field`);
-          }
-          for (const needField of Object.keys(fieldDef.needs ?? {})) {
-            const needDef = getField(schema, model, needField);
-            if (!needDef || needDef.relation) {
-              throw new Error(`Plugin "${plugin.id}" registers ext result field "${fieldName}" on model "${model}" with invalid need "${needField}"`);
-            }
-          }
-          defs.set(fieldName, fieldDef);
+  for (const { owner, config } of getExtResultModelConfigs(schema, model, plugins)) {
+    for (const [fieldName, fieldDef] of Object.entries(config)) {
+      if (getField(schema, model, fieldName)) {
+        throw new Error(`${owner} registers ext result field "${fieldName}" on model "${model}" which conflicts with an existing model field`);
+      }
+      for (const needField of Object.keys(fieldDef.needs ?? {})) {
+        const needDef = getField(schema, model, needField);
+        if (!needDef || needDef.relation) {
+          throw new Error(`${owner} registers ext result field "${fieldName}" on model "${model}" with invalid need "${needField}"`);
         }
       }
+      defs.set(fieldName, fieldDef);
     }
   }
   return defs;