@swiftuijs/twill 0.3.0 → 0.3.1

package/dist/project.js

@@ -1,444 +1,3 @@
-import { a as transform, i as originalPosition, n as generatedPosition, r as inferLanguage, t as TwillSyntaxError } from "./compiler-CbNSBUI2.js";
-import { n as isTwillFile, t as extensions } from "./extensions-B1xTkoYP.js";
-import { n as loadConfig } from "./configuration-BVMf6Q_j.js";
+import { n as sourceFilename, r as virtualFilename, t as TwillProject } from "./project-ZmlpFooa.js";
 import { t as isDependency } from "./files-BW9geU0_.js";
-import MagicString from "magic-string";
-import { dirname, resolve } from "node:path";
-import ts from "typescript";
-import remapping from "@ampproject/remapping";
-//#region src/recovery.ts
-/** Editor-only recovery; build and CLI compilation always use strict parsing. */
-function recoverTransform(source, options, onSyntaxError) {
-	const repaired = new MagicString(source);
-	let text = source;
-	for (let attempt = 0; attempt < 8; attempt++) try {
-		const result = transform(text, options);
-		if (text === source) return result;
-		const repairMap = repaired.generateMap({
-			source: options.filename,
-			includeContent: true,
-			hires: true
-		});
-		const repairedResult = {
-			...result,
-			map: repairMap
-		};
-		const starts = [0];
-		for (const match of source.matchAll(/\n/g)) starts.push(match.index + 1);
-		const sourceOffset = (offset) => {
-			const prefix = text.slice(0, offset).split("\n");
-			const point = originalPosition(repairedResult, prefix.length, prefix.at(-1).length);
-			return starts[point.line - 1] + point.column;
-		};
-		const enumPatterns = result.enumPatterns.map((pattern) => ({
-			...pattern,
-			reference: {
-				...pattern.reference,
-				property: {
-					...pattern.reference.property,
-					start: sourceOffset(pattern.reference.property.start),
-					end: sourceOffset(pattern.reference.property.end)
-				}
-			}
-		}));
-		const map = remapping([JSON.parse(result.map.toString()), JSON.parse(repairMap.toString())], () => null);
-		return {
-			...result,
-			enumPatterns,
-			map
-		};
-	} catch (error) {
-		if (!(error instanceof TwillSyntaxError)) throw error;
-		if (attempt === 0) onSyntaxError?.(error);
-		const before = text.slice(0, error.offset);
-		let insertion;
-		let offset = error.offset;
-		if (/\.\s*$/.test(before)) insertion = "__twillIncomplete";
-		else if (offset >= text.length) {
-			const stack = [];
-			for (const token of text.matchAll(/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`|\/\*[\s\S]*?\*\/|\/\/[^\n]*|[()[\]{}])/g)) if ("([{".includes(token[0])) stack.push(token[0]);
-			else if (")]}".includes(token[0])) stack.pop();
-			const opening = stack.at(-1);
-			if (!opening) throw error;
-			insertion = {
-				"(": ")",
-				"[": "]",
-				"{": "}"
-			}[opening];
-		} else throw error;
-		if (offset >= text.length) offset = source.length;
-		else if (text !== source) {
-			const prefix = text.slice(0, offset).split("\n");
-			const point = originalPosition({
-				code: text,
-				map: repaired.generateMap({
-					source: options.filename,
-					hires: true
-				})
-			}, prefix.length, prefix.at(-1).length);
-			const starts = [0];
-			for (const match of source.matchAll(/\n/g)) starts.push(match.index + 1);
-			offset = point.line == null || point.column == null ? source.length : starts[point.line - 1] + point.column;
-		}
-		repaired.appendLeft(offset, insertion);
-		text = repaired.toString();
-	}
-	return transform(source, options);
-}
-//#endregion
-//#region src/project.ts
-function lineStarts(text) {
-	const starts = [0];
-	const breaks = /\n/g;
-	while (breaks.exec(text)) starts.push(breaks.lastIndex);
-	return starts;
-}
-function positionAt(starts, offset) {
-	let low = 0;
-	let high = starts.length;
-	while (low + 1 < high) {
-		const mid = low + high >>> 1;
-		if (starts[mid] <= offset) low = mid;
-		else high = mid;
-	}
-	return {
-		line: low + 1,
-		column: offset - starts[low]
-	};
-}
-var extraExtensions = extensions.map((extension) => ({
-	extension,
-	isMixedContent: false,
-	scriptKind: ts.ScriptKind.Deferred
-}));
-function virtualFilename(filename) {
-	filename = filename.replaceAll("\\", "/");
-	return isTwillFile(filename) ? filename + {
-		ts: ".ts",
-		tsx: ".tsx",
-		js: ".js",
-		jsx: ".jsx"
-	}[inferLanguage(filename)] : filename;
-}
-function sourceFilename(filename) {
-	filename = filename.replaceAll("\\", "/");
-	if (isTwillFile(filename)) return filename;
-	return filename.replace(/(\.twill)\.ts$/, "$1").replace(/(\.twillx)\.tsx$/, "$1");
-}
-/** A virtual-source TypeScript project shared by the CLI and VS Code extension. */
-var TwillProject = class {
-	root;
-	service;
-	compilerOptions;
-	configFiles;
-	files;
-	overlays = /* @__PURE__ */ new Map();
-	results = /* @__PURE__ */ new Map();
-	lineMaps = /* @__PURE__ */ new WeakMap();
-	version = 0;
-	invalidation = 0;
-	fileVersions = /* @__PURE__ */ new Map();
-	configurationErrors;
-	options;
-	host;
-	recover;
-	discoverFiles;
-	constructor(tsconfig, options = {}, projectOptions = {}) {
-		const configFile = sourceFilename(resolve(tsconfig));
-		this.root = dirname(configFile);
-		this.recover = projectOptions.recover ?? false;
-		this.options = {
-			...loadConfig(this.root, configFile),
-			...options
-		};
-		const configReads = /* @__PURE__ */ new Set([configFile, sourceFilename(resolve(this.root, "twill.config.json"))]);
-		const configHost = {
-			...ts.sys,
-			readFile: (filename) => {
-				configReads.add(sourceFilename(filename));
-				return ts.sys.readFile(filename);
-			}
-		};
-		const raw = projectOptions.inferred && !ts.sys.fileExists(configFile) ? { config: { compilerOptions: {
-			strict: true,
-			target: "ES2022",
-			module: "ESNext",
-			moduleResolution: "Bundler",
-			jsx: "react-jsx"
-		} } } : ts.readConfigFile(configFile, configHost.readFile);
-		const parsed = ts.parseJsonConfigFileContent(raw.config ?? {}, configHost, this.root, {
-			allowJs: true,
-			allowImportingTsExtensions: true,
-			noEmit: true
-		}, configFile, void 0, extraExtensions);
-		this.configurationErrors = [...raw.error ? [raw.error] : [], ...parsed.errors];
-		if (parsed.projectReferences?.length && !projectOptions.declarationRedirects) this.configurationErrors = [...this.configurationErrors, {
-			category: ts.DiagnosticCategory.Error,
-			code: 90002,
-			file: void 0,
-			start: void 0,
-			length: void 0,
-			messageText: "TypeScript project references are not supported by twill check. Check each referenced project separately."
-		}];
-		this.compilerOptions = parsed.options;
-		this.configFiles = [...configReads];
-		this.options.jsxImportSource ??= parsed.options.jsxImportSource;
-		this.files = parsed.fileNames.map(virtualFilename);
-		this.discoverFiles = () => ts.parseJsonConfigFileContent(raw.config ?? {}, configHost, this.root, {
-			allowJs: true,
-			allowImportingTsExtensions: true,
-			noEmit: true
-		}, configFile, void 0, extraExtensions).fileNames.map(virtualFilename);
-		const readFile = (name) => {
-			const original = sourceFilename(name);
-			const source = this.overlays.get(original) ?? ts.sys.readFile(original);
-			if (source === void 0) return void 0;
-			if (!isTwillFile(original)) return source;
-			try {
-				return this.result(original, source).code;
-			} catch {
-				return "";
-			}
-		};
-		const fileExists = (name) => this.overlays.has(sourceFilename(name)) || ts.sys.fileExists(sourceFilename(name));
-		const resolutionHost = {
-			...ts.sys,
-			readFile,
-			fileExists
-		};
-		this.host = {
-			...ts.sys,
-			getScriptFileNames: () => this.files,
-			useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
-			getScriptVersion: (name) => `${this.invalidation}:${this.fileVersions.get(sourceFilename(name)) ?? 0}`,
-			getProjectVersion: () => String(this.version),
-			getScriptSnapshot: (name) => {
-				const text = readFile(name);
-				return text === void 0 ? void 0 : ts.ScriptSnapshot.fromString(text);
-			},
-			getCurrentDirectory: () => this.root,
-			getCompilationSettings: () => this.compilerOptions,
-			getDefaultLibFileName: projectOptions.defaultLibFileName ?? ((opts) => ts.getDefaultLibFilePath(opts)),
-			readFile,
-			fileExists,
-			resolveModuleNames: (names, importer) => names.map((name) => {
-				const resolved = ts.resolveModuleName(name, importer, this.compilerOptions, resolutionHost).resolvedModule;
-				if (resolved) {
-					const redirect = projectOptions.declarationRedirects?.get(sourceFilename(resolved.resolvedFileName));
-					return redirect ? {
-						...resolved,
-						resolvedFileName: redirect,
-						extension: ts.Extension.Dts
-					} : {
-						...resolved,
-						resolvedFileName: virtualFilename(resolved.resolvedFileName)
-					};
-				}
-				if (name.startsWith(".") || name.startsWith("/")) {
-					const base = resolve(dirname(sourceFilename(importer)), name);
-					const candidates = isTwillFile(base) ? [base] : extensions.flatMap((extension) => [base + extension, resolve(base, "index" + extension)]);
-					for (const candidate of candidates) if (fileExists(candidate)) {
-						const redirect = projectOptions.declarationRedirects?.get(sourceFilename(candidate));
-						if (redirect) return {
-							resolvedFileName: redirect,
-							extension: ts.Extension.Dts,
-							isExternalLibraryImport: false
-						};
-						const file = virtualFilename(candidate);
-						return {
-							resolvedFileName: file,
-							extension: file.endsWith(".tsx") ? ts.Extension.Tsx : ts.Extension.Ts,
-							isExternalLibraryImport: false
-						};
-					}
-				}
-			})
-		};
-		this.service = ts.createLanguageService(this.host);
-	}
-	/** Declaration-only native TypeScript emit from the checked virtual program. */
-	declarationOutput(outDir, declarationMap = true) {
-		const diagnostics = this.diagnostics();
-		if (diagnostics.some((item) => item.category === "error")) return {
-			diagnostics,
-			files: []
-		};
-		const previous = this.service.getProgram();
-		if (!previous) return {
-			diagnostics,
-			files: []
-		};
-		const options = {
-			...this.compilerOptions,
-			noEmit: false,
-			declaration: true,
-			emitDeclarationOnly: true,
-			declarationMap,
-			noEmitOnError: true,
-			incremental: false,
-			composite: false,
-			rootDir: this.compilerOptions.rootDir ?? this.root,
-			outDir,
-			declarationDir: outDir,
-			allowImportingTsExtensions: true
-		};
-		const host = ts.createCompilerHost(options);
-		host.readFile = this.host.readFile;
-		host.fileExists = this.host.fileExists;
-		host.getCurrentDirectory = () => this.root;
-		host.resolveModuleNames = this.host.resolveModuleNames;
-		host.getSourceFile = (filename, languageVersion) => previous.getSourceFile(filename) ?? (host.readFile(filename) === void 0 ? void 0 : ts.createSourceFile(filename, host.readFile(filename), languageVersion, true));
-		const program = ts.createProgram(previous.getRootFileNames(), options, host);
-		const errors = ts.getPreEmitDiagnostics(program).map((item) => this.diagnostic(item));
-		if (errors.some((item) => item.category === "error")) return {
-			diagnostics: errors,
-			files: []
-		};
-		const files = [];
-		const emitted = program.emit(void 0, (filename, text, _bom, _error, sources) => {
-			files.push({
-				filename: sourceFilename(filename),
-				text,
-				sources: sources?.map((source) => sourceFilename(source.fileName)) ?? []
-			});
-		}, void 0, true);
-		return {
-			diagnostics: [...diagnostics, ...emitted.diagnostics.map((item) => this.diagnostic(item))],
-			files: emitted.emitSkipped ? [] : files
-		};
-	}
-	result(filename, source) {
-		const cached = this.results.get(filename);
-		if (cached?.source === source) return cached.result;
-		const options = {
-			...this.options,
-			filename
-		};
-		let syntaxError;
-		const result = this.recover ? recoverTransform(source, options, (error) => {
-			syntaxError = error;
-		}) : transform(source, options);
-		this.results.set(filename, {
-			source,
-			result,
-			syntaxError
-		});
-		return result;
-	}
-	update(filename, text) {
-		filename = sourceFilename(resolve(filename));
-		if (text !== void 0 && text === this.overlays.get(filename) && this.files.includes(virtualFilename(filename))) return;
-		if (text === void 0) this.overlays.delete(filename);
-		else this.overlays.set(filename, text);
-		this.fileVersions.set(filename, (this.fileVersions.get(filename) ?? 0) + 1);
-		if (!this.files.includes(virtualFilename(filename))) this.files.push(virtualFilename(filename));
-		this.results.delete(filename);
-		this.version++;
-	}
-	invalidate() {
-		this.invalidation++;
-		this.version++;
-		this.results.clear();
-	}
-	/** Refresh a disk version without discarding unsaved overlays or other transforms. */
-	refresh(filename, discover = false) {
-		filename = sourceFilename(resolve(filename));
-		if (discover) this.files = [.../* @__PURE__ */ new Set([...this.discoverFiles(), ...[...this.overlays.keys()].map(virtualFilename)])];
-		if (!this.overlays.has(filename)) {
-			this.results.delete(filename);
-			this.fileVersions.set(filename, (this.fileVersions.get(filename) ?? 0) + 1);
-		}
-		this.version++;
-	}
-	text(filename) {
-		filename = sourceFilename(resolve(filename));
-		return this.overlays.get(filename) ?? ts.sys.readFile(filename);
-	}
-	transformed(filename) {
-		filename = sourceFilename(resolve(filename));
-		const source = this.text(filename);
-		return source !== void 0 && isTwillFile(filename) ? this.result(filename, source) : void 0;
-	}
-	sourceFiles() {
-		const dependencies = this.service.getProgram()?.getSourceFiles().filter((file) => !file.isDeclarationFile && !isDependency(file.fileName)).map((file) => file.fileName) ?? [];
-		return [...new Set([...this.files, ...dependencies].map(sourceFilename))];
-	}
-	lines(filename, result) {
-		let lines = this.lineMaps.get(result);
-		if (!lines) {
-			lines = {
-				original: lineStarts(this.text(filename)),
-				generated: lineStarts(result.code)
-			};
-			this.lineMaps.set(result, lines);
-		}
-		return lines;
-	}
-	toGeneratedOffset(filename, offset) {
-		const result = this.transformed(filename);
-		if (!result) return offset;
-		const lines = this.lines(filename, result);
-		const sourcePosition = positionAt(lines.original, offset);
-		const position = generatedPosition(result, sourcePosition.line, sourcePosition.column);
-		if (position.line === null || position.column === null) return offset;
-		return (lines.generated[position.line - 1] ?? 0) + position.column;
-	}
-	toOriginalOffset(filename, offset) {
-		const result = this.transformed(filename);
-		if (!result) return offset;
-		const lines = this.lines(filename, result);
-		const sourcePosition = positionAt(lines.generated, offset);
-		const position = originalPosition(result, sourcePosition.line, sourcePosition.column);
-		if (position.line === null || position.column === null) return 0;
-		return (lines.original[position.line - 1] ?? 0) + position.column;
-	}
-	diagnostic(diagnostic) {
-		const filename = diagnostic.file ? sourceFilename(diagnostic.file.fileName) : void 0;
-		const source = filename ? this.text(filename) ?? "" : "";
-		const start = filename ? this.toOriginalOffset(filename, diagnostic.start ?? 0) : 0;
-		const end = filename ? this.toOriginalOffset(filename, (diagnostic.start ?? 0) + (diagnostic.length ?? 1)) : start + 1;
-		const before = source.slice(0, start).split(/\r\n|[\r\n\u2028\u2029]/);
-		return {
-			filename,
-			line: before.length,
-			column: before.at(-1).length,
-			length: Math.max(1, end - start),
-			code: diagnostic.code,
-			category: diagnostic.category === ts.DiagnosticCategory.Error ? "error" : diagnostic.category === ts.DiagnosticCategory.Warning ? "warning" : "message",
-			message: ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n")
-		};
-	}
-	diagnostics(filename) {
-		const result = this.configurationErrors.map((error) => this.diagnostic(error));
-		if (!filename) result.push(...this.service.getCompilerOptionsDiagnostics().map((error) => this.diagnostic(error)));
-		const files = filename ? [virtualFilename(resolve(filename))] : this.sourceFiles().map(virtualFilename);
-		for (const file of files) {
-			if (/\.d\.[cm]?ts$/.test(file)) continue;
-			try {
-				this.transformed(file);
-				const syntaxError = this.results.get(sourceFilename(file))?.syntaxError;
-				if (syntaxError) throw syntaxError;
-				result.push(...[...this.service.getSyntacticDiagnostics(file), ...this.service.getSemanticDiagnostics(file)].map((error) => this.diagnostic(error)));
-			} catch (error) {
-				const syntax = error;
-				result.push({
-					filename: sourceFilename(file),
-					line: syntax.line ?? 1,
-					column: syntax.column ?? 0,
-					length: 1,
-					code: 90001,
-					category: "error",
-					message: syntax.message
-				});
-			}
-		}
-		return result;
-	}
-	dispose() {
-		this.service.dispose();
-	}
-};
-//#endregion
 export { TwillProject, isDependency, sourceFilename, virtualFilename };
-
-//# sourceMappingURL=project.js.map

package/dist/register.js

@@ -1,6 +1,6 @@
-import { register } from "node:module";
+import { t as registerLoader } from "./loader-registration-B1ST9h1e.js";
 //#region src/register.ts
-register("./loader.js", import.meta.url);
+await registerLoader();
 //#endregion
 export {};
 

package/dist/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","names":[],"sources":["../src/register.ts"],"sourcesContent":["import { register } from 'node:module';\nregister('./loader.js', import.meta.url);\n"],"mappings":";;AACA,SAAS,eAAe,YAAY,GAAG"}
+{"version":3,"file":"register.js","names":[],"sources":["../src/register.ts"],"sourcesContent":["import { registerLoader } from './loader-registration.js';\nawait registerLoader();\n"],"mappings":";;AACA,MAAM,eAAe"}

package/dist/rollup.js

@@ -1,4 +1,4 @@
-import { t as twillPlugin } from "./plugin-BHfiQ2L-.js";
+import { t as twillPlugin } from "./plugin-DdTVagIU.js";
 //#region src/rollup.ts
 var rollup_default = twillPlugin.rollup;
 //#endregion

package/dist/rspack.js

@@ -1,4 +1,4 @@
-import { t as twillPlugin } from "./plugin-BHfiQ2L-.js";
+import { t as twillPlugin } from "./plugin-DdTVagIU.js";
 //#region src/rspack.ts
 var rspack_default = twillPlugin.rspack;
 //#endregion

package/dist/syntax.js

@@ -1,4 +1,4 @@
-import { o as parse, r as inferLanguage } from "./compiler-CbNSBUI2.js";
+import { o as parse, r as inferLanguage } from "./compiler-BdkU4Ruh.js";
 //#region src/syntax.ts
 /** Original ESTree and dialect metadata for source-aware tooling. */
 function parseSyntax(source, options = {}) {

package/dist/{transpile-D8P8Lsbx.js → transpile-CLNavDUr.js}

@@ -1,4 +1,4 @@
-import { a as transform, r as inferLanguage } from "./compiler-CbNSBUI2.js";
+import { a as transform, r as inferLanguage } from "./compiler-BdkU4Ruh.js";
 import MagicString from "magic-string";
 import ts from "typescript";
 import remapping from "@ampproject/remapping";
@@ -48,4 +48,4 @@ function transpileNative(source, filename, language = inferLanguage(filename), s
 //#endregion
 export { transpileNative as n, transpile as t };
 
-//# sourceMappingURL=transpile-D8P8Lsbx.js.map
+//# sourceMappingURL=transpile-CLNavDUr.js.map

package/dist/{transpile-D8P8Lsbx.js.map → transpile-CLNavDUr.js.map}

@@ -1 +1 @@
-{"version":3,"file":"transpile-D8P8Lsbx.js","names":[],"sources":["../src/transpile.ts"],"sourcesContent":["import ts from 'typescript';\nimport remapping from '@ampproject/remapping';\nimport MagicString from 'magic-string';\nimport { transform, inferLanguage, type TransformOptions } from './compiler.js';\n\nexport function transpile(\n  source: string,\n  options: TransformOptions = {},\n  target = ts.ScriptTarget.ESNext,\n) {\n  const filename = options.filename ?? 'input.twill';\n  const result = transform(source, options);\n  const language = options.language ?? inferLanguage(filename);\n  return transpileNative(\n    result.code,\n    filename,\n    language,\n    result.map.toString(),\n    options.jsxImportSource,\n    target,\n  );\n}\n\n/** Native source never goes through Twill's parser or implicit-return rules. */\nexport function transpileNative(\n  source: string,\n  filename: string,\n  language = inferLanguage(filename),\n  syntaxMap?: string,\n  jsxImportSource?: string,\n  target = ts.ScriptTarget.ESNext,\n) {\n  // Plain JavaScript needs no type erasure or JSX transform. Leave modern JS\n  // (including comments and import attributes) to the host's target pipeline.\n  if (language === 'js')\n    return {\n      code: source,\n      map:\n        syntaxMap ??\n        new MagicString(source)\n          .generateMap({ source: filename, includeContent: true, hires: true })\n          .toString(),\n    };\n  const output = ts.transpileModule(source, {\n    fileName: syntaxMap ? filename + (language.endsWith('x') ? '.tsx' : '.ts') : filename,\n    compilerOptions: {\n      target,\n      module: ts.ModuleKind.ESNext,\n      jsx: ts.JsxEmit.ReactJSX,\n      jsxImportSource,\n      sourceMap: true,\n      inlineSources: true,\n      isolatedModules: true,\n      verbatimModuleSyntax: true,\n    },\n    reportDiagnostics: true,\n  });\n  const errors = output.diagnostics?.filter(\n    (diagnostic) => diagnostic.category === ts.DiagnosticCategory.Error,\n  );\n  if (errors?.length)\n    throw new Error(\n      ts.formatDiagnostics(errors, {\n        getCanonicalFileName: (name) => name,\n        getCurrentDirectory: () => '',\n        getNewLine: () => '\\n',\n      }),\n    );\n  const map = syntaxMap\n    ? remapping([JSON.parse(output.sourceMapText!), JSON.parse(syntaxMap)], () => null).toString()\n    : output.sourceMapText!;\n  return {\n    code: output.outputText.replace(/^\\/\\/# sourceMappingURL=.*$/m, ''),\n    map,\n  };\n}\n"],"mappings":";;;;;AAKA,SAAgB,UACd,QACA,UAA4B,CAAC,GAC7B,SAAS,GAAG,aAAa,QACzB;CACA,MAAM,WAAW,QAAQ,YAAY;CACrC,MAAM,SAAS,UAAU,QAAQ,OAAO;CACxC,MAAM,WAAW,QAAQ,YAAY,cAAc,QAAQ;CAC3D,OAAO,gBACL,OAAO,MACP,UACA,UACA,OAAO,IAAI,SAAS,GACpB,QAAQ,iBACR,MACF;AACF;;AAGA,SAAgB,gBACd,QACA,UACA,WAAW,cAAc,QAAQ,GACjC,WACA,iBACA,SAAS,GAAG,aAAa,QACzB;CAGA,IAAI,aAAa,MACf,OAAO;EACL,MAAM;EACN,KACE,aACA,IAAI,YAAY,MAAM,CAAC,CACpB,YAAY;GAAE,QAAQ;GAAU,gBAAgB;GAAM,OAAO;EAAK,CAAC,CAAC,CACpE,SAAS;CAChB;CACF,MAAM,SAAS,GAAG,gBAAgB,QAAQ;EACxC,UAAU,YAAY,YAAY,SAAS,SAAS,GAAG,IAAI,SAAS,SAAS;EAC7E,iBAAiB;GACf;GACA,QAAQ,GAAG,WAAW;GACtB,KAAK,GAAG,QAAQ;GAChB;GACA,WAAW;GACX,eAAe;GACf,iBAAiB;GACjB,sBAAsB;EACxB;EACA,mBAAmB;CACrB,CAAC;CACD,MAAM,SAAS,OAAO,aAAa,QAChC,eAAe,WAAW,aAAa,GAAG,mBAAmB,KAChE;CACA,IAAI,QAAQ,QACV,MAAM,IAAI,MACR,GAAG,kBAAkB,QAAQ;EAC3B,uBAAuB,SAAS;EAChC,2BAA2B;EAC3B,kBAAkB;CACpB,CAAC,CACH;CACF,MAAM,MAAM,YACR,UAAU,CAAC,KAAK,MAAM,OAAO,aAAc,GAAG,KAAK,MAAM,SAAS,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,IAC3F,OAAO;CACX,OAAO;EACL,MAAM,OAAO,WAAW,QAAQ,gCAAgC,EAAE;EAClE;CACF;AACF"}
+{"version":3,"file":"transpile-CLNavDUr.js","names":[],"sources":["../src/transpile.ts"],"sourcesContent":["import ts from 'typescript';\nimport remapping from '@ampproject/remapping';\nimport MagicString from 'magic-string';\nimport { transform, inferLanguage, type TransformOptions } from './compiler.js';\n\nexport function transpile(\n  source: string,\n  options: TransformOptions = {},\n  target = ts.ScriptTarget.ESNext,\n) {\n  const filename = options.filename ?? 'input.twill';\n  const result = transform(source, options);\n  const language = options.language ?? inferLanguage(filename);\n  return transpileNative(\n    result.code,\n    filename,\n    language,\n    result.map.toString(),\n    options.jsxImportSource,\n    target,\n  );\n}\n\n/** Native source never goes through Twill's parser or implicit-return rules. */\nexport function transpileNative(\n  source: string,\n  filename: string,\n  language = inferLanguage(filename),\n  syntaxMap?: string,\n  jsxImportSource?: string,\n  target = ts.ScriptTarget.ESNext,\n) {\n  // Plain JavaScript needs no type erasure or JSX transform. Leave modern JS\n  // (including comments and import attributes) to the host's target pipeline.\n  if (language === 'js')\n    return {\n      code: source,\n      map:\n        syntaxMap ??\n        new MagicString(source)\n          .generateMap({ source: filename, includeContent: true, hires: true })\n          .toString(),\n    };\n  const output = ts.transpileModule(source, {\n    fileName: syntaxMap ? filename + (language.endsWith('x') ? '.tsx' : '.ts') : filename,\n    compilerOptions: {\n      target,\n      module: ts.ModuleKind.ESNext,\n      jsx: ts.JsxEmit.ReactJSX,\n      jsxImportSource,\n      sourceMap: true,\n      inlineSources: true,\n      isolatedModules: true,\n      verbatimModuleSyntax: true,\n    },\n    reportDiagnostics: true,\n  });\n  const errors = output.diagnostics?.filter(\n    (diagnostic) => diagnostic.category === ts.DiagnosticCategory.Error,\n  );\n  if (errors?.length)\n    throw new Error(\n      ts.formatDiagnostics(errors, {\n        getCanonicalFileName: (name) => name,\n        getCurrentDirectory: () => '',\n        getNewLine: () => '\\n',\n      }),\n    );\n  const map = syntaxMap\n    ? remapping([JSON.parse(output.sourceMapText!), JSON.parse(syntaxMap)], () => null).toString()\n    : output.sourceMapText!;\n  return {\n    code: output.outputText.replace(/^\\/\\/# sourceMappingURL=.*$/m, ''),\n    map,\n  };\n}\n"],"mappings":";;;;;AAKA,SAAgB,UACd,QACA,UAA4B,CAAC,GAC7B,SAAS,GAAG,aAAa,QACzB;CACA,MAAM,WAAW,QAAQ,YAAY;CACrC,MAAM,SAAS,UAAU,QAAQ,OAAO;CACxC,MAAM,WAAW,QAAQ,YAAY,cAAc,QAAQ;CAC3D,OAAO,gBACL,OAAO,MACP,UACA,UACA,OAAO,IAAI,SAAS,GACpB,QAAQ,iBACR,MACF;AACF;;AAGA,SAAgB,gBACd,QACA,UACA,WAAW,cAAc,QAAQ,GACjC,WACA,iBACA,SAAS,GAAG,aAAa,QACzB;CAGA,IAAI,aAAa,MACf,OAAO;EACL,MAAM;EACN,KACE,aACA,IAAI,YAAY,MAAM,CAAC,CACpB,YAAY;GAAE,QAAQ;GAAU,gBAAgB;GAAM,OAAO;EAAK,CAAC,CAAC,CACpE,SAAS;CAChB;CACF,MAAM,SAAS,GAAG,gBAAgB,QAAQ;EACxC,UAAU,YAAY,YAAY,SAAS,SAAS,GAAG,IAAI,SAAS,SAAS;EAC7E,iBAAiB;GACf;GACA,QAAQ,GAAG,WAAW;GACtB,KAAK,GAAG,QAAQ;GAChB;GACA,WAAW;GACX,eAAe;GACf,iBAAiB;GACjB,sBAAsB;EACxB;EACA,mBAAmB;CACrB,CAAC;CACD,MAAM,SAAS,OAAO,aAAa,QAChC,eAAe,WAAW,aAAa,GAAG,mBAAmB,KAChE;CACA,IAAI,QAAQ,QACV,MAAM,IAAI,MACR,GAAG,kBAAkB,QAAQ;EAC3B,uBAAuB,SAAS;EAChC,2BAA2B;EAC3B,kBAAkB;CACpB,CAAC,CACH;CACF,MAAM,MAAM,YACR,UAAU,CAAC,KAAK,MAAM,OAAO,aAAc,GAAG,KAAK,MAAM,SAAS,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,IAC3F,OAAO;CACX,OAAO;EACL,MAAM,OAAO,WAAW,QAAQ,gCAAgC,EAAE;EAClE;CACF;AACF"}

package/dist/typescript-plugin.cjs

@@ -14989,9 +14989,12 @@ function guardAt(input, offset, implicitMember = false) {
 	const lexer = Parser.tokenizer(input.slice(offset), { ecmaVersion: "latest" });
 	const stack = [];
 	let first = true;
+	let missingElse = false;
+	let afterNonNull = false;
 	try {
 		for (;;) {
-			const label = lexer.getToken().type.label;
+			const token = lexer.getToken();
+			const label = token.type.label;
 			if (first && [
 				"=",
 				".",
@@ -15005,6 +15008,22 @@ function guardAt(input, offset, implicitMember = false) {
 				"in",
 				"instanceof"
 			].includes(label) && !(implicitMember && label === ".")) return false;
+			if (first || afterNonNull) {
+				missingElse = !/[\r\n\u2028\u2029]/.test(input.slice(offset, offset + token.start)) && (token.type === types$1.name && !["as", "satisfies"].includes(token.value) || [
+					"const",
+					"num",
+					"string",
+					"true",
+					"false",
+					"null",
+					"this",
+					"new",
+					"typeof",
+					"void",
+					"delete"
+				].includes(label) || token.type === types$1.prefix && token.value === "~" || implicitMember && first && label === ".");
+				afterNonNull = token.type === types$1.prefix && token.value === "!";
+			}
 			if (!stack.length && [
 				"if",
 				"for",
@@ -15015,15 +15034,12 @@ function guardAt(input, offset, implicitMember = false) {
 				"throw",
 				"var",
 				"export"
-			].includes(label)) return false;
-			if (!first && !stack.length && label === "const") return false;
+			].includes(label)) return missingElse ? "missingElse" : false;
+			if (!first && !stack.length && label === "const") return missingElse ? "missingElse" : false;
 			first = false;
 			if (!stack.length && label === "else") return true;
-			if (!stack.length && [
-				"eof",
-				";",
-				"}"
-			].includes(label)) return false;
+			if (label === "eof") return !stack.length && missingElse ? "missingElse" : false;
+			if (!stack.length && [";", "}"].includes(label)) return missingElse ? "missingElse" : false;
 			if ([
 				"(",
 				"[",
@@ -15260,7 +15276,9 @@ function parserFor(language) {
 				node.cleanup = cleanup;
 				return this.finishNode(node, "DeferStatement");
 			}
-			if (!this.isContextual("guard") || !guardAt(this.input, this.end, !!this.implicitClosure)) {
+			const guard = this.isContextual("guard") && guardAt(this.input, this.end, !!this.implicitClosure);
+			if (guard === "missingElse") this.raise(this.start, "Missing 'else' in guard statement. Put 'else' before the failure block: 'guard condition else { return ...; }'.");
+			if (!guard) {
 				const statement = super.parseStatement(context, ...args);
 				if (context && statement.type === "TwillEnumDeclaration") this.raise(statement.start, "An associated-value enum requires a block; add braces around this body.");
 				return statement;
@@ -15269,6 +15287,7 @@ function parserFor(language) {
 			node.singleStatement = !!context;
 			this.next();
 			node.binding = null;
+			if (this.type === types$1._else) this.raise(this.start, "Guard needs a condition or 'const' binding before 'else'.");
 			if (this.type === types$1._const) {
 				if (context) this.raise(node.start, "A guard binding requires a block; add braces around this body.");
 				const declaration = this.startNode();
@@ -15278,8 +15297,9 @@ function parserFor(language) {
 				if (node.binding.declarations.length !== 1) this.raise(node.start, "guard const requires one binding declaration.");
 			} else node.test = this.parseExpression();
 			node.elseStart = this.start;
-			this.expect(types$1._else);
-			if (this.type !== types$1.braceL) this.unexpected();
+			if (this.type !== types$1._else) this.raise(this.start, "Expected 'else' after the guard condition or binding.");
+			this.next();
+			if (this.type !== types$1.braceL) this.raise(this.start, "Guard 'else' must be followed by a block, for example 'else { return ...; }'.");
 			node.failure = this.parseBlock();
 			if (!exits(node.failure)) this.raise(node.failure.start, "Every guard else path must exit with return, throw, break or continue.");
 			return this.finishNode(node, "GuardStatement");