@ronin/compiler 0.14.2 → 0.14.3

package/dist/index.js

@@ -403,12 +403,10 @@ 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}`;
@@ -508,15 +506,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 +757,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 +1282,8 @@ var addDefaultModelPresets = (list, model) => {
                             }
                           }
                         }
-                      }
+                      },
+                      selecting: ["**", "!source", "!target"]
                     }
                   }
                 }

package/package.json

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