portosaurus 0.16.4 → 0.16.6

package/lib/src/cli/commands/init.js

@@ -35,17 +35,36 @@ export async function initCommand(directory) {
         }
         // 2. Resolve templates directory
         // We need to robustly find templates whether running from source or built lib
-        let templatesDir = path.resolve(__dirname, '../../../../templates');
-        // Check if we are in built mode (lib structure might differ slightly depending on tsc output)
-        // If 'bin' and 'src' are strictly separated in source, but compiled to 'lib', we need strict logic.
-        // For now, assuming development with tsx:
-        // bin/cli.ts calls src/cli/commands/init.ts
-        // templates is at root.
-        // From src/cli/commands -> ../../../templates
-        if (!fs.existsSync(templatesDir)) {
-            // Try checking if we are in 'lib'
-            templatesDir = path.resolve(__dirname, '../../../templates');
+        // 2. Resolve templates directory
+        // We need to robustly find templates whether running from source or built lib
+        // Strategy: Find package root by looking for package.json, then look for templates
+        let currentDir = __dirname;
+        let packageRoot = '';
+        // Walk up until we find package.json or hit root
+        for (let i = 0; i < 10; i++) {
+            if (fs.existsSync(path.join(currentDir, 'package.json'))) {
+                packageRoot = currentDir;
+                break;
+            }
+            const parent = path.dirname(currentDir);
+            if (parent === currentDir)
+                break; // Root
+            currentDir = parent;
         }
+        if (!packageRoot) {
+            // Fallback: try common locations relative to this file
+            // If in lib/src/cli/commands -> ../../../..
+            // If in src/cli/commands -> ../../../..
+            const potentialRoot = path.resolve(__dirname, '../../../../');
+            if (fs.existsSync(path.join(potentialRoot, 'package.json'))) {
+                packageRoot = potentialRoot;
+            }
+        }
+        if (!packageRoot) {
+            spinner.fail(`Could not find package root from ${__dirname}`);
+            return;
+        }
+        const templatesDir = path.join(packageRoot, 'templates');
         if (!fs.existsSync(templatesDir)) {
             spinner.fail(`Could not find templates directory at ${templatesDir}`);
             return;
@@ -53,7 +72,13 @@ export async function initCommand(directory) {
         // 3. Copy templates
         spinner.text = 'Copying template files...';
         await fs.copy(templatesDir, targetDir, {
-            filter: (src) => !src.includes('node_modules') && !src.includes('package.json') // Don't copy package.json if it exists there, we generate it
+            filter: (src) => {
+                // We only want to filter out node_modules that might be INSIDE the template directory (unlikely, but safe)
+                // But src path will be absolute, so it MIGHT contain node_modules if the package itself is installed in node_modules
+                // We should only check the relative path from templatesDir
+                const relativePath = path.relative(templatesDir, src);
+                return !relativePath.includes('node_modules') && !relativePath.includes('package.json');
+            }
         });
         // Rename _tsconfig.json to tsconfig.json
         const tempTsConfig = path.join(targetDir, '_tsconfig.json');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portosaurus",
-  "version": "0.16.4",
+  "version": "0.16.6",
   "license": "GPL-3.0",
   "author": "soymadip",
   "description": "Complete portfolio cum personal website solution for your digital personality",

package/src/cli/commands/init.ts

@@ -40,20 +40,41 @@ export async function initCommand(directory: string) {
 
     // 2. Resolve templates directory
     // We need to robustly find templates whether running from source or built lib
-    let templatesDir = path.resolve(__dirname, '../../../../templates');
+    // 2. Resolve templates directory
+    // We need to robustly find templates whether running from source or built lib
+    // Strategy: Find package root by looking for package.json, then look for templates
     
-    // Check if we are in built mode (lib structure might differ slightly depending on tsc output)
-    // If 'bin' and 'src' are strictly separated in source, but compiled to 'lib', we need strict logic.
-    // For now, assuming development with tsx:
-    // bin/cli.ts calls src/cli/commands/init.ts
-    // templates is at root.
-    // From src/cli/commands -> ../../../templates
+    let currentDir = __dirname;
+    let packageRoot = '';
     
-    if (!fs.existsSync(templatesDir)) {
-         // Try checking if we are in 'lib'
-          templatesDir = path.resolve(__dirname, '../../../templates');
+    // Walk up until we find package.json or hit root
+    for (let i = 0; i < 10; i++) {
+        if (fs.existsSync(path.join(currentDir, 'package.json'))) {
+            packageRoot = currentDir;
+            break;
+        }
+        const parent = path.dirname(currentDir);
+        if (parent === currentDir) break; // Root
+        currentDir = parent;
+    }
+
+    if (!packageRoot) {
+        // Fallback: try common locations relative to this file
+        // If in lib/src/cli/commands -> ../../../..
+        // If in src/cli/commands -> ../../../..
+        const potentialRoot = path.resolve(__dirname, '../../../../');
+        if (fs.existsSync(path.join(potentialRoot, 'package.json'))) {
+            packageRoot = potentialRoot;
+        }
     }
 
+    if (!packageRoot) {
+        spinner.fail(`Could not find package root from ${__dirname}`);
+        return;
+    }
+
+    const templatesDir = path.join(packageRoot, 'templates');
+
     if (!fs.existsSync(templatesDir)) {
         spinner.fail(`Could not find templates directory at ${templatesDir}`);
         return;
@@ -62,7 +83,13 @@ export async function initCommand(directory: string) {
     // 3. Copy templates
     spinner.text = 'Copying template files...';
     await fs.copy(templatesDir, targetDir, {
-        filter: (src: string) => !src.includes('node_modules') && !src.includes('package.json') // Don't copy package.json if it exists there, we generate it
+        filter: (src: string) => {
+            // We only want to filter out node_modules that might be INSIDE the template directory (unlikely, but safe)
+            // But src path will be absolute, so it MIGHT contain node_modules if the package itself is installed in node_modules
+            // We should only check the relative path from templatesDir
+            const relativePath = path.relative(templatesDir, src);
+            return !relativePath.includes('node_modules') && !relativePath.includes('package.json');
+        }
     });
     
     // Rename _tsconfig.json to tsconfig.json