@solid-stack/mason 1.0.11 → 1.0.12

package/dist/bin.js

@@ -2,7 +2,7 @@
 import { cac } from 'cac';
 import * as p3 from '@clack/prompts';
 import pc13 from 'picocolors';
-import path6 from 'path';
+import path15 from 'path';
 import fs7 from 'fs';
 import { fileURLToPath } from 'url';
 import Handlebars from 'handlebars';
@@ -10,7 +10,7 @@ import { execSync } from 'child_process';
 
 function writeFileSafely(absolutePath, content, options = {}) {
   const projectRoot = options.projectRoot || process.cwd();
-  const relPath = path6.relative(projectRoot, absolutePath).replace(/\\/g, "/");
+  const relPath = path15.relative(projectRoot, absolutePath).replace(/\\/g, "/");
   const existedBefore = fs7.existsSync(absolutePath);
   if (options.dryRun) {
     return {
@@ -30,7 +30,7 @@ function writeFileSafely(absolutePath, content, options = {}) {
       existedBefore: true
     };
   }
-  const dir = path6.dirname(absolutePath);
+  const dir = path15.dirname(absolutePath);
   if (!fs7.existsSync(dir)) {
     fs7.mkdirSync(dir, { recursive: true });
   }
@@ -125,20 +125,20 @@ function toStubName(ifaceName) {
   return `Stub${base}`;
 }
 function findProjectRoot(startDir = process.cwd()) {
-  let current = path6.resolve(startDir);
+  let current = path15.resolve(startDir);
   while (true) {
-    if (fs7.existsSync(path6.join(current, "package.json"))) {
+    if (fs7.existsSync(path15.join(current, "package.json"))) {
       return current;
     }
-    const parent = path6.dirname(current);
+    const parent = path15.dirname(current);
     if (parent === current) {
-      return path6.resolve(startDir);
+      return path15.resolve(startDir);
     }
     current = parent;
   }
 }
 function resolveFeaturesDir(projectRoot) {
-  return path6.join(projectRoot, "features");
+  return path15.join(projectRoot, "features");
 }
 function listExistingFeatures(projectRoot) {
   const featuresDir = resolveFeaturesDir(projectRoot);
@@ -154,14 +154,14 @@ function listDomainInterfaces(projectRoot, featureName) {
   const results = [];
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const domainDir = path6.join(resolveFeaturesDir(projectRoot), feat, "domain");
+    const domainDir = path15.join(resolveFeaturesDir(projectRoot), feat, "domain");
     if (!fs7.existsSync(domainDir)) continue;
     try {
       const files = fs7.readdirSync(domainDir);
       for (const file of files) {
         if (file.endsWith(".ts") && !file.endsWith(".test.ts") && !file.endsWith(".d.ts")) {
           const name = file.replace(/\.ts$/, "");
-          const fullPath = path6.join(domainDir, file);
+          const fullPath = path15.join(domainDir, file);
           if (/^I[A-Z]/.test(name)) {
             results.push({
               name,
@@ -192,7 +192,7 @@ function listDomainEntities(projectRoot, featureName) {
   const results = [];
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const domainDir = path6.join(resolveFeaturesDir(projectRoot), feat, "domain");
+    const domainDir = path15.join(resolveFeaturesDir(projectRoot), feat, "domain");
     if (!fs7.existsSync(domainDir)) continue;
     try {
       const files = fs7.readdirSync(domainDir);
@@ -202,7 +202,7 @@ function listDomainEntities(projectRoot, featureName) {
           if (!/^I[A-Z]/.test(name)) {
             results.push({
               name,
-              fullPath: path6.join(domainDir, file),
+              fullPath: path15.join(domainDir, file),
               feature: feat
             });
           }
@@ -217,7 +217,7 @@ function listUseCases(projectRoot, featureName) {
   const results = [];
   const features = featureName ? [featureName] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const useCasesDir = path6.join(resolveFeaturesDir(projectRoot), feat, "useCases");
+    const useCasesDir = path15.join(resolveFeaturesDir(projectRoot), feat, "useCases");
     if (!fs7.existsSync(useCasesDir)) continue;
     try {
       const files = fs7.readdirSync(useCasesDir);
@@ -226,7 +226,7 @@ function listUseCases(projectRoot, featureName) {
           const name = file.replace(/\.ts$/, "");
           results.push({
             name,
-            fullPath: path6.join(useCasesDir, file),
+            fullPath: path15.join(useCasesDir, file),
             feature: feat
           });
         }
@@ -255,30 +255,30 @@ function getTemplatesDir() {
   if (cachedTemplatesDir && fs7.existsSync(cachedTemplatesDir)) {
     return cachedTemplatesDir;
   }
-  const currentDir = typeof __dirname !== "undefined" ? __dirname : path6.dirname(fileURLToPath(import.meta.url));
-  const cand1 = path6.resolve(currentDir, "../../templates");
+  const currentDir = typeof __dirname !== "undefined" ? __dirname : path15.dirname(fileURLToPath(import.meta.url));
+  const cand1 = path15.resolve(currentDir, "../../templates");
   if (fs7.existsSync(cand1)) {
     cachedTemplatesDir = cand1;
     return cand1;
   }
-  const cand2 = path6.resolve(currentDir, "../templates");
+  const cand2 = path15.resolve(currentDir, "../templates");
   if (fs7.existsSync(cand2)) {
     cachedTemplatesDir = cand2;
     return cand2;
   }
-  const cand3 = path6.resolve(currentDir, "templates");
+  const cand3 = path15.resolve(currentDir, "templates");
   if (fs7.existsSync(cand3)) {
     cachedTemplatesDir = cand3;
     return cand3;
   }
   let curr = currentDir;
   while (true) {
-    const candTemplates = path6.join(curr, "templates");
+    const candTemplates = path15.join(curr, "templates");
     if (fs7.existsSync(candTemplates)) {
       cachedTemplatesDir = candTemplates;
       return candTemplates;
     }
-    const parent = path6.dirname(curr);
+    const parent = path15.dirname(curr);
     if (parent === curr) break;
     curr = parent;
   }
@@ -286,7 +286,7 @@ function getTemplatesDir() {
 }
 var templateCache = /* @__PURE__ */ new Map();
 function loadTemplate(relativePath) {
-  const fullPath = path6.isAbsolute(relativePath) ? relativePath : path6.join(getTemplatesDir(), relativePath);
+  const fullPath = path15.isAbsolute(relativePath) ? relativePath : path15.join(getTemplatesDir(), relativePath);
   return fs7.readFileSync(fullPath, "utf-8");
 }
 function renderTemplateFile(relativePath, context) {
@@ -374,8 +374,8 @@ function generateDomainEntityCode(name, kind = "interface", properties = []) {
 function generateDomain(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const entityName = toPascalCase(options.name);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
-  const filePath = path6.join(targetDir, `${entityName}.ts`);
+  const targetDir = options.targetDir || path15.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
+  const filePath = path15.join(targetDir, `${entityName}.ts`);
   const code = generateDomainEntityCode(
     entityName,
     options.kind || "interface",
@@ -424,8 +424,8 @@ function generateInterfaceCode(ifaceName, kind = "abstractClass", entityName, me
 function generateInterface(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const ifaceName = ensureInterfacePrefix(options.name);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
-  const filePath = path6.join(targetDir, `${ifaceName}.ts`);
+  const targetDir = options.targetDir || path15.join(resolveFeaturesDir(projectRoot), options.feature, "domain");
+  const filePath = path15.join(targetDir, `${ifaceName}.ts`);
   const code = generateInterfaceCode(
     ifaceName,
     options.kind || "abstractClass",
@@ -670,21 +670,21 @@ function findInterfaceFile(projectRoot, ifaceName, featureName, customPath) {
   ];
   const features = featureName ? [featureName, ...listExistingFeatures(projectRoot).filter((f) => f !== featureName)] : listExistingFeatures(projectRoot);
   for (const feat of features) {
-    const domainDir = path6.join(resolveFeaturesDir(projectRoot), feat, "domain");
+    const domainDir = path15.join(resolveFeaturesDir(projectRoot), feat, "domain");
     if (!fs7.existsSync(domainDir)) continue;
     for (const cand of candidateNames) {
-      const p1 = path6.join(domainDir, `${cand}.ts`);
+      const p1 = path15.join(domainDir, `${cand}.ts`);
       if (fs7.existsSync(p1)) {
         return { filePath: p1, ifaceName: cand, feature: feat };
       }
     }
   }
   for (const cand of candidateNames) {
-    const p1 = path6.join(projectRoot, "domain", `${cand}.ts`);
+    const p1 = path15.join(projectRoot, "domain", `${cand}.ts`);
     if (fs7.existsSync(p1)) return { filePath: p1, ifaceName: cand };
-    const p22 = path6.join(projectRoot, "src", "domain", `${cand}.ts`);
+    const p22 = path15.join(projectRoot, "src", "domain", `${cand}.ts`);
     if (fs7.existsSync(p22)) return { filePath: p22, ifaceName: cand };
-    const p32 = path6.join(projectRoot, "interfaces", `${cand}.ts`);
+    const p32 = path15.join(projectRoot, "interfaces", `${cand}.ts`);
     if (fs7.existsSync(p32)) return { filePath: p32, ifaceName: cand };
   }
   return null;
@@ -784,7 +784,7 @@ function generateStubCode(stubClassName, ifaceName, entityName, featureName, met
   const entitiesVar = `${entityVar}s`;
   const idKey = `${entityVar}Id`;
   const impPath = ifaceImportPath || `../domain/${ifaceName}.js`;
-  const entityImportPath = ifaceImportPath ? `${path6.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
+  const entityImportPath = ifaceImportPath ? `${path15.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
   const importsByFrom = /* @__PURE__ */ new Map();
   for (const imp of domainImports) {
     if (imp.name === ifaceName || imp.name === baseEntity) continue;
@@ -833,7 +833,7 @@ function generateConcreteInfraCode(className, ifaceName, dependencies = [], meth
     if (baseEntity) {
       finalMethods = synthesizeCrudMethods(baseEntity);
       if (!finalDomainImports.some((imp) => imp.name === baseEntity)) {
-        const importPath = ifaceImportPath ? `${path6.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
+        const importPath = ifaceImportPath ? `${path15.dirname(ifaceImportPath)}/${baseEntity}.js` : `../domain/${baseEntity}.js`;
         finalDomainImports.push({
           name: baseEntity,
           from: importPath,
@@ -878,8 +878,8 @@ function generateInfrastructure(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const className = toPascalCase(options.name);
   const isFeatureScope = options.scope !== "global" && Boolean(options.feature);
-  const targetDir = options.targetDir || (isFeatureScope ? path6.join(resolveFeaturesDir(projectRoot), options.feature, "infrastructure") : path6.join(projectRoot, "infrastructure"));
-  const filePath = path6.join(targetDir, `${className}.ts`);
+  const targetDir = options.targetDir || (isFeatureScope ? path15.join(resolveFeaturesDir(projectRoot), options.feature, "infrastructure") : path15.join(projectRoot, "infrastructure"));
+  const filePath = path15.join(targetDir, `${className}.ts`);
   let code;
   if (options.implementsInterface) {
     const rawIfaceName = options.implementsInterface;
@@ -893,7 +893,7 @@ function generateInfrastructure(options) {
     const ifaceFilePath = hierarchy.ifaceFilePath;
     let ifaceImportPath;
     if (ifaceFilePath) {
-      let rel = path6.relative(targetDir, ifaceFilePath).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+      let rel = path15.relative(targetDir, ifaceFilePath).replace(/\\/g, "/").replace(/\.ts$/, ".js");
       if (!rel.startsWith(".")) rel = "./" + rel;
       ifaceImportPath = rel;
     } else if (isFeatureScope) {
@@ -906,8 +906,8 @@ function generateInfrastructure(options) {
         if (new RegExp(`\\b${item.name}\\b`).test(allSignatures)) {
           let fromPath;
           if (imp.specifier.startsWith(".") && ifaceFilePath) {
-            const absTarget = path6.resolve(path6.dirname(ifaceFilePath), imp.specifier);
-            let rel = path6.relative(targetDir, absTarget).replace(/\\/g, "/");
+            const absTarget = path15.resolve(path15.dirname(ifaceFilePath), imp.specifier);
+            let rel = path15.relative(targetDir, absTarget).replace(/\\/g, "/");
             if (!rel.startsWith(".")) rel = "./" + rel;
             fromPath = rel;
           } else {
@@ -1094,8 +1094,8 @@ function generateUseCase(options) {
   const files = [];
   const projectRoot = options.projectRoot || findProjectRoot();
   const ucName = toPascalCase(options.name);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), options.feature, "useCases");
-  const filePath = path6.join(targetDir, `${ucName}.ts`);
+  const targetDir = options.targetDir || path15.join(resolveFeaturesDir(projectRoot), options.feature, "useCases");
+  const filePath = path15.join(targetDir, `${ucName}.ts`);
   const code = generateUseCaseCode(
     ucName,
     options.dependencies || [],
@@ -1111,7 +1111,7 @@ function generateUseCase(options) {
     })
   );
   if (options.includeTest) {
-    const testPath = path6.join(targetDir, `${ucName}.test.ts`);
+    const testPath = path15.join(targetDir, `${ucName}.test.ts`);
     const testCode = generateUseCaseTestCode(ucName, options.dependencies || []);
     files.push(
       writeFileSafely(testPath, testCode, {
@@ -1179,9 +1179,9 @@ function generateHttpHandler(options) {
   const files = [];
   const projectRoot = options.projectRoot || findProjectRoot();
   const className = toPascalCase(options.name);
-  const pxDir = path6.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress");
-  const handlersDir = path6.join(pxDir, "handlers");
-  const pxIndexPath = path6.join(pxDir, "index.ts");
+  const pxDir = path15.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress");
+  const handlersDir = path15.join(pxDir, "handlers");
+  const pxIndexPath = path15.join(pxDir, "index.ts");
   if (!fs7.existsSync(pxIndexPath)) {
     const featurePath = options.routePrefix || `/${options.feature.toLowerCase()}`;
     const pxIndexContent = renderTemplate(expressIndexTemplate, {
@@ -1195,7 +1195,7 @@ function generateHttpHandler(options) {
       })
     );
   }
-  const handlerFilePath = path6.join(handlersDir, `${className}.ts`);
+  const handlerFilePath = path15.join(handlersDir, `${className}.ts`);
   const code = generateHttpHandlerCode(
     className,
     options.method || "get",
@@ -1216,7 +1216,7 @@ function generateHttpHandler(options) {
   return files;
 }
 function updateOrGenerateDiProvider(featureDir, featureName, bindings = [], options = {}) {
-  const providerPath = path6.join(featureDir, "diProvider.ts");
+  const providerPath = path15.join(featureDir, "diProvider.ts");
   const pascalFeature = toPascalCase(featureName);
   const providerModuleName = `${pascalFeature}Provider`;
   if (fs7.existsSync(providerPath) && !options.overwrite) {
@@ -1279,7 +1279,7 @@ function generateFeature(options) {
   const projectRoot = options.projectRoot || findProjectRoot();
   const rawName = options.name.trim();
   const featureName = toCamelCase(rawName);
-  const targetDir = options.targetDir || path6.join(resolveFeaturesDir(projectRoot), featureName);
+  const targetDir = options.targetDir || path15.join(resolveFeaturesDir(projectRoot), featureName);
   const routePath = options.routePath || `/${featureName}`;
   const rawEntities = [];
   if (options.entityNames && options.entityNames.length > 0) {
@@ -1300,7 +1300,7 @@ function generateFeature(options) {
       const domainFile = generateDomain({
         name: ent,
         feature: featureName,
-        targetDir: path6.join(targetDir, "domain"),
+        targetDir: path15.join(targetDir, "domain"),
         projectRoot,
         dryRun: options.dryRun,
         overwrite: options.overwrite,
@@ -1320,7 +1320,7 @@ function generateFeature(options) {
       const ifaceFile = generateInterface({
         name: ifaceName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "domain"),
+        targetDir: path15.join(targetDir, "domain"),
         entityName: ent,
         projectRoot,
         dryRun: options.dryRun,
@@ -1337,7 +1337,7 @@ function generateFeature(options) {
       const stubFile = generateInfrastructure({
         name: stubName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "infrastructure"),
+        targetDir: path15.join(targetDir, "infrastructure"),
         kind: "stub",
         implementsInterface: ifaceName,
         entityName: ent,
@@ -1379,7 +1379,7 @@ function generateFeature(options) {
       const ucFiles = generateUseCase({
         name: ucName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "useCases"),
+        targetDir: path15.join(targetDir, "useCases"),
         dependencies: options.includeInterface !== false ? [ifaceName] : [],
         inputProperties: [{ name: idParam, type: "string" }],
         outputProperties: [{ name: entVar, type: primaryEntity }],
@@ -1424,7 +1424,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path15.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: entVar, type: ent }],
             outputProperties: [{ name: entVar, type: ent }],
@@ -1457,7 +1457,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path15.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: idParam, type: "string" }],
             outputProperties: [{ name: entVar, type: ent }],
@@ -1490,7 +1490,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path15.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [
               { name: "page", type: "number", optional: true },
@@ -1534,7 +1534,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path15.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: entVar, type: ent }],
             outputProperties: [{ name: entVar, type: ent }],
@@ -1567,7 +1567,7 @@ function generateFeature(options) {
           const ucFiles = generateUseCase({
             name: ucName,
             feature: featureName,
-            targetDir: path6.join(targetDir, "useCases"),
+            targetDir: path15.join(targetDir, "useCases"),
             dependencies: deps,
             inputProperties: [{ name: idParam, type: "string" }],
             outputProperties: [{ name: "success", type: "boolean" }],
@@ -1604,7 +1604,7 @@ function generateFeature(options) {
       const ucFiles = generateUseCase({
         name: ucName,
         feature: featureName,
-        targetDir: path6.join(targetDir, "useCases"),
+        targetDir: path15.join(targetDir, "useCases"),
         dependencies: customUc.dependencies || [],
         inputProperties: customUc.inputProperties || [],
         outputProperties: customUc.outputProperties || [],
@@ -1636,8 +1636,8 @@ function generateFeature(options) {
     }
   }
   if (options.includeExpress !== false) {
-    const pxDir = path6.join(targetDir, "pxExpress");
-    const pxIndexPath = path6.join(pxDir, "index.ts");
+    const pxDir = path15.join(targetDir, "pxExpress");
+    const pxIndexPath = path15.join(pxDir, "index.ts");
     if (!files.some((f) => f.absolutePath === pxIndexPath)) {
       const pxIndexContent = renderTemplate(expressIndexTemplate, { routePath });
       files.push(
@@ -1765,7 +1765,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
     ).trim();
   }
   const normalizedName = toCamelCase(name);
-  const defaultDir = path6.relative(projectRoot, path6.join(resolveFeaturesDir(projectRoot), normalizedName));
+  const defaultDir = path15.relative(projectRoot, path15.join(resolveFeaturesDir(projectRoot), normalizedName));
   let targetDirRel = defaultDir;
   if (!flags.yes && !flags.target) {
     targetDirRel = handleCancel(
@@ -1776,7 +1776,7 @@ async function runFeatureCommand(featureNameArg, flags = {}) {
       })
     ).trim();
   }
-  const targetDir = flags.target ? path6.resolve(projectRoot, flags.target) : path6.resolve(projectRoot, targetDirRel);
+  const targetDir = flags.target ? path15.resolve(projectRoot, flags.target) : path15.resolve(projectRoot, targetDirRel);
   let includeExpress = flags.express !== void 0 ? Boolean(flags.express) : true;
   let routePath = `/${normalizedName}`;
   let includeDomain = true;
@@ -2444,7 +2444,7 @@ async function runInfrastructureCommand(classNameArg, flags = {}) {
   const infraFile = generateInfrastructure(options);
   files.push(infraFile);
   if (registerInProvider && scope === "feature" && feature && implementsInterface) {
-    const featureDir = path6.join(resolveFeaturesDir(projectRoot), feature);
+    const featureDir = path15.join(resolveFeaturesDir(projectRoot), feature);
     const providerFile = updateOrGenerateDiProvider(
       featureDir,
       feature,
@@ -2606,7 +2606,7 @@ async function runInterfaceCommand(interfaceNameArg, flags = {}) {
     files.push(stubFile);
   }
   if (registerInProvider && generateStub) {
-    const featureDir = path6.join(resolveFeaturesDir(projectRoot), feature);
+    const featureDir = path15.join(resolveFeaturesDir(projectRoot), feature);
     const providerFile = updateOrGenerateDiProvider(
       featureDir,
       feature,
@@ -2794,21 +2794,21 @@ function generateInjectable(options) {
   const className = toPascalCase(options.name);
   let targetDir = "";
   if (options.customPath) {
-    targetDir = path6.isAbsolute(options.customPath) ? options.customPath : path6.join(projectRoot, options.customPath);
+    targetDir = path15.isAbsolute(options.customPath) ? options.customPath : path15.join(projectRoot, options.customPath);
   } else if (options.location === "feature-service" && options.feature) {
-    targetDir = path6.join(resolveFeaturesDir(projectRoot), options.feature, "services");
+    targetDir = path15.join(resolveFeaturesDir(projectRoot), options.feature, "services");
   } else if (options.location === "feature-transformer" && options.feature) {
-    targetDir = path6.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress", "transformers");
+    targetDir = path15.join(resolveFeaturesDir(projectRoot), options.feature, "pxExpress", "transformers");
   } else if (options.location === "module") {
-    targetDir = path6.join(projectRoot, "modules", className);
+    targetDir = path15.join(projectRoot, "modules", className);
   } else {
-    targetDir = options.feature ? path6.join(resolveFeaturesDir(projectRoot), options.feature, "services") : path6.join(projectRoot, "shared", className.toLowerCase());
+    targetDir = options.feature ? path15.join(resolveFeaturesDir(projectRoot), options.feature, "services") : path15.join(projectRoot, "shared", className.toLowerCase());
   }
-  const filePath = path6.join(targetDir, `${className}.ts`);
+  const filePath = path15.join(targetDir, `${className}.ts`);
   let ifaceName;
   if (options.generateInterface) {
     ifaceName = `I${className}`;
-    const ifacePath = path6.join(targetDir, `${ifaceName}.ts`);
+    const ifacePath = path15.join(targetDir, `${ifaceName}.ts`);
     const ifaceContent = renderTemplate(injectableInterfaceTemplate, { ifaceName });
     files.push(
       writeFileSafely(ifacePath, ifaceContent, {
@@ -3042,40 +3042,105 @@ async function handleCreate(type, name, flags = {}) {
   }
 }
 var DEFAULT_REGISTRY_BASE = "https://raw.githubusercontent.com/solid-stack-digital/mason-registry/main";
+function normalizeRegistryUrl(urlOrPath, baseDir) {
+  let trimmed = urlOrPath.trim();
+  const gitSshRegex = /^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/;
+  const sshMatch = trimmed.match(gitSshRegex);
+  if (sshMatch && sshMatch[1] && sshMatch[2]) {
+    return `https://raw.githubusercontent.com/${sshMatch[1]}/${sshMatch[2]}/main`;
+  }
+  const githubWebRegex = /^https?:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?(?:\/tree\/([^/]+))?\/?$/;
+  const webMatch = trimmed.match(githubWebRegex);
+  if (webMatch && webMatch[1] && webMatch[2]) {
+    const owner = webMatch[1];
+    const repo = webMatch[2];
+    const branch = webMatch[3] || "main";
+    return `https://raw.githubusercontent.com/${owner}/${repo}/${branch}`;
+  }
+  if (baseDir && (trimmed.startsWith("./") || trimmed.startsWith("../") || trimmed === "." || trimmed === "..")) {
+    return path15.resolve(baseDir, trimmed);
+  }
+  return trimmed;
+}
+function findLocalRegistry(startDir = process.cwd()) {
+  let current = path15.resolve(startDir);
+  while (true) {
+    const candidate = path15.join(current, "mason-registry");
+    if (fs7.existsSync(candidate) && fs7.existsSync(path15.join(candidate, "index.json"))) {
+      return candidate;
+    }
+    const parent = path15.dirname(current);
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
 function getRegistryBase(projectRoot, override) {
+  const rootDir = projectRoot ? path15.resolve(projectRoot) : process.cwd();
   if (override && override.trim()) {
-    return override.trim();
+    return normalizeRegistryUrl(override.trim(), rootDir);
   }
   if (process.env.MASON_REGISTRY_URL && process.env.MASON_REGISTRY_URL.trim()) {
-    return process.env.MASON_REGISTRY_URL.trim();
+    return normalizeRegistryUrl(process.env.MASON_REGISTRY_URL.trim(), rootDir);
   }
-  if (projectRoot) {
-    const configPath = path6.join(projectRoot, "mason.config.json");
+  const configLocations = [
+    path15.join(rootDir, "mason.config.json"),
+    path15.join(process.cwd(), "mason.config.json")
+  ];
+  for (const configPath of configLocations) {
     if (fs7.existsSync(configPath)) {
       try {
         const config = JSON.parse(fs7.readFileSync(configPath, "utf-8"));
         if (config.registry && typeof config.registry === "string") {
-          return config.registry.trim();
+          return normalizeRegistryUrl(config.registry.trim(), path15.dirname(configPath));
         }
       } catch {
       }
     }
   }
-  if (projectRoot) {
-    const siblingRegistry = path6.resolve(projectRoot, "../mason-registry");
-    if (fs7.existsSync(siblingRegistry) && fs7.existsSync(path6.join(siblingRegistry, "index.json"))) {
-      return siblingRegistry;
+  const pkgLocations = [
+    path15.join(rootDir, "package.json"),
+    path15.join(process.cwd(), "package.json")
+  ];
+  for (const pkgPath of pkgLocations) {
+    if (fs7.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs7.readFileSync(pkgPath, "utf-8"));
+        if (pkg.mason?.registry && typeof pkg.mason.registry === "string") {
+          return normalizeRegistryUrl(pkg.mason.registry.trim(), path15.dirname(pkgPath));
+        }
+      } catch {
+      }
     }
   }
+  const localRegistry = findLocalRegistry(rootDir);
+  if (localRegistry) {
+    return localRegistry;
+  }
   return DEFAULT_REGISTRY_BASE;
 }
 async function fetchRegistryFile(registryBase, relPath) {
   const cleanRelPath = relPath.replace(/^\/+/, "");
   if (registryBase.startsWith("http://") || registryBase.startsWith("https://")) {
     const url = `${registryBase.replace(/\/+$/, "")}/${cleanRelPath}`;
-    const res = await fetch(url);
+    const headers = {};
+    const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+    const res = await fetch(url, { headers });
     if (!res.ok) {
-      throw new Error(`Failed to fetch ${cleanRelPath} from ${url} (HTTP ${res.status}: ${res.statusText})`);
+      let extraHint = "";
+      if (res.status === 404) {
+        extraHint = `
+  Possible reasons:
+  \u2022 If using a private GitHub repository, ensure GITHUB_TOKEN is set in your environment.
+  \u2022 If your registry has not yet been pushed to GitHub, point to your local directory:
+    - CLI flag:      mason import ... --registry /path/to/mason-registry
+    - Environment:   export MASON_REGISTRY_URL=/path/to/mason-registry
+    - Config file:   Create mason.config.json with { "registry": "/path/to/mason-registry" }`;
+      }
+      throw new Error(`Failed to fetch ${cleanRelPath} from ${url} (HTTP ${res.status}: ${res.statusText})${extraHint}`);
     }
     return await res.text();
   }
@@ -3083,7 +3148,7 @@ async function fetchRegistryFile(registryBase, relPath) {
   if (baseDir.startsWith("file://")) {
     baseDir = fileURLToPath(baseDir);
   }
-  const filePath = path6.resolve(baseDir, cleanRelPath);
+  const filePath = path15.resolve(baseDir, cleanRelPath);
   if (!fs7.existsSync(filePath)) {
     throw new Error(`Registry file not found at ${filePath}`);
   }
@@ -3149,14 +3214,14 @@ function findClosestMatch(target, candidates) {
   return null;
 }
 function detectPackageManager(projectRoot) {
-  if (fs7.existsSync(path6.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs7.existsSync(path6.join(projectRoot, "yarn.lock"))) return "yarn";
-  if (fs7.existsSync(path6.join(projectRoot, "bun.lockb")) || fs7.existsSync(path6.join(projectRoot, "bun.lock"))) return "bun";
+  if (fs7.existsSync(path15.join(projectRoot, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs7.existsSync(path15.join(projectRoot, "yarn.lock"))) return "yarn";
+  if (fs7.existsSync(path15.join(projectRoot, "bun.lockb")) || fs7.existsSync(path15.join(projectRoot, "bun.lock"))) return "bun";
   return "npm";
 }
 function getMissingNpmPackages(projectRoot, requiredPackages) {
   if (!requiredPackages || requiredPackages.length === 0) return [];
-  const pkgJsonPath = path6.join(projectRoot, "package.json");
+  const pkgJsonPath = path15.join(projectRoot, "package.json");
   if (!fs7.existsSync(pkgJsonPath)) {
     return requiredPackages;
   }
@@ -3283,7 +3348,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
     const sharedDeps = manifest.dependencies?.shared || [];
     for (const dep of sharedDeps) {
-      const depPath = path6.join(projectRoot, "src", "shared", dep);
+      const depPath = path15.join(projectRoot, "src", "shared", dep);
       if (!fs7.existsSync(depPath) && !importedModules.has(`shared:${dep}`)) {
         p3.log.info(`  \u21B3 Resolving required shared dependency: ${pc13.cyan(dep)}`);
         await importModuleRecursive("shared", dep);
@@ -3291,7 +3356,7 @@ async function handleImport(typeArg, nameArg, flags = {}) {
     }
     const featureDeps = manifest.dependencies?.features || [];
     for (const dep of featureDeps) {
-      const depPath = path6.join(projectRoot, "src", "features", dep);
+      const depPath = path15.join(projectRoot, "src", "features", dep);
       if (!fs7.existsSync(depPath) && !importedModules.has(`feature:${dep}`)) {
         p3.log.info(`  \u21B3 Resolving required feature dependency: ${pc13.cyan(dep)}`);
         await importModuleRecursive("feature", dep);
@@ -3301,21 +3366,21 @@ async function handleImport(typeArg, nameArg, flags = {}) {
       requiredNpmPackages.add(pkg);
     }
     const folder = modType === "shared" ? "shared" : "features";
-    const targetDir = path6.join(projectRoot, "src", folder, modName);
+    const targetDir = path15.join(projectRoot, "src", folder, modName);
     for (const file of manifest.files || []) {
       if (file === "registry.json") continue;
       const remoteFilePath = `${folder}/${modName}/${file}`;
-      const localFilePath = path6.join(targetDir, file);
+      const localFilePath = path15.join(targetDir, file);
       if (fs7.existsSync(localFilePath) && !flags.overwrite) {
-        p3.log.warn(`  \u21B3 Skipping existing file: ${pc13.dim(path6.relative(projectRoot, localFilePath))} (use --overwrite to replace)`);
+        p3.log.warn(`  \u21B3 Skipping existing file: ${pc13.dim(path15.relative(projectRoot, localFilePath))} (use --overwrite to replace)`);
         continue;
       }
       const content = await fetchRegistryFile(registryBase, remoteFilePath);
       if (!flags.dryRun) {
-        fs7.mkdirSync(path6.dirname(localFilePath), { recursive: true });
+        fs7.mkdirSync(path15.dirname(localFilePath), { recursive: true });
         fs7.writeFileSync(localFilePath, content, "utf-8");
       }
-      const displayPath = path6.relative(projectRoot, localFilePath);
+      const displayPath = path15.relative(projectRoot, localFilePath);
       totalWrittenFiles.push(displayPath);
       p3.log.message(`  ${pc13.green("+")} ${displayPath}`);
     }