portosaurus 0.16.3 → 0.16.5

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;

package/lib/src/utils/cssUtils.js

@@ -19,13 +19,22 @@ export function getCssVar(varName) {
     // We need to handle both dev (src/css) and prod (lib/src/css) structures
     // When running in lib: __dirname is .../lib/src/utils
     // We want .../lib/src/css
-    const cssDir = path.resolve(__dirname, '../css');
-    const srcCssDir = path.resolve(__dirname, '../../src/css'); // Fallback for some dev setups
+    const cssDir = path.resolve(__dirname, '../css'); // ../css
+    const srcCssDir = path.resolve(__dirname, '../../src/css'); // ../../src/css (if inside lib/src/utils -> lib/src/css ?) 
+    // Real structure in node_modules:
+    // lib/src/utils/cssUtils.js
+    // src/css/custom.css
+    //
+    // Relative path from lib/src/utils to src/css is:
+    // ../../../src/css
+    const installedCssDir = path.resolve(__dirname, '../../../src/css');
     const potentialFiles = [
         path.join(cssDir, 'custom.css'),
         path.join(cssDir, 'catppuccin.css'),
         path.join(srcCssDir, 'custom.css'),
-        path.join(srcCssDir, 'catppuccin.css')
+        path.join(srcCssDir, 'catppuccin.css'),
+        path.join(installedCssDir, 'custom.css'),
+        path.join(installedCssDir, 'catppuccin.css')
     ];
     const cssFiles = potentialFiles.filter(f => fs.existsSync(f));
     if (cssFiles.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portosaurus",
-  "version": "0.16.3",
+  "version": "0.16.5",
   "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;

package/src/utils/cssUtils.ts

@@ -26,14 +26,25 @@ export function getCssVar(varName: string): string {
   // When running in lib: __dirname is .../lib/src/utils
   // We want .../lib/src/css
   
-  const cssDir = path.resolve(__dirname, '../css');
-  const srcCssDir = path.resolve(__dirname, '../../src/css'); // Fallback for some dev setups
+  const cssDir = path.resolve(__dirname, '../css'); // ../css
+  const srcCssDir = path.resolve(__dirname, '../../src/css'); // ../../src/css (if inside lib/src/utils -> lib/src/css ?) 
+  
+  // Real structure in node_modules:
+  // lib/src/utils/cssUtils.js
+  // src/css/custom.css
+  //
+  // Relative path from lib/src/utils to src/css is:
+  // ../../../src/css
+  
+  const installedCssDir = path.resolve(__dirname, '../../../src/css');
 
   const potentialFiles = [
     path.join(cssDir, 'custom.css'),
     path.join(cssDir, 'catppuccin.css'),
     path.join(srcCssDir, 'custom.css'),
-    path.join(srcCssDir, 'catppuccin.css')
+    path.join(srcCssDir, 'catppuccin.css'),
+    path.join(installedCssDir, 'custom.css'),
+    path.join(installedCssDir, 'catppuccin.css')
   ];
 
   const cssFiles = potentialFiles.filter(f => fs.existsSync(f));