@gregorlohaus/tdir 0.1.1 → 0.1.2

package/README.md

@@ -58,8 +58,9 @@ render("./output", {
 
 | Directive | Description |
 |---|---|
-| `<@if(context.x)>` | Conditional block (must end with `<@endif>`) |
-| `<@elseif(context.y)>` | Else-if branch |
+| `<@if(context.x)>` | Conditional block — truthy check (must end with `<@endif>`) |
+| `<@if(eq(context.x,"value"))>` | Conditional block — string equality check |
+| `<@elseif(context.y)>` | Else-if branch (same forms as `@if`) |
 | `<@else>` | Else branch |
 | `<@endif>` | End conditional block |
 | `<@var(context.x)>` | Substitute with context value (default type: `string`) |
@@ -69,7 +70,8 @@ render("./output", {
 
 | Directive | Description |
 |---|---|
-| `<@if(context.x)>dirname` | Conditionally include directory/file |
+| `<@if(context.x)>dirname` | Conditionally include directory/file (truthy check) |
+| `<@if(eq(context.x,"value"))>dirname` | Conditionally include by string equality |
 | `<@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.
@@ -117,6 +119,10 @@ render("./output", { web: "not a boolean", header: { show: true, title: "Hi" } }
 // ZodError: expected boolean, received string at "web"
 ```
 
+## Re-rendering
+
+`render(target, context)` clears `target` before writing, so rendering the same template into the same directory with different contexts always produces a clean result (files/paths excluded by conditionals won't linger from a previous run).
+
 ## Unmatched directives
 
 A `<@if>` without a matching `<@endif>` throws at render time:

package/dist/index.js

@@ -1,14 +1,24 @@
-// index.ts
-import { z } from "zod";
-
 // parser.ts
 import { readdirSync, statSync, readFileSync } from "node:fs";
 import { join } from "node:path";
-var IF_RE = /<@if\(context\.(.+?)\)>/g;
+var IF_RE = /<@(?:if|elseif)\((.+?)\)>/g;
 var VAR_RE = /<@var\(context\.(.+?)(?::(\w+))?\)>/g;
+var EQ_RE = /^eq\(context\.(.+?),\s*"(.*)"\)$/;
+var PATH_RE = /^context\.(.+)$/;
+function extractCondition(expr, vars) {
+  const eqMatch = expr.match(EQ_RE);
+  if (eqMatch) {
+    vars.push({ path: eqMatch[1], type: "string" });
+    return;
+  }
+  const pathMatch = expr.match(PATH_RE);
+  if (pathMatch) {
+    vars.push({ path: pathMatch[1], type: "boolean" });
+  }
+}
 function extractFromString(text, vars) {
   for (const match of text.matchAll(IF_RE)) {
-    vars.push({ path: match[1], type: "boolean" });
+    extractCondition(match[1], vars);
   }
   for (const match of text.matchAll(VAR_RE)) {
     vars.push({ path: match[1], type: match[2] ?? "string" });
@@ -42,11 +52,24 @@ function parse(dirPath) {
 }
 
 // render.ts
-import { readdirSync as readdirSync2, statSync as statSync2, readFileSync as readFileSync2, mkdirSync, writeFileSync } from "node:fs";
+import { readdirSync as readdirSync2, statSync as statSync2, readFileSync as readFileSync2, mkdirSync, writeFileSync, rmSync } from "node:fs";
 import { join as join2 } from "node:path";
-var IF_PATH_RE = /^<@if\(context\.(.+?)\)>(.*)$/;
+var IF_PATH_RE = /^<@if\((.+?)\)>(.*)$/;
 var VAR_RE2 = /<@var\(context\.(.+?)(?::(\w+))?\)>/g;
-var DIRECTIVE_RE = /<@(if|elseif|else|endif)(?:\(context\.(.+?)\))?>/g;
+var DIRECTIVE_RE = /<@(if|elseif|else|endif)(?:\((.+?)\))?>/g;
+var EQ_RE2 = /^eq\(context\.(.+?),\s*"(.*)"\)$/;
+var PATH_RE2 = /^context\.(.+)$/;
+function evalCondition(expr, context) {
+  const eqMatch = expr.match(EQ_RE2);
+  if (eqMatch) {
+    return resolve(context, eqMatch[1]) === eqMatch[2];
+  }
+  const pathMatch = expr.match(PATH_RE2);
+  if (pathMatch) {
+    return !!resolve(context, pathMatch[1]);
+  }
+  throw new Error(`Invalid condition expression: ${expr}`);
+}
 function resolve(context, path) {
   const segments = path.split(".");
   let current = context;
@@ -72,7 +95,7 @@ function processIfBlocks(content, context) {
     if (directive === "if") {
       if (isEmitting())
         result += content.slice(pos, match.index);
-      const truthy = !!resolve(context, condPath);
+      const truthy = evalCondition(condPath, context);
       stack.push({ matched: truthy, active: truthy });
       pos = re.lastIndex;
     } else if (directive === "elseif") {
@@ -84,7 +107,7 @@ function processIfBlocks(content, context) {
       if (top.matched) {
         top.active = false;
       } else {
-        const truthy = !!resolve(context, condPath);
+        const truthy = evalCondition(condPath, context);
         top.matched = truthy;
         top.active = truthy;
       }
@@ -120,6 +143,10 @@ function renderContent(content, context) {
   });
 }
 function renderDir(srcDir, destDir, context) {
+  rmSync(destDir, { recursive: true, force: true });
+  renderDirInner(srcDir, destDir, context);
+}
+function renderDirInner(srcDir, destDir, context) {
   mkdirSync(destDir, { recursive: true });
   const entries = readdirSync2(srcDir).sort();
   for (const entry of entries) {
@@ -128,8 +155,7 @@ function renderDir(srcDir, destDir, context) {
     const ifMatch = entry.match(IF_PATH_RE);
     let outputName = entry;
     if (ifMatch) {
-      const conditionPath = ifMatch[1];
-      if (!resolve(context, conditionPath))
+      if (!evalCondition(ifMatch[1], context))
         continue;
       outputName = ifMatch[2];
     }
@@ -138,7 +164,7 @@ function renderDir(srcDir, destDir, context) {
     });
     const destPath = join2(destDir, outputName);
     if (stat.isDirectory()) {
-      renderDir(srcPath, destPath, context);
+      renderDirInner(srcPath, destPath, context);
     } else {
       mkdirSync(destDir, { recursive: true });
       const content = readFileSync2(srcPath, "utf-8");

package/package.json

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