@ronin/compiler 0.12.3 → 0.12.4-leo-ron-1071-experimental-255

package/dist/index.d.ts

@@ -15671,8 +15671,8 @@ declare class Transaction {
      */
     private compileQueries;
     private formatRows;
-    formatResults(results: Array<Array<RawRow>>, raw?: true): Array<Result>;
-    formatResults(results: Array<Array<ObjectRow>>, raw?: false): Array<Result>;
+    formatResults<Record>(results: Array<Array<RawRow>>, raw?: true): Array<Result<Record>>;
+    formatResults<Record>(results: Array<Array<ObjectRow>>, raw?: false): Array<Result<Record>>;
 }
 
 declare const CLEAN_ROOT_MODEL: PublicModel;

package/dist/index.js

@@ -435,7 +435,7 @@ var pluralize = (word) => {
   }
   return `${word}s`;
 };
-var modelSettings = [
+var modelAttributes = [
   ["pluralSlug", "slug", pluralize],
   ["name", "slug", slugToName],
   ["pluralName", "pluralSlug", slugToName],
@@ -444,7 +444,7 @@ var modelSettings = [
 ];
 var addDefaultModelFields = (model, isNew) => {
   const copiedModel = { ...model };
-  for (const [setting, base, generator] of modelSettings) {
+  for (const [setting, base, generator] of modelAttributes) {
     if (copiedModel[setting] || !copiedModel[base]) continue;
     copiedModel[setting] = generator(copiedModel[base]);
   }
@@ -732,23 +732,30 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
         [...models, modelWithFields],
         modelWithFields
       );
+      modelWithPresets.fields = modelWithPresets.fields.map((field2) => ({
+        ...field2,
+        // Default field type.
+        type: field2.type || "string",
+        // Default field name.
+        name: field2.name || slugToName(field2.slug)
+      }));
+      const columns = modelWithPresets.fields.map((field2) => getFieldStatement(models, modelWithPresets, field2)).filter(Boolean);
       const entities = Object.fromEntries(
         Object.entries(PLURAL_MODEL_ENTITIES).map(([type, pluralType2]) => {
           const list = modelWithPresets[pluralType2];
           return [pluralType2, formatModelEntity(type, list)];
         })
       );
-      const columns = modelWithPresets.fields.map((field2) => getFieldStatement(models, modelWithPresets, field2)).filter(Boolean);
       dependencyStatements.push({
         statement: `CREATE TABLE "${modelWithPresets.table}" (${columns.join(", ")})`,
         params: []
       });
       models.push(modelWithPresets);
-      const finalModel = Object.assign({}, modelWithPresets);
+      const modelWithObjects = Object.assign({}, modelWithPresets);
       for (const entity2 in entities) {
-        if (entities[entity2]) finalModel[entity2] = entities[entity2];
+        if (entities[entity2]) modelWithObjects[entity2] = entities[entity2];
       }
-      queryTypeDetails = { to: finalModel };
+      queryTypeDetails = { to: modelWithObjects };
       getSystemModels(models, modelWithPresets).map((systemModel) => {
         return handleSystemModel(models, dependencyStatements, "create", systemModel);
       });
@@ -809,6 +816,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
     if (action === "create") {
       const field2 = jsonValue;
       field2.type = field2.type || "string";
+      field2.name = field2.name || slugToName(field2.slug);
       const fieldStatement = getFieldStatement(models, existingModel, field2);
       if (fieldStatement) {
         dependencyStatements.push({
@@ -817,12 +825,16 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
         });
       }
     } else if (action === "alter") {
-      const newSlug = jsonValue?.slug;
-      if (newSlug && !existingLinkField) {
-        dependencyStatements.push({
-          statement: `${statement} RENAME COLUMN "${slug}" TO "${newSlug}"`,
-          params: []
-        });
+      const field2 = jsonValue;
+      const newSlug = field2.slug;
+      if (newSlug) {
+        field2.name = field2.name || slugToName(field2.slug);
+        if (!existingLinkField) {
+          dependencyStatements.push({
+            statement: `${statement} RENAME COLUMN "${slug}" TO "${newSlug}"`,
+            params: []
+          });
+        }
       }
     } else if (action === "drop" && !existingLinkField) {
       dependencyStatements.push({
@@ -1642,7 +1654,11 @@ var Transaction = class {
             usableRowIndex = 0;
           }
         }
-        records[usableRowIndex] = setProperty(records[usableRowIndex], newSlug, newValue);
+        records[usableRowIndex] = setProperty(
+          records[usableRowIndex],
+          newSlug,
+          newValue
+        );
       }
     }
     return single ? records[0] : records;
@@ -1667,60 +1683,66 @@ var Transaction = class {
         return Object.values(row);
       });
     });
-    const formattedResults = normalizedResults.map((rows, index) => {
-      const { returning, query, fields: rawModelFields } = this.internalStatements[index];
-      if (!returning) return null;
-      const { queryType, queryModel, queryInstructions } = splitQuery(query);
-      const model = getModelBySlug(this.models, queryModel);
-      const modelFields = Object.fromEntries(
-        model.fields.map((field) => [field.slug, field.type])
-      );
-      if (queryType === "count") {
-        return { amount: rows[0][0] };
-      }
-      const single = queryModel !== model.pluralSlug;
-      if (single) {
-        return {
-          record: rows[0] ? this.formatRows(rawModelFields, rows, single) : null,
+    const formattedResults = normalizedResults.map(
+      (rows, index) => {
+        const {
+          returning,
+          query,
+          fields: rawModelFields
+        } = this.internalStatements[index];
+        if (!returning) return null;
+        const { queryType, queryModel, queryInstructions } = splitQuery(query);
+        const model = getModelBySlug(this.models, queryModel);
+        const modelFields = Object.fromEntries(
+          model.fields.map((field) => [field.slug, field.type])
+        );
+        if (queryType === "count") {
+          return { amount: rows[0][0] };
+        }
+        const single = queryModel !== model.pluralSlug;
+        if (single) {
+          return {
+            record: rows[0] ? this.formatRows(rawModelFields, rows, single) : null,
+            modelFields
+          };
+        }
+        const pageSize = queryInstructions?.limitedTo;
+        const output = {
+          records: this.formatRows(rawModelFields, rows, single),
           modelFields
         };
-      }
-      const pageSize = queryInstructions?.limitedTo;
-      const output = {
-        records: this.formatRows(rawModelFields, rows, single),
-        modelFields
-      };
-      if (pageSize && output.records.length > 0) {
-        if (output.records.length > pageSize) {
-          if (queryInstructions?.before) {
-            output.records.shift();
-          } else {
-            output.records.pop();
+        if (pageSize && output.records.length > 0) {
+          if (output.records.length > pageSize) {
+            if (queryInstructions?.before) {
+              output.records.shift();
+            } else {
+              output.records.pop();
+            }
+            const direction = queryInstructions?.before ? "moreBefore" : "moreAfter";
+            const lastRecord = output.records.at(
+              direction === "moreAfter" ? -1 : 0
+            );
+            output[direction] = generatePaginationCursor(
+              model,
+              queryInstructions.orderedBy,
+              lastRecord
+            );
+          }
+          if (queryInstructions?.before || queryInstructions?.after) {
+            const direction = queryInstructions?.before ? "moreAfter" : "moreBefore";
+            const firstRecord = output.records.at(
+              direction === "moreAfter" ? -1 : 0
+            );
+            output[direction] = generatePaginationCursor(
+              model,
+              queryInstructions.orderedBy,
+              firstRecord
+            );
           }
-          const direction = queryInstructions?.before ? "moreBefore" : "moreAfter";
-          const lastRecord = output.records.at(
-            direction === "moreAfter" ? -1 : 0
-          );
-          output[direction] = generatePaginationCursor(
-            model,
-            queryInstructions.orderedBy,
-            lastRecord
-          );
-        }
-        if (queryInstructions?.before || queryInstructions?.after) {
-          const direction = queryInstructions?.before ? "moreAfter" : "moreBefore";
-          const firstRecord = output.records.at(
-            direction === "moreAfter" ? -1 : 0
-          );
-          output[direction] = generatePaginationCursor(
-            model,
-            queryInstructions.orderedBy,
-            firstRecord
-          );
         }
+        return output;
       }
-      return output;
-    });
+    );
     return formattedResults.filter((result) => result !== null);
   }
 };

package/package.json

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