@ronin/compiler 0.14.3 → 0.14.4

package/dist/index.js

@@ -23,8 +23,14 @@ var RAW_FIELD_TYPES = ["string", "number", "boolean"];
 var CURRENT_TIME_EXPRESSION = {
   [QUERY_SYMBOLS.EXPRESSION]: `strftime('%Y-%m-%dT%H:%M:%f', 'now') || 'Z'`
 };
-var composeIncludedTableAlias = (fieldSlug) => {
-  return `including_${fieldSlug}`;
+var MOUNTING_PATH_SUFFIX = /(.*?)(\{(\d+)\})?$/;
+var composeMountingPath = (single, key, mountingPath) => {
+  const subMountingPath = key === "ronin_root" ? mountingPath ? mountingPath.replace(
+    MOUNTING_PATH_SUFFIX,
+    (_, p, __, n) => `${p}{${n ? +n + 1 : 1}}`
+  ) : void 0 : `${mountingPath ? `${mountingPath}.` : ""}${single ? key : `${key}[0]`}`;
+  const tableAlias = `including_${subMountingPath || key}`;
+  return { subMountingPath, tableAlias };
 };
 var MODEL_ENTITY_ERROR_CODES = {
   field: "FIELD_NOT_FOUND",
@@ -299,7 +305,7 @@ var handleFor = (model, instructions) => {
 };
 
 // src/instructions/including.ts
-var handleIncluding = (models, model, statementParams, single, instruction) => {
+var handleIncluding = (models, model, statementParams, single, instruction, options = {}) => {
   let statement = "";
   let tableSubQuery;
   for (const ephemeralFieldSlug in instruction) {
@@ -311,8 +317,12 @@ var handleIncluding = (models, model, statementParams, single, instruction) => {
     const relatedModel = getModelBySlug(models, queryModel);
     let joinType = "LEFT";
     let relatedTableSelector = `"${relatedModel.table}"`;
-    const tableAlias = composeIncludedTableAlias(ephemeralFieldSlug);
     const subSingle = queryModel !== relatedModel.pluralSlug;
+    const { tableAlias, subMountingPath } = composeMountingPath(
+      subSingle,
+      ephemeralFieldSlug,
+      options.mountingPath
+    );
     if (!modifiableQueryInstructions?.with) {
       joinType = "CROSS";
       if (subSingle) {
@@ -332,7 +342,7 @@ var handleIncluding = (models, model, statementParams, single, instruction) => {
       );
       relatedTableSelector = `(${subSelect.main.statement})`;
     }
-    statement += `${joinType} JOIN ${relatedTableSelector} as ${tableAlias}`;
+    statement += `${joinType} JOIN ${relatedTableSelector} as "${tableAlias}"`;
     model.tableAlias = model.tableAlias || model.table;
     if (joinType === "LEFT") {
       const subStatement = composeConditions(
@@ -356,7 +366,8 @@ var handleIncluding = (models, model, statementParams, single, instruction) => {
         { ...relatedModel, tableAlias },
         statementParams,
         subSingle,
-        modifiableQueryInstructions.including
+        modifiableQueryInstructions.including,
+        { mountingPath: subMountingPath }
       );
       statement += ` ${subIncluding.statement}`;
     }
@@ -409,7 +420,7 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
   ).filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => {
     const newField = { ...field, mountingPath: field.slug };
     if (options.mountingPath) {
-      newField.mountingPath = `${options.mountingPath}.${field.slug}`;
+      newField.mountingPath = `${options.mountingPath.replace(/\{\d+\}/g, "")}.${field.slug}`;
     }
     return newField;
   });
@@ -430,11 +441,14 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
         const subQueryModel = getModelBySlug(models, queryModel);
         isJoining = true;
         if (queryInstructions?.selecting) options.expandColumns = true;
-        const tableAlias = composeIncludedTableAlias(key);
         const subSingle = queryModel !== subQueryModel.pluralSlug;
         if (!model.tableAlias)
           model.tableAlias = single && !subSingle ? `sub_${model.table}` : model.table;
-        const subMountingPath = key === "ronin_root" ? options.mountingPath : `${options?.mountingPath ? `${options?.mountingPath}.` : ""}${subSingle ? key : `${key}[0]`}`;
+        const { tableAlias, subMountingPath } = composeMountingPath(
+          subSingle,
+          key,
+          options.mountingPath
+        );
         const { columns: nestedColumns, selectedFields: nestedSelectedFields } = handleSelecting(
           models,
           { ...subQueryModel, tableAlias },
@@ -1993,7 +2007,7 @@ var Transaction = class {
     const records = [];
     for (const row of rows) {
       const record = fields.reduce((acc, field, fieldIndex) => {
-        const newSlug = field.mountingPath;
+        let newSlug = field.mountingPath;
         let newValue = row[fieldIndex];
         if (field.type === "json") {
           newValue = JSON.parse(newValue);
@@ -2005,6 +2019,29 @@ var Transaction = class {
             return { slug, ...attributes };
           }) : [];
         }
+        const { parentField, parentIsArray } = (() => {
+          const lastDotIndex = newSlug.lastIndexOf(".");
+          if (lastDotIndex === -1) return { parentField: null };
+          const parent = newSlug.slice(0, lastDotIndex);
+          if (parent.endsWith("[0]")) {
+            return { parentField: parent.slice(0, -3), parentIsArray: true };
+          }
+          return { parentField: parent };
+        })();
+        if (parentField) {
+          if (field.slug === "id" && newValue === null) {
+            newSlug = parentField;
+            newValue = parentIsArray ? [] : null;
+          }
+          const parentFields = newSlug.split(".").map((_, index, array) => array.slice(0, index + 1).join(".")).reverse();
+          if (parentFields.some((item) => {
+            const isArray = item.endsWith("[0]");
+            const value = getProperty(acc, item.replaceAll("[0]", ""));
+            return isArray ? Array.isArray(value) && value.length === 0 : value === null;
+          })) {
+            return acc;
+          }
+        }
         setProperty(acc, newSlug, newValue);
         return acc;
       }, {});
@@ -2022,7 +2059,18 @@ var Transaction = class {
       for (const arrayField of joinFields.values()) {
         const currentValue = existingRecord[arrayField];
         const newValue = record[arrayField];
-        currentValue.push(...newValue);
+        for (const newRecord of newValue) {
+          if ("id" in newRecord) {
+            const existingIndex = currentValue.findIndex((value) => {
+              return value.id === newRecord.id;
+            });
+            if (existingIndex > -1) {
+              Object.assign(currentValue[existingIndex], newRecord);
+              continue;
+            }
+          }
+          currentValue.push(newRecord);
+        }
       }
     }
     return single ? records[0] : records;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {