@ronin/compiler 0.10.0 → 0.10.1-leo-ron-1083-experimental-208

package/dist/index.js

@@ -648,11 +648,15 @@ var formatModelEntity = (type, entities) => {
   });
   return entries ? Object.fromEntries(entries) : void 0;
 };
-var composeSystemModelStatement = (models, dependencyStatements, action, systemModel) => {
+var handleSystemModel = (models, dependencyStatements, action, systemModel, newModel) => {
   const { system: _, ...systemModelClean } = systemModel;
   const query = {
     [action]: { model: action === "create" ? systemModelClean : systemModelClean.slug }
   };
+  if (action === "alter" && newModel) {
+    const { system: _2, ...newModelClean } = newModel;
+    query.alter.to = newModelClean;
+  }
   const statement = compileQueryInput(query, models, []);
   dependencyStatements.push(...statement.dependencies);
 };
@@ -712,12 +716,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       }
       queryTypeDetails = { to: finalModel };
       getSystemModels(models, modelWithPresets).map((systemModel) => {
-        return composeSystemModelStatement(
-          models,
-          dependencyStatements,
-          "create",
-          systemModel
-        );
+        return handleSystemModel(models, dependencyStatements, "create", systemModel);
       });
     }
     if (action === "alter" && model) {
@@ -744,12 +743,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       dependencyStatements.push({ statement: `DROP TABLE "${model.table}"`, params: [] });
       queryTypeDetails = { with: { slug } };
       models.filter(({ system }) => system?.model === model.slug).map((systemModel) => {
-        return composeSystemModelStatement(
-          models,
-          dependencyStatements,
-          "drop",
-          systemModel
-        );
+        return handleSystemModel(models, dependencyStatements, "drop", systemModel);
       });
     }
     const queryTypeAction = action === "create" ? "add" : action === "alter" ? "set" : "remove";
@@ -759,6 +753,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       }
     };
   }
+  const modelBeforeUpdate = structuredClone(model);
   const existingModel = model;
   const pluralType = PLURAL_MODEL_ENTITIES[entity];
   const targetEntityIndex = existingModel[pluralType]?.findIndex(
@@ -773,6 +768,8 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
   const existingEntity = existingModel[pluralType]?.[targetEntityIndex];
   if (entity === "field") {
     const statement = `ALTER TABLE "${existingModel.table}"`;
+    const existingField = existingEntity;
+    const existingLinkField = existingField?.type === "link" && existingField.kind === "many";
     if (action === "create") {
       const field2 = jsonValue;
       field2.type = field2.type || "string";
@@ -785,20 +782,17 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       }
     } else if (action === "alter") {
       const newSlug = jsonValue?.slug;
-      if (newSlug) {
+      if (newSlug && !existingLinkField) {
         dependencyStatements.push({
           statement: `${statement} RENAME COLUMN "${slug}" TO "${newSlug}"`,
           params: []
         });
       }
-    } else if (action === "drop") {
-      const existingField = existingEntity;
-      if (!(existingField.type === "link" && existingField.kind === "many")) {
-        dependencyStatements.push({
-          statement: `${statement} DROP COLUMN "${slug}"`,
-          params: []
-        });
-      }
+    } else if (action === "drop" && !existingLinkField) {
+      dependencyStatements.push({
+        statement: `${statement} DROP COLUMN "${slug}"`,
+        params: []
+      });
     }
   }
   const statementAction = action.toUpperCase();
@@ -890,7 +884,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       const value = prepareStatementValue(statementParams, jsonValue);
       json = `json_set(${field}, '$.${slug}', json_patch(json_extract(${field}, '$.${slug}'), ${value}))`;
       const targetEntity = existingModel[pluralType];
-      targetEntity[targetEntityIndex] = jsonValue;
+      Object.assign(targetEntity[targetEntityIndex], jsonValue);
       break;
     }
     case "drop": {
@@ -903,15 +897,35 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
     return system?.model === existingModel.slug;
   });
   const newSystemModels = getSystemModels(models, existingModel);
+  const matchSystemModels = (oldSystemModel, newSystemModel) => {
+    const conditions = [
+      oldSystemModel.system?.model === newSystemModel.system?.model
+    ];
+    if (oldSystemModel.system?.associationSlug) {
+      const oldFieldIndex = modelBeforeUpdate?.fields.findIndex((item) => {
+        return item.slug === newSystemModel.system?.associationSlug;
+      });
+      const newFieldIndex = existingModel.fields.findIndex((item) => {
+        return item.slug === oldSystemModel.system?.associationSlug;
+      });
+      conditions.push(oldFieldIndex === newFieldIndex);
+    }
+    return conditions.every((condition) => condition === true);
+  };
   for (const systemModel of currentSystemModels) {
-    const exists = newSystemModels.find((model2) => model2.slug === systemModel.slug);
-    if (exists) continue;
-    composeSystemModelStatement(models, dependencyStatements, "drop", systemModel);
+    const exists = newSystemModels.find(matchSystemModels.bind(null, systemModel));
+    if (exists) {
+      if (exists.slug !== systemModel.slug) {
+        handleSystemModel(models, dependencyStatements, "alter", systemModel, exists);
+      }
+      continue;
+    }
+    handleSystemModel(models, dependencyStatements, "drop", systemModel);
   }
   for (const systemModel of newSystemModels) {
-    const exists = currentSystemModels.find((model2) => model2.slug === systemModel.slug);
+    const exists = currentSystemModels.find(matchSystemModels.bind(null, systemModel));
     if (exists) continue;
-    composeSystemModelStatement(models, dependencyStatements, "create", systemModel);
+    handleSystemModel(models, dependencyStatements, "create", systemModel);
   }
   return {
     set: {
@@ -1198,6 +1212,11 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   if (symbol?.type === "query") {
     let { 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 = [
@@ -1220,7 +1239,19 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
         ...subQueryInstructions.including
       };
     }
-    return compileQueryInput(symbol.value, models, statementParams).main.statement;
+    let statement2 = "";
+    if (subQuerySelectedFields) {
+      const selectedFields = [
+        ...subQueryFields,
+        ...defaultFieldsToAdd.map(([key]) => key)
+      ];
+      const columns = selectedFields.map((field) => {
+        return getFieldFromModel(model, field, "to").fieldSelector;
+      });
+      statement2 = `(${columns.join(", ")}) `;
+    }
+    statement2 += compileQueryInput(symbol.value, models, statementParams).main.statement;
+    return statement2;
   }
   Object.assign(toInstruction, defaultFields);
   for (const fieldSlug in toInstruction) {
@@ -1484,11 +1515,22 @@ var Transaction = class {
     return expand(formattedRecord);
   }
   prepareResults(results) {
-    return results.map((result, index) => {
+    const relevantResults = results.filter((_, index) => {
+      return this.statements[index].returning;
+    });
+    return relevantResults.map((result, index) => {
       const query = this.queries.at(-index);
       const { queryModel } = splitQuery(query);
       const model = getModelBySlug(this.models, queryModel);
-      return { record: this.formatRecord(model, result[0]) };
+      const single = queryModel !== model.pluralSlug;
+      if (single) {
+        return { record: this.formatRecord(model, result[0]) };
+      }
+      return {
+        records: result.map((resultItem) => {
+          return this.formatRecord(model, resultItem);
+        })
+      };
     });
   }
 };

package/package.json

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