@gregorlohaus/tdir 0.1.6 → 0.1.7

package/dist/cli.js

@@ -199,6 +199,16 @@ function writeSkippedTemplate(templateRoot, skipped) {
   writeFileSync(templatePath, content);
   return 1;
 }
+function replaceFlatTokens(content, manifest) {
+  const entries = Object.entries(manifest.tokens).filter(([, tokens]) => tokens.length > 0).sort(([a], [b]) => b.length - a.length);
+  let result = content;
+  for (const [rendered, tokens] of entries) {
+    if (rendered === "")
+      continue;
+    result = result.split(rendered).join(tokens[0]);
+  }
+  return result;
+}
 function dirnamePath(path) {
   const normalized = normalizePath(path);
   const index = normalized.lastIndexOf("/");
@@ -271,13 +281,18 @@ function walkFiles(root, excludedRoots = []) {
   }
   return files;
 }
-function copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap) {
+function copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest) {
   let filesWritten = 0;
   for (const outputPath of includedOutputPaths) {
     const renderedPath = resolveInside(renderedRoot, outputPath);
     const templatePath = resolveInside(templateRoot, inferTemplatePath(outputPath, directoryMap));
     mkdirSync(dirname(templatePath), { recursive: true });
-    copyFileSync(renderedPath, templatePath);
+    const content = readFileSync(renderedPath);
+    if (isUtf8Text(content)) {
+      writeFileSync(templatePath, replaceFlatTokens(content.toString("utf-8"), manifest));
+    } else {
+      copyFileSync(renderedPath, templatePath);
+    }
     filesWritten += 1;
   }
   return filesWritten;
@@ -333,7 +348,7 @@ function reverseDir(renderedDir, templateDir, options = {}) {
   for (const skipped of manifest.skipped ?? []) {
     filesWritten += writeSkippedTemplate(templateRoot, skipped);
   }
-  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap);
+  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest);
   return { filesWritten, warnings };
 }
 

package/dist/index.js

@@ -186,6 +186,14 @@ function addReverseMapToken(state, file, token) {
     tokens.push(token.token);
   state.manifest.tokens[token.result] = tokens;
 }
+function addFlatToken(state, result, token) {
+  if (!state?.manifest)
+    return;
+  const tokens = state.manifest.tokens[result] ?? [];
+  if (!tokens.includes(token))
+    tokens.push(token);
+  state.manifest.tokens[result] = tokens;
+}
 function getReverseMapPath(destRoot, reverseMap) {
   if (reverseMap === true)
     return resolveOutputPath(destRoot, ".tdir-map.json");
@@ -341,6 +349,11 @@ function processIfBlocksWithMap(content, context) {
   };
 }
 function renderContentWithMap(content, context, state, file) {
+  for (const match of content.matchAll(VAR_RE2)) {
+    const token = match[0];
+    const path = match[1];
+    addFlatToken(state, String(resolveContext(context, path) ?? ""), token);
+  }
   const processedResult = processIfBlocksWithMap(content, context);
   const processed = processedResult.content;
   for (const token of processedResult.conditionalTokens) {
@@ -685,6 +698,16 @@ function writeSkippedTemplate(templateRoot, skipped) {
   writeFileSync2(templatePath, content);
   return 1;
 }
+function replaceFlatTokens(content, manifest) {
+  const entries = Object.entries(manifest.tokens).filter(([, tokens]) => tokens.length > 0).sort(([a], [b]) => b.length - a.length);
+  let result = content;
+  for (const [rendered, tokens] of entries) {
+    if (rendered === "")
+      continue;
+    result = result.split(rendered).join(tokens[0]);
+  }
+  return result;
+}
 function dirnamePath(path) {
   const normalized = normalizePath(path);
   const index = normalized.lastIndexOf("/");
@@ -757,13 +780,18 @@ function walkFiles(root, excludedRoots = []) {
   }
   return files;
 }
-function copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap) {
+function copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest) {
   let filesWritten = 0;
   for (const outputPath of includedOutputPaths) {
     const renderedPath = resolveInside(renderedRoot, outputPath);
     const templatePath = resolveInside(templateRoot, inferTemplatePath(outputPath, directoryMap));
     mkdirSync2(dirname2(templatePath), { recursive: true });
-    copyFileSync2(renderedPath, templatePath);
+    const content = readFileSync3(renderedPath);
+    if (isUtf8Text3(content)) {
+      writeFileSync2(templatePath, replaceFlatTokens(content.toString("utf-8"), manifest));
+    } else {
+      copyFileSync2(renderedPath, templatePath);
+    }
     filesWritten += 1;
   }
   return filesWritten;
@@ -819,7 +847,7 @@ function reverseDir(renderedDir, templateDir, options = {}) {
   for (const skipped of manifest.skipped ?? []) {
     filesWritten += writeSkippedTemplate(templateRoot, skipped);
   }
-  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap);
+  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest);
   return { filesWritten, warnings };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gregorlohaus/tdir",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",