@es-joy/jsoe 0.8.1 → 0.9.0

package/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES TO `@es-joy/jsoe`
 
+## 0.9.0
+
+- feat: add `blob` type
+
 ## 0.8.1
 
 - feat: fix bug with `file` in array/object context not triggering file

package/README.md

@@ -27,6 +27,7 @@ Supported types include:
 - Array reference (for cyclic arrays)
 - Array
 - `BigInt`
+- `Blob`
 - `Boolean` object
 - `Date`
 - `Error`
@@ -103,14 +104,14 @@ Supported supertypes include:
                     1. bigint64arrayconstructor
                     1. biguint64arrayconstructor
             1. Web/API types
-                1. blob (besides HTML, including SVG), filelist
+                1. filelist
                 1. imagedata, imagebitmap
             1. Our own custom derivative types (e.g., MIDI using TypedArray)
 1. Expand subtypes
     1. String
         1. As supported by Zod, JSON Schema, etc. (e.g., email addresses as
             subtype of `string`, color as a subtype of string)
-    1. `File`
+    1. `File`/`Blob`
         1. Drawing image for `image/png`, etc. `File`'s
         1. Drawing SVG program for `application/svg` `File`
         1. JS/CSS/HTML/XML/Markdown/JSON/CSV/text text editor (including

package/demo/index.js

@@ -337,12 +337,15 @@ setTimeout(async function () {
           new File(['abc'], 'someName', {
             lastModified: 1231231230,
             type: 'text/plain'
+          }),
+          new Blob(['abc'], {
+            type: 'text/plain'
           })
         ],
         typeNamespace: 'demo-type-choices-only-initial-value'
       });
 
-      const typeSelectionBlob = typeChoices({
+      const typeSelectionBlobHTML = typeChoices({
         format: 'structuredCloning',
         setValue: true,
         value: new Blob(['<b>Testing</b>'], {type: 'text/html'}),
@@ -399,14 +402,24 @@ setTimeout(async function () {
         typeNamespace: 'demo-type-choices-only-initial-value'
       });
 
+      const typeSelectionBlob = typeChoices({
+        format: 'structuredCloning',
+        setValue: true,
+        value: new Blob(['abc'], {
+          type: 'text/plain'
+        }),
+        typeNamespace: 'demo-type-choices-only-initial-value'
+      });
+
       return ['form', [
         ...typeSelection.domArray,
-        ...typeSelectionBlob.domArray,
+        ...typeSelectionBlobHTML.domArray,
         ...typeSelectionErrorWithCause.domArray,
         ...typeSelectionIndexedDBKey.domArray,
         ...typeSelectionTypeErrorWithCause.domArray,
         ...typeSelectionTypeErrorWithAggregate.domArray,
-        ...typeSelectionFile.domArray
+        ...typeSelectionFile.domArray,
+        ...typeSelectionBlob.domArray
       ]];
     })(),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es-joy/jsoe",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "main": "./src/index.js",

package/src/formats/structuredCloning.js

@@ -337,15 +337,7 @@ const canonicalToAvailableType = (format, state, valType, v) => {
       valType = newValType;
     }
   }
-  if (allowableTypes.some((allowableType) => {
-    if (allowableType === valType) {
-      ret = allowableType;
-      return true;
-    }
-    return false;
-  })) {
-    return /** @type {import('../types.js').AvailableType} */ (ret);
-  }
+
   // console.log('ret', ret);
   allowableTypes.some((allowableType) => {
     // eslint-disable-next-line @stylistic/max-len -- Long
@@ -364,6 +356,11 @@ const canonicalToAvailableType = (format, state, valType, v) => {
       ret = allowableType;
       return true;
     }
+    if (allowableType === valType) {
+      ret = allowableType;
+      return true;
+    }
+
     return false;
   });
   // console.log('ret2', ret);
@@ -457,12 +454,13 @@ const structuredCloning = {
       'StringObject',
       'error',
       'errors',
-      'blobHTML',
+      'blobHTML', // Must come before `blob`
+      'blob',
       'file',
       'set',
       'map'
       // Ok, but will need some work
-      //     'blob', 'filelist',
+      //     'filelist',
       //     'arraybuffer',
       //     'dataview', 'imagedata', 'imagebitmap',
       /*