Merge pull request #157 from hardy613/develop

fixes #156 DNT builds broken

Author: ChrisDufourMB

.github/DEVELOPMENT.md

@@ -44,10 +44,10 @@ symbols.
 If you find a bug a test case is the right place to start. Test example:
 
 ```ts
-import { assertEquals, test } from "../test_deps.ts";
+import { assertEquals } from "@std/assert";
 import { Serializable, SerializeProperty } from "../mod.ts";
 
-test({
+Deno.test({
   name: "Serialize nested",
   fn() {
     class Test1 extends Serializable {

.github/workflows/ts_serialize_release.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        deno: ["v1.x", "v2.x"]
+        deno: ["v2.x"]
         os: [macOS-latest, windows-latest, ubuntu-latest]
 
     steps:
@@ -25,17 +25,14 @@ jobs:
           deno-version: ${{ matrix.deno }}
 
       - name: Deno lint
-        run: deno lint -c tsconfig.json
+        run: deno task lint
 
       - name: Deno format check
-        run: deno fmt --check -c tsconfig.json
+        run: deno task fmt --check
         if: matrix.os != 'windows-latest'
 
-      - name: Cache dependencies
-        run: deno cache test_deps.ts
-
       - name: Run deno tests
-        run: deno test --doc -c tsconfig.json
+        run: deno task test --doc
 
   build:
     name: Release
@@ -44,7 +41,7 @@ jobs:
 
     strategy:
       matrix:
-        deno: ["v1.x", "v2.x"]
+        deno: ["v2.x"]
 
     steps:
       - name: Get github tag
@@ -66,7 +63,7 @@ jobs:
           registry-url: https://registry.npmjs.org/
 
       - name: Build and test NPM module
-        run: ./_build_npm.ts -v ${{ steps.get_github_tag.outputs.VERSION }}
+        run: deno task build -v ${{ steps.get_github_tag.outputs.VERSION }}
 
       - name: Create release
         id: create_release

.github/workflows/ts_serialize_tests.yml

@@ -12,12 +12,34 @@ on:
     branches: ["**"]
 
 jobs:
-  test:
+  deno_v1:
     runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        deno: ["v1.x", "v2.x"]
+        deno: [v1.x]
+        os: [macOS-latest, windows-latest, ubuntu-latest]
+
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v2
+
+      - name: Setup deno
+        uses: denolib/setup-deno@v2
+        with:
+          deno-version: ${{ matrix.deno }}
+
+      - name: Deno test
+        run: deno test
+
+  deno_v2_and_up:
+    runs-on: ${{ matrix.os }}
+
+    needs: deno_v1
+
+    strategy:
+      matrix:
+        deno: [v2.x]
         os: [macOS-latest, windows-latest, ubuntu-latest]
 
     steps:
@@ -30,17 +52,23 @@ jobs:
           deno-version: ${{ matrix.deno }}
 
       - name: Deno lint
-        run: deno lint -c tsconfig.json
+        run: deno task lint
 
       - name: Deno format check
-        run: deno fmt --check -c tsconfig.json
+        run: deno task fmt --check
         if: matrix.os != 'windows-latest'
 
-      - name: Cache dependencies
-        run: deno cache test_deps.ts
-
       - name: Deno test
-        run: deno test --doc -c tsconfig.json
+        run: deno task test:coverage
+
+      - name: Generate coverage report
+        run: deno task test:coverage:report
+
+      - name: Coverage report
+        uses: VeryGoodOpenSource/very_good_coverage@v2
+        with:
+          path: ./coverage/lcov.info
+          min_coverage: 100
 
       - name: Setup node
         uses: actions/setup-node@v1
@@ -49,4 +77,5 @@ jobs:
           registry-url: https://registry.npmjs.org/
 
       - name: Build and test NPM module
-        run: ./_build_npm.ts
+        run: deno task build
+        if: matrix.os == 'ubuntu-latest'

.gitignore

@@ -1,5 +1,6 @@
 deno.d.ts
 dist
+coverage
 ts_serialize_coverage
 ts_serialize_coverage.lcov
 .DS_Store

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "deno.enable": true,
   "deno.lint": true,
-  "deno.unstable": [],
-  "deno.config": "./tsconfig.json"
+  "deno.unstable": []
 }

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to
 
 ### Changed
 
+- 100% test coverage
+- use deno `task` for tasks
+- remove `-c tsconfig` option from `deno` cli calls ... again
 - node/deno version in ci/cd
 - copyright year
 - support deno 2.x+
@@ -20,6 +23,13 @@ and this project adheres to
 - add member accessor for all classes
 - fix #151 Allow the fromSerializationStrategy to handle null in place of an
   serializable object.
+- test use the Deno.test function for shimmed tests with DNT
+- add deno.json
+- add deno.lock
+- remove test_deps.ts and test_deps_test.ts
+- add jsr:@std/assert
+- add jsr:@std/cli
+- add jsr:@deno/dnt
 
 ## [v2.0.1 - v2.0.3] - 2022-04-15
 

SECURITY.md

@@ -4,11 +4,20 @@ Below is a table of supported versions.
 
 ## Supported Versions
 
+### ts_serialize
+
 | Version | Supported          |
 | ------- | ------------------ |
 | 2.x     | :white_check_mark: |
 | 1.x     | :x:                |
 
+### Deno
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.x     | :white_check_mark: |
+| 1.x     | :white_check_mark: |
+
 ## Reporting a Vulnerability
 
 Please use our issue's page to create an issue or report a CVE. Thank you

_build_npm.ts

@@ -1,9 +1,8 @@
-#!/usr/bin/env -S deno run --allow-env --allow-read --allow-write --allow-run=npm,cmd --allow-net=deno.land
-
+#!/usr/bin/env -S deno run --allow-env --allow-read --allow-write --allow-run=npm --allow-net=jsr.io
 // Copyright 2018-2025 Gamebridge.ai authors. All rights reserved. MIT license.
 
-import { build, emptyDir } from "https://deno.land/x/dnt@0.22.0/mod.ts";
-import { parse } from "https://deno.land/std@0.133.0/flags/mod.ts";
+import { build, emptyDir } from "@deno/dnt";
+import { parseArgs } from "@std/cli";
 
 const entryPointDefault = "./mod.ts";
 const outDirDefault = "./dist";
@@ -36,7 +35,7 @@ function printHelpText(message = "") {
   Deno.exit(0);
 }
 
-const flags = parse(Deno.args, {
+const flags = parseArgs(Deno.args, {
   string: ["v", "e", "o"],
   boolean: ["h"],
   alias: { h: "help", e: "entry-point", v: "version", o: "out" },
@@ -48,13 +47,16 @@ if (flags.h) {
   printHelpText();
 }
 
+await Deno.remove(`${flags.o}`, { recursive: true }).catch((_) => {});
+
 try {
   await emptyDir(flags.o);
 
   await build({
+    importMap: "./deno.json",
     entryPoints: [flags.e],
     outDir: flags.o,
-    compilerOptions: { target: "ES2021" },
+    compilerOptions: { lib: ["ESNext"], experimentalDecorators: true },
     shims: {
       deno: true,
     },
@@ -94,5 +96,6 @@ try {
   await Deno.copyFile("README.md", `${flags.o}/README.md`);
   await Deno.copyFile("CHANGELOG.md", `${flags.o}/CHANGELOG.md`);
 } catch (e) {
-  printHelpText(e.message);
+  const { message } = e instanceof Error ? e : { message: `${e}` };
+  printHelpText(message);
 }

deno.json

@@ -0,0 +1,53 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.42.1",
+    "@std/assert": "jsr:@std/assert@^1.0.13",
+    "@std/cli": "jsr:@std/cli@^1.0.17"
+  },
+  "lock": false,
+  "compilerOptions": {
+    "experimentalDecorators": true
+  },
+  "fmt": {
+    "include": ["./"],
+    "exclude": ["./dist"]
+  },
+  "test": {
+    "include": ["./"],
+    "exclude": ["./dist"]
+  },
+  "lint": {
+    "include": ["./"],
+    "exclude": ["./dist"]
+  },
+  "typeCheck": {
+    "include": ["./"],
+    "exclude": ["./dist"]
+  },
+  "tasks": {
+    "build": {
+      "description": "Build the project for npm, pass in your flags to override the defaults",
+      "command": "./_build_npm.ts -v v0.0.0-test -e ./mod.ts -o ./dist"
+    },
+    "lint": {
+      "description": "Run linting",
+      "command": "deno lint"
+    },
+    "fmt": {
+      "description": "Run formatting",
+      "command": "deno fmt"
+    },
+    "test": {
+      "description": "Run tests",
+      "command": "deno test --doc"
+    },
+    "test:coverage": {
+      "description": "Run tests with coverage",
+      "command": "deno test --coverage=coverage --doc"
+    },
+    "test:coverage:report": {
+      "description": "Generate coverage report",
+      "command": "deno coverage --lcov coverage > coverage/lcov.info"
+    }
+  }
+}

error_messages_test.ts

@@ -1,9 +1,9 @@
 // Copyright 2018-2025 Gamebridge.ai authors. All rights reserved. MIT license.
 
-import { assert, assertEquals, test } from "./test_deps.ts";
+import { assert, assertEquals } from "@std/assert";
 import * as mod from "./error_messages.ts";
 
-test({
+Deno.test({
   name: "Error messages assertions",
   fn() {
     assert(mod != null);