@zenstackhq/runtime 3.0.0-alpha.21 → 3.0.0-alpha.23

package/dist/{contract-D8U59Syb.d.cts → contract-Y3qWOegb.d.cts}

@@ -615,11 +615,11 @@ type MutationInterceptionFilterResult = {
     /**
      * Whether entities should be loaded before the mutation.
      */
-    loadBeforeMutationEntity?: boolean;
+    loadBeforeMutationEntities?: boolean;
     /**
      * Whether entities should be loaded after the mutation.
      */
-    loadAfterMutationEntity?: boolean;
+    loadAfterMutationEntities?: boolean;
 };
 type MutationHooksArgs<Schema extends SchemaDef> = {
     /**
@@ -685,15 +685,15 @@ interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
     mutationInterceptionFilter?: MutationInterceptionFilter<Schema>;
     /**
      * Called before an entity is mutated.
-     * @param args.entity Only available if `loadBeforeMutationEntity` is set to true in the
+     * @param args.entity Only available if `loadBeforeMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     beforeEntityMutation?: BeforeEntityMutationCallback<Schema>;
     /**
      * Called after an entity is mutated.
-     * @param args.beforeMutationEntity Only available if `loadBeforeMutationEntity` is set to true in the
+     * @param args.beforeMutationEntity Only available if `loadBeforeMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
-     * @param args.afterMutationEntity Only available if `loadAfterMutationEntity` is set to true in the
+     * @param args.afterMutationEntity Only available if `loadAfterMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     afterEntityMutation?: AfterEntityMutationCallback<Schema>;

package/dist/{contract-D8U59Syb.d.ts → contract-Y3qWOegb.d.ts}

@@ -615,11 +615,11 @@ type MutationInterceptionFilterResult = {
     /**
      * Whether entities should be loaded before the mutation.
      */
-    loadBeforeMutationEntity?: boolean;
+    loadBeforeMutationEntities?: boolean;
     /**
      * Whether entities should be loaded after the mutation.
      */
-    loadAfterMutationEntity?: boolean;
+    loadAfterMutationEntities?: boolean;
 };
 type MutationHooksArgs<Schema extends SchemaDef> = {
     /**
@@ -685,15 +685,15 @@ interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
     mutationInterceptionFilter?: MutationInterceptionFilter<Schema>;
     /**
      * Called before an entity is mutated.
-     * @param args.entity Only available if `loadBeforeMutationEntity` is set to true in the
+     * @param args.entity Only available if `loadBeforeMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     beforeEntityMutation?: BeforeEntityMutationCallback<Schema>;
     /**
      * Called after an entity is mutated.
-     * @param args.beforeMutationEntity Only available if `loadBeforeMutationEntity` is set to true in the
+     * @param args.beforeMutationEntity Only available if `loadBeforeMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
-     * @param args.afterMutationEntity Only available if `loadAfterMutationEntity` is set to true in the
+     * @param args.afterMutationEntity Only available if `loadAfterMutationEntities` is set to true in the
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     afterEntityMutation?: AfterEntityMutationCallback<Schema>;

package/dist/index.cjs

@@ -5908,7 +5908,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends import_kysely13
         await this.callBeforeMutationHooks(queryNode, mutationInterceptionInfo);
       }
       const oldQueryNode = queryNode;
-      if ((import_kysely13.InsertQueryNode.is(queryNode) || import_kysely13.UpdateQueryNode.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntity) {
+      if ((import_kysely13.InsertQueryNode.is(queryNode) || import_kysely13.UpdateQueryNode.is(queryNode)) && mutationInterceptionInfo?.loadAfterMutationEntities) {
         queryNode = {
           ...queryNode,
           returning: import_kysely13.ReturningNode.create([
@@ -6054,12 +6054,12 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
             queryNode
           });
           result.intercept ||= filterResult.intercept;
-          result.loadBeforeMutationEntity ||= filterResult.loadBeforeMutationEntity;
-          result.loadAfterMutationEntity ||= filterResult.loadAfterMutationEntity;
+          result.loadBeforeMutationEntities ||= filterResult.loadBeforeMutationEntities;
+          result.loadAfterMutationEntities ||= filterResult.loadAfterMutationEntities;
         }
       }
       let beforeMutationEntities;
-      if (result.loadBeforeMutationEntity && (import_kysely13.UpdateQueryNode.is(queryNode) || import_kysely13.DeleteQueryNode.is(queryNode))) {
+      if (result.loadBeforeMutationEntities && (import_kysely13.UpdateQueryNode.is(queryNode) || import_kysely13.DeleteQueryNode.is(queryNode))) {
         beforeMutationEntities = await this.loadEntities(mutationModel, where);
       }
       return {
@@ -6108,7 +6108,7 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     const inTransaction = this.driver.isTransactionConnection(connection);
     for (const hook of hooks) {
       let afterMutationEntities = void 0;
-      if (mutationInterceptionInfo.loadAfterMutationEntity) {
+      if (mutationInterceptionInfo.loadAfterMutationEntities) {
         if (import_kysely13.InsertQueryNode.is(queryNode) || import_kysely13.UpdateQueryNode.is(queryNode)) {
           afterMutationEntities = queryResult.rows;
         }
@@ -6290,6 +6290,7 @@ __name(processCasing, "processCasing");
 // src/client/helpers/schema-db-pusher.ts
 var import_common_helpers11 = require("@zenstackhq/common-helpers");
 var import_kysely15 = require("kysely");
+var import_toposort = __toESM(require("toposort"), 1);
 var import_ts_pattern18 = require("ts-pattern");
 var SchemaDbPusher = class {
   static {
@@ -6309,41 +6310,79 @@ var SchemaDbPusher = class {
           await createEnum.execute();
         }
       }
-      for (const model of Object.keys(this.schema.models)) {
-        const createTable = this.createModelTable(tx, model);
+      const sortedModels = this.sortModels(this.schema.models);
+      for (const modelDef of sortedModels) {
+        const createTable = this.createModelTable(tx, modelDef);
         await createTable.execute();
       }
     });
   }
-  createModelTable(kysely, model) {
-    let table = kysely.schema.createTable(model).ifNotExists();
-    const modelDef = requireModel(this.schema, model);
+  sortModels(models) {
+    const graph = [];
+    for (const model of Object.values(models)) {
+      let added = false;
+      if (model.baseModel) {
+        const baseDef = requireModel(this.schema, model.baseModel);
+        graph.push([
+          model,
+          baseDef
+        ]);
+        added = true;
+      }
+      for (const field of Object.values(model.fields)) {
+        if (field.relation && field.relation.fields && field.relation.references) {
+          const targetModel = requireModel(this.schema, field.type);
+          graph.push([
+            model,
+            targetModel
+          ]);
+          added = true;
+        }
+      }
+      if (!added) {
+        graph.push([
+          model,
+          void 0
+        ]);
+      }
+    }
+    return (0, import_toposort.default)(graph).reverse().filter((m) => !!m);
+  }
+  createModelTable(kysely, modelDef) {
+    let table = kysely.schema.createTable(modelDef.name).ifNotExists();
     for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
+      if (fieldDef.originModel && !fieldDef.id) {
+        continue;
+      }
       if (fieldDef.relation) {
-        table = this.addForeignKeyConstraint(table, model, fieldName, fieldDef);
+        table = this.addForeignKeyConstraint(table, modelDef.name, fieldName, fieldDef);
       } else if (!this.isComputedField(fieldDef)) {
-        table = this.createModelField(table, fieldName, fieldDef, modelDef);
+        table = this.createModelField(table, fieldDef, modelDef);
       }
     }
-    table = this.addPrimaryKeyConstraint(table, model, modelDef);
-    table = this.addUniqueConstraint(table, model, modelDef);
+    if (modelDef.baseModel) {
+      const baseModelDef = requireModel(this.schema, modelDef.baseModel);
+      table = table.addForeignKeyConstraint(`fk_${modelDef.baseModel}_delegate`, baseModelDef.idFields, modelDef.baseModel, baseModelDef.idFields, (cb) => cb.onDelete("cascade").onUpdate("cascade"));
+    }
+    table = this.addPrimaryKeyConstraint(table, modelDef);
+    table = this.addUniqueConstraint(table, modelDef);
     return table;
   }
   isComputedField(fieldDef) {
     return fieldDef.attributes?.some((a) => a.name === "@computed");
   }
-  addPrimaryKeyConstraint(table, model, modelDef) {
+  addPrimaryKeyConstraint(table, modelDef) {
     if (modelDef.idFields.length === 1) {
       if (Object.values(modelDef.fields).some((f) => f.id)) {
         return table;
       }
     }
     if (modelDef.idFields.length > 0) {
-      table = table.addPrimaryKeyConstraint(`pk_${model}`, modelDef.idFields);
+      table = table.addPrimaryKeyConstraint(`pk_${modelDef.name}`, modelDef.idFields);
     }
     return table;
   }
-  addUniqueConstraint(table, model, modelDef) {
+  addUniqueConstraint(table, modelDef) {
     for (const [key, value] of Object.entries(modelDef.uniqueFields)) {
       (0, import_common_helpers11.invariant)(typeof value === "object", "expecting an object");
       if ("type" in value) {
@@ -6351,17 +6390,17 @@ var SchemaDbPusher = class {
         if (fieldDef.unique) {
           continue;
         }
-        table = table.addUniqueConstraint(`unique_${model}_${key}`, [
+        table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, [
           key
         ]);
       } else {
-        table = table.addUniqueConstraint(`unique_${model}_${key}`, Object.keys(value));
+        table = table.addUniqueConstraint(`unique_${modelDef.name}_${key}`, Object.keys(value));
       }
     }
     return table;
   }
-  createModelField(table, fieldName, fieldDef, modelDef) {
-    return table.addColumn(fieldName, this.mapFieldType(fieldDef), (col) => {
+  createModelField(table, fieldDef, modelDef) {
+    return table.addColumn(fieldDef.name, this.mapFieldType(fieldDef), (col) => {
       if (fieldDef.id && modelDef.idFields.length === 1) {
         col = col.primaryKey();
       }