refactor: simplify jsr package

Author: andrewbrey

.github/demos/generate.ts

@@ -1,5 +1,5 @@
-import { expandGlob, joinGlobs } from "../../deps.dev.ts";
-import { $ } from "../../deps.ts";
+import { expandGlob, joinGlobs } from "../../src/deps.dev.ts";
+import { $ } from "../../src/deps.ts";
 import { invariant } from "../../src/util.ts";
 
 const root = $.relativePath(import.meta.url, "..", "..");

.hooks/pre-commit

@@ -1,8 +1,8 @@
 #!/usr/bin/env -S deno run -A
 
-import { equals, greaterThan, parse } from "../deps.dev.ts";
-import { $, colors } from "../deps.ts";
-import { daxVersion, version } from "../mod.ts";
+import { equals, greaterThan, parse } from "../src/deps.dev.ts";
+import { $, colors } from "../src/deps.ts";
+import { daxVersion, version } from "../src/cli.ts";
 
 const root = $.relativePath(import.meta.url, "..");
 

.hooks/pre-push

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S deno run -A
 
-import { $ } from "../deps.ts";
+import { $ } from "../src/deps.ts";
 
 const root = $.relativePath(import.meta.url, "..");
 

deno.jsonc

@@ -1,12 +1,20 @@
 {
 	"name": "@andrewbrey/mdrb",
 	"version": "3.0.2",
-	"exports": "./mod.ts",
+	"exports": "./src/cli.ts",
+	"publish": {
+		"include": [
+			"LICENSE",
+			"README.md",
+			"demo.md",
+			"src/**/*.ts"
+		]
+	},
 	"fmt": { "lineWidth": 120, "useTabs": true, "exclude": [".deno_cache", "deno.lock"] },
 	"lint": { "exclude": [".deno_cache", "deno.lock"] },
 	"tasks": {
 		"test": "deno test -A --no-check",
-		"lint": "deno check mod.ts && deno lint && deno fmt --check",
+		"lint": "deno check **/*.ts && deno lint && deno fmt --check",
 		// Bump dependencies using @molt/cli (https://jsr.io/@molt/cli) - may prompt for read perms on ~/.local/share/deno-wasmbuild
 		"deps": "deno run -E=XDG_DATA_HOME,HOME,GITHUB_TOKEN -R='./' -W=deno.jsonc -N=api.jsr.io,jsr.io,deno.land,registry.npmjs.org,esm.sh jsr:@molt/cli --write deno.jsonc",
 		"demos": "deno run -A .github/demos/generate.ts",

mod.test.ts renamed to src/cli.test.ts

@@ -1,8 +1,8 @@
 import { assertEquals, assertRejects, assertStringIncludes } from "./deps.dev.ts";
 import { $, CommandBuilder } from "./deps.ts";
 
-const mod = $.relativePath(import.meta.url, "mod.ts");
-const demo = $.relativePath(import.meta.url, "demo.md");
+const cli = $.relativePath(import.meta.url, "cli.ts");
+const demo = $.relativePath(import.meta.url, "..", "demo.md");
 const demoText = Deno.readTextFileSync(demo);
 
 const t$ = $.build$({
@@ -55,7 +55,7 @@ function withServer(action: (serverUrl: URL) => Promise<void>) {
 }
 
 Deno.test("mdrb works with local file", async () => {
-	const { combined } = await t$`deno run -A ${mod} ${demo}`.stdinText("");
+	const { combined } = await t$`deno run -A ${cli} ${demo}`.stdinText("");
 
 	const expected = $.dedent`
 		step 1 of 3 // say hello to the world
@@ -75,7 +75,7 @@ Deno.test("mdrb works with local file", async () => {
 });
 
 Deno.test("mdrb shows error output for local file if no file exists", async () => {
-	const { combined, code } = await t$`deno run -A ${mod} ./does-not-exist.md`.stdinText("");
+	const { combined, code } = await t$`deno run -A ${cli} ./does-not-exist.md`.stdinText("");
 
 	assertEquals(code, 2);
 	assertStringIncludes(combined, "no file exists at ./does-not-exist.md");
@@ -84,7 +84,7 @@ Deno.test("mdrb shows error output for local file if no file exists", async () =
 Deno.test("mdrb shows error output for local file if text read", async () => {
 	const file = await Deno.makeTempFile({ prefix: "mdrb-test_", suffix: ".md" });
 
-	const { combined, code } = await t$`deno run -A ${mod} ${file}`.stdinText("");
+	const { combined, code } = await t$`deno run -A ${cli} ${file}`.stdinText("");
 
 	assertEquals(code, 2);
 	assertStringIncludes(combined, `no code to run for ${file}`);
@@ -94,7 +94,7 @@ Deno.test("mdrb works with http", async () => {
 	await withServer(async (serverURL) => {
 		const url = new URL("/demo", serverURL);
 
-		const { combined } = await t$`deno run -A ${mod} ${url}`.stdinText("");
+		const { combined } = await t$`deno run -A ${cli} ${url}`.stdinText("");
 
 		const expected = $.dedent`
 			step 1 of 3 // say hello to the world
@@ -118,15 +118,15 @@ Deno.test("mdrb shows error output for http if no text served", async () => {
 	await withServer(async (serverURL) => {
 		const url = new URL("/does-not-exist", serverURL);
 
-		const { combined, code } = await t$`deno run -A ${mod} ${url}`.stdinText("");
+		const { combined, code } = await t$`deno run -A ${cli} ${url}`.stdinText("");
 
 		assertEquals(code, 2);
 		assertStringIncludes(combined, "no code to run for http://localhost");
 	});
 });
 
 Deno.test("mdrb works with stdin", async () => {
-	const { combined } = await t$`deno run -A ${mod}`.stdinText(demoText);
+	const { combined } = await t$`deno run -A ${cli}`.stdinText(demoText);
 
 	const expected = $.dedent`
 		step 1 of 3 // say hello to the world
@@ -146,7 +146,7 @@ Deno.test("mdrb works with stdin", async () => {
 });
 
 Deno.test("mdrb shows error output for stdin if no text piped", async () => {
-	const { combined, code } = await t$`deno run -A ${mod}`.stdinText("");
+	const { combined, code } = await t$`deno run -A ${cli}`.stdinText("");
 
 	assertEquals(code, 2);
 	assertStringIncludes(combined, "no code to run from stdin");
@@ -157,7 +157,7 @@ Deno.test(
 	async () => {
 		const timeout = 3_000;
 
-		await t$`deno run -A ${mod} --mode runbook`.stdinText(demoText)
+		await t$`deno run -A ${cli} --mode runbook`.stdinText(demoText)
 			.timeout(timeout).noThrow(false);
 	},
 );
@@ -169,7 +169,7 @@ Deno.test("$ is defined by default", async () => {
 		~~~
 	`;
 
-	const { combined } = await t$`deno run -A ${mod}`
+	const { combined } = await t$`deno run -A ${cli}`
 		.stdinText(md);
 
 	assertStringIncludes(combined, "$ is function");
@@ -182,7 +182,7 @@ Deno.test("$ is undefined if dax integration disabled", async () => {
 		~~~
 	`;
 
-	const { combined } = await t$`deno run -A ${mod} --dax=false`
+	const { combined } = await t$`deno run -A ${cli} --dax=false`
 		.stdinText(md);
 
 	assertStringIncludes(combined, "$ is undefined");
@@ -201,7 +201,7 @@ Deno.test("single mode throws if blocks are incompatible", async () => {
 		~~~
 	`;
 
-		await t$`deno run -A ${mod} --mode=single`.stdinText(md).noThrow(false);
+		await t$`deno run -A ${cli} --mode=single`.stdinText(md).noThrow(false);
 	});
 });
 
@@ -216,7 +216,7 @@ Deno.test("summary is printed if one is available", async () => {
 		~~~
 	`;
 
-	const { combined } = await t$`deno run -A ${mod}`
+	const { combined } = await t$`deno run -A ${cli}`
 		.stdinText(md);
 
 	assertStringIncludes(combined, `step 1 of 1 // ${summary}`);
@@ -233,7 +233,7 @@ Deno.test("summary is not printed if one is not available", async () => {
 		~~~
 	`;
 
-	const { stderr } = await t$`deno run -A ${mod}`
+	const { stderr } = await t$`deno run -A ${cli}`
 		.captureCombined(false).stdinText(md);
 
 	assertEquals(stderr.trim(), "step 1 of 1");

mod.ts renamed to src/cli.ts

@@ -1,6 +1,6 @@
 import { $, colors, Command, EnumType, readAll, ValidationError } from "./deps.ts";
-import { type CodeBlock, mdCodeBlocks, renderMDToString } from "./src/markdown.ts";
-import { invariant, toFileURL } from "./src/util.ts";
+import { type CodeBlock, mdCodeBlocks, renderMDToString } from "./markdown.ts";
+import { invariant, toFileURL } from "./util.ts";
 
 /* Current version of MDRB */
 export const version = "3.0.2";

deps.dev.ts renamed to src/deps.dev.ts

@@ -1,5 +1,5 @@
-import { assertEquals } from "../deps.dev.ts";
-import { $ } from "../deps.ts";
+import { assertEquals } from "./deps.dev.ts";
+import { $ } from "./deps.ts";
 import { fileProtocolifyLocalImports, mdCodeBlocks, replaceImportMeta } from "./markdown.ts";
 
 const FENCE = "```";

deps.ts renamed to src/deps.ts

@@ -1,4 +1,4 @@
-import { $, colors, type Extension, renderMarkdown } from "../deps.ts";
+import { $, colors, type Extension, renderMarkdown } from "./deps.ts";
 
 export type CodeBlock = {
 	idx: number;

src/markdown.test.ts

@@ -1,5 +1,5 @@
-import { assertEquals, assertInstanceOf, assertThrows } from "../deps.dev.ts";
-import { $, POSIX_SEP, SEP } from "../deps.ts";
+import { assertEquals, assertInstanceOf, assertThrows } from "./deps.dev.ts";
+import { $, POSIX_SEP, SEP } from "./deps.ts";
 import { invariant, toFileURL } from "./util.ts";
 
 Deno.test("invariant throws if condition false", () => {

src/markdown.ts

@@ -1,4 +1,4 @@
-import { $, POSIX_SEP, SEP } from "../deps.ts";
+import { $, POSIX_SEP, SEP } from "./deps.ts";
 
 /** Enforce that a condition is true, and narrow types based on the assertion */
 export function invariant(