@trustless-work/blocks 0.0.7 → 0.0.8

package/bin/index.js

@@ -220,20 +220,211 @@ function parseFlags(argv) {
 
 function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
   const srcFile = path.join(TEMPLATES_DIR, `${name}.tsx`);
-  const srcDir = path.join(TEMPLATES_DIR, name);
+  const requestedDir = path.join(TEMPLATES_DIR, name);
+  let srcDir = null;
+  if (fs.existsSync(requestedDir) && fs.lstatSync(requestedDir).isDirectory()) {
+    srcDir = requestedDir;
+  } else {
+    // Alias: allow multi-release/approve-milestone to fallback to existing source
+    if (name.startsWith("escrows/multi-release/approve-milestone")) {
+      const altMulti = path.join(
+        TEMPLATES_DIR,
+        "escrows",
+        "multi-release",
+        "approve-milestone"
+      );
+      const altSingle = path.join(
+        TEMPLATES_DIR,
+        "escrows",
+        "single-release",
+        "approve-milestone"
+      );
+      if (fs.existsSync(altMulti) && fs.lstatSync(altMulti).isDirectory()) {
+        srcDir = altMulti;
+      } else if (
+        fs.existsSync(altSingle) &&
+        fs.lstatSync(altSingle).isDirectory()
+      ) {
+        srcDir = altSingle;
+      }
+    }
+  }
   const outRoot = path.join(PROJECT_ROOT, "src", "components", "tw-blocks");
 
   const config = loadConfig();
   const effectiveUiBase = uiBase || config.uiBase || "@/components/ui";
+  let currentEscrowType = null;
 
   function writeTransformed(srcPath, destPath) {
     const raw = fs.readFileSync(srcPath, "utf8");
-    const transformed = raw.replaceAll("__UI_BASE__", effectiveUiBase);
+    let transformed = raw.replaceAll("__UI_BASE__", effectiveUiBase);
+    // Resolve details placeholders to either multi-release modules (if present) or local compat
+    const applyDetailsPlaceholders = (content) => {
+      const resolveImport = (segments, compatFile) => {
+        const realWithExt = path.join(
+          outRoot,
+          "escrows",
+          "multi-release",
+          ...segments
+        );
+        const realCandidate = [
+          realWithExt,
+          realWithExt + ".tsx",
+          realWithExt + ".ts",
+          realWithExt + ".jsx",
+          realWithExt + ".js",
+        ].find((p) => fs.existsSync(p));
+        const realNoExt = realCandidate
+          ? realCandidate.replace(/\.(tsx|ts|jsx|js)$/i, "")
+          : null;
+        const compatWithExt = path.join(
+          path.dirname(destPath),
+          "compat",
+          compatFile
+        );
+        const compatCandidate = [
+          compatWithExt,
+          compatWithExt + ".tsx",
+          compatWithExt + ".ts",
+          compatWithExt + ".jsx",
+          compatWithExt + ".js",
+        ].find((p) => fs.existsSync(p));
+        const compatNoExt = (compatCandidate || compatWithExt).replace(
+          /\.(tsx|ts|jsx|js)$/i,
+          ""
+        );
+        const target = realNoExt || compatNoExt;
+        let rel = path.relative(path.dirname(destPath), target);
+        rel = rel.split(path.sep).join("/");
+        if (!rel.startsWith(".")) rel = "./" + rel;
+        return rel;
+      };
+      return content
+        .replaceAll(
+          "__MR_RELEASE_MODULE__",
+          resolveImport(
+            ["release-escrow", "button", "ReleaseEscrow"],
+            "ReleaseEscrow"
+          )
+        )
+        .replaceAll(
+          "__MR_DISPUTE_MODULE__",
+          resolveImport(
+            ["dispute-escrow", "button", "DisputeEscrow"],
+            "DisputeEscrow"
+          )
+        )
+        .replaceAll(
+          "__MR_RESOLVE_MODULE__",
+          resolveImport(
+            ["resolve-dispute", "dialog", "ResolveDispute"],
+            "ResolveDispute"
+          )
+        );
+    };
+    transformed = applyDetailsPlaceholders(transformed);
+    if (currentEscrowType) {
+      transformed = transformed.replaceAll(
+        "__ESCROW_TYPE__",
+        currentEscrowType
+      );
+    }
     fs.mkdirSync(path.dirname(destPath), { recursive: true });
     fs.writeFileSync(destPath, transformed, "utf8");
     console.log(`✅ ${path.relative(PROJECT_ROOT, destPath)} created`);
   }
 
+  // Generic: materialize any module from templates/escrows/shared/<module>
+  if (!srcDir) {
+    const m = name.match(
+      /^escrows\/(single-release|multi-release)\/([^\/]+)(?:\/(button|dialog|form))?$/
+    );
+    if (m) {
+      const releaseType = m[1];
+      const moduleName = m[2];
+      const variant = m[3] || null;
+
+      const sharedModuleDir = path.join(
+        TEMPLATES_DIR,
+        "escrows",
+        "shared",
+        moduleName
+      );
+
+      if (
+        fs.existsSync(sharedModuleDir) &&
+        fs.lstatSync(sharedModuleDir).isDirectory()
+      ) {
+        currentEscrowType = releaseType;
+        const destBase = path.join(outRoot, "escrows", releaseType, moduleName);
+
+        function copyModuleRootFilesInto(targetDir) {
+          const entries = fs.readdirSync(sharedModuleDir, {
+            withFileTypes: true,
+          });
+          for (const entry of entries) {
+            if (entry.isDirectory()) continue;
+            if (!/\.(tsx?|jsx?)$/i.test(entry.name)) continue;
+            const entrySrc = path.join(sharedModuleDir, entry.name);
+            const entryDest = path.join(targetDir, entry.name);
+            writeTransformed(entrySrc, entryDest);
+          }
+        }
+
+        function copyVariant(variantName) {
+          const variantSrc = path.join(sharedModuleDir, variantName);
+          const variantDest = path.join(destBase, variantName);
+          fs.mkdirSync(variantDest, { recursive: true });
+          if (
+            fs.existsSync(variantSrc) &&
+            fs.lstatSync(variantSrc).isDirectory()
+          ) {
+            const stack = [""];
+            while (stack.length) {
+              const rel = stack.pop();
+              const current = path.join(variantSrc, rel);
+              const entries = fs.readdirSync(current, { withFileTypes: true });
+              for (const entry of entries) {
+                const entryRel = path.join(rel, entry.name);
+                const entrySrc = path.join(variantSrc, entryRel);
+                const entryDest = path.join(variantDest, entryRel);
+                if (entry.isDirectory()) {
+                  stack.push(entryRel);
+                  continue;
+                }
+                if (/\.(tsx?|jsx?)$/i.test(entry.name)) {
+                  writeTransformed(entrySrc, entryDest);
+                } else {
+                  fs.mkdirSync(path.dirname(entryDest), { recursive: true });
+                  fs.copyFileSync(entrySrc, entryDest);
+                  console.log(
+                    `✅ ${path.relative(PROJECT_ROOT, entryDest)} created`
+                  );
+                }
+              }
+            }
+          }
+          // Always place module-level shared files into the variant directory
+          copyModuleRootFilesInto(variantDest);
+        }
+
+        if (variant) {
+          copyVariant(variant);
+        } else {
+          const variants = ["button", "dialog", "form"];
+          for (const v of variants) copyVariant(v);
+        }
+
+        if (shouldInstall && fs.existsSync(GLOBAL_DEPS_FILE)) {
+          const meta = JSON.parse(fs.readFileSync(GLOBAL_DEPS_FILE, "utf8"));
+          installDeps(meta);
+        }
+        currentEscrowType = null;
+        return;
+      }
+    }
+  }
+
   if (fs.existsSync(srcDir) && fs.lstatSync(srcDir).isDirectory()) {
     const skipDetails =
       name === "escrows/escrows-by-role" ||
@@ -326,17 +517,20 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
     }
 
     try {
-      const isSingleReleaseInitRoot =
-        name === "escrows/single-release/approve-milestone";
-      const isSingleReleaseInitDialog =
+      const isSRRoot = name === "escrows/single-release/approve-milestone";
+      const isSRDialog =
         name === "escrows/single-release/approve-milestone/dialog";
-      const isSingleReleaseInitForm =
-        name === "escrows/single-release/approve-milestone/form";
+      const isSRForm = name === "escrows/single-release/approve-milestone/form";
+
+      const isMRRoot = name === "escrows/multi-release/approve-milestone";
+      const isMRDialog =
+        name === "escrows/multi-release/approve-milestone/dialog";
+      const isMRForm = name === "escrows/multi-release/approve-milestone/form";
 
       const srcSharedDir = path.join(
         TEMPLATES_DIR,
         "escrows",
-        "single-release",
+        "shared",
         "approve-milestone",
         "shared"
       );
@@ -352,12 +546,12 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
         }
       }
 
