Merge pull request #24 from lambdalisue/upgrade-support-deno

💥 Upgrade support Deno version

Author: lambdalisue

.github/workflows/test.yml

@@ -1,8 +1,5 @@
 name: Test
 
-env:
-  DENO_VERSION: 1.x
-
 on:
   schedule:
     - cron: "0 7 * * 0"
@@ -14,46 +11,47 @@ on:
       - main
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@main
-        with:
-          deno-version: ${{ env.DENO_VERSION }}
-      - name: Lint
-        run: deno lint
-
-  format:
-    runs-on: ubuntu-latest
+  check:
+    strategy:
+      matrix:
+        runner:
+          - ubuntu-latest
+        version:
+          - "1.x"
+          - "1.22.x"
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@main
+      - uses: actions/checkout@v3
+      - uses: denoland/setup-deno@v1
         with:
-          deno-version: ${{ env.DENO_VERSION }}
-      - name: Format
+          deno-version: "${{ matrix.version }}"
+      - name: Lint check
+        run: |
+          make lint
+      - name: Format check
+        run: |
+          make fmt-check
+      - name: Type check
         run: |
-          deno fmt --check
+          make type-check
 
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        runner:
+          - windows-latest
+          - macos-latest
+          - ubuntu-latest
+        version:
+          - "1.x"
+          - "1.22.x"
+    runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@main
+      - uses: actions/checkout@v3
+      - uses: denoland/setup-deno@v1
         with:
-          deno-version: ${{ env.DENO_VERSION }}
+          deno-version: "${{ matrix.version }}"
       - name: Test
         run: |
-          deno test
+          make test
         timeout-minutes: 5
-
-  typecheck:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: denoland/setup-deno@main
-        with:
-          deno-version: ${{ env.DENO_VERSION }}
-      - name: Type check
-        run: |
-          deno test --unstable --no-run ./*.ts

.github/workflows/udd.yml

@@ -9,7 +9,7 @@ jobs:
   udd:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: denoland/setup-deno@v1
         with:
           deno-version: "1.x"
@@ -35,7 +35,7 @@ jobs:
           ${{ steps.log.outputs.content }}
 
           EOM
-      - uses: peter-evans/create-pull-request@v3
+      - uses: peter-evans/create-pull-request@v4
         with:
           title: ":package: Update Deno dependencies"
           body: |

Makefile

@@ -8,19 +8,19 @@ help:
 	    perl -pe 's/(.*):.*##\s*/sprintf("%-20s",$$1)/eg;'
 
 fmt: FORCE	## Format code
-	@deno fmt --ignore=.deno
+	@deno fmt
 
 fmt-check: FORCE	## Format check
-	@deno fmt --check --ignore=.deno
+	@deno fmt --check
 
 lint: FORCE	## Lint code
-	@deno lint --ignore=.deno
+	@deno lint
 
 type-check: FORCE	## Type check
-	@deno test --unstable --no-run ${TARGETS}
+	@deno test --no-run ${TARGETS}
 
 test: FORCE	## Test
-	@deno test --unstable -A --no-check --jobs
+	@deno test -A --no-check
 
 deps: FORCE	## Update dependencies
 	@deno run -A https://deno.land/x/[email protected]/main.ts ${TARGETS}

deps.ts

@@ -1,5 +1,5 @@
 export { decodeStream, encode } from "https://deno.land/x/[email protected]/mod.ts";
-export { deferred, delay } from "https://deno.land/x/std@0.110.0/async/mod.ts";
-export * as io from "https://deno.land/x/std@0.110.0/io/mod.ts";
-export type { Deferred } from "https://deno.land/x/std@0.110.0/async/mod.ts";
+export { deferred, delay } from "https://deno.land/x/std@0.164.0/async/mod.ts";
+export * as streams from "https://deno.land/x/std@0.164.0/streams/mod.ts";
+export type { Deferred } from "https://deno.land/x/std@0.164.0/async/mod.ts";
 export type { Disposable } from "https://deno.land/x/[email protected]/mod.ts";

deps_test.ts

@@ -1,3 +1,3 @@
-export * from "https://deno.land/std@0.110.0/testing/asserts.ts";
-export { delay } from "https://deno.land/std@0.110.0/async/mod.ts";
+export * from "https://deno.land/std@0.164.0/testing/asserts.ts";
+export { delay } from "https://deno.land/std@0.164.0/async/mod.ts";
 export { using } from "https://deno.land/x/[email protected]/mod.ts";

