blok0 0.1.3 → 0.1.5

package/dist/api/index.d.ts

@@ -8,6 +8,10 @@ export interface BlockMetadata {
             url: string;
         };
     }>;
+    externalPackages: Array<{
+        id: string;
+        package: string;
+    }>;
     _status: 'published' | 'draft';
 }
 export interface CodeFile {

package/dist/blocks/index.d.ts

@@ -35,6 +35,10 @@ export declare function createBlockEntry(metadata: {
     name: string;
     slug: string;
     sourceUrl: string;
+    externalPackages: Array<{
+        id: string;
+        package: string;
+    }>;
 }, dir: string, configPath: string, componentPath: string, checksums: {
     [filename: string]: string;
 }): BlockEntry;

package/dist/blocks/index.js

@@ -138,6 +138,7 @@ function createBlockEntry(metadata, dir, configPath, componentPath, checksums) {
         dir,
         configPath,
         componentPath,
+        externalPackages: metadata.externalPackages,
         source: {
             url: metadata.sourceUrl,
             id: metadata.id,

package/dist/handlers/add-block.js

@@ -40,6 +40,7 @@ const api_1 = require("../api");
 const registry_1 = require("../registry");
 const blocks_1 = require("../blocks");
 const ast_1 = require("../ast");
+const packageManager_1 = require("../packageManager");
 const ui_1 = require("../ui");
 /**
  * Handle add block command
@@ -87,16 +88,22 @@ async function handleAddBlock(blockUrl, options = {}) {
             require('fs').rmSync(dir, { recursive: true, force: true });
             process.exit(1);
         }
-        // Step 7: Calculate checksums
+        // Step 7: Install external packages if any
+        if (metadata.externalPackages && metadata.externalPackages.length > 0) {
+            const packageNames = metadata.externalPackages.map(pkg => pkg.package);
+            await (0, ui_1.withSpinner)(`Installing ${packageNames.length} external package(s)`, () => (0, packageManager_1.installPackages)(packageNames), { emoji: ui_1.EMOJIS.PACKAGE, successText: `Installed ${packageNames.length} package(s)` });
+        }
+        // Step 8: Calculate checksums
         const checksums = (0, registry_1.calculateDirectoryChecksums)(dir);
-        // Step 8: Create registry entry
+        // Step 9: Create registry entry
         const blockEntry = (0, blocks_1.createBlockEntry)({
             id: metadata.id,
             name: metadata.name,
             slug: metadata.slug,
-            sourceUrl: blockUrl
+            sourceUrl: blockUrl,
+            externalPackages: metadata.externalPackages
         }, dir, configPath, componentPath, checksums);
-        // Step 9: Update Pages collection (AST manipulation)
+        // Step 10: Update Pages collection (AST manipulation)
         const pagesCollectionPath = (0, ast_1.findPagesCollection)();
         if (pagesCollectionPath) {
             await (0, ui_1.withSpinner)('Updating Pages collection', async () => {
@@ -108,7 +115,7 @@ async function handleAddBlock(blockUrl, options = {}) {
         else {
             ui_1.log.warning('Could not find Pages collection file. You may need to manually add the block to your collections.');
         }
-        // Step 10: Update RenderBlocks component (AST manipulation)
+        // Step 11: Update RenderBlocks component (AST manipulation)
         const renderBlocksPath = (0, ast_1.findRenderBlocksComponent)();
         if (renderBlocksPath) {
             await (0, ui_1.withSpinner)('Updating RenderBlocks component', async () => {
@@ -119,7 +126,7 @@ async function handleAddBlock(blockUrl, options = {}) {
         else {
             ui_1.log.warning('Could not find RenderBlocks component. You may need to manually add the block component.');
         }
-        // Step 11: Register block in registry
+        // Step 12: Register block in registry
         await (0, ui_1.withSpinner)('Registering block', async () => (0, registry_1.addBlockToRegistry)(blockEntry), { emoji: ui_1.EMOJIS.CHECK, successText: 'Block registered successfully' });
         ui_1.log.success('Block installation complete!');
         (0, ui_1.showNextSteps)([

package/dist/index.js

@@ -143,7 +143,7 @@ async function main() {
             case 'add':
                 const [addSubcommand, ...addRestArgs] = restArgs;
                 if (addSubcommand === 'block') {
-                    const blockUrl = `https://www.blok0.com/api/cli/sections/${addRestArgs[0]}`;
+                    const blockUrl = `https://www.blok0.xyz/api/cli/sections/${addRestArgs[0]}`;
                     if (!blockUrl) {
                         console.error('Error: Block Slug is required. Use: blok0 add block <slug>');
                         process.exit(1);

package/dist/packageManager.d.ts

@@ -0,0 +1,9 @@
+export type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun';
+/**
+ * Detect the package manager used in the current project
+ */
+export declare function detectPackageManager(): PackageManager;
+/**
+ * Install packages using the detected package manager with fallback to npm
+ */
+export declare function installPackages(packages: string[]): Promise<void>;

package/dist/packageManager.js

@@ -0,0 +1,139 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectPackageManager = detectPackageManager;
+exports.installPackages = installPackages;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const util_1 = require("util");
+const execAsync = (0, util_1.promisify)(child_process_1.exec);
+/**
+ * Detect the package manager used in the current project
+ */
+function detectPackageManager() {
+    const cwd = process.cwd();
+    // Check for lock files in order of preference
+    if (fs.existsSync(path.join(cwd, 'bun.lockb'))) {
+        return 'bun';
+    }
+    if (fs.existsSync(path.join(cwd, 'pnpm-lock.yaml'))) {
+        return 'pnpm';
+    }
+    if (fs.existsSync(path.join(cwd, 'yarn.lock'))) {
+        return 'yarn';
+    }
+    if (fs.existsSync(path.join(cwd, 'package-lock.json'))) {
+        return 'npm';
+    }
+    // Default to npm if no lock file is found
+    return 'npm';
+}
+/**
+ * Get the install command for a package manager
+ */
+function getInstallCommand(packageManager, packages) {
+    const packageList = packages.join(' ');
+    switch (packageManager) {
+        case 'bun':
+            return `bun add ${packageList}`;
+        case 'pnpm':
+            return `pnpm add ${packageList}`;
+        case 'yarn':
+            return `yarn add ${packageList}`;
+        case 'npm':
+        default:
+            return `npm install ${packageList}`;
+    }
+}
+/**
+ * Install packages using the detected package manager with fallback to npm
+ */
+async function installPackages(packages) {
+    if (packages.length === 0) {
+        return;
+    }
+    const primaryPackageManager = detectPackageManager();
+    // Try the detected package manager first
+    try {
+        const command = getInstallCommand(primaryPackageManager, packages);
+        console.log(`Running: ${command}`);
+        const { stdout, stderr } = await execAsync(command, {
+            cwd: process.cwd(),
+            env: { ...process.env }
+        });
+        if (stderr) {
+            console.warn(`Package installation warnings: ${stderr}`);
+        }
+        console.log(`Successfully installed packages: ${packages.join(', ')}`);
+        return;
+    }
+    catch (error) {
+        console.error(`Failed with ${primaryPackageManager}: ${error.message || 'Unknown error'}`);
+        if (error.stdout) {
+            console.error(`stdout: ${error.stdout}`);
+        }
+        if (error.stderr) {
+            console.error(`stderr: ${error.stderr}`);
+        }
+    }
+    // If primary package manager failed and it's not npm, try npm as fallback
+    if (primaryPackageManager !== 'npm') {
+        try {
+            console.log(`Falling back to npm...`);
+            const command = getInstallCommand('npm', packages);
+            console.log(`Running: ${command}`);
+            const { stdout, stderr } = await execAsync(command, {
+                cwd: process.cwd(),
+                env: { ...process.env }
+            });
+            if (stderr) {
+                console.warn(`Package installation warnings: ${stderr}`);
+            }
+            console.log(`Successfully installed packages with npm fallback: ${packages.join(', ')}`);
+            return;
+        }
+        catch (error) {
+            console.error(`Failed with npm fallback: ${error.message || 'Unknown error'}`);
+            if (error.stdout) {
+                console.error(`stdout: ${error.stdout}`);
+            }
+            if (error.stderr) {
+                console.error(`stderr: ${error.stderr}`);
+            }
+        }
+    }
+    throw new Error(`Failed to install packages with both ${primaryPackageManager} and npm fallback`);
+}

package/dist/registry/index.d.ts

@@ -9,6 +9,10 @@ export interface BlockEntry {
     dir: string;
     configPath: string;
     componentPath: string;
+    externalPackages: Array<{
+        id: string;
+        package: string;
+    }>;
     source: BlockSource & {
         fetchedAt: string;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blok0",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "CLI tool for Payload CMS scaffolding",
   "main": "dist/index.js",
   "bin": {

package/src/api/index.ts

@@ -11,6 +11,10 @@ export interface BlockMetadata {
       url: string;
     };
   }>;
+  externalPackages: Array<{
+    id: string;
+    package: string;
+  }>;
   _status: 'published' | 'draft';
 }
 
@@ -174,4 +178,4 @@ class APIClient {
 
 // Export singleton instance
 export const apiClient = new APIClient();
-export { APIClient };
+export { APIClient };

package/src/blocks/index.ts

@@ -110,7 +110,7 @@ export function removeBlockDirectory(dirPath: string): void {
  * Create block entry from metadata and file paths
  */
 export function createBlockEntry(
-  metadata: { id: number; name: string; slug: string; sourceUrl: string },
+  metadata: { id: number; name: string; slug: string; sourceUrl: string; externalPackages: Array<{id: string, package: string}> },
   dir: string,
   configPath: string,
   componentPath: string,
@@ -123,6 +123,7 @@ export function createBlockEntry(
     dir,
     configPath,
     componentPath,
+    externalPackages: metadata.externalPackages,
     source: {
       url: metadata.sourceUrl,
       id: metadata.id,
@@ -183,4 +184,4 @@ export function ensureBlocksDirectory(): string {
   }
 
   return blocksDir;
-}
+}

package/src/handlers/add-block.ts

@@ -10,6 +10,7 @@ import {
   validateBlockDirectory
 } from '../blocks';
 import { updatePageCollectionConfig, updateRenderBlocksComponent, findPagesCollection, findRenderBlocksComponent } from '../ast';
+import { installPackages } from '../packageManager';
 import { withSpinner, log, showSection, showNextSteps, EMOJIS, ProgressBar } from '../ui';
 
 /**
@@ -76,16 +77,27 @@ export async function handleAddBlock(blockUrl: string, options: { force?: boolea
       process.exit(1);
     }
 
-    // Step 7: Calculate checksums
+    // Step 7: Install external packages if any
+    if (metadata.externalPackages && metadata.externalPackages.length > 0) {
+      const packageNames = metadata.externalPackages.map(pkg => pkg.package);
+      await withSpinner(
+        `Installing ${packageNames.length} external package(s)`,
+        () => installPackages(packageNames),
+        { emoji: EMOJIS.PACKAGE, successText: `Installed ${packageNames.length} package(s)` }
+      );
+    }
+
+    // Step 8: Calculate checksums
     const checksums = calculateDirectoryChecksums(dir);
 
-    // Step 8: Create registry entry
+    // Step 9: Create registry entry
     const blockEntry = createBlockEntry(
       {
         id: metadata.id,
         name: metadata.name,
         slug: metadata.slug,
-        sourceUrl: blockUrl
+        sourceUrl: blockUrl,
+        externalPackages: metadata.externalPackages
       },
       dir,
       configPath,
@@ -93,7 +105,7 @@ export async function handleAddBlock(blockUrl: string, options: { force?: boolea
       checksums
     );
 
-    // Step 9: Update Pages collection (AST manipulation)
+    // Step 10: Update Pages collection (AST manipulation)
     const pagesCollectionPath = findPagesCollection();
     if (pagesCollectionPath) {
       await withSpinner(
@@ -109,7 +121,7 @@ export async function handleAddBlock(blockUrl: string, options: { force?: boolea
       log.warning('Could not find Pages collection file. You may need to manually add the block to your collections.');
     }
 
-    // Step 10: Update RenderBlocks component (AST manipulation)
+    // Step 11: Update RenderBlocks component (AST manipulation)
     const renderBlocksPath = findRenderBlocksComponent();
     if (renderBlocksPath) {
       await withSpinner(
@@ -124,7 +136,7 @@ export async function handleAddBlock(blockUrl: string, options: { force?: boolea
       log.warning('Could not find RenderBlocks component. You may need to manually add the block component.');
     }
 
-    // Step 11: Register block in registry
+    // Step 12: Register block in registry
     await withSpinner(
       'Registering block',
       async () => addBlockToRegistry(blockEntry),

package/src/index.ts

@@ -123,7 +123,7 @@ async function main() {
       case 'add':
         const [addSubcommand, ...addRestArgs] = restArgs;
         if (addSubcommand === 'block') {
-          const blockUrl = `https://www.blok0.com/api/cli/sections/${addRestArgs[0]}`;
+          const blockUrl = `https://www.blok0.xyz/api/cli/sections/${addRestArgs[0]}`;
           if (!blockUrl) {
             console.error('Error: Block Slug is required. Use: blok0 add block <slug>');
             process.exit(1);

package/src/packageManager.ts

@@ -0,0 +1,117 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { exec } from 'child_process';
+import { promisify } from 'util';
+
+const execAsync = promisify(exec);
+
+export type PackageManager = 'npm' | 'yarn' | 'pnpm' | 'bun';
+
+/**
+ * Detect the package manager used in the current project
+ */
+export function detectPackageManager(): PackageManager {
+  const cwd = process.cwd();
+
+  // Check for lock files in order of preference
+  if (fs.existsSync(path.join(cwd, 'bun.lockb'))) {
+    return 'bun';
+  }
+  if (fs.existsSync(path.join(cwd, 'pnpm-lock.yaml'))) {
+    return 'pnpm';
+  }
+  if (fs.existsSync(path.join(cwd, 'yarn.lock'))) {
+    return 'yarn';
+  }
+  if (fs.existsSync(path.join(cwd, 'package-lock.json'))) {
+    return 'npm';
+  }
+
+  // Default to npm if no lock file is found
+  return 'npm';
+}
+
+/**
+ * Get the install command for a package manager
+ */
+function getInstallCommand(packageManager: PackageManager, packages: string[]): string {
+  const packageList = packages.join(' ');
+
+  switch (packageManager) {
+    case 'bun':
+      return `bun add ${packageList}`;
+    case 'pnpm':
+      return `pnpm add ${packageList}`;
+    case 'yarn':
+      return `yarn add ${packageList}`;
+    case 'npm':
+    default:
+      return `npm install ${packageList}`;
+  }
+}
+
+/**
+ * Install packages using the detected package manager with fallback to npm
+ */
+export async function installPackages(packages: string[]): Promise<void> {
+  if (packages.length === 0) {
+    return;
+  }
+
+  const primaryPackageManager = detectPackageManager();
+
+  // Try the detected package manager first
+  try {
+    const command = getInstallCommand(primaryPackageManager, packages);
+    console.log(`Running: ${command}`);
+    const { stdout, stderr } = await execAsync(command, {
+      cwd: process.cwd(),
+      env: { ...process.env }
+    });
+
+    if (stderr) {
+      console.warn(`Package installation warnings: ${stderr}`);
+    }
+
+    console.log(`Successfully installed packages: ${packages.join(', ')}`);
+    return;
+  } catch (error: any) {
+    console.error(`Failed with ${primaryPackageManager}: ${error.message || 'Unknown error'}`);
+    if (error.stdout) {
+      console.error(`stdout: ${error.stdout}`);
+    }
+    if (error.stderr) {
+      console.error(`stderr: ${error.stderr}`);
+    }
+  }
+
+  // If primary package manager failed and it's not npm, try npm as fallback
+  if (primaryPackageManager !== 'npm') {
+    try {
+      console.log(`Falling back to npm...`);
+      const command = getInstallCommand('npm', packages);
+      console.log(`Running: ${command}`);
+      const { stdout, stderr } = await execAsync(command, {
+        cwd: process.cwd(),
+        env: { ...process.env }
+      });
+
+      if (stderr) {
+        console.warn(`Package installation warnings: ${stderr}`);
+      }
+
+      console.log(`Successfully installed packages with npm fallback: ${packages.join(', ')}`);
+      return;
+    } catch (error: any) {
+      console.error(`Failed with npm fallback: ${error.message || 'Unknown error'}`);
+      if (error.stdout) {
+        console.error(`stdout: ${error.stdout}`);
+      }
+      if (error.stderr) {
+        console.error(`stderr: ${error.stderr}`);
+      }
+    }
+  }
+
+  throw new Error(`Failed to install packages with both ${primaryPackageManager} and npm fallback`);
+}

package/src/registry/index.ts

@@ -14,6 +14,10 @@ export interface BlockEntry {
   dir: string;
   configPath: string;
   componentPath: string;
+  externalPackages: Array<{
+    id: string;
+    package: string;
+  }>;
   source: BlockSource & {
     fetchedAt: string;
   };
@@ -241,4 +245,4 @@ export function createEmptyRegistry(): void {
   };
 
   saveRegistry(emptyRegistry);
-}
+}