typescript-bedrock 0.1.0 → 0.1.2

package/files/base/justfile

@@ -8,10 +8,11 @@ mod? typescript ".just/typescript.just"
 mod? rust ".just/rust.just"
 mod? swift ".just/swift.just"
 mod? cpp ".just/cpp.just"
+mod? jvm ".just/jvm.just"
 
 import? "project.just"
 
-languages := "typescript rust swift cpp"
+languages := "typescript rust swift cpp jvm"
 
 # List the recipes.
 default:

package/files/tsconfig.json

@@ -4,5 +4,5 @@
 	"compilerOptions": {
 		"rootDir": "."
 	},
-	"exclude": ["**/.build", "**/coverage", "**/dist", "**/target"]
+	"exclude": ["**/.build", "**/build", "**/coverage", "**/dist", "**/target"]
 }

package/oxlintrc.json

@@ -339,6 +339,12 @@
 				"import/no-default-export": "off"
 			}
 		},
+		{
+			"files": ["**/src/theme/**"],
+			"rules": {
+				"import/no-default-export": "off"
+			}
+		},
 		{
 			"files": ["**/*.d.{ts,mts,cts}"],
 			"rules": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "typescript-bedrock",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"description": "Strictest Bun + TypeScript 7 tooling: shared configs, git hooks, a guard, and an adopt command.",
 	"license": "MIT",
 	"author": "xsyetopz",
@@ -28,7 +28,7 @@
 		"eslint-plugin-jsdoc": "65.4.5",
 		"markdownlint-cli2": "0.24.0",
 		"markdownlint-rule-title-case-style": "0.4.3",
-		"oxlint": "1.91.0",
+		"oxlint": "1.93.0",
 		"oxlint-tsgolint": "7.0.2006",
 		"typescript": "7.0.2"
 	},

package/src/adopt/blocks.ts

@@ -17,6 +17,7 @@ const ORDER = [
 	"rust-bedrock",
 	"swift-bedrock",
 	"swift-bedrock-cxx",
+	"jvm-bedrock",
 ];
 
 /** Where the first line starting with `marker` begins in `text`, or -1. */

package/src/adopt/tests.ts

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 
+import { listFiles } from "../files.ts";
 import type { Step } from "./steps.ts";
 
 const TEST_FILES = new Bun.Glob(
@@ -39,18 +40,15 @@ export const migrateTestFile = (text: string): string => {
 		: text;
 };
 
-/** Rewrites each test file outside node_modules that is not on bun:test yet. */
+/** Rewrites each test file outside node_modules and git's ignored files that is not on bun:test yet. */
 export const testSteps = async (target: string): Promise<Step[]> => {
-	const steps: Step[] = [];
-	for await (const path of TEST_FILES.scan({ cwd: target, dot: false })) {
-		if (path.split("/").includes("node_modules")) {
-			continue;
-		}
-		const text = await Bun.file(join(target, path)).text();
+	const paths = await listFiles(target, TEST_FILES);
+	const texts = await Promise.all(
+		paths.map((path) => Bun.file(join(target, path)).text()),
+	);
+	return paths.flatMap((path, index): Step[] => {
+		const text = texts[index] ?? "";
 		const content = migrateTestFile(text);
-		if (content !== text) {
-			steps.push({ kind: "write", path, content });
-		}
-	}
-	return steps;
+		return content === text ? [] : [{ kind: "write", path, content }];
+	});
 };

package/src/adopt/tsconfig.ts

@@ -23,8 +23,17 @@ const REMOVED_OPTIONS = new Set([
 /** Project facts the base config cannot know. */
 const PROJECT_OPTIONS = new Set(["jsx", "lib", "types"]);
 const BASE_FILE = "typescript-bedrock/tsconfig.base.json";
-/** Build output a repo can hold: Bun's, Rust's (`cargo doc` writes JavaScript), and SwiftPM's. */
-const GENERATED_DIRS = ["**/.build", "**/coverage", "**/dist", "**/target"];
+/**
+ * Build output a repo can hold: Bun's, Rust's (`cargo doc` writes JavaScript), SwiftPM's, and
+ * Gradle's (its test reports are JavaScript).
+ */
+const GENERATED_DIRS = [
+	"**/.build",
+	"**/build",
+	"**/coverage",
+	"**/dist",
+	"**/target",
+];
 const EMIT_OPTIONS = [
 	"composite",
 	"declaration",

package/src/files.ts

@@ -0,0 +1,23 @@
+import { join } from "node:path";
+
+import { $, type Glob } from "bun";
+
+/** The files under `cwd` that match `glob`, without the ones git ignores and without node_modules. */
+export const listFiles = async (cwd: string, glob: Glob): Promise<string[]> => {
+	const git = await $`git ls-files --cached --others --exclude-standard`
+		.cwd(cwd)
+		.nothrow()
+		.quiet();
+	const listed = (
+		git.exitCode === 0
+			? git.stdout.toString().split("\n")
+			: await Array.fromAsync(glob.scan({ cwd }))
+	).filter(
+		(path) => glob.match(path) && !path.split("/").includes("node_modules"),
+	);
+	// The index still lists a file deleted since the last commit.
+	const present = await Promise.all(
+		listed.map((path) => Bun.file(join(cwd, path)).exists()),
+	);
+	return listed.filter((_, index) => present[index] === true);
+};

package/src/guard.ts

@@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url";
 import { $, Glob } from "bun";
 
 import { planAdoption, PROJECT_FILES } from "./adopt/adopt.ts";
+import { listFiles } from "./files.ts";
 
 // Written as alternations so this file does not match itself.
 const SUPPRESSION =
@@ -40,25 +41,6 @@ const FOREIGN_FILES = [
 	"yarn.lock",
 ];
 
-const listFiles = async (cwd: string, glob: Glob): Promise<string[]> => {
-	const git = await $`git ls-files --cached --others --exclude-standard`
-		.cwd(cwd)
-		.nothrow()
-		.quiet();
-	const listed = (
-		git.exitCode === 0
-			? git.stdout.toString().split("\n")
-			: await Array.fromAsync(glob.scan({ cwd }))
-	).filter(
-		(path) => glob.match(path) && !path.split("/").includes("node_modules"),
-	);
-	// The index still lists a file deleted since the last commit.
-	const present = await Promise.all(
-		listed.map((path) => Bun.file(join(cwd, path)).exists()),
-	);
-	return listed.filter((_, index) => present[index] === true);
-};
-
 export const findSuppressions = async (
 	cwd: string,
 	paths: readonly string[],