chore: ...

Signed-off-by: Okiki <okikio.dev@gmail.com>
okikio · Apr 25, 2024 · 99c1b27 · 99c1b27
1 parent e294453
commit 99c1b27
Show file tree

Hide file tree

Showing 13 changed files with 160 additions and 58 deletions.
diff --git a/.npmignore b/.npmignore
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Okiki Ojo
+Copyright (c) 2024 Okiki Ojo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/benchmark/browsers.spec.ts b/benchmark/browsers.spec.ts
@@ -1,6 +1,6 @@
 import type { ConsoleMessage } from '@playwright/test';
 import { test, expect } from '@playwright/test';
-import { WriteFile } from './_fs.ts';
+import { WriteFile } from './utils/_fs.ts';
 
 const consoleLog = async (msg: ConsoleMessage) => {
   const values: any[] = [];

diff --git a/benchmark/fixtures/postMessageMessageChannel.ts b/benchmark/fixtures/postMessageMessageChannel.ts
@@ -31,7 +31,7 @@ export default async function (e: MouseEvent): Promise<string> {
     transferable: data_.transferable.length,
   })  
 
-  const counter = new Map<string, number>();
+  let counter = 0;
   for (let index = 0; index <= Math.log2(MAX_SIZE); index++) {
     const num = Math.pow(2, index);
     const name = bytes(num, { maximumFractionDigits: 3 });
@@ -42,19 +42,15 @@ export default async function (e: MouseEvent): Promise<string> {
         let channel = new MessageChannel();
 
         const instanceKey = `#${index} ${name} -> ${variant}`;
-        counter.set(instanceKey, counter.get(instanceKey) ?? 0);
-        console.log(`${counter.get(instanceKey) ?? 0} - ${instanceKey}`);
+        console.log(`${counter++} - ${instanceKey}`);
 
         bench(
           variant,
           async () => {
-            const prevCount = counter.get(instanceKey) ?? 0;
-
             data = GenerateStub(num, IsClonable);
             await AsyncPostMessagePromise?.(channel.port1, {
-              name, index: prevCount, variant, data: data!
+              name, index: counter, variant, data: data!
             });
-            counter.set(instanceKey, prevCount + 1);
           },
           {
             warmup: true,

diff --git a/benchmark/fixtures/postMessageWorker.ts b/benchmark/fixtures/postMessageWorker.ts
@@ -34,7 +34,7 @@ export default async function (e: MouseEvent): Promise<string> {
     transferable: data_.transferable.length,
   })
 
-  const counter = new Map<string, number>();
+  let counter = 0;
   for (let index = 0; index <= Math.log2(MAX_SIZE) / 5; index += 3) {
     const num = Math.pow(2, index);
     const name = bytes(num, { maximumFractionDigits: 3 });
@@ -45,19 +45,15 @@ export default async function (e: MouseEvent): Promise<string> {
         let worker: Worker | null = null;
 
         const instanceKey = `#${index} ${name} -> ${variant}`;
-        counter.set(instanceKey, counter.get(instanceKey) ?? 0);
-        console.log(`${counter.get(instanceKey) ?? 0} - ${instanceKey}`);
+        console.log(`${counter++} - ${instanceKey}`);
 
         bench(
           variant,
           async () => {
-            const prevCount = counter.get(instanceKey) ?? 0;
-
             data = GenerateStub(num, IsClonable);
             await AsyncPostMessagePromise?.(worker!, {
-              name, index: prevCount, variant, data: data!
+              name, index: counter, variant, data: data!
             });
-            counter.set(instanceKey, prevCount + 1);
           },
           {
             warmup: true,

diff --git a/benchmark/fixtures/structuredClone.ts b/benchmark/fixtures/structuredClone.ts
@@ -5,7 +5,7 @@ import { getTransferable, getTransferables, hasTransferables } from "../../src/m
 
 import { CreateStructuredCloneVariants } from "../utils/_structuredclone.ts";
 import { PrintMarkdownTable, GenerateStub, IsClonable } from "../utils/_utils.ts";
-import { BITS_IN_BYTE, MAX_SIZE } from "../utils/_constants.ts";
+import { MAX_SIZE } from "../utils/_constants.ts";
 
 export default async function (e: MouseEvent): Promise<string> {
   e.preventDefault();
@@ -33,9 +33,9 @@ export default async function (e: MouseEvent): Promise<string> {
   })
 
   const counter = new Map<string, number>();
-  for (let index = 0; index <= Math.log2(MAX_SIZE / BITS_IN_BYTE); index++) {
+  for (let index = 0; index <= Math.log2(MAX_SIZE); index++) {
     const num = Math.pow(2, index);
-    const name = bytes(num * BITS_IN_BYTE, { maximumFractionDigits: 3 });
+    const name = bytes(num, { maximumFractionDigits: 3 });
 
     group(name, () => {
       for (const variant of variants) {

diff --git a/benchmark/messagechannel.bench.ts b/benchmark/messagechannel.bench.ts
@@ -29,7 +29,7 @@ console.log({
   transferable: data_.transferable.length,
 })
 
-const counter = new Map<string, number>();
+let counter = 0;
 for (let index = 0; index <= Math.log2(MAX_SIZE); index ++) {
   const num = Math.pow(2, index);
   const name = bytes(num, { maximumFractionDigits: 3 });
@@ -40,19 +40,15 @@ for (let index = 0; index <= Math.log2(MAX_SIZE); index ++) {
       let channel = new MessageChannel();
 
       const instanceKey = `#${index} ${name} -> ${variant}`;
-      counter.set(instanceKey, counter.get(instanceKey) ?? 0);
-      console.log(`${counter.get(instanceKey) ?? 0} - ${instanceKey}`);
+      console.log(`${counter++} - ${instanceKey}`);
 
       bench(
         variant, 
         async () => {
-          const prevCount = counter.get(instanceKey) ?? 0;
-
           data = GenerateStub(num, IsClonable); 
           await AsyncPostMessagePromise?.(channel.port1, {
-            name, index: prevCount, variant, data: data!
-          });
-          counter.set(instanceKey, prevCount + 1); 
+            name, index: counter, variant, data: data!
+          }); 
         }, 
         {
           warmup: true,

diff --git a/benchmark/structuredclone.bench.ts b/benchmark/structuredclone.bench.ts
@@ -6,7 +6,7 @@ import { WriteFile } from "./utils/_fs.ts";
 
 import { CreateStructuredCloneVariants } from "./utils/_structuredclone.ts";
 import { PrintMarkdownTable, GenerateStub, IsClonable } from "./utils/_utils.ts";
-import { BITS_IN_BYTE, MAX_SIZE } from "./utils/_constants.ts";
+import { MAX_SIZE } from "./utils/_constants.ts";
 
 const variantsFn = CreateStructuredCloneVariants({
   hasTransferables, getTransferable, getTransferables
@@ -30,7 +30,7 @@ console.log({
   transferable: data_.transferable.length,
 })
 
-const counter = new Map<string, number>();
+let counter = 0;
 for (let index = 0; index <= Math.log2(MAX_SIZE); index++) {
   const num = Math.pow(2, index);
   const name = bytes(num, { maximumFractionDigits: 3 });
@@ -40,18 +40,14 @@ for (let index = 0; index <= Math.log2(MAX_SIZE); index++) {
       let data: ReturnType<typeof GenerateStub> | null = null;
 
       const instanceKey = `#${index} ${name} -> ${variant}`;
-      counter.set(instanceKey, counter.get(instanceKey) ?? 0);
-      console.log(`${counter.get(instanceKey) ?? 0} - ${instanceKey}`);
+      console.log(`${counter++} - ${instanceKey}`);
 
       bench(
         variant, 
         async () => {
-          const prevCount = counter.get(instanceKey) ?? 0;
-
           data = GenerateStub(num, IsClonable);
           const fn = variantsFn[variant];
           await fn?.(data!);
-          counter.set(instanceKey, prevCount + 1); 
         }, 
         {
           warmup: true,

diff --git a/benchmark/utils/_constants.ts b/benchmark/utils/_constants.ts
@@ -30,4 +30,4 @@ export const BITS_IN_MEGABYTE: number = BITS_IN_BYTE * BYTES_IN_MEGABYTE; // 8 b
  * @constant
  * @type {number}
  */
-export const MAX_SIZE: number = 2 * BITS_IN_MEGABYTE; // 2 MB in bytes
+export const MAX_SIZE: number = 0.0005 * BITS_IN_MEGABYTE; // 2 MB in bytes
diff --git a/benchmark/utils/_fs.ts b/benchmark/utils/_fs.ts
@@ -19,8 +19,8 @@ export async function WriteFile(result: string, name: string, env: string) {
   const __filename = fileURLToPath(import.meta.url);
   const __dirname = path.dirname(__filename);
 
-  const fileDir = path.join(__dirname, `/results`);
-  const filePath = path.join(__dirname, `/results/${name.toLowerCase()}.${env}.md`);
+  const fileDir = path.join(__dirname, "..", `/results`);
+  const filePath = path.join(__dirname, "..", `/results/${name.toLowerCase()}.${env}.md`);
   console.log(`Writing/Appending to ${filePath}`)
 
   const append = await exists(filePath);

diff --git a/benchmark/worker.bench.ts b/benchmark/worker.bench.ts
@@ -26,12 +26,12 @@ const env_ = (() => {
 })();
 
 console.log({ 
-  type: `MessageChannel (${env_})`,
+  type: `Worker (${env_})`,
   name: name_,
   transferable: data_.transferable.length,
 })
 
-const counter = new Map<string, number>();
+let counter = 0;
 for (let index = 0; index <= Math.log2(MAX_SIZE) / 5; index += 3) {
   const num = Math.pow(2, index);
   const name = bytes(num, { maximumFractionDigits: 3 });
@@ -42,19 +42,15 @@ for (let index = 0; index <= Math.log2(MAX_SIZE) / 5; index += 3) {
       let worker: Worker | null = null;
 
       const instanceKey = `#${index} ${name} -> ${variant}`;
-      counter.set(instanceKey, counter.get(instanceKey) ?? 0);
-      console.log(`${counter.get(instanceKey) ?? 0} - ${instanceKey}`);
+      console.log(`${counter++} - ${instanceKey}`);
 
       bench(
         variant, 
         async () => {
-          const prevCount = counter.get(instanceKey) ?? 0;
-
           data = GenerateStub(num, IsClonable); 
           await AsyncPostMessagePromise?.(worker!, {
-            name, index: prevCount, variant, data: data!
+            name, index: counter, variant, data: data!
           });
-          counter.set(instanceKey, prevCount + 1); 
         }, 
         {
           warmup: true,
@@ -87,4 +83,4 @@ const { benchmarks } = await run({
 });
 
 const result = PrintMarkdownTable(variants, benchmarks);
-WriteFile(result, `MessageChannel`, env_);
+WriteFile(result, `Worker`, env_);
diff --git a/package.json b/package.json
@@ -39,38 +39,30 @@
   "scripts": {
     "start": "pnpm browser:fixture",
     "dev": "pnpm browser:fixture",
-
     "test": "vitest",
     "test:run": "vitest run tests",
-
     "build": "tsup",
     "playwright:init": "playwright install --with-deps",
     "browser:fixture": "vite build ./benchmark/fixtures --target \"es2022\" && vite preview ./benchmark/fixtures --port 3000",
     "browser:fixture:dev": "vite dev ./benchmark/fixtures --port 3000",
-
     "benchmark:browser": "playwright test ./benchmark/browsers.spec.ts",
     "benchmark:browser:chrome": "rm -rf ./benchmark/results/chromium.md && playwright test --browser=chromium ./benchmark/browsers.spec.ts",
     "benchmark:browser:firefox": "rm -rf ./benchmark/results/firefox.md && playwright test --browser=firefox ./benchmark/browsers.spec.ts",
     "benchmark:browser:safari": "rm -rf ./benchmark/results/safari.md && playwright test --browser=webkit ./benchmark/browsers.spec.ts",
-
     "benchmark:node": "tsx ./benchmark/structuredclone.bench.ts",
     "benchmark:node:worker": "tsx ./benchmark/worker.bench.ts",
     "benchmark:node:messagechannel": "tsx ./benchmark/messagechannel.bench.ts",
     "benchmark:node:all": "rm -rf ./benchmark/results/node.md && pnpm benchmark:node && pnpm benchmark:node:worker && pnpm benchmark:node:messagechannel",
-
     "benchmark:deno": "deno run --allow-run --allow-env --allow-read --allow-write --allow-hrtime --allow-sys ./benchmark/structuredclone.bench.ts",
     "benchmark:deno:worker": "deno run --allow-run --allow-env --allow-read --allow-write --allow-hrtime --allow-sys ./benchmark/worker.bench.ts",
     "benchmark:deno:messagechannel": "deno run --allow-run --allow-env --allow-read --allow-write --allow-hrtime --allow-sys ./benchmark/messagechannel.bench.ts",
     "benchmark:deno:all": "rm -rf ./benchmark/results/deno.md && pnpm benchmark:deno && pnpm benchmark:deno:worker && pnpm benchmark:deno:messagechannel",
-
     "benchmark:bun": "bun run ./benchmark/structuredclone.bench.ts",
     "benchmark:bun:worker": "bun run ./benchmark/worker.bench.ts",
     "benchmark:bun:messagechannel": "bun run ./benchmark/messagechannel.bench.ts",
     "benchmark:bun:all": "rm -rf ./benchmark/results/bun.md && pnpm benchmark:bun && pnpm benchmark:bun:worker && pnpm benchmark:bun:messagechannel",
-
     "benchmark": "pnpm benchmark:node:all && pnpm benchmark:deno:all && pnpm benchmark:bun:all",
     "benchmark:all": "pnpm benchmark && pnpm benchmark:browser",
-
     "commitlint": "commitlint --edit",
     "pre-release": "pnpm test:run && pnpm build",
     "semantic-release": "semantic-release",
@@ -159,6 +151,7 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@std/fmt": "npm:@jsr/std__fmt@^0.224.0",
+    "@swc/core": "^1.5.0",
     "@types/node": "^20.12.7",
     "@types/web": "^0.0.143",
     "bun": "^1.1.4",