refactor

Author: wan2land

.github/workflows/ci.yml

@@ -2,34 +2,32 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        deno-version: [v1.x]
     steps:
       - name: Git Checkout Deno Module
-        uses: actions/checkout@v2
-      - name: Use Deno Version ${{ matrix.deno-version }}
-        uses: denoland/setup-deno@v1
+        uses: actions/checkout@v4
+      - uses: denoland/setup-deno@v2
         with:
-          deno-version: ${{ matrix.deno-version }}
+          deno-version: vx.x.x
       - name: Format
         run: deno fmt --check
       - name: Lint
         run: deno lint
       - name: Unit Test
         run: deno test --coverage=coverage
       - name: Create coverage report
-        run:  deno coverage ./coverage --lcov > coverage.lcov
+        run: deno coverage ./coverage --lcov > coverage.lcov
       - name: Collect coverage
-        uses: codecov/codecov-action@v1.0.10
+        uses: codecov/codecov-action@v5
         with:
-          file: ./coverage.lcov
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: denostack/intlit
+          files: ./coverage.lcov
       - name: Build Module
         run: deno task build:npm

.gitignore

@@ -1,2 +1 @@
 .npm
-deno.lock

deno.json

@@ -5,14 +5,14 @@
     "test": "deno task test:unit && deno task test:lint && deno task test:format && deno task test:types",
     "test:format": "deno fmt --check",
     "test:lint": "deno lint",
-    "test:unit": "deno test -A",
-    "test:types": "deno check mod.ts",
-    "build:npm": "deno run --allow-sys --allow-env --allow-read --allow-write --allow-net --allow-run scripts/build_npm.ts"
+    "test:unit": "deno test",
+    "test:types": "find . -name '*.ts' -not -path './.npm/*' | xargs deno check",
+    "build:npm": "deno run --allow-env --allow-read --allow-write --allow-run scripts/build_npm.ts"
   },
   "imports": {
-    "@deno/dnt": "jsr:@deno/dnt@^0.41.1",
-    "@std/assert": "jsr:@std/assert@^0.221.0",
-    "@std/fmt": "jsr:@std/fmt@^0.221.0"
+    "@deno/dnt": "jsr:@deno/dnt@^0.42.3",
+    "@std/assert": "jsr:@std/assert@^1.0.15",
+    "@std/fmt": "jsr:@std/fmt@^1.0.8"
   },
   "exports": {
     ".": "./mod.ts",
@@ -26,5 +26,11 @@
   "fmt": {
     "exclude": [".npm"]
   },
-  "lock": false
+  "publish": {
+    "exclude": [
+      ".github",
+      ".vscode",
+      "scripts"
+    ]
+  }
 }

deno.lock

@@ -60,21 +60,21 @@ export class IterableWeakMap<K extends object, V>
     }
   }
 
-  *[Symbol.iterator](): IterableIterator<[K, V]> {
+  *[Symbol.iterator](): MapIterator<[K, V]> {
     for (const key of this.#set) {
       yield [key, this.#weakMap.get(key)!];
     }
   }
 
-  entries(): IterableIterator<[K, V]> {
+  entries(): MapIterator<[K, V]> {
     return this[Symbol.iterator]();
   }
 
-  keys(): IterableIterator<K> {
+  keys(): MapIterator<K> {
     return this.#set[Symbol.iterator]();
   }
 
-  *values(): IterableIterator<V> {
+  *values(): MapIterator<V> {
     for (const key of this.#set) {
       yield this.#weakMap.get(key)!;
     }

iterable_weak_map.ts

@@ -75,24 +75,24 @@ export class IterableWeakSet<T extends object> implements
     return "IterableWeakSet";
   }
 
-  *[Symbol.iterator](): IterableIterator<T> {
+  *[Symbol.iterator](): SetIterator<T> {
     for (const ref of this.#set) {
       yield ref.deref()!;
     }
   }
 
-  *entries(): IterableIterator<[T, T]> {
+  *entries(): SetIterator<[T, T]> {
     for (const ref of this.#set) {
       const value = ref.deref()!;
       yield [value, value];
     }
   }
 
-  keys(): IterableIterator<T> {
+  keys(): SetIterator<T> {
     return this[Symbol.iterator]();
   }
 
-  values(): IterableIterator<T> {
+  values(): SetIterator<T> {
     return this[Symbol.iterator]();
   }
 }

iterable_weak_set.ts

@@ -1,10 +1,8 @@
 import { build, emptyDir } from "@deno/dnt";
 import { bgGreen } from "@std/fmt/colors";
+import denoJson from "../deno.json" with { type: "json" };
 
-const denoInfo = JSON.parse(
-  Deno.readTextFileSync(new URL("../deno.json", import.meta.url)),
-);
-const version = denoInfo.version;
+const version = denoJson.version;
 
 console.log(bgGreen(`version: ${version}`));
 
@@ -17,7 +15,7 @@ await build({
   outDir: "./.npm",
   test: false,
   compilerOptions: {
-    lib: ["ES2022"],
+    lib: ["ES2021"],
   },
   shims: {
     deno: false,
@@ -44,7 +42,8 @@ await build({
       url: "https://github.com/denostack/weakref/issues",
     },
   },
+  postBuild() {
+    Deno.copyFileSync("LICENSE", ".npm/LICENSE");
+    Deno.copyFileSync("README.md", ".npm/README.md");
+  },
 });
-
-// post build steps
-Deno.copyFileSync("README.md", ".npm/README.md");

scripts/build_npm.ts

@@ -58,21 +58,21 @@ export class WeakValueMap<K, V extends object> implements Map<K, V> {
     }
   }
 
-  *[Symbol.iterator](): IterableIterator<[K, V]> {
+  *[Symbol.iterator](): MapIterator<[K, V]> {
     for (const [key, ref] of this.#map) {
       yield [key, ref.deref()!];
     }
   }
 
-  entries(): IterableIterator<[K, V]> {
+  entries(): MapIterator<[K, V]> {
     return this[Symbol.iterator]();
   }
 
-  keys(): IterableIterator<K> {
+  keys(): MapIterator<K> {
     return this.#map.keys();
   }
 
-  *values(): IterableIterator<V> {
+  *values(): MapIterator<V> {
     for (const ref of this.#map.values()) {
       yield ref.deref()!;
     }