@ronin/compiler 0.10.2-leo-ron-1083-experimental-214 → 0.10.3-leo-ron-1083-experimental-215

package/dist/index.js

@@ -65,6 +65,23 @@ var convertToCamelCase = (str) => {
   return sanitize(str).split(SPLIT_REGEX).map((part, index) => index === 0 ? part.toLowerCase() : capitalize(part)).join("");
 };
 var isObject = (value) => value != null && typeof value === "object" && Array.isArray(value) === false;
+var getSymbol = (value) => {
+  if (!isObject(value)) return null;
+  const objectValue = value;
+  if (RONIN_MODEL_SYMBOLS.QUERY in objectValue) {
+    return {
+      type: "query",
+      value: objectValue[RONIN_MODEL_SYMBOLS.QUERY]
+    };
+  }
+  if (RONIN_MODEL_SYMBOLS.EXPRESSION in objectValue) {
+    return {
+      type: "expression",
+      value: objectValue[RONIN_MODEL_SYMBOLS.EXPRESSION]
+    };
+  }
+  return null;
+};
 var findInObject = (obj, pattern, replacer) => {
   let found = false;
   for (const key in obj) {
@@ -85,10 +102,11 @@ var findInObject = (obj, pattern, replacer) => {
 var flatten = (obj, prefix = "", res = {}) => {
   for (const key in obj) {
     const path = prefix ? `${prefix}.${key}` : key;
-    if (typeof obj[key] === "object" && obj[key] !== null) {
-      flatten(obj[key], path, res);
+    const value = obj[key];
+    if (typeof value === "object" && value !== null && !getSymbol(value)) {
+      flatten(value, path, res);
     } else {
-      res[path] = obj[key];
+      res[path] = value;
     }
   }
   return res;
@@ -278,23 +296,6 @@ var formatIdentifiers = ({ identifiers }, queryInstructions) => {
     [type]: newNestedInstructions
   };
 };
-var getSymbol = (value) => {
-  if (!isObject(value)) return null;
-  const objectValue = value;
-  if (RONIN_MODEL_SYMBOLS.QUERY in objectValue) {
-    return {
-      type: "query",
-      value: objectValue[RONIN_MODEL_SYMBOLS.QUERY]
-    };
-  }
-  if (RONIN_MODEL_SYMBOLS.EXPRESSION in objectValue) {
-    return {
-      type: "expression",
-      value: objectValue[RONIN_MODEL_SYMBOLS.EXPRESSION]
-    };
-  }
-  return null;
-};
 
 // src/instructions/with.ts
 var getMatcher = (value, negative) => {
@@ -1183,32 +1184,44 @@ var handleOrderedBy = (model, instruction) => {
 };
 
 // src/instructions/selecting.ts
-var handleSelecting = (model, statementParams, instructions) => {
+var handleSelecting = (models, model, statementParams, instructions, options) => {
   let isJoining = false;
   let statement = instructions.selecting ? instructions.selecting.map((slug) => {
     return getFieldFromModel(model, slug, "selecting").fieldSelector;
   }).join(", ") : "*";
   if (instructions.including) {
-    const filteredObject = Object.entries(instructions.including).map(([key, value]) => {
+    const filteredObject = Object.entries(instructions.including).flatMap(([key, value]) => {
       const symbol = getSymbol(value);
-      if (symbol) {
-        if (symbol.type === "query") {
-          isJoining = true;
-          return null;
-        }
-        if (symbol.type === "expression") {
-          value = parseFieldExpression(model, "including", symbol.value);
-        }
+      if (symbol?.type === "query") {
+        isJoining = true;
+        if (!options?.expandColumns) return null;
+        const { queryModel: queryModelSlug } = splitQuery(symbol.value);
+        const queryModel = getModelBySlug(models, queryModelSlug);
+        const tableName = `including_${key}`;
+        const duplicatedFields = queryModel.fields.filter((field) => {
+          if (field.type === "group") return null;
+          return model.fields.some((modelField) => modelField.slug === field.slug);
+        }).filter((item) => item !== null);
+        return duplicatedFields.map((field) => ({
+          key: `${tableName}.${field.slug}`,
+          value: {
+            [RONIN_MODEL_SYMBOLS.EXPRESSION]: `${RONIN_MODEL_SYMBOLS.FIELD}${field.slug}`
+          }
+        }));
       }
-      return [key, value];
-    }).filter((entry) => entry !== null);
+      return { key, value };
+    }).filter((entry) => entry !== null).map((entry) => [entry.key, entry.value]);
     const newObjectEntries = Object.entries(flatten(Object.fromEntries(filteredObject)));
     if (newObjectEntries.length > 0) {
       statement += ", ";
       statement += newObjectEntries.map(([key, value]) => {
-        if (typeof value === "string" && value.startsWith('"'))
-          return `(${value}) as "${key}"`;
-        return `${prepareStatementValue(statementParams, value)} as "${key}"`;
+        const symbol = getSymbol(value);
+        if (symbol?.type === "expression") {
+          value = `(${parseFieldExpression(model, "including", symbol.value)})`;
+        } else {
+          value = prepareStatementValue(statementParams, value);
+        }
+        return `${value} as "${key}"`;
       }).join(", ");
     }
   }
@@ -1355,10 +1368,16 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
   if (instructions && Object.hasOwn(instructions, "for")) {
     instructions = handleFor(model, instructions);
   }
-  const { columns, isJoining } = handleSelecting(model, statementParams, {
-    selecting: instructions?.selecting,
-    including: instructions?.including
-  });
+  const { columns, isJoining } = handleSelecting(
+    models,
+    model,
+    statementParams,
+    {
+      selecting: instructions?.selecting,
+      including: instructions?.including
+    },
+    options
+  );
   let statement = "";
   switch (queryType) {
     case "get":
@@ -1518,7 +1537,8 @@ var Transaction = class {
       const result = compileQueryInput(
         query,
         modelListWithPresets,
-        options?.inlineParams ? null : []
+        options?.inlineParams ? null : [],
+        { expandColumns: options?.expandColumns }
       );
       dependencyStatements.push(...result.dependencies);
       mainStatements.push(result.main);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.10.2-leo-ron-1083-experimental-214",
+  "version": "0.10.3-leo-ron-1083-experimental-215",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {