seroval-plugins 1.3.2 → 1.4.0

package/web/form-data.ts

@@ -6,7 +6,6 @@ type FormDataInit = [key: string, value: FormDataEntryValue][];
 
 function convertFormData(instance: FormData): FormDataInit {
   const items: FormDataInit = [];
-  // biome-ignore lint/complexity/noForEach: <explanation>
   instance.forEach((value, key) => {
     items.push([key, value]);
   });
@@ -15,6 +14,20 @@ function convertFormData(instance: FormData): FormDataInit {
 
 const FORM_DATA_FACTORY = {};
 
+const FORM_DATA_FACTORY_CONSTRUCTOR = (
+  e: [key: string, value: FormDataEntryValue][],
+  f = new FormData(),
+  i = 0,
+  s = e.length,
+  t?: [key: string, value: FormDataEntryValue],
+) => {
+  for (; i < s; i++) {
+    t = e[i];
+    f.append(t[0], t[1]);
+  }
+  return f;
+};
+
 const FormDataFactoryPlugin = /* @__PURE__ */ createPlugin<object, undefined>({
   tag: 'seroval-plugins/web/FormDataFactory',
   test(value) {
@@ -31,11 +44,8 @@ const FormDataFactoryPlugin = /* @__PURE__ */ createPlugin<object, undefined>({
       return undefined;
     },
   },
-  serialize(_node, ctx) {
-    return ctx.createEffectfulFunction(
-      ['e', 'f', 'i', 's', 't'],
-      'f=new FormData;for(i=0,s=e.length;i<s;i++)f.append((t=e[i])[0],t[1]);return f',
-    );
+  serialize() {
+    return FORM_DATA_FACTORY_CONSTRUCTOR.toString();
   },
   deserialize() {
     return FORM_DATA_FACTORY;
@@ -86,13 +96,9 @@ const FormDataPlugin = /* @__PURE__ */ createPlugin<FormData, FormDataNode>({
     );
   },
   deserialize(node, ctx) {
-    const instance = new FormData();
-    const entries = ctx.deserialize(node.entries) as FormDataInit;
-    for (let i = 0, len = entries.length; i < len; i++) {
-      const entry = entries[i];
-      instance.append(entry[0], entry[1]);
-    }
-    return instance;
+    return FORM_DATA_FACTORY_CONSTRUCTOR(
+      ctx.deserialize(node.entries) as FormDataInit,
+    );
   },
 });
 

package/web/image-data.ts

@@ -63,7 +63,7 @@ const ImageDataPlugin = /* @__PURE__ */ createPlugin<ImageData, ImageDataNode>({
   },
   deserialize(node, ctx) {
     return new ImageData(
-      ctx.deserialize(node.data) as Uint8ClampedArray,
+      ctx.deserialize(node.data) as Uint8ClampedArray<ArrayBuffer>,
       ctx.deserialize(node.width) as number,
       ctx.deserialize(node.height) as number,
       ctx.deserialize(node.options) as ImageDataSettings,

package/web/readable-stream.ts

@@ -3,6 +3,30 @@ import { createPlugin, createStream } from 'seroval';
 
 const READABLE_STREAM_FACTORY = {};
 
+const READABLE_STREAM_FACTORY_CONSTRUCTOR = (stream: Stream<unknown>) => new ReadableStream({
+  start: (controller) => {
+    stream.on({
+      next: (value) => {
+        try {
+          controller.enqueue(value)
+        } catch (_error) {
+          // no-op
+        }
+      },
+      throw: (value) => {
+        controller.error(value);
+      },
+      return: () => {
+        try {
+          controller.close();
+        } catch (_error) {
+          // no-op
+        }
+      },
+    })
+  },
+});
+
 const ReadableStreamFactoryPlugin = /* @__PURE__ */ createPlugin<
   object,
   undefined
@@ -22,22 +46,8 @@ const ReadableStreamFactoryPlugin = /* @__PURE__ */ createPlugin<
       return undefined;
     },
   },
-  serialize(_node, ctx) {
-    return ctx.createFunction(
-      ['d'],
-      'new ReadableStream({start:' +
-        ctx.createEffectfulFunction(
-          ['c'],
-          'd.on({next:' +
-            ctx.createEffectfulFunction(['v'], 'c.enqueue(v)') +
-            ',throw:' +
-            ctx.createEffectfulFunction(['v'], 'c.error(v)') +
-            ',return:' +
-            ctx.createEffectfulFunction([], 'c.close()') +
-            '})',
-        ) +
-        '})',
-    );
+  serialize() {
+    return READABLE_STREAM_FACTORY_CONSTRUCTOR.toString();
   },
   deserialize() {
     return READABLE_STREAM_FACTORY;
@@ -118,21 +128,7 @@ const ReadableStreamPlugin = /* @__PURE__ */ createPlugin<
   },
   deserialize(node, ctx) {
     const stream = ctx.deserialize(node.stream) as Stream<any>;
-    return new ReadableStream({
-      start(controller): void {
-        stream.on({
-          next(value) {
-            controller.enqueue(value);
-          },
-          throw(value) {
-            controller.error(value);
-          },
-          return() {
-            controller.close();
-          },
-        });
-      },
-    });
+    return READABLE_STREAM_FACTORY_CONSTRUCTOR(stream);
   },
 });
 

package/web/request.ts

@@ -43,7 +43,9 @@ const RequestPlugin = /* @__PURE__ */ createPlugin<Request, RequestNode>({
         options: await ctx.parse(
           createRequestOptions(
             value,
-            value.body ? await value.clone().arrayBuffer() : null,
+            value.body && !value.bodyUsed
+              ? await value.clone().arrayBuffer()
+              : null,
           ),
         ),
       };
@@ -51,7 +53,12 @@ const RequestPlugin = /* @__PURE__ */ createPlugin<Request, RequestNode>({
     stream(value, ctx) {
       return {
         url: ctx.parse(value.url),
-        options: ctx.parse(createRequestOptions(value, value.clone().body)),
+        options: ctx.parse(
+          createRequestOptions(
+            value,
+            value.body && !value.bodyUsed ? value.clone().body : null,
+          ),
+        ),
       };
     },
   },

package/web/response.ts

@@ -29,14 +29,18 @@ const ResponsePlugin = /* @__PURE__ */ createPlugin<Response, ResponseNode>({
     async async(value, ctx) {
       return {
         body: await ctx.parse(
-          value.body ? await value.clone().arrayBuffer() : null,
+          value.body && !value.bodyUsed
+            ? await value.clone().arrayBuffer()
+            : null,
         ),
         options: await ctx.parse(createResponseOptions(value)),
       };
     },
     stream(value, ctx) {
       return {
-        body: ctx.parse(value.clone().body),
+        body: ctx.parse(
+          value.body && !value.bodyUsed ? value.clone().body : null,
+        ),
         options: ctx.parse(createResponseOptions(value)),
       };
     },