@ronin/compiler 0.17.4 → 0.17.5-corny-ron-1099-experimental-388

package/dist/index.d.ts

@@ -307,7 +307,7 @@ type ModelTrigger<T extends ModelEntityList<ModelField> = ModelEntityList<ModelF
     /** When the trigger should fire in the case that a matching query is executed. */
     when: 'BEFORE' | 'DURING' | 'AFTER';
     /** A list of queries that should be executed when the trigger fires. */
-    effects: Array<Query>;
+    effects: Array<Record<typeof QUERY_SYMBOLS.QUERY, Query>>;
     /** A list of field slugs for which the trigger should fire. */
     fields?: Array<ModelTriggerField<T>>;
     /**

package/dist/index.js

@@ -1856,7 +1856,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
       }
     };
   }
-  const modelBeforeUpdate = structuredClone(model);
+  const modelBeforeUpdate = structuredClone(JSON.parse(JSON.stringify(model)));
   const existingModel = model;
   const pluralType = PLURAL_MODEL_ENTITIES[entity];
   const existingEntity = existingModel[pluralType]?.[slug];
@@ -1987,7 +1987,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
         statementParts.push("WHEN", `(${withStatement})`);
       }
       const effectStatements = trigger.effects.map((effectQuery) => {
-        return compileQueryInput(effectQuery, models, null, {
+        return compileQueryInput(effectQuery[QUERY_SYMBOLS.QUERY], models, null, {
           returning: false,
           parentModel: existingModel,
           inlineDefaults: options.inlineDefaults
@@ -2004,10 +2004,11 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
   let json;
   switch (action) {
     case "create": {
-      const value = prepareStatementValue(statementParams, jsonValue);
-      json = `json_insert(${field}, '$.${slug}', ${value})`;
+      const { slug: slug2, ...entityValue } = jsonValue;
+      const value = prepareStatementValue(statementParams, entityValue);
+      json = `json_insert(${field}, '$.${slug2}', ${value})`;
       if (!existingModel[pluralType]) existingModel[pluralType] = {};
-      existingModel[pluralType][slug] = jsonValue;
+      existingModel[pluralType][slug2] = jsonValue;
       break;
     }
     case "alter": {
@@ -2019,8 +2020,9 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
           newSlug,
           Object.getOwnPropertyDescriptor(targetEntities, slug)
         );
+        Object.assign(targetEntities[newSlug], entityValue);
         delete targetEntities[slug];
-        const value = prepareStatementValue(statementParams, entityValue);
+        const value = prepareStatementValue(statementParams, targetEntities[newSlug]);
         json = `json_insert(json_remove(${field}, '$.${slug}'), '$.${newSlug}', ${value})`;
       } else {
         Object.assign(targetEntities[slug], jsonValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.17.4",
+  "version": "0.17.5-corny-ron-1099-experimental-388",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {