@swiftuijs/twill 0.2.0 → 0.3.1

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 ([
 				"(",
 				"[",
@@ -15159,6 +15175,15 @@ function parserFor(language) {
 	if (parsers.has(language)) return parsers.get(language);
 	const Base = bases[language];
 	class TwillParser extends Base {
+		declareName(name, bindingType, position) {
+			if (bindingType === 6 || bindingType === 7) {
+				const scope = this.currentScope();
+				(scope.types ??= []).push(name);
+				if (this.inModule && scope.flags & 1) delete this.undefinedExports[name];
+				return;
+			}
+			super.declareName(name, bindingType, position);
+		}
 		skipHeader = null;
 		closures = [];
 		lineStarts = null;
@@ -15251,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;
@@ -15260,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();
@@ -15269,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");
@@ -15632,9 +15661,10 @@ function parse$1(source, language = "ts", sourceType = "module") {
 		if (node.type === "DeferStatement") defers.push(node);
 		if (node.type === "TwillSwitchExpression") switches.push(node);
 		if (node.type === "TwillEnumDeclaration") enums.push(node);
-		for (const [key, value] of Object.entries(node)) {
+		for (const key of Object.keys(node)) {
 			if (key === "trailing" || key === "loc") continue;
-			if (Array.isArray(value)) value.forEach(visit);
+			const value = node[key];
+			if (Array.isArray(value)) for (const child of value) visit(child);
 			else if (value?.type) visit(value);
 		}
 	};
@@ -15667,15 +15697,15 @@ var functions = /* @__PURE__ */ new Set([
 	"ArrowFunctionExpression"
 ]);
 function children(node, visit) {
-	for (const [key, value] of Object.entries(node)) {
+	for (const key of Object.keys(node)) {
 		if (key === "loc" || key === "trailing") continue;
-		if (Array.isArray(value)) value.forEach((child) => {
-			if (child?.type) visit(child);
-		});
-		else if (value?.type) visit(value);
+		const value = node[key];
+		if (Array.isArray(value)) {
+			for (const child of value) if (child?.type) visit(child);
+		} else if (value?.type) visit(value);
 	}
 }
-/** Scope-local cleanup callbacks; dynamic registrations use lazy stacks. */
+/** Native finally where scope permits; callbacks retain dynamic registration semantics. */
 function lowerDefers(source, ast, code, language, usedNames, contentStarts, comments, runtime, sourceType, fail) {
 	const scopes = [];
 	const visit = (node, scope, parent) => {
@@ -15730,6 +15760,35 @@ function lowerDefers(source, ast, code, language, usedNames, contentStarts, comm
 		if (!scope.defers.length) continue;
 		const { block } = scope;
 		const statements = block.body;
+		const first = statements.indexOf(scope.defers[0]);
+		let native = first >= 0 && scope.defers.every((node) => !node.awaited && statements.includes(node));
+		if (native) {
+			native = !statements.some((node, index) => node.type === "FunctionDeclaration" || node.type === "TSDeclareFunction" || node.type === "VariableDeclaration" && node.kind.endsWith("using") || index > first && (node.type === "VariableDeclaration" && node.kind !== "var" || node.type.endsWith("Declaration") && node.type !== "VariableDeclaration" || node.type === "GuardStatement" && node.binding));
+			const check = (node) => {
+				if (node.type === "WithStatement" || node.type === "ThisExpression" || node.type === "VariableDeclarator" && !node.init || node.type === "VariableDeclaration" && node.kind === "var" && (!statements.includes(node) || node.start > scope.defers[0].start) || node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "eval") native = false;
+				children(node, check);
+			};
+			if (native) check(block);
+			const cleanupScope = (node) => {
+				if (node.type === "FunctionDeclaration" || node.directive || node.type === "VariableDeclaration" && node.kind === "var") native = false;
+				if (!functions.has(node.type)) children(node, cleanupScope);
+			};
+			if (native) for (const node of scope.defers) cleanupScope(node.cleanup.body);
+		}
+		if (native) {
+			for (const node of [...scope.defers].reverse()) {
+				code.overwrite(node.start, node.cleanup.body.start, ";try {");
+				if (!node.cleanup.body.body.length) {
+					code.remove(node.cleanup.body.start, node.cleanup.body.end);
+					code.appendLeft(block.end - 1, "\n} finally " + source.slice(node.cleanup.body.start, node.cleanup.body.end) + "\n");
+					continue;
+				}
+				code.prependRight(node.cleanup.body.start, "\n} finally ");
+				code.appendLeft(node.cleanup.body.end, "\n");
+				if (node.cleanup.body.end !== block.end - 1) code.move(node.cleanup.body.start, node.cleanup.body.end, block.end - 1);
+			}
+			continue;
+		}
 		const single = scope.defers.length === 1 && statements.includes(scope.defers[0]);
 		const stack = fresh(single ? "Cleanup" : "Defers");
 		const failure = single ? "" : fresh("Failure");
@@ -16610,12 +16669,12 @@ var TwillSyntaxError = class extends SyntaxError {
 };
 function walk(node, visit) {
 	visit(node);
-	for (const [key, value] of Object.entries(node)) {
-		if (["loc", "trailing"].includes(key)) continue;
-		if (Array.isArray(value)) value.forEach((child) => {
-			if (child?.type) walk(child, visit);
-		});
-		else if (value?.type) walk(value, visit);
+	for (const key of Object.keys(node)) {
+		if (key === "loc" || key === "trailing") continue;
+		const value = node[key];
+		if (Array.isArray(value)) {
+			for (const child of value) if (child?.type) walk(child, visit);
+		} else if (value?.type) walk(value, visit);
 	}
 }
 function calleeName(node) {
@@ -17392,7 +17451,7 @@ function remapping(input, loader, options) {
 //#endregion
 //#region src/recovery.ts
 /** Editor-only recovery; build and CLI compilation always use strict parsing. */
-function recoverTransform(source, options) {
+function recoverTransform(source, options, onSyntaxError) {
 	const repaired = new MagicString(source);
 	let text = source;
 	for (let attempt = 0; attempt < 8; attempt++) try {
@@ -17433,6 +17492,7 @@ function recoverTransform(source, options) {
 		};
 	} 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;
@@ -17697,13 +17757,18 @@ var TwillProject = class {
 	result(filename, source) {
 		const cached = this.results.get(filename);
 		if (cached?.source === source) return cached.result;
-		const result = (this.recover ? recoverTransform : transform)(source, {
+		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
+			result,
+			syntaxError
 		});
 		return result;
 	}
@@ -17797,11 +17862,9 @@ var TwillProject = class {
 		for (const file of files) {
 			if (/\.d\.[cm]?ts$/.test(file)) continue;
 			try {
-				if (this.recover && isTwillFile(sourceFilename(file))) transform(this.text(file) ?? "", {
-					...this.options,
-					filename: sourceFilename(file)
-				});
 				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;