cbs-block 1.0.3 → 1.0.5

package/bin/cbs-block.js

@@ -20,34 +20,101 @@ async function main() {
                 const colors = { 'Math': '#4A90E2', 'Logic': '#F5A623', 'Control': '#FFCC00', 'Custom': '#4CAF50' };
                 return colors[a.category] || '#4CAF50';
             }},
-            { type: 'confirm', name: 'hasFlow', message: 'Include flow ports?', default: true },
+            { type: 'confirm', name: 'useDir', message: 'Create as directory (Recommended for external packages)?', default: true },
             { type: 'list', name: 'lang', message: 'Primary Language:', choices: ['JavaScript', 'TypeScript'] }
         ]);
 
-        const ext = answers.lang === 'TypeScript' ? 'ts' : 'js';
-        const template = {
-            name: answers.name,
-            category: answers.category,
-            color: answers.color,
-            ports: [
-                ...(answers.hasFlow ? [{ name: "flowIn", type: "FlowIn" }, { name: "flowOut", type: "FlowOut" }] : []),
-                { name: "input1", type: "Input", dataType: "string" },
-                { name: "output1", type: "Output", dataType: "string" }
-            ],
-            codeTemplates: {
-                python: "print({input1})",
-                web: "console.log({input1})",
-                javascript: "console.log({input1})",
-                typescript: `console.log({input1} as string)`
-            },
-            logic: answers.lang === 'TypeScript' 
-                ? `function run(inputs: { input1: string }): string { return inputs.input1; }`
-                : `function run(inputs) { return inputs.input1; }`
-        };
+        if (answers.useDir) {
+            const dirName = answers.name.toLowerCase().replace(/\s+/g, '_');
+            fs.mkdirSync(dirName, { recursive: true });
+            
+            const metadata = {
+                name: answers.name,
+                category: answers.category,
+                color: answers.color,
+                ports: [
+                    { name: "flowIn", type: "FlowIn" },
+                    { name: "flowOut", type: "FlowOut" },
+                    { name: "input1", type: "Input", dataType: "string" },
+                    { name: "output1", type: "Output", dataType: "string" }
+                ],
+                codeTemplates: {
+                    python: "print({input1})",
+                    web: "console.log({input1})",
+                    javascript: "console.log({input1})",
+                    typescript: `console.log({input1} as string)`
+                }
+            };
+
+            const logicStr = answers.lang === 'TypeScript' 
+                ? `export function run(inputs: { input1: string }): string {\n  // TIP: You can now npm install packages here!\n  return inputs.input1;\n}`
+                : `export function run(inputs) {\n  // TIP: You can now npm install packages here!\n  return inputs.input1;\n}`;
 
-        const fileName = `${answers.name.toLowerCase().replace(/\s+/g, '_')}.cbsblock`;
-        fs.writeFileSync(fileName, JSON.stringify(template, null, 2));
-        console.log(chalk.green(`\n✔ Successfully created block: ${chalk.bold(fileName)}`));
+            fs.writeFileSync(path.join(dirName, 'metadata.json'), JSON.stringify(metadata, null, 2));
+            fs.writeFileSync(path.join(dirName, answers.lang === 'TypeScript' ? 'index.ts' : 'index.js'), logicStr);
+            fs.writeFileSync(path.join(dirName, 'package.json'), JSON.stringify({
+                name: dirName,
+                version: "1.0.0",
+                main: "index.js",
+                dependencies: {}
+            }, null, 2));
+
+            console.log(chalk.green(`\n✔ Created code-first block directory: ${chalk.bold(dirName)}`));
+            console.log(chalk.cyan(`   → cd ${dirName}`));
+            console.log(chalk.cyan(`   → npm install <your-package>`));
+            console.log(chalk.cyan(`   → cbs-block build`));
+
+        } else {
+            const template = {
+                name: answers.name,
+                category: answers.category,
+                color: answers.color,
+                ports: [
+                    { name: "flowIn", type: "FlowIn" }, { name: "flowOut", type: "FlowOut" },
+                    { name: "input1", type: "Input", dataType: "string" },
+                    { name: "output1", type: "Output", dataType: "string" }
+                ],
+                codeTemplates: {
+                    python: "print({input1})",
+                    web: "console.log({input1})",
+                    javascript: "console.log({input1})",
+                    typescript: `console.log({input1} as string)`
+                },
+                logic: answers.lang === 'TypeScript' 
+                    ? `function run(inputs: { input1: string }): string { return inputs.input1; }`
+                    : `function run(inputs) { return inputs.input1; }`
+            };
+
+            const fileName = `${answers.name.toLowerCase().replace(/\s+/g, '_')}.cbsblock`;
+            fs.writeFileSync(fileName, JSON.stringify(template, null, 2));
+            console.log(chalk.green(`\n✔ Successfully created block file: ${chalk.bold(fileName)}`));
+        }
+
+    } else if (command === 'build') {
+        const targetDir = target || '.';
+        const metaPath = path.join(targetDir, 'metadata.json');
+        const indexPath = fs.existsSync(path.join(targetDir, 'index.ts')) ? path.join(targetDir, 'index.ts') : path.join(targetDir, 'index.js');
+
+        if (!fs.existsSync(metaPath)) return console.error(chalk.red(`Error: metadata.json not found in ${targetDir}`));
+        if (!fs.existsSync(indexPath)) return console.error(chalk.red(`Error: index.js/ts not found in ${targetDir}`));
+
+        console.log(chalk.yellow(`Building code-first block from ${targetDir}...`));
+        
+        const metadata = JSON.parse(fs.readFileSync(metaPath, 'utf8'));
+        let logic = fs.readFileSync(indexPath, 'utf8');
+
+        // Simple bundle logic: find imports and Warn for now (Premium feature for Phase 15.1)
+        // For now, we wrap it into a compatible run function for the engine
+        if (logic.includes('export function run')) {
+            logic = logic.replace('export function run', 'function run');
+        }
+
+        metadata.logic = logic;
+        const outName = `${metadata.name.toLowerCase().replace(/\s+/g, '_')}.cbsblock`;
+        fs.writeFileSync(outName, JSON.stringify(metadata, null, 2));
+        
+        console.log(chalk.green(`\n✔ Built ${chalk.bold(outName)} successfully!`));
+        console.log(chalk.dim(`(Note: Dynamic bundling for node_modules coming in next update)`));
 
     } else if (command === 'init') {
         const answers = await inquirer.prompt([
@@ -66,16 +133,32 @@ async function main() {
         fs.mkdirSync(path.join(answers.projName, 'blocks'), { recursive: true });
         console.log(chalk.green(`\n✔ Project ${chalk.bold(answers.projName)} initialized!`));
 
-    } else if (command === 'pack' || command === 'build') {
+    } else if (command === 'pack') {
         const files = fs.readdirSync('.').filter(f => f.endsWith('.cbsblock'));
+        const dirs = fs.readdirSync('.').filter(d => fs.statSync(d).isDirectory() && fs.existsSync(path.join(d, 'metadata.json')));
+        
+        console.log(chalk.yellow(`Packing ${files.length} files and ${dirs.length} directories into a .cbspak...`));
+        
+        const packedBlocks = [
+            ...files.map(f => JSON.parse(fs.readFileSync(f, 'utf8'))),
+            ...dirs.map(d => {
+                const meta = JSON.parse(fs.readFileSync(path.join(d, 'metadata.json'), 'utf8'));
+                const indexPath = fs.existsSync(path.join(d, 'index.ts')) ? path.join(d, 'index.ts') : path.join(d, 'index.js');
+                let logic = fs.readFileSync(indexPath, 'utf8');
+                if (logic.includes('export function run')) logic = logic.replace('export function run', 'function run');
+                meta.logic = logic;
+                return meta;
+            })
+        ];
+
         const pack = {
             package: path.basename(process.cwd()),
             version: "1.0.0",
-            blocks: files.map(f => JSON.parse(fs.readFileSync(f, 'utf8')))
+            blocks: packedBlocks
         };
         const packName = `${pack.package}.cbspak`;
         fs.writeFileSync(packName, JSON.stringify(pack, null, 2));
-        console.log(chalk.green(`\n✔ Packed ${files.length} blocks into ${chalk.bold(packName)}`));
+        console.log(chalk.green(`\n✔ Packed ${packedBlocks.length} blocks into ${chalk.bold(packName)}`));
 
     } else if (command === 'doc' && target) {
         if (!fs.existsSync(target)) return console.error(chalk.red(`Error: File ${target} not found.`));
@@ -108,8 +191,6 @@ async function main() {
             console.log(chalk.red(`[FAIL] Qt/qmake not found in PATH`));
         }
 
-            else console.error(chalk.red(`${f}: INVALID - ${result.error}`));
-        });
     } else if (command === 'lint') {
         const sdk = require('../index.js');
         const files = fs.readdirSync('.').filter(f => f.endsWith('.cbsblock'));
@@ -208,9 +289,10 @@ async function main() {
 
     } else {
         console.log(chalk.white(`Available commands:`));
-        console.log(`  ${chalk.bold('create [name]')}  - Create a new block interactively`);
-        console.log(`  ${chalk.bold('init [name]')}    - Initialize a new project`);
-        console.log(`  ${chalk.bold('pack')}           - Build a .cbspak package`);
+        console.log(`  ${chalk.bold('create [name]')}  - Create a new block (file or directory)`);
+        console.log(`  ${chalk.bold('build [dir]')}   - Build a directory block into a .cbsblock`);
+        console.log(`  ${chalk.bold('pack')}           - Bundle all blocks in folder into .cbspak`);
+        console.log(`  ${chalk.bold('init [name]')}    - Initialize a new block project`);
         console.log(`  ${chalk.bold('test <file>')}     - Run unit tests on a block`);
         console.log(`  ${chalk.bold('dev <file>')}      - Watch for changes and re-test`);
         console.log(`  ${chalk.bold('search <query>')} - Search Marketplace from CLI`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cbs-block",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "SDK for creating CodeBlock Studio blocks",
   "main": "index.js",
   "bin": {