s3db.js 5.0.0 → 5.2.0

package/dist/s3db.cjs.js

@@ -3392,7 +3392,7 @@ function requireJsonStableStringify () {
 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;
@@ -3405,6 +3405,10 @@ async function custom(actual, errors, schema) {
   }
   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({}, {
@@ -3426,7 +3430,7 @@ class Validator extends FastestValidator {
     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."
@@ -3434,11 +3438,15 @@ class Validator extends FastestValidator {
     });
     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
     });
   }
 }
@@ -3608,24 +3616,27 @@ class Schema {
       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) {