four-stroke 0.2.2 → 0.3.0

package/bin/api-types.mjs

@@ -1,15 +1,23 @@
 #!/usr/bin/env node
 
+import ts from "@typescript/typescript6";
 import fs from "node:fs";
-import openapiTS from "openapi-typescript";
 import { format } from "oxfmt";
-import ts from "typescript";
+import openapiTS from "../src/openapi-typescript.mjs";
 
 const services = process.argv[2].split(",");
 
 const UUID = ts.factory.createTypeReferenceNode(ts.factory.createIdentifier("UUID"));
 const NULL = ts.factory.createLiteralTypeNode(ts.factory.createNull());
 
+const isEmpty = (node) =>
+  ts.isTypeAliasDeclaration(node) &&
+  ts.isTypeReferenceNode(node.type) &&
+  ts.isIdentifier(node.type.typeName) &&
+  node.type.typeName.text === "Record" &&
+  node.type.typeArguments?.length === 2 &&
+  node.type.typeArguments[1].kind === ts.SyntaxKind.NeverKeyword;
+
 await Promise.all(
   services.map(async (service) => {
     const output = await openapiTS(`${service}/doc`, {
@@ -20,18 +28,18 @@ await Promise.all(
         return null;
       },
     });
+    const path = `src/__definitions__/${service.replace("https://", "").replace("http://", "")}-definitions.ts`;
     const printer = ts.createPrinter({});
-    const resultFile = ts.createSourceFile(
-      `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
-      "",
-      ts.ScriptTarget.Latest,
-    );
-    const result = printer.printNode(ts.EmitHint.Unspecified, output[0], resultFile);
+    const resultFile = ts.createSourceFile(path, "", ts.ScriptTarget.Latest);
+    const result = output
+      .filter((node) => !isEmpty(node))
+      .map((node) => printer.printNode(ts.EmitHint.Unspecified, node, resultFile))
+      .join("\n\n");
     fs.writeFileSync(
-      `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
+      path,
       (
         await format(
-          `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
+          path,
           `// Autogenerated by two-stroke
 
 ${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf8")}

package/bin/lint.mjs

@@ -3,9 +3,13 @@
 import fs from "fs";
 import { cmd } from "../src/cmd.mjs";
 
+const isApp = fs.readdirSync(".").some((file) => file.startsWith("vite.config."));
+
 if (fs.existsSync("wrangler.jsonc")) {
   cmd("wrangler types --env-file /dev/null --strict-vars false --check");
 }
-cmd("react-router typegen");
+if (isApp) {
+  cmd("react-router typegen");
+}
 cmd("oxfmt --check");
-cmd("oxlint --report-unused-disable-directives-severity=warn");
+cmd("oxlint --report-unused-disable-directives-severity=error");

package/bin/test.mjs

@@ -3,6 +3,7 @@
 import { cmd } from "../src/cmd.mjs";
 
 cmd("vitest", [
+  "--passWithNoTests",
   ...(!process.argv.slice(2).includes("-w") && !process.argv.slice(2).includes("--watch")
     ? ["--run"]
     : []),

package/bin/type-check.mjs

@@ -3,9 +3,13 @@
 import fs from "fs";
 import { cmd } from "../src/cmd.mjs";
 
+const isApp = fs.readdirSync(".").some((file) => file.startsWith("vite.config."));
+
 if (fs.existsSync("wrangler.jsonc")) {
   cmd("wrangler types --env-file /dev/null --strict-vars false");
 }
-cmd("react-router typegen");
-cmd("vite build");
+if (isApp) {
+  cmd("react-router typegen");
+  cmd("vite build");
+}
 cmd("tsc --noEmit");

package/oxlint.config.mjs

@@ -1,17 +1,19 @@
 import { defineConfig } from "oxlint";
 
 export default defineConfig({
-  plugins: ["eslint", "typescript", "unicorn", "oxc", "import", "promise", "vitest", "react"],
+  plugins: ["eslint", "typescript", "unicorn", "oxc", "import", "promise", "react"],
   options: {
     typeAware: true,
   },
   categories: {
     correctness: "error",
-    suspicious: "warn",
+    suspicious: "error",
     perf: "error",
-    style: "warn",
+    style: "error",
   },
   rules: {
+    // Judge a wrapped comment by its first line, so the second can carry on the sentence.
+    "capitalized-comments": ["error", "always", { ignoreConsecutiveComments: true }],
     "no-map-spread": "off",
     "no-named-export": "off",
     "no-magic-numbers": "off",
@@ -22,7 +24,6 @@ export default defineConfig({
     "sort-keys": "off",
     curly: "off",
     "switch-case-braces": "off",
-    "vitest/require-hook": "off",
     "no-ternary": "off",
     "group-exports": "off",
     "exports-last": "off",
@@ -30,7 +31,6 @@ export default defineConfig({
     "no-null": "off",
     "consistent-type-specifier-style": "off",
     "max-statements": "off",
-    "consistent-type-imports": "error",
     "relative-url-style": ["error", "always"],
     "no-namespace": "off",
     "no-duplicate-imports": ["error", { allowSeparateTypeImports: true }],
@@ -53,45 +53,75 @@ export default defineConfig({
     "no-anonymous-default-export": "off",
     "no-continue": "off",
     "init-declarations": "off",
-    "vitest/prefer-to-be-truthy": "off",
-    "vitest/prefer-to-be-falsy": "off",
-    "vitest/prefer-expect-assertions": "off",
-    "vitest/prefer-importing-vitest-globals": "off",
-    "vitest/no-importing-vitest-globals": "error",
-    "vitest/require-top-level-describe": "off",
-    "vitest/max-expects": "off",
-    "vitest/no-hooks": "off",
     "unicorn/number-literal-case": "off",
     "eslint/one-var": "off",
-    "vitest/prefer-called-once": "off",
-    // Judge a wrapped comment by its first line, so the second can carry on the sentence.
-    "capitalized-comments": ["warn", "always", { ignoreConsecutiveComments: true }],
-    // Assertion helpers are `assert` or named `expect…` (`expectRedirect`), so it
-    // can see them; anything left over really asserts nothing.
-    "vitest/expect-expect": ["warn", { assertFunctionNames: ["expect", "expect*", "assert"] }],
-    // Route tests are titled by the request they make: "GET /thing", not "gET /thing".
-    "vitest/prefer-lowercase-title": [
-      "warn",
-      { allowedPrefixes: ["GET", "POST", "PUT", "DELETE", "PATCH", "JWT"] },
-    ],
-    "react/react-in-jsx-scope": "off",
-    "react/jsx-max-depth": "off",
+    // A ternary only reads better when both branches fit on one line.
+    "unicorn/prefer-ternary": ["error", "only-single-line"],
+    "unicorn/prefer-spread": "off", // Upstream bug
+    // Positional capture groups are used throughout; naming them all would
+    // reindex every `match[n]` consumer for no functional gain.
+    "eslint/prefer-named-capture-group": "off",
+    // Stylesheets can only be pulled in for their side effects.
+    "import/no-unassigned-import": ["error", { allow: ["**/*.css", "**/*.scss"] }],
+    "react/jsx-max-depth": ["error", { max: 4 }],
+    "react/react-in-jsx-scope": "off", // Automatic JSX runtime (tsconfig `jsx: react-jsx`)
     "react/function-component-definition": [
       "error",
-      {
-        namedComponents: "arrow-function",
-        unnamedComponents: "arrow-function",
-      },
+      { namedComponents: "arrow-function", unnamedComponents: "arrow-function" },
     ],
   },
   overrides: [
     {
-      files: ["*.test.ts", "*.spec.ts"],
+      // Mocks and page factories are test code too, and use vitest.
+      files: [
+        "*.test.ts",
+        "*.test.tsx",
+        "*.spec.ts",
+        "*.spec.tsx",
+        "e2e/**",
+        "**/__mocks__/**",
+        "**/__factories__/**",
+      ],
+      plugins: ["vitest"],
       rules: {
-        "@typescript-eslint/no-explicit-any": "off",
+        "vitest/require-hook": "off",
+        "vitest/prefer-to-be-truthy": "off",
+        "vitest/prefer-to-be-falsy": "off",
+        "vitest/prefer-expect-assertions": "off",
+        "vitest/prefer-importing-vitest-globals": "off",
+        "vitest/prefer-describe-function-title": "off",
+        "vitest/require-top-level-describe": "off",
+        "vitest/max-expects": "off",
+        "vitest/no-hooks": "off",
+        "vitest/prefer-called-once": "off",
+        // `toEqual` ignores keys written as `undefined`; `toStrictEqual` does not. Fixtures
+        // spell those out on purpose, so the fix changes what a test asserts.
+        "vitest/prefer-strict-equal": "off",
+        // `vi.mock(import("x"))` does not type-check against vi.mock's overloads.
+        "vitest/prefer-import-in-mock": "off",
+        // A mock standing in for a whole module would restate that module's signatures.
+        "vitest/require-mock-type-parameters": "off",
+        // Assertion helpers are named `expect…` or `assert…` (`expectRedirect`), or are
+        // page-object methods that wrap expect(), so it can see them; anything left over
+        // really asserts nothing.
+        "vitest/expect-expect": [
+          "error",
+          { assertFunctionNames: ["expect*", "assert*", "page.expect*", "page.*Present"] },
+        ],
+        "vitest/prefer-lowercase-title": "off",
+        // Tests stash a method to restore it after stubbing. It is never called, so
+        // `this` never matters.
+        "unbound-method": "off",
         // A helper belongs next to the only test that uses it; hoisting it to module
         // scope saves nothing in a test run and puts it out of sight.
         "unicorn/consistent-function-scoping": "off",
+        "vitest/no-conditional-expect": "off",
+        "vitest/prefer-called-with": "off",
+        "prefer-arrow-callback": "off",
+        "vitest/consistent-vitest-vi": "off", // Upstream bug
+        "vitest/consistent-test-filename": "off",
+        // UI steps, polling and findBy queries are sequential by design.
+        "eslint/no-await-in-loop": "off",
       },
     },
     {
@@ -100,13 +130,10 @@ export default defineConfig({
         "no-unused-vars": "off",
         "@typescript-eslint/no-redundant-type-constituents": "off",
         "@typescript-eslint/no-duplicate-type-constituents": "off",
-        "group-exports": "off",
-        "exports-last": "off",
-        "consistent-indexed-object-style": "off",
       },
     },
     {
-      files: ["bin/*.mjs", "src/cmd.mjs"],
+      files: ["bin/*.mjs", "src/cmd.mjs", "src/openapi-typescript.mjs"],
       rules: {
         "import/no-nodejs-modules": "off",
         "prefer-destructuring": "off",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-stroke",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "Simple Cloudflare Worker SSR SPA framework",
   "license": "MIT",
   "repository": {
@@ -20,15 +20,16 @@
   "main": "src/fake.ts",
   "dependencies": {
     "@types/react": "^19.3.0",
+    "@typescript/typescript6": "^6.0.2",
     "openapi-typescript": "^7.13.0",
     "typescript": "^7.0.2"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.22.0",
-    "knip": "^6.35.1",
-    "oxfmt": "^0.70.0",
-    "oxlint": "^1.82.0",
-    "oxlint-tsgolint": "^7.0.2001",
+    "knip": "^6.38.0",
+    "oxfmt": "^0.71.0",
+    "oxlint": "^1.86.0",
+    "oxlint-tsgolint": "^7.0.2003",
     "vitest": "^4.1.11"
   },
   "peerDependencies": {
@@ -43,5 +44,12 @@
   },
   "engines": {
     "node": "^24.9.0"
+  },
+  "scripts": {
+    "dev": "node bin/dev.mjs",
+    "format": "node bin/format.mjs",
+    "lint": "node bin/lint.mjs",
+    "test": "node bin/test.mjs",
+    "type-check": "node bin/type-check.mjs"
   }
 }

package/src/openapi-typescript.mjs

@@ -0,0 +1,15 @@
+import { registerHooks } from "node:module";
+
+// Openapi-typescript needs the TypeScript 6 JS API (ts.factory), which TypeScript 7 no longer
+// ships. Redirect its `typescript` import to @typescript/typescript6, resolved from two-stroke's
+// own dependencies so this works however two-stroke is installed.
+registerHooks({
+  resolve(specifier, context, nextResolve) {
+    if (specifier === "typescript" && context.parentURL?.includes("/openapi-typescript/")) {
+      return nextResolve("@typescript/typescript6", { ...context, parentURL: import.meta.url });
+    }
+    return nextResolve(specifier, context);
+  },
+});
+
+export default (await import("openapi-typescript")).default;