indexer_test.ts

@@ -18,5 +18,5 @@ Deno.test("Indexer with 'max' works as expect", () => {
 });
 
 Deno.test("Indexer with 'max' smaller than 2 throws error", () => {
-  assertThrows(() => new Indexer(1), undefined, "must be greater than 1");
+  assertThrows(() => new Indexer(1), Error, "must be greater than 1");
 });

response_waiter_test.ts

@@ -1,4 +1,4 @@
-import { assertEquals, assertThrowsAsync } from "./deps_test.ts";
+import { assertEquals, assertRejects } from "./deps_test.ts";
 import { MessageId, ResponseMessage } from "./message.ts";
 import { ResponseWaiter, TimeoutError } from "./response_waiter.ts";
 
@@ -30,7 +30,7 @@ Deno.test({
   fn: async () => {
     const msgid: MessageId = 0;
     const waiter = new ResponseWaiter();
-    await assertThrowsAsync(async () => {
+    await assertRejects(async () => {
       const promise = waiter.wait(msgid, 1);
       assertEquals(waiter.waiterCount, 1);
       await promise;

session.ts

@@ -4,7 +4,7 @@ import {
   deferred,
   Disposable,
   encode,
-  io,
+  streams,
 } from "./deps.ts";
 import * as message from "./message.ts";
 import { Indexer } from "./indexer.ts";
@@ -83,7 +83,7 @@ export class Session implements Disposable {
   }
 
   private async send(data: Uint8Array): Promise<void> {
-    await io.writeAll(this.#writer, data);
+    await streams.writeAll(this.#writer, data);
   }
 
   private async dispatch(
@@ -134,7 +134,7 @@ export class Session implements Disposable {
   }
 
   private async listen(): Promise<void> {
-    const iter = decodeStream(io.iter(this.#reader));
+    const iter = decodeStream(streams.iterateReader(this.#reader));
     try {
       while (!this.#closed) {
         const { done, value } = await Promise.race([

session_test.ts

@@ -1,5 +1,5 @@
-import { io } from "./deps.ts";
-import { assertEquals, assertThrowsAsync, delay, using } from "./deps_test.ts";
+import { streams } from "./deps.ts";
+import { assertEquals, assertRejects, delay, using } from "./deps_test.ts";
 import { Session, SessionClosedError } from "./session.ts";
 
 class Reader implements Deno.Reader, Deno.Closer {
@@ -67,9 +67,9 @@ Deno.test("Make sure that Reader/Writer for tests works properly", async () => {
   const r = new Reader(q);
   const w = new Writer(q);
   const d = (new TextEncoder()).encode(buildMassiveData());
-  await io.writeAll(w, d);
+  await streams.writeAll(w, d);
   r.close();
-  assertEquals(await io.readAll(r), d);
+  assertEquals(await streams.readAll(r), d);
 });
 
 Deno.test("Local can call Remote method", async () => {
@@ -219,7 +219,7 @@ Deno.test({
     const writer = new Writer(buffer);
     const session = new Session(reader, writer);
     session.close();
-    await assertThrowsAsync(async () => {
+    await assertRejects(async () => {
       await session.call("say");
     }, SessionClosedError);
     reader.close();
@@ -237,7 +237,7 @@ Deno.test({
     const writer = new Writer(buffer);
     const session = new Session(reader, writer);
     session.close();
-    await assertThrowsAsync(async () => {
+    await assertRejects(async () => {
       await session.notify("say");
     }, SessionClosedError);
     reader.close();
@@ -268,7 +268,7 @@ Deno.test({
       assertEquals(await local.call("say"), "Hello");
     });
     // Session is closed by `dispose`
-    await assertThrowsAsync(async () => {
+    await assertRejects(async () => {
       await local.call("say");
     }, SessionClosedError);
     // Close
@@ -298,7 +298,7 @@ Deno.test({
         return Promise.reject(new Error("Panic!"));
       },
     });
-    await assertThrowsAsync(
+    await assertRejects(
       async () => {
         await local.call("say");
       },
@@ -332,7 +332,7 @@ Deno.test({
         return Promise.reject("Panic!");
       },
     });
-    await assertThrowsAsync(
+    await assertRejects(
       async () => {
         await local.call("say");
       },
@@ -366,7 +366,7 @@ Deno.test({
         return Promise.reject(null);
       },
     });
-    await assertThrowsAsync(
+    await assertRejects(
       async () => {
         await local.call("say");
       },