@ronin/compiler 0.14.14-leo-ron-1099-1-experimental-357 → 0.14.14-leo-ron-1099-1-experimental-359

package/dist/index.js

@@ -256,55 +256,6 @@ var handleBeforeOrAfter = (model, statementParams, instructions) => {
   return `${clause}(${conditions.join(" OR ")})`;
 };
 
-// src/instructions/for.ts
-var handleUsing = (model, instructions) => {
-  const normalizedFor = Array.isArray(instructions.using) ? Object.fromEntries(instructions.using.map((presetSlug) => [presetSlug, null])) : instructions.using;
-  for (const presetSlug in normalizedFor) {
-    if (!Object.hasOwn(normalizedFor, presetSlug)) continue;
-    const arg = normalizedFor[presetSlug];
-    const preset = model.presets?.find((preset2) => preset2.slug === presetSlug);
-    if (!preset) {
-      throw new RoninError({
-        message: `Preset "${presetSlug}" does not exist in model "${model.name}".`,
-        code: "PRESET_NOT_FOUND"
-      });
-    }
-    const replacedUsingFilter = structuredClone(preset.instructions);
-    if (arg !== null) {
-      findInObject(
-        replacedUsingFilter,
-        QUERY_SYMBOLS.VALUE,
-        (match) => match.replace(QUERY_SYMBOLS.VALUE, arg)
-      );
-    }
-    for (const subInstruction in replacedUsingFilter) {
-      if (!Object.hasOwn(replacedUsingFilter, subInstruction)) continue;
-      const instructionName = subInstruction;
-      const currentValue = instructions[instructionName];
-      if (currentValue) {
-        let newValue;
-        if (Array.isArray(currentValue)) {
-          newValue = [
-            ...replacedUsingFilter[instructionName],
-            ...currentValue
-          ];
-        } else if (isObject(currentValue)) {
-          newValue = {
-            ...replacedUsingFilter[instructionName],
-            ...currentValue
-          };
-        }
-        Object.assign(instructions, { [instructionName]: newValue });
-        continue;
-      }
-      Object.assign(instructions, {
-        [instructionName]: replacedUsingFilter[instructionName]
-      });
-    }
-  }
-  return instructions;
-};
-
 // src/instructions/including.ts
 var handleIncluding = (models, model, statementParams, single, instruction, options = {}) => {
   let statement = "";
@@ -315,6 +266,7 @@ var handleIncluding = (models, model, statementParams, single, instruction, opti
     if (symbol?.type !== "query") continue;
     const { queryType, queryModel, queryInstructions } = splitQuery(symbol.value);
     let modifiableQueryInstructions = queryInstructions;
+    if (queryType === "count") continue;
     const relatedModel = getModelBySlug(models, queryModel);
     let joinType = "LEFT";
     let relatedTableSelector = `"${relatedModel.table}"`;
@@ -340,7 +292,8 @@ var handleIncluding = (models, model, statementParams, single, instruction, opti
           }
         },
         models,
-        statementParams
+        statementParams,
+        { parentModel: model }
       );
       relatedTableSelector = `(${subSelect.main.statement})`;
     }
@@ -438,8 +391,20 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     for (const [key, value] of Object.entries(flatObject)) {
       const symbol2 = getQuerySymbol(value);
       if (symbol2?.type === "query") {
-        const { queryModel, queryInstructions } = splitQuery(symbol2.value);
+        const { queryType, queryModel, queryInstructions } = splitQuery(symbol2.value);
         const subQueryModel = getModelBySlug(models, queryModel);
+        if (queryType === "count") {
+          const subSelect = compileQueryInput(symbol2.value, models, statementParams, {
+            parentModel: { ...model, tableAlias: model.table }
+          });
+          selectedFields.push({
+            slug: key,
+            mountingPath: key,
+            type: "number",
+            mountedValue: `(${subSelect.main.statement})`
+          });
+          continue;
+        }
         isJoining = true;
         const subSingle = queryModel !== subQueryModel.pluralSlug;
         if (!model.tableAlias)
@@ -598,6 +563,55 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   return statement;
 };
 
+// src/instructions/using.ts
+var handleUsing = (model, instructions) => {
+  const normalizedUsing = Array.isArray(instructions.using) ? Object.fromEntries(instructions.using.map((presetSlug) => [presetSlug, null])) : instructions.using;
+  for (const presetSlug in normalizedUsing) {
+    if (!Object.hasOwn(normalizedUsing, presetSlug)) continue;
+    const arg = normalizedUsing[presetSlug];
+    const preset = model.presets?.find((preset2) => preset2.slug === presetSlug);
+    if (!preset) {
+      throw new RoninError({
+        message: `Preset "${presetSlug}" does not exist in model "${model.name}".`,
+        code: "PRESET_NOT_FOUND"
+      });
+    }
+    const replacedUsingFilter = structuredClone(preset.instructions);
+    if (arg !== null) {
+      findInObject(
+        replacedUsingFilter,
+        QUERY_SYMBOLS.VALUE,
+        (match) => match.replace(QUERY_SYMBOLS.VALUE, arg)
+      );
+    }
+    for (const subInstruction in replacedUsingFilter) {
+      if (!Object.hasOwn(replacedUsingFilter, subInstruction)) continue;
+      const instructionName = subInstruction;
+      const currentValue = instructions[instructionName];
+      if (currentValue) {
+        let newValue;
+        if (Array.isArray(currentValue)) {
+          newValue = [
+            ...replacedUsingFilter[instructionName],
+            ...currentValue
+          ];
+        } else if (isObject(currentValue)) {
+          newValue = {
+            ...replacedUsingFilter[instructionName],
+            ...currentValue
+          };
+        }
+        Object.assign(instructions, { [instructionName]: newValue });
+        continue;
+      }
+      Object.assign(instructions, {
+        [instructionName]: replacedUsingFilter[instructionName]
+      });
+    }
+  }
+  return instructions;
+};
+
 // src/utils/index.ts
 var compileQueryInput = (defaultQuery, models, statementParams, options) => {
   const dependencyStatements = [];

package/package.json

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