@solid-stack/mason 1.0.17 → 1.0.18

package/dist/commands/import.d.ts

@@ -24,7 +24,7 @@ export declare function rewriteImports(content: string, aliasMap: Map<string, st
  */
 export declare function getModuleBaseDir(projectRoot: string, modType: "shared" | "feature"): string;
 /**
- * Resolves the existing directory path for a module in the project, checking both src/<folder>/<name> and <folder>/<name>.
+ * Resolves the existing directory path for a module in the project, checking configured dirs, src/<folder>/<name>, and <folder>/<name>.
  */
 export declare function getExistingModuleDir(projectRoot: string, modType: "shared" | "feature", modName: string): string | null;
 /**
@@ -32,7 +32,7 @@ export declare function getExistingModuleDir(projectRoot: string, modType: "shar
  */
 export declare function checkModuleExists(projectRoot: string, modType: "shared" | "feature", modName: string): boolean;
 /**
- * List all available local module names for a given type (checking both src/<folder> and <folder>)
+ * List all available local module names for a given type (checking configured dir, src/<folder>, and <folder>)
  */
 export declare function getAvailableLocalModules(projectRoot: string, modType: "shared" | "feature"): string[];
 /**

package/dist/commands/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAiBpC,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACzD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,eAAO,MAAM,aAAa;IACxB,MAAM;IACN,IAAI;CACL,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAerF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,CAG3F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAOf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,OAAO,EAAE,MAAM,GACd,OAAO,CAET;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,GAAG,SAAS,GAC5B,MAAM,EAAE,CAoBV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAuBlE;AAgBD,wBAAsB,YAAY,CAChC,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,GAAE,WAAgB,GACtB,OAAO,CAAC,IAAI,CAAC,CA0iBf"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AAkBpC,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACzD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,eAAO,MAAM,aAAa;IACxB,MAAM;IACN,IAAI;CACL,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAerF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,MAAM,CAS3F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAYf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,GAAG,SAAS,EAC7B,OAAO,EAAE,MAAM,GACd,OAAO,CAET;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,QAAQ,GAAG,SAAS,GAC5B,MAAM,EAAE,CAwBV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAuBlE;AAgBD,wBAAsB,YAAY,CAChC,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,GAAE,WAAgB,GACtB,OAAO,CAAC,IAAI,CAAC,CA0iBf"}

package/dist/index.cjs

@@ -176,7 +176,7 @@ function getEffectiveMode(projectRoot, flags) {
   if (flags?.registry) return "registry";
   const config = loadMasonConfig(projectRoot);
   if (config?.mode) return config.mode;
-  if (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "index.json")) && (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "features")) || fs4__default.default.existsSync(path2__default.default.join(projectRoot, "shared"))) && !fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src"))) {
+  if (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "index.json")) && (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "features")) || fs4__default.default.existsSync(path2__default.default.join(projectRoot, "shared")) || fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src/features")) || fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src/shared")))) {
     return "registry";
   }
   return "app";
@@ -190,6 +190,9 @@ function getConfiguredFeaturesDir(projectRoot, flags) {
   }
   const mode = getEffectiveMode(projectRoot, flags);
   if (mode === "registry") {
+    if (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src/features"))) {
+      return path2__default.default.join(projectRoot, "src/features");
+    }
     return path2__default.default.join(projectRoot, "features");
   }
   if (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src/features"))) {
@@ -206,6 +209,9 @@ function getConfiguredSharedDir(projectRoot, flags) {
   }
   const mode = getEffectiveMode(projectRoot, flags);
   if (mode === "registry") {
+    if (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src/shared"))) {
+      return path2__default.default.join(projectRoot, "src/shared");
+    }
     return path2__default.default.join(projectRoot, "shared");
   }
   if (fs4__default.default.existsSync(path2__default.default.join(projectRoot, "src/shared"))) {
@@ -512,7 +518,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) {
@@ -532,9 +545,14 @@ async function fetchRegistryFile(registryBase, relPath) {
   if (baseDir.startsWith("file://")) {
     baseDir = url.fileURLToPath(baseDir);
   }
-  const filePath = path2__default.default.resolve(baseDir, cleanRelPath);
+  let filePath = path2__default.default.resolve(baseDir, cleanRelPath);
   if (!fs4__default.default.existsSync(filePath)) {
-    throw new Error(`Registry file not found at ${filePath}`);
+    const inSrcPath = path2__default.default.resolve(baseDir, "src", cleanRelPath);
+    if (fs4__default.default.existsSync(inSrcPath)) {
+      filePath = inSrcPath;
+    } else {
+      throw new Error(`Registry file not found at ${filePath}`);
+    }
   }
   return fs4__default.default.promises.readFile(filePath, "utf-8");
 }
@@ -3629,11 +3647,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__default.default.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__default.default.join(configuredDir, modName);
+  if (fs4__default.default.existsSync(inConfigured)) return inConfigured;
   const inSrc = path2__default.default.join(projectRoot, "src", folder, modName);
   if (fs4__default.default.existsSync(inSrc)) return inSrc;
   const inRoot = path2__default.default.join(projectRoot, folder, modName);
@@ -3645,7 +3670,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__default.default.join(projectRoot, "src", folder),
     path2__default.default.join(projectRoot, folder)
   ];
@@ -4274,7 +4301,7 @@ function createCli() {
     });
   }
   cli.help();
-  cli.version("1.0.17");
+  cli.version("1.0.18");
   return cli;
 }
 function handleCliError(err) {