@rohal12/twee-ts 1.17.1 → 1.18.0

package/dist/plugins/rollup.d.ts

@@ -1,4 +1,4 @@
-import { t as CompileOptions } from "../types-dR5vTVu2.js";
+import { t as CompileOptions } from "../types-D8Xfe0l8.js";
 //#region src/plugins/diagnostics.d.ts
 /** An error carrying the file and line the bundler reports (and Vite shows in its overlay). */
 interface LocatedError extends Error {
@@ -30,12 +30,14 @@ export interface TweeTsRollupPluginOptions {
 }
 export declare function tweeTsPlugin(options: TweeTsRollupPluginOptions): {
   name: string;
+  options(inputOptions: object): undefined;
   buildStart(this: {
     addWatchFile: (id: string) => void;
     meta: {
       watchMode: boolean;
     };
   }): void;
+  renderStart(outputOptions: OutputLocation): void;
   generateBundle(this: {
     emitFile: (opts: {
       type: 'asset';
@@ -44,9 +46,6 @@ export declare function tweeTsPlugin(options: TweeTsRollupPluginOptions): {
     }) => void;
     error: (error: LocatedError) => never;
     warn: (message: string) => void;
-    meta: {
-      watchMode: boolean;
-    };
   }, outputOptions: OutputLocation, bundle: Readonly<Record<string, unknown>>): Promise<void>;
 };
 //#endregion

package/dist/plugins/rollup.js

@@ -1,6 +1,6 @@
-import { a as fatalError, c as compileForOutputFile, o as formatDiagnostic, s as splitDiagnostics, t as emittedFilePath } from "../paths-w4ulhCFb.js";
-import { readdirSync } from "node:fs";
-import { join, resolve, sep } from "node:path";
+import { c as splitDiagnostics, f as outputPaths, i as outputLocations, l as compileForOutputFile, m as walkedEntry, o as fatalError, p as realPathOf, s as formatDiagnostic, t as createOutputRecord } from "../paths-DgO9oo6G.js";
+import { readdirSync, statSync } from "node:fs";
+import { join, resolve } from "node:path";
 //#region src/plugins/rollup.ts
 /**
 * Ready-made Rollup plugin for twee-ts.
@@ -8,52 +8,80 @@ import { join, resolve, sep } from "node:path";
 * and emit nothing; warnings go through Rollup's warnings.
 */
 /**
-* What `rollup --watch` watches for the input at the absolute `path`: the path
-* itself, which Rollup watches recursively when it is a folder, unless it holds
-* one of the files the build wrote (`written`). Such a folder is replaced by what
-* it contains, and the written files are left out, so writing them starts no
-* build. A file added straight to that folder later is found at the next build.
+* What `rollup --watch` watches for the input at `path`, whose real path is
+* `real`. `isRoot`: the input itself, which is followed wherever it leads.
+*
+* Rollup watches a folder recursively and follows the links in it. So a folder
+* is registered whole only when nothing under it is left out of the story: no
+* file or folder the build writes (`outputs`), and no link to a folder, which
+* source discovery doesn't follow and which may lead to the output. Any other
+* folder is replaced by what it contains, minus those, so writing the outputs
+* starts no build. A file added straight to such a folder is found at the next
+* build. A path the build writes to is never registered itself: Rollup fails a
+* watch build whose watched files include its `output.dir` or `output.file`.
 */
-function watchTargets(path, written) {
-	if (written.includes(path)) return [];
-	if (!written.some((file) => file.startsWith(path + sep))) return [path];
-	let entries;
+function watchTargets(path, real, outputs, isRoot) {
+	if (outputs.isFile(real) || !isRoot && outputs.isDir(real)) return [];
+	let entry;
 	try {
-		entries = readdirSync(path);
+		entry = isRoot ? {
+			stat: statSync(path),
+			real
+		} : walkedEntry(path, real);
 	} catch {
-		return [path];
+		return isRoot && !outputs.isDir(real) ? [path] : [];
 	}
-	return entries.flatMap((entry) => watchTargets(join(path, entry), written));
+	if (entry === void 0) return [];
+	if (outputs.isFile(entry.real)) return [];
+	if (!entry.stat.isDirectory()) return [path];
+	let names;
+	try {
+		names = readdirSync(path);
+	} catch {
+		return isRoot && !outputs.isDir(real) ? [path] : [];
+	}
+	const children = names.map((name) => {
+		const child = join(path, name);
+		return {
+			path: child,
+			targets: watchTargets(child, join(entry.real, name), outputs, false)
+		};
+	});
+	return !outputs.holds(entry.real) && children.every(({ path: child, targets }) => targets.length === 1 && targets[0] === child) ? [path] : children.flatMap(({ targets }) => targets);
 }
 function tweeTsPlugin(options) {
 	const outputFilename = options.outputFilename ?? "index.html";
-	let written = [];
-	let writing = [];
+	const record = createOutputRecord(outputFilename);
 	return {
 		name: "twee-ts",
+		options(inputOptions) {
+			const { output } = inputOptions;
+			for (const location of outputLocations(output)) record.addLocation(location);
+		},
 		buildStart() {
 			if (!this.meta.watchMode) return;
-			if (writing.length > 0) {
-				written = writing;
-				writing = [];
-			}
+			const outputs = outputPaths(record.outputs());
 			const extra = options.compileOptions;
 			const inputs = [
 				...options.sources,
 				...extra?.headFile ? [extra.headFile] : [],
 				...extra?.modules ?? []
 			];
-			for (const input of inputs) for (const target of watchTargets(resolve(input), written)) this.addWatchFile(target);
+			for (const input of inputs) for (const target of watchTargets(resolve(input), realPathOf(input), outputs, true)) this.addWatchFile(target);
+		},
+		renderStart(outputOptions) {
+			record.addLocation(outputOptions);
 		},
 		async generateBundle(outputOptions, bundle) {
-			const outFile = emittedFilePath(outputOptions, outputFilename);
+			record.addLocation(outputOptions);
+			record.addFiles(outputOptions, Object.keys(bundle));
 			let result;
 			try {
 				result = await compileForOutputFile({
 					sources: options.sources,
 					formatId: options.format,
 					...options.compileOptions
-				}, outFile);
+				}, record.outputs());
 			} catch (e) {
 				return this.error(fatalError(e));
 			}
@@ -69,10 +97,6 @@ function tweeTsPlugin(options) {
 				fileName: outputFilename,
 				source: result.output
 			});
-			if (this.meta.watchMode) for (const fileName of /* @__PURE__ */ new Set([...Object.keys(bundle), outputFilename])) {
-				const path = emittedFilePath(outputOptions, fileName);
-				if (path !== void 0) writing.push(path);
-			}
 		}
 	};
 }

