flowdular 0.6.3 → 0.6.4

package/dist/distribution.js

@@ -2821,7 +2821,7 @@ async function validateInstalledModules(workspace) {
 }
 
 // src/sdk.ts
-var SDK_VERSION = "0.6.3";
+var SDK_VERSION = "0.6.4";
 function npmPackage(specifier) {
   return specifier.startsWith("@") ? specifier.split("/").slice(0, 2).join("/") : specifier.split("/")[0];
 }

package/dist/index.js

@@ -7320,10 +7320,12 @@ async function translationIssues(moduleRoot, manifest2, projectLocales) {
     for (const [key, path] of [...missing].sort(
       ([left], [right]) => left.localeCompare(right)
     )) {
+      const localKey = key.slice(prefix.length);
+      const prefixed = referenceKeys.has(key) ? ` The bundle has "${key}", but bundle keys leave out the "${prefix}" prefix.` : "";
       issues.push(
         issue(
           "TRANSLATION_KEY_MISSING",
-          `Translation key "${key}" is used by the client but absent from translations/${reference[0]}.json.`,
+          `Translation key "${localKey}" is missing from translations/${reference[0]}.json; the client reads it as t('${key}').${prefixed}`,
           path
         )
       );
@@ -8966,7 +8968,7 @@ async function applyModulePlan(workspace, id, apply) {
 import { readFile as readFile10 } from "node:fs/promises";
 
 // src/sdk.ts
-var SDK_VERSION = "0.6.3";
+var SDK_VERSION = "0.6.4";
 var LIBRARIES = /* @__PURE__ */ new Set([
   "ai-provider",
   "cli-protocol",
@@ -12883,6 +12885,7 @@ async function migrationVerify(workspace) {
 // src/module-scaffold.ts
 import {
   access as access6,
+  lstat as lstat6,
   mkdir as mkdir10,
   readdir as readdir8,
   readFile as readFile19,
@@ -12937,11 +12940,44 @@ async function inspectTarget(workspaceRoot, moduleDirectory, specPath, specSourc
   }
   return { exists: true, present };
 }
-async function writeScaffold(moduleDirectory, files, target) {
+function jsonObject(source) {
+  try {
+    const value = JSON.parse(source);
+    return value && typeof value === "object" && !Array.isArray(value) ? value : null;
+  } catch {
+    return null;
+  }
+}
+async function mergeAuthorBundles(moduleDirectory, planned, target) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const [path, source] of planned) {
+    if (!target.present.has(path) || !/^translations\/[^/]+\.json$/.test(path))
+      continue;
+    const file = join17(moduleDirectory, path);
+    if (!(await lstat6(file)).isFile()) continue;
+    const authored = jsonObject(await readFile19(file, "utf8"));
+    const generated = jsonObject(source);
+    if (authored && generated)
+      merged.set(
+        path,
+        `${JSON.stringify({ ...generated, ...authored }, null, "	")}
+`
+      );
+  }
+  return merged;
+}
+async function writeScaffold(moduleDirectory, files, target, merged) {
   const written = [];
   const createdDirectories = [];
+  const replaced = /* @__PURE__ */ new Map();
   try {
     for (const [path, source] of files) {
+      if (merged.has(path)) {
+        const absolute2 = join17(moduleDirectory, path);
+        replaced.set(absolute2, await readFile19(absolute2));
+        await writeFile10(absolute2, source, "utf8");
+        continue;
+      }
       if (target.present.has(path)) continue;
       const absolute = join17(moduleDirectory, path);
       const created = await mkdir10(dirname14(absolute), { recursive: true });
@@ -12953,6 +12989,7 @@ async function writeScaffold(moduleDirectory, files, target) {
     if (!target.exists) {
       await rm9(moduleDirectory, { recursive: true, force: true });
     } else {
+      for (const [file, source] of replaced) await writeFile10(file, source);
       for (const file of written) await rm9(file, { force: true });
       for (const directory of createdDirectories.reverse()) {
         await rm9(directory, { recursive: true, force: true });
@@ -13008,12 +13045,14 @@ async function scaffoldModule(workspace, request) {
   );
   let planned = planScaffold(spec, specSource);
   if ((await sdkModules(workspace)).size) planned = sdkScaffold(planned);
+  const merged = await mergeAuthorBundles(moduleDirectory, planned, target);
+  planned = new Map([...planned, ...merged]);
   let formatted = false;
   if (request.apply) {
     const formatter = await loadWorkspaceFormatter(workspace.root);
     const files = formatter ? await formatFiles(moduleDirectory, planned, formatter) : planned;
     formatted = formatter !== null;
-    await writeScaffold(moduleDirectory, files, target);
+    await writeScaffold(moduleDirectory, files, target, new Set(merged.keys()));
   }
   const moduleRelative = relative11(workspace.root, moduleDirectory);
   return {
@@ -13021,7 +13060,8 @@ async function scaffoldModule(workspace, request) {
     formatted,
     moduleDirectory: moduleRelative,
     files: [...planned.keys()].map((path) => join17(moduleRelative, path)),
-    skipped: [...planned.keys()].filter((path) => target.present.has(path)).map((path) => join17(moduleRelative, path))
+    skipped: [...planned.keys()].filter((path) => target.present.has(path) && !merged.has(path)).map((path) => join17(moduleRelative, path)),
+    merged: [...merged.keys()].map((path) => join17(moduleRelative, path))
   };
 }
 async function formatFiles(moduleDirectory, files, formatter) {
@@ -13040,7 +13080,7 @@ import { constants as constants2 } from "node:fs";
 import {
   chmod as chmod3,
   copyFile as copyFile2,
-  lstat as lstat6,
+  lstat as lstat7,
   mkdir as mkdir11,
   readdir as readdir9,
   readFile as readFile20,
@@ -13062,7 +13102,7 @@ function isMissing(error) {
 }
 async function pathState(path) {
   try {
-    return await lstat6(path);
+    return await lstat7(path);
   } catch (error) {
     if (isMissing(error)) return void 0;
     throw error;
@@ -13148,7 +13188,7 @@ async function ensurePrivateDirectory(path) {
     if (!(error instanceof Error && "code" in error && error.code === "EEXIST"))
       throw error;
   }
-  const state = await lstat6(path);
+  const state = await lstat7(path);
   if (state.isSymbolicLink() || !state.isDirectory()) {
     throw new Error(`${path} is not a safe local state directory.`);
   }
@@ -13160,7 +13200,7 @@ async function copyPlan(plan) {
   const created = [];
   try {
     for (const file of plan.files) {
-      const sourceState = await lstat6(file.source);
+      const sourceState = await lstat7(file.source);
       if (sourceState.isSymbolicLink() || !sourceState.isFile()) {
         throw new Error(`${file.name} is no longer a regular file.`);
       }
@@ -14299,7 +14339,7 @@ import { stat as stat4 } from "node:fs/promises";
 
 // src/setup-environment.ts
 import { randomUUID as randomUUID6 } from "node:crypto";
-import { lstat as lstat7, open as open3, readFile as readFile23, rename as rename7, rm as rm11, writeFile as writeFile12 } from "node:fs/promises";
+import { lstat as lstat8, open as open3, readFile as readFile23, rename as rename7, rm as rm11, writeFile as writeFile12 } from "node:fs/promises";
 import { join as join21 } from "node:path";
 async function readSetupEnvironment(root) {
   try {
@@ -14312,7 +14352,7 @@ async function readSetupEnvironment(root) {
 async function saveSetupEnvironment(root, before, updates) {
   const path = join21(root, ".env");
   try {
-    if (!(await lstat7(path)).isFile())
+    if (!(await lstat8(path)).isFile())
       throw new Error("Setup requires .env to be a regular file.");
   } catch (error) {
     if (error.code !== "ENOENT") throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "flowdular",
-	"version": "0.6.3",
+	"version": "0.6.4",
 	"type": "module",
 	"bin": {
 		"flowdular": "./dist/index.js",
@@ -16,7 +16,7 @@
 		"ajv": "8.20.0",
 		"pg": "8.23.0",
 		"yaml": "2.9.0",
-		"@flowdular/sdk": "0.6.3"
+		"@flowdular/sdk": "0.6.4"
 	},
 	"license": "MIT",
 	"repository": {