@athrio/loom 0.0.4 → 0.0.5

package/dist/main.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env bun
 import { t as __commonJSMin } from "./rolldown-runtime-yvBN9yY6.js";
-import { $ as get, $n as filter, $t as ignore, A as Boolean, An as mergeAll, Ar as identity, At as makeUnsafe, B as make$8, Bn as fail$2, Bt as catchTag, C as errorReported, Cn as try_, Cr as format, Ct as endUnsafe, D as make$9, Dr as isNullish, Dt as offerUnsafe, E as Crypto$1, En as catchDone, Er as isNotUndefined, Et as offer, F as FileDescriptor, Fn as MinimumLogLevel, Ft as as, G as isStream, Gn as fail$3, Gt as ensuring, H as decodeText, Hn as Done, Ht as catch_, I as FileSystem, In as _await, It as asVoid, J as run$2, Jn as empty, Jt as fnUntraced, K as merge, Kn as Reference, Kt as fail, L as FileTypeId, Ln as doneUnsafe, Lt as callback, M as TrueValues, Mn as provideMerge, Mr as pipeArguments, Mt as acquireRelease, N as Path$1, Nn as succeed$3, Nt as addFinalizer$1, O as error, On as taggedEnum, Or as isUndefined, Ot as take, P as TypeId$5, Pn as addFinalizer, Pt as andThen, Q as unwrap, Qn as dedupe, Qt as gen, R as Size, Rn as isDone, S as errorExitCode, Sn as tryPromise, Sr as BaseProto, St as mapDone, Tn as void_, Tr as isNotNull, Tt as make$12, U as empty$1, Un as UnknownError, V as callback$1, Vn as succeed$2, Vt as catchTags, W as fromChannel$1, Wn as done, Wt as effectify, X as splitLines, Xn as make$6, Xt as forever, Y as runCollect, Yn as getUnsafe, Yt as forEach, Z as transduce, Zn as Prototype, Zt as forkScoped, _ as Terminal, _n as succeed, _r as map$4, _t as tag, a as storeDir, an as match$1, ar as of, at as badArgument, b as Stdio, br as some, c as LoomCompiler, cn as orElseSucceed, cr as fail$1, ct as Defect, d as PackageConfig, dn as provideService, dr as fromNullishOr, dt as String$1, en as interrupt, et as make$11, f as LoomConfig, fn as raceFirst, fr as fromUndefinedOr, ft as Struct, g as QuitError, gn as serviceOption, gr as isSome, gt as optional$3, hn as scoped, hr as isNone, ht as is, i as servicePackage, in as mapError, ir as match, it as BadArgument, j as FalseValues, jn as provide, jr as pipe, jt as nominal, k as log, kn as effect, kr as dual, kt as make$7, ln as provide$1, lr as succeed$1, lt as ErrorClass, mn as runFork, mr as getOrUndefined, mt as decodeUnknownEffect, n as installedServices, nt as fromChannel, o as workspaceRoot, on as matchEffect, or as reduce, ot as systemError, pn as result, pr as getOrElse, pt as Union, q as mkString, qn as Service, qt as flatMap, r as removeService, rn as map$2, rr as map$3, rt as isSink, s as DocumentSource, sn as orDie, sr as sort, st as ArraySchema, t as addService, tn as isEffect, tt as drain, un as provideContext, ur as flatMap$1, ut as Literal, v as isQuitError, vn as suspend, vr as match$2, vt as toCodecStringTree, w as makeRunMain, wn as uninterruptible, wr as hasProperty, wt as failCauseUnsafe, x as make$10, xn as timeoutOrElse, xr as String$2, xt as fromTransform, y as make$13, yn as sync, yr as none, z as WatchBackend, zn as makeUnsafe$1, zt as catchFilter } from "./LoomStore-DMf2PkfP.js";
+import { $ as mkString, $n as done, $t as ensuring, A as log, An as timeoutOrElse, Ar as none, At as mapDone, B as WatchBackend, Bn as provide, Br as dual, Bt as acquireRelease, C as errorExitCode, Cn as runFork, Cr as fromUndefinedOr, Ct as is, D as Crypto$1, Dn as suspend, Dr as isSome, En as succeed, Er as isNone, Et as toCodecStringTree, F as TypeId$5, Fn as catchDone, Fr as hasProperty, Ft as offerUnsafe, G as empty$1, Gn as _await, Gt as callback, H as callback$1, Hn as succeed$3, Hr as pipe, Ht as andThen, I as FileDescriptor, Ir as isNotNull, It as take, J as fromEffect, Jn as makeUnsafe$1, Jt as catchTag, K as filter$1, Kn as doneUnsafe, L as FileSystem, Ln as taggedEnum, Lr as isNotUndefined, Lt as make$7, M as FalseValues, Mn as try_, Mr as String$2, Mt as failCauseUnsafe, N as TrueValues, Nn as uninterruptible, Nr as BaseProto, Nt as make$12, O as make$9, On as sync, Or as map$4, P as Path$1, Pn as void_, Pr as format, Pt as offer, Q as merge, Qn as UnknownError, Qt as effectify, R as FileTypeId, Rn as effect, Rr as isNullish, Rt as makeUnsafe, S as make$10, Sn as result, Sr as fromNullishOr, St as decodeUnknownEffect, T as makeRunMain, Tn as serviceOption, Tr as getOrUndefined, Tt as tag, U as concat, Un as addFinalizer, Ur as pipeArguments, Ut as as, V as make$8, Vn as provideMerge, Vr as identity, Vt as addFinalizer$1, W as decodeText, Wn as MinimumLogLevel, Wt as asVoid, X as isStream, Xn as succeed$2, Xt as catch_, Y as groupedWithin, Yn as fail$2, Yt as catchTags, Z as mapEffect, Zn as Done, _ as QuitError, _n as orElseSucceed, _r as fail$1, _t as ErrorClass, a as storeDir, an as forkScoped, ar as make$6, at as transduce, b as make$13, bn as provideService, br as contains, bt as Struct, c as LoomCompiler, cn as interrupt, cr as filter, ct as make$11, dn as map$2, dt as isSink, en as fail, er as fail$3, et as orDie$1, f as PackageConfig, fn as mapError, fr as map$3, ft as BadArgument, gn as orDie, gr as sort, gt as Defect, hn as option, hr as reduce, ht as ArraySchema, i as servicePackage, in as forever, ir as getUnsafe, it as splitLines, j as Boolean, jn as tryPromise, jr as some, jt as endUnsafe, k as error, kr as match$2, kt as fromTransform, l as ignoredDirs, ln as isEffect, lt as drain, mn as matchEffect, mr as of, mt as systemError, n as installedServices, nn as fnUntraced, nr as Service, nt as runCollect, o as workspaceRoot, on as gen, or as Prototype, ot as unwrap, p as LoomConfig, pn as match$1, pr as match, pt as badArgument, q as fromChannel$1, qn as isDone, qt as catchFilter, r as removeService, rn as forEach, rr as empty, rt as runForEach, s as DocumentSource, sn as ignore, sr as dedupe, st as get, t as addService, tn as flatMap, tr as Reference, tt as run$2, ut as fromChannel, v as Terminal, vn as provide$1, vr as match$3, vt as Literal, w as errorReported, wn as scoped, wr as getOrElse, wt as optional$3, x as Stdio, xn as raceFirst, xr as flatMap$1, xt as Union, y as isQuitError, yn as provideContext, yr as succeed$1, yt as String$1, z as Size, zn as mergeAll, zr as isUndefined, zt as nominal } from "./LoomStore-CxUQqaPK.js";
 import * as NodeChildProcess from "node:child_process";
