@ronin/compiler 0.14.11 → 0.14.12-leo-ron-1099-1-experimental-351

package/dist/index.js

@@ -714,7 +714,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
       instructions.orderedBy.descending.push("ronin.createdAt");
     }
   }
-  if (instructions && (Object.hasOwn(instructions, "before") || Object.hasOwn(instructions, "after"))) {
+  if (instructions && (typeof instructions.before !== "undefined" || typeof instructions.after !== "undefined")) {
     if (single) {
       throw new RoninError({
         message: "The `before` and `after` instructions are not supported when querying for a single record.",
@@ -988,15 +988,16 @@ var WITH_CONDITIONS = {
   lessOrEqual: (value) => ["<=", value]
 };
 var handleWith = (models, model, statementParams, instruction, parentModel) => {
-  const subStatement = composeConditions(
+  return composeConditions(
     models,
     model,
     statementParams,
     "with",
     instruction,
-    { parentModel }
+    {
+      parentModel
+    }
   );
-  return `(${subStatement})`;
 };
 
 // node_modules/title/dist/esm/lower-case.js
@@ -1246,9 +1247,12 @@ var addDefaultModelAttributes = (model, isNew) => {
 };
 var addDefaultModelFields = (model, isNew) => {
   const copiedModel = { ...model };
-  const newFields = copiedModel.fields || [];
-  if (isNew || newFields.length > 0) {
-    copiedModel.fields = [...getSystemFields(copiedModel.idPrefix), ...newFields];
+  const existingFields = copiedModel.fields || [];
+  if (isNew || existingFields.length > 0) {
+    const additionalFields = getSystemFields(copiedModel.idPrefix).filter((newField) => {
+      return !existingFields.some(({ slug }) => slug === newField.slug);
+    });
+    copiedModel.fields = [...additionalFields, ...existingFields];
   }
   return copiedModel;
 };
@@ -1360,8 +1364,12 @@ var addDefaultModelPresets = (list, model) => {
       slug: presetSlug
     });
   }
-  if (Object.keys(defaultPresets).length > 0) {
-    model.presets = [...defaultPresets, ...model.presets || []];
+  if (defaultPresets.length > 0) {
+    const existingPresets = model.presets || [];
+    const additionalPresets = defaultPresets.filter((newPreset) => {
+      return !existingPresets.some(({ slug }) => slug === newPreset.slug);
+    });
+    model.presets = [...additionalPresets, ...existingPresets];
   }
   return model;
 };

package/package.json

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