@ronin/compiler 0.15.0-leo-ron-1099-1-experimental-364 → 0.15.0

package/dist/index.d.ts

@@ -391,9 +391,7 @@ type MultipleRecordResult<T = ResultRecord> = {
 type AmountResult = {
     amount: number;
 };
-type RegularResult<T = ResultRecord> = SingleRecordResult<T> | MultipleRecordResult<T> | AmountResult;
-type ExpandedResult<T = ResultRecord> = Record<Model['slug'], RegularResult<T>>;
-type Result<T = ResultRecord> = RegularResult<T> | ExpandedResult<T>;
+type Result<T = ResultRecord> = SingleRecordResult<T> | MultipleRecordResult<T> | AmountResult;
 
 interface TransactionOptions {
     /** A list of models that already exist in the database. */
@@ -409,8 +407,8 @@ declare class Transaction {
     statements: Array<Statement>;
     models: Array<Model>;
     constructor(queries: Array<Query>, options?: TransactionOptions);
-    formatResults<RecordType>(results: Array<Array<ObjectRow>>, raw?: false): Array<Result<RecordType>>;
-    formatResults<RecordType>(results: Array<Array<RawRow>>, raw?: true): Array<Result<RecordType>>;
+    formatResults<Record>(results: Array<Array<ObjectRow>>, raw?: false): Array<Result<Record>>;
+    formatResults<Record>(results: Array<Array<RawRow>>, raw?: true): Array<Result<Record>>;
 }
 
 declare const CLEAN_ROOT_MODEL: PublicModel;

package/dist/index.js

@@ -566,14 +566,8 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
 // src/instructions/using.ts
 var handleUsing = (model, instructions) => {
   const normalizedUsing = Array.isArray(instructions.using) ? Object.fromEntries(instructions.using.map((presetSlug) => [presetSlug, null])) : instructions.using;
-  if ("links" in normalizedUsing) {
-    for (const field of model.fields) {
-      if (field.type !== "link" || field.kind === "many") continue;
-      normalizedUsing[field.slug] = null;
-    }
-  }
   for (const presetSlug in normalizedUsing) {
-    if (!Object.hasOwn(normalizedUsing, presetSlug) || presetSlug === "links") continue;
+    if (!Object.hasOwn(normalizedUsing, presetSlug)) continue;
     const arg = normalizedUsing[presetSlug];
     const preset = model.presets?.find((preset2) => preset2.slug === presetSlug);
     if (!preset) {
@@ -1515,7 +1509,6 @@ var ROOT_MODEL = {
     { slug: "presets", type: "json", defaultValue: "{}" }
   ]
 };
-var ROOT_MODEL_WITH_ATTRIBUTES = addDefaultModelAttributes(ROOT_MODEL, true);
 var getSystemModels = (models, model) => {
   const addedModels = [];
   for (const field of model.fields || []) {
@@ -1997,14 +1990,14 @@ var Transaction = class {
    * @returns The composed SQL statements.
    */
   #compileQueries = (queries, models, options) => {
-    const modelsWithAttributes = models.map((model) => {
+    const modelsWithAttributes = [ROOT_MODEL, ...models].map((model) => {
       return addDefaultModelAttributes(model, true);
     });
     const modelsWithFields = [
       ...modelsWithAttributes.flatMap((model) => {
         return getSystemModels(modelsWithAttributes, model);
       }),
-      ...[ROOT_MODEL_WITH_ATTRIBUTES, ...modelsWithAttributes]
+      ...modelsWithAttributes
     ].map((model) => {
       return addDefaultModelFields(model, true);
     });
@@ -2012,19 +2005,7 @@ var Transaction = class {
       return addDefaultModelPresets(modelsWithFields, model);
     });
     const statements = [];
-    const expandedQueries = queries.flatMap((query, expansionIndex) => {
-      const { queryType, queryModel, queryInstructions } = splitQuery(query);
-      if (queryModel === "all") {
-        return modelsWithAttributes.map((model) => {
-          const query2 = {
-            [queryType]: { [model.pluralSlug]: queryInstructions }
-          };
-          return { query: query2, expansionIndex };
-        });
-      }
-      return { query };
-    });
-    for (const { query, expansionIndex } of expandedQueries) {
+    for (const query of queries) {
       const { dependencies, main, selectedFields } = compileQueryInput(
         query,
         modelsWithPresets,
@@ -2038,8 +2019,7 @@ var Transaction = class {
         ...subStatements.map((statement) => ({
           ...statement,
           query,
-          selectedFields,
-          expansionIndex
+          selectedFields
         }))
       );
     }
@@ -2139,19 +2119,10 @@ var Transaction = class {
         return Object.values(row);
       });
     });
-    return normalizedResults.reduce(
-      (finalResults, rows, index) => {
-        const { returning, query, selectedFields, expansionIndex } = this.#internalStatements[index];
-        if (!returning) return finalResults;
-        const addResult = (result2) => {
-          if (typeof expansionIndex !== "undefined") {
-            if (!finalResults[expansionIndex]) finalResults[expansionIndex] = {};
-            finalResults[expansionIndex][queryModel] = result2;
-          } else {
-            finalResults.push(result2);
-          }
-          return finalResults;
-        };
+    const formattedResults = normalizedResults.map(
+      (rows, index) => {
+        const { returning, query, selectedFields } = this.#internalStatements[index];
+        if (!returning) return null;
         const { queryType, queryModel, queryInstructions } = splitQuery(query);
         const model = getModelBySlug(this.models, queryModel);
         const isMeta = queryModel === "model" || queryModel === "models";
@@ -2159,32 +2130,32 @@ var Transaction = class {
           model.fields.map((field) => [field.slug, field.type])
         );
         if (queryType === "count") {
-          return addResult({ amount: rows[0][0] });
+          return { amount: rows[0][0] };
         }
         const single = queryModel !== model.pluralSlug;
         if (single) {
-          return addResult({
+          return {
             record: rows[0] ? this.#formatRows(selectedFields, rows, true, isMeta) : null,
             modelFields
-          });
+          };
         }
         const pageSize = queryInstructions?.limitedTo;
-        const result = {
+        const output = {
           records: this.#formatRows(selectedFields, rows, false, isMeta),
           modelFields
         };
-        if (pageSize && result.records.length > 0) {
-          if (result.records.length > pageSize) {
+        if (pageSize && output.records.length > 0) {
+          if (output.records.length > pageSize) {
             if (queryInstructions?.before) {
-              result.records.shift();
+              output.records.shift();
             } else {
-              result.records.pop();
+              output.records.pop();
             }
             const direction = queryInstructions?.before ? "moreBefore" : "moreAfter";
-            const lastRecord = result.records.at(
+            const lastRecord = output.records.at(
               direction === "moreAfter" ? -1 : 0
             );
-            result[direction] = generatePaginationCursor(
+            output[direction] = generatePaginationCursor(
               model,
               queryInstructions.orderedBy,
               lastRecord
@@ -2192,20 +2163,20 @@ var Transaction = class {
           }
           if (queryInstructions?.before || queryInstructions?.after) {
             const direction = queryInstructions?.before ? "moreAfter" : "moreBefore";
-            const firstRecord = result.records.at(
+            const firstRecord = output.records.at(
               direction === "moreAfter" ? -1 : 0
             );
-            result[direction] = generatePaginationCursor(
+            output[direction] = generatePaginationCursor(
               model,
               queryInstructions.orderedBy,
               firstRecord
             );
           }
         }
-        return addResult(result);
-      },
-      []
+        return output;
+      }
     );
+    return formattedResults.filter((result) => result !== null);
   }
 };
 var CLEAN_ROOT_MODEL = omit(ROOT_MODEL, ["system"]);

package/package.json

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