@solid-stack/mason 1.0.16 → 1.0.18

package/dist/index.js

@@ -147,7 +147,7 @@ function getEffectiveMode(projectRoot, flags) {
   if (flags?.registry) return "registry";
   const config = loadMasonConfig(projectRoot);
   if (config?.mode) return config.mode;
-  if (fs4.existsSync(path2.join(projectRoot, "index.json")) && (fs4.existsSync(path2.join(projectRoot, "features")) || fs4.existsSync(path2.join(projectRoot, "shared"))) && !fs4.existsSync(path2.join(projectRoot, "src"))) {
+  if (fs4.existsSync(path2.join(projectRoot, "index.json")) && (fs4.existsSync(path2.join(projectRoot, "features")) || fs4.existsSync(path2.join(projectRoot, "shared")) || fs4.existsSync(path2.join(projectRoot, "src/features")) || fs4.existsSync(path2.join(projectRoot, "src/shared")))) {
     return "registry";
   }
   return "app";
@@ -161,6 +161,9 @@ function getConfiguredFeaturesDir(projectRoot, flags) {
   }
   const mode = getEffectiveMode(projectRoot, flags);
   if (mode === "registry") {
+    if (fs4.existsSync(path2.join(projectRoot, "src/features"))) {
+      return path2.join(projectRoot, "src/features");
+    }
     return path2.join(projectRoot, "features");
   }
   if (fs4.existsSync(path2.join(projectRoot, "src/features"))) {
@@ -177,6 +180,9 @@ function getConfiguredSharedDir(projectRoot, flags) {
   }
   const mode = getEffectiveMode(projectRoot, flags);
   if (mode === "registry") {
+    if (fs4.existsSync(path2.join(projectRoot, "src/shared"))) {
+      return path2.join(projectRoot, "src/shared");
+    }
     return path2.join(projectRoot, "shared");
   }
   if (fs4.existsSync(path2.join(projectRoot, "src/shared"))) {
@@ -483,7 +489,14 @@ async function fetchRegistryFile(registryBase, relPath) {
     if (token) {
       headers["Authorization"] = `Bearer ${token}`;
     }
-    const res = await fetch(url, { headers });
+    let res = await fetch(url, { headers });
+    if (!res.ok && res.status === 404 && !cleanRelPath.startsWith("src/")) {
+      const srcUrl = `${registryBase.replace(/\/+$/, "")}/src/${cleanRelPath}`;
+      const srcRes = await fetch(srcUrl, { headers });
+      if (srcRes.ok) {
+        res = srcRes;
+      }
+    }
     if (!res.ok) {
       let extraHint = "";
       if (res.status === 404) {
@@ -503,9 +516,14 @@ async function fetchRegistryFile(registryBase, relPath) {
   if (baseDir.startsWith("file://")) {
     baseDir = fileURLToPath(baseDir);
   }
-  const filePath = path2.resolve(baseDir, cleanRelPath);
+  let filePath = path2.resolve(baseDir, cleanRelPath);
   if (!fs4.existsSync(filePath)) {
-    throw new Error(`Registry file not found at ${filePath}`);
+    const inSrcPath = path2.resolve(baseDir, "src", cleanRelPath);
+    if (fs4.existsSync(inSrcPath)) {
+      filePath = inSrcPath;
+    } else {
+      throw new Error(`Registry file not found at ${filePath}`);
+    }
   }
   return fs4.promises.readFile(filePath, "utf-8");
 }
@@ -3600,11 +3618,18 @@ function rewriteImports(content, aliasMap) {
   return rewritten;
 }
 function getModuleBaseDir(projectRoot, modType) {
+  const mode = getEffectiveMode(projectRoot);
+  if (mode === "registry") {
+    return modType === "shared" ? getConfiguredSharedDir(projectRoot) : getConfiguredFeaturesDir(projectRoot);
+  }
   const folder = modType === "shared" ? "shared" : "features";
   return path2.join(projectRoot, "src", folder);
 }
 function getExistingModuleDir(projectRoot, modType, modName) {
   const folder = modType === "shared" ? "shared" : "features";
+  const configuredDir = modType === "shared" ? getConfiguredSharedDir(projectRoot) : getConfiguredFeaturesDir(projectRoot);
+  const inConfigured = path2.join(configuredDir, modName);
+  if (fs4.existsSync(inConfigured)) return inConfigured;
   const inSrc = path2.join(projectRoot, "src", folder, modName);
   if (fs4.existsSync(inSrc)) return inSrc;
   const inRoot = path2.join(projectRoot, folder, modName);
@@ -3614,6 +3639,50 @@ function getExistingModuleDir(projectRoot, modType, modName) {
 function checkModuleExists(projectRoot, modType, modName) {
   return getExistingModuleDir(projectRoot, modType, modName) !== null;
 }
+function getAvailableLocalModules(projectRoot, modType) {
+  const folder = modType === "shared" ? "shared" : "features";
+  const configuredDir = modType === "shared" ? getConfiguredSharedDir(projectRoot) : getConfiguredFeaturesDir(projectRoot);
+  const dirs = [
+    configuredDir,
+    path2.join(projectRoot, "src", folder),
+    path2.join(projectRoot, folder)
+  ];
+  const set = /* @__PURE__ */ new Set();
+  for (const dir of dirs) {
+    if (fs4.existsSync(dir)) {
+      try {
+        const entries = fs4.readdirSync(dir, { withFileTypes: true });
+        for (const e of entries) {
+          if (e.isDirectory() && !e.name.startsWith(".")) {
+            set.add(e.name);
+          }
+        }
+      } catch {
+      }
+    }
+  }
+  return Array.from(set).sort();
+}
+function parseMappingFlags(raw) {
+  if (!raw) return {};
+  if (typeof raw === "object" && !Array.isArray(raw)) return raw;
+  const result = {};
+  const entries = Array.isArray(raw) ? raw : [raw];
+  for (const entry of entries) {
+    if (typeof entry === "string") {
+      const idx = entry.indexOf(":");
+      if (idx !== -1) {
+        let key = entry.slice(0, idx).trim();
+        let val = entry.slice(idx + 1).trim();
+        val = val.replace(/^@\/(shared|features)\//, "").replace(/^(src\/)?(shared|features)\//, "").replace(/^\/+|\/+$/g, "").trim();
+        if (key && val) {
+          result[key] = val;
+        }
+      }
+    }
+  }
+  return result;
+}
 async function handleImport(typeArg, nameArg, flags = {}) {
   const projectRoot = findProjectRoot();
   let type = typeArg?.trim().toLowerCase();
@@ -3734,7 +3803,8 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     const { type: modType, name: registryName, manifest } = node;
     const folder = modType === "shared" ? "shared" : "features";
     if (key === rootKey) {
-      const programmaticAlias2 = flags.alias?.[registryName] || flags.alias?.[`${modType}/${registryName}`];
+      const aliasMap2 = parseMappingFlags(flags.alias);
+      const programmaticAlias2 = aliasMap2[registryName] || aliasMap2[`${modType}/${registryName}`];
       const targetName = programmaticAlias2 || registryName;
       if (targetName !== registryName) {
         globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${targetName}/`);
@@ -3749,7 +3819,36 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       });
       continue;
     }
-    const programmaticAlias = flags.alias?.[registryName] || flags.alias?.[`${modType}/${registryName}`];
+    const aliasMap = parseMappingFlags(flags.alias);
+    const pointToMap = {
+      ...parseMappingFlags(flags.pointTo),
+      ...parseMappingFlags(flags["point-to"]),
+      ...parseMappingFlags(flags.useExisting),
+      ...parseMappingFlags(flags["use-existing"])
+    };
+    const programmaticPointTo = pointToMap[registryName] || pointToMap[`${modType}/${registryName}`];
+    if (programmaticPointTo) {
+      if (!checkModuleExists(projectRoot, modType, programmaticPointTo)) {
+        p14.log.error(
+          pc14.red(
+            `Module '${programmaticPointTo}' specified in --point-to does not exist in ${folder}.`
+          )
+        );
+        process.exit(1);
+      }
+      globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${programmaticPointTo}/`);
+      globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${programmaticPointTo}`);
+      p14.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${programmaticPointTo}'`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: programmaticPointTo,
+        action: "reuse",
+        manifest
+      });
+      continue;
+    }
+    const programmaticAlias = aliasMap[registryName] || aliasMap[`${modType}/${registryName}`];
     if (programmaticAlias) {
       globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${programmaticAlias}/`);
       globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${programmaticAlias}`);
@@ -3823,6 +3922,10 @@ async function handleImport(typeArg, nameArg, flags = {}) {
             value: "keep_existing",
             label: `Keep existing local version (Recommended)`
           },
+          {
+            value: "point_existing",
+            label: `Point to another existing ${modType} module`
+          },
           {
             value: "rename",
             label: "Import fresh copy under a new name (alias)"
@@ -3845,6 +3948,78 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       });
       continue;
     }
+    if (choice === "point_existing" || choice === "point_to_existing") {
+      const candidates = getAvailableLocalModules(projectRoot, modType).filter(
+        (m) => m !== registryName
+      );
+      let chosenName;
+      if (candidates.length > 0) {
+        const selection = handleCancel(
+          await importPrompts.select({
+            message: `Select an existing ${modType} module to point to:`,
+            options: [
+              ...candidates.map((m) => ({
+                value: m,
+                label: m
+              })),
+              {
+                value: "__custom__",
+                label: "Enter name manually..."
+              }
+            ]
+          })
+        );
+        if (selection === "__custom__") {
+          chosenName = handleCancel(
+            await importPrompts.text({
+              message: `Enter the name of the existing ${modType} module:`,
+              placeholder: `my${registryName}`,
+              validate(val) {
+                const v = val?.trim();
+                if (!v) return "Name cannot be empty";
+                if (v === registryName) {
+                  return `Name must be different from '${registryName}' (or select 'Keep existing local version')`;
+                }
+                if (!checkModuleExists(projectRoot, modType, v)) {
+                  return `'${v}' does not exist in ${folder}`;
+                }
+              }
+            })
+          ).trim();
+        } else {
+          chosenName = selection;
+        }
+      } else {
+        chosenName = handleCancel(
+          await importPrompts.text({
+            message: `Enter the name of the existing ${modType} module:`,
+            placeholder: `my${registryName}`,
+            validate(val) {
+              const v = val?.trim();
+              if (!v) return "Name cannot be empty";
+              if (v === registryName) {
+                return `Name must be different from '${registryName}' (or select 'Keep existing local version')`;
+              }
+              if (!checkModuleExists(projectRoot, modType, v)) {
+                return `'${v}' does not exist in ${folder}`;
+              }
+            }
+          })
+        ).trim();
+      }
+      chosenName = chosenName.replace(/^@\/(shared|features)\//, "").replace(/^(src\/)?(shared|features)\//, "").replace(/^\/+|\/+$/g, "").trim();
+      globalAliasMap.set(`@/${folder}/${registryName}/`, `@/${folder}/${chosenName}/`);
+      globalAliasMap.set(`@/${folder}/${registryName}`, `@/${folder}/${chosenName}`);
+      p14.log.step(`Pointing '${modType}/${registryName}' to existing '${folder}/${chosenName}'`);
+      resolutions.set(key, {
+        type: modType,
+        registryName,
+        targetName: chosenName,
+        action: "reuse",
+        manifest
+      });
+      continue;
+    }
     if (choice === "rename") {
       const newName = handleCancel(
         await importPrompts.text({
@@ -3972,7 +4147,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
 // src/cli.ts
 function createCli() {
   const cli = cac("mason");
-  cli.command("[...args]", "Interactive scaffolding and import wizard").option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry", "Run in registry mode").action(async (args, flags) => {
+  cli.command("[...args]", "Interactive scaffolding and import wizard").option("-d, --dry-run", "Preview changes without writing to disk").option("-o, --overwrite", "Overwrite existing files").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry", "Run in registry mode").option("--point-to <mapping>", "Point a dependency to an existing local module (e.g. --point-to time:mytime)").option("--alias <mapping>", "Import a dependency fresh under an alias name (e.g. --alias time:time-mason)").action(async (args, flags) => {
     if (args && args.length > 0) {
       p14.log.error(
         pc14.red(
@@ -4067,7 +4242,7 @@ function createCli() {
   cli.command(
     "import [type] [name]",
     "Import pre-built shared modules or features from the Solid Stack Registry"
-  ).option("-o, --overwrite", "Overwrite existing files").option("-d, --dry-run", "Preview changes without writing to disk").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry <url>", "Registry base URL or local directory").option("--skip-install", "Skip automatic package manager dependency installation").example("mason import shared hasher").example("mason import feature authn").example("mason import shared").example("mason import feature").action(async (type, name, flags = {}) => {
+  ).option("-o, --overwrite", "Overwrite existing files").option("-d, --dry-run", "Preview changes without writing to disk").option("-y, --yes", "Accept defaults and skip interactive prompts").option("--registry <url>", "Registry base URL or local directory").option("--skip-install", "Skip automatic package manager dependency installation").option("--point-to <mapping>", "Point a dependency to an existing local module (e.g. --point-to time:mytime)").option("--alias <mapping>", "Import a dependency fresh under an alias name (e.g. --alias time:time-mason)").example("mason import shared hasher").example("mason import feature authn").example("mason import shared").example("mason import feature").action(async (type, name, flags = {}) => {
     try {
       await handleImport(type, name, flags);
     } catch (err) {
@@ -4097,7 +4272,7 @@ function createCli() {
     });
   }
   cli.help();
-  cli.version("1.0.16");
+  cli.version("1.0.18");
   return cli;
 }
 function handleCliError(err) {