@dualkit/convert 0.3.0-beta.0 → 0.5.0-beta.0

package/dist/index.cjs

@@ -151,6 +151,11 @@ function detectPackageManager(root) {
     if (top || (0, import_node_path.dirname)(dir) === dir) return "npm";
   }
 }
+var I18N_LIBRARIES = ["next-intl", "react-i18next", "i18next", "next-i18next", "react-intl", "@lingui/core", "next-international", "@inlang/paraglide-js"];
+function existingI18n(root) {
+  const deps = readDeps(root);
+  return I18N_LIBRARIES.find((name) => name in deps) ?? null;
+}
 function detectI18n(deps) {
   if ("next-intl" in deps) return "next-intl";
   if ("react-i18next" in deps) return "react-i18next";
@@ -172,8 +177,8 @@ function detectProject(root) {
 }
 
 // src/convert.ts
-var import_lint12 = require("@dualkit/lint");
-var import_node_path17 = require("path");
+var import_lint13 = require("@dualkit/lint");
+var import_node_path18 = require("path");
 
 // src/apply.ts
 var import_lint2 = require("@dualkit/lint");
@@ -269,11 +274,11 @@ var RefusedError = class extends Error {
 };
 var NO_GIT = "git is not installed or not on PATH";
 function git(cwd, args) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     (0, import_node_child_process.execFile)("git", ["--literal-pathspecs", ...args], { cwd, maxBuffer: 64 * 1024 * 1024 }, (error, stdout, stderr) => {
       if (error && error.code === "ENOENT") return reject(new Error((0, import_node_fs3.existsSync)(cwd) ? NO_GIT : `The folder ${cwd} does not exist.`));
       const code = error ? typeof error.code === "number" ? error.code : 1 : 0;
-      resolve3({ code, out: `${stdout}${stderr}`.trim(), stdout });
+      resolve4({ code, out: `${stdout}${stderr}`.trim(), stdout });
     });
   });
 }
