@zenstackhq/runtime 3.0.0-alpha.4 → 3.0.0-alpha.6

package/dist/index.d.cts

@@ -1,10 +1,8 @@
-import { C as ClientConstructor } from './contract-BBUC-uVq.cjs';
-export { a as ClientContract } from './contract-BBUC-uVq.cjs';
-import '@zenstackhq/sdk/schema';
+import { C as ClientConstructor } from './contract-DW8XGrtV.cjs';
+export { a as ClientContract } from './contract-DW8XGrtV.cjs';
 import 'decimal.js';
+import '@zenstackhq/sdk/schema';
 import 'kysely';
-import 'utility-types';
-import '@zenstackhq/language/ast';
 
 /**
  * ZenStack client.

package/dist/index.d.ts

@@ -1,10 +1,8 @@
-import { C as ClientConstructor } from './contract-BBUC-uVq.js';
-export { a as ClientContract } from './contract-BBUC-uVq.js';
-import '@zenstackhq/sdk/schema';
+import { C as ClientConstructor } from './contract-DW8XGrtV.js';
+export { a as ClientContract } from './contract-DW8XGrtV.js';
 import 'decimal.js';
+import '@zenstackhq/sdk/schema';
 import 'kysely';
-import 'utility-types';
-import '@zenstackhq/language/ast';
 
 /**
  * ZenStack client.

package/dist/index.js

@@ -6,6 +6,7 @@ var __export = (target, all) => {
 };
 
 // src/client/client-impl.ts
+import { lowerCaseFirst as lowerCaseFirst2 } from "@zenstackhq/common-helpers";
 import { DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, PostgresDialect, SqliteDialect } from "kysely";
 import { match as match19 } from "ts-pattern";
 
@@ -280,9 +281,9 @@ __name(safeJSONStringify, "safeJSONStringify");
 
 // src/client/crud/operations/base.ts
 import { createId } from "@paralleldrive/cuid2";
+import { invariant as invariant7 } from "@zenstackhq/common-helpers";
 import { expressionBuilder as expressionBuilder2, sql as sql4 } from "kysely";
 import { nanoid } from "nanoid";
-import invariant7 from "tiny-invariant";
 import { match as match8 } from "ts-pattern";
 import { ulid } from "ulid";
 import * as uuid from "uuid";
@@ -300,21 +301,21 @@ var RejectedByPolicyError = class extends Error {
 };
 
 // src/plugins/policy/policy-handler.ts
+import { invariant as invariant6 } from "@zenstackhq/common-helpers";
 import { AliasNode as AliasNode3, BinaryOperationNode as BinaryOperationNode3, ColumnNode as ColumnNode2, DeleteQueryNode, FromNode as FromNode2, IdentifierNode as IdentifierNode2, InsertQueryNode, OperationNodeTransformer, OperatorNode as OperatorNode3, PrimitiveValueListNode, RawNode, ReturningNode, SelectionNode as SelectionNode2, SelectQueryNode as SelectQueryNode2, TableNode as TableNode3, UpdateQueryNode, ValueNode as ValueNode3, ValuesNode, WhereNode as WhereNode2 } from "kysely";
-import invariant6 from "tiny-invariant";
 import { match as match7 } from "ts-pattern";
 
 // src/client/crud/dialects/index.ts
 import { match as match4 } from "ts-pattern";
 
 // src/client/crud/dialects/postgresql.ts
+import { invariant as invariant2 } from "@zenstackhq/common-helpers";
 import { sql as sql2 } from "kysely";
-import invariant2 from "tiny-invariant";
 import { match as match2 } from "ts-pattern";
 
 // src/client/crud/dialects/base.ts
+import { invariant, isPlainObject } from "@zenstackhq/common-helpers";
 import { sql } from "kysely";
-import invariant from "tiny-invariant";
 import { match, P } from "ts-pattern";
 
 // src/utils/enumerate.ts
@@ -332,7 +333,6 @@ function enumerate(x) {
 __name(enumerate, "enumerate");
 
 // src/client/crud/dialects/base.ts
-import { isPlainObject } from "is-plain-object";
 var BaseCrudDialect = class {
   static {
     __name(this, "BaseCrudDialect");
@@ -915,8 +915,8 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
 };
 
 // src/client/crud/dialects/sqlite.ts
+import { invariant as invariant3 } from "@zenstackhq/common-helpers";
 import { sql as sql3 } from "kysely";
-import invariant3 from "tiny-invariant";
 import { match as match3 } from "ts-pattern";
 var SqliteCrudDialect = class extends BaseCrudDialect {
   static {
@@ -1460,12 +1460,12 @@ var ColumnCollector = class extends DefaultOperationNodeVisitor {
 };
 
 // src/plugins/policy/expression-transformer.ts
+import { invariant as invariant5 } from "@zenstackhq/common-helpers";
 import { AliasNode as AliasNode2, BinaryOperationNode as BinaryOperationNode2, ColumnNode, expressionBuilder, FromNode, FunctionNode as FunctionNode2, IdentifierNode, OperatorNode as OperatorNode2, ReferenceNode as ReferenceNode2, SelectionNode, SelectQueryNode, TableNode as TableNode2, ValueListNode, ValueNode as ValueNode2, WhereNode } from "kysely";
-import invariant5 from "tiny-invariant";
 import { match as match6 } from "ts-pattern";
 
 // src/plugins/policy/expression-evaluator.ts
-import invariant4 from "tiny-invariant";
+import { invariant as invariant4 } from "@zenstackhq/common-helpers";
 import { match as match5 } from "ts-pattern";
 var ExpressionEvaluator = class {
   static {
@@ -2385,7 +2385,7 @@ var PolicyPlugin = class {
 };
 
 // src/utils/clone.ts
-import { isPlainObject as isPlainObject2 } from "is-plain-object";
+import { isPlainObject as isPlainObject2 } from "@zenstackhq/common-helpers";
 function clone(value) {
   if (Array.isArray(value)) {
     return value.map((v) => clone(v));
@@ -3948,16 +3948,15 @@ var UpdateOperationHandler = class extends BaseOperationHandler {
 import Decimal from "decimal.js";
 import stableStringify from "json-stable-stringify";
 import { match as match14, P as P2 } from "ts-pattern";
-import { z } from "zod";
+import { z } from "zod/v4";
 var InputValidator = class {
   static {
     __name(this, "InputValidator");
   }
   schema;
-  schemaCache;
+  schemaCache = /* @__PURE__ */ new Map();
   constructor(schema) {
     this.schema = schema;
-    this.schemaCache = /* @__PURE__ */ new Map();
   }
   validateFindArgs(model, unique, args) {
     return this.validate(model, "find", {
@@ -4118,7 +4117,7 @@ var InputValidator = class {
         }
       }
     }
-    fields["$expr"] = z.function().optional();
+    fields["$expr"] = z.custom((v) => typeof v === "function").optional();
     fields["AND"] = this.orArray(z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)), true).optional();
     fields["OR"] = z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)).array().optional();
     fields["NOT"] = this.orArray(z.lazy(() => this.makeWhereSchema(model, false, withoutRelationFields)), true).optional();
