@x18n/builtins 0.0.7 → 0.0.9

package/dist/extractors.mjs

@@ -1,4 +1,4 @@
-import { X18nError, createLineIndex, pathMatcher } from "@x18n/core";
+import { createLineIndex, errors, pathMatcher } from "@x18n/core";
 //#region src/extractors/index.ts
 const textKinds = /* @__PURE__ */ new Set([
 	"jsx-text",
@@ -301,7 +301,7 @@ function toPlanFile(project, candidates) {
 function extractItems(project, items) {
 	return items.map((item) => {
 		const text = project.text(item.path);
-		if (text === void 0 || text.slice(item.range.start, item.range.end) !== item.original) throw new X18nError("X18N4004", `${item.path} changed since the plan was made`);
+		if (text === void 0 || text.slice(item.range.start, item.range.end) !== item.original) throw errors.X18N4004({ path: item.path });
 		return {
 			path: item.path,
 			range: item.range,

package/dist/finders.mjs

@@ -1,3 +1,3 @@
 import { a as patternFinder, i as pattern, n as guessResources, r as namespaceFromPath, t as compilePattern } from "./finders-CqTGh4OJ.mjs";
-import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BwJwCUka.mjs";
+import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BIPqKcvd.mjs";
 export { compilePattern, guessResources, namespaceFromPath, pattern, patternFinder, sfcBlocks, sfcFluentBlocks };

package/dist/{formats-BAogSrvw.mjs → formats-CFkM5co0.mjs}

@@ -1,4 +1,4 @@
-import { X18nError, applyMessageOps, applyTextEdits, buildTree, diffText, isMessageLeaf, isMessageTree, pathId, walkLeaves } from "@x18n/core";
+import { applyMessageOps, applyTextEdits, buildTree, diffText, errors, isMessageLeaf, isMessageTree, pathId, walkLeaves } from "@x18n/core";
 import { parseSync } from "oxc-parser";
 import { applyEdits, modify, parseTree, printParseErrorCode } from "jsonc-parser";
 import JSON5 from "json5";
@@ -179,14 +179,21 @@ function readObject(node, path, module, text, fail) {
 	return out;
 }
 function readModule(text, path) {
-	const fail = (code, node, message) => {
-		throw new X18nError(code, `${path}:${text.slice(0, node.start).split("\n").length}: ${message}`);
+	const fail = (code, node, reason) => {
+		throw errors[code]({
+			path,
+			line: text.slice(0, node.start).split("\n").length,
+			reason
+		});
 	};
 	const result = parseSync(path, text, {
 		lang: /\.[mc]?ts$/.test(path) ? "ts" : "js",
 		sourceType: "module"
 	});
-	if (result.errors.length > 0) throw new X18nError("X18N2002", `${path}: ${result.errors[0].message}`);
+	if (result.errors.length > 0) throw errors.X18N2002({
+		path,
+		reason: result.errors[0].message
+	});
 	const root = findRoot(result.program, fail);
 	const found = {
 		ranges: /* @__PURE__ */ new Map(),
@@ -317,7 +324,11 @@ function read$3(text, path) {
 			continue;
 		}
 		if (/^[ \t]/.test(content)) {
-			if (!current) throw new X18nError("X18N2002", `${path}:${lineNumber}: indented line outside a message`);
+			if (!current) throw errors.X18N2002({
+				path,
+				line: lineNumber,
+				reason: "indented line outside a message"
+			});
 			const attribute = /^[ \t]+\.([a-z][\w-]*)[ \t]*=[ \t]*/i.exec(content);
 			if (attribute) {
 				const nameStart = line.start + attribute[0].indexOf(".") + 1;
@@ -357,7 +368,11 @@ function read$3(text, path) {
 			continue;
 		}
 		const message = /^(-?[a-z][\w-]*)[ \t]*=[ \t]*/i.exec(content);
-		if (!message) throw new X18nError("X18N2002", `${path}:${lineNumber}: expected a message, a term or a comment`);
+		if (!message) throw errors.X18N2002({
+			path,
+			line: lineNumber,
+			reason: "expected a message, a term or a comment"
+		});
 		current = {
 			id: message[1],
 			idRange: {
@@ -534,7 +549,11 @@ function read$2(text, path) {
 	let section = "";
 	let lineNumber = 0;
 	const fail = (message) => {
-		throw new X18nError("X18N2002", `${path}:${lineNumber}: ${message}`);
+		throw errors.X18N2002({
+			path,
+			line: lineNumber,
+			reason: message
+		});
 	};
 	for (const line of splitLines(text)) {
 		lineNumber++;
@@ -669,21 +688,24 @@ function createJsonFormat(id, extensions, allowComments, defaultIndent) {
 		id,
 		extensions,
 		parse(text, ctx) {
-			const errors = [];
-			const root = parseTree(text, errors, {
+			const problems = [];
+			const root = parseTree(text, problems, {
 				allowTrailingComma: true,
 				disallowComments: !allowComments
 			});
-			if (errors.length > 0) {
-				const first = errors[0];
-				throw new X18nError("X18N2002", `${ctx.path}: ${printParseErrorCode(first.error)} at offset ${first.offset}`);
+			if (problems.length > 0) {
+				const first = problems[0];
+				throw errors.X18N2002({
+					path: ctx.path,
+					reason: `${printParseErrorCode(first.error)} at offset ${first.offset}`
+				});
 			}
 			if (!root || root.type !== "object") {
 				if (text.trim() === "") return {
 					tree: {},
 					ranges: /* @__PURE__ */ new Map()
 				};
-				throw new X18nError("X18N2003", ctx.path);
+				throw errors.X18N2003({ path: ctx.path });
 			}
 			const ranges = /* @__PURE__ */ new Map();
 			return {
@@ -732,9 +754,13 @@ function json5() {
 				try {
 					data = JSON5.parse(text);
 				} catch (error) {
-					throw new X18nError("X18N2002", `${ctx.path}: ${error instanceof Error ? error.message : String(error)}`);
+					throw errors.X18N2002({
+						path: ctx.path,
+						reason: error instanceof Error ? error.message : String(error),
+						cause: error
+					});
 				}
-				if (!isMessageTree(data)) throw new X18nError("X18N2003", ctx.path);
+				if (!isMessageTree(data)) throw errors.X18N2003({ path: ctx.path });
 				return { tree: data };
 			},
 			serialize: (tree, ctx) => `${JSON5.stringify(tree, null, ctx.indent === "tab" ? "	" : ctx.indent ?? 2)}\n`
@@ -765,9 +791,12 @@ function decodeDouble(raw, fail) {
 }
 function parseFile(text, path) {
 	let pos = 0;
-	const fail = (code, message) => {
-		const line = text.slice(0, pos).split("\n").length;
-		throw new X18nError(code, `${path}:${line}: ${message}`);
+	const fail = (code, reason) => {
+		throw errors[code]({
+			path,
+			line: text.slice(0, pos).split("\n").length,
+			reason
+		});
 	};
 	const skip = () => {
 		for (;;) {
@@ -1008,7 +1037,11 @@ function read$1(text, path) {
 	const entries = [];
 	let lineNumber = 0;
 	const fail = (message) => {
-		throw new X18nError("X18N2002", `${path}:${lineNumber}: ${message}`);
+		throw errors.X18N2002({
+			path,
+			line: lineNumber,
+			reason: message
+		});
 	};
 	let draft;
 	let field;
@@ -1128,7 +1161,10 @@ function unescape(raw, path) {
 			while (isSpace(raw[i + 1])) i++;
 		} else if (next === "u") {
 			const hex = raw.slice(i + 1, i + 5);
-			if (!/^[0-9a-f]{4}$/i.test(hex)) throw new X18nError("X18N2002", `${path}: malformed \\u escape "\\u${hex}"`);
+			if (!/^[0-9a-f]{4}$/i.test(hex)) throw errors.X18N2002({
+				path,
+				reason: `malformed \\u escape "\\u${hex}"`
+			});
 			out += String.fromCharCode(Number.parseInt(hex, 16));
 			i += 4;
 		} else out += escapes[next] ?? next;
@@ -1267,7 +1303,10 @@ function parse$1(text, path) {
 		keepSourceTokens: true,
 		uniqueKeys: false
 	});
-	if (doc.errors.length > 0) throw new X18nError("X18N2002", `${path}: ${doc.errors[0].message}`);
+	if (doc.errors.length > 0) throw errors.X18N2002({
+		path,
+		reason: doc.errors[0].message
+	});
 	return doc;
 }
 function scalarText(value, type) {
@@ -1292,7 +1331,7 @@ function yaml() {
 					tree: {},
 					ranges
 				};
-				if (!isMap(doc.contents)) throw new X18nError("X18N2003", ctx.path);
+				if (!isMap(doc.contents)) throw errors.X18N2003({ path: ctx.path });
 				return {
 					tree: readMap(doc.contents, [], ranges),
 					ranges

package/dist/formats.mjs

@@ -1 +1 @@
-export { u as ecmascript, l as ftl, c as ini, o as json, a as json5, s as jsonc, i as php, r as po, n as properties, t as yaml } from "./formats-BAogSrvw.mjs";
+export { u as ecmascript, l as ftl, c as ini, o as json, a as json5, s as jsonc, i as php, r as po, n as properties, t as yaml } from "./formats-CFkM5co0.mjs";

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import { recommended } from "./checks.mjs";
 import { i as pattern } from "./finders-CqTGh4OJ.mjs";
-import { a as json5, c as ini, i as php, l as ftl, n as properties, o as json, r as po, s as jsonc, t as yaml, u as ecmascript } from "./formats-BAogSrvw.mjs";
+import { a as json5, c as ini, i as php, l as ftl, n as properties, o as json, r as po, s as jsonc, t as yaml, u as ecmascript } from "./formats-CFkM5co0.mjs";
 import { i as js, n as vue } from "./vue-5GFR5hft.mjs";
 import { manifests } from "./manifests.mjs";
 import { n as regex } from "./regex-B9TBGgXC.mjs";
-import { t as presets } from "./presets-DNnE_2MQ.mjs";
+import { t as presets } from "./presets-DJrGl3HR.mjs";
 import { reporters } from "./reporters.mjs";
 import { t as svelte } from "./scanners-B27IEH4_.mjs";
 //#region src/index.ts

package/dist/{presets-DNnE_2MQ.mjs → presets-DJrGl3HR.mjs}

@@ -1,5 +1,5 @@
 import { defaultTemplates } from "./extractors.mjs";
-import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BwJwCUka.mjs";
+import { n as sfcFluentBlocks, t as sfcBlocks } from "./sfc-blocks-BIPqKcvd.mjs";
 import { braces, colon, dollars, doubleBraces, fluent, icu, linked, nesting, percentBraces, placeholders, printf } from "./placeholders.mjs";
 import { r as regexScopes } from "./regex-B9TBGgXC.mjs";
 import { isMessageLeaf } from "@x18n/core";
@@ -1083,6 +1083,64 @@ function chromeExtension() {
 		]
 	};
 }
+function solidPrimitivesI18n() {
+	return {
+		name: "solid-primitives-i18n",
+		detect: dependsOn(["@solid-primitives/i18n"]),
+		plugins: [library({
+			name: "solid-primitives-i18n",
+			calls: [{ callee: ["t", "i18n.t"] }],
+			templates: [
+				{
+					template: "{t('{key}'{args})}",
+					kinds: ["jsx-text"]
+				},
+				{
+					template: "{attr}={t('{key}'{args})}",
+					kinds: ["jsx-attribute"]
+				},
+				{
+					template: "t('{key}'{args})",
+					kinds: ["js-string", "js-template"]
+				}
+			]
+		}), placeholders(doubleBraces)]
+	};
+}
+function paraglide() {
+	return {
+		name: "paraglide",
+		detect: dependsOn([
+			"@inlang/paraglide-js",
+			"@inlang/paraglide-sveltekit",
+			"@inlang/paraglide-next",
+			"@inlang/paraglide-astro",
+			"@inlang/paraglide-vite"
+		]),
+		plugins: [library({
+			name: "paraglide",
+			regex: [{
+				extensions: [
+					...scriptExtensions,
+					"vue",
+					"svelte",
+					"astro"
+				],
+				patterns: ["\\bm\\.({key})\\(", "\\bm\\[\\s*['\"`]({key})['\"`]\\s*\\]\\("]
+			}],
+			resources: [{ pattern: "messages/{locale}.json" }],
+			templates: [{
+				template: "{m.{key}({args})}",
+				kinds: ["jsx-text", "svelte-text"],
+				imports: ["import { m } from '$lib/paraglide/messages'"]
+			}, {
+				template: "m.{key}({args})",
+				kinds: ["js-string", "js-template"],
+				imports: ["import { m } from '$lib/paraglide/messages'"]
+			}]
+		}), placeholders(braces)]
+	};
+}
 //#endregion
 //#region src/presets/index.ts
 /**
@@ -1101,6 +1159,8 @@ const presets = {
 	"next-intl": () => nextIntl(),
 	"react-intl": () => reactIntl(),
 	"svelte-i18n": () => svelteI18n(),
+	"solid-primitives-i18n": () => solidPrimitivesI18n(),
+	"paraglide": () => paraglide(),
 	"ngx-translate": () => ngxTranslate(),
 	"transloco": () => transloco(),
 	"lingui": () => lingui(),
@@ -1121,4 +1181,4 @@ const presets = {
 	"general": () => general()
 };
 //#endregion
-export { ngxTranslate as A, nextIntl as C, svelteI18n as D, reactIntl as E, vscodeExtension as O, i18next as S, reactI18next as T, phpJoomla as _, globalize as a, flutter as b, i18nextShopify as c, nextTranslate as d, polyglot as f, phpGettext as g, laravel as h, fluentVue as i, transloco as j, vueI18n as k, lingui as l, jekyll as m, chromeExtension as n, i18nJs as o, ui5 as p, emberIntl as r, i18nTag as s, presets as t, nextInternational as u, railsLazyKey as v, nuxtI18n as w, general as x, rubyRails as y };
+export { vscodeExtension as A, general as C, reactI18next as D, nuxtI18n as E, ngxTranslate as M, transloco as N, reactIntl as O, flutter as S, nextIntl as T, laravel as _, globalize as a, railsLazyKey as b, i18nextShopify as c, nextTranslate as d, paraglide as f, jekyll as g, ui5 as h, fluentVue as i, vueI18n as j, svelteI18n as k, lingui as l, solidPrimitivesI18n as m, chromeExtension as n, i18nJs as o, polyglot as p, emberIntl as r, i18nTag as s, presets as t, nextInternational as u, phpGettext as v, i18next as w, rubyRails as x, phpJoomla as y };

package/dist/presets.d.mts

@@ -46,6 +46,8 @@ export declare function emberIntl(): Preset;
 export declare function i18nJs(): Preset;
 /** Chrome and WebExtension `_locales/{locale}/messages.json`: `{ "name": { "message": "..." } }` reads as `name`. */
 export declare function chromeExtension(): Preset;
+export declare function solidPrimitivesI18n(): Preset;
+export declare function paraglide(): Preset;
 //#endregion
 //#region src/presets/index.d.ts
 /**

package/dist/presets.mjs

@@ -1 +1 @@
-export { n as chromeExtension, r as emberIntl, i as fluentVue, b as flutter, x as general, a as globalize, o as i18nJs, s as i18nTag, S as i18next, c as i18nextShopify, m as jekyll, h as laravel, l as lingui, u as nextInternational, C as nextIntl, d as nextTranslate, A as ngxTranslate, w as nuxtI18n, g as phpGettext, _ as phpJoomla, f as polyglot, t as presets, v as railsLazyKey, T as reactI18next, E as reactIntl, y as rubyRails, D as svelteI18n, j as transloco, p as ui5, O as vscodeExtension, k as vueI18n } from "./presets-DNnE_2MQ.mjs";
+export { n as chromeExtension, r as emberIntl, i as fluentVue, S as flutter, C as general, a as globalize, o as i18nJs, s as i18nTag, w as i18next, c as i18nextShopify, g as jekyll, _ as laravel, l as lingui, u as nextInternational, T as nextIntl, d as nextTranslate, M as ngxTranslate, E as nuxtI18n, f as paraglide, v as phpGettext, y as phpJoomla, p as polyglot, t as presets, b as railsLazyKey, D as reactI18next, O as reactIntl, x as rubyRails, m as solidPrimitivesI18n, k as svelteI18n, N as transloco, h as ui5, A as vscodeExtension, j as vueI18n } from "./presets-DJrGl3HR.mjs";

package/dist/reporters.d.mts

@@ -1,6 +1,6 @@
 import { Plugin, Reporter } from "@x18n/core";
 //#region src/reporters/index.d.ts
-/** tsc-style output: `path:line:col - error code: message`, code frames, then a summary. */
+/** `path:line:col`, then the severity, message and check, a code frame, and a summary. */
 export declare const prettyReporter: Reporter;
 /** The versioned JSON contract of `x18n check --json`. */
 export declare const jsonReporter: Reporter;

package/dist/reporters.mjs

@@ -33,40 +33,57 @@ const severityColor = {
 	info: "blue",
 	hint: "gray"
 };
-function codeFrame(text, start, end, ctx) {
+/** The severity as a highlighted label, like ` ERROR `. */
+function badge(ctx, severity) {
+	const label = ` ${severity.toUpperCase()} `;
+	return ctx.color ? `\u001B[1;7;${codes[severityColor[severity]]}m${label}\u001B[0m` : label;
+}
+/** The marked line with one line of context on each side, and `~` under the range. */
+function codeFrame(text, start, end, severity, ctx) {
 	const index = createLineIndex(text);
 	const from = index.position(start);
 	const to = index.position(end);
-	const number = String(from.line + 1);
-	const line = index.line(from.line);
-	const width = Math.max(1, (to.line === from.line ? to.character : line.length) - from.character);
-	const gutter = " ".repeat(number.length);
-	return `${paint(ctx, "gray", number)} ${line}\n${gutter} ${" ".repeat(from.character)}${paint(ctx, "red", "~".repeat(width))}`;
+	const first = Math.max(0, from.line - 1);
+	const last = Math.min(index.lineCount - 1, from.line + 1);
+	const pad = String(last + 1).length;
+	const gutter = (n) => `${paint(ctx, "gray", n.padStart(pad))} ${paint(ctx, "gray", "│")} `;
+	const width = Math.max(1, (to.line === from.line ? to.character : index.line(from.line).length) - from.character);
+	const lines = [];
+	for (let n = first; n <= last; n++) {
+		const line = index.line(n);
+		lines.push(`${gutter(String(n + 1))}${n === from.line ? line : paint(ctx, "gray", line)}`);
+		if (n === from.line) lines.push(`${gutter("")}${" ".repeat(from.character)}${paint(ctx, severityColor[severity], "~".repeat(width))}`);
+	}
+	return lines.join("\n");
 }
-/** tsc-style output: `path:line:col - error code: message`, code frames, then a summary. */
+/** `path:line:col`, then the severity, message and check, a code frame, and a summary. */
 const prettyReporter = {
 	id: "pretty",
 	report(inputs, ctx) {
-		const out = [];
+		const blocks = [];
 		for (const input of inputs) for (const d of input.diagnostics) {
-			const head = `${paint(ctx, severityColor[d.severity], d.severity)} ${paint(ctx, "gray", d.code)}: ${d.message}`;
+			const head = `${badge(ctx, d.severity)} ${d.message}  ${paint(ctx, "gray", d.code)}`;
 			if (!d.location) {
-				out.push(`${head}\n`);
+				blocks.push(head);
 				continue;
 			}
 			const text = input.text(d.location.path);
 			const position = createLineIndex(text ?? "").position(d.location.range.start);
-			const where = `${paint(ctx, "cyan", ctx.displayPath(d.location.path, input.project))}:${paint(ctx, "yellow", String(position.line + 1))}:${paint(ctx, "yellow", String(position.character + 1))}`;
-			const frame = text !== void 0 && d.location.range.end > d.location.range.start ? `\n${codeFrame(text, d.location.range.start, d.location.range.end, ctx)}\n` : "";
-			out.push(`${where} - ${head}${frame}`);
+			const where = `${paint(ctx, "cyan", ctx.displayPath(d.location.path, input.project))}${paint(ctx, "gray", `:${position.line + 1}:${position.character + 1}`)}`;
+			const frame = text !== void 0 && d.location.range.end > d.location.range.start ? `\n${codeFrame(text, d.location.range.start, d.location.range.end, d.severity, ctx)}` : "";
+			blocks.push(`${where}\n${head}${frame}`);
 		}
 		const sum = totals(inputs);
-		if (sum.errors + sum.warnings === 0) out.push(paint(ctx, "gray", "Found no errors."));
+		if (sum.errors + sum.warnings === 0) blocks.push(paint(ctx, "gray", "Found no errors."));
 		else {
-			const parts = [sum.errors ? plural(sum.errors, "error") : "", sum.warnings ? plural(sum.warnings, "warning") : ""].filter(Boolean);
-			out.push(`${out.length && !out.at(-1).endsWith("\n") ? "\n" : ""}Found ${parts.join(" and ")} in ${plural(sum.files, "file")}.`);
+			const parts = [
+				sum.errors ? paint(ctx, "red", `✖ ${plural(sum.errors, "error")}`) : "",
+				sum.warnings ? paint(ctx, "yellow", `⚠ ${plural(sum.warnings, "warning")}`) : "",
+				paint(ctx, "gray", plural(sum.files, "file"))
+			].filter(Boolean);
+			blocks.push(parts.join("  "));
 		}
-		return `${out.join("\n")}\n`;
+		return `${blocks.join("\n\n")}\n`;
 	}
 };
 /** The versioned JSON contract of `x18n check --json`. */

package/dist/{sfc-blocks-BwJwCUka.mjs → sfc-blocks-BIPqKcvd.mjs}

@@ -1,4 +1,4 @@
-import { a as json5, o as json, t as yaml } from "./formats-BAogSrvw.mjs";
+import { a as json5, o as json, t as yaml } from "./formats-CFkM5co0.mjs";
 import { t as loadVueCompiler } from "./vue-5GFR5hft.mjs";
 import { isMessageLeaf, pathId } from "@x18n/core";
 //#region src/finders/sfc-blocks.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@x18n/builtins",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Built-in x18n plugins and presets: formats, locale finders, scanners, checks and reporters",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
   ],
   "dependencies": {
     "@vue/compiler-sfc": "^3.5.44",
-    "@x18n/core": "0.0.7",
+    "@x18n/core": "0.0.9",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.3.1",
     "oxc-parser": "^0.155.0",