Merge pull request #25 from joshLong145/update/deno-v2-rc

dev: update readAllSync
joshLong145 · Sep 24, 2024 · ba91ea4 · ba91ea4
2 parents 2514e2f + 78b81ad
commit ba91ea4
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -205,7 +205,8 @@ const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(example,
     },
     moduleLoader: (path: string) => {
       const fd = Deno.openSync(path);
-      return Deno.readAllSync(fd);
+      //import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
+      return readAllSync(fd);
     },
 });
 

diff --git a/benchmark/wasm_instance_start_bench.ts b/benchmark/wasm_instance_start_bench.ts
@@ -1,7 +1,7 @@
 import { InstanceWrapper, WorkerDefinition } from "../src/mod.ts";
 import { existsSync } from "https://deno.land/std/fs/mod.ts";
 import * as path from "https://deno.land/std@0.188.0/path/mod.ts";
-
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 class TestExample extends WorkerDefinition {
   public constructor() {
     super();
@@ -40,7 +40,7 @@ Deno.bench("Wasm Worker Start Go Module loading", {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -74,7 +74,7 @@ Deno.bench("Wasm Worker Start Rust Module loading", {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -116,7 +116,7 @@ Deno.bench("Wasm Worker Start Code Gen Bootstrapping Rust", {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -162,7 +162,7 @@ Deno.bench("Wasm Worker Start Code Gen Bootstrapping Tiny Go", {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -208,7 +208,7 @@ Deno.bench("Wasm Worker Start Code Gen Bootstrapping Go", {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },

diff --git a/deno-lock.json b/deno-lock.json
@@ -11,7 +11,9 @@
     }
   },
   "redirects": {
-    "https://deno.land/std/fs/mod.ts": "https://deno.land/std@0.211.0/fs/mod.ts"
+    "https://deno.land/std/fs/mod.ts": "https://deno.land/std@0.211.0/fs/mod.ts",
+    "https://deno.land/std/io/read_all.ts": "https://deno.land/std@0.224.0/io/read_all.ts",
+    "https://deno.land/std/io/read_all.ts?s=readAllSync": "https://deno.land/std@0.224.0/io/read_all.ts"
   },
   "remote": {
     "https://deno.land/std@0.188.0/_util/asserts.ts": "178dfc49a464aee693a7e285567b3d0b555dc805ff490505a8aae34f9cfb1462",
@@ -125,6 +127,10 @@
     "https://deno.land/std@0.211.0/path/windows/separator.ts": "2bbcc551f64810fb43252185bd1d33d66e0477d74bd52f03b89f5dc21a3dd486",
     "https://deno.land/std@0.224.0/assert/assert.ts": "09d30564c09de846855b7b071e62b5974b001bb72a4b797958fe0660e7849834",
     "https://deno.land/std@0.224.0/assert/assertion_error.ts": "ba8752bd27ebc51f723702fac2f54d3e94447598f54264a6653d6413738a8917",
+    "https://deno.land/std@0.224.0/bytes/concat.ts": "86161274b5546a02bdb3154652418efe7af8c9310e8d54107a68aaa148e0f5ed",
+    "https://deno.land/std@0.224.0/io/_constants.ts": "3c7ad4695832e6e4a32e35f218c70376b62bc78621ef069a4a0a3d55739f8856",
+    "https://deno.land/std@0.224.0/io/read_all.ts": "876c1cb20adea15349c72afc86cecd3573335845ae778967aefb5e55fe5a8a4a",
+    "https://deno.land/std@0.224.0/io/types.ts": "acecb3074c730b5ff487ba4fe9ce51e67bd982aa07c95e5f5679b7b2f24ad129",
     "https://deno.land/std@0.224.0/path/_common/assert_path.ts": "dbdd757a465b690b2cc72fc5fb7698c51507dec6bfafce4ca500c46b76ff7bd8",
     "https://deno.land/std@0.224.0/path/_common/basename.ts": "569744855bc8445f3a56087fd2aed56bdad39da971a8d92b138c9913aecc5fa2",
     "https://deno.land/std@0.224.0/path/_common/common.ts": "ef73c2860694775fe8ffcbcdd387f9f97c7a656febf0daa8c73b56f4d8a7bd4c",

diff --git a/examples/wasm/rust/example.ts b/examples/wasm/rust/example.ts
@@ -3,6 +3,7 @@ import {
   WorkerDefinition,
 } from "../../../src/InstanceWrapper.ts";
 import { WorkerAny } from "../../../src/mod.ts";
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 
 class Example extends WorkerDefinition {
   public constructor() {
@@ -32,7 +33,7 @@ const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(
     modulePath: "./examples/wasm/rust/wasm_test_bg.wasm",
     moduleLoader: (path: string) => {
       const fd = Deno.openSync(path);
-      return Deno.readAllSync(fd);
+      return readAllSync(fd);
     },
     workerCount: 1,
   },

diff --git a/examples/wasm/tiny-go/example.ts b/examples/wasm/tiny-go/example.ts
@@ -3,6 +3,7 @@ import {
   WorkerDefinition,
 } from "../../../src/InstanceWrapper.ts";
 import type { WorkerAny } from "../../../src/types.ts";
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 
 class Example extends WorkerDefinition {
   public constructor() {
@@ -37,7 +38,7 @@ const wrapper: InstanceWrapper<Example> = new InstanceWrapper<Example>(
     },
     moduleLoader: (path: string) => {
       const fd = Deno.openSync(path);
-      return Deno.readAllSync(fd);
+      return readAllSync(fd);
     },
     workerCount: 5,
   },

diff --git a/tests/instance_wrapper_static_generation_test.ts b/tests/instance_wrapper_static_generation_test.ts
@@ -7,6 +7,7 @@ import * as path from "https://deno.land/std@0.224.0/path/mod.ts";
 import { InstanceWrapper, WorkerDefinition } from "../src/mod.ts";
 import { existsSync } from "https://deno.land/std/fs/mod.ts";
 import type { WorkerAny } from "../src/types.ts";
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 
 declare global {
   const test: {

diff --git a/tests/wasm_instance_wrapper_runtime_test.ts b/tests/wasm_instance_wrapper_runtime_test.ts
@@ -7,6 +7,7 @@ import * as path from "https://deno.land/std@0.224.0/path/mod.ts";
 
 import { InstanceWrapper, WorkerDefinition } from "../src/mod.ts";
 import type { WorkerAny } from "../src/types.ts";
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 
 class GoTestExample extends WorkerDefinition {
   public constructor() {
@@ -91,7 +92,7 @@ Deno.test("WASM Worker Should have wasm methods loaded from GoLang module", asyn
       modulePath: wasmModPath,
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -145,7 +146,7 @@ Deno.test("WASM Worker method should correct pass arguments", async () => {
       modulePath: wasmModPath,
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        let mod = Deno.readAllSync(fd);
+        let mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -189,7 +190,7 @@ Deno.test("WASM Worker Should have wasm methods loaded from Rust compiled module
       modulePath: wasmModPath,
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        let source = Deno.readAllSync(fd);
+        let source = readAllSync(fd);
         fd.close();
         return source;
       },

diff --git a/tests/wasm_instance_wrapper_standup_test.ts b/tests/wasm_instance_wrapper_standup_test.ts
@@ -5,6 +5,7 @@ import {
 import * as path from "https://deno.land/std@0.224.0/path/mod.ts";
 import { InstanceWrapper, WorkerDefinition } from "../src/InstanceWrapper.ts";
 import type { WorkerAny } from "../src/types.ts";
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 
 class TestExample extends WorkerDefinition {
   public constructor() {
@@ -40,7 +41,7 @@ Deno.test("Wasm Worker Wrapper manager should have config correctly defnined", (
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -74,7 +75,7 @@ Deno.test("Wasm class members should be defined", () => {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -107,7 +108,7 @@ Deno.test("Wasm class should have correct worker number on start", () => {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },
@@ -141,7 +142,7 @@ Deno.test("Wasm class ", () => {
       },
       moduleLoader: (path: string) => {
         const fd = Deno.openSync(path);
-        const mod = Deno.readAllSync(fd);
+        const mod = readAllSync(fd);
         fd.close();
         return mod;
       },

diff --git a/tests/wasm_instance_wrapper_static_generation_test.ts b/tests/wasm_instance_wrapper_static_generation_test.ts
@@ -6,6 +6,7 @@ import * as path from "https://deno.land/std@0.224.0/path/mod.ts";
 
 import { InstanceWrapper, WorkerDefinition } from "../src/mod.ts";
 import { existsSync } from "https://deno.land/std@0.211.0/fs/exists.ts";
+import { readAllSync } from 'https://deno.land/std/io/read_all.ts';
 
 import type { WorkerAny } from "../src/types.ts";
 
@@ -69,7 +70,7 @@ Deno.test("WASM Worker Should generate worker and load functions into global", a
         },
         moduleLoader: (path: string) => {
           const fd = Deno.openSync(path);
-          const source = Deno.readAllSync(fd);
+          const source = readAllSync(fd);
           fd.close();
           return source;
         },