@solid-stack/mason 1.0.17 → 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);
@@ -3616,7 +3641,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)
   ];
@@ -4245,7 +4272,7 @@ function createCli() {
     });
   }
   cli.help();
-  cli.version("1.0.17");
+  cli.version("1.0.18");
   return cli;
 }
 function handleCliError(err) {