@ronin/compiler 0.13.1 → 0.13.2-leo-ron-1071-experimental-293

package/dist/index.js

@@ -676,7 +676,12 @@ var RONIN_MODEL_FIELD_REGEX = new RegExp(
   "g"
 );
 var RAW_FIELD_TYPES = ["string", "number", "boolean"];
-var composeIncludedTableAlias = (fieldSlug) => `including_${fieldSlug}`;
+var CURRENT_TIME_EXPRESSION = {
+  [QUERY_SYMBOLS.EXPRESSION]: `strftime('%Y-%m-%dT%H:%M:%f', 'now') || 'Z'`
+};
+var composeIncludedTableAlias = (fieldSlug) => {
+  return `including_${fieldSlug}`;
+};
 var MODEL_ENTITY_ERROR_CODES = {
   field: "FIELD_NOT_FOUND",
   index: "INDEX_NOT_FOUND",
@@ -742,6 +747,7 @@ var getSymbol = (value) => {
 var findInObject = (obj, pattern, replacer) => {
   let found = false;
   for (const key in obj) {
+    if (!Object.hasOwn(obj, key)) continue;
     const value = obj[key];
     if (isObject(value)) {
       found = findInObject(value, pattern, replacer);
@@ -758,6 +764,7 @@ var findInObject = (obj, pattern, replacer) => {
 };
 var flatten = (obj, prefix = "", res = {}) => {
   for (const key in obj) {
+    if (!Object.hasOwn(obj, key)) continue;
     const path = prefix ? `${prefix}.${key}` : key;
     const value = obj[key];
     if (typeof value === "object" && value !== null && !getSymbol(value)) {
@@ -771,19 +778,6 @@ var flatten = (obj, prefix = "", res = {}) => {
 var omit = (obj, properties) => Object.fromEntries(
   Object.entries(obj).filter(([key]) => !properties.includes(key))
 );
-var expand = (obj) => {
-  return Object.entries(obj).reduce((res, [key, val]) => {
-    key.split(".").reduce((acc, part, i, arr) => {
-      if (i === arr.length - 1) {
-        acc[part] = val;
-      } else {
-        acc[part] = typeof acc[part] === "object" && acc[part] !== null ? acc[part] : {};
-      }
-      return acc[part];
-    }, res);
-    return res;
-  }, {});
-};
 var getProperty = (obj, path) => {
   return path.split(".").reduce((acc, key) => acc?.[key], obj);
 };
@@ -814,10 +808,14 @@ var splitQuery = (query) => {
 };
 
 // src/utils/statement.ts
+var replaceJSON = (key, value) => {
+  if (key === QUERY_SYMBOLS.EXPRESSION) return value.replaceAll(`'`, `''`);
+  return value;
+};
 var prepareStatementValue = (statementParams, value) => {
   if (value === null) return "NULL";
   if (!statementParams) {
-    const valueString = typeof value === "object" ? `json('${JSON.stringify(value)}')` : `'${value.toString()}'`;
+    const valueString = typeof value === "object" ? `json('${JSON.stringify(value, replaceJSON)}')` : `'${value.toString()}'`;
     return valueString;
   }
   let formattedValue = value;
@@ -1329,7 +1327,8 @@ var SYSTEM_FIELDS = [
   {
     name: "RONIN - Created At",
     type: "date",
-    slug: "ronin.createdAt"
+    slug: "ronin.createdAt",
+    defaultValue: CURRENT_TIME_EXPRESSION
   },
   {
     name: "RONIN - Created By",
@@ -1339,7 +1338,8 @@ var SYSTEM_FIELDS = [
   {
     name: "RONIN - Updated At",
     type: "date",
-    slug: "ronin.updatedAt"
+    slug: "ronin.updatedAt",
+    defaultValue: CURRENT_TIME_EXPRESSION
   },
   {
     name: "RONIN - Updated By",
@@ -1489,8 +1489,12 @@ var getFieldStatement = (models, model, field) => {
   if (field.slug === "id") statement += " PRIMARY KEY";
   if (field.unique === true) statement += " UNIQUE";
   if (field.required === true) statement += " NOT NULL";
-  if (typeof field.defaultValue !== "undefined")
-    statement += ` DEFAULT ${typeof field.defaultValue === "string" ? `'${field.defaultValue}'` : field.defaultValue}`;
+  if (typeof field.defaultValue !== "undefined") {
+    const symbol = getSymbol(field.defaultValue);
+    let value = typeof field.defaultValue === "string" ? `'${field.defaultValue}'` : field.defaultValue;
+    if (symbol) value = `(${parseFieldExpression(model, "to", symbol.value)})`;
+    statement += ` DEFAULT ${value}`;
+  }
   if (field.collation) statement += ` COLLATE ${field.collation}`;
   if (field.increment === true) statement += " AUTOINCREMENT";
   if (typeof field.check !== "undefined") {
@@ -1509,6 +1513,7 @@ var getFieldStatement = (models, model, field) => {
     const targetTable = getModelBySlug(modelList, field.target).table;
     statement += ` REFERENCES ${targetTable}("id")`;
     for (const trigger in actions) {
+      if (!Object.hasOwn(actions, trigger)) continue;
       const triggerName = trigger.toUpperCase().slice(2);
       const action = actions[trigger];
       statement += ` ON ${triggerName} ${action}`;
@@ -1601,7 +1606,8 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       models.push(modelWithPresets);
       const modelWithObjects = Object.assign({}, modelWithPresets);
       for (const entity2 in entities) {
-        if (entities[entity2]) modelWithObjects[entity2] = entities[entity2];
+        if (!Object.hasOwn(entities, entity2)) continue;
+        Object.defineProperty(modelWithObjects, entity2, { value: entities[entity2] });
       }
       queryTypeDetails = { to: modelWithObjects };
       getSystemModels(models, modelWithPresets).map((systemModel) => {
@@ -1695,7 +1701,6 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
   if (entity === "index") {
     const index = jsonValue;
     const indexName = convertToSnakeCase(slug);
-    const params = [];
     let statement = `${statementAction}${index?.unique ? " UNIQUE" : ""} INDEX "${indexName}"`;
     if (action === "create") {
       const columns = index.fields.map((field2) => {
@@ -1711,15 +1716,14 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       });
       statement += ` ON "${existingModel.table}" (${columns.join(", ")})`;
       if (index.filter) {
-        const withStatement = handleWith(models, existingModel, params, index.filter);
+        const withStatement = handleWith(models, existingModel, null, index.filter);
         statement += ` WHERE (${withStatement})`;
       }
     }
-    dependencyStatements.push({ statement, params });
+    dependencyStatements.push({ statement, params: [] });
   }
   if (entity === "trigger") {
     const triggerName = convertToSnakeCase(slug);
-    const params = [];
     let statement = `${statementAction} TRIGGER "${triggerName}"`;
     if (action === "create") {
       const trigger = jsonValue;
@@ -1746,13 +1750,13 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
         const withStatement = handleWith(
           models,
           { ...existingModel, tableAlias },
-          params,
+          null,
           trigger.filter
         );
         statementParts.push("WHEN", `(${withStatement})`);
       }
       const effectStatements = trigger.effects.map((effectQuery) => {
-        return compileQueryInput(effectQuery, models, params, {
+        return compileQueryInput(effectQuery, models, null, {
           returning: false,
           parentModel: existingModel
         }).main.statement;
@@ -1762,7 +1766,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
       statementParts.push("END");
       statement += ` ${statementParts.join(" ")}`;
     }
-    dependencyStatements.push({ statement, params });
+    dependencyStatements.push({ statement, params: [] });
   }
   const field = `${QUERY_SYMBOLS.FIELD}${pluralType}`;
   let json;
@@ -1935,6 +1939,7 @@ var handleBeforeOrAfter = (model, statementParams, instructions) => {
 var handleFor = (model, instructions) => {
   const normalizedFor = Array.isArray(instructions.for) ? Object.fromEntries(instructions.for.map((presetSlug) => [presetSlug, null])) : instructions.for;
   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) {
@@ -1952,6 +1957,7 @@ var handleFor = (model, instructions) => {
       );
     }
     for (const subInstruction in replacedForFilter) {
+      if (!Object.hasOwn(replacedForFilter, subInstruction)) continue;
       const instructionName = subInstruction;
       const currentValue = instructions[instructionName];
       if (currentValue) {
@@ -1983,6 +1989,7 @@ var handleIncluding = (models, model, statementParams, instruction) => {
   let statement = "";
   let tableSubQuery;
   for (const ephemeralFieldSlug in instruction) {
+    if (!Object.hasOwn(instruction, ephemeralFieldSlug)) continue;
     const symbol = getSymbol(instruction[ephemeralFieldSlug]);
     if (symbol?.type !== "query") continue;
     const { queryType, queryModel, queryInstructions } = splitQuery(symbol.value);
@@ -2155,23 +2162,22 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
 
 // src/instructions/to.ts
 var handleTo = (models, model, statementParams, queryType, dependencyStatements, instructions, parentModel) => {
-  const currentTime = (/* @__PURE__ */ new Date()).toISOString();
   const { with: withInstruction, to: toInstruction } = instructions;
   const defaultFields = {};
   if (queryType === "add") {
     defaultFields.id = toInstruction.id || generateRecordId(model.idPrefix);
   }
-  defaultFields.ronin = {
-    // If records are being created, set their creation time.
-    ...queryType === "add" ? { createdAt: currentTime } : {},
-    // If records are being created or updated, set their update time.
-    updatedAt: currentTime,
-    // Allow for overwriting the default values provided above.
-    ...toInstruction.ronin
-  };
+  if (queryType === "set" || toInstruction.ronin) {
+    defaultFields.ronin = {
+      // If records are being updated, bump their update time.
+      ...queryType === "set" ? { updatedAt: CURRENT_TIME_EXPRESSION } : {},
+      // Allow for overwriting the default values provided above.
+      ...toInstruction.ronin
+    };
+  }
   const symbol = getSymbol(toInstruction);
   if (symbol?.type === "query") {
-    let { queryModel: subQueryModelSlug, queryInstructions: subQueryInstructions } = splitQuery(symbol.value);
+    const { queryModel: subQueryModelSlug, queryInstructions: subQueryInstructions } = splitQuery(symbol.value);
     const subQueryModel = getModelBySlug(models, subQueryModelSlug);
     if (subQueryInstructions?.selecting) {
       const currentFields = new Set(subQueryInstructions.selecting);
@@ -2189,24 +2195,9 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
     for (const field of subQueryFields || []) {
       getFieldFromModel(model, field, "to");
     }
-    const defaultFieldsToAdd = subQuerySelectedFields ? Object.entries(flatten(defaultFields)).filter(([key]) => {
-      return !subQuerySelectedFields.includes(key);
-    }) : [];
-    if (defaultFieldsToAdd.length > 0) {
-      const defaultFieldsObject = expand(Object.fromEntries(defaultFieldsToAdd));
-      if (!subQueryInstructions) subQueryInstructions = {};
-      subQueryInstructions.including = {
-        ...defaultFieldsObject,
-        ...subQueryInstructions.including
-      };
-    }
     let statement2 = "";
     if (subQuerySelectedFields) {
-      const selectedFields = [
-        ...subQueryFields,
-        ...defaultFieldsToAdd.map(([key]) => key)
-      ];
-      const columns = selectedFields.map((field) => {
+      const columns = subQueryFields.map((field) => {
         return getFieldFromModel(model, field, "to").fieldSelector;
       });
       statement2 = `(${columns.join(", ")}) `;
@@ -2216,6 +2207,7 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   }
   Object.assign(toInstruction, defaultFields);
   for (const fieldSlug in toInstruction) {
+    if (!Object.hasOwn(toInstruction, fieldSlug)) continue;
     const fieldValue = toInstruction[fieldSlug];
     const fieldDetails = getFieldFromModel(model, fieldSlug, "to", false);
     if (fieldDetails?.field.type === "link" && fieldDetails.field.kind === "many") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.13.1",
+  "version": "0.13.2-leo-ron-1071-experimental-293",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "lint": "bun run --bun lint:tsc && bun run --bun lint:biome",
-    "lint:biome": "biome check",
+    "lint:biome": "biome check --error-on-warnings",
     "lint:tsc": "tsc --pretty",
     "format": "biome check --write && biome format --write",
     "test": "bun test",