s3db.js 3.2.0 → 3.2.2

package/dist/s3db.cjs.js

@@ -746,7 +746,7 @@ class NoSuchBucket extends BaseError {
 }
 class NoSuchKey extends BaseError {
   constructor({ bucket, key, ...rest }) {
-    super({ ...rest, bucket, message: `Key does not exists [bucket:${bucket}/${key}]` });
+    super({ ...rest, bucket, message: `Key [${key}] does not exists [bucket:${bucket}/${key}]` });
     this.key = key;
   }
 }
@@ -1185,11 +1185,19 @@ class Client extends EventEmitter {
 }
 
 async function dynamicCrypto() {
-  if (lodashEs.isObject(process)) {
-    return (await Promise.resolve().then(function () { return _polyfillNode_crypto; })).webcrypto;
-  } else {
-    return window.crypto;
+  let lib;
+  if (process) {
+    try {
+      const { webcrypto } = await Promise.resolve().then(function () { return _polyfillNode_crypto; });
+      lib = webcrypto;
+    } catch (error) {
+      throw new Error("Crypto API not available");
+    }
+  } else if (window) {
+    lib = window.crypto;
   }
+  if (!lib) throw new Error("Could not load any crypto library");
+  return lib;
 }
 async function sha256(message) {
   const cryptoLib = await dynamicCrypto();
@@ -1336,9 +1344,9 @@ const SchemaActions = {
   toString: (value) => String(value),
   fromArray: (value, { separator }) => (value || []).join(separator),
   toArray: (value, { separator }) => (value || "").split(separator),
-  toNumber: (value) => lodashEs.isString(value) ? value.includes(".") ? parseFloat(value) : parseInt(value) : value,
   toJSON: (value) => JSON.stringify(value),
-  fromJSON: (value) => JSON.parse(value)
+  fromJSON: (value) => JSON.parse(value),
+  toNumber: (value) => lodashEs.isString(value) ? value.includes(".") ? parseFloat(value) : parseInt(value) : value
 };
 class Schema {
   constructor(args) {
@@ -1407,8 +1415,8 @@ class Schema {
           this.addHook("afterUnmap", name, "toNumber");
         }
         if (definition.includes("boolean")) {
-          this.addHook("beforeMap", name, "toJson");
-          this.addHook("afterUnmap", name, "fromJson");
+          this.addHook("beforeMap", name, "toJSON");
+          this.addHook("afterUnmap", name, "fromJSON");
         }
       }
     }