@@ -327,7 +332,7 @@ async function stagedFiles(root) {
   return out.split("\0").filter(Boolean);
 }
 async function commit(root, message) {
-  await must(root, ["commit", "-q", "-m", message]);
+  await must(root, ["commit", "-q", "--no-verify", "-m", message]);
 }
 async function trackedFiles(root) {
   const out = await must(root, ["ls-files", "-z"]);
@@ -562,6 +567,26 @@ function writeConfigAnswers(disk, answers2, file = CONFIG_FILE) {
   return writeText(disk, file, mergedConfigText(readText(disk.root, file), answers2, file));
 }
 
+// src/closed-routes.ts
+var CLOSED = /* @__PURE__ */ new Set([401, 403, 404]);
+var STATUS_TIMEOUT_MS = 6e4;
+var closedStatus = async (url) => {
+  try {
+    const res = await fetch(url, { signal: AbortSignal.timeout(STATUS_TIMEOUT_MS), redirect: "manual" });
+    return CLOSED.has(res.status) ? res.status : null;
+  } catch {
+    return null;
+  }
+};
+async function closedRoutes(base, routes) {
+  const found = [];
+  for (const route of routes) {
+    const status = await closedStatus(`${base}${route}`);
+    if (status) found.push({ route, reason: `the English page returns ${status}, so its Arabic page was not checked` });
+  }
+  return found;
+}
+
 // src/baseline.ts
 var import_node_fs8 = require("fs");
 var import_node_path9 = require("path");
@@ -619,15 +644,15 @@ var ServerError = class extends Error {
 var OUTPUT_LINES = 20;
 var POLL_MS = 250;
 var KILL_GRACE_MS = 5e3;
-var sleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
+var sleep = (ms) => new Promise((resolve4) => setTimeout(resolve4, ms));
 function portTaken(port) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const socket = (0, import_node_net.connect)({ port, host: "localhost" });
     socket.once("connect", () => {
       socket.destroy();
-      resolve3(true);
+      resolve4(true);
     });
-    socket.once("error", () => resolve3(false));
+    socket.once("error", () => resolve4(false));
   });
 }
 async function answers(url) {
@@ -667,7 +692,7 @@ async function startServer(cmd, port, cwd, timeoutMs = 12e4) {
   });
   const pid = child.pid;
   if (pid === void 0) {
-    await new Promise((resolve3) => setImmediate(resolve3));
+    await new Promise((resolve4) => setImmediate(resolve4));
     throw new ServerError(`Could not start "${cmd}": ${spawnError?.message ?? "no process id"}`);
   }
   const collect = (chunk) => {
@@ -706,6 +731,7 @@ ${tail2()}`);
 
 // src/baseline.ts
 var BASELINE_DIR = `${STATE_DIR}/baseline`;
+var CLOSED_FILE = `${BASELINE_DIR}/closed.json`;
 var WIDTHS = [390, 1280];
 var DEFAULT_PORTS = { "next-app": 3e3, "vite-react": 5173 };
 var routeSlug = (route) => route.replace(/^\/+|\/+$/g, "").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-|-$/g, "") || "home";
@@ -717,6 +743,7 @@ async function shootBaseline(project, config, shoot, log) {
   const server = await startServer(config.start, port, project.root);
   const shots = [];
   try {
+    (0, import_node_fs8.writeFileSync)((0, import_node_path9.join)(project.root, CLOSED_FILE), JSON.stringify((await closedRoutes(server.url, routes)).map((c) => c.route)));
     for (const route of routes) {
       for (const width of WIDTHS) {
         const path = baselinePath(route, width);
@@ -1093,6 +1120,7 @@ function pieceOf(child, ctx) {
   const source = ctx.file.text.slice(ctx.base + expression.start, ctx.base + expression.end);
   return { kind: "value", name, source: mayBeEmpty(expression) ? `${source} ?? ''` : source, start: start2, end };
 }
+var OWN_DIRECTION = /setAttribute\(\s*['"]dir['"]|documentElement\.dir\s*=[^=]/;
 var NODE_NAMES = /^(children|icon|avatar|logo|image|element|node)$/i;
 var mayBeEmpty = (expression) => /^Optional/.test(expression.type) || expression.type === "CallExpression" && !textMethodTarget(expression);
 var jsxText = (value) => value.replace(/^\s*\n\s*/, "").replace(/\s*\n\s*$/, "");
@@ -1342,6 +1370,15 @@ function extractStrings(file, lib, taken) {
   for (const block of file.js) {
     const program = block.ast.program;
     if (isServerFile(program)) continue;
+    if (OWN_DIRECTION.test(file.text.slice(block.offset))) {
+      flag(
+        { file, flags },
+        block.offset,
+        "unsupported",
+        "This file sets the page direction itself, which can clash with the Arabic layout.",
+        "Check the Arabic pages, and drive this direction from the locale so components read it too."
+      );
+    }
     const ctx = { file, base: block.offset, lib, stem: stemOf(file.path), used, byText: /* @__PURE__ */ new Map(), entries, edits: edits2, flags, components: /* @__PURE__ */ new Set(), sawJsx: false, consumed: /* @__PURE__ */ new Set(), usedTrans: false };
     walk(program, ctx, []);
     if (ctx.sawJsx) flagModuleStrings(program, ctx);
@@ -1618,12 +1655,12 @@ function routeMoves(appDir, paths) {
   }
   return { moves, keptPages };
 }
-function eachNode(node, visit) {
-  if (Array.isArray(node)) return node.forEach((child) => eachNode(child, visit));
+function eachNode(node, visit2) {
+  if (Array.isArray(node)) return node.forEach((child) => eachNode(child, visit2));
   if (!node || typeof node !== "object") return;
   const n = node;
-  if (typeof n.type === "string") visit(n);
-  for (const [key, child] of Object.entries(n)) if (!SKIP3.has(key)) eachNode(child, visit);
+  if (typeof n.type === "string") visit2(n);
+  for (const [key, child] of Object.entries(n)) if (!SKIP3.has(key)) eachNode(child, visit2);
 }
 var RELATIVE = /^\.\.?\//;
 var stringLiteral = (node) => node?.type === "StringLiteral" ? node : null;
@@ -2096,7 +2133,7 @@ export function DualkitLanguageSwitch() {
   )
 }
 `;
-var INLINE_SCRIPT = `<script>(function(){var m=document.cookie.match(${COOKIE_PATTERN});var l=m&&m[1]==='ar'?'ar':'en';var h=document.documentElement;h.lang=l;h.dir=l==='ar'?'rtl':'ltr'})()</script>`;
+var INLINE_SCRIPT = `<script>(function(){var m=document.cookie.match(${COOKIE_PATTERN});var l=m&&m[1]==='ar'?'ar':'en';var h=document.documentElement;h.lang=l;h.dir=l==='ar'?'rtl':'ltr';if(l==='ar')new MutationObserver(function(){if(h.dir!=='rtl')h.dir='rtl'}).observe(h,{attributes:true,attributeFilter:['dir']})})()</script>`;
 function htmlEdits2(html, mode) {
   if (mode === "bilingual") {
     if (html.includes(LOCALE_COOKIE)) return [];
@@ -2692,12 +2729,27 @@ function visitExpression(container, ancestors, ctx) {
   ctx.edits.push({ start: ctx.base + container.start, end: ctx.base + container.start, text: "<bdi>" });
   ctx.edits.push({ start: ctx.base + container.end, end: ctx.base + container.end, text: "</bdi>" });
 }
+var SIGNED_NUMBER = /^(?:[+\-\u2212]\d[\d,.]*\s?%?|\d[\d,.]*\s?%)$/;
+var NO_BDI = /* @__PURE__ */ new Set(["svg", "text", "option", "title", "textarea", "style", "script"]);
+function visitText(text, ancestors, ctx) {
+  const parent = ancestors[ancestors.length - 1];
+  if (parent.type !== "JSXElement" && parent.type !== "JSXFragment") return;
+  const value = String(text.value);
+  const trimmed = value.trim();
+  if (!SIGNED_NUMBER.test(trimmed)) return;
+  const elements = ancestors.filter((a) => a.type === "JSXElement");
+  if (elements.some((a) => isolates(a) || NO_BDI.has(tagName2(a.openingElement) ?? ""))) return;
+  const start2 = ctx.base + text.start + value.indexOf(trimmed);
+  ctx.edits.push({ start: start2, end: start2, text: "<bdi>" });
+  ctx.edits.push({ start: start2 + trimmed.length, end: start2 + trimmed.length, text: "</bdi>" });
+}
 function walk3(node, ctx, ancestors) {
   if (Array.isArray(node)) return node.forEach((child) => walk3(child, ctx, ancestors));
   if (!node || typeof node !== "object") return;
   const n = node;
   if (n.type === "JSXOpeningElement") visitOpening(n, ctx, ancestors);
   if (n.type === "JSXExpressionContainer" && ancestors.length) visitExpression(n, ancestors, ctx);
+  if (n.type === "JSXText" && ancestors.length) visitText(n, ancestors, ctx);
   const next = typeof n.type === "string" ? [...ancestors, n] : ancestors;
   for (const [key, child] of Object.entries(n)) if (!SKIP6.has(key)) walk3(child, ctx, next);
 }
@@ -2839,6 +2891,15 @@ function groups(fragments) {
   for (const f of fragments) byGroup.set(f.group, [...byGroup.get(f.group) ?? [], f]);
   return [...byGroup.values()];
 }
+var TRACKED = /^tracking-(?!normal$)/;
+function trackingEdits(fragments) {
+  const tokens = tokensOf(fragments);
+  if (tokens.some((t) => t.parsed.core.startsWith("tracking-") && t.parsed.variants.includes("rtl"))) return [];
+  const first = tokens.find((t) => TRACKED.test(t.parsed.core) && KEPT(t));
+  if (!first) return [];
+  const end = first.at + first.text.length;
+  return [{ start: end, end, text: " rtl:tracking-normal" }];
+}
 function tailwindEdits(file, version) {
   const parsed = parseVersion(version);
   const fragments = (0, import_lint10.classStrings)(file);
@@ -2851,7 +2912,7 @@ function tailwindEdits(file, version) {
     return { edits: [], flags: [{ file: file.path, line: lineOf(file.text, first.offset), kind: "unsupported", message, suggestion }] };
   }
   const sources = groups(fragments);
-  const edits2 = sources.flatMap((g) => [...physicalEdits(g, parsed), ...parsed[0] < 4 ? reverseEdits(g) : []]);
+  const edits2 = sources.flatMap((g) => [...physicalEdits(g, parsed), ...parsed[0] < 4 ? reverseEdits(g) : [], ...trackingEdits(g)]);
   const flags = [...sources.flatMap((g) => formFlags(file, g)), ...computedFlags(file)];
   return { edits: edits2, flags: flags.sort((a, b) => a.line - b.line) };
 }
@@ -2901,9 +2962,208 @@ function runPasses(path, text, abs, ctx) {
   return { kind: "done", text: file.text, edits: edits2, byKind, flags, entries };
 }
 
+// src/transforms/data.ts
+var import_node_path16 = require("path");
+var import_lint12 = require("@dualkit/lint");
+var SKIP8 = /* @__PURE__ */ new Set(["loc", "leadingComments", "trailingComments", "innerComments", "extra"]);
+var TEXT_KEYS = /* @__PURE__ */ new Set(["title", "label", "description", "placeholder", "subtitle", "message", "text", "alt", "heading", "caption"]);
+var NAV_KEYS = /* @__PURE__ */ new Set(["href", "url", "path", "to", "icon"]);
+var RESERVED = /* @__PURE__ */ new Set(["metadata", "viewport", "config", "routing"]);
+var PROSE2 = /^\p{Lu}\p{Ll}/u;
+var NOT_PROSE2 = /[/\\_=<>{}@#|]/;
+var EXTENSIONS3 = ["", ".ts", ".tsx", ".js", ".jsx", "/index.ts", "/index.tsx", "/index.js", "/index.jsx"];
+var ALIASES = /^[@~]\//;
+var unwrap = (node) => node.type === "TSAsExpression" || node.type === "TSSatisfiesExpression" ? unwrap(node.expression) : node;
+var children = (node) => Object.entries(node).filter(([key]) => !SKIP8.has(key));
+function visit(node, ancestors, fn) {
+  if (Array.isArray(node)) return node.forEach((child) => visit(child, ancestors, fn));
+  if (!node || typeof node !== "object") return;
+  const n = node;
+  if (typeof n.type === "string") fn(n, ancestors);
+  const next = typeof n.type === "string" ? [...ancestors, n] : ancestors;
+  for (const [, child] of children(n)) visit(child, next, fn);
+}
+var keyName = (property) => {
+  const key = property.key;
+  if (property.computed) return null;
+  return key.type === "Identifier" ? String(key.name) : key.type === "StringLiteral" ? String(key.value) : null;
+};
+var isProse = (value) => PROSE2.test(value) && !NOT_PROSE2.test(value);
+function textProperty(property, parent) {
+  const key = keyName(property);
+  if (key === null) return false;
+  if (TEXT_KEYS.has(key)) return true;
+  if (key !== "name" || parent?.type !== "ObjectExpression") return false;
+  return (parent.properties ?? []).some((p) => p.type === "ObjectProperty" && NAV_KEYS.has(keyName(p) ?? ""));
+}
+function textsIn(init, reserved) {
+  const strings = [];
+  let clash = false;
+  visit(init, [], (node, above) => {
+    if (FUNCTIONS.has(node.type) && scopeNames(node).includes("t")) clash = true;
+    if (node.type !== "ObjectProperty" || above.some((a) => FUNCTIONS.has(a.type) || a.type?.startsWith("JSX"))) return;
+    const value = node.value;
+    if (value.type === "StringLiteral" && isProse(String(value.value)) && !reserved.has(String(value.value)) && textProperty(node, above[above.length - 1])) strings.push(value);
+  });
+  return clash ? null : strings;
+}
+function dataIn(module2, reserved) {
+  const found = [];
+  for (const statement of module2.program.body ?? []) {
+    const declaration = statement.type === "ExportNamedDeclaration" ? statement.declaration : statement;
+    if (declaration?.type !== "VariableDeclaration" || declaration.kind !== "const") continue;
+    for (const declarator of declaration.declarations ?? []) {
+      const id = declarator.id;
+      const init = declarator.init;
+      if (id.type !== "Identifier" || !init || RESERVED.has(String(id.name))) continue;
+      if (!["ArrayExpression", "ObjectExpression"].includes(unwrap(init).type)) continue;
+      const strings = textsIn(init, reserved);
+      if (strings?.length) found.push({ module: module2, name: String(id.name), declarator, init, strings });
+    }
+  }
+  return found;
+}
+function literalTypes(modules) {
+  const found = /* @__PURE__ */ new Set();
+  for (const module2 of modules) {
+    visit(module2.program, [], (node) => {
+      const literal = node.type === "TSLiteralType" ? node.literal : null;
+      if (literal?.type === "StringLiteral") found.add(String(literal.value));
+    });
+  }
+  return found;
+}
+function resolve3(from, source, known) {
+  const bases = source.startsWith(".") ? [(0, import_node_path16.join)((0, import_node_path16.dirname)(from), source)] : ALIASES.test(source) ? [source.slice(2), (0, import_node_path16.join)("src", source.slice(2))] : [];
+  for (const base of bases) {
+    for (const extension of EXTENSIONS3) {
+      const path = (0, import_node_path16.normalize)(`${base}${extension}`);
+      if (known.has(path)) return path;
+    }
+  }
+  return null;
+}
+function opaque(module2, known) {
+  const paths = [];
+  for (const statement of module2.program.body ?? []) {
+    const source = statement.source;
+    if (!source) continue;
+    const path = resolve3(module2.path, String(source.value), known);
+    if (!path) continue;
+    const star = (statement.specifiers ?? []).some((s) => s.type === "ImportNamespaceSpecifier");
+    if (statement.type !== "ImportDeclaration" || star) paths.push(path);
+  }
+  return paths;
+}
+function usesOf(module2, local, skip, lib) {
+  const uses = [];
+  let blocked = false;
+  visit(module2.program, [], (node, above) => {
+    if (blocked || node.type !== "Identifier" || node.name !== local || node === skip) return;
+    const parent = above[above.length - 1];
+    if (parent.type?.startsWith("Import") || parent.type === "TSTypeReference" || parent.type === "TSQualifiedName") return;
+    if (parent.type === "MemberExpression" && parent.property === node && !parent.computed) return;
+    if (parent.type === "OptionalMemberExpression" && parent.property === node && !parent.computed) return;
+    if (parent.type === "ObjectProperty" && parent.key === node && !parent.computed && !parent.shorthand) return;
+    const inner = above.slice(1);
+    const shadowed = inner.some((a) => scopeNames(a).includes(local));
+    const component = componentOf(above);
+    const stuck = parent.type === "TSTypeQuery" || parent.type?.startsWith("Export") || Boolean(parent.shorthand);
+    const inParams = component !== null && node.start < component.body.start;
+    if (shadowed || stuck || inParams || !component || tInScope(inner) || lib === "react-i18next" && component.async) blocked = true;
+    else uses.push({ module: module2, node, local, component });
+  });
+  return blocked ? null : uses;
+}
+function allUses(data, modules, known, lib) {
+  const own = usesOf(data.module, data.name, data.declarator.id, lib);
+  if (!own) return null;
+  const uses = [...own];
+  for (const module2 of modules) {
+    if (module2 === data.module) continue;
+    for (const statement of module2.program.body ?? []) {
+      if (statement.type !== "ImportDeclaration" || resolve3(module2.path, String(statement.source.value), known) !== data.module.path) continue;
+      const specifier2 = (statement.specifiers ?? []).find((s) => s.type === "ImportSpecifier" && s.imported.name === data.name);
+      if (!specifier2) continue;
+      const found = usesOf(module2, String(specifier2.local.name), null, lib);
+      if (!found) return null;
+      uses.push(...found);
+    }
+  }
+  return uses.length ? uses : null;
+}
+function parseModule({ path, text }) {
+  if (text.includes("use server")) return null;
+  const outcome = (0, import_lint12.parseSourceOutcome)(path, text, path);
+  const block = "file" in outcome ? outcome.file.js[0] : void 0;
+  return block ? { path, text, base: block.offset, program: block.ast.program } : null;
+}
+function keyFor2(keys, stem, en) {
+  const known = keys.byText.get(`${stem}
+${en}`);
+  if (known) return { key: known, isNew: false };
+  const base = `${stem}.${keyWords(en)}`;
+  let key = base;
+  for (let n = 2; keys.used.has(key); n++) key = `${base}-${n}`;
+  keys.used.add(key);
+  keys.byText.set(`${stem}
+${en}`, key);
+  return { key, isNew: true };
+}
+function dataEdits(data, keys, entries) {
+  const { module: module2, init, declarator, strings } = data;
+  const { base, text, path } = module2;
+  const annotation = declarator.id.typeAnnotation;
+  const returns = annotation ? text.slice(base + annotation.start, base + annotation.end) : "";
+  const edits2 = [
+    { start: base + init.start, end: base + init.start, text: `(t: (key: string) => string)${returns} => (` },
+    { start: base + init.end, end: base + init.end, text: ")" },
+    ...annotation ? [{ start: base + annotation.start, end: base + annotation.end, text: "" }] : []
+  ];
+  const stem = stemOf(path);
+  for (const literal of strings) {
+    const en = String(literal.value);
+    const { key, isNew } = keyFor2(keys, stem, en);
+    if (isNew) entries.push({ key, en, ar: "", status: "pending", file: path, line: lineOf(text, base + literal.start) });
+    edits2.push({ start: base + literal.start, end: base + literal.end, text: `t('${key}')` });
+  }
+  return edits2;
+}
+function liftData(inputs, lib, taken) {
+  const modules = inputs.map(parseModule).filter((m) => m !== null);
+  const known = new Set(inputs.map((i) => (0, import_node_path16.normalize)(i.path)));
+  const barred = new Set(modules.flatMap((m) => opaque(m, known)));
+  const reserved = literalTypes(modules);
+  const edits2 = /* @__PURE__ */ new Map();
+  const components = /* @__PURE__ */ new Map();
+  const entries = [];
+  const keys = { used: new Set(taken), byText: /* @__PURE__ */ new Map() };
+  const push = (module2, more) => {
+    edits2.set(module2, [...edits2.get(module2) ?? [], ...more]);
+  };
+  let moved = 0;
+  for (const data of modules.filter((m) => !barred.has((0, import_node_path16.normalize)(m.path))).flatMap((m) => dataIn(m, reserved))) {
+    const uses = allUses(data, modules, known, lib);
+    if (!uses) continue;
+    push(data.module, dataEdits(data, keys, entries));
+    moved += data.strings.length;
+    for (const use of uses) {
+      push(use.module, [{ start: use.module.base + use.node.end, end: use.module.base + use.node.end, text: "(t)" }]);
+      components.set(use.module, (components.get(use.module) ?? /* @__PURE__ */ new Set()).add(use.component));
+    }
+  }
+  for (const [module2, found] of components) {
+    const style = styleOf(module2.program, module2.text, module2.base);
+    const hooks = [...found].map((fn) => hookEdits(fn, lib, module2.text, module2.base, style));
+    push(module2, [...hooks.flatMap((h) => h.edits), ...importEdits(module2.program, hooks.flatMap((h) => h.imports), module2.base, style)]);
+  }
+  const texts = new Map([...edits2].map(([module2, list]) => [module2.path, applyEdits(module2.text, list)]));
+  return { texts, entries, moved };
+}
+
 // src/rollback.ts
 var import_node_fs9 = require("fs");
-var import_node_path16 = require("path");
+var import_node_path17 = require("path");
 var ConvertFailedError = class extends Error {
   constructor(message, cause) {
     super(message);
@@ -2922,7 +3182,7 @@ async function rollBack(target, step, error) {
   const failed = `convert failed at ${step}: ${reasonOf(error)}.`;
   try {
     await resetHard(target.root);
-    for (const path of [...target.created].reverse()) (0, import_node_fs9.rmSync)((0, import_node_path16.join)(target.root, path), { recursive: true, force: true });
+    for (const path of [...target.created].reverse()) (0, import_node_fs9.rmSync)((0, import_node_path17.join)(target.root, path), { recursive: true, force: true });
     if (target.madeBranch) {
       await checkout(target.root, target.base);
       await deleteBranch(target.root, target.branch);
@@ -3002,7 +3262,7 @@ var branchFor = (mode) => `dualkit/${mode}`;
 var problems = (flags) => flags.filter((f) => f.kind !== "info");
 function transformAll(project, generated, taken) {
   const { root } = project;
-  const walked = (0, import_lint12.walk)(["."], root);
+  const walked = (0, import_lint13.walk)(["."], root);
   const used = new Set(taken);
   const ctx = {
     tailwind: project.tailwind,
@@ -3011,18 +3271,21 @@ function transformAll(project, generated, taken) {
     css: physicalContext(root)
   };
   const out = { texts: /* @__PURE__ */ new Map(), edits: 0, byKind: { tailwind: 0, css: 0, markup: 0, strings: 0, formats: 0 }, perFile: /* @__PURE__ */ new Map(), flags: [], entries: [], skipped: [...walked.skipped] };
+  const lifted = lift(project, walked.files.filter((path) => !generated.has(path)), ctx.lib, used);
+  out.entries.push(...lifted.entries);
+  for (const entry of lifted.entries) used.add(entry.key);
   for (const path of walked.files) {
     if (generated.has(path)) continue;
-    const raw = readText(root, path);
+    const raw = lifted.texts.get(path) ?? readText(root, path);
     if (raw === null) {
       out.skipped.push({ file: path, reason: "unreadable" });
       continue;
     }
-    if ((0, import_lint12.isMinified)(raw)) {
+    if ((0, import_lint13.isMinified)(raw)) {
       out.skipped.push({ file: path, reason: "minified" });
       continue;
     }
-    const result = runPasses(path, raw, (0, import_node_path17.join)(root, path), { ...ctx, taken: used });
+    const result = runPasses(path, raw, (0, import_node_path18.join)(root, path), { ...ctx, taken: used });
     if (result.kind === "skipped") {
       out.skipped.push({ file: path, reason: result.reason });
       continue;
@@ -3030,7 +3293,7 @@ function transformAll(project, generated, taken) {
     out.flags.push(...result.flags);
     out.entries.push(...result.entries);
     for (const entry of result.entries) used.add(entry.key);
-    if (result.edits === 0) continue;
+    if (result.edits === 0 && !lifted.texts.has(path)) continue;
     out.edits += result.edits;
     for (const kind of Object.keys(out.byKind)) out.byKind[kind] += result.byKind[kind];
     out.perFile.set(path, result.edits);
@@ -3038,6 +3301,13 @@ function transformAll(project, generated, taken) {
   }
   return out;
 }
+function lift(project, paths, lib, taken) {
+  const inputs = paths.flatMap((path) => {
+    const text = /\.[jt]sx?$/.test(path) ? readText(project.root, path) : null;
+    return text !== null && !text.startsWith(BOM) && !(0, import_lint13.isMinified)(text) ? [{ path, text }] : [];
+  });
+  return liftData(inputs, lib, taken);
+}
 function changedFiles(perFile, moved, wiring) {
   const total = /* @__PURE__ */ new Map();
   const add = (file, n) => {
@@ -3096,6 +3366,8 @@ async function convert(options, ioIn) {
   if (options.configAnswers) checkConfigAnswers(root, options.configFile);
   const io = options.configAnswers ? { ...ioIn, config: { ...ioIn.config, ...options.configAnswers } } : ioIn;
   const project = detectProject(root);
+  const library = rerun ? null : existingI18n(root);
+  if (library) throw new UnsupportedError(`This app already uses ${library}. Convert adds its own translation setup and the two collide, so nothing was changed. Convert supports apps with no translation library yet.`);
   const branch = branchFor(mode);
   const generated = new Set(state?.generated ?? []);
   const existing = readLedger(root);
@@ -3125,7 +3397,7 @@ async function convert(options, ioIn) {
 
 // src/finish.ts
 var import_node_fs11 = require("fs");
-var import_node_path19 = require("path");
+var import_node_path20 = require("path");
 
 // src/match.ts
 var import_pngjs = require("pngjs");
@@ -3156,7 +3428,7 @@ function compare(a, b) {
 
 // src/finish-undo.ts
 var import_node_fs10 = require("fs");
-var import_node_path18 = require("path");
+var import_node_path19 = require("path");
 async function snapshot(root, paths) {
   const clean = new Set(await cleanAtHead(root, paths));
   return paths.map((path) => ({ path, clean: clean.has(path), text: clean.has(path) ? null : readText(root, path) }));
@@ -3165,8 +3437,8 @@ async function undo(root, saved, staged) {
   await restoreFromHead(root, saved.filter((s) => s.clean).map((s) => s.path));
   const dirty = saved.filter((s) => !s.clean);
   for (const { path, text } of dirty) {
-    if (text === null) (0, import_node_fs10.rmSync)((0, import_node_path18.join)(root, path), { force: true });
-    else (0, import_node_fs10.writeFileSync)((0, import_node_path18.join)(root, path), text);
+    if (text === null) (0, import_node_fs10.rmSync)((0, import_node_path19.join)(root, path), { force: true });
+    else (0, import_node_fs10.writeFileSync)((0, import_node_path19.join)(root, path), text);
   }
   await unstage(root, [.../* @__PURE__ */ new Set([...dirty.map((s) => s.path), ...staged])]);
 }
@@ -3269,7 +3541,8 @@ function english(data) {
 }
 function arabic(data) {
   const lines = data.arabic.map(
-    (p) => !Number.isFinite(p.errors) ? `- ${esc(p.route)}: the check returned no result` : `- ${esc(p.route)}: score ${p.score}, ${plural(p.errors, "error", "errors")}, ${plural(p.warnings, "warning", "warnings")}`
+    (p) => !Number.isFinite(p.errors) ? `- ${esc(p.route)}: ${esc(p.problems?.[0] ?? "the check returned no result")}` : `- ${esc(p.route)}: score ${p.score}, ${plural(p.errors, "error", "errors")}, ${plural(p.warnings, "warning", "warnings")}${(p.problems ?? []).map((m) => `
+  - ${esc(m)}`).join("")}`
   );
   return section("Arabic pages", lines, "No pages were checked.");
 }
@@ -3344,7 +3617,7 @@ function writeMessages(root, ledger) {
   for (const [path, text] of Object.entries(messagesFiles(ledger))) writeText(disk, path, mergedMessages(root, path, text));
 }
 function mergedMessages(root, path, generated) {
-  const full = (0, import_node_path19.join)(root, path);
+  const full = (0, import_node_path20.join)(root, path);
   if (!(0, import_node_fs11.existsSync)(full)) return generated;
   try {
     const existing = JSON.parse((0, import_node_fs11.readFileSync)(full, "utf8"));
@@ -3359,7 +3632,7 @@ async function englishChecks(root, base, routes, shoot) {
   const noBaseline = [];
   for (const route of routes) {
     for (const width of WIDTHS) {
-      const file = (0, import_node_path19.join)(root, baselinePath(route, width));
+      const file = (0, import_node_path20.join)(root, baselinePath(route, width));
       if (!(0, import_node_fs11.existsSync)(file)) {
         noBaseline.push({ route, width });
         continue;
@@ -3369,8 +3642,8 @@ async function englishChecks(root, base, routes, shoot) {
       let diffPath;
       if (ratio >= MAX_DIFF_RATIO) {
         diffPath = `${DIFF_DIR}/${routeSlug(route)}-${width}.png`;
-        (0, import_node_fs11.mkdirSync)((0, import_node_path19.join)(root, DIFF_DIR), { recursive: true });
-        (0, import_node_fs11.writeFileSync)((0, import_node_path19.join)(root, diffPath), diff);
+        (0, import_node_fs11.mkdirSync)((0, import_node_path20.join)(root, DIFF_DIR), { recursive: true });
+        (0, import_node_fs11.writeFileSync)((0, import_node_path20.join)(root, diffPath), diff);
       }
       english2.push({ route, width, ratio, ...diffPath ? { diffPath } : {} });
     }
@@ -3385,11 +3658,21 @@ async function arabicChecks(project, state, base, routes, audit) {
       const result = await audit(`${base}${path}`, width, options);
       const usable = result && Number.isFinite(result.errors);
       const failed = { score: Number.NaN, errors: Number.NaN, warnings: Number.NaN };
-      arabic2.push({ route: `${path} at ${width}px`, ...usable ? result : failed });
+      arabic2.push({ route: `${path} at ${width}px`, ...usable ? result : { ...failed, ...result?.problems ? { problems: result.problems } : {} } });
     }
   }
   return arabic2;
 }
+function closedAtBaseline(root) {
+  const path = (0, import_node_path20.join)(root, CLOSED_FILE);
+  if (!(0, import_node_fs11.existsSync)(path)) return /* @__PURE__ */ new Set();
+  try {
+    const routes = JSON.parse((0, import_node_fs11.readFileSync)(path, "utf8"));
+    return new Set(Array.isArray(routes) ? routes.filter((r) => typeof r === "string") : []);
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
 async function runChecks(project, state, routes, { config, shoot, audit }, step) {
   const { start: cmd } = config;
   if (!cmd || !shoot) throw new RefusedError(NEEDS_BROWSER);
@@ -3400,8 +3683,13 @@ async function runChecks(project, state, routes, { config, shoot, audit }, step)
   });
   try {
     step.name = "checking the pages";
-    const english2 = state.mode === "bilingual" ? await englishChecks(project.root, server.url, routes, shoot) : { english: [], noBaseline: [] };
-    return { ...english2, arabic: await arabicChecks(project, state, server.url, routes, audit) };
+    const closed = await closedRoutes(server.url, routes);
+    const shut = new Set(closed.map((c) => c.route));
+    const open = routes.filter((route) => !shut.has(route));
+    const before = closedAtBaseline(project.root);
+    const compared = routes.filter((route) => !(shut.has(route) && before.has(route)));
+    const english2 = state.mode === "bilingual" ? await englishChecks(project.root, server.url, compared, shoot) : { english: [], noBaseline: [] };
+    return { ...english2, closed, arabic: await arabicChecks(project, state, server.url, open, audit) };
   } finally {
     await server.stop();
   }
@@ -3442,21 +3730,21 @@ async function run(ready, step) {
     ledger,
     ...checks,
     ...earlier ? {} : { summaryMissing: true },
-    unreachable,
+    unreachable: [...unreachable, ...checks.closed],
     remainingLint,
     ...tests2 ? { tests: { code: tests2.code, tail: tail(tests2.out) } } : {}
   };
-  (0, import_node_fs11.writeFileSync)((0, import_node_path19.join)(root, REPORT_FILE), renderConvertReport(data));
+  (0, import_node_fs11.writeFileSync)((0, import_node_path20.join)(root, REPORT_FILE), renderConvertReport(data));
   step.name = "saving the state";
   saveState(root, { ...state, phase: "finished" });
   step.name = "saving your answers";
   if (options.configAnswers) writeConfigAnswers({ root, created: [] }, options.configAnswers, configFile);
   step.name = "committing";
-  await stage(root, own.filter((p) => (p !== configFile || options.configAnswers) && (0, import_node_fs11.existsSync)((0, import_node_path19.join)(root, p))));
+  await stage(root, own.filter((p) => (p !== configFile || options.configAnswers) && (0, import_node_fs11.existsSync)((0, import_node_path20.join)(root, p))));
   if ((await stagedFiles(root)).length) await commit(root, `dualkit: finish ${state.mode} conversion`);
   const checked = checks.arabic.length > 0;
   const passed = checked && checks.english.every((p) => p.ratio < MAX_DIFF_RATIO) && checks.arabic.every((p) => p.errors === 0) && (tests2?.code ?? 0) === 0;
-  return { reportPath: (0, import_node_path19.join)(root, REPORT_FILE), passed };
+  return { reportPath: (0, import_node_path20.join)(root, REPORT_FILE), passed };
 }
 async function finish(options, ioIn) {
   const ready = await prepare(options, ioIn);

package/dist/index.d.cts

@@ -157,6 +157,7 @@ type FinishIo = ConvertIo & {
         score: number;
         errors: number;
         warnings: number;
+        problems?: string[];
     }>;
     lint: (root: string) => Promise<number>;
 };

package/dist/index.d.ts

@@ -157,6 +157,7 @@ type FinishIo = ConvertIo & {
         score: number;
         errors: number;
         warnings: number;
+        problems?: string[];
     }>;
     lint: (root: string) => Promise<number>;
 };

package/dist/index.js

@@ -116,6 +116,11 @@ function detectPackageManager(root) {
     if (top || dirname(dir) === dir) return "npm";
   }
 }
+var I18N_LIBRARIES = ["next-intl", "react-i18next", "i18next", "next-i18next", "react-intl", "@lingui/core", "next-international", "@inlang/paraglide-js"];
+function existingI18n(root) {
+  const deps = readDeps(root);
+  return I18N_LIBRARIES.find((name) => name in deps) ?? null;
+}
 function detectI18n(deps) {
   if ("next-intl" in deps) return "next-intl";
   if ("react-i18next" in deps) return "react-i18next";
@@ -138,7 +143,7 @@ function detectProject(root) {
 
 // src/convert.ts
 import { isMinified, walk as walk4 } from "@dualkit/lint";
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 
 // src/apply.ts
 import { parseSourceOutcome } from "@dualkit/lint";
@@ -234,11 +239,11 @@ var RefusedError = class extends Error {
 };
 var NO_GIT = "git is not installed or not on PATH";
 function git(cwd, args) {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     execFile("git", ["--literal-pathspecs", ...args], { cwd, maxBuffer: 64 * 1024 * 1024 }, (error, stdout, stderr) => {
       if (error && error.code === "ENOENT") return reject(new Error(existsSync3(cwd) ? NO_GIT : `The folder ${cwd} does not exist.`));
       const code = error ? typeof error.code === "number" ? error.code : 1 : 0;
-      resolve3({ code, out: `${stdout}${stderr}`.trim(), stdout });
+      resolve4({ code, out: `${stdout}${stderr}`.trim(), stdout });
     });
   });
 }
@@ -292,7 +297,7 @@ async function stagedFiles(root) {
   return out.split("\0").filter(Boolean);
 }
 async function commit(root, message) {
-  await must(root, ["commit", "-q", "-m", message]);
+  await must(root, ["commit", "-q", "--no-verify", "-m", message]);
 }
 async function trackedFiles(root) {
   const out = await must(root, ["ls-files", "-z"]);
@@ -527,6 +532,26 @@ function writeConfigAnswers(disk, answers2, file = CONFIG_FILE) {
   return writeText(disk, file, mergedConfigText(readText(disk.root, file), answers2, file));
 }
 
+// src/closed-routes.ts
+var CLOSED = /* @__PURE__ */ new Set([401, 403, 404]);
+var STATUS_TIMEOUT_MS = 6e4;
+var closedStatus = async (url) => {
+  try {
+    const res = await fetch(url, { signal: AbortSignal.timeout(STATUS_TIMEOUT_MS), redirect: "manual" });
+    return CLOSED.has(res.status) ? res.status : null;
+  } catch {
+    return null;
+  }
+};
+async function closedRoutes(base, routes) {
+  const found = [];
+  for (const route of routes) {
+    const status = await closedStatus(`${base}${route}`);
+    if (status) found.push({ route, reason: `the English page returns ${status}, so its Arabic page was not checked` });
+  }
+  return found;
+}
+
 // src/baseline.ts
 import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "fs";
 import { join as join7 } from "path";
@@ -584,15 +609,15 @@ var ServerError = class extends Error {
 var OUTPUT_LINES = 20;
 var POLL_MS = 250;
 var KILL_GRACE_MS = 5e3;
-var sleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
+var sleep = (ms) => new Promise((resolve4) => setTimeout(resolve4, ms));
 function portTaken(port) {
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const socket = connect({ port, host: "localhost" });
     socket.once("connect", () => {
       socket.destroy();
-      resolve3(true);
+      resolve4(true);
     });
-    socket.once("error", () => resolve3(false));
+    socket.once("error", () => resolve4(false));
   });
 }
 async function answers(url) {
@@ -632,7 +657,7 @@ async function startServer(cmd, port, cwd, timeoutMs = 12e4) {
   });
   const pid = child.pid;
   if (pid === void 0) {
-    await new Promise((resolve3) => setImmediate(resolve3));
+    await new Promise((resolve4) => setImmediate(resolve4));
     throw new ServerError(`Could not start "${cmd}": ${spawnError?.message ?? "no process id"}`);
   }
   const collect = (chunk) => {
@@ -671,6 +696,7 @@ ${tail2()}`);
 
 // src/baseline.ts
 var BASELINE_DIR = `${STATE_DIR}/baseline`;
+var CLOSED_FILE = `${BASELINE_DIR}/closed.json`;
 var WIDTHS = [390, 1280];
 var DEFAULT_PORTS = { "next-app": 3e3, "vite-react": 5173 };
 var routeSlug = (route) => route.replace(/^\/+|\/+$/g, "").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-|-$/g, "") || "home";
@@ -682,6 +708,7 @@ async function shootBaseline(project, config, shoot, log) {
   const server = await startServer(config.start, port, project.root);
   const shots = [];
   try {
+    writeFileSync5(join7(project.root, CLOSED_FILE), JSON.stringify((await closedRoutes(server.url, routes)).map((c) => c.route)));
     for (const route of routes) {
       for (const width of WIDTHS) {
         const path = baselinePath(route, width);
@@ -1058,6 +1085,7 @@ function pieceOf(child, ctx) {
   const source = ctx.file.text.slice(ctx.base + expression.start, ctx.base + expression.end);
   return { kind: "value", name, source: mayBeEmpty(expression) ? `${source} ?? ''` : source, start: start2, end };
 }
+var OWN_DIRECTION = /setAttribute\(\s*['"]dir['"]|documentElement\.dir\s*=[^=]/;
 var NODE_NAMES = /^(children|icon|avatar|logo|image|element|node)$/i;
 var mayBeEmpty = (expression) => /^Optional/.test(expression.type) || expression.type === "CallExpression" && !textMethodTarget(expression);
 var jsxText = (value) => value.replace(/^\s*\n\s*/, "").replace(/\s*\n\s*$/, "");
@@ -1307,6 +1335,15 @@ function extractStrings(file, lib, taken) {
   for (const block of file.js) {
     const program = block.ast.program;
     if (isServerFile(program)) continue;
+    if (OWN_DIRECTION.test(file.text.slice(block.offset))) {
+      flag(
+        { file, flags },
+        block.offset,
+        "unsupported",
+        "This file sets the page direction itself, which can clash with the Arabic layout.",
+        "Check the Arabic pages, and drive this direction from the locale so components read it too."
+      );
+    }
     const ctx = { file, base: block.offset, lib, stem: stemOf(file.path), used, byText: /* @__PURE__ */ new Map(), entries, edits: edits2, flags, components: /* @__PURE__ */ new Set(), sawJsx: false, consumed: /* @__PURE__ */ new Set(), usedTrans: false };
     walk(program, ctx, []);
     if (ctx.sawJsx) flagModuleStrings(program, ctx);
@@ -1583,12 +1620,12 @@ function routeMoves(appDir, paths) {
   }
   return { moves, keptPages };
 }
-function eachNode(node, visit) {
-  if (Array.isArray(node)) return node.forEach((child) => eachNode(child, visit));
+function eachNode(node, visit2) {
+  if (Array.isArray(node)) return node.forEach((child) => eachNode(child, visit2));
   if (!node || typeof node !== "object") return;
   const n = node;
-  if (typeof n.type === "string") visit(n);
-  for (const [key, child] of Object.entries(n)) if (!SKIP3.has(key)) eachNode(child, visit);
+  if (typeof n.type === "string") visit2(n);
+  for (const [key, child] of Object.entries(n)) if (!SKIP3.has(key)) eachNode(child, visit2);
 }
 var RELATIVE = /^\.\.?\//;
 var stringLiteral = (node) => node?.type === "StringLiteral" ? node : null;
@@ -2061,7 +2098,7 @@ export function DualkitLanguageSwitch() {
   )
 }
 `;
-var INLINE_SCRIPT = `<script>(function(){var m=document.cookie.match(${COOKIE_PATTERN});var l=m&&m[1]==='ar'?'ar':'en';var h=document.documentElement;h.lang=l;h.dir=l==='ar'?'rtl':'ltr'})()</script>`;
+var INLINE_SCRIPT = `<script>(function(){var m=document.cookie.match(${COOKIE_PATTERN});var l=m&&m[1]==='ar'?'ar':'en';var h=document.documentElement;h.lang=l;h.dir=l==='ar'?'rtl':'ltr';if(l==='ar')new MutationObserver(function(){if(h.dir!=='rtl')h.dir='rtl'}).observe(h,{attributes:true,attributeFilter:['dir']})})()</script>`;
 function htmlEdits2(html, mode) {
   if (mode === "bilingual") {
     if (html.includes(LOCALE_COOKIE)) return [];
@@ -2657,12 +2694,27 @@ function visitExpression(container, ancestors, ctx) {
   ctx.edits.push({ start: ctx.base + container.start, end: ctx.base + container.start, text: "<bdi>" });
   ctx.edits.push({ start: ctx.base + container.end, end: ctx.base + container.end, text: "</bdi>" });
 }
+var SIGNED_NUMBER = /^(?:[+\-\u2212]\d[\d,.]*\s?%?|\d[\d,.]*\s?%)$/;
+var NO_BDI = /* @__PURE__ */ new Set(["svg", "text", "option", "title", "textarea", "style", "script"]);
+function visitText(text, ancestors, ctx) {
+  const parent = ancestors[ancestors.length - 1];
+  if (parent.type !== "JSXElement" && parent.type !== "JSXFragment") return;
+  const value = String(text.value);
+  const trimmed = value.trim();
+  if (!SIGNED_NUMBER.test(trimmed)) return;
+  const elements = ancestors.filter((a) => a.type === "JSXElement");
+  if (elements.some((a) => isolates(a) || NO_BDI.has(tagName2(a.openingElement) ?? ""))) return;
+  const start2 = ctx.base + text.start + value.indexOf(trimmed);
+  ctx.edits.push({ start: start2, end: start2, text: "<bdi>" });
+  ctx.edits.push({ start: start2 + trimmed.length, end: start2 + trimmed.length, text: "</bdi>" });
+}
 function walk3(node, ctx, ancestors) {
   if (Array.isArray(node)) return node.forEach((child) => walk3(child, ctx, ancestors));
   if (!node || typeof node !== "object") return;
   const n = node;
   if (n.type === "JSXOpeningElement") visitOpening(n, ctx, ancestors);
   if (n.type === "JSXExpressionContainer" && ancestors.length) visitExpression(n, ancestors, ctx);
+  if (n.type === "JSXText" && ancestors.length) visitText(n, ancestors, ctx);
   const next = typeof n.type === "string" ? [...ancestors, n] : ancestors;
   for (const [key, child] of Object.entries(n)) if (!SKIP6.has(key)) walk3(child, ctx, next);
 }
@@ -2804,6 +2856,15 @@ function groups(fragments) {
   for (const f of fragments) byGroup.set(f.group, [...byGroup.get(f.group) ?? [], f]);
   return [...byGroup.values()];
 }
+var TRACKED = /^tracking-(?!normal$)/;
+function trackingEdits(fragments) {
+  const tokens = tokensOf(fragments);
+  if (tokens.some((t) => t.parsed.core.startsWith("tracking-") && t.parsed.variants.includes("rtl"))) return [];
+  const first = tokens.find((t) => TRACKED.test(t.parsed.core) && KEPT(t));
+  if (!first) return [];
+  const end = first.at + first.text.length;
+  return [{ start: end, end, text: " rtl:tracking-normal" }];
+}
 function tailwindEdits(file, version) {
   const parsed = parseVersion(version);
   const fragments = classStrings(file);
@@ -2816,7 +2877,7 @@ function tailwindEdits(file, version) {
     return { edits: [], flags: [{ file: file.path, line: lineOf(file.text, first.offset), kind: "unsupported", message, suggestion }] };
   }
   const sources = groups(fragments);
-  const edits2 = sources.flatMap((g) => [...physicalEdits(g, parsed), ...parsed[0] < 4 ? reverseEdits(g) : []]);
+  const edits2 = sources.flatMap((g) => [...physicalEdits(g, parsed), ...parsed[0] < 4 ? reverseEdits(g) : [], ...trackingEdits(g)]);
   const flags = [...sources.flatMap((g) => formFlags(file, g)), ...computedFlags(file)];
   return { edits: edits2, flags: flags.sort((a, b) => a.line - b.line) };
 }
@@ -2866,9 +2927,208 @@ function runPasses(path, text, abs, ctx) {
   return { kind: "done", text: file.text, edits: edits2, byKind, flags, entries };
 }
 
+// src/transforms/data.ts
+import { dirname as dirname4, join as join8, normalize } from "path";
+import { parseSourceOutcome as parseSourceOutcome7 } from "@dualkit/lint";
+var SKIP8 = /* @__PURE__ */ new Set(["loc", "leadingComments", "trailingComments", "innerComments", "extra"]);
+var TEXT_KEYS = /* @__PURE__ */ new Set(["title", "label", "description", "placeholder", "subtitle", "message", "text", "alt", "heading", "caption"]);
+var NAV_KEYS = /* @__PURE__ */ new Set(["href", "url", "path", "to", "icon"]);
+var RESERVED = /* @__PURE__ */ new Set(["metadata", "viewport", "config", "routing"]);
+var PROSE2 = /^\p{Lu}\p{Ll}/u;
+var NOT_PROSE2 = /[/\\_=<>{}@#|]/;
+var EXTENSIONS3 = ["", ".ts", ".tsx", ".js", ".jsx", "/index.ts", "/index.tsx", "/index.js", "/index.jsx"];
+var ALIASES = /^[@~]\//;
+var unwrap = (node) => node.type === "TSAsExpression" || node.type === "TSSatisfiesExpression" ? unwrap(node.expression) : node;
+var children = (node) => Object.entries(node).filter(([key]) => !SKIP8.has(key));
+function visit(node, ancestors, fn) {
+  if (Array.isArray(node)) return node.forEach((child) => visit(child, ancestors, fn));
+  if (!node || typeof node !== "object") return;
+  const n = node;
+  if (typeof n.type === "string") fn(n, ancestors);
+  const next = typeof n.type === "string" ? [...ancestors, n] : ancestors;
+  for (const [, child] of children(n)) visit(child, next, fn);
+}
+var keyName = (property) => {
+  const key = property.key;
+  if (property.computed) return null;
+  return key.type === "Identifier" ? String(key.name) : key.type === "StringLiteral" ? String(key.value) : null;
+};
+var isProse = (value) => PROSE2.test(value) && !NOT_PROSE2.test(value);
+function textProperty(property, parent) {
+  const key = keyName(property);
+  if (key === null) return false;
+  if (TEXT_KEYS.has(key)) return true;
+  if (key !== "name" || parent?.type !== "ObjectExpression") return false;
+  return (parent.properties ?? []).some((p) => p.type === "ObjectProperty" && NAV_KEYS.has(keyName(p) ?? ""));
+}
+function textsIn(init, reserved) {
+  const strings = [];
+  let clash = false;
+  visit(init, [], (node, above) => {
+    if (FUNCTIONS.has(node.type) && scopeNames(node).includes("t")) clash = true;
+    if (node.type !== "ObjectProperty" || above.some((a) => FUNCTIONS.has(a.type) || a.type?.startsWith("JSX"))) return;
+    const value = node.value;
+    if (value.type === "StringLiteral" && isProse(String(value.value)) && !reserved.has(String(value.value)) && textProperty(node, above[above.length - 1])) strings.push(value);
+  });
+  return clash ? null : strings;
+}
+function dataIn(module, reserved) {
+  const found = [];
+  for (const statement of module.program.body ?? []) {
+    const declaration = statement.type === "ExportNamedDeclaration" ? statement.declaration : statement;
+    if (declaration?.type !== "VariableDeclaration" || declaration.kind !== "const") continue;
+    for (const declarator of declaration.declarations ?? []) {
+      const id = declarator.id;
+      const init = declarator.init;
+      if (id.type !== "Identifier" || !init || RESERVED.has(String(id.name))) continue;
+      if (!["ArrayExpression", "ObjectExpression"].includes(unwrap(init).type)) continue;
+      const strings = textsIn(init, reserved);
+      if (strings?.length) found.push({ module, name: String(id.name), declarator, init, strings });
+    }
+  }
+  return found;
+}
+function literalTypes(modules) {
+  const found = /* @__PURE__ */ new Set();
+  for (const module of modules) {
+    visit(module.program, [], (node) => {
+      const literal = node.type === "TSLiteralType" ? node.literal : null;
+      if (literal?.type === "StringLiteral") found.add(String(literal.value));
+    });
+  }
+  return found;
+}
+function resolve3(from, source, known) {
+  const bases = source.startsWith(".") ? [join8(dirname4(from), source)] : ALIASES.test(source) ? [source.slice(2), join8("src", source.slice(2))] : [];
+  for (const base of bases) {
+    for (const extension of EXTENSIONS3) {
+      const path = normalize(`${base}${extension}`);
+      if (known.has(path)) return path;
+    }
+  }
+  return null;
+}
+function opaque(module, known) {
+  const paths = [];
+  for (const statement of module.program.body ?? []) {
+    const source = statement.source;
+    if (!source) continue;
+    const path = resolve3(module.path, String(source.value), known);
+    if (!path) continue;
+    const star = (statement.specifiers ?? []).some((s) => s.type === "ImportNamespaceSpecifier");
+    if (statement.type !== "ImportDeclaration" || star) paths.push(path);
+  }
+  return paths;
+}
+function usesOf(module, local, skip, lib) {
+  const uses = [];
+  let blocked = false;
+  visit(module.program, [], (node, above) => {
+    if (blocked || node.type !== "Identifier" || node.name !== local || node === skip) return;
+    const parent = above[above.length - 1];
+    if (parent.type?.startsWith("Import") || parent.type === "TSTypeReference" || parent.type === "TSQualifiedName") return;
+    if (parent.type === "MemberExpression" && parent.property === node && !parent.computed) return;
+    if (parent.type === "OptionalMemberExpression" && parent.property === node && !parent.computed) return;
+    if (parent.type === "ObjectProperty" && parent.key === node && !parent.computed && !parent.shorthand) return;
+    const inner = above.slice(1);
+    const shadowed = inner.some((a) => scopeNames(a).includes(local));
+    const component = componentOf(above);
+    const stuck = parent.type === "TSTypeQuery" || parent.type?.startsWith("Export") || Boolean(parent.shorthand);
+    const inParams = component !== null && node.start < component.body.start;
+    if (shadowed || stuck || inParams || !component || tInScope(inner) || lib === "react-i18next" && component.async) blocked = true;
+    else uses.push({ module, node, local, component });
+  });
+  return blocked ? null : uses;
+}
+function allUses(data, modules, known, lib) {
+  const own = usesOf(data.module, data.name, data.declarator.id, lib);
+  if (!own) return null;
+  const uses = [...own];
+  for (const module of modules) {
+    if (module === data.module) continue;
+    for (const statement of module.program.body ?? []) {
+      if (statement.type !== "ImportDeclaration" || resolve3(module.path, String(statement.source.value), known) !== data.module.path) continue;
+      const specifier2 = (statement.specifiers ?? []).find((s) => s.type === "ImportSpecifier" && s.imported.name === data.name);
+      if (!specifier2) continue;
+      const found = usesOf(module, String(specifier2.local.name), null, lib);
+      if (!found) return null;
+      uses.push(...found);
+    }
+  }
+  return uses.length ? uses : null;
+}
+function parseModule({ path, text }) {
+  if (text.includes("use server")) return null;
+  const outcome = parseSourceOutcome7(path, text, path);
+  const block = "file" in outcome ? outcome.file.js[0] : void 0;
+  return block ? { path, text, base: block.offset, program: block.ast.program } : null;
+}
+function keyFor2(keys, stem, en) {
+  const known = keys.byText.get(`${stem}
+${en}`);
+  if (known) return { key: known, isNew: false };
+  const base = `${stem}.${keyWords(en)}`;
+  let key = base;
+  for (let n = 2; keys.used.has(key); n++) key = `${base}-${n}`;
+  keys.used.add(key);
+  keys.byText.set(`${stem}
+${en}`, key);
+  return { key, isNew: true };
+}
+function dataEdits(data, keys, entries) {
+  const { module, init, declarator, strings } = data;
+  const { base, text, path } = module;
+  const annotation = declarator.id.typeAnnotation;
+  const returns = annotation ? text.slice(base + annotation.start, base + annotation.end) : "";
+  const edits2 = [
+    { start: base + init.start, end: base + init.start, text: `(t: (key: string) => string)${returns} => (` },
+    { start: base + init.end, end: base + init.end, text: ")" },
+    ...annotation ? [{ start: base + annotation.start, end: base + annotation.end, text: "" }] : []
+  ];
+  const stem = stemOf(path);
+  for (const literal of strings) {
+    const en = String(literal.value);
+    const { key, isNew } = keyFor2(keys, stem, en);
+    if (isNew) entries.push({ key, en, ar: "", status: "pending", file: path, line: lineOf(text, base + literal.start) });
+    edits2.push({ start: base + literal.start, end: base + literal.end, text: `t('${key}')` });
+  }
+  return edits2;
+}
+function liftData(inputs, lib, taken) {
+  const modules = inputs.map(parseModule).filter((m) => m !== null);
+  const known = new Set(inputs.map((i) => normalize(i.path)));
+  const barred = new Set(modules.flatMap((m) => opaque(m, known)));
+  const reserved = literalTypes(modules);
+  const edits2 = /* @__PURE__ */ new Map();
+  const components = /* @__PURE__ */ new Map();
+  const entries = [];
+  const keys = { used: new Set(taken), byText: /* @__PURE__ */ new Map() };
+  const push = (module, more) => {
+    edits2.set(module, [...edits2.get(module) ?? [], ...more]);
+  };
+  let moved = 0;
+  for (const data of modules.filter((m) => !barred.has(normalize(m.path))).flatMap((m) => dataIn(m, reserved))) {
+    const uses = allUses(data, modules, known, lib);
+    if (!uses) continue;
+    push(data.module, dataEdits(data, keys, entries));
+    moved += data.strings.length;
+    for (const use of uses) {
+      push(use.module, [{ start: use.module.base + use.node.end, end: use.module.base + use.node.end, text: "(t)" }]);
+      components.set(use.module, (components.get(use.module) ?? /* @__PURE__ */ new Set()).add(use.component));
+    }
+  }
+  for (const [module, found] of components) {
+    const style = styleOf(module.program, module.text, module.base);
+    const hooks = [...found].map((fn) => hookEdits(fn, lib, module.text, module.base, style));
+    push(module, [...hooks.flatMap((h) => h.edits), ...importEdits(module.program, hooks.flatMap((h) => h.imports), module.base, style)]);
+  }
+  const texts = new Map([...edits2].map(([module, list]) => [module.path, applyEdits(module.text, list)]));
+  return { texts, entries, moved };
+}
+
 // src/rollback.ts
 import { rmSync } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 var ConvertFailedError = class extends Error {
   constructor(message, cause) {
     super(message);
@@ -2887,7 +3147,7 @@ async function rollBack(target, step, error) {
   const failed = `convert failed at ${step}: ${reasonOf(error)}.`;
   try {
     await resetHard(target.root);
-    for (const path of [...target.created].reverse()) rmSync(join8(target.root, path), { recursive: true, force: true });
+    for (const path of [...target.created].reverse()) rmSync(join9(target.root, path), { recursive: true, force: true });
     if (target.madeBranch) {
       await checkout(target.root, target.base);
       await deleteBranch(target.root, target.branch);
@@ -2976,9 +3236,12 @@ function transformAll(project, generated, taken) {
     css: physicalContext(root)
   };
   const out = { texts: /* @__PURE__ */ new Map(), edits: 0, byKind: { tailwind: 0, css: 0, markup: 0, strings: 0, formats: 0 }, perFile: /* @__PURE__ */ new Map(), flags: [], entries: [], skipped: [...walked.skipped] };
+  const lifted = lift(project, walked.files.filter((path) => !generated.has(path)), ctx.lib, used);
+  out.entries.push(...lifted.entries);
+  for (const entry of lifted.entries) used.add(entry.key);
   for (const path of walked.files) {
     if (generated.has(path)) continue;
-    const raw = readText(root, path);
+    const raw = lifted.texts.get(path) ?? readText(root, path);
     if (raw === null) {
       out.skipped.push({ file: path, reason: "unreadable" });
       continue;
@@ -2987,7 +3250,7 @@ function transformAll(project, generated, taken) {
       out.skipped.push({ file: path, reason: "minified" });
       continue;
     }
-    const result = runPasses(path, raw, join9(root, path), { ...ctx, taken: used });
+    const result = runPasses(path, raw, join10(root, path), { ...ctx, taken: used });
     if (result.kind === "skipped") {
       out.skipped.push({ file: path, reason: result.reason });
       continue;
@@ -2995,7 +3258,7 @@ function transformAll(project, generated, taken) {
     out.flags.push(...result.flags);
     out.entries.push(...result.entries);
     for (const entry of result.entries) used.add(entry.key);
-    if (result.edits === 0) continue;
+    if (result.edits === 0 && !lifted.texts.has(path)) continue;
     out.edits += result.edits;
     for (const kind of Object.keys(out.byKind)) out.byKind[kind] += result.byKind[kind];
     out.perFile.set(path, result.edits);
@@ -3003,6 +3266,13 @@ function transformAll(project, generated, taken) {
   }
   return out;
 }
+function lift(project, paths, lib, taken) {
+  const inputs = paths.flatMap((path) => {
+    const text = /\.[jt]sx?$/.test(path) ? readText(project.root, path) : null;
+    return text !== null && !text.startsWith(BOM) && !isMinified(text) ? [{ path, text }] : [];
+  });
+  return liftData(inputs, lib, taken);
+}
 function changedFiles(perFile, moved, wiring) {
   const total = /* @__PURE__ */ new Map();
   const add = (file, n) => {
@@ -3061,6 +3331,8 @@ async function convert(options, ioIn) {
   if (options.configAnswers) checkConfigAnswers(root, options.configFile);
   const io = options.configAnswers ? { ...ioIn, config: { ...ioIn.config, ...options.configAnswers } } : ioIn;
   const project = detectProject(root);
+  const library = rerun ? null : existingI18n(root);
+  if (library) throw new UnsupportedError(`This app already uses ${library}. Convert adds its own translation setup and the two collide, so nothing was changed. Convert supports apps with no translation library yet.`);
   const branch = branchFor(mode);
   const generated = new Set(state?.generated ?? []);
   const existing = readLedger(root);
@@ -3090,7 +3362,7 @@ async function convert(options, ioIn) {
 
 // src/finish.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync7 } from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 
 // src/match.ts
 import { PNG } from "pngjs";
@@ -3121,7 +3393,7 @@ function compare(a, b) {
 
 // src/finish-undo.ts
 import { rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 async function snapshot(root, paths) {
   const clean = new Set(await cleanAtHead(root, paths));
   return paths.map((path) => ({ path, clean: clean.has(path), text: clean.has(path) ? null : readText(root, path) }));
@@ -3130,8 +3402,8 @@ async function undo(root, saved, staged) {
   await restoreFromHead(root, saved.filter((s) => s.clean).map((s) => s.path));
   const dirty = saved.filter((s) => !s.clean);
   for (const { path, text } of dirty) {
-    if (text === null) rmSync2(join10(root, path), { force: true });
-    else writeFileSync6(join10(root, path), text);
+    if (text === null) rmSync2(join11(root, path), { force: true });
+    else writeFileSync6(join11(root, path), text);
   }
   await unstage(root, [.../* @__PURE__ */ new Set([...dirty.map((s) => s.path), ...staged])]);
 }
@@ -3234,7 +3506,8 @@ function english(data) {
 }
 function arabic(data) {
   const lines = data.arabic.map(
-    (p) => !Number.isFinite(p.errors) ? `- ${esc(p.route)}: the check returned no result` : `- ${esc(p.route)}: score ${p.score}, ${plural(p.errors, "error", "errors")}, ${plural(p.warnings, "warning", "warnings")}`
+    (p) => !Number.isFinite(p.errors) ? `- ${esc(p.route)}: ${esc(p.problems?.[0] ?? "the check returned no result")}` : `- ${esc(p.route)}: score ${p.score}, ${plural(p.errors, "error", "errors")}, ${plural(p.warnings, "warning", "warnings")}${(p.problems ?? []).map((m) => `
+  - ${esc(m)}`).join("")}`
   );
   return section("Arabic pages", lines, "No pages were checked.");
 }
@@ -3309,7 +3582,7 @@ function writeMessages(root, ledger) {
   for (const [path, text] of Object.entries(messagesFiles(ledger))) writeText(disk, path, mergedMessages(root, path, text));
 }
 function mergedMessages(root, path, generated) {
-  const full = join11(root, path);
+  const full = join12(root, path);
   if (!existsSync8(full)) return generated;
   try {
     const existing = JSON.parse(readFileSync7(full, "utf8"));
@@ -3324,7 +3597,7 @@ async function englishChecks(root, base, routes, shoot) {
   const noBaseline = [];
   for (const route of routes) {
     for (const width of WIDTHS) {
-      const file = join11(root, baselinePath(route, width));
+      const file = join12(root, baselinePath(route, width));
       if (!existsSync8(file)) {
         noBaseline.push({ route, width });
         continue;
@@ -3334,8 +3607,8 @@ async function englishChecks(root, base, routes, shoot) {
       let diffPath;
       if (ratio >= MAX_DIFF_RATIO) {
         diffPath = `${DIFF_DIR}/${routeSlug(route)}-${width}.png`;
-        mkdirSync5(join11(root, DIFF_DIR), { recursive: true });
-        writeFileSync7(join11(root, diffPath), diff);
+        mkdirSync5(join12(root, DIFF_DIR), { recursive: true });
+        writeFileSync7(join12(root, diffPath), diff);
       }
       english2.push({ route, width, ratio, ...diffPath ? { diffPath } : {} });
     }
@@ -3350,11 +3623,21 @@ async function arabicChecks(project, state, base, routes, audit) {
       const result = await audit(`${base}${path}`, width, options);
       const usable = result && Number.isFinite(result.errors);
       const failed = { score: Number.NaN, errors: Number.NaN, warnings: Number.NaN };
-      arabic2.push({ route: `${path} at ${width}px`, ...usable ? result : failed });
+      arabic2.push({ route: `${path} at ${width}px`, ...usable ? result : { ...failed, ...result?.problems ? { problems: result.problems } : {} } });
     }
   }
   return arabic2;
 }
+function closedAtBaseline(root) {
+  const path = join12(root, CLOSED_FILE);
+  if (!existsSync8(path)) return /* @__PURE__ */ new Set();
+  try {
+    const routes = JSON.parse(readFileSync7(path, "utf8"));
+    return new Set(Array.isArray(routes) ? routes.filter((r) => typeof r === "string") : []);
+  } catch {
+    return /* @__PURE__ */ new Set();
+  }
+}
 async function runChecks(project, state, routes, { config, shoot, audit }, step) {
   const { start: cmd } = config;
   if (!cmd || !shoot) throw new RefusedError(NEEDS_BROWSER);
@@ -3365,8 +3648,13 @@ async function runChecks(project, state, routes, { config, shoot, audit }, step)
   });
   try {
     step.name = "checking the pages";
-    const english2 = state.mode === "bilingual" ? await englishChecks(project.root, server.url, routes, shoot) : { english: [], noBaseline: [] };
-    return { ...english2, arabic: await arabicChecks(project, state, server.url, routes, audit) };
+    const closed = await closedRoutes(server.url, routes);
+    const shut = new Set(closed.map((c) => c.route));
+    const open = routes.filter((route) => !shut.has(route));
+    const before = closedAtBaseline(project.root);
+    const compared = routes.filter((route) => !(shut.has(route) && before.has(route)));
+    const english2 = state.mode === "bilingual" ? await englishChecks(project.root, server.url, compared, shoot) : { english: [], noBaseline: [] };
+    return { ...english2, closed, arabic: await arabicChecks(project, state, server.url, open, audit) };
   } finally {
     await server.stop();
   }
@@ -3407,21 +3695,21 @@ async function run(ready, step) {
     ledger,
     ...checks,
     ...earlier ? {} : { summaryMissing: true },
-    unreachable,
+    unreachable: [...unreachable, ...checks.closed],
     remainingLint,
     ...tests2 ? { tests: { code: tests2.code, tail: tail(tests2.out) } } : {}
   };
-  writeFileSync7(join11(root, REPORT_FILE), renderConvertReport(data));
+  writeFileSync7(join12(root, REPORT_FILE), renderConvertReport(data));
   step.name = "saving the state";
   saveState(root, { ...state, phase: "finished" });
   step.name = "saving your answers";
   if (options.configAnswers) writeConfigAnswers({ root, created: [] }, options.configAnswers, configFile);
   step.name = "committing";
-  await stage(root, own.filter((p) => (p !== configFile || options.configAnswers) && existsSync8(join11(root, p))));
+  await stage(root, own.filter((p) => (p !== configFile || options.configAnswers) && existsSync8(join12(root, p))));
   if ((await stagedFiles(root)).length) await commit(root, `dualkit: finish ${state.mode} conversion`);
   const checked = checks.arabic.length > 0;
   const passed = checked && checks.english.every((p) => p.ratio < MAX_DIFF_RATIO) && checks.arabic.every((p) => p.errors === 0) && (tests2?.code ?? 0) === 0;
-  return { reportPath: join11(root, REPORT_FILE), passed };
+  return { reportPath: join12(root, REPORT_FILE), passed };
 }
 async function finish(options, ioIn) {
   const ready = await prepare(options, ioIn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dualkit/convert",
-  "version": "0.3.0-beta.0",
+  "version": "0.5.0-beta.0",
   "description": "Converts an English React or Next.js app to Arabic on a new git branch.",
   "license": "MIT",
   "type": "module",