@ronin/compiler 0.14.3-leo-ron-1099-1-experimental-322 → 0.14.3-leo-ron-1099-1-experimental-323

package/dist/index.js

@@ -23,12 +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 = (input) => {
-  return input.replace(MOUNTING_PATH_SUFFIX, (_, p, __, n) => `${p}{${n ? +n + 1 : 1}}`);
+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",
@@ -316,8 +318,11 @@ var handleIncluding = (models, model, statementParams, single, instruction, opti
     let joinType = "LEFT";
     let relatedTableSelector = `"${relatedModel.table}"`;
     const subSingle = queryModel !== relatedModel.pluralSlug;
-    const subMountingPath = ephemeralFieldSlug === "ronin_root" ? options.mountingPath ? composeMountingPath(options.mountingPath) : void 0 : `${options?.mountingPath ? `${options?.mountingPath}.` : ""}${subSingle ? ephemeralFieldSlug : `${ephemeralFieldSlug}[0]`}`;
-    const tableAlias = composeIncludedTableAlias(subMountingPath || ephemeralFieldSlug);
+    const { tableAlias, subMountingPath } = composeMountingPath(
+      subSingle,
+      ephemeralFieldSlug,
+      options.mountingPath
+    );
     if (!modifiableQueryInstructions?.with) {
       joinType = "CROSS";
       if (subSingle) {
@@ -439,8 +444,11 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
         const subSingle = queryModel !== subQueryModel.pluralSlug;
         if (!model.tableAlias)
           model.tableAlias = single && !subSingle ? `sub_${model.table}` : model.table;
-        const subMountingPath = key === "ronin_root" ? options.mountingPath ? composeMountingPath(options.mountingPath) : void 0 : `${options?.mountingPath ? `${options?.mountingPath}.` : ""}${subSingle ? key : `${key}[0]`}`;
-        const tableAlias = composeIncludedTableAlias(subMountingPath || key);
+        const { tableAlias, subMountingPath } = composeMountingPath(
+          subSingle,
+          key,
+          options.mountingPath
+        );
         const { columns: nestedColumns, selectedFields: nestedSelectedFields } = handleSelecting(
           models,
           { ...subQueryModel, tableAlias },

package/package.json

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