@ronin/compiler 0.14.13-leo-ron-1099-1-experimental-354 → 0.14.13-leo-ron-1099-1-experimental-355

package/dist/index.d.ts

@@ -113,7 +113,7 @@ type SetQuery = Record<string, Omit<CombinedInstructions, 'to'> & {
     to: FieldSelector;
 }>;
 type AddQuery = Record<string, Omit<CombinedInstructions, 'with' | 'using'> & {
-    to: FieldSelector;
+    with: FieldSelector;
 }>;
 type RemoveQuery = Record<string, Omit<CombinedInstructions, 'to'>>;
 type CountQuery = Record<string, Omit<CombinedInstructions, 'to'> | null>;

package/dist/index.js

@@ -550,7 +550,7 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
         const query = compileQueryInput(
           {
             [subQueryType]: {
-              [associativeModelSlug]: subQueryType === "add" ? { to: recordDetails } : { with: recordDetails }
+              [associativeModelSlug]: { with: recordDetails }
             }
           },
           models,
@@ -673,10 +673,12 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     statement += `"${model.table}" `;
   }
   if (queryType === "add" || queryType === "set") {
-    if (!isObject(instructions.to) || Object.keys(instructions.to).length === 0) {
+    const instructionName = queryType === "add" ? "with" : "to";
+    const instructionValue = instructions[instructionName];
+    if (!(instructionValue && isObject(instructionValue)) || Object.keys(instructionValue).length === 0) {
       throw new RoninError({
-        message: `When using a \`${queryType}\` query, the \`to\` instruction must be a non-empty object.`,
-        code: "INVALID_TO_VALUE",
+        message: `When using a \`${queryType}\` query, the \`${instructionName}\` instruction must be a non-empty object.`,
+        code: instructionName === "to" ? "INVALID_TO_VALUE" : "INVALID_WITH_VALUE",
         queries: [query]
       });
     }
@@ -686,7 +688,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
       statementParams,
       queryType,
       dependencyStatements,
-      { with: instructions.with, to: instructions.to },
+      { with: instructions.with, to: instructionValue },
       options?.parentModel
     );
     statement += `${toStatement} `;
@@ -1719,7 +1721,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
         if (!Object.hasOwn(entities, entity2)) continue;
         Object.defineProperty(modelWithObjects, entity2, { value: entities[entity2] });
       }
-      queryTypeDetails = { to: modelWithObjects };
+      queryTypeDetails = { with: modelWithObjects };
       getSystemModels(models, modelWithPresets).map((systemModel) => {
         return handleSystemModel(models, dependencyStatements, "create", systemModel);
       });

package/package.json

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