package/dist/plugins/rollup.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.js","names":[],"sources":["../../src/plugins/rollup.ts"],"sourcesContent":["/**\n * Ready-made Rollup plugin for twee-ts.\n * Compiles .tw files and emits HTML as an asset. Compile errors fail the build\n * and emit nothing; warnings go through Rollup's warnings.\n */\nimport { readdirSync } from 'node:fs';\nimport { join, resolve, sep } from 'node:path';\nimport type { CompileOptions, CompileResult, Diagnostic } from '../types.js';\nimport { compileForOutputFile } from '../compiler.js';\nimport { fatalError, formatDiagnostic, splitDiagnostics } from './diagnostics.js';\nimport type { LocatedError } from './diagnostics.js';\nimport { emittedFilePath } from './paths.js';\nimport type { OutputLocation } from './paths.js';\n\nexport interface TweeTsRollupPluginOptions {\n  /** Source directories/files to compile. */\n  sources: string[];\n  /** Story format ID. */\n  format?: string;\n  /** Output filename. Default: 'index.html'. */\n  outputFilename?: string;\n  /** Additional compile options. */\n  compileOptions?: Partial<CompileOptions>;\n}\n\n/**\n * What `rollup --watch` watches for the input at the absolute `path`: the path\n * itself, which Rollup watches recursively when it is a folder, unless it holds\n * one of the files the build wrote (`written`). Such a folder is replaced by what\n * it contains, and the written files are left out, so writing them starts no\n * build. A file added straight to that folder later is found at the next build.\n */\nfunction watchTargets(path: string, written: readonly string[]): string[] {\n  if (written.includes(path)) return [];\n  if (!written.some((file) => file.startsWith(path + sep))) return [path];\n  let entries: string[];\n  try {\n    entries = readdirSync(path);\n  } catch {\n    return [path]; // Unreadable: Rollup's watcher reports it.\n  }\n  return entries.flatMap((entry) => watchTargets(join(path, entry), written));\n}\n\nexport function tweeTsPlugin(options: TweeTsRollupPluginOptions) {\n  const outputFilename = options.outputFilename ?? 'index.html';\n  // In watch mode, the files the last build wrote and those the current one writes\n  // (absolute paths). They may sit inside a source folder, which must not rebuild for them.\n  let written: readonly string[] = [];\n  let writing: string[] = [];\n\n  return {\n    name: 'twee-ts',\n\n    // `rollup --watch` rebuilds for the files the build registers. The story's\n    // inputs are read in generateBundle, outside the module graph, so they are\n    // registered here. Rollup's watcher watches a folder recursively, files added\n    // to it included.\n    buildStart(this: { addWatchFile: (id: string) => void; meta: { watchMode: boolean } }) {\n      if (!this.meta.watchMode) return;\n      // A build that failed before writing leaves the last build's files as they were.\n      if (writing.length > 0) {\n        written = writing;\n        writing = [];\n      }\n      const extra = options.compileOptions;\n      const inputs = [...options.sources, ...(extra?.headFile ? [extra.headFile] : []), ...(extra?.modules ?? [])];\n      for (const input of inputs) {\n        for (const target of watchTargets(resolve(input), written)) this.addWatchFile(target);\n      }\n    },\n\n    async generateBundle(\n      this: {\n        emitFile: (opts: { type: 'asset'; fileName: string; source: string }) => void;\n        error: (error: LocatedError) => never;\n        warn: (message: string) => void;\n        meta: { watchMode: boolean };\n      },\n      outputOptions: OutputLocation,\n      bundle: Readonly<Record<string, unknown>>,\n    ): Promise<void> {\n      // Where the story is written: a source folder may hold it, and its last\n      // build must not be loaded back as a source.\n      const outFile = emittedFilePath(outputOptions, outputFilename);\n      let result: CompileResult;\n      try {\n        result = await compileForOutputFile(\n          { sources: options.sources, formatId: options.format, ...options.compileOptions },\n          outFile,\n        );\n      } catch (e) {\n        return this.error(fatalError(e));\n      }\n      let warnings: Diagnostic[];\n      try {\n        warnings = splitDiagnostics(result);\n      } catch (e) {\n        return this.error(e as LocatedError);\n      }\n      for (const w of warnings) this.warn(formatDiagnostic(w));\n      this.emitFile({ type: 'asset', fileName: outputFilename, source: result.output });\n      if (this.meta.watchMode) {\n        for (const fileName of new Set([...Object.keys(bundle), outputFilename])) {\n          const path = emittedFilePath(outputOptions, fileName);\n          if (path !== undefined) writing.push(path);\n        }\n      }\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAgCA,SAAS,aAAa,MAAc,SAAsC;CACxE,IAAI,QAAQ,SAAS,IAAI,GAAG,OAAO,CAAC;CACpC,IAAI,CAAC,QAAQ,MAAM,SAAS,KAAK,WAAW,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI;CACtE,IAAI;CACJ,IAAI;EACF,UAAU,YAAY,IAAI;CAC5B,QAAQ;EACN,OAAO,CAAC,IAAI;CACd;CACA,OAAO,QAAQ,SAAS,UAAU,aAAa,KAAK,MAAM,KAAK,GAAG,OAAO,CAAC;AAC5E;AAEA,SAAgB,aAAa,SAAoC;CAC/D,MAAM,iBAAiB,QAAQ,kBAAkB;CAGjD,IAAI,UAA6B,CAAC;CAClC,IAAI,UAAoB,CAAC;CAEzB,OAAO;EACL,MAAM;EAMN,aAAuF;GACrF,IAAI,CAAC,KAAK,KAAK,WAAW;GAE1B,IAAI,QAAQ,SAAS,GAAG;IACtB,UAAU;IACV,UAAU,CAAC;GACb;GACA,MAAM,QAAQ,QAAQ;GACtB,MAAM,SAAS;IAAC,GAAG,QAAQ;IAAS,GAAI,OAAO,WAAW,CAAC,MAAM,QAAQ,IAAI,CAAC;IAAI,GAAI,OAAO,WAAW,CAAC;GAAE;GAC3G,KAAK,MAAM,SAAS,QAClB,KAAK,MAAM,UAAU,aAAa,QAAQ,KAAK,GAAG,OAAO,GAAG,KAAK,aAAa,MAAM;EAExF;EAEA,MAAM,eAOJ,eACA,QACe;GAGf,MAAM,UAAU,gBAAgB,eAAe,cAAc;GAC7D,IAAI;GACJ,IAAI;IACF,SAAS,MAAM,qBACb;KAAE,SAAS,QAAQ;KAAS,UAAU,QAAQ;KAAQ,GAAG,QAAQ;IAAe,GAChF,OACF;GACF,SAAS,GAAG;IACV,OAAO,KAAK,MAAM,WAAW,CAAC,CAAC;GACjC;GACA,IAAI;GACJ,IAAI;IACF,WAAW,iBAAiB,MAAM;GACpC,SAAS,GAAG;IACV,OAAO,KAAK,MAAM,CAAiB;GACrC;GACA,KAAK,MAAM,KAAK,UAAU,KAAK,KAAK,iBAAiB,CAAC,CAAC;GACvD,KAAK,SAAS;IAAE,MAAM;IAAS,UAAU;IAAgB,QAAQ,OAAO;GAAO,CAAC;GAChF,IAAI,KAAK,KAAK,WACZ,KAAK,MAAM,4BAAY,IAAI,IAAI,CAAC,GAAG,OAAO,KAAK,MAAM,GAAG,cAAc,CAAC,GAAG;IACxE,MAAM,OAAO,gBAAgB,eAAe,QAAQ;IACpD,IAAI,SAAS,KAAA,GAAW,QAAQ,KAAK,IAAI;GAC3C;EAEJ;CACF;AACF"}
+{"version":3,"file":"rollup.js","names":[],"sources":["../../src/plugins/rollup.ts"],"sourcesContent":["/**\n * Ready-made Rollup plugin for twee-ts.\n * Compiles .tw files and emits HTML as an asset. Compile errors fail the build\n * and emit nothing; warnings go through Rollup's warnings.\n */\nimport { readdirSync, statSync } from 'node:fs';\nimport { join, resolve } from 'node:path';\nimport type { CompileOptions, CompileResult, Diagnostic } from '../types.js';\nimport { compileForOutputFile } from '../compiler.js';\nimport { outputPaths, realPathOf, walkedEntry } from '../filesystem.js';\nimport type { OutputPaths } from '../filesystem.js';\nimport { fatalError, formatDiagnostic, splitDiagnostics } from './diagnostics.js';\nimport type { LocatedError } from './diagnostics.js';\nimport { createOutputRecord, outputLocations } from './paths.js';\nimport type { OutputLocation } from './paths.js';\n\nexport interface TweeTsRollupPluginOptions {\n  /** Source directories/files to compile. */\n  sources: string[];\n  /** Story format ID. */\n  format?: string;\n  /** Output filename. Default: 'index.html'. */\n  outputFilename?: string;\n  /** Additional compile options. */\n  compileOptions?: Partial<CompileOptions>;\n}\n\n/**\n * What `rollup --watch` watches for the input at `path`, whose real path is\n * `real`. `isRoot`: the input itself, which is followed wherever it leads.\n *\n * Rollup watches a folder recursively and follows the links in it. So a folder\n * is registered whole only when nothing under it is left out of the story: no\n * file or folder the build writes (`outputs`), and no link to a folder, which\n * source discovery doesn't follow and which may lead to the output. Any other\n * folder is replaced by what it contains, minus those, so writing the outputs\n * starts no build. A file added straight to such a folder is found at the next\n * build. A path the build writes to is never registered itself: Rollup fails a\n * watch build whose watched files include its `output.dir` or `output.file`.\n */\nfunction watchTargets(path: string, real: string, outputs: OutputPaths, isRoot: boolean): string[] {\n  if (outputs.isFile(real) || (!isRoot && outputs.isDir(real))) return [];\n  let entry;\n  try {\n    entry = isRoot ? { stat: statSync(path), real } : walkedEntry(path, real);\n  } catch {\n    // An input Rollup's watcher reports, unless it is an output location. Below an\n    // input, what source discovery can't read (a link to nothing, say) is skipped.\n    return isRoot && !outputs.isDir(real) ? [path] : [];\n  }\n  if (entry === undefined) return []; // A link to a folder, not followed.\n  if (outputs.isFile(entry.real)) return [];\n  if (!entry.stat.isDirectory()) return [path];\n  let names: string[];\n  try {\n    names = readdirSync(path);\n  } catch {\n    return isRoot && !outputs.isDir(real) ? [path] : [];\n  }\n  const children = names.map((name) => {\n    const child = join(path, name);\n    return { path: child, targets: watchTargets(child, join(entry.real, name), outputs, false) };\n  });\n  const whole =\n    !outputs.holds(entry.real) &&\n    children.every(({ path: child, targets }) => targets.length === 1 && targets[0] === child);\n  return whole ? [path] : children.flatMap(({ targets }) => targets);\n}\n\nexport function tweeTsPlugin(options: TweeTsRollupPluginOptions) {\n  const outputFilename = options.outputFilename ?? 'index.html';\n  // Every path this plugin's builds write: each output's folder or file, its story,\n  // and the files of each bundle. A source folder may hold any of them, and none\n  // may be read back as a source or rebuild under watch.\n  const record = createOutputRecord(outputFilename);\n\n  return {\n    name: 'twee-ts',\n\n    // Rollup's watch mode and CLI pass the whole config here, outputs included, so\n    // they are known before the first build starts and before any is written.\n    // Typed `object`: a type with only optional properties would share none with\n    // Rollup's InputOptions, and the plugin would no longer be assignable to Plugin.\n    options(inputOptions: object): undefined {\n      const { output } = inputOptions as { readonly output?: unknown };\n      for (const location of outputLocations(output)) record.addLocation(location);\n      return undefined;\n    },\n\n    // `rollup --watch` rebuilds for the files the build registers. The story's\n    // inputs are read in generateBundle, outside the module graph, so they are\n    // registered here. Rollup's watcher watches a folder recursively, files added\n    // to it included.\n    buildStart(this: { addWatchFile: (id: string) => void; meta: { watchMode: boolean } }) {\n      if (!this.meta.watchMode) return;\n      const outputs = outputPaths(record.outputs());\n      const extra = options.compileOptions;\n      const inputs = [...options.sources, ...(extra?.headFile ? [extra.headFile] : []), ...(extra?.modules ?? [])];\n      for (const input of inputs) {\n        for (const target of watchTargets(resolve(input), realPathOf(input), outputs, true)) this.addWatchFile(target);\n      }\n    },\n\n    // Runs for every output before any of them generates its bundle, when the\n    // outputs are written together (as the CLI and watch mode write them).\n    renderStart(outputOptions: OutputLocation): void {\n      record.addLocation(outputOptions);\n    },\n\n    async generateBundle(\n      this: {\n        emitFile: (opts: { type: 'asset'; fileName: string; source: string }) => void;\n        error: (error: LocatedError) => never;\n        warn: (message: string) => void;\n      },\n      outputOptions: OutputLocation,\n      bundle: Readonly<Record<string, unknown>>,\n    ): Promise<void> {\n      // Where this output writes the story and the bundle. A source folder may hold\n      // them, or another output's, and no last build of them may be read back.\n      record.addLocation(outputOptions);\n      record.addFiles(outputOptions, Object.keys(bundle));\n      let result: CompileResult;\n      try {\n        result = await compileForOutputFile(\n          { sources: options.sources, formatId: options.format, ...options.compileOptions },\n          record.outputs(),\n        );\n      } catch (e) {\n        return this.error(fatalError(e));\n      }\n      let warnings: Diagnostic[];\n      try {\n        warnings = splitDiagnostics(result);\n      } catch (e) {\n        return this.error(e as LocatedError);\n      }\n      for (const w of warnings) this.warn(formatDiagnostic(w));\n      this.emitFile({ type: 'asset', fileName: outputFilename, source: result.output });\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAwCA,SAAS,aAAa,MAAc,MAAc,SAAsB,QAA2B;CACjG,IAAI,QAAQ,OAAO,IAAI,KAAM,CAAC,UAAU,QAAQ,MAAM,IAAI,GAAI,OAAO,CAAC;CACtE,IAAI;CACJ,IAAI;EACF,QAAQ,SAAS;GAAE,MAAM,SAAS,IAAI;GAAG;EAAK,IAAI,YAAY,MAAM,IAAI;CAC1E,QAAQ;EAGN,OAAO,UAAU,CAAC,QAAQ,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC;CACpD;CACA,IAAI,UAAU,KAAA,GAAW,OAAO,CAAC;CACjC,IAAI,QAAQ,OAAO,MAAM,IAAI,GAAG,OAAO,CAAC;CACxC,IAAI,CAAC,MAAM,KAAK,YAAY,GAAG,OAAO,CAAC,IAAI;CAC3C,IAAI;CACJ,IAAI;EACF,QAAQ,YAAY,IAAI;CAC1B,QAAQ;EACN,OAAO,UAAU,CAAC,QAAQ,MAAM,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC;CACpD;CACA,MAAM,WAAW,MAAM,KAAK,SAAS;EACnC,MAAM,QAAQ,KAAK,MAAM,IAAI;EAC7B,OAAO;GAAE,MAAM;GAAO,SAAS,aAAa,OAAO,KAAK,MAAM,MAAM,IAAI,GAAG,SAAS,KAAK;EAAE;CAC7F,CAAC;CAID,OAFE,CAAC,QAAQ,MAAM,MAAM,IAAI,KACzB,SAAS,OAAO,EAAE,MAAM,OAAO,cAAc,QAAQ,WAAW,KAAK,QAAQ,OAAO,KAAK,IAC5E,CAAC,IAAI,IAAI,SAAS,SAAS,EAAE,cAAc,OAAO;AACnE;AAEA,SAAgB,aAAa,SAAoC;CAC/D,MAAM,iBAAiB,QAAQ,kBAAkB;CAIjD,MAAM,SAAS,mBAAmB,cAAc;CAEhD,OAAO;EACL,MAAM;EAMN,QAAQ,cAAiC;GACvC,MAAM,EAAE,WAAW;GACnB,KAAK,MAAM,YAAY,gBAAgB,MAAM,GAAG,OAAO,YAAY,QAAQ;EAE7E;EAMA,aAAuF;GACrF,IAAI,CAAC,KAAK,KAAK,WAAW;GAC1B,MAAM,UAAU,YAAY,OAAO,QAAQ,CAAC;GAC5C,MAAM,QAAQ,QAAQ;GACtB,MAAM,SAAS;IAAC,GAAG,QAAQ;IAAS,GAAI,OAAO,WAAW,CAAC,MAAM,QAAQ,IAAI,CAAC;IAAI,GAAI,OAAO,WAAW,CAAC;GAAE;GAC3G,KAAK,MAAM,SAAS,QAClB,KAAK,MAAM,UAAU,aAAa,QAAQ,KAAK,GAAG,WAAW,KAAK,GAAG,SAAS,IAAI,GAAG,KAAK,aAAa,MAAM;EAEjH;EAIA,YAAY,eAAqC;GAC/C,OAAO,YAAY,aAAa;EAClC;EAEA,MAAM,eAMJ,eACA,QACe;GAGf,OAAO,YAAY,aAAa;GAChC,OAAO,SAAS,eAAe,OAAO,KAAK,MAAM,CAAC;GAClD,IAAI;GACJ,IAAI;IACF,SAAS,MAAM,qBACb;KAAE,SAAS,QAAQ;KAAS,UAAU,QAAQ;KAAQ,GAAG,QAAQ;IAAe,GAChF,OAAO,QAAQ,CACjB;GACF,SAAS,GAAG;IACV,OAAO,KAAK,MAAM,WAAW,CAAC,CAAC;GACjC;GACA,IAAI;GACJ,IAAI;IACF,WAAW,iBAAiB,MAAM;GACpC,SAAS,GAAG;IACV,OAAO,KAAK,MAAM,CAAiB;GACrC;GACA,KAAK,MAAM,KAAK,UAAU,KAAK,KAAK,iBAAiB,CAAC,CAAC;GACvD,KAAK,SAAS;IAAE,MAAM;IAAS,UAAU;IAAgB,QAAQ,OAAO;GAAO,CAAC;EAClF;CACF;AACF"}

package/dist/plugins/vite.d.ts

@@ -1,4 +1,4 @@
-import { t as CompileOptions } from "../types-dR5vTVu2.js";
+import { t as CompileOptions } from "../types-D8Xfe0l8.js";
 import { Plugin } from "vite";
 //#region src/plugins/vite.d.ts
 export interface TweeTsVitePluginOptions {

package/dist/plugins/vite.js

@@ -1,6 +1,6 @@
-import { a as fatalError, c as compileForOutputFile, d as mediaTypeFromFilename, i as toPosix, l as getFilenames, n as isInside, o as formatDiagnostic, r as isViteConfigTemp, s as splitDiagnostics, t as emittedFilePath, u as isExcluded } from "../paths-w4ulhCFb.js";
+import { a as toPosix, c as splitDiagnostics, d as isExcluded, f as outputPaths, h as mediaTypeFromFilename, i as outputLocations, l as compileForOutputFile, m as walkedEntry, n as isInside, o as fatalError, p as realPathOf, r as isViteConfigTemp, s as formatDiagnostic, t as createOutputRecord, u as getFilenames } from "../paths-DgO9oo6G.js";
 import { readdirSync, statSync } from "node:fs";
-import { resolve } from "node:path";
+import { join, relative, resolve } from "node:path";
 import { stripVTControlCharacters } from "node:util";
 import { build, version } from "vite";
 //#region src/plugins/vite.ts
@@ -119,23 +119,52 @@ function headInputs(options) {
 	return [...extra?.headFile ? [extra.headFile] : [], ...extra?.modules ?? []].map((p) => toPosix(resolve(p)));
 }
 /**
-* Whether a file (forward-slash path) is an input the compile leaves out: the
-* story HTML a build writes (`builtStory`, an absolute path), and the sources
-* `exclude` matches. `exclude` never applies to the head file and modules.
+* Whether a file (forward-slash path) is a source `exclude` matches. `exclude`
+* never applies to the head file and modules.
 */
-function excludedInput(options, builtStory) {
+function excludedByGlob(options) {
 	const exclude = options.compileOptions?.exclude ?? [];
 	const notExcludable = headInputs(options);
-	const output = builtStory === void 0 ? void 0 : toPosix(builtStory);
-	return (file) => file === output || isExcluded(file, exclude) && !isInside(file, notExcludable);
+	return (file) => isExcluded(file, exclude) && !isInside(file, notExcludable);
 }
 /**
-* Where a build writes the story HTML with this config: `build.outDir`, against
-* the root. It may sit inside a source folder, where neither a compile nor the
-* watchers may take it for a source.
+* Where a build with this config writes: each output's folder, the bundler's
+* `output.dir` or else `build.outDir`, or the bundler's `output.file`. Vite
+* resolves an `output.dir` against the root when it empties the folder and
+* copies the public files into it, while the bundler resolves it against the
+* working directory when it writes; both count.
 */
-function builtStoryPath(config, outputFilename) {
-	return resolve(config.root, config.build.outDir, outputFilename);
+function configOutputLocations(config) {
+	const outDir = resolve(config.root, config.build.outDir);
+	const option = config.build[viteMajor >= 8 ? "rolldownOptions" : "rollupOptions"]?.output;
+	return (option === void 0 ? [{}] : Array.isArray(option) ? option : [option]).flatMap((output) => {
+		const [location] = outputLocations(output);
+		if (location === void 0) return [{ dir: outDir }];
+		if (location.dir === void 0) return [location];
+		return [{ dir: resolve(location.dir) }, { dir: resolve(config.root, location.dir) }];
+	});
+}
+/**
+* Every path a build with this config writes, as far as the config tells: each
+* output's folder (see configOutputLocations), the story in it, and the copies
+* of the public files Vite puts there. The plugin adds the files each bundle
+* writes as it builds (see createOutputRecord).
+*/
+function configOutputs(config, outputFilename) {
+	const record = createOutputRecord(outputFilename);
+	const publicFiles = config.build.copyPublicDir && config.publicDir ? getFilenames([config.publicDir]).filenames.map((file) => relative(config.publicDir, resolve(file))) : [];
+	for (const location of configOutputLocations(config)) {
+		record.addLocation(location);
+		record.addFiles(location, publicFiles);
+	}
+	return record.outputs();
+}
+/** Both builds' outputs together. */
+function mergeOutputs(a, b) {
+	return {
+		files: [...a.files, ...b.files],
+		dirs: [...a.dirs, ...b.dirs]
+	};
 }
 /** Absolute forward-slash paths whose changes recompile the story: sources, head file, modules. */
 function watchedInputs(options) {
@@ -143,43 +172,50 @@ function watchedInputs(options) {
 }
 /**
 * What `vite build --watch` watches for the story: every file under `inputs`
-* (forward-slash paths) but those `skip` returns true for, and every folder
-* under them. The bundler watches each path on its own, not recursively, so a
-* folder is listed for the files added to it or deleted from it.
+* (forward-slash paths) that source discovery reads, but those `skip` returns
+* true for, and every folder under them. The bundler watches each path on its
+* own, not recursively, so a folder is listed for the files added to it or
+* deleted from it. As in source discovery, a link to a folder is not followed.
 *
 * A watched folder may still report changes in its subfolders (Rolldown's
-* watcher on Linux does), so no folder that holds the story the build writes
-* (`story`, a forward-slash path) is listed: writing the story would start the
-* next build. A file added straight to such a folder is found when another
-* change starts a build.
+* watcher on Linux does), so no path the build writes (`outputs`) is listed, nor
+* a folder that holds one: writing the outputs would start the next build. A file
+* added straight to such a folder is found when another change starts a build.
 */
-function buildWatchTargets(inputs, skip, story) {
+function buildWatchTargets(inputs, skip, outputs) {
 	const targets = [];
-	const walk = (path) => {
-		let entries;
+	const walk = (path, real, isRoot) => {
+		if (outputs.isFile(real) || !isRoot && outputs.isDir(real)) return;
+		let entry;
+		let names;
 		try {
-			if (!statSync(path).isDirectory()) {
+			entry = isRoot ? {
+				stat: statSync(path),
+				real
+			} : walkedEntry(path, real);
+			if (entry === void 0 || outputs.isFile(entry.real)) return;
+			if (!entry.stat.isDirectory()) {
 				if (!skip(path)) targets.push(path);
 				return;
 			}
-			entries = readdirSync(path);
+			names = readdirSync(path);
 		} catch {
 			return;
 		}
-		if (story === void 0 || !story.startsWith(`${path}/`)) targets.push(path);
-		for (const entry of entries) walk(`${path}/${entry}`);
+		if (!outputs.holds(entry.real)) targets.push(path);
+		for (const name of names) walk(`${path}/${name}`, join(entry.real, name), false);
 	};
-	for (const input of inputs) walk(input);
+	for (const input of inputs) walk(input, realPathOf(input), true);
 	return targets;
 }
 /**
-* Every file under `inputs` (forward-slash paths) but those `skip` returns true
-* for, with what a change to it alters: modification time, size and inode (a
-* file replaced by a new one).
+* Every file under `inputs` (forward-slash paths) that source discovery reads,
+* leaving out `outputs`, but those `skip` returns true for, with what a change to
+* it alters: modification time, size and inode (a file replaced by a new one).
 */
-function inputFiles(inputs, skip) {
+function inputFiles(inputs, skip, outputs) {
 	const files = /* @__PURE__ */ new Map();
-	for (const filename of getFilenames([...inputs]).filenames) {
+	for (const filename of getFilenames(inputs, outputs).filenames) {
 		const file = toPosix(resolve(filename));
 		if (skip(file)) continue;
 		try {
@@ -373,8 +409,9 @@ function tweeTsPlugin(options) {
 	const cache = /* @__PURE__ */ new Map();
 	let innerBuild = false;
 	let building = false;
-	let builtStory;
-	let stopDev;
+	let buildConfig;
+	const record = createOutputRecord(outputFilename);
+	const allOutputs = (config) => mergeOutputs(configOutputs(config, outputFilename), record.outputs());
 	if (options.entry && viteMajor < 8) throw new Error(`twee-ts: the entry option needs Vite 8 or newer (found ${version}).`);
 	return {
 		name: "twee-ts",
@@ -388,15 +425,15 @@ function tweeTsPlugin(options) {
 		},
 		configResolved(config) {
 			if (innerBuild) return;
-			builtStory = builtStoryPath(config, outputFilename);
+			if (building) buildConfig = config;
 			if (!options.entry) return;
 			const sources = options.sources.map((p) => toPosix(resolve(p)));
 			if (isInside(toPosix(resolve(options.entry)), sources)) config.logger.warn(`[twee-ts] The entry ${options.entry} is inside the story sources (${options.sources.join(", ")}). twee-ts also loads the .js and .css files it finds in source folders, unbundled, as Story JavaScript and Story Stylesheet; keep the entry's folder out of \`sources\`.`);
 		},
 		buildStart() {
-			if (innerBuild || !building || !this.meta.watchMode) return;
-			const story = builtStory === void 0 ? void 0 : toPosix(builtStory);
-			for (const target of buildWatchTargets(watchedInputs(options), excludedInput(options, builtStory), story)) this.addWatchFile(target);
+			if (innerBuild || !building || !this.meta.watchMode || buildConfig === void 0) return;
+			const outputs = outputPaths(allOutputs(buildConfig));
+			for (const target of buildWatchTargets(watchedInputs(options), excludedByGlob(options), outputs)) this.addWatchFile(target);
 		},
 		watchChange(id) {
 			if (innerBuild) return;
@@ -414,11 +451,13 @@ function tweeTsPlugin(options) {
 			async handler(outputOptions, bundle) {
 				if (innerBuild) return;
 				for (const [fileName, item] of Object.entries(bundle)) if (item.type === "chunk" && item.facadeModuleId === RESOLVED_EMPTY_INPUT) delete bundle[fileName];
+				record.addLocation(outputOptions);
+				record.addFiles(outputOptions, Object.keys(bundle));
+				const outputs = buildConfig === void 0 ? record.outputs() : allOutputs(buildConfig);
 				const entry = options.entry ? takeEntryFromBundle(bundle) : void 0;
-				const outFile = emittedFilePath(outputOptions, outputFilename) ?? builtStory;
 				let result;
 				try {
-					result = await compileForOutputFile(buildCompileOptions(options, entry), outFile, cache);
+					result = await compileForOutputFile(buildCompileOptions(options, entry), outputs, cache);
 				} catch (e) {
 					return this.error(fatalError(e));
 				}
@@ -441,8 +480,14 @@ function tweeTsPlugin(options) {
 			const base = server.config.base;
 			const servePaths = outputFilename === "index.html" ? [base, `${base}index.html`] : [`${base}${outputFilename}`];
 			const inputs = watchedInputs(options);
-			const buildOutput = builtStoryPath(server.config, outputFilename);
-			const excluded = excludedInput(options, buildOutput);
+			let outputs = allOutputs(server.config);
+			let output = outputPaths(outputs);
+			const refreshOutputs = () => {
+				outputs = allOutputs(server.config);
+				output = outputPaths(outputs);
+			};
+			const excludedGlob = excludedByGlob(options);
+			const excluded = (file) => excludedGlob(file) || output.isOutput(file, inputs);
 			const entryPath = options.entry ? resolve(options.entry) : void 0;
 			const root = toPosix(server.config.root);
 			server.watcher.add(inputs);
@@ -456,15 +501,18 @@ function tweeTsPlugin(options) {
 			let closed = false;
 			let compiledInputs = /* @__PURE__ */ new Map();
 			let catchingUp;
-			stopDev = () => {
+			const closeWatcher = server.watcher.close.bind(server.watcher);
+			server.watcher.close = async () => {
 				closed = true;
 				clearTimeout(timer);
 				pending.clear();
+				return closeWatcher();
 			};
 			const touchesEntry = (file) => entryPath !== void 0 && (entryStale ? isInside(file, [root]) : entry?.files.has(file) ?? false);
 			const rebuild = async (changed, initial = false) => {
 				if (closed) return;
-				compiledInputs = inputFiles(inputs, excluded);
+				refreshOutputs();
+				compiledInputs = inputFiles(inputs, excludedGlob, outputs);
 				for (const key of [...cache.keys()]) if (changed.has(toPosix(resolve(key)))) cache.delete(key);
 				try {
 					if (entryPath && (entryStale || [...changed].some(touchesEntry))) {
@@ -472,7 +520,7 @@ function tweeTsPlugin(options) {
 						entry = await bundleEntryForDev(server.config, entryPath);
 						entryStale = false;
 					}
-					const result = await compileForOutputFile(buildCompileOptions(options, entry), buildOutput, cache);
+					const result = await compileForOutputFile(buildCompileOptions(options, entry), outputs, cache);
 					for (const w of splitDiagnostics(result)) server.config.logger.warn(`[twee-ts] ${formatDiagnostic(w)}`);
 					html = injectViteClient(result.output, base);
 					lastError = void 0;
@@ -508,7 +556,7 @@ function tweeTsPlugin(options) {
 			const catchUp = () => {
 				catchingUp ??= (async () => {
 					await queue;
-					const changed = filesChanged(compiledInputs, inputFiles(inputs, excluded));
+					const changed = filesChanged(compiledInputs, inputFiles(inputs, excludedGlob, outputs));
 					if (changed.size === 0) return;
 					for (const file of pending) changed.add(file);
 					pending = /* @__PURE__ */ new Set();
@@ -545,9 +593,6 @@ function tweeTsPlugin(options) {
 				}
 				next();
 			});
-		},
-		closeBundle() {
-			stopDev?.();
 		}
 	};
 }