@ronin/compiler 0.17.11 → 0.17.12-leo-ron-1113-experimental-402

package/dist/index.d.ts

@@ -150,23 +150,23 @@ type AlterQuery = {
     model: string;
     to?: Partial<Omit<PublicModel, 'fields' | 'indexes' | 'triggers' | 'presets' | 'idPrefix'>>;
     create?: {
-        field?: ModelField;
-        index?: ModelIndex;
-        trigger?: ModelTrigger;
-        preset?: ModelPreset;
+        field?: Omit<ModelField, 'system'>;
+        index?: Omit<ModelIndex, 'system'>;
+        trigger?: Omit<ModelTrigger, 'system'>;
+        preset?: Omit<ModelPreset, 'system'>;
     };
     alter?: {
         field?: string;
-        to?: Partial<ModelField>;
+        to?: Partial<Omit<ModelField, 'system'>>;
     } | {
         index?: string;
-        to?: Partial<ModelIndex>;
+        to?: Partial<Omit<ModelIndex, 'system'>>;
     } | {
         trigger?: string;
-        to?: Partial<ModelTrigger>;
+        to?: Omit<ModelTrigger, 'system'>;
     } | {
         preset?: string;
-        to?: Partial<ModelPreset>;
+        to?: Omit<ModelPreset, 'system'>;
     };
     drop?: Partial<Record<ModelEntityEnum, string>>;
 };
@@ -227,6 +227,8 @@ type ModelFieldBasics = {
     };
     /** An expression that gets evaluated every time a value is provided for the field. */
     check?: Expression;
+    /** Whether the field was automatically added by RONIN. */
+    system?: boolean;
 };
 type ModelField = ModelFieldBasics & ({
     /** The kind of value that should be stored inside the field. */
@@ -340,10 +342,14 @@ type ModelTrigger<T extends ModelEntityList<ModelField> = ModelEntityList<ModelF
     filter?: WithInstruction;
 };
 type ModelPreset = {
+    /** The visual display name of the preset. */
+    name?: string;
     /** The identifier that can be used for adding the preset to a query. */
     slug: string;
     /** The query instructions that should be applied when the preset is used. */
     instructions: GetInstructions;
+    /** Whether the preset was automatically added by RONIN. */
+    system?: boolean;
 };
 type ModelEntityList<T extends {
     slug: string;

package/dist/index.js

@@ -764,7 +764,9 @@ var addDefaultModelPresets = (list, model) => {
                 }
               }
             }
-          }
+          },
+          name: slugToName(fieldSlug),
+          system: true
         };
         defaultPresets[fieldSlug] = preset2;
         continue;
@@ -788,7 +790,9 @@ var addDefaultModelPresets = (list, model) => {
               }
             }
           }
-        }
+        },
+        name: slugToName(fieldSlug),
+        system: true
       };
       defaultPresets[fieldSlug] = preset;
     }
@@ -823,7 +827,9 @@ var addDefaultModelPresets = (list, model) => {
             }
           }
         }
-      }
+      },
+      name: slugToName(presetSlug),
+      system: true
     };
     defaultPresets[presetSlug] = preset;
   }
@@ -1511,25 +1517,30 @@ var getSystemFields = (idPrefix) => ({
       // cannot rely on the `idPrefix` column here. Instead, we need to inject it
       // directly into the expression as a static string.
       [QUERY_SYMBOLS.EXPRESSION]: `'${idPrefix}_' || lower(substr(hex(randomblob(12)), 1, 16))`
-    }
+    },
+    system: true
   },
   "ronin.createdAt": {
     name: "RONIN - Created At",
     type: "date",
-    defaultValue: CURRENT_TIME_EXPRESSION
+    defaultValue: CURRENT_TIME_EXPRESSION,
+    system: true
   },
   "ronin.createdBy": {
     name: "RONIN - Created By",
-    type: "string"
+    type: "string",
+    system: true
   },
   "ronin.updatedAt": {
     name: "RONIN - Updated At",
     type: "date",
-    defaultValue: CURRENT_TIME_EXPRESSION
+    defaultValue: CURRENT_TIME_EXPRESSION,
+    system: true
   },
   "ronin.updatedBy": {
     name: "RONIN - Updated By",
-    type: "string"
+    type: "string",
+    system: true
   }
 });
 var ROOT_MODEL = {
@@ -2124,7 +2135,6 @@ var Transaction = class {
             );
           });
         }
-        this.#internalQueries[index].models = modelList;
         return modelList.map((model) => {
           const instructions = Object.assign(
             {},
@@ -2151,10 +2161,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;
@@ -2319,7 +2327,9 @@ var Transaction = class {
         if (queryModel === "all") {
           const models = {};
           const { on: onInstruction, ...restInstructions } = queryInstructions || {};
-          for (const model of affectedModels) {
+          for (let index = 0; index < affectedModels.length; index++) {
+            const model = affectedModels[index];
+            const fields = selectedFields[index];
             const instructions = Object.assign(
               {},
               restInstructions,
@@ -2330,7 +2340,7 @@ var Transaction = class {
               instructions,
               model,
               absoluteResults[resultIndex++],
-              selectedFields,
+              fields,
               false
             );
             models[model.pluralSlug] = result;
@@ -2338,12 +2348,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.11",
+  "version": "0.17.12-leo-ron-1113-experimental-402",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {