@jigs.design/compiler 0.1.2 → 0.2.0

package/README.md

@@ -2,7 +2,7 @@
 
 Today's Jigs compiler: the parser, the checker against a catalog, the code generator, recipe libraries, and the SEARCH/REPLACE edit helpers. `@jigs.design/server` and `@jigs.design/prompt` use it. You import it for tooling, not to run a session.
 
-It parses embedded code with [acorn](https://github.com/acornjs/acorn) in strict mode, the mode programs run in, and checks names and the JavaScript subset. It has no built-in catalog. Every caller passes one, and its prop kinds are boolean, enum, handler, number, rows and string.
+Its diagnostics are the `Diagnostic` type from `@jigs.design/protocol`, the shape the server sends; it imports that package's types and nothing else from it. It parses embedded code with [acorn](https://github.com/acornjs/acorn) in strict mode, the mode programs run in, and checks names and the JavaScript subset. It has no built-in catalog. Every caller passes one, and its prop kinds are boolean, enum, handler, number, rows and string.
 
 The [language RFC](../../docs/language-v2/rfc.md) plans its next changes. It evolves in place, behind the same server API.
 

package/dist/block-hoist.d.ts

@@ -0,0 +1,2 @@
+import "./ast.js";
+import "./compile.js";

package/dist/check-code.d.ts

@@ -1,4 +1,6 @@
-import { Diagnostic } from "./compile.js";
+import "./ast.js";
+import { Finding } from "./compile.js";
+import "./block-hoist.js";
 import { ProcedureCall } from "./script.js";
 //#region src/check-code.d.ts
 /** A procedure call in the document, by line, for the server to check against its host. */
@@ -10,7 +12,7 @@ export interface ProcedureUse extends Omit<ProcedureCall, "end" | "offset"> {
   start?: number;
 }
 /** Where a diagnostic points: a line, and a range in the source when the code has one. */
-type Place = Pick<Diagnostic, "end" | "line" | "start">;
+type Place = Pick<Finding, "end" | "line" | "start">;
 /** A step of `DataRead.path` into each element of an array, as an `<each>` item takes. */
 export declare const ELEMENT = "[]";
 /**

package/dist/check-code.js

@@ -277,18 +277,18 @@ function readBody(statements, define, outer) {
 * Checks every piece of code in the page and its defines, adding to
 * `diagnostics`, and returns the procedure calls it saw, in source order.
 */
-function checkCode(tree, defines, pageStatements, diagnostics, hoists, dropped = /* @__PURE__ */ new Set()) {
+function checkCode(tree, defines, pageStatements, findings, hoists, dropped = /* @__PURE__ */ new Set()) {
 	const procedures = [];
 	const reads = [];
 	const report = (place, code, message, fix) => {
-		const diagnostic = {
+		const finding = {
 			code,
 			...place,
 			message,
-			severity: "warning"
+			severity: "error"
 		};
-		if (fix !== void 0) diagnostic.fix = fix;
-		diagnostics.push(diagnostic);
+		if (fix !== void 0) finding.fix = fix;
+		findings.push(finding);
 	};
 	const checkSnippet = (snippet, body, scope) => {
 		const facts = factsOf(snippet);

package/dist/codegen.d.ts

@@ -1,3 +1,5 @@
+import "./ast.js";
+import "./compile.js";
 //#region src/codegen.d.ts
 /** What the sandbox runs: a JavaScript program plus the text it displays. */
 export interface ProgramOutput {

package/dist/codegen.js

@@ -62,15 +62,15 @@ const fragment = (children) => `__jigs.jsx(${[
 const documentLines = { line: String };
 const libraryLines = { line: () => "__jigsAt" };
 function generateProgram(statements, tree, defines = []) {
-	const diagnostics = [];
+	const findings = [];
 	const constants = {};
 	let nextConstant = 0;
 	const invalid = (code, line, message) => {
-		diagnostics.push({
+		findings.push({
 			code,
 			line,
 			message,
-			severity: "warning"
+			severity: "error"
 		});
 	};
 	/** Statement lines, run in order, plus a `let` for every name they declare. */
@@ -195,7 +195,7 @@ function generateProgram(statements, tree, defines = []) {
 	const functions = defines.map((def) => genDefine(def));
 	const children = genChildren(tree, documentLines);
 	return {
-		diagnostics,
+		findings,
 		output: {
 			code: [
 				"\"use strict\";",

package/dist/compile.d.ts

@@ -3,6 +3,7 @@ import { ExprNode, PropValue, Statement, TextNode } from "./ast.js";
 import { CompileCatalog } from "./spec.js";
 import { ProgramOutput } from "./codegen.js";
 import { DataRead, ProcedureUse } from "./check-code.js";
+import { Diagnostic, Severity } from "@jigs.design/protocol";
 //#region src/compile.d.ts
 type DiagnosticCode = "coerced" | "handle_field" | "hook_placement" | "invalid_control" | "invalid_define" | "invalid_expression" | "invalid_literal" | "invalid_statement" | "missing_declarations" | "missing_prop" | "mutate_in_render" | "outer_reference" | "query_options" | "repaired" | "shadows_library" | "unclosed" | "undefined_compare" | "undefined_reference" | "unexpected_children" | "unknown_component" | "unknown_prop" | "unstable_input" | "unsupported_syntax" | "use_before_declare";
 /** Replace `[start, end)` of the source with `text`. */
@@ -21,20 +22,25 @@ export interface Fix {
   /** What the fix does, such as "Replace with `q.status === "pending"`". */
   title: string;
 }
-export interface Diagnostic {
+/**
+ * A diagnostic while the compiler works: flat offsets into the source being
+ * compiled, and a fix as offset edits, so `applyFixes` can apply it. The
+ * result reports each as a `Diagnostic`.
+ */
+export interface Finding {
   code: DiagnosticCode;
-  /** The 1-based column of `start` on its line. */
-  column?: number;
   /** Just past what the diagnostic is about, as an offset into the source. */
   end?: number;
   fix?: Fix;
   /** The line of `start` when there is one. */
   line: number;
   message: string;
-  severity: "info" | "warning";
+  severity: Severity;
   /** The first character of what the diagnostic is about, as an offset into the source. */
   start?: number;
 }
+/** What `compileJigs` reports: the shape the server sends and the eval results store. */
+type Diagnostic$1 = Diagnostic<DiagnosticCode>;
 interface RenderElement {
   children: Array<RenderNode>;
   component: string;
@@ -138,7 +144,7 @@ export interface CompileOptions {
 }
 export interface CompileResult {
   defines: ReadonlyArray<CompiledDefine>;
-  diagnostics: Array<Diagnostic>;
+  diagnostics: Array<Diagnostic$1>;
   /** The recipes this document was compiled against. */
   library: ReadonlyMap<string, CompiledDefine>;
   output: ProgramOutput;
@@ -165,13 +171,13 @@ export interface CompileResult {
  */
 export declare function compileLibrary(recipes: ReadonlyArray<Recipe>, catalog: CompileCatalog): Library;
 /**
- * Compiles a document. A warning that carries a fix is applied rather than
+ * Compiles a document. An error that carries a fix is applied rather than
  * sent to the model: the fixed source is compiled again, and when it has
  * exactly the problems left that the fixes did not cover, its program is
- * used and those warnings become `info`, as a quoted number on a number prop
+ * used and those errors become `info`, as a quoted number on a number prop
  * already is. Diagnostics, procedures and their spans stay those of `source`,
  * which is what the model wrote and what the session keeps.
  */
 export declare function compileJigs(source: string, options: CompileOptions): CompileResult;
 //#endregion
-export {};
+export { Diagnostic$1 as Diagnostic };

package/dist/compile.js

@@ -1,6 +1,6 @@
 import { analyze } from "./script.js";
 import { generateProgram, isBindingName } from "./codegen.js";
-import { columnAt, lineAt, sourceRange } from "./offsets.js";
+import { lineAt, rangeIn, sourceRange, spanIn } from "./offsets.js";
 import { closest, nearest } from "./suggest.js";
 import { checkCode } from "./check-code.js";
 import { parseJigs } from "./parse.js";
@@ -109,37 +109,37 @@ function treeHasSlot(nodes) {
 	}
 	return false;
 }
-function readDefine(node, diagnostics, libraryNames, components) {
+function readDefine(node, findings, libraryNames, components) {
 	const nameProp = node.props.find((prop) => prop.name === "name");
 	const name = nameProp !== void 0 && nameProp.shorthand !== true && nameProp.value.kind === "literal" && typeof nameProp.value.value === "string" ? nameProp.value.value : null;
 	if (name === null) {
-		diagnostics.push({
+		findings.push({
 			code: "invalid_define",
 			...placeOf(node),
 			message: `<define> needs name="componentName"; it was removed`,
-			severity: "warning"
+			severity: "error"
 		});
 		return null;
 	}
 	if (componentSpec(components, name) !== void 0 || RESERVED_TAGS.has(name)) {
-		diagnostics.push({
+		findings.push({
 			code: "invalid_define",
 			...placeOf(node),
 			message: `<define name="${name}"> clashes with <${name}>; it was removed`,
-			severity: "warning"
+			severity: "error"
 		});
 		return null;
 	}
 	if (!isBindingName(name)) {
-		diagnostics.push({
+		findings.push({
 			code: "invalid_define",
 			...placeOf(node),
 			message: `<define name="${name}"> is not a usable component name; it was removed`,
-			severity: "warning"
+			severity: "error"
 		});
 		return null;
 	}
-	if (libraryNames.has(name)) diagnostics.push({
+	if (libraryNames.has(name)) findings.push({
 		code: "shadows_library",
 		...placeOf(node),
 		message: `<define name="${name}"> overrides the library component`,
@@ -150,38 +150,38 @@ function readDefine(node, diagnostics, libraryNames, components) {
 	for (const prop of node.props) {
 		if (prop === nameProp) continue;
 		if (prop.name === "key") {
-			diagnostics.push({
+			findings.push({
 				code: "invalid_define",
 				...placeOf(node, prop),
 				message: `<define name="${name}"> prop "key" is reserved for the instance; it was removed`,
-				severity: "warning"
+				severity: "error"
 			});
 			continue;
 		}
 		if (prop.name === "name") {
-			diagnostics.push({
+			findings.push({
 				code: "invalid_define",
 				...placeOf(node, prop),
 				message: `<define name="${name}"> cannot take a prop called "name", which names the define itself; call it "title" or "label". It was removed`,
-				severity: "warning"
+				severity: "error"
 			});
 			continue;
 		}
 		if (prop.name === "children" || !isBindingName(prop.name)) {
-			diagnostics.push({
+			findings.push({
 				code: "invalid_define",
 				...placeOf(node, prop),
 				message: `<define name="${name}"> prop "${prop.name}" is not a usable name; it was removed`,
-				severity: "warning"
+				severity: "error"
 			});
 			continue;
 		}
 		if (seen.has(prop.name)) {
-			diagnostics.push({
+			findings.push({
 				code: "invalid_define",
 				...placeOf(node, prop),
 				message: `<define name="${name}"> prop "${prop.name}" is duplicated; the later one was removed`,
-				severity: "warning"
+				severity: "error"
 			});
 			continue;
 		}
@@ -355,13 +355,13 @@ function placeOfCode(code) {
 	};
 }
 const codeAt = (value) => value?.kind === "expr" ? value.at : void 0;
-function validateControl(node, name, children, statements, diagnostics) {
-	const warn = (code, message, prop) => {
-		diagnostics.push({
+function validateControl(node, name, children, statements, findings) {
+	const reject = (code, message, prop) => {
+		findings.push({
 			code,
 			...placeOf(node, prop),
 			message,
-			severity: "warning"
+			severity: "error"
 		});
 	};
 	const props = new Map(node.props.map((prop) => [prop.name, prop.value]));
@@ -369,21 +369,21 @@ function validateControl(node, name, children, statements, diagnostics) {
 		if (controlProps[name].some((allowed) => allowed === prop.name)) continue;
 		const fix = name === "each" && prop.name === "key" ? dropAttribute(node, index) : null;
 		if (fix === null) {
-			warn("unknown_prop", `<${name}> has no prop "${prop.name}"`, prop);
+			reject("unknown_prop", `<${name}> has no prop "${prop.name}"`, prop);
 			continue;
 		}
-		diagnostics.push({
+		findings.push({
 			code: "unknown_prop",
 			...placeOf(node, prop),
 			fix,
 			message: "<each> has no prop \"key\": items are keyed by their own `id` or `key`",
-			severity: "warning"
+			severity: "error"
 		});
 	}
 	if (name === "if") {
 		const test = asCode(props.get("test"));
 		if (test === null) {
-			warn("invalid_control", "<if> needs test={condition}; it was removed");
+			reject("invalid_control", "<if> needs test={condition}; it was removed");
 			return [];
 		}
 		const testAt = codeAt(props.get("test"));
@@ -399,14 +399,14 @@ function validateControl(node, name, children, statements, diagnostics) {
 	const items = asCode(props.get("of"));
 	const itemsAt = codeAt(props.get("of"));
 	if (items === null) {
-		warn("invalid_control", "<each> needs of={list}; it was removed");
+		reject("invalid_control", "<each> needs of={list}; it was removed");
 		return [];
 	}
 	const binding = (prop, fallback) => {
 		const value = props.get(prop);
 		if (value === void 0) return fallback;
 		if (value.kind === "literal" && isBindingName(String(value.value))) return String(value.value);
-		warn("invalid_control", `<each ${prop}> must be a plain variable name like "item"; using ${fallback === null ? "none" : `"${fallback}"`}`);
+		reject("invalid_control", `<each ${prop}> must be a plain variable name like "item"; using ${fallback === null ? "none" : `"${fallback}"`}`);
 		return fallback;
 	};
 	return [{
@@ -422,25 +422,25 @@ function validateControl(node, name, children, statements, diagnostics) {
 }
 function validateSlot(node, state) {
 	if (!state.inDefine) {
-		state.diagnostics.push({
+		state.findings.push({
 			code: "invalid_define",
 			...placeOf(node),
 			message: "<slot> is only allowed inside <define>; it was removed",
-			severity: "warning"
+			severity: "error"
 		});
 		return [];
 	}
-	for (const prop of node.props) state.diagnostics.push({
+	for (const prop of node.props) state.findings.push({
 		code: "unknown_prop",
 		...placeOf(node, prop),
 		message: `<slot> has no prop "${prop.name}"`,
-		severity: "warning"
+		severity: "error"
 	});
-	if (node.children.length > 0) state.diagnostics.push({
+	if (node.children.length > 0) state.findings.push({
 		code: "unexpected_children",
 		...placeOf(node),
 		message: "<slot> takes no children; they were dropped",
-		severity: "warning"
+		severity: "error"
 	});
 	return [{
 		line: node.line,
@@ -448,15 +448,15 @@ function validateSlot(node, state) {
 	}];
 }
 /** Keeps the first `<slot/>` that survived validation and drops the rest. */
-function trimExtraSlots(nodes, defineName, diagnostics, seen) {
+function trimExtraSlots(nodes, defineName, findings, seen) {
 	return nodes.flatMap((node) => {
 		if (node.type === "slot") {
 			if (seen.count > 0) {
-				diagnostics.push({
+				findings.push({
 					code: "invalid_define",
 					...placeOf(node),
 					message: `<${defineName}> already has a <slot>; this one was removed`,
-					severity: "warning"
+					severity: "error"
 				});
 				return [];
 			}
@@ -465,7 +465,7 @@ function trimExtraSlots(nodes, defineName, diagnostics, seen) {
 		}
 		if (node.type === "call" || node.type === "each" || node.type === "element" || node.type === "if") return [{
 			...node,
-			children: trimExtraSlots(node.children, defineName, diagnostics, seen)
+			children: trimExtraSlots(node.children, defineName, findings, seen)
 		}];
 		return [node];
 	});
@@ -480,11 +480,11 @@ function validateCall(node, def, state, scope) {
 	for (const prop of node.props) {
 		if (prop.name === "key") {
 			if (prop.value.kind === "literal" && typeof prop.value.value !== "string" && typeof prop.value.value !== "number") {
-				state.diagnostics.push({
+				state.findings.push({
 					code: "invalid_literal",
 					...placeOf(node, prop),
 					message: `<${def.name} key={${JSON.stringify(prop.value.value)}}> must be a string or number`,
-					severity: "warning"
+					severity: "error"
 				});
 				continue;
 			}
@@ -494,17 +494,17 @@ function validateCall(node, def, state, scope) {
 		const spec = known.get(prop.name);
 		if (spec === void 0) {
 			const near = nearest(prop.name, known.keys(), 1)[0];
-			state.diagnostics.push({
+			state.findings.push({
 				code: "unknown_prop",
 				...placeOf(node, prop),
 				message: near === void 0 ? `<${def.name}> has no prop "${prop.name}"` : `<${def.name}> has no prop "${prop.name}"; did you mean ${near}?`,
-				severity: "warning"
+				severity: "error"
 			});
 			continue;
 		}
 		if (spec.kind === "number" && prop.value.kind === "literal" && typeof prop.value.value === "string" && NUMERIC.test(prop.value.value)) {
 			const value = Number(prop.value.value);
-			state.diagnostics.push({
+			state.findings.push({
 				code: "coerced",
 				...placeOf(node, prop),
 				message: `<${def.name} ${writtenProp(prop)}> is text; it was read as ${prop.name}={${String(value)}}. Write numbers in braces`,
@@ -517,27 +517,27 @@ function validateCall(node, def, state, scope) {
 			continue;
 		}
 		if (prop.value.kind === "literal" && spec.kind !== null && typeof prop.value.value !== spec.kind) {
-			state.diagnostics.push({
+			state.findings.push({
 				code: "invalid_literal",
 				...placeOf(node, prop),
 				message: `<${def.name} ${writtenProp(prop)}> does not match a ${spec.kind} value`,
-				severity: "warning"
+				severity: "error"
 			});
 			continue;
 		}
 		props[prop.name] = prop.value;
 	}
-	for (const spec of def.props) if (spec.required && !Object.hasOwn(props, spec.name)) state.diagnostics.push({
+	for (const spec of def.props) if (spec.required && !Object.hasOwn(props, spec.name)) state.findings.push({
 		code: "missing_prop",
 		...placeOf(node),
 		message: `<${def.name}> is missing required prop "${spec.name}"`,
-		severity: "warning"
+		severity: "error"
 	});
-	if (!def.hasSlot && def.incomplete !== true && children.length > 0) state.diagnostics.push({
+	if (!def.hasSlot && def.incomplete !== true && children.length > 0) state.findings.push({
 		code: "unexpected_children",
 		...placeOf(node),
 		message: `<${def.name}> has no <slot>, so its children were dropped`,
-		severity: "warning"
+		severity: "error"
 	});
 	return [{
 		children: def.hasSlot ? children : [],
@@ -562,14 +562,14 @@ function validateNodes(nodes, state, scope) {
 			if (misuse !== null) {
 				const inBlock = scope.block === "each" || scope.block === "if";
 				const hoist = inBlock ? state.hoists.byStart.get(node.start) : void 0;
-				const diagnostic = {
+				const finding = {
 					code: inBlock ? "invalid_statement" : "hook_placement",
 					...placeOfCode(node),
 					message: `${misuse.message}${hoist?.reason === null || hoist?.reason === void 0 ? "" : `; it can't move out by itself, as it ${hoist.reason}`}. The statement was removed`,
-					severity: "warning"
+					severity: "error"
 				};
-				if (hoist?.fix) diagnostic.fix = hoist.fix;
-				state.diagnostics.push(diagnostic);
+				if (hoist?.fix) finding.fix = hoist.fix;
+				state.findings.push(finding);
 				for (const name of misuse.declared) state.dropped.add(name);
 				return [];
 			}
@@ -585,11 +585,11 @@ function validateNodes(nodes, state, scope) {
 		if (node.type === "expr") {
 			const misuse = hookMisuse(node.code, "expression", scope.block);
 			if (misuse !== null) {
-				state.diagnostics.push({
+				state.findings.push({
 					code: "hook_placement",
 					...placeOfCode(node),
 					message: `${misuse.message}. The expression was removed`,
-					severity: "warning"
+					severity: "error"
 				});
 				return [];
 			}
@@ -597,11 +597,11 @@ function validateNodes(nodes, state, scope) {
 		}
 		if (node.type !== "element") return [node];
 		if (node.name === "define") {
-			state.diagnostics.push({
+			state.findings.push({
 				code: "invalid_define",
 				...placeOf(node),
 				message: "<define> is only allowed at the top level; it was removed",
-				severity: "warning"
+				severity: "error"
 			});
 			return [];
 		}
@@ -612,18 +612,18 @@ function validateNodes(nodes, state, scope) {
 				block: node.name,
 				statements
 			});
-			return validateControl(node, node.name, children, statements, state.diagnostics);
+			return validateControl(node, node.name, children, statements, state.findings);
 		}
 		const defined = state.defines.get(node.name);
 		if (defined !== void 0) return validateCall(node, defined, state, scope);
 		const children = validateNodes(node.children, state, scope);
 		const spec = componentSpec(state.catalog, node.name);
 		if (spec === void 0) {
-			state.diagnostics.push({
+			state.findings.push({
 				code: "unknown_component",
 				...placeOf(node),
 				message: unknownComponentMessage(node.name, state.defines, state.catalog),
-				severity: "warning"
+				severity: "error"
 			});
 			return children;
 		}
@@ -634,29 +634,29 @@ function validateNodes(nodes, state, scope) {
 			const propDefinition = propSpec(spec, prop.name);
 			if (propDefinition === void 0) {
 				const wrap = flexWrap(node, prop, state.catalog);
-				const diagnostic = {
+				const finding = {
 					code: "unknown_prop",
 					...placeOf(node, prop),
 					message: wrap === null ? unknownPropMessage(component, prop.name, spec.props) : `<${component}> has no prop "flex"; wrap it in <box ${wrap.written}>`,
-					severity: "warning"
+					severity: "error"
 				};
-				if (wrap !== null) diagnostic.fix = wrap.fix;
-				state.diagnostics.push(diagnostic);
+				if (wrap !== null) finding.fix = wrap.fix;
+				state.findings.push(finding);
 				continue;
 			}
 			const misuse = prop.value.kind === "expr" ? hookMisuse(prop.value.code, "expression", scope.block) : null;
 			if (misuse !== null) {
-				state.diagnostics.push({
+				state.findings.push({
 					code: "hook_placement",
 					...placeOf(node, prop),
 					message: `<${component} ${prop.name}={…}>: ${misuse.message}. The prop was removed`,
-					severity: "warning"
+					severity: "error"
 				});
 				continue;
 			}
 			const coerced = coerceNumber(propDefinition, prop.value);
 			if (coerced !== null && coerced.kind === "literal") {
-				state.diagnostics.push({
+				state.findings.push({
 					code: "coerced",
 					...placeOf(node, prop),
 					message: `<${component} ${writtenProp(prop)}> is text; it was read as ${prop.name}={${String(coerced.value)}}. Write numbers in braces`,
@@ -666,22 +666,22 @@ function validateNodes(nodes, state, scope) {
 				continue;
 			}
 			if (prop.value.kind === "literal" && !isValidValue(propDefinition, prop.value.value)) {
-				state.diagnostics.push({
+				state.findings.push({
 					code: "invalid_literal",
 					...placeOf(node, prop),
 					message: `<${component} ${writtenProp(prop)}> does not match ${describe(propDefinition, prop.value.value)}`,
-					severity: "warning"
+					severity: "error"
 				});
 				continue;
 			}
 			props[prop.name] = prop.value;
 		}
 		const allowsChildren = spec.children !== "none";
-		if (!allowsChildren && children.length > 0) state.diagnostics.push({
+		if (!allowsChildren && children.length > 0) state.findings.push({
 			code: "unexpected_children",
 			...placeOf(node),
 			message: `<${component}> takes no children; they were dropped`,
-			severity: "warning"
+			severity: "error"
 		});
 		return [{
 			children: allowsChildren ? children : [],
@@ -756,7 +756,7 @@ function countUses(tree, docDefines) {
 }
 function compileDocument(source, library, components) {
 	const document = parseJigs(source);
-	const diagnostics = [...document.repairs.map((repair) => ({
+	const findings = [...document.repairs.map((repair) => ({
 		code: "repaired",
 		...placeOf(repair),
 		message: repair.message,
@@ -765,7 +765,7 @@ function compileDocument(source, library, components) {
 		code: "unclosed",
 		...placeOf(error),
 		message: error.message,
-		severity: "warning"
+		severity: "error"
 	}))];
 	const libraryNames = new Set(library.keys());
 	const docDefines = [];
@@ -774,14 +774,14 @@ function compileDocument(source, library, components) {
 	const docNames = /* @__PURE__ */ new Set();
 	for (const node of document.children) {
 		if (node.type === "element" && node.name === "define") {
-			const def = readDefine(node, diagnostics, libraryNames, components);
+			const def = readDefine(node, findings, libraryNames, components);
 			if (def === null) continue;
 			if (docNames.has(def.name)) {
-				diagnostics.push({
+				findings.push({
 					code: "invalid_define",
 					...placeOf(node),
 					message: `<define name="${def.name}"> is already defined; this one was removed`,
-					severity: "warning"
+					severity: "error"
 				});
 				continue;
 			}
@@ -801,8 +801,8 @@ function compileDocument(source, library, components) {
 		catalog: components,
 		defineName: null,
 		defines: available,
-		diagnostics,
 		dropped,
+		findings,
 		hoists,
 		inDefine: false,
 		ordinals: /* @__PURE__ */ new Map()
@@ -813,15 +813,15 @@ function compileDocument(source, library, components) {
 			catalog: components,
 			defineName: def.name,
 			defines: available,
-			diagnostics,
 			dropped,
+			findings,
 			hoists,
 			inDefine: true,
 			ordinals: /* @__PURE__ */ new Map()
 		}, {
 			block: "define",
 			statements
-		}), def.name, diagnostics, { count: 0 });
+		}), def.name, findings, { count: 0 });
 		def.statements = statements;
 	}
 	const statements = [];
@@ -831,11 +831,11 @@ function compileDocument(source, library, components) {
 			statements.push(statement);
 			continue;
 		}
-		diagnostics.push({
+		findings.push({
 			code: "hook_placement",
 			...placeOfCode(statement),
 			message: `${misuse.message}. The statement was removed`,
-			severity: "warning"
+			severity: "error"
 		});
 		for (const name of misuse.declared) dropped.add(name);
 	}
@@ -843,17 +843,14 @@ function compileDocument(source, library, components) {
 		block: null,
 		statements
 	});
-	const uses = checkCode(tree, docDefines, statements, diagnostics, hoists, dropped);
+	const uses = checkCode(tree, docDefines, statements, findings, hoists, dropped);
 	const generated = generateProgram(statements, tree, emittedDefines(tree, docDefines, available));
-	diagnostics.push(...generated.diagnostics);
-	for (const diagnostic of diagnostics) if (diagnostic.start !== void 0) {
-		diagnostic.line = lineAt(source, diagnostic.start);
-		diagnostic.column = columnAt(source, diagnostic.start);
-	}
-	diagnostics.sort((a, b) => a.line - b.line);
+	findings.push(...generated.findings);
+	for (const finding of findings) if (finding.start !== void 0) finding.line = lineAt(source, finding.start);
+	findings.sort((a, b) => a.line - b.line);
 	return {
 		defines: docDefines,
-		diagnostics,
+		findings,
 		library,
 		output: generated.output,
 		procedures: uses.procedures,
@@ -871,7 +868,7 @@ function buildLibrary(list, components) {
 	for (const recipe of list) {
 		if (built.has(recipe.name)) throw new Error(`Recipe name "${recipe.name}" is duplicated`);
 		const result = compileDocument(recipe.source, built, components);
-		const problem = result.diagnostics[0];
+		const problem = result.findings[0];
 		if (problem !== void 0) throw new Error(`Recipe "${recipe.name}" failed to compile: line ${problem.line}: ${problem.message}`);
 		const def = result.defines[0];
 		if (result.defines.length !== 1 || def === void 0) throw new Error(`Recipe "${recipe.name}" must contain exactly one <define>`);
@@ -917,34 +914,57 @@ function applyFixes(source, fixes) {
 		text
 	};
 }
-const problems = (diagnostics) => diagnostics.filter((diagnostic) => diagnostic.severity === "warning").length;
+const problems = (findings) => findings.filter((finding) => finding.severity === "error").length;
+/** `finding` as a `Diagnostic`, its spans counted in `source`. */
+function toDiagnostic(source, finding) {
+	const diagnostic = {
+		code: finding.code,
+		message: finding.message,
+		severity: finding.severity,
+		span: spanIn(source, finding)
+	};
+	if (finding.fix !== void 0) diagnostic.fix = {
+		edits: finding.fix.edits.map((edit) => ({
+			span: rangeIn(source, edit.start, edit.end),
+			text: edit.text
+		})),
+		title: finding.fix.title
+	};
+	return diagnostic;
+}
+/** `document`'s result, reporting `findings` as diagnostics of `source`. */
+function withDiagnostics({ findings: _, ...result }, source, findings) {
+	return {
+		...result,
+		diagnostics: findings.map((finding) => toDiagnostic(source, finding))
+	};
+}
 /**
-* Compiles a document. A warning that carries a fix is applied rather than
+* Compiles a document. An error that carries a fix is applied rather than
 * sent to the model: the fixed source is compiled again, and when it has
 * exactly the problems left that the fixes did not cover, its program is
-* used and those warnings become `info`, as a quoted number on a number prop
+* used and those errors become `info`, as a quoted number on a number prop
 * already is. Diagnostics, procedures and their spans stay those of `source`,
 * which is what the model wrote and what the session keeps.
 */
 function compileJigs(source, options) {
 	const library = options.library ?? NO_LIBRARY;
 	const result = compileDocument(source, library, options.catalog);
-	const fixes = new Set(result.diagnostics.flatMap((diagnostic) => diagnostic.severity === "warning" && diagnostic.fix !== void 0 ? [diagnostic.fix] : []));
-	if (fixes.size === 0) return result;
+	const fixes = new Set(result.findings.flatMap((finding) => finding.severity === "error" && finding.fix !== void 0 ? [finding.fix] : []));
+	if (fixes.size === 0) return withDiagnostics(result, source, result.findings);
 	const patched = applyFixes(source, [...fixes]);
 	const fixed = compileDocument(patched.text, library, options.catalog);
-	const covered = result.diagnostics.filter((diagnostic) => diagnostic.fix !== void 0 && patched.applied.has(diagnostic.fix)).length;
-	if (problems(fixed.diagnostics) !== problems(result.diagnostics) - covered) return result;
-	return {
+	const covered = result.findings.filter((finding) => finding.fix !== void 0 && patched.applied.has(finding.fix)).length;
+	if (problems(fixed.findings) !== problems(result.findings) - covered) return withDiagnostics(result, source, result.findings);
+	return withDiagnostics({
 		...fixed,
-		diagnostics: result.diagnostics.map((diagnostic) => diagnostic.fix !== void 0 && patched.applied.has(diagnostic.fix) ? {
-			...diagnostic,
-			message: `${diagnostic.message}; the compiler made that change`,
-			severity: "info"
-		} : diagnostic),
 		procedures: result.procedures,
 		reads: result.reads
-	};
+	}, source, result.findings.map((finding) => finding.fix !== void 0 && patched.applied.has(finding.fix) ? {
+		...finding,
+		message: `${finding.message}; the compiler made that change`,
+		severity: "info"
+	} : finding));
 }
 //#endregion
 export { compileJigs, compileLibrary };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { columnAt, lineAt } from "./offsets.js";
+import { columnAt, lineAt, rangeIn, spanIn } from "./offsets.js";
 import { JigsNode, Statement } from "./ast.js";
 import { CompileCatalog, ComponentSpec, PropSpec } from "./spec.js";
 import { ProgramOutput } from "./codegen.js";
@@ -9,4 +9,4 @@ import { parseJigs } from "./parse.js";
 import { nearest } from "./suggest.js";
 import { recipeSignature } from "./signature.js";
 import { Edit, EditFailure, EditFailureReason, SEARCH_MARKER, applyEdits, editBreakage, isEditReply, parseEdits } from "./patch.js";
-export { type CompileCatalog, type CompileOptions, type CompileResult, type CompiledDefine, type ComponentSpec, type DataRead, type Diagnostic, ELEMENT, type Edit, type EditFailure, type EditFailureReason, type Hoisted, type JigsNode, type Library, type ProcedureUse, type Program, type ProgramOutput, type PropSpec, type Recipe, type RenderNode, SEARCH_MARKER, type Statement, applyEdits, columnAt, compileJigs, compileLibrary, editBreakage, hoistDeclarations, isEditReply, lineAt, nearest, parseEdits, parseJigs, recipeSignature };
+export { type CompileCatalog, type CompileOptions, type CompileResult, type CompiledDefine, type ComponentSpec, type DataRead, type Diagnostic, ELEMENT, type Edit, type EditFailure, type EditFailureReason, type Hoisted, type JigsNode, type Library, type ProcedureUse, type Program, type ProgramOutput, type PropSpec, type Recipe, type RenderNode, SEARCH_MARKER, type Statement, applyEdits, columnAt, compileJigs, compileLibrary, editBreakage, hoistDeclarations, isEditReply, lineAt, nearest, parseEdits, parseJigs, rangeIn, recipeSignature, spanIn };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { columnAt, lineAt } from "./offsets.js";
+import { columnAt, lineAt, rangeIn, spanIn } from "./offsets.js";
 import { nearest } from "./suggest.js";
 import { ELEMENT } from "./check-code.js";
 import { parseJigs } from "./parse.js";
@@ -6,4 +6,4 @@ import { hoistDeclarations } from "./hoist.js";
 import { compileJigs, compileLibrary } from "./compile.js";
 import { recipeSignature } from "./signature.js";
 import { SEARCH_MARKER, applyEdits, editBreakage, isEditReply, parseEdits } from "./patch.js";
-export { ELEMENT, SEARCH_MARKER, applyEdits, columnAt, compileJigs, compileLibrary, editBreakage, hoistDeclarations, isEditReply, lineAt, nearest, parseEdits, parseJigs, recipeSignature };
+export { ELEMENT, SEARCH_MARKER, applyEdits, columnAt, compileJigs, compileLibrary, editBreakage, hoistDeclarations, isEditReply, lineAt, nearest, parseEdits, parseJigs, rangeIn, recipeSignature, spanIn };

package/dist/offsets.d.ts

@@ -1,3 +1,4 @@
+import { Span } from "@jigs.design/protocol";
 //#region src/offsets.d.ts
 /**
  * Where text the parser cut out sits in the source. Each entry is
@@ -15,4 +16,12 @@ export interface Range {
 export declare function columnAt(source: string, offset: number): number;
 /** The 1-based line of `offset` in `source`. */
 export declare function lineAt(source: string, offset: number): number;
+/** The span of `[start, end)` in `source`: its line, column and range. */
+export declare function rangeIn(source: string, start: number, end: number): Span;
+/** The span of `place` in `source`: its line, and its range and column when it has one. */
+export declare function spanIn(source: string, place: {
+  end?: number;
+  line: number;
+  start?: number;
+}): Span;
 //#endregion

package/dist/offsets.js

@@ -36,5 +36,18 @@ function lineAt(source, offset) {
 	for (let newline = source.indexOf("\n"); newline !== -1 && newline < offset; newline = source.indexOf("\n", newline + 1)) line++;
 	return line;
 }
+/** The span of `[start, end)` in `source`: its line, column and range. */
+function rangeIn(source, start, end) {
+	return {
+		column: columnAt(source, start),
+		end,
+		line: lineAt(source, start),
+		start
+	};
+}
+/** The span of `place` in `source`: its line, and its range and column when it has one. */
+function spanIn(source, place) {
+	return place.start === void 0 || place.end === void 0 ? { line: place.line } : rangeIn(source, place.start, place.end);
+}
 //#endregion
-export { columnAt, extendMap, lineAt, sliceMap, sourceOffset, sourceRange };
+export { columnAt, extendMap, lineAt, rangeIn, sliceMap, sourceOffset, sourceRange, spanIn };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jigs.design/compiler",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Today's Jigs compiler: parser, checker against a catalog, code generator, recipes, and the edit helpers. The v2 rewrite replaces it.",
   "license": "MIT",
   "repository": {
@@ -25,6 +25,7 @@
     "access": "public"
   },
   "dependencies": {
-    "acorn": "8.19.0"
+    "acorn": "8.19.0",
+    "@jigs.design/protocol": "0.2.0"
   }
 }