s3db.js 5.0.0 → 5.1.0

package/dist/s3db.iife.js

@@ -3382,7 +3382,7 @@ ${JSON.stringify(validation, null, 2)}`, {
   var jsonStableStringifyExports = requireJsonStableStringify();
   var jsonStableStringify = /*@__PURE__*/getDefaultExportFromCjs(jsonStableStringifyExports);
 
-  async function custom(actual, errors, schema) {
+  async function secretHandler(actual, errors, schema) {
     if (!this.passphrase) {
       errors.push({ actual, type: "encryptionKeyMissing" });
       return actual;
@@ -3395,6 +3395,10 @@ ${JSON.stringify(validation, null, 2)}`, {
     }
     return actual;
   }
+  async function jsonHandler(actual, errors, schema) {
+    if (lodashEs.isString(actual)) return actual;
+    return JSON.stringify(actual);
+  }
   class Validator extends FastestValidator {
     constructor({ options, passphrase, autoEncrypt = true } = {}) {
       super(lodashEs.merge({}, {
@@ -3416,7 +3420,7 @@ ${JSON.stringify(validation, null, 2)}`, {
       this.autoEncrypt = autoEncrypt;
       this.alias("secret", {
         type: "string",
-        custom: this.autoEncrypt ? custom : void 0,
+        custom: this.autoEncrypt ? secretHandler : void 0,
         messages: {
           string: "The '{field}' field must be a string.",
           stringMin: "This secret '{field}' field length must be at least {expected} long."
@@ -3424,11 +3428,15 @@ ${JSON.stringify(validation, null, 2)}`, {
       });
       this.alias("secretAny", {
         type: "any",
-        custom: this.autoEncrypt ? custom : void 0
+        custom: this.autoEncrypt ? secretHandler : void 0
       });
       this.alias("secretNumber", {
         type: "number",
-        custom: this.autoEncrypt ? custom : void 0
+        custom: this.autoEncrypt ? secretHandler : void 0
+      });
+      this.alias("json", {
+        type: "any",
+        custom: this.autoEncrypt ? jsonHandler : void 0
       });
     }
   }
@@ -3598,24 +3606,27 @@ ${JSON.stringify(validation, null, 2)}`, {
         if (definition.includes("array")) {
           this.addHook("beforeMap", name, "fromArray");
           this.addHook("afterUnmap", name, "toArray");
-        } else {
-          if (definition.includes("secret")) {
-            if (this.options.autoEncrypt) {
-              this.addHook("beforeMap", name, "encrypt");
-            }
-            if (this.options.autoDecrypt) {
-              this.addHook("afterUnmap", name, "decrypt");
-            }
-          }
-          if (definition.includes("number")) {
-            this.addHook("beforeMap", name, "toString");
-            this.addHook("afterUnmap", name, "toNumber");
+        }
+        if (definition.includes("secret")) {
+          if (this.options.autoEncrypt) {
+            this.addHook("beforeMap", name, "encrypt");
           }
-          if (definition.includes("boolean")) {
-            this.addHook("beforeMap", name, "fromBool");
-            this.addHook("afterUnmap", name, "toBool");
+          if (this.options.autoDecrypt) {
+            this.addHook("afterUnmap", name, "decrypt");
           }
         }
+        if (definition.includes("number")) {
+          this.addHook("beforeMap", name, "toString");
+          this.addHook("afterUnmap", name, "toNumber");
+        }
+        if (definition.includes("boolean")) {
+          this.addHook("beforeMap", name, "fromBool");
+          this.addHook("afterUnmap", name, "toBool");
+        }
+        if (definition.includes("json")) {
+          this.addHook("beforeMap", name, "toJSON");
+          this.addHook("afterUnmap", name, "fromJSON");
+        }
       }
     }
     static import(data) {