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

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}`;
     }
@@ -403,15 +414,13 @@ var handleOrderedBy = (model, instruction) => {
 // src/instructions/selecting.ts
 var handleSelecting = (models, model, statementParams, single, instructions, options = {}) => {
   let isJoining = false;
-  const selectedFields = (instructions.selecting ? instructions.selecting.map((slug) => {
-    const { field } = getFieldFromModel(model, slug, {
-      instructionName: "selecting"
-    });
-    return field;
-  }) : model.fields).filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => {
+  const selectedFields = filterSelectedFields(
+    model,
+    instructions.selecting
+  ).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;
   });
@@ -432,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 },
@@ -508,15 +520,12 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   if (symbol?.type === "query") {
     const { queryModel: subQueryModelSlug, queryInstructions: subQueryInstructions } = splitQuery(symbol.value);
     const subQueryModel = getModelBySlug(models, subQueryModelSlug);
-    if (subQueryInstructions?.selecting) {
-      const currentFields = new Set(subQueryInstructions.selecting);
-      currentFields.add("id");
-      subQueryInstructions.selecting = Array.from(currentFields);
-    }
     const subQuerySelectedFields = subQueryInstructions?.selecting;
     const subQueryIncludedFields = subQueryInstructions?.including;
     const subQueryFields = [
-      ...subQuerySelectedFields || (subQueryModel.fields || []).map((field) => field.slug),
+      ...filterSelectedFields(subQueryModel, subQuerySelectedFields).map(
+        (field) => field.slug
+      ),
       ...subQueryIncludedFields ? Object.keys(
         flatten(subQueryIncludedFields || {})
       ) : []
@@ -762,6 +771,32 @@ var replaceJSON = (key, value) => {
   if (key === QUERY_SYMBOLS.EXPRESSION) return value.replaceAll(`'`, `''`);
   return value;
 };
+var matchSelectedFields = (fields, pattern) => {
+  let regexStr = pattern.replace(/\./g, "\\.");
+  regexStr = regexStr.replace(/\*\*/g, "<<DOUBLESTAR>>");
+  regexStr = regexStr.replace(/\*/g, "[^.]*");
+  regexStr = regexStr.replace(/<<DOUBLESTAR>>/g, ".*");
+  const regex2 = new RegExp(`^${regexStr}$`);
+  return fields.filter((field) => regex2.test(field.slug));
+};
+var filterSelectedFields = (model, instruction) => {
+  if (!instruction) return model.fields;
+  let selectedFields = [];
+  for (const pattern of instruction) {
+    const isNegative = pattern.startsWith("!");
+    const cleanPattern = isNegative ? pattern.slice(1) : pattern;
+    const matchedFields = matchSelectedFields(
+      isNegative ? selectedFields : model.fields,
+      cleanPattern
+    );
+    if (isNegative) {
+      selectedFields = selectedFields.filter((field) => !matchedFields.includes(field));
+    } else {
+      selectedFields.push(...matchedFields);
+    }
+  }
+  return selectedFields;
+};
 var prepareStatementValue = (statementParams, value) => {
   if (value === null) return "NULL";
   if (!statementParams) {
@@ -1261,7 +1296,8 @@ var addDefaultModelPresets = (list, model) => {
                             }
                           }
                         }
-                      }
+                      },
+                      selecting: ["**", "!source", "!target"]
                     }
                   }
                 }
@@ -2000,7 +2036,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.2",
+  "version": "0.14.3-leo-ron-1099-1-experimental-323",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {