@x18n/node 0.0.12 → 0.0.14

package/dist/index.mjs

@@ -3,11 +3,12 @@ import { existsSync, readFileSync } from "node:fs";
 import { mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { compileYamlPlugin } from "@x18n/builtins/yaml-plugin";
 import { PluginFileSchema, createProject, errors, hashText, isX18nError, resolveConfig, validate } from "@x18n/core";
 import { createJiti } from "jiti";
 import { glob } from "tinyglobby";
 import { parse, stringify } from "yaml";
+import { placeholderFromShape } from "@x18n/builtins/placeholders";
+import regexScopes from "@x18n/builtins/scanners/regex-scopes";
 import process from "node:process";
 import { watch } from "chokidar";
 import ignore from "ignore";
@@ -15,6 +16,76 @@ import { createBuiltins } from "@x18n/builtins";
 import { Buffer } from "node:buffer";
 import { execFile, spawn } from "node:child_process";
 import { applyEdits, modify, parse as parse$1 } from "jsonc-parser";
+//#region src/yaml-plugin.ts
+/**
+* Compiles a validated YAML plugin into plugin objects. Each section maps to the
+* options of a built-in factory, so moving to a TS plugin is a small change.
+*/
+function compileYamlPlugin(data) {
+	const replacements = (data.normalizeKey ?? []).map((rule) => ({
+		from: new RegExp(rule.replace.pattern, "g"),
+		to: rule.replace.with
+	}));
+	const localeInfo = data.localeInfo;
+	const plugin = {
+		name: data.name,
+		config(draft) {
+			const defaults = data.config;
+			if (defaults?.sourceLocale) draft.sourceLocale = defaults.sourceLocale;
+			if (defaults?.locales) draft.locales = defaults.locales;
+			if (defaults?.resources && draft.resources.length === 0) draft.resources = defaults.resources;
+			if (defaults?.keyStyle) draft.keyStyle = defaults.keyStyle;
+			if (defaults?.namespace) draft.namespace = {
+				separator: defaults.namespace.separator ?? draft.namespace.separator,
+				default: defaults.namespace.default ?? draft.namespace.default,
+				fallback: defaults.namespace.fallback ?? draft.namespace.fallback,
+				byFile: {
+					...draft.namespace.byFile,
+					...defaults.namespace.byFile
+				},
+				fromPath: defaults.namespace.fromPath ?? draft.namespace.fromPath
+			};
+			draft.usage = {
+				...draft.usage,
+				calls: [...draft.usage.calls, ...data.scanners?.calls ?? []],
+				regex: [...draft.usage.regex, ...data.scanners?.regex ?? []]
+			};
+			if (data.extract?.templates) draft.extract = {
+				...draft.extract,
+				templates: [...draft.extract.templates ?? [], ...data.extract.templates]
+			};
+		},
+		derivedKeys: data.derivedKeys,
+		placeholders: data.placeholders?.map(placeholderFromShape),
+		normalizeKey: replacements.length > 0 ? (raw) => replacements.reduce((text, rule) => text.replace(rule.from, rule.to), raw) : void 0,
+		localeInfo: localeInfo ? (code) => {
+			const info = localeInfo[code];
+			return info ? {
+				...info.flag ? { flag: info.flag } : {},
+				...info.displayName ? { displayName: info.displayName } : {}
+			} : void 0;
+		} : void 0
+	};
+	const plugins = [plugin, ...data.scopes ? [regexScopes(data.scopes.regex, `${data.name}-scopes`)] : []];
+	const detect = data.detect;
+	if (!detect) return plugins.length === 1 ? plugin : {
+		name: data.name,
+		plugins
+	};
+	return {
+		name: data.name,
+		exclusive: data.exclusive,
+		plugins,
+		async detect(ctx) {
+			const deps = detect.dependencies;
+			if (deps?.any && !ctx.hasAnyDependency(deps.any)) return false;
+			if (deps?.all && !deps.all.every(ctx.hasDependency)) return false;
+			for (const pattern of detect.files ?? []) if (!await ctx.fileExists(pattern)) return false;
+			return true;
+		}
+	};
+}
+//#endregion
 //#region src/config.ts
 const configFileNames = [
 	"x18n.config.ts",
@@ -43,6 +114,15 @@ function findConfigUpward(cwd) {
 		dir = parent;
 	}
 }
+/** One config file per directory below `dir`, shallowest first. */
+async function findConfigsBelow(dir) {
+	const files = await glob(configFileNames.map((name) => `**/${name}`), {
+		cwd: dir,
+		absolute: true,
+		ignore: ["**/node_modules/**"]
+	});
+	return [...new Set(files.map((file) => dirname(file)))].sort((a, b) => a.split("/").length - b.split("/").length || a.localeCompare(b)).flatMap((found) => findConfigFile(found) ?? []);
+}
 function resolveOwn(specifier) {
 	try {
 		return fileURLToPath(import.meta.resolve(specifier));
@@ -153,7 +233,9 @@ async function manifestRootsOf(root, gitRoot) {
 }
 //#endregion
 //#region src/host.ts
-const toPosix = (path) => sep === "\\" ? path.replace(/\\/g, "/") : path;
+function toPosix(path) {
+	return sep === "\\" ? path.replace(/\\/g, "/") : path;
+}
 function isNotFound(error) {
 	return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "EISDIR");
 }
@@ -719,10 +801,17 @@ const keygenStyles = {
 	"kebab-case": "kebab"
 };
 const editorSettings = {
-	annotations: "x18n.annotations",
-	annotationInPlace: "x18n.inPlace",
-	annotationMaxLength: "x18n.annotationMaxLength",
-	displayLanguage: "x18n.displayLocale"
+	"annotations": "x18n.annotations",
+	"annotationInPlace": "x18n.annotationInPlace",
+	"annotationInPlaceFullMatch": "x18n.annotationInPlaceFullMatch",
+	"annotationMaxLength": "x18n.annotationMaxLength",
+	"displayLanguage": "x18n.displayLocale",
+	"showFlags": "x18n.showFlags",
+	"theme.annotation": "x18n.theme.annotation",
+	"theme.annotationMissing": "x18n.theme.annotationMissing",
+	"theme.annotationBorder": "x18n.theme.annotationBorder",
+	"theme.annotationMissingBorder": "x18n.theme.annotationMissingBorder",
+	"theme.annotationInPlaceFullMatch": "x18n.theme.annotationInPlaceFullMatch"
 };
 const handledByDefaults = [
 	"readonly",
@@ -731,7 +820,6 @@ const handledByDefaults = [
 	"includeSubfolders",
 	"ignoreFiles",
 	"editor.preferEditor",
-	"showFlags",
 	"annotationDelimiter",
 	"languageTagSystem",
 	"targetPickingStrategy",
@@ -753,7 +841,9 @@ async function readFirst(root, paths) {
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-const asStrings = (value) => (Array.isArray(value) ? value : value === void 0 ? [] : [value]).filter((v) => typeof v === "string");
+function asStrings(value) {
+	return (Array.isArray(value) ? value : value === void 0 ? [] : [value]).filter((v) => typeof v === "string");
+}
 /** Setting prefixes by priority: the i18n-ally-next fork renames `i18n-ally.*` keys, so its value is the newest. */
 const settingPrefixes = [
 	"i18n-ally-next",
@@ -1121,6 +1211,15 @@ function applyDefaults(draft, config) {
 }
 async function projectSpecs(rootConfigFile, cwd, upward) {
 	if (!rootConfigFile) {
+		const nested = await findConfigsBelow(cwd);
+		if (nested.length) {
+			const specs = [];
+			for (const file of nested) if (!specs.some((spec) => spec.configFile === file)) specs.push(...(await projectSpecs(file, cwd, false)).specs);
+			return {
+				root: resolve(cwd),
+				specs
+			};
+		}
 		const settingsRoot = findI18nAllyRoot(cwd, upward);
 		const fallback = settingsRoot && await i18nAllyFallback(settingsRoot);
 		if (settingsRoot && fallback) return {
@@ -1173,7 +1272,7 @@ async function loadWorkspace(options) {
 	const configFile = options.configFile ? resolve(options.cwd, options.configFile) : options.upward === false ? findConfigFile(resolve(options.cwd)) : findConfigUpward(options.cwd);
 	const { root, specs } = await projectSpecs(configFile, options.cwd, options.upward !== false);
 	const gitRoot = findGitRoot(root);
-	const defaults = options.builtins ?? createBuiltins();
+	const defaults = options.builtins ?? await createBuiltins();
 	const builtins = gitRoot ? {
 		...defaults,
 		plugins: [...defaults.plugins, gitHistory()]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@x18n/node",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Node.js host for x18n: file system access, config and plugin loading",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -25,8 +25,8 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@x18n/builtins": "0.0.12",
-    "@x18n/core": "0.0.12",
+    "@x18n/builtins": "0.0.14",
+    "@x18n/core": "0.0.14",
     "chokidar": "^6.0.0",
     "ignore": "^7.0.13",
     "jiti": "^2.7.0",