@gregorlohaus/tdir 0.1.5 → 0.1.7

package/README.md

@@ -225,6 +225,14 @@ reverseDir("./output", "./templates", {
 
 The command writes files at their original template paths, restores recorded `<@var(...)>` tokens, wraps edited inline conditional output back in the original conditional block, and restores template files that were skipped by path conditionals.
 
+The template output directory may be inside the rendered directory, for example:
+
+```sh
+tdir reverse ./ ./reversed --include "components/**"
+```
+
+When the template output directory is inside the rendered directory, reverse snapshots included files before writing and excludes the output directory from include glob matching.
+
 ## Unmatched directives
 
 A `<@if>` without a matching `<@endif>` throws when the renderer is initialized:

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("/");
@@ -252,47 +262,58 @@ function inferTemplatePath(outputPath, directoryMap) {
   const suffix = bestOutputDir === "" ? outputDir : outputDir.slice(bestOutputDir.length).replace(/^\//, "");
   return joinPath(bestTemplateDir, suffix, basenamePath(normalized));
 }
-function walkFiles(root, current = root) {
+function walkFiles(root, excludedRoots = []) {
   const files = [];
-  for (const entry of readdirSync(current).sort()) {
-    const path = resolvePath(current, entry);
-    const stat = statSync(path);
-    if (stat.isDirectory()) {
-      files.push(...walkFiles(root, path));
-    } else if (stat.isFile()) {
-      files.push(normalizePath(relative(root, path)));
+  const pending = [root];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    for (const entry of readdirSync(current).sort()) {
+      const path = resolvePath(current, entry);
+      if (excludedRoots.some((excluded) => isInsidePath(excluded, path)))
+        continue;
+      const stat = statSync(path);
+      if (stat.isDirectory()) {
+        pending.push(path);
+      } else if (stat.isFile()) {
+        files.push(normalizePath(relative(root, path)));
+      }
     }
   }
   return files;
 }
-function copyIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, include) {
-  const matchers = getIncludeMatchers(include);
-  if (matchers.length === 0)
-    return 0;
-  const mappedOutputPaths = new Set(manifest.files.map((file) => normalizePath(file.outputPath)));
-  const mapRelativePath = normalizePath(relative(renderedRoot, mapPath));
-  const directoryMap = buildDirectoryMap(manifest);
+function copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest) {
   let filesWritten = 0;
-  for (const outputPath of walkFiles(renderedRoot)) {
-    if (outputPath === mapRelativePath)
-      continue;
-    if (mappedOutputPaths.has(outputPath))
-      continue;
-    if (!matchesAny(outputPath, matchers))
-      continue;
+  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;
 }
+function getIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, include) {
+  const matchers = getIncludeMatchers(include);
+  if (matchers.length === 0)
+    return [];
+  const mappedOutputPaths = new Set(manifest.files.map((file) => normalizePath(file.outputPath)));
+  const mapRelativePath = normalizePath(relative(renderedRoot, mapPath));
+  return walkFiles(renderedRoot, [templateRoot]).filter((outputPath) => {
+    return outputPath !== mapRelativePath && !mappedOutputPaths.has(outputPath) && matchesAny(outputPath, matchers);
+  });
+}
 function reverseDir(renderedDir, templateDir, options = {}) {
   const renderedRoot = resolvePath(renderedDir);
   const templateRoot = resolvePath(templateDir);
   const mapPath = options.mapPath ? resolvePath(renderedRoot, options.mapPath) : resolvePath(renderedRoot, ".tdir-map.json");
   const manifest = readManifest(mapPath);
+  const directoryMap = buildDirectoryMap(manifest);
+  const includedOutputPaths = getIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, options.include);
   const warnings = [];
   let filesWritten = 0;
   for (const file of manifest.files) {
@@ -327,7 +348,7 @@ function reverseDir(renderedDir, templateDir, options = {}) {
   for (const skipped of manifest.skipped ?? []) {
     filesWritten += writeSkippedTemplate(templateRoot, skipped);
   }
-  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, options.include);
+  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("/");
@@ -738,47 +761,58 @@ function inferTemplatePath(outputPath, directoryMap) {
   const suffix = bestOutputDir === "" ? outputDir : outputDir.slice(bestOutputDir.length).replace(/^\//, "");
   return joinPath(bestTemplateDir, suffix, basenamePath(normalized));
 }
-function walkFiles(root, current = root) {
+function walkFiles(root, excludedRoots = []) {
   const files = [];
-  for (const entry of readdirSync3(current).sort()) {
-    const path = resolvePath2(current, entry);
-    const stat = statSync3(path);
-    if (stat.isDirectory()) {
-      files.push(...walkFiles(root, path));
-    } else if (stat.isFile()) {
-      files.push(normalizePath(relative2(root, path)));
+  const pending = [root];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    for (const entry of readdirSync3(current).sort()) {
+      const path = resolvePath2(current, entry);
+      if (excludedRoots.some((excluded) => isInsidePath2(excluded, path)))
+        continue;
+      const stat = statSync3(path);
+      if (stat.isDirectory()) {
+        pending.push(path);
+      } else if (stat.isFile()) {
+        files.push(normalizePath(relative2(root, path)));
+      }
     }
   }
   return files;
 }
-function copyIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, include) {
-  const matchers = getIncludeMatchers(include);
-  if (matchers.length === 0)
-    return 0;
-  const mappedOutputPaths = new Set(manifest.files.map((file) => normalizePath(file.outputPath)));
-  const mapRelativePath = normalizePath(relative2(renderedRoot, mapPath));
-  const directoryMap = buildDirectoryMap(manifest);
+function copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest) {
   let filesWritten = 0;
-  for (const outputPath of walkFiles(renderedRoot)) {
-    if (outputPath === mapRelativePath)
-      continue;
-    if (mappedOutputPaths.has(outputPath))
-      continue;
-    if (!matchesAny(outputPath, matchers))
-      continue;
+  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;
 }
+function getIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, include) {
+  const matchers = getIncludeMatchers(include);
+  if (matchers.length === 0)
+    return [];
+  const mappedOutputPaths = new Set(manifest.files.map((file) => normalizePath(file.outputPath)));
+  const mapRelativePath = normalizePath(relative2(renderedRoot, mapPath));
+  return walkFiles(renderedRoot, [templateRoot]).filter((outputPath) => {
+    return outputPath !== mapRelativePath && !mappedOutputPaths.has(outputPath) && matchesAny(outputPath, matchers);
+  });
+}
 function reverseDir(renderedDir, templateDir, options = {}) {
   const renderedRoot = resolvePath2(renderedDir);
   const templateRoot = resolvePath2(templateDir);
   const mapPath = options.mapPath ? resolvePath2(renderedRoot, options.mapPath) : resolvePath2(renderedRoot, ".tdir-map.json");
   const manifest = readManifest(mapPath);
+  const directoryMap = buildDirectoryMap(manifest);
+  const includedOutputPaths = getIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, options.include);
   const warnings = [];
   let filesWritten = 0;
   for (const file of manifest.files) {
@@ -813,7 +847,7 @@ function reverseDir(renderedDir, templateDir, options = {}) {
   for (const skipped of manifest.skipped ?? []) {
     filesWritten += writeSkippedTemplate(templateRoot, skipped);
   }
-  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, mapPath, manifest, options.include);
+  filesWritten += copyIncludedRenderedFiles(renderedRoot, templateRoot, includedOutputPaths, directoryMap, manifest);
   return { filesWritten, warnings };
 }
 

package/package.json

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