@ronin/compiler 0.18.3 → 0.18.4-invalid-json-experimental-443

package/dist/index.d.ts

@@ -392,7 +392,7 @@ type ExpandedResult<T = ResultRecord> = {
 };
 type Result<T = ResultRecord> = RegularResult<T> | ExpandedResult<T>;
 
-type RoninErrorCode = 'MODEL_NOT_FOUND' | 'FIELD_NOT_FOUND' | 'INDEX_NOT_FOUND' | 'TRIGGER_NOT_FOUND' | 'PRESET_NOT_FOUND' | 'INVALID_WITH_VALUE' | 'INVALID_TO_VALUE' | 'INVALID_INCLUDING_VALUE' | 'INVALID_FOR_VALUE' | 'INVALID_BEFORE_OR_AFTER_INSTRUCTION' | 'INVALID_MODEL_VALUE' | 'EXISTING_MODEL_ENTITY' | 'REQUIRED_MODEL_ENTITY' | 'MUTUALLY_EXCLUSIVE_INSTRUCTIONS' | 'MISSING_INSTRUCTION' | 'MISSING_FIELD';
+type RoninErrorCode = 'MODEL_NOT_FOUND' | 'FIELD_NOT_FOUND' | 'INDEX_NOT_FOUND' | 'TRIGGER_NOT_FOUND' | 'PRESET_NOT_FOUND' | 'INVALID_WITH_VALUE' | 'INVALID_TO_VALUE' | 'INVALID_INCLUDING_VALUE' | 'INVALID_FOR_VALUE' | 'INVALID_BEFORE_OR_AFTER_INSTRUCTION' | 'INVALID_MODEL_VALUE' | 'INVALID_FIELD_VALUE' | 'EXISTING_MODEL_ENTITY' | 'REQUIRED_MODEL_ENTITY' | 'MUTUALLY_EXCLUSIVE_INSTRUCTIONS' | 'MISSING_INSTRUCTION' | 'MISSING_FIELD';
 interface Issue {
     message: string;
     path: Array<string | number>;

package/dist/index.js

@@ -1371,8 +1371,18 @@ var composeConditions = (models, model, statementParams, instructionName, value,
         instructionName
       });
       const { field: modelField } = fieldDetails || {};
-      const consumeJSON = (modelField?.type === "json" || modelField?.type === "blob") && instructionName === "to";
-      if (modelField && !(isObject(value) || Array.isArray(value)) || getQuerySymbol(value) || consumeJSON) {
+      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 && 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({
+            message,
+            field: modelField?.slug,
+            code: "INVALID_FIELD_VALUE"
+          });
+        }
         return composeFieldValues(
           models,
           model,

package/package.json

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