-      if (isSingleReleaseInitRoot) {
+      if (isSRRoot || isMRRoot) {
         copySharedInto(path.join(destDir, "dialog"));
         copySharedInto(path.join(destDir, "form"));
-      } else if (isSingleReleaseInitDialog) {
+      } else if (isSRDialog || isMRDialog) {
         copySharedInto(destDir);
-      } else if (isSingleReleaseInitForm) {
+      } else if (isSRForm || isMRForm) {
         copySharedInto(destDir);
       }
     } catch (e) {
@@ -535,6 +729,132 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
       );
     }
 
+    // Post-copy: materialize shared files for multi-release modules
+    try {
+      const isMultiInitRoot =
+        name === "escrows/multi-release/initialize-escrow";
+      const isMultiInitDialog =
+        name === "escrows/multi-release/initialize-escrow/dialog";
+      const isMultiInitForm =
+        name === "escrows/multi-release/initialize-escrow/form";
+
+      const srcSharedDir = path.join(
+        TEMPLATES_DIR,
+        "escrows",
+        "multi-release",
+        "initialize-escrow",
+        "shared"
+      );
+
+      function copyMultiInitSharedInto(targetDir) {
+        if (!fs.existsSync(srcSharedDir)) return;
+        const entries = fs.readdirSync(srcSharedDir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (!/\.(tsx?|jsx?)$/i.test(entry.name)) continue;
+          const entrySrc = path.join(srcSharedDir, entry.name);
+          const entryDest = path.join(targetDir, entry.name);
+          writeTransformed(entrySrc, entryDest);
+        }
+      }
+
+      if (isMultiInitRoot) {
+        copyMultiInitSharedInto(path.join(destDir, "dialog"));
+        copyMultiInitSharedInto(path.join(destDir, "form"));
+      } else if (isMultiInitDialog) {
+        copyMultiInitSharedInto(destDir);
+      } else if (isMultiInitForm) {
+        copyMultiInitSharedInto(destDir);
+      }
+    } catch (e) {
+      console.warn(
+        "⚠️  Failed to materialize shared multi-release initialize-escrow files:",
+        e?.message || e
+      );
+    }
+
+    try {
+      const isMultiResolveRoot =
+        name === "escrows/multi-release/resolve-dispute";
+      const isMultiResolveDialog =
+        name === "escrows/multi-release/resolve-dispute/dialog";
+      const isMultiResolveForm =
+        name === "escrows/multi-release/resolve-dispute/form";
+
+      const srcSharedDir = path.join(
+        TEMPLATES_DIR,
+        "escrows",
+        "multi-release",
+        "resolve-dispute",
+        "shared"
+      );
+
+      function copyMultiResolveSharedInto(targetDir) {
+        if (!fs.existsSync(srcSharedDir)) return;
+        const entries = fs.readdirSync(srcSharedDir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (!/\.(tsx?|jsx?)$/i.test(entry.name)) continue;
+          const entrySrc = path.join(srcSharedDir, entry.name);
+          const entryDest = path.join(targetDir, entry.name);
+          writeTransformed(entrySrc, entryDest);
+        }
+      }
+
+      if (isMultiResolveRoot) {
+        copyMultiResolveSharedInto(path.join(destDir, "dialog"));
+        copyMultiResolveSharedInto(path.join(destDir, "form"));
+      } else if (isMultiResolveDialog) {
+        copyMultiResolveSharedInto(destDir);
+      } else if (isMultiResolveForm) {
+        copyMultiResolveSharedInto(destDir);
+      }
+    } catch (e) {
+      console.warn(
+        "⚠️  Failed to materialize shared multi-release resolve-dispute files:",
+        e?.message || e
+      );
+    }
+
+    try {
+      const isMultiUpdateRoot = name === "escrows/multi-release/update-escrow";
+      const isMultiUpdateDialog =
+        name === "escrows/multi-release/update-escrow/dialog";
+      const isMultiUpdateForm =
+        name === "escrows/multi-release/update-escrow/form";
+
+      const srcSharedDir = path.join(
+        TEMPLATES_DIR,
+        "escrows",
+        "multi-release",
+        "update-escrow",
+        "shared"
+      );
+
+      function copyMultiUpdateSharedInto(targetDir) {
+        if (!fs.existsSync(srcSharedDir)) return;
+        const entries = fs.readdirSync(srcSharedDir, { withFileTypes: true });
+        for (const entry of entries) {
+          if (!/\.(tsx?|jsx?)$/i.test(entry.name)) continue;
+          const entrySrc = path.join(srcSharedDir, entry.name);
+          const entryDest = path.join(targetDir, entry.name);
+          writeTransformed(entrySrc, entryDest);
+        }
+      }
+
+      if (isMultiUpdateRoot) {
+        copyMultiUpdateSharedInto(path.join(destDir, "dialog"));
+        copyMultiUpdateSharedInto(path.join(destDir, "form"));
+      } else if (isMultiUpdateDialog) {
+        copyMultiUpdateSharedInto(destDir);
+      } else if (isMultiUpdateForm) {
+        copyMultiUpdateSharedInto(destDir);
+      }
+    } catch (e) {
+      console.warn(
+        "⚠️  Failed to materialize shared multi-release update-escrow files:",
+        e?.message || e
+      );
+    }
+
     // If adding the whole single-release bundle, materialize all shared files
     try {
       if (name === "escrows/single-release") {
@@ -551,8 +871,8 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
           const srcSharedDir = path.join(
             TEMPLATES_DIR,
             "escrows",
-            "single-release",
-            mod,
+            mod === "approve-milestone" ? "shared" : "single-release",
+            mod === "approve-milestone" ? "approve-milestone" : mod,
             "shared"
           );
           if (!fs.existsSync(srcSharedDir)) continue;
@@ -580,6 +900,48 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
       );
     }
 
+    // If adding the whole multi-release bundle, materialize all shared files
+    try {
+      if (name === "escrows/multi-release") {
+        const modules = [
+          "initialize-escrow",
+          "resolve-dispute",
+          "update-escrow",
+        ];
+
+        for (const mod of modules) {
+          const srcSharedDir = path.join(
+            TEMPLATES_DIR,
+            "escrows",
+            "multi-release",
+            mod,
+            "shared"
+          );
+          if (!fs.existsSync(srcSharedDir)) continue;
+
+          const targets = [
+            path.join(destDir, mod, "dialog"),
+            path.join(destDir, mod, "form"),
+          ];
+
+          const entries = fs.readdirSync(srcSharedDir, { withFileTypes: true });
+          for (const entry of entries) {
+            if (!/\.(tsx?|jsx?)$/i.test(entry.name)) continue;
+            const entrySrc = path.join(srcSharedDir, entry.name);
+            for (const t of targets) {
+              const entryDest = path.join(t, entry.name);
+              writeTransformed(entrySrc, entryDest);
+            }
+          }
+        }
+      }
+    } catch (e) {
+      console.warn(
+        "⚠️  Failed to materialize shared files for multi-release bundle:",
+        e?.message || e
+      );
+    }
+
     // If adding the root escrows bundle, also materialize single-release shared files
     try {
       if (name === "escrows") {
@@ -597,8 +959,8 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
           const srcSharedDir = path.join(
             TEMPLATES_DIR,
             "escrows",
-            "single-release",
-            mod,
+            mod === "approve-milestone" ? "shared" : "single-release",
+            mod === "approve-milestone" ? "approve-milestone" : mod,
             "shared"
           );
           if (!fs.existsSync(srcSharedDir)) continue;
@@ -625,6 +987,49 @@ function copyTemplate(name, { uiBase, shouldInstall = false } = {}) {
         e?.message || e
       );
     }
+
+    // If adding the root escrows bundle, also materialize multi-release shared files
+    try {
+      if (name === "escrows") {
+        const modules = [
+          "initialize-escrow",
+          "resolve-dispute",
+          "update-escrow",
+        ];
+
+        const baseTarget = path.join(destDir, "multi-release");
+        for (const mod of modules) {
+          const srcSharedDir = path.join(
+            TEMPLATES_DIR,
+            "escrows",
+            "multi-release",
+            mod,
+            "shared"
+          );
+          if (!fs.existsSync(srcSharedDir)) continue;
+
+          const targets = [
+            path.join(baseTarget, mod, "dialog"),
+            path.join(baseTarget, mod, "form"),
+          ];
+
+          const entries = fs.readdirSync(srcSharedDir, { withFileTypes: true });
+          for (const entry of entries) {
+            if (!/\.(tsx?|jsx?)$/i.test(entry.name)) continue;
+            const entrySrc = path.join(srcSharedDir, entry.name);
+            for (const t of targets) {
+              const entryDest = path.join(t, entry.name);
+              writeTransformed(entrySrc, entryDest);
+            }
+          }
+        }
+      }
+    } catch (e) {
+      console.warn(
+        "⚠️  Failed to materialize shared files for escrows root (multi-release):",
+        e?.message || e
+      );
+    }
   } else if (fs.existsSync(srcFile)) {
     fs.mkdirSync(outRoot, { recursive: true });
     const destFile = path.join(outRoot, name + ".tsx");
@@ -652,7 +1057,69 @@ function copySharedDetailsInto(targetRelativeDir, { uiBase } = {}) {
 
   function writeTransformed(srcPath, destPath) {
     const raw = fs.readFileSync(srcPath, "utf8");
-    const transformed = raw.replaceAll("__UI_BASE__", effectiveUiBase);
+    let transformed = raw.replaceAll("__UI_BASE__", effectiveUiBase);
+    // Resolve details placeholders to either multi-release modules (if present) or local compat
+    const resolveImport = (segments, compatFile) => {
+      const realWithExt = path.join(
+        outRoot,
+        "escrows",
+        "multi-release",
+        ...segments
+      );
+      const realCandidate = [
+        realWithExt,
+        realWithExt + ".tsx",
+        realWithExt + ".ts",
+        realWithExt + ".jsx",
+        realWithExt + ".js",
+      ].find((p) => fs.existsSync(p));
+      const realNoExt = realCandidate
+        ? realCandidate.replace(/\.(tsx|ts|jsx|js)$/i, "")
+        : null;
+      const compatWithExt = path.join(
+        path.dirname(destPath),
+        "compat",
+        compatFile
+      );
+      const compatCandidate = [
+        compatWithExt,
+        compatWithExt + ".tsx",
+        compatWithExt + ".ts",
+        compatWithExt + ".jsx",
+        compatWithExt + ".js",
+      ].find((p) => fs.existsSync(p));
+      const compatNoExt = (compatCandidate || compatWithExt).replace(
+        /\.(tsx|ts|jsx|js)$/i,
+        ""
+      );
+      const target = realNoExt || compatNoExt;
+      let rel = path.relative(path.dirname(destPath), target);
+      rel = rel.split(path.sep).join("/");
+      if (!rel.startsWith(".")) rel = "./" + rel;
+      return rel;
+    };
+    transformed = transformed
+      .replaceAll(
+        "__MR_RELEASE_MODULE__",
+        resolveImport(
+          ["release-escrow", "button", "ReleaseEscrow"],
+          "ReleaseEscrow"
+        )
+      )
+      .replaceAll(
+        "__MR_DISPUTE_MODULE__",
+        resolveImport(
+          ["dispute-escrow", "button", "DisputeEscrow"],
+          "DisputeEscrow"
+        )
+      )
+      .replaceAll(
+        "__MR_RESOLVE_MODULE__",
+        resolveImport(
+          ["resolve-dispute", "dialog", "ResolveDispute"],
+          "ResolveDispute"
+        )
+      );
     fs.mkdirSync(path.dirname(destPath), { recursive: true });
     fs.writeFileSync(destPath, transformed, "utf8");
     console.log(`✅ ${path.relative(PROJECT_ROOT, destPath)} created`);
@@ -856,7 +1323,7 @@ if (args[0] === "init") {
   }
 
   const addShadcn = await promptYesNo(
-    "Add shadcn components (button, input, form, card, sonner, checkbox, dialog, textarea, sonner, select, table, calendar, popover, separator, calendar-05, badge, sheet, tabs, avatar)?",
+    "Add shadcn components (button, input, form, card, sonner, checkbox, dialog, textarea, sonner, select, table, calendar, popover, separator, calendar-05, badge, sheet, tabs, avatar, tooltip)?",
     true
   );
   if (addShadcn) {
@@ -883,6 +1350,7 @@ if (args[0] === "init") {
         "sheet",
         "tabs",
         "avatar",
+        "tooltip",
       ]);
     });
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trustless-work/blocks",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "author": "Trustless Work",
   "keywords": [
     "react",