@@ -4925,11 +4924,11 @@ var QueryNameMapper = class extends OperationNodeTransformer2 {
     __name(this, "QueryNameMapper");
   }
   schema;
-  modelToTableMap;
-  fieldToColumnMap;
-  modelStack;
+  modelToTableMap = /* @__PURE__ */ new Map();
+  fieldToColumnMap = /* @__PURE__ */ new Map();
+  modelStack = [];
   constructor(schema) {
-    super(), this.schema = schema, this.modelToTableMap = /* @__PURE__ */ new Map(), this.fieldToColumnMap = /* @__PURE__ */ new Map(), this.modelStack = [];
+    super(), this.schema = schema;
     for (const [modelName, modelDef] of Object.entries(schema.models)) {
       const mappedName = this.getMappedName(modelDef);
       if (mappedName) {
@@ -5386,8 +5385,8 @@ __export(functions_exports, {
   search: () => search,
   startsWith: () => startsWith
 });
+import { invariant as invariant8, lowerCaseFirst, upperCaseFirst } from "@zenstackhq/common-helpers";
 import { sql as sql8, ValueNode as ValueNode4 } from "kysely";
-import invariant8 from "tiny-invariant";
 import { match as match16 } from "ts-pattern";
 var contains = /* @__PURE__ */ __name((eb, args) => {
   const [field, search2, caseInsensitive = false] = args;
@@ -5494,7 +5493,7 @@ var currentOperation = /* @__PURE__ */ __name((_eb, args, { operation }) => {
 function processCasing(casing, result, model) {
   const opNode = casing.toOperationNode();
   invariant8(ValueNode4.is(opNode) && typeof opNode.value === "string", '"casting" parameter must be a string value');
-  result = match16(opNode.value).with("original", () => model).with("upper", () => result.toUpperCase()).with("lower", () => result.toLowerCase()).with("capitalize", () => `${result.charAt(0).toUpperCase() + result.slice(1)}`).with("uncapitalize", () => `${result.charAt(0).toLowerCase() + result.slice(1)}`).otherwise(() => {
+  result = match16(opNode.value).with("original", () => model).with("upper", () => result.toUpperCase()).with("lower", () => result.toLowerCase()).with("capitalize", () => upperCaseFirst(result)).with("uncapitalize", () => lowerCaseFirst(result)).otherwise(() => {
     throw new Error(`Invalid casing value: ${opNode.value}. Must be "original", "upper", "lower", "capitalize", or "uncapitalize".`);
   });
   return result;
@@ -5502,8 +5501,8 @@ function processCasing(casing, result, model) {
 __name(processCasing, "processCasing");
 
 // src/client/helpers/schema-db-pusher.ts
+import { invariant as invariant9 } from "@zenstackhq/common-helpers";
 import { sql as sql9 } from "kysely";
-import invariant9 from "tiny-invariant";
 import { match as match17 } from "ts-pattern";
 var SchemaDbPusher = class {
   static {
@@ -5535,7 +5534,7 @@ var SchemaDbPusher = class {
     for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
       if (fieldDef.relation) {
         table = this.addForeignKeyConstraint(table, model, fieldName, fieldDef);
-      } else {
+      } else if (!this.isComputedField(fieldDef)) {
         table = this.createModelField(table, fieldName, fieldDef, modelDef);
       }
     }
@@ -5543,6 +5542,9 @@ var SchemaDbPusher = class {
     table = this.addUniqueConstraint(table, modelDef);
     return table;
   }
+  isComputedField(fieldDef) {
+    return fieldDef.attributes?.some((a) => a.name === "@computed");
+  }
   addPrimaryKeyConstraint(table, model, modelDef) {
     if (modelDef.idFields.length === 1) {
       if (Object.values(modelDef.fields).some((f) => f.id)) {
@@ -5669,8 +5671,8 @@ function valueToPromise(thing) {
 __name(valueToPromise, "valueToPromise");
 
 // src/client/result-processor.ts
+import { invariant as invariant10 } from "@zenstackhq/common-helpers";
 import Decimal2 from "decimal.js";
-import invariant10 from "tiny-invariant";
 import { match as match18 } from "ts-pattern";
 var ResultProcessor = class {
   static {
@@ -5904,12 +5906,19 @@ var ClientImpl = class _ClientImpl {
     const newOptions = {
       ...this.options,
       plugins: [
-        ...this.options?.plugins ?? [],
+        ...this.options.plugins ?? [],
         plugin
       ]
     };
     return new _ClientImpl(this.schema, newOptions, this);
   }
+  $unuse(pluginId) {
+    const newOptions = {
+      ...this.options,
+      plugins: this.options.plugins?.filter((p) => p.id !== pluginId)
+    };
+    return new _ClientImpl(this.schema, newOptions, this);
+  }
   $unuseAll() {
     const newOptions = {
       ...this.options,
@@ -5965,22 +5974,31 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
         }
         return result;
       }, "proceed");
-      const context = {
-        client,
-        model,
-        operation,
-        queryArgs: args
-      };
       const plugins = [
         ...client.$options.plugins ?? []
       ];
       for (const plugin of plugins) {
-        if (plugin.onQuery) {
-          const _proceed = proceed;
-          proceed = /* @__PURE__ */ __name(() => plugin.onQuery({
-            ...context,
-            proceed: _proceed
-          }), "proceed");
+        if (plugin.onQuery && typeof plugin.onQuery === "object") {
+          for (const [_model, modelHooks] of Object.entries(plugin.onQuery)) {
+            if (_model === lowerCaseFirst2(model) || _model === "$allModels") {
+              if (modelHooks && typeof modelHooks === "object") {
+                for (const [op, opHooks] of Object.entries(modelHooks)) {
+                  if (op === operation || op === "$allOperations") {
+                    if (typeof opHooks === "function") {
+                      const _proceed = proceed;
+                      proceed = /* @__PURE__ */ __name(() => opHooks({
+                        client,
+                        model,
+                        operation,
+                        args,
+                        query: _proceed
+                      }), "proceed");
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       }
       return proceed(args);