-import "node:stream";
+import { PassThrough } from "node:stream";
 import * as Crypto from "node:crypto";
 import * as NFS from "node:fs";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
@@ -8525,11 +8525,11 @@ var getOutOfScopeGlobalFlagErrors = (allFlags, activeFlags, flagMap, commandPath
 	}
 	return errors;
 };
-var showHelp = (command, error$2) => gen(function* () {
+var showHelp = (command, error$3) => gen(function* () {
 	const formatter = yield* Formatter;
-	const helpDoc = yield* getHelpForCommandPath(command, error$2.commandPath, BuiltIns);
+	const helpDoc = yield* getHelpForCommandPath(command, error$3.commandPath, BuiltIns);
 	yield* log(formatter.formatHelpDoc(helpDoc));
-	if (error$2.errors.length > 0) yield* error(formatter.formatErrors(error$2.errors));
+	if (error$3.errors.length > 0) yield* error(formatter.formatErrors(error$3.errors));
 });
 /**
 * Runs a command using the arguments supplied by the `Stdio` service.
@@ -9092,7 +9092,6 @@ var fromReadableChannel = (options) => fromTransform((_, scope) => readableToPul
 }));
 var readableToPullUnsafe = (options) => {
 	const readable = options.readable;
-	if (readable.readableEnded) return succeed(done());
 	const closeOnDone = options.closeOnDone ?? true;
 	const exit = options.exit ?? make$7(void 0);
 	const latch = makeUnsafe(false);
@@ -9114,6 +9113,7 @@ var readableToPullUnsafe = (options) => {
 		let item = options.readable.read(options.chunkSize);
 		if (item === null) {
 			if (exit.current) return exit.current;
+			if (readable.readableEnded) return fail(Done());
 			latch.closeUnsafe();
 			return flatMap(latch.await, loop);
 		}
@@ -9240,10 +9240,15 @@ var layer$11 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(fun
 				}
 				case "output": {
 					let stream = empty$1;
-					if (nodeStream && "read" in nodeStream) stream = fromReadable({
-						evaluate: () => nodeStream,
-						onError: (error) => toPlatformError(`fromReadable(fd${fd})`, toError(error), command)
-					});
+					if (nodeStream && "read" in nodeStream) {
+						const passThrough = new PassThrough();
+						nodeStream.on("error", (error) => passThrough.destroy(error));
+						nodeStream.pipe(passThrough);
+						stream = fromReadable({
+							evaluate: () => passThrough,
+							onError: (error) => toPlatformError(`fromReadable(fd${fd})`, toError(error), command)
+						});
+					}
 					if (config.sink) stream = transduce(stream, config.sink);
 					outputStreams.set(fd, stream);
 					break;
@@ -9267,14 +9272,24 @@ var layer$11 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(fun
 		return succeed(sink);
 	});
 	const setupChildOutputStreams = (command, childProcess, stdoutConfig, stderrConfig) => {
-		let stdout = childProcess.stdout ? fromReadable({
-			evaluate: () => childProcess.stdout,
-			onError: (error) => toPlatformError("fromReadable(stdout)", toError(error), command)
-		}) : empty$1;
-		let stderr = childProcess.stderr ? fromReadable({
-			evaluate: () => childProcess.stderr,
-			onError: (error) => toPlatformError("fromReadable(stderr)", toError(error), command)
-		}) : empty$1;
+		let stdout = childProcess.stdout ? (() => {
+			const passThrough = new PassThrough();
+			childProcess.stdout.on("error", (error) => passThrough.destroy(error));
+			childProcess.stdout.pipe(passThrough);
+			return fromReadable({
+				evaluate: () => passThrough,
+				onError: (error) => toPlatformError("fromReadable(stdout)", toError(error), command)
+			});
+		})() : empty$1;
+		let stderr = childProcess.stderr ? (() => {
+			const passThrough = new PassThrough();
+			childProcess.stderr.on("error", (error) => passThrough.destroy(error));
+			childProcess.stderr.pipe(passThrough);
+			return fromReadable({
+				evaluate: () => passThrough,
+				onError: (error) => toPlatformError("fromReadable(stderr)", toError(error), command)
+			});
+		})() : empty$1;
 		if (isSink(stdoutConfig.stream)) stdout = transduce(stdout, stdoutConfig.stream);
 		if (isSink(stderrConfig.stream)) stderr = transduce(stderr, stderrConfig.stream);
 		const all = merge(stdout, stderr);
@@ -9359,7 +9374,6 @@ var layer$11 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(fun
 				const stderrConfig = resolveOutputOption(cmd.options, "stderr");
 				const resolvedAdditionalFds = resolveAdditionalFds(cmd.options);
 				let isReferenced = true;
-				let cleanupOnNonZeroExit = false;
 				const cwd = yield* resolveWorkingDirectory(cmd.options);
 				const env = resolveEnvironment(cmd.options);
 				const stdio = buildStdioArray(stdinConfig, stdoutConfig, stderrConfig, resolvedAdditionalFds);
@@ -9382,20 +9396,18 @@ var layer$11 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(fun
 				}));
 				const pid = ProcessId(childProcess.pid);
 				childProcess.on("exit", (code) => {
-					if (cleanupOnNonZeroExit && code !== 0 && isNotNull(code)) killProcessGroupOnExit(childProcess, cmd.options.killSignal ?? "SIGTERM");
+					if (code !== 0 && isNotNull(code)) killProcessGroupOnExit(childProcess, cmd.options.killSignal ?? "SIGTERM");
 				});
 				const reref = sync(() => {
 					if (!isReferenced) {
 						childProcess.ref();
 						isReferenced = true;
-						cleanupOnNonZeroExit = false;
 					}
 				});
 				const unref = sync(() => {
 					if (isReferenced) {
 						childProcess.unref();
 						isReferenced = false;
-						cleanupOnNonZeroExit = true;
 					}
 					return reref;
 				});
@@ -9566,6 +9578,13 @@ var chown = /*#__PURE__*/ (() => {
 	const nodeChown = /*#__PURE__*/ effectify(NFS.chown, /*#__PURE__*/ handleErrnoException("FileSystem", "chown"), /*#__PURE__*/ handleBadArgument("chown"));
 	return (path, uid, gid) => nodeChown(path, uid, gid);
 })();
+var glob = /*#__PURE__*/ (() => {
+	const nodeGlob = /*#__PURE__*/ effectify(NFS.glob, /*#__PURE__*/ handleErrnoException("FileSystem", "glob"), /*#__PURE__*/ handleBadArgument("glob"));
+	return (pattern, options) => nodeGlob(pattern, {
+		cwd: options?.root,
+		exclude: options?.exclude
+	});
+})();
 var link = /*#__PURE__*/ (() => {
 	const nodeLink = /*#__PURE__*/ effectify(NFS.link, /*#__PURE__*/ handleErrnoException("FileSystem", "link"), /*#__PURE__*/ handleBadArgument("link"));
 	return (existingPath, newPath) => nodeLink(existingPath, newPath);
@@ -9843,6 +9862,7 @@ var makeFileSystem = /*#__PURE__*/ map$2(/*#__PURE__*/ serviceOption(WatchBacken
 	chown,
 	copy,
 	copyFile,
+	glob,
 	link,
 	makeDirectory,
 	makeTempDirectory,
@@ -10214,17 +10234,13 @@ var pruned = (produced) => ({
 });
 //#endregion
 //#region ../loom-lang/src/LoomTangler.ts
-var ignoredSegment = /* @__PURE__ */ new Set([
-	"node_modules",
-	".loom",
-	"dist",
-	".git"
-]);
-var isStorePath = (name) => name.split("/").some((segment) => ignoredSegment.has(segment));
+var isStorePath = (name) => name.split("/").some((segment) => ignoredDirs.has(segment));
 var LoomTangler = class extends Service()("LoomTangler", { make: gen(function* () {
 	const compiler = yield* LoomCompiler;
 	const fs = yield* FileSystem;
-	const writeFile = (file) => fs.makeDirectory(dirname(file.path), { recursive: true }).pipe(andThen(fs.writeFileString(file.path, file.content)), orDie, as(file));
+	const config = yield* PackageConfig;
+	const matchesDisk = (file) => fs.readFileString(file.path).pipe(option, map$2(contains(file.content)));
+	const writeFile = (file) => matchesDisk(file).pipe(flatMap((same) => same ? void_ : fs.makeDirectory(dirname(file.path), { recursive: true }).pipe(andThen(fs.writeFileString(file.path, file.content)))), orDie, as(file));
 	const tangleFile = (entry) => compiler.tangle(entry).pipe(flatMap((files) => forEach(files, writeFile)));
 	const loomsUnder = (dir) => fs.readDirectory(dir, { recursive: true }).pipe(orDie, map$2((names) => pipe(names, filter((name) => name.endsWith(".loom") && !isStorePath(name)), map$3((name) => resolve(dir, name)))));
 	const loomsOf = (path) => fs.stat(path).pipe(orDie, flatMap((info) => info.type === "Directory" ? loomsUnder(path) : succeed([path])));
@@ -10255,10 +10271,16 @@ var LoomTangler = class extends Service()("LoomTangler", { make: gen(function* (
 		yield* writeLock(root, pruned(produced));
 		return map$3(orphans, (rel) => resolve(root, rel));
 	});
+	const batchWindow = "50 millis";
+	const batchLimit = 1e3;
+	const isLoomEvent = (event) => event.path.endsWith(".loom") && !isStorePath(event.path);
+	const watchRoot = (path) => fs.stat(path).pipe(orDie, flatMap((info) => info.type === "Directory" ? succeed(path) : config.resolve(path).pipe(map$2(({ corpusDir }) => getOrElse(fromNullishOr(corpusDir), () => dirname(path))))));
+	const watch = (path) => unwrap(watchRoot(path).pipe(map$2((root) => concat(fromEffect(result(tangle(path))), fs.watch(root).pipe(filter$1(isLoomEvent), groupedWithin(batchLimit, batchWindow), mapEffect((events) => forEach(dedupe(map$3(events, (event) => resolve(root, event.path))), (changed) => compiler.invalidate(changed), { discard: true }).pipe(andThen(result(tangle(path))))), orDie$1)))));
 	return {
 		tangle,
 		orphans,
-		prune
+		prune,
+		watch
 	};
 }) }) {
 	static {
@@ -10302,11 +10324,19 @@ var banner = log(`\n${teal([
 	"   ███████╗╚██████╔╝╚██████╔╝██║ ╚═╝ ██║",
 	"   ╚══════╝ ╚═════╝  ╚═════╝ ╚═╝     ╚═╝"
 ].join("\n"))}\n   ${dim("a literate framework")}\n`);
-var tangle = (file) => gen(function* () {
-	const written = yield* (yield* LoomTangler).tangle(resolve(process.cwd(), file));
-	if (written.length === 0) yield* log("loom: no {path} sinks to tangle");
-	else yield* forEach(written, (f) => log(`loom: tangled ${f.section} → ${f.path}`));
+var reportWritten = (written) => written.length === 0 ? log("loom: no {path} sinks to tangle") : forEach(written, (f) => log(`loom: tangled ${f.section} → ${f.path}`), { discard: true });
+var tangleOnce = (file) => gen(function* () {
+	yield* reportWritten(yield* (yield* LoomTangler).tangle(resolve(process.cwd(), file)));
 }).pipe(catchTag("TangleError", (e) => error(e.message).pipe(andThen(sync(() => void (process.exitCode = 1))))));
+var tangleWatch = (file) => gen(function* () {
+	const tangler = yield* LoomTangler;
+	yield* log(`loom: watching ${file} — re-tangling on change`);
+	yield* runForEach(tangler.watch(resolve(process.cwd(), file)), match$3({
+		onSuccess: reportWritten,
+		onFailure: (error$1) => error(error$1.message)
+	}));
+});
+var tangle = (file, watch) => watch ? tangleWatch(file) : tangleOnce(file);
 var orphans = (prune) => gen(function* () {
 	const tangler = yield* LoomTangler;
 	if (prune) {
@@ -10378,7 +10408,7 @@ var add = (language) => gen(function* () {
 	yield* addService(language, dir);
 	yield* updateLanguages(config, dir, (ids) => [.../* @__PURE__ */ new Set([...ids, language])]);
 	yield* log(`\n   ${teal("✓")} activated ${language}\n   ${dim(`store: ${storeDir(dir)}`)}\n`);
-}).pipe(catchTag("StoreError", (error$1) => error(`loom: could not install ${servicePackage(error$1.id)} — ${String(error$1.cause)}`).pipe(andThen(sync(() => void (process.exitCode = 1))))));
+}).pipe(catchTag("StoreError", (error$2) => error(`loom: could not install ${servicePackage(error$2.id)} — ${String(error$2.cause)}`).pipe(andThen(sync(() => void (process.exitCode = 1))))));
 var remove = (language) => gen(function* () {
 	const config = yield* LoomConfig;
 	const dir = process.cwd();
@@ -10423,7 +10453,10 @@ var set = (name, value) => gen(function* () {
 	const corpus = resolve(workspace, current?.corpus ?? "corpus");
 	yield* log(`loom: set ${name} = ${value} (re-tangled ${(yield* tangler.tangle(corpus)).length} files)`);
 }).pipe(catchTag("TangleError", (e) => error(e.message).pipe(andThen(sync(() => void (process.exitCode = 1))))));
-var tangleCommand = make$5("tangle", { path: string("path") }, ({ path }) => tangle(path));
+var tangleCommand = make$5("tangle", {
+	path: string("path"),
+	watch: boolean("watch")
+}, ({ path, watch }) => tangle(path, watch));
 var orphansCommand = make$5("orphans", { prune: boolean("prune") }, ({ prune }) => orphans(prune));
 var weaveCommand = make$5("weave", {
 	path: string("path"),
@@ -10448,11 +10481,11 @@ var program = run(make$5("loom").pipe(withSubcommands([
 	removeCommand,
 	statusCommand,
 	setCommand
-])), { version: "0.0.4" }).pipe(provide$1(LoomTangler.layer), provide$1(LoomWeaver.layer), provide$1(LoomContents.layer), provide$1(DocumentSource.layer), provide$1(PackageConfig.layer), provide$1(LoomConfig.layer), provide$1(layer));
+])), { version: "0.0.5" }).pipe(provide$1(LoomTangler.layer), provide$1(LoomWeaver.layer), provide$1(LoomContents.layer), provide$1(DocumentSource.layer), provide$1(PackageConfig.layer), provide$1(LoomConfig.layer), provide$1(layer));
 if (process.argv[2] === "lsp") {
 	const { createRequire } = await import("node:module");
 	globalThis.require = createRequire(import.meta.url);
-	const { startLanguageServer } = await import("./LoomServer-D8I04Chj.js");
+	const { startLanguageServer } = await import("./LoomServer-DdMrIE4N.js");
 	startLanguageServer();
 } else runMain(program);
 //#endregion