@ronin/compiler 0.18.4 → 0.18.5-json-experimental-444

package/dist/index.js

@@ -1374,7 +1374,7 @@ var composeConditions = (models, model, statementParams, instructionName, value,
       const fieldIsJSON = (modelField?.type === "json" || modelField?.type === "blob") && instructionName === "to";
       const valueIsJSON = isObject(value) || (modelField?.type === "blob" ? null : Array.isArray(value));
       if (!valueIsJSON || getQuerySymbol(value) || fieldIsJSON) {
-        if (modelField && fieldIsJSON && !valueIsJSON) {
+        if (modelField && fieldIsJSON && !valueIsJSON && value !== null) {
           const messagePrefix = "The provided field value is not";
           const message = modelField.type === "json" ? `${messagePrefix} valid JSON. Only objects and arrays should be provided. Other types of values should be stored in their respective primitive field types.` : `${messagePrefix} a valid Blob reference.`;
           throw new RoninError({
@@ -1684,7 +1684,16 @@ var getFieldStatement = (models, model, field) => {
     const symbol = getQuerySymbol(field.defaultValue);
     let value = typeof field.defaultValue === "string" ? `'${field.defaultValue}'` : field.defaultValue;
     if (symbol) value = `(${parseFieldExpression(model, "to", symbol.value)})`;
-    if (field.type === "json") value = `'${JSON.stringify(field.defaultValue)}'`;
+    if (field.type === "json") {
+      if (!isObject(field.defaultValue)) {
+        throw new RoninError({
+          message: `The default value of JSON field "${field.slug}" must be an object.`,
+          code: "INVALID_MODEL_VALUE",
+          field: "fields"
+        });
+      }
+      value = `'${JSON.stringify(field.defaultValue)}'`;
+    }
     statement += ` DEFAULT ${value}`;
   }
   if (field.type === "string" && field.collation) {
@@ -2001,7 +2010,7 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query,
         throw new RoninError({
           message: `When ${actionReadable} ${PLURAL_MODEL_ENTITIES[entity]}, at least one field must be provided.`,
           code: "INVALID_MODEL_VALUE",
-          fields: ["fields"]
+          field: PLURAL_MODEL_ENTITIES[entity]
         });
       }
       const columns = index.fields.map((field2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.18.4",
+  "version": "0.18.5-json-experimental-444",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {