@ronin/compiler 0.14.6-corny-ron-1099-experimental-333 → 0.14.6-leo-ron-1099-1-experimental-336

package/dist/index.d.ts

@@ -199,7 +199,7 @@ type ModelFieldBasics = {
      * The value that should be inserted into the field in the case that no value was
      * explicitly provided for it when a record is created.
      */
-    defaultValue?: Expression | unknown | (() => string);
+    defaultValue?: Expression | unknown;
     /**
      * An expression that should be evaluated to form the value of the field. The
      * expression can either be VIRTUAL (evaluated whenever a record is read) or STORED
@@ -207,10 +207,10 @@ type ModelFieldBasics = {
      */
     computedAs?: {
         kind: 'VIRTUAL' | 'STORED';
-        value: ((fields: Record<string, string>) => string) | string | Expression;
+        value: Expression;
     };
     /** An expression that gets evaluated every time a value is provided for the field. */
-    check?: Expression | ((fields: Record<string, string>) => string);
+    check?: Expression;
 };
 type ModelField = ModelFieldBasics & ({
     /** The kind of value that should be stored inside the field. */

package/dist/index.js

@@ -557,10 +557,10 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
       delete toInstruction[fieldSlug];
       const associativeModelSlug = composeAssociationModelSlug(model, fieldDetails.field);
       const composeStatement = (subQueryType, value) => {
-        const source = queryType === "add" ? { id: toInstruction.id } : withInstruction;
+        const source = queryType === "add" ? toInstruction : withInstruction;
         const recordDetails = { source };
         if (value) recordDetails.target = value;
-        return compileQueryInput(
+        const query = compileQueryInput(
           {
             [subQueryType]: {
               [associativeModelSlug]: subQueryType === "add" ? { to: recordDetails } : { with: recordDetails }
@@ -570,19 +570,24 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
           [],
           { returning: false }
         ).main;
+        const details = { ...query };
+        if (queryType === "add" && subQueryType === "add") {
+          details.after = true;
+        }
+        dependencyStatements.push(details);
       };
       if (Array.isArray(fieldValue)) {
-        dependencyStatements.push(composeStatement("remove"));
+        if (queryType === "set") composeStatement("remove");
         for (const record of fieldValue) {
-          dependencyStatements.push(composeStatement("add", record));
+          composeStatement("add", record);
         }
       } else if (isObject(fieldValue)) {
         const value = fieldValue;
         for (const recordToAdd of value.containing || []) {
-          dependencyStatements.push(composeStatement("add", recordToAdd));
+          composeStatement("add", recordToAdd);
         }
         for (const recordToRemove of value.notContaining || []) {
-          dependencyStatements.push(composeStatement("remove", recordToRemove));
+          composeStatement("remove", recordToRemove);
         }
       }
     }
@@ -1984,19 +1989,21 @@ var Transaction = class {
     });
     const statements = [];
     for (const query of queries) {
-      const result = compileQueryInput(
+      const { dependencies, main, selectedFields } = compileQueryInput(
         query,
         modelsWithPresets,
         options?.inlineParams ? null : [],
         { expandColumns: options?.expandColumns }
       );
-      const subStatements = [...result.dependencies, result.main];
+      const preDependencies = dependencies.filter(({ after }) => !after);
+      const postDependencies = dependencies.map(({ after, ...rest }) => after ? rest : null).filter((item) => item != null);
+      const subStatements = [...preDependencies, main, ...postDependencies];
       this.statements.push(...subStatements);
       this.#internalStatements.push(
         ...subStatements.map((statement) => ({
           ...statement,
           query,
-          selectedFields: result.selectedFields
+          selectedFields
         }))
       );
     }

package/package.json

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