unplugin-saykit 0.2.0 → 0.3.0

package/README.md

@@ -2,6 +2,8 @@
 
 > Universal build-tool plugin for [SayKit](https://saykit.js.org).
 
+[![Coverage](https://codecov.io/gh/k0d13/saykit/graph/badge.svg?flag=plugin-unplugin)](https://codecov.io/gh/k0d13/saykit?flags%5B0%5D=plugin-unplugin)
+
 Works with Vite, Rollup, Rolldown, Webpack, Rspack, esbuild, Farm, and Bun via [unplugin](https://github.com/unjs/unplugin).
 
 ## Install

package/dist/bun.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/bun.ts
 var bun_default = src_default.bun;
 //#endregion

package/dist/esbuild.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/esbuild.ts
 var esbuild_default = src_default.esbuild;
 //#endregion

package/dist/farm.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/farm.ts
 var farm_default = src_default.farm;
 //#endregion

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 export { src_default as default };

package/dist/index.test.mjs

@@ -1,7 +1,7 @@
-import { join } from "node:path";
-import { generateHash } from "@saykit/config/features/messages";
-import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
+import { generateHash } from "@saykit/config/features/messages";
 //#region ../../node_modules/.pnpm/tinyrainbow@3.1.0/node_modules/tinyrainbow/dist/index.js
 var b = {
 	reset: [0, 0],
@@ -13650,20 +13650,39 @@ Object.defineProperty(globalThis, GLOBAL_EXPECT, {
 });
 //#endregion
 //#region src/index.test.ts
-const config = { buckets: [{
-	match: (id) => id.endsWith(".ts"),
-	output: { match: (id) => id.endsWith("messages.json") },
-	transformer: { transform: (code) => code.replace("say", "SAY") },
-	formatter: { parse: (content) => JSON.parse(content) }
-}] };
+const dir = mkdtempSync(join(tmpdir(), "saykit-unplugin-"));
+const config = {
+	locales: [
+		"en",
+		"en-GB",
+		"en-NZ",
+		"fr"
+	],
+	fallbackLocales: { "en-NZ": ["en-GB"] },
+	buckets: [{
+		match: (id) => id.endsWith(".ts"),
+		output: Object.assign(join(dir, "{locale}", "messages.{extension}"), { match: (id) => id.endsWith("messages.json") }),
+		transformer: { transform: (code) => code.replace("say", "SAY") },
+		formatter: {
+			extension: ".json",
+			parse: (content) => JSON.parse(content)
+		}
+	}]
+};
 vi.mock("@saykit/config/features/loader", () => ({ resolveConfig: () => config }));
 const { default: unplugin } = await import("./index.mjs");
 const plugin = unplugin.raw(void 0, { framework: "rollup" });
-const dir = mkdtempSync(join(tmpdir(), "saykit-unplugin-"));
 afterAll(() => rmSync(dir, {
 	recursive: true,
 	force: true
 }));
+const write = (locale, content) => {
+	const file = join(dir, locale, "messages.json");
+	mkdirSync(dirname(file), { recursive: true });
+	writeFileSync(file, typeof content === "string" ? content : JSON.stringify(content));
+	return file;
+};
+const record = (output) => JSON.parse(output.replace("export default ", ""));
 describe("unplugin transform", () => {
 	it("transforms code for a matching bucket", () => {
 		globalExpect(plugin.transform.handler("say`Hi`", join(process.cwd(), "src/app.ts"))).toBe("SAY`Hi`");
@@ -13673,21 +13692,79 @@ describe("unplugin transform", () => {
 	});
 });
 describe("unplugin load", () => {
-	it("loads a catalogue file into a default-exported record", async () => {
-		const file = join(dir, "messages.json");
-		writeFileSync(file, JSON.stringify([{
+	it("loads the source locale into a default-exported record", async () => {
+		const file = write("en", [{
 			message: "Hello",
-			translation: "Bonjour",
+			translation: "",
 			id: "greeting"
 		}, {
 			message: "Bye",
 			translation: ""
-		}]));
+		}]);
 		const output = await plugin.load.handler(file);
 		globalExpect(output).toContain("export default");
-		const record = JSON.parse(output.replace("export default ", ""));
-		globalExpect(record.greeting).toBe("Bonjour");
-		globalExpect(record[generateHash("Bye", void 0)]).toBe("Bye");
+		const messages = record(output);
+		globalExpect(messages.greeting).toBe("Hello");
+		globalExpect(messages[generateHash("Bye", void 0)]).toBe("Bye");
+	});
+	it("falls back to the source string for keys untranslated in a non-source locale", async () => {
+		write("en", [{
+			message: "Hello",
+			id: "greeting"
+		}, {
+			message: "Bye",
+			id: "farewell"
+		}]);
+		const file = write("fr", [{
+			message: "Hello",
+			translation: "Bonjour",
+			id: "greeting"
+		}]);
+		const messages = record(await plugin.load.handler(file));
+		globalExpect(messages.greeting).toBe("Bonjour");
+		globalExpect(messages.farewell).toBe("Bye");
+	});
+	it("resolves an empty non-source locale entirely to source strings", async () => {
+		write("en", [{
+			message: "Hello",
+			id: "greeting"
+		}]);
+		const file = write("fr", "");
+		globalExpect(record(await plugin.load.handler(file)).greeting).toBe("Hello");
+	});
+	it("resolves a configured fallback chain before the source locale", async () => {
+		write("en", [
+			{
+				message: "A",
+				id: "a"
+			},
+			{
+				message: "B",
+				id: "b"
+			},
+			{
+				message: "C",
+				id: "c"
+			}
+		]);
+		write("en-GB", [{
+			message: "B",
+			translation: "B-GB",
+			id: "b"
+		}, {
+			message: "C",
+			translation: "C-GB",
+			id: "c"
+		}]);
+		const file = write("en-NZ", [{
+			message: "C",
+			translation: "C-NZ",
+			id: "c"
+		}]);
+		const messages = record(await plugin.load.handler(file));
+		globalExpect(messages.a).toBe("A");
+		globalExpect(messages.b).toBe("B-GB");
+		globalExpect(messages.c).toBe("C-NZ");
 	});
 	it("returns undefined when the id does not match a bucket output", async () => {
 		globalExpect(await plugin.load.handler(join(dir, "other.txt"))).toBeUndefined();

package/dist/rolldown.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/rolldown.ts
 var rolldown_default = src_default.rolldown;
 //#endregion

package/dist/rollup.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/rollup.ts
 var rollup_default = src_default.rollup;
 //#endregion

package/dist/rspack.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;
 //#endregion

package/dist/{src-C-_DjRpL.mjs → src-B4Rsypvw.mjs}

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { relative } from "node:path";
+import { assembleCatalogueRecord, resolveCatalogueSources } from "@saykit/config/features/catalogue";
 import { resolveConfig } from "@saykit/config/features/loader";
-import { generateHash } from "@saykit/config/features/messages";
 import { createUnplugin } from "unplugin";
 //#region src/index.ts
 var src_default = createUnplugin((_options) => {
@@ -18,13 +18,15 @@ var src_default = createUnplugin((_options) => {
 		},
 		load: {
 			filter: { id: { exclude: /node_modules/ } },
-			handler: async (id_) => {
+			handler: async function(id_) {
 				const id = relative(process.cwd(), id_).replaceAll("\\", "/").split("?")[0];
 				const bucket = config.buckets.find((b) => b.output.match(id));
 				if (!bucket) return;
-				const content = await readFile(id, "utf8");
-				const entries = bucket.formatter.parse(content).map((m) => [m.id || generateHash(m.message, m.context), m.translation || m.message]);
-				return `export default ${JSON.stringify(Object.fromEntries(entries))}`;
+				const { sources } = resolveCatalogueSources(config, bucket, id);
+				const contents = await Promise.all(sources.map((source) => readFile(source, "utf8").catch(() => "")));
+				for (const source of sources) this.addWatchFile?.(source);
+				const record = assembleCatalogueRecord(bucket, contents);
+				return `export default ${JSON.stringify(record)}`;
 			}
 		}
 	};

package/dist/unloader.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/unloader.ts
 var unloader_default = src_default.unloader;
 //#endregion

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/vite.ts
 var vite_default = src_default.vite;
 //#endregion

package/dist/webpack.mjs

@@ -1,4 +1,4 @@
-import { t as src_default } from "./src-C-_DjRpL.mjs";
+import { t as src_default } from "./src-B4Rsypvw.mjs";
 //#region src/webpack.ts
 var webpack_default = src_default.webpack;
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unplugin-saykit",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Universal build tool plugin for saykit (Vite, Rollup, Webpack, esbuild)",
   "keywords": [
     "i18n",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "unplugin": "^3.3.0",
-    "@saykit/config": "^0.2.0"
+    "@saykit/config": "^0.3.0"
   },
   "scripts": {
     "check": "tsc --noEmit",