recipe-tmlanguage 0.3.4 → 0.3.5

package/bin/{recipe-tmlang.mjs → cli.mjs}

@@ -1,12 +1,34 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
+import { cli, command, flag } from "@kjanat/dreamcli";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { COUNTERS, NUMBER_WORDS, PERIODS, PERIOD_PLURALS } from "tree-sitter-recipe/grammar/dutch";
 import { COMPOUNDING, COMPOUNDING_MULTIWORD, CONDITIONAL, CONDITIONAL_MULTIWORD, DISPENSING, DISPENSING_MULTIWORD, FORMS, FORMS_MULTIWORD, FREQUENCY, ROUTE, ROUTE_MULTIWORD, TIMING, TIMING_MULTIWORD, WARNING } from "tree-sitter-recipe/grammar/latin";
 import { UNITS } from "tree-sitter-recipe/grammar/units";
-import { cli, command, flag } from "@kjanat/dreamcli";
 import { mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
 import { cwd, exit } from "node:process";
+import { readFile } from "node:fs/promises";
+//#region bin/lib/utils.ts
+const require$1 = createRequire(import.meta.url);
+const toPath = (resolved) => resolved.startsWith("file:") ? fileURLToPath(resolved) : resolved;
+function packageDir(specifier) {
+	return resolve(dirname(toPath(require$1.resolve(specifier))));
+}
+function resolveImportMeta(specifier) {
+	return toPath(import.meta.resolve(specifier));
+}
+/**
+* Default path of the generated grammar: `recipe.tmLanguage.json` at the
+* package root. Anchored on `#pkg` (package.json / deno.json — always present)
+* rather than `#tmLang`, because the grammar is generated + gitignored and may
+* not exist yet on a fresh checkout, and `import.meta.resolve` throws on a
+* missing target. Existence is enforced later, where the file is actually read.
+*/
+function defaultGrammarPath() {
+	return resolve(dirname(resolveImportMeta("#pkg")), "recipe.tmLanguage.json");
+}
+//#endregion
 //#region src/grammar.ts
 /**
 * @file Pure grammar builder — imports the tree-sitter-recipe vocabulary and
@@ -15,6 +37,8 @@ import { cwd, exit } from "node:process";
 *
 * Scopes are standard TextMate names with a `.recipe` suffix so themes paint
 * recipe blocks without a custom theme shipment.
+*
+* @module recipe-tmlanguage/src/grammar
 */
 const SCOPE = {
 	rxMarker: "keyword.control.directive.rx.recipe",
@@ -268,7 +292,7 @@ function serializeGrammar(g, indent) {
 //#endregion
 //#region bin/commands/generate.ts
 const indentOf = (raw) => raw === "tab" ? "tab" : Number(raw);
-const DEFAULT_OUT$1 = `${dirname(createRequire(import.meta.url).resolve("#pkg"))}/recipe.tmLanguage.json`;
+const DEFAULT_OUT$1 = defaultGrammarPath();
 const generateCmd = command("generate").description("Build the TextMate grammar from the tree-sitter-recipe vocabulary").flag("out", flag.string().alias("o").default(DEFAULT_OUT$1).describe("Output JSON path")).flag("indent", flag.enum([
 	"tab",
 	"2",
@@ -296,6 +320,31 @@ const generateCmd = command("generate").description("Build the TextMate grammar
 	log(`  vocab: ${v.frequency} frequency · ${v.timing.single}+${v.timing.multi} timing · ${v.route.single}+${v.route.multi} route · ${v.dispensing.single}+${v.dispensing.multi} dispensing · ${v.forms.single}+${v.forms.multi} forms · ${v.compounding.single}+${v.compounding.multi} compounding · ${v.conditional.single}+${v.conditional.multi} conditional · ${v.warning} warning · ${v.units} units`);
 });
 //#endregion
+//#region src/deps/oniguruma.ts
+const require = createRequire(import.meta.url);
+const oniguruma = require("vscode-oniguruma");
+let loadPromise;
+function loadOniguruma() {
+	loadPromise ??= (async () => {
+		const wasm = await readFile(require.resolve("vscode-oniguruma/release/onig.wasm"));
+		await oniguruma.loadWASM(wasm);
+	})();
+	return loadPromise;
+}
+async function createOnigLib() {
+	await loadOniguruma();
+	return {
+		createOnigScanner(patterns) {
+			return oniguruma.createOnigScanner(patterns);
+		},
+		createOnigString(string) {
+			return oniguruma.createOnigString(string);
+		}
+	};
+}
+const { loadWASM, createOnigScanner, createOnigString, OnigScanner, OnigString } = oniguruma;
+const { parseRawGrammar, Registry, INITIAL } = createRequire(import.meta.url)("vscode-textmate");
+//#endregion
 //#region src/verifier.ts
 /**
 * @file Pure verifier — tokenizes tree-sitter-recipe's own highlight fixtures
@@ -304,10 +353,9 @@ const generateCmd = command("generate").description("Build the TextMate grammar
 *
 * No CLI concerns here; the caller supplies paths and decides how to present
 * the result (text table / JSON / exit code).
+*
+* @module recipe-tmlanguage/src/verifier
 */
-const require$1 = createRequire(import.meta.url);
-const oniguruma = require$1("vscode-oniguruma");
-const { parseRawGrammar, Registry } = require$1("vscode-textmate");
 const CAPTURE_EXPECTS = {
 	"keyword.directive": "keyword.control.directive",
 	"keyword.repeat": "keyword.other.frequency",
@@ -360,12 +408,7 @@ function parseFixture(content, name) {
 	};
 }
 async function verify(opts) {
-	const wasmBin = readFileSync(opts.onigWasmPath);
-	await oniguruma.loadWASM(wasmBin.buffer);
-	const onigLib = Promise.resolve({
-		createOnigScanner: (patterns) => new oniguruma.OnigScanner(patterns),
-		createOnigString: (s) => new oniguruma.OnigString(s)
-	});
+	const onigLib = createOnigLib();
 	const rawGrammar = parseRawGrammar(readFileSync(opts.grammarPath, "utf-8"), opts.grammarPath);
 	const grammar = await new Registry({
 		onigLib,
@@ -410,15 +453,12 @@ async function verify(opts) {
 }
 //#endregion
 //#region bin/commands/verify.ts
-const require = createRequire(import.meta.url);
-const DEFAULT_FIXTURES_DIR = resolve(resolve(dirname(require.resolve("tree-sitter-recipe/package.json"))), "test/highlight");
-const DEFAULT_ONIG_WASM = require.resolve("vscode-oniguruma/release/onig.wasm");
-const DEFAULT_OUT = `${dirname(require.resolve("#pkg"))}/recipe.tmLanguage.json`;
-const verifyCmd = command("verify").description("Tokenize tree-sitter-recipe highlight fixtures and assert scope matches").flag("grammar", flag.string().alias("g").default(DEFAULT_OUT).describe("Path to .tmLanguage.json")).flag("fixtures", flag.string().alias("f").default(DEFAULT_FIXTURES_DIR).describe("Directory of .recipe fixtures")).flag("onig-wasm", flag.string().default(DEFAULT_ONIG_WASM).describe("Path to oniguruma WASM")).flag("max-failures", flag.number().default(40).describe("Max failures to print (0 = all)")).action(async ({ flags, out }) => {
+const DEFAULT_FIXTURES_DIR = resolve(packageDir("tree-sitter-recipe/package.json"), "test/highlight");
+const DEFAULT_OUT = defaultGrammarPath();
+const verifyCmd = command("verify").description("Tokenize tree-sitter-recipe highlight fixtures and assert scope matches").flag("grammar", flag.string().alias("g").default(DEFAULT_OUT).describe("Path to .tmLanguage.json")).flag("fixtures", flag.string().alias("f").default(DEFAULT_FIXTURES_DIR).describe("Directory of .recipe fixtures")).flag("max-failures", flag.number().default(40).describe("Max failures to print (0 = all)")).action(async ({ flags, out }) => {
 	const result = await verify({
 		grammarPath: resolve(cwd(), flags.grammar),
-		fixturesDir: resolve(cwd(), flags.fixtures),
-		onigWasmPath: resolve(cwd(), flags["onig-wasm"])
+		fixturesDir: resolve(cwd(), flags.fixtures)
 	});
 	const failuresLen = result.failures.length;
 	const { json, jsonMode, setExitCode, log } = out;
@@ -443,7 +483,7 @@ const verifyCmd = command("verify").description("Tokenize tree-sitter-recipe hig
 	setExitCode(1);
 });
 //#endregion
-//#region bin/recipe-tmlang.ts
+//#region bin/cli.ts
 /**
 * recipe-tmlang — TextMate grammar generator & verifier for recipe-tmlanguage.
 *
@@ -454,14 +494,12 @@ const verifyCmd = command("verify").description("Tokenize tree-sitter-recipe hig
 * Zero manual argparse — argument parsing, help, and completions all come from
 * {@link https://github.com/kjanat/dreamcli | DreamCLI}. `--json` is a DreamCLI built-in;
 * we branch on {@linkcode out.jsonMode | https://dreamcli.kjanat.com/reference/symbols/main/Out#jsonmode}.
+*
+* @module recipe-tmlanguage/bin
 */
-const app = cli("recipe-tmlanguage").packageJson({
-	repository: {
-		"type": "git",
-		"url": "git+https://github.com/kjanat/recipe-tmlanguage.git"
-	},
-	homepage: "https://github.com/kjanat/recipe-tmlanguage#recipe-tmlanguage",
-	version: "0.3.4"
+const app = cli("recipe-tmlanguage").manifest({
+	from: import.meta.url,
+	files: ["package.json", "deno.json"]
 }).links().description("TextMate grammar generator & verifier for the recipe DSL").command(generateCmd).command(verifyCmd).completions();
 if (import.meta.main) app.run();
 //#endregion

package/bin/{recipe-tmlang.ts → cli.ts}

@@ -9,13 +9,16 @@
  * Zero manual argparse — argument parsing, help, and completions all come from
  * {@link https://github.com/kjanat/dreamcli | DreamCLI}. `--json` is a DreamCLI built-in;
  * we branch on {@linkcode out.jsonMode | https://dreamcli.kjanat.com/reference/symbols/main/Out#jsonmode}.
+ *
+ * @module recipe-tmlanguage/bin
  */
-import { generateCmd } from "#bin/commands/generate";
-import { verifyCmd } from "#bin/commands/verify";
-import { homepage, name, repository, version } from "#pkg" with { type: "json" };
 import { cli } from "@kjanat/dreamcli";
+import { generateCmd } from "./commands/generate.ts";
+import { verifyCmd } from "./commands/verify.ts";
 
-const app = cli(name).packageJson({ repository, homepage, version }).links()
+const app = cli("recipe-tmlanguage")
+	.manifest({ from: import.meta.url, files: ["package.json", "deno.json"] })
+	.links()
 	.description("TextMate grammar generator & verifier for the recipe DSL")
 	.command(generateCmd)
 	.command(verifyCmd)

package/bin/commands/generate.ts

@@ -1,13 +1,12 @@
-import { buildGrammar, serializeGrammar } from "#grammar";
+import { defaultGrammarPath } from "#bin/lib/utils.ts";
+import { buildGrammar, serializeGrammar } from "#src/grammar.ts";
 import { command, flag } from "@kjanat/dreamcli";
 import { mkdirSync, writeFileSync } from "node:fs";
-import { createRequire } from "node:module";
 import { dirname, resolve } from "node:path";
 import { cwd } from "node:process";
 
 const indentOf = (raw: string): "tab" | number => (raw === "tab" ? "tab" : Number(raw));
-const require = createRequire(import.meta.url);
-const DEFAULT_OUT = `${dirname(require.resolve("#pkg"))}/recipe.tmLanguage.json`;
+const DEFAULT_OUT = defaultGrammarPath();
 
 export const generateCmd = command("generate")
 	.description("Build the TextMate grammar from the tree-sitter-recipe vocabulary")

package/bin/commands/verify.ts

@@ -1,26 +1,21 @@
-import { verify } from "#verifier";
+import { defaultGrammarPath, packageDir } from "#bin/lib/utils.ts";
+import { verify } from "#src/verifier.ts";
 import { command, flag } from "@kjanat/dreamcli";
-import { createRequire } from "node:module";
-import { dirname, resolve } from "node:path";
+import { resolve } from "node:path";
 import { cwd, exit } from "node:process";
 
-const require = createRequire(import.meta.url);
-const TS_RX_DIR = resolve(dirname(require.resolve("tree-sitter-recipe/package.json")));
-const DEFAULT_FIXTURES_DIR = resolve(TS_RX_DIR, "test/highlight");
-const DEFAULT_ONIG_WASM = require.resolve("vscode-oniguruma/release/onig.wasm");
-const DEFAULT_OUT = `${dirname(require.resolve("#pkg"))}/recipe.tmLanguage.json`;
+const DEFAULT_FIXTURES_DIR = resolve(packageDir("tree-sitter-recipe/package.json"), "test/highlight");
+const DEFAULT_OUT = defaultGrammarPath();
 
 export const verifyCmd = command("verify")
 	.description("Tokenize tree-sitter-recipe highlight fixtures and assert scope matches")
 	.flag("grammar", flag.string().alias("g").default(DEFAULT_OUT).describe("Path to .tmLanguage.json"))
 	.flag("fixtures", flag.string().alias("f").default(DEFAULT_FIXTURES_DIR).describe("Directory of .recipe fixtures"))
-	.flag("onig-wasm", flag.string().default(DEFAULT_ONIG_WASM).describe("Path to oniguruma WASM"))
 	.flag("max-failures", flag.number().default(40).describe("Max failures to print (0 = all)"))
 	.action(async ({ flags, out }) => {
 		const result = await verify({
 			grammarPath: resolve(cwd(), flags.grammar),
 			fixturesDir: resolve(cwd(), flags.fixtures),
-			onigWasmPath: resolve(cwd(), flags["onig-wasm"]),
 		});
 		const failuresLen = result.failures.length;
 		const { json, jsonMode, setExitCode, log } = out;

package/bin/lib/utils.ts

@@ -0,0 +1,29 @@
+import { createRequire } from "node:module";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const require = createRequire(import.meta.url);
+
+const toPath = (resolved: string) =>
+	resolved.startsWith("file:")
+		? fileURLToPath(resolved)
+		: resolved;
+
+export function packageDir(specifier: string): string {
+	return resolve(dirname(toPath(require.resolve(specifier))));
+}
+
+export function resolveImportMeta(specifier: string): string {
+	return toPath(import.meta.resolve(specifier));
+}
+
+/**
+ * Default path of the generated grammar: `recipe.tmLanguage.json` at the
+ * package root. Anchored on `#pkg` (package.json / deno.json — always present)
+ * rather than `#tmLang`, because the grammar is generated + gitignored and may
+ * not exist yet on a fresh checkout, and `import.meta.resolve` throws on a
+ * missing target. Existence is enforced later, where the file is actually read.
+ */
+export function defaultGrammarPath(): string {
+	return resolve(dirname(resolveImportMeta("#pkg")), "recipe.tmLanguage.json");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "recipe-tmlanguage",
-	"version": "0.3.4",
+	"version": "0.3.5",
 	"description": "TextMate grammar for the recipe (.recipe) pharmacological notation language.",
 	"keywords": [
 		"dreamcli",
@@ -21,18 +21,20 @@
 	},
 	"type": "module",
 	"imports": {
-		"#bin/*": "./bin/*.ts",
+		"#bin/*": "./bin/*",
+		"#src/*": "./src/*",
+		"#deps/*": "./src/deps/*",
 		"#pkg": "./package.json",
-		"#grammar": "./src/grammar.ts",
-		"#verifier": "./src/verifier.ts"
+		"#tmLang": "./recipe.tmLanguage.json"
 	},
 	"exports": {
 		".": "./recipe.tmLanguage.json",
+		"./bin": "./bin/cli.mjs",
 		"./package.json": "./package.json"
 	},
 	"main": "./recipe.tmLanguage.json",
 	"module": "./recipe.tmLanguage.json",
-	"bin": "bin/recipe-tmlang.mjs",
+	"bin": "bin/cli.mjs",
 	"directories": {
 		"lib": "/src",
 		"bin": "/bin"
@@ -53,16 +55,17 @@
 		"generate": "run recipe-tmlang generate",
 		"lint": "biome lint",
 		"prepack": "bun run generate && bun run bundle",
-		"recipe-tmlang": "bun bin/recipe-tmlang.ts",
+		"recipe-tmlang": "bun bin/cli.ts",
 		"test": "bun test",
 		"typecheck": "tsc --noEmit",
-		"verify": "run recipe-tmlang verify"
+		"verify": "run recipe-tmlang verify",
+		"version": "node bin/cli.mjs --version"
 	},
 	"dependencies": {
-		"@kjanat/dreamcli": "^2.4.1",
+		"@kjanat/dreamcli": "^2.5.0",
 		"tree-sitter-recipe": "^0.3.1",
 		"vscode-oniguruma": "^2.0.1",
-		"vscode-textmate": "^9.2.0"
+		"vscode-textmate": "^9.3.2"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.5.1",

package/src/deps/oniguruma.ts

@@ -0,0 +1,35 @@
+// src/deps/oniguruma.ts
+import { readFile } from "node:fs/promises";
+import { createRequire } from "node:module";
+import type { IOnigLib } from "./textmate.ts";
+
+const require = createRequire(import.meta.url);
+const oniguruma: typeof import("vscode-oniguruma") = require("vscode-oniguruma");
+
+let loadPromise: Promise<void> | undefined;
+
+export function loadOniguruma(): Promise<void> {
+	loadPromise ??= (async () => {
+		const wasmPath = require.resolve("vscode-oniguruma/release/onig.wasm");
+		const wasm = await readFile(wasmPath);
+
+		await oniguruma.loadWASM(wasm);
+	})();
+
+	return loadPromise;
+}
+
+export async function createOnigLib(): Promise<IOnigLib> {
+	await loadOniguruma();
+
+	return {
+		createOnigScanner(patterns) {
+			return oniguruma.createOnigScanner(patterns);
+		},
+		createOnigString(string) {
+			return oniguruma.createOnigString(string);
+		},
+	};
+}
+
+export const { loadWASM, createOnigScanner, createOnigString, OnigScanner, OnigString } = oniguruma;

package/src/deps/textmate.ts

@@ -0,0 +1,8 @@
+import { createRequire } from "node:module";
+
+export type { IOnigLib, StateStack } from "vscode-textmate";
+const require = createRequire(import.meta.url);
+
+const textmate: typeof import("vscode-textmate") = require("vscode-textmate");
+
+export const { parseRawGrammar, Registry, INITIAL } = textmate;

package/src/grammar.ts

@@ -5,6 +5,8 @@
  *
  * Scopes are standard TextMate names with a `.recipe` suffix so themes paint
  * recipe blocks without a custom theme shipment.
+ *
+ * @module recipe-tmlanguage/src/grammar
  */
 import { COUNTERS, NUMBER_WORDS, PERIOD_PLURALS, PERIODS } from "tree-sitter-recipe/grammar/dutch";
 import {

package/src/verifier.ts

@@ -5,17 +5,15 @@
  *
  * No CLI concerns here; the caller supplies paths and decides how to present
  * the result (text table / JSON / exit code).
+ *
+ * @module recipe-tmlanguage/src/verifier
  */
 import { readdirSync, readFileSync } from "node:fs";
-import { createRequire } from "node:module";
 import { resolve } from "node:path";
 
-import type { StateStack } from "vscode-textmate";
-
-const require = createRequire(import.meta.url);
-const oniguruma: typeof import("vscode-oniguruma") = require("vscode-oniguruma");
-const textmate: typeof import("vscode-textmate") = require("vscode-textmate");
-const { parseRawGrammar, Registry } = textmate;
+import { createOnigLib } from "#deps/oniguruma.ts";
+import type { StateStack } from "#deps/textmate.ts";
+import { parseRawGrammar, Registry } from "#deps/textmate.ts";
 
 // ── capture → scope mapping (inverse of grammar.ts SCOPE) ───────────────────
 // Fixtures speak tree-sitter capture names; the tokenizer speaks TextMate
@@ -57,7 +55,6 @@ export type VerifyResult = {
 export type VerifyOptions = {
 	grammarPath: string;
 	fixturesDir: string;
-	onigWasmPath: string;
 };
 
 // ── fixture parser ──────────────────────────────────────────────────────────
@@ -105,13 +102,7 @@ function parseFixture(content: string, name: string): { source: string; asserts:
 
 // ── main ────────────────────────────────────────────────────────────────────
 export async function verify(opts: VerifyOptions): Promise<VerifyResult> {
-	const wasmBin = readFileSync(opts.onigWasmPath);
-	await oniguruma.loadWASM(wasmBin.buffer as ArrayBuffer);
-
-	const onigLib = Promise.resolve({
-		createOnigScanner: (patterns: string[]) => new oniguruma.OnigScanner(patterns),
-		createOnigString: (s: string) => new oniguruma.OnigString(s),
-	});
+	const onigLib = createOnigLib();
 
 	const rawGrammar = parseRawGrammar(
 		readFileSync(opts.grammarPath, "utf-8"),