@solid-stack/mason 1.0.17 → 1.0.20

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");
 }
@@ -632,7 +650,7 @@ function getAllFiles(dir, baseDir = dir) {
       }
       files.push(...getAllFiles(fullPath, baseDir));
     } else if (entry.isFile()) {
-      if (entry.name === "registry.json" || entry.name.endsWith(".test.ts") || entry.name.endsWith(".spec.ts") || entry.name.startsWith(".")) {
+      if (entry.name === "registry.json" || entry.name.endsWith(".test.ts") || entry.name.endsWith(".spec.ts") || entry.name.endsWith(".test.js") || entry.name.endsWith(".spec.js") || entry.name.startsWith(".")) {
         continue;
       }
       files.push(relPath);
@@ -3585,8 +3603,15 @@ async function handleCreate(type, name, flags = {}) {
 }
 var importPrompts = {
   select: p14.select,
-  text: p14.text
+  text: p14.text,
+  confirm: p14.confirm
 };
+function isTestFile(filePath) {
+  const normalized = filePath.replace(/\\/g, "/");
+  const parts = normalized.split("/");
+  const fileName = parts[parts.length - 1] || "";
+  return fileName.endsWith(".test.ts") || fileName.endsWith(".test.js") || fileName.endsWith(".spec.ts") || fileName.endsWith(".spec.js") || parts.includes("__tests__");
+}
 function rewriteImports(content, aliasMap) {
   if (aliasMap.size === 0) return content;
   let rewritten = content;
@@ -3600,11 +3625,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);
@@ -3616,7 +3648,9 @@ function checkModuleExists(projectRoot, modType, modName) {
 }
 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)
   ];
@@ -4044,6 +4078,22 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       requiredNpmPackages.add(pkg);
     }
   }
+  const hasTestFiles = Array.from(nodes.values()).some(
+    (node) => node.manifest.files?.some((file) => isTestFile(file))
+  );
+  let includeTests = true;
+  if (flags.tests !== void 0) {
+    includeTests = Boolean(flags.tests);
+  } else if (flags.yes) {
+    includeTests = true;
+  } else if (hasTestFiles) {
+    includeTests = handleCancel(
+      await importPrompts.confirm({
+        message: "Include test files?",
+        initialValue: true
+      })
+    );
+  }
   for (const key of orderedKeys) {
     const res = resolutions.get(key);
     if (res.action === "reuse") {
@@ -4068,6 +4118,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
     for (const file of res.manifest.files || []) {
       if (file === "registry.json") continue;
+      if (!includeTests && isTestFile(file)) continue;
       const remoteFilePath = `${folder}/${res.registryName}/${file}`;
       const localFilePath = path2.join(targetDir, file);
       if (fs4.existsSync(localFilePath) && !isOverwrite) {
@@ -4120,7 +4171,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").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) => {
+  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)").option("--tests", "Include test files (use --no-tests to exclude)").action(async (args, flags) => {
     if (args && args.length > 0) {
       p14.log.error(
         pc14.red(
@@ -4215,7 +4266,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").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 = {}) => {
+  ).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)").option("--tests", "Include test files (use --no-tests to exclude)").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) {
@@ -4245,7 +4296,7 @@ function createCli() {
     });
   }
   cli.help();
-  cli.version("1.0.17");
+  cli.version("1.0.19");
   return cli;
 }
 function handleCliError(err) {