@ronin/compiler 0.8.6 → 0.8.8

package/dist/index.js

@@ -633,6 +633,13 @@ var PLURAL_MODEL_ENTITIES = {
   trigger: "triggers",
   preset: "presets"
 };
+var formatModelEntity = (type, entities) => {
+  const entries = entities?.map((entity) => {
+    const { slug, ...rest } = "slug" in entity ? entity : { slug: `${type}Slug`, ...entity };
+    return [slug, rest];
+  });
+  return entries ? Object.fromEntries(entries) : void 0;
+};
 var transformMetaQuery = (models, dependencyStatements, statementParams, query) => {
   const { queryType } = splitQuery(query);
   const subAltering = query.alter && !("to" in query.alter);
@@ -671,14 +678,23 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       const newModel = jsonValue;
       const modelWithFields = addDefaultModelFields(newModel, true);
       const modelWithPresets = addDefaultModelPresets(models, modelWithFields);
-      const { fields } = modelWithPresets;
-      const columns = fields.map((field) => getFieldStatement(models, modelWithPresets, field)).filter(Boolean);
+      const entities = Object.fromEntries(
+        Object.entries(PLURAL_MODEL_ENTITIES).map(([type, pluralType2]) => {
+          const list = modelWithPresets[pluralType2];
+          return [pluralType2, formatModelEntity(type, list)];
+        })
+      );
+      const columns = modelWithPresets.fields.map((field2) => getFieldStatement(models, modelWithPresets, field2)).filter(Boolean);
       dependencyStatements.push({
         statement: `${statement} (${columns.join(", ")})`,
         params: []
       });
       models.push(modelWithPresets);
-      queryTypeDetails = { to: modelWithPresets };
+      const finalModel = Object.assign({}, modelWithPresets);
+      for (const entity2 in entities) {
+        if (entities[entity2]) finalModel[entity2] = entities[entity2];
+      }
+      queryTypeDetails = { to: finalModel };
     }
     if (action === "alter" && model) {
       const newModel = jsonValue;
@@ -714,10 +730,10 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
   }
   if (entity === "field" && model) {
     if (action === "create") {
-      const field = jsonValue;
-      field.type = field.type || "string";
+      const field2 = jsonValue;
+      field2.type = field2.type || "string";
       dependencyStatements.push({
-        statement: `${statement} ADD COLUMN ${getFieldStatement(models, model, field)}`,
+        statement: `${statement} ADD COLUMN ${getFieldStatement(models, model, field2)}`,
         params: []
       });
     } else if (action === "alter") {
@@ -741,15 +757,15 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
     const params = [];
     let statement2 = `${tableAction}${index?.unique ? " UNIQUE" : ""} INDEX "${indexName}"`;
     if (action === "create") {
-      const columns = index.fields.map((field) => {
+      const columns = index.fields.map((field2) => {
         let fieldSelector = "";
-        if ("slug" in field) {
-          ({ fieldSelector } = getFieldFromModel(model, field.slug, "to"));
-        } else if ("expression" in field) {
-          fieldSelector = parseFieldExpression(model, "to", field.expression);
+        if ("slug" in field2) {
+          ({ fieldSelector } = getFieldFromModel(model, field2.slug, "to"));
+        } else if ("expression" in field2) {
+          fieldSelector = parseFieldExpression(model, "to", field2.expression);
         }
-        if (field.collation) fieldSelector += ` COLLATE ${field.collation}`;
-        if (field.order) fieldSelector += ` ${field.order}`;
+        if (field2.collation) fieldSelector += ` COLLATE ${field2.collation}`;
+        if (field2.order) fieldSelector += ` ${field2.order}`;
         return fieldSelector;
       });
       statement2 += ` ON "${tableName}" (${columns.join(", ")})`;
@@ -775,8 +791,8 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
             fields: ["action"]
           });
         }
-        const fieldSelectors = trigger.fields.map((field) => {
-          return getFieldFromModel(model, field.slug, "to").fieldSelector;
+        const fieldSelectors = trigger.fields.map((field2) => {
+          return getFieldFromModel(model, field2.slug, "to").fieldSelector;
         });
         statementParts.push(`OF (${fieldSelectors.join(", ")})`);
       }
@@ -808,10 +824,23 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
     dependencyStatements.push({ statement: statement2, params });
   }
   const pluralType = PLURAL_MODEL_ENTITIES[entity];
-  const jsonAction = action === "create" ? "insert" : action === "alter" ? "patch" : "remove";
-  let json = `json_${jsonAction}(${RONIN_MODEL_SYMBOLS.FIELD}${pluralType}, '$.${slug}'`;
-  if (jsonValue) json += `, ${prepareStatementValue(statementParams, jsonValue)}`;
-  json += ")";
+  const field = `${RONIN_MODEL_SYMBOLS.FIELD}${pluralType}`;
+  let json;
+  switch (action) {
+    case "create": {
+      const value = prepareStatementValue(statementParams, jsonValue);
+      json = `json_insert(${field}, '$.${slug}', ${value})`;
+      break;
+    }
+    case "alter": {
+      const value = prepareStatementValue(statementParams, jsonValue);
+      json = `json_set(${field}, '$.${slug}', json_patch(json_extract(${field}, '$.${slug}'), ${value}))`;
+      break;
+    }
+    case "drop": {
+      json = `json_remove(${field}, '$.${slug}')`;
+    }
+  }
   return {
     set: {
       model: {

package/package.json

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