@ronin/compiler 0.17.10 → 0.17.11-leo-ron-1099-experimental-401

package/dist/index.d.ts

@@ -118,7 +118,15 @@ type AddQuery = Record<string, Omit<CombinedInstructions, 'with' | 'using'> & {
 type RemoveQuery = Record<string, Omit<CombinedInstructions, 'to'>>;
 type CountQuery = Record<string, Omit<CombinedInstructions, 'to'> | null>;
 type AllQueryInstructions = {
-    for?: string;
+    /**
+     * Limit the list of models for which queries should be generated to only the models
+     * that the provided model links to.
+     */
+    for?: PublicModel['slug'];
+    /**
+     * Provide query instructions for specific models.
+     */
+    on?: Record<PublicModel['slug'], Omit<CombinedInstructions, 'to'> | null>;
 };
 type AllQuery = {
     all: AllQueryInstructions | null;

package/dist/index.js

@@ -2108,7 +2108,11 @@ var Transaction = class {
     const expandedQueries = this.#internalQueries.flatMap(({ query }, index) => {
       const { queryType, queryModel, queryInstructions } = splitQuery(query);
       if (queryModel === "all") {
-        const { for: forInstruction, ...restInstructions } = queryInstructions || {};
+        const {
+          for: forInstruction,
+          on: onInstruction,
+          ...restInstructions
+        } = queryInstructions || {};
         let modelList = modelsWithPresets.filter((model) => {
           return model.slug !== ROOT_MODEL.slug;
         });
@@ -2120,10 +2124,14 @@ var Transaction = class {
             );
           });
         }
-        this.#internalQueries[index].models = modelList;
         return modelList.map((model) => {
+          const instructions = Object.assign(
+            {},
+            restInstructions,
+            onInstruction?.[model.pluralSlug]
+          );
           const query2 = {
-            [queryType]: { [model.pluralSlug]: restInstructions }
+            [queryType]: { [model.pluralSlug]: instructions }
           };
           return { query: query2, index };
         });
@@ -2142,10 +2150,8 @@ var Transaction = class {
       const postDependencies = dependencies.map(({ after, ...rest }) => after ? rest : null).filter((item) => item != null);
       const subStatements = [...preDependencies, main, ...postDependencies];
       this.statements.push(...subStatements);
-      this.#internalQueries[index].selectedFields = selectedFields;
-      if (this.#internalQueries[index].models.length === 0) {
-        this.#internalQueries[index].models = [model];
-      }
+      this.#internalQueries[index].selectedFields.push(selectedFields);
+      this.#internalQueries[index].models.push(model);
     }
     this.models = modelsWithPresets;
     return statements;
@@ -2309,13 +2315,21 @@ var Transaction = class {
         });
         if (queryModel === "all") {
           const models = {};
-          for (const model of affectedModels) {
+          const { on: onInstruction, ...restInstructions } = queryInstructions || {};
+          for (let index = 0; index < affectedModels.length; index++) {
+            const model = affectedModels[index];
+            const fields = selectedFields[index];
+            const instructions = Object.assign(
+              {},
+              restInstructions,
+              onInstruction?.[model.pluralSlug]
+            );
             const result = this.formatIndividualResult(
               queryType,
-              queryInstructions,
+              instructions,
               model,
               absoluteResults[resultIndex++],
-              selectedFields,
+              fields,
               false
             );
             models[model.pluralSlug] = result;
@@ -2323,12 +2337,13 @@ var Transaction = class {
           finalResults.push({ models });
         } else {
           const model = affectedModels[0];
+          const fields = selectedFields[0];
           const result = this.formatIndividualResult(
             queryType,
             queryInstructions,
             model,
             absoluteResults[resultIndex++],
-            selectedFields,
+            fields,
             queryModel !== model.pluralSlug
           );
           finalResults.push(result);

package/package.json

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