create-fornix 0.0.11 → 0.0.12

package/dist/index.js

@@ -2284,32 +2284,56 @@ async function runManualFlow(input) {
   let selectedHeader;
   let selectedFooter;
   let selectedContentBlocks = [];
-  if (headerOptions.length > 0) {
-    const noneOption = { value: "__none__", label: "None", hint: "No header" };
-    const headerChoice = await p.select({
-      message: "Choose a header (appears on every page)",
-      options: [noneOption, ...headerOptions]
-    });
-    if (p.isCancel(headerChoice)) return handleCancel();
-    if (headerChoice !== "__none__") selectedHeader = headerChoice;
-  }
-  if (contentOptions.length > 0) {
-    const blocks = await p.multiselect({
-      message: "Select content blocks (space to toggle, enter to confirm)",
-      options: contentOptions,
-      required: false
-    });
-    if (p.isCancel(blocks)) return handleCancel();
-    selectedContentBlocks = blocks;
-  }
-  if (footerOptions.length > 0) {
-    const noneOption = { value: "__none__", label: "None", hint: "No footer" };
-    const footerChoice = await p.select({
-      message: "Choose a footer (appears on every page)",
-      options: [noneOption, ...footerOptions]
-    });
-    if (p.isCancel(footerChoice)) return handleCancel();
-    if (footerChoice !== "__none__") selectedFooter = footerChoice;
+  while (true) {
+    selectedHeader = void 0;
+    selectedFooter = void 0;
+    selectedContentBlocks = [];
+    if (headerOptions.length > 0) {
+      const noneOption = { value: "__none__", label: "None", hint: "No header" };
+      const headerChoice = await p.select({
+        message: "Choose a header (appears on every page)",
+        options: [noneOption, ...headerOptions]
+      });
+      if (p.isCancel(headerChoice)) return handleCancel();
+      if (headerChoice !== "__none__") selectedHeader = headerChoice;
+    }
+    if (contentOptions.length > 0) {
+      const blocks = await p.multiselect({
+        message: "Select content blocks (space to toggle, enter to confirm)",
+        options: contentOptions,
+        required: false
+      });
+      if (p.isCancel(blocks)) return handleCancel();
+      selectedContentBlocks = blocks;
+    }
+    if (footerOptions.length > 0) {
+      const noneOption = { value: "__none__", label: "None", hint: "No footer" };
+      const footerChoice = await p.select({
+        message: "Choose a footer (appears on every page)",
+        options: [noneOption, ...footerOptions]
+      });
+      if (p.isCancel(footerChoice)) return handleCancel();
+      if (footerChoice !== "__none__") selectedFooter = footerChoice;
+    }
+    const tempSelected = [];
+    if (selectedHeader) tempSelected.push(selectedHeader);
+    tempSelected.push(...selectedContentBlocks);
+    if (selectedFooter) tempSelected.push(selectedFooter);
+    if (tempSelected.length > 0) {
+      const checkResult = resolveDependencies(tempSelected, input.manifests);
+      if (!isOk(checkResult)) {
+        if (checkResult.error.kind === "DependencyConflictError") {
+          p.log.warn(`Conflict detected: ${checkResult.error.blockA} conflicts with ${checkResult.error.blockB}`);
+          const retry = await p.confirm({
+            message: "Block conflict detected. Would you like to select your blocks again?",
+            initialValue: true
+          });
+          if (p.isCancel(retry) || !retry) return handleCancel();
+          continue;
+        }
+      }
+    }
+    break;
   }
   const localesInput = await p.text({
     message: "Locales (comma-separated, e.g. en,es,ar)",
@@ -2477,58 +2501,58 @@ import { writeFileSync as writeFileSync3 } from "fs";
 import { join as join4, basename } from "path";
 import pc2 from "picocolors";
 function runPostScaffold(input, callbacks) {
-  const log = callbacks?.onLog ?? ((msg) => console.log(msg));
+  const log2 = callbacks?.onLog ?? ((msg) => console.log(msg));
   const warn = callbacks?.onWarn ?? ((msg) => console.warn(msg));
   const { config, resolvedBlockNames, filesWritten, verbose } = input;
   const projectDir = config.projectDir;
   const projectName = basename(projectDir);
   generateClaudeMd(projectDir, config, resolvedBlockNames);
-  if (verbose) log(pc2.dim("  created CLAUDE.md"));
+  if (verbose) log2(pc2.dim("  created CLAUDE.md"));
   let installSuccess = false;
   if (!input.skipInstall) {
-    installSuccess = installDependencies(projectDir, config.packageManager, verbose, log, warn);
+    installSuccess = installDependencies(projectDir, config.packageManager, verbose, log2, warn);
   }
   let gitSuccess = false;
   if (!input.skipGit) {
-    gitSuccess = initGit(projectDir, verbose, log, warn);
-  }
-  log("");
-  log(pc2.green(pc2.bold("\u2714 Project created successfully!")));
-  log("");
-  log(`  ${pc2.bold("Project:")}  ${config.projectName}`);
-  log(`  ${pc2.bold("Dir:")}      ${projectDir}`);
-  log(`  ${pc2.bold("Render:")}   ${config.renderMode}`);
-  log(`  ${pc2.bold("Deploy:")}   ${config.deployTarget}`);
-  log(`  ${pc2.bold("CSS:")}      ${config.cssEngine}`);
+    gitSuccess = initGit(projectDir, verbose, log2, warn);
+  }
+  log2("");
+  log2(pc2.green(pc2.bold("\u2714 Project created successfully!")));
+  log2("");
+  log2(`  ${pc2.bold("Project:")}  ${config.projectName}`);
+  log2(`  ${pc2.bold("Dir:")}      ${projectDir}`);
+  log2(`  ${pc2.bold("Render:")}   ${config.renderMode}`);
+  log2(`  ${pc2.bold("Deploy:")}   ${config.deployTarget}`);
+  log2(`  ${pc2.bold("CSS:")}      ${config.cssEngine}`);
   if (resolvedBlockNames.length > 0) {
-    log(`  ${pc2.bold("Blocks:")}   ${resolvedBlockNames.join(", ")}`);
+    log2(`  ${pc2.bold("Blocks:")}   ${resolvedBlockNames.join(", ")}`);
   }
   if (config.locales.length > 1) {
-    log(`  ${pc2.bold("Locales:")}  ${config.locales.join(", ")} (default: ${config.defaultLocale})`);
+    log2(`  ${pc2.bold("Locales:")}  ${config.locales.join(", ")} (default: ${config.defaultLocale})`);
   }
   if (config.palette.preset) {
-    log(`  ${pc2.bold("Palette:")}  ${config.palette.preset}`);
+    log2(`  ${pc2.bold("Palette:")}  ${config.palette.preset}`);
   }
-  log(`  ${pc2.bold("Files:")}    ${filesWritten} files written`);
+  log2(`  ${pc2.bold("Files:")}    ${filesWritten} files written`);
   if (installSuccess) {
-    log(`  ${pc2.bold("Deps:")}     ${pc2.green("installed")}`);
+    log2(`  ${pc2.bold("Deps:")}     ${pc2.green("installed")}`);
   }
   if (gitSuccess) {
-    log(`  ${pc2.bold("Git:")}      ${pc2.green("initialized")}`);
+    log2(`  ${pc2.bold("Git:")}      ${pc2.green("initialized")}`);
   }
-  log("");
-  log(pc2.dim("  Next steps:"));
-  log(pc2.dim(`    cd ${projectName}`));
+  log2("");
+  log2(pc2.dim("  Next steps:"));
+  log2(pc2.dim(`    cd ${projectName}`));
   if (!installSuccess) {
-    log(pc2.dim(`    ${config.packageManager} install`));
+    log2(pc2.dim(`    ${config.packageManager} install`));
   }
-  log(pc2.dim(`    ${config.packageManager} dev`));
-  log(pc2.dim(`    npx create-fornix add <block>`));
-  log("");
+  log2(pc2.dim(`    ${config.packageManager} dev`));
+  log2(pc2.dim(`    npx create-fornix add <block>`));
+  log2("");
 }
-function installDependencies(projectDir, packageManager, verbose, log, warn) {
+function installDependencies(projectDir, packageManager, verbose, log2, warn) {
   try {
-    log(pc2.dim("  Installing dependencies..."));
+    log2(pc2.dim("  Installing dependencies..."));
     const cmd = `${packageManager} install`;
     execSync(cmd, {
       cwd: projectDir,
@@ -2542,9 +2566,9 @@ function installDependencies(projectDir, packageManager, verbose, log, warn) {
     return false;
   }
 }
-function initGit(projectDir, verbose, log, warn) {
+function initGit(projectDir, verbose, log2, warn) {
   try {
-    if (verbose) log(pc2.dim("  Initializing git repository..."));
+    if (verbose) log2(pc2.dim("  Initializing git repository..."));
     execSync("git init", {
       cwd: projectDir,
       stdio: "pipe",