convert to typescript

silverwind · May 23, 2024 · 70a507e · 70a507e
1 parent 44ed8a8
commit 70a507e
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 999 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -6,11 +6,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        node: [20, 22]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: latest
+          node-version: ${{matrix.node}}
       - run: make lint test
diff --git a/Makefile b/Makefile
@@ -19,18 +19,19 @@ lint-fix: node_modules
 	npx tsc
 
 .PHONY: test
-test: node_modules
+test: build node_modules
 	npx vitest
 
 .PHONY: test-update
-test-update: node_modules
+test-update: build node_modules
 	npx vitest -u
 
 .PHONY: build
 build: node_modules $(DIST_FILES)
 
 $(DIST_FILES): $(SOURCE_FILES) package-lock.json vite.config.ts
 	npx vite build
+	chmod +x $(DIST_FILES)
 
 .PHONY: publish
 publish: node_modules

diff --git a/versions.test.ts → index.test.ts b/versions.test.ts → index.test.ts
@@ -2,8 +2,9 @@ import {execa} from "execa";
 import {readFileSync} from "node:fs";
 import {readFile, writeFile, unlink} from "node:fs/promises";
 import {parse as parseToml} from "toml";
-import type {SemverLevel} from "./versions.ts";
+import type {SemverLevel} from "./index.ts";
 
+const distFile = "dist/index.js";
 const pkgFile = new URL("package.json", import.meta.url);
 const pyFile = new URL("fixtures/pyproject.toml", import.meta.url);
 const testFile = new URL("testfile", import.meta.url);
@@ -31,7 +32,7 @@ afterAll(async () => {
 
 test("version", async () => {
   const {version: expected} = JSON.parse(readFileSync(new URL("package.json", import.meta.url), "utf8"));
-  const {stdout, exitCode} = await execa("node", ["dist/versions.js", "-v"]);
+  const {stdout, exitCode} = await execa("node", [distFile, "-v"]);
   expect(stdout).toEqual(expected);
   expect(exitCode).toEqual(0);
 });
@@ -58,7 +59,7 @@ test("semver", () => {
 });
 
 async function run(args: string) {
-  return await execa(`node dist/versions.js ${args}`, {shell: true});
+  return await execa(`node ${distFile} ${args}`, {shell: true});
 }
 
 async function verify(version: string) {

diff --git a/versions.ts → index.ts b/versions.ts → index.ts
@@ -5,12 +5,12 @@ import {basename, dirname, join, relative} from "node:path";
 import {cwd, exit as doExit} from "node:process";
 import {platform} from "node:os";
 import {readFileSync, writeFileSync, accessSync, truncateSync, statSync} from "node:fs";
+import {version} from "./package.json" with {type: "json"};
 import type {Opts as MinimistOpts} from "minimist";
 
 export type SemverLevel = "patch" | "minor" | "major";
 
-// @ts-ignore
-const packageVersion = import.meta.VERSION || "0.0.0";
+const packageVersion = version || "0.0.0";
 const esc = (str: string) => str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
 const semverRe = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
 const isSemver = (str: string) => semverRe.test(str.replace(/^v/, ""));
@@ -229,7 +229,7 @@ function joinStrings(strings: (string | undefined)[], separator: string) {
 function exit(err?: Error | string | void) {
   if (err instanceof Error) {
     console.info(String(err.stack || err.message || err).trim());
-  } else {
+  } else if (err) {
     console.info(err);
   }
   doExit(err ? 1 : 0);