@gregorlohaus/tdir 0.1.6 → 0.1.8

package/README.md

@@ -60,6 +60,7 @@ render("./output", {
 |---|---|
 | `<@if(context.x)>` | Conditional block — boolean check (must end with `<@endif>`) |
 | `<@if(eq(context.x,"value"))>` | Conditional block — string equality check |
+| `<@if(neq(context.x,"value"))>` | Conditional block — string inequality check |
 | `<@elseif(context.y)>` | Else-if branch (same forms as `@if`) |
 | `<@else>` | Else branch |
 | `<@endif>` | End conditional block |
@@ -72,6 +73,7 @@ render("./output", {
 |---|---|
 | `<@if(context.x)>dirname` | Conditionally include directory/file (boolean check) |
 | `<@if(eq(context.x,"value"))>dirname` | Conditionally include by string equality |
+| `<@if(neq(context.x,"value"))>dirname` | Conditionally include by string inequality |
 | `<@var(context.x)>` | Dynamic directory/file name |
 
 These can be combined: `<@if(context.web.create)><@var(context.web.dir)>` creates a directory named by `context.web.dir` only if `context.web.create` is true.

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

@@ -8,14 +8,14 @@ import { TextDecoder } from "node:util";
 var IF_RE = /<@(?:if|elseif)\((.+?)\)>/g;
 var VAR_RE = /<@var\(context\.(.+?)(?::(\w+))?\)>/g;
 var DIRECTIVE_RE = /<@(if|elseif|else|endif)(?:\((.+?)\))?>/g;
-var EQ_RE = /^eq\(context\.(.+?),\s*"(.*)"\)$/;
+var STRING_COMPARE_RE = /^(?:eq|neq)\(context\.(.+?),\s*"(.*)"\)$/;
 var PATH_RE = /^context\.(.+)$/;
 function extractCondition(expr, vars) {
   if (!expr)
     throw new Error("Missing condition expression");
-  const eqMatch = expr.match(EQ_RE);
-  if (eqMatch) {
-    vars.push({ path: eqMatch[1], type: "string" });
+  const stringCompareMatch = expr.match(STRING_COMPARE_RE);
+  if (stringCompareMatch) {
+    vars.push({ path: stringCompareMatch[1], type: "string" });
     return;
   }
   const pathMatch = expr.match(PATH_RE);
@@ -122,14 +122,15 @@ import { TextDecoder as TextDecoder2 } from "node:util";
 var IF_PATH_RE = /^<@if\((.+?)\)>(.*)$/;
 var VAR_RE2 = /<@var\(context\.(.+?)(?::(\w+))?\)>/g;
 var DIRECTIVE_RE2 = /<@(if|elseif|else|endif)(?:\((.+?)\))?>/g;
-var EQ_RE2 = /^eq\(context\.(.+?),\s*"(.*)"\)$/;
+var STRING_COMPARE_RE2 = /^(eq|neq)\(context\.(.+?),\s*"(.*)"\)$/;
 var PATH_RE2 = /^context\.(.+)$/;
 function evalCondition(expr, context) {
   if (!expr)
     throw new Error("Missing condition expression");
-  const eqMatch = expr.match(EQ_RE2);
-  if (eqMatch) {
-    return resolveContext(context, eqMatch[1]) === eqMatch[2];
+  const stringCompareMatch = expr.match(STRING_COMPARE_RE2);
+  if (stringCompareMatch) {
+    const result = resolveContext(context, stringCompareMatch[2]) === stringCompareMatch[3];
+    return stringCompareMatch[1] === "eq" ? result : !result;
   }
   const pathMatch = expr.match(PATH_RE2);
   if (pathMatch) {
@@ -186,6 +187,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 +350,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 +699,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 +781,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 +848,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.8",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",