spyne-cli 0.5.5 → 0.6.2

package/index.js

@@ -1,30 +1,31 @@
 #!/usr/bin/env node
-import  {SpyneCliUI} from './src/ui.js';
+
+import { SpyneCliUI } from './src/ui.js';
 import clear from 'clear';
-import SpyneAppCreator from './src/spyne-app-creator.js';
-import SpyneAppCreate from './src/spyne-app-create.js';
+import { createNewApp } from './src/spyne-starter-app-create.js';
 import SpyneFilePrompt from './src/spyne-file-prompt.js';
-const args = process.argv;
-
-
-//let spyneAppCreator = new SpyneAppCreator(args);
-//const {createAppBool} = spyneAppCreator;
 
+const command = process.argv[2];
+const appName = process.argv[3];
 
-let spyneAppCreator = new SpyneAppCreate(process.argv.slice(2));
-const {createAppBool} = spyneAppCreator;
-
-const startPromptFn = async()=>{
+const startPromptFn = async () => {
   clear();
   SpyneCliUI.title();
   const spyneFilePrompt = new SpyneFilePrompt();
   await spyneFilePrompt.startPrompt();
-}
+};
 
-if (createAppBool){
-  //spyneAppCreator.generateResponse();
-  spyneAppCreator.createApp();
+if (command === 'new' && appName) {
+  // We can use an immediately-invoked async function
+  // OR top-level await if your Node version supports it.
+  (async () => {
+    try {
+      await createNewApp(appName);
+    } catch (err) {
+      console.error('Failed to create new application:', err.message);
+      process.exit(1);
+    }
+  })();
 } else {
   startPromptFn();
 }
-

package/mocha.conf.cjs

@@ -0,0 +1,16 @@
+// mocha.conf.js
+
+module.exports = {
+  // Look for test files in the `tests` folder
+  spec: 'tests/**/*.test.js',
+
+  exclude: [
+      'tests/create-spyne-app-test.js'
+
+  ],
+  // You can also specify mocha options here
+  extension: ['js'],       // The file extensions Mocha should look for
+  ui: 'bdd',               // BDD-style (describe/it)
+  timeout: 5000,           // Test timeout in milliseconds
+  reporter: 'spec',        // The built-in "spec" reporter
+};

package/package.json

@@ -4,13 +4,13 @@
     "spyne-cli": "index.js"
   },
   "type": "module",
-  "version": "0.5.5",
+  "version": "0.6.2",
   "description": "Generates spyne objects and saves them to standard spyne.",
   "main": "index.js",
   "scripts": {
     "debug": "nodemon --no-stdin index.js",
     "start": "node index.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha --config mocha.conf.cjs"
   },
   "repository": {
     "type": "git",
@@ -25,24 +25,25 @@
   "dependencies": {
     "ansi-colors": "^4.1.3",
     "boxen": "^8.0.1",
-    "chalk": "^5.3.0",
+    "chalk": "^5.4.1",
     "change-case": "^5.4.4",
     "clear": "^0.1.0",
     "enquirer": "^2.4.1",
-    "figlet": "^1.7.0",
+    "figlet": "^1.8.0",
     "fs-extra": "^11.2.0",
     "json-stringify-safe": "^5.0.1",
+    "ora": "^8.1.1",
     "package-up": "^5.0.0",
     "pkg-dir": "^8.0.0",
-    "pkg-up": "^5.0.0",
     "ramda": "^0.30.1",
     "read-pkg": "^9.0.1",
-    "recast": "^0.23.9"
+    "recast": "^0.23.9",
+    "simple-git": "^3.27.0"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^10.7.3",
-    "nodemon": "^3.1.7"
+    "chai": "^5.1.2",
+    "mocha": "^11.0.1",
+    "nodemon": "^3.1.9"
   },
   "directories": {
     "lib": "lib"

package/src/app/channels/channel-custom.js

@@ -0,0 +1 @@
+Some content for tests/utils/file-utils-test -- should test saving to file

package/src/spyne-app-create.js

@@ -4,6 +4,8 @@ import c from 'ansi-colors';
 import { exec } from 'child_process';
 import fs from 'fs-extra';
 import path from 'path';
+import ora from 'ora';
+import cliCursor from 'cli-cursor';
 
 class SpyneAppCreator {
   constructor(args) {
@@ -63,6 +65,9 @@ class SpyneAppCreator {
     console.log(c.green(`\nCreating a new Spyne app in ${c.cyan(appPath)} using the "${c.cyan(templateName)}" template...\n`));
 
     try {
+      // Hide the cursor
+      cliCursor.hide();
+
       // Clone the repository
       await this.cloneRepository(repoUrl, appFolder);
 
@@ -86,6 +91,9 @@ class SpyneAppCreator {
       this.printSuccessMessage(appFolder, appPath, skipInstall);
     } catch (error) {
       console.error(c.red(`\nError: ${error.message}`));
+    } finally {
+      // Show the cursor again
+      cliCursor.show();
     }
   }
 
@@ -101,33 +109,38 @@ class SpyneAppCreator {
     return templates[templateName];
   }
 
-  // Method to clone the repository
+  // Method to clone the repository with spinner
   cloneRepository(repoUrl, appFolder) {
     return new Promise((resolve, reject) => {
+      const spinner = ora(c.green('Cloning repository...')).start();
+
       exec(`git clone --depth=1 ${repoUrl} ${appFolder}`, (error) => {
         if (error) {
+          spinner.fail(c.red('Failed to clone repository.'));
           reject(new Error(`Failed to clone repository: ${error.message}`));
         } else {
-          console.log(c.green('✔ Repository cloned successfully.'));
+          spinner.succeed(c.green('Repository cloned successfully.'));
           resolve();
         }
       });
     });
   }
 
-  // Method to initialize a new Git repository
+  // Method to initialize a new Git repository with spinner
   initGitRepo(appFolder) {
     return new Promise((resolve) => {
+      const spinner = ora(c.green('Initializing Git repository...')).start();
+
       exec('git --version', (gitError) => {
         if (gitError) {
-          console.warn(c.yellow('⚠ Git is not installed. Skipping Git initialization.'));
+          spinner.warn(c.yellow('Git is not installed. Skipping Git initialization.'));
           resolve();
         } else {
           exec('git init', { cwd: appFolder }, (initError) => {
             if (initError) {
-              console.warn(c.yellow('⚠ Failed to initialize Git repository.'));
+              spinner.fail(c.red('Failed to initialize Git repository.'));
             } else {
-              console.log(c.green('✔ Git repository initialized.'));
+              spinner.succeed(c.green('Git repository initialized.'));
             }
             resolve();
           });
@@ -136,36 +149,42 @@ class SpyneAppCreator {
     });
   }
 
-  // Method to install dependencies
+  // Method to install dependencies with spinner
   installDependencies(appFolder) {
-    return new Promise((resolve, reject) => {
-      console.log(c.green('\nInstalling dependencies...\n'));
+    return new Promise((resolve) => {
+      const spinner = ora(c.green('Installing dependencies...')).start();
+
       exec('npm install', { cwd: appFolder }, (installError) => {
         if (installError) {
-          console.warn(c.yellow('⚠ Failed to install dependencies.'));
+          spinner.fail(c.red('Failed to install dependencies.'));
           resolve(); // Proceed even if installation fails
         } else {
-          console.log(c.green('✔ Dependencies installed successfully.'));
+          spinner.succeed(c.green('Dependencies installed successfully.'));
           resolve();
         }
       });
     });
   }
 
-  // Method to update package.json
+  // Method to update package.json with spinner
   updatePackageJson(appFolder) {
     return new Promise((resolve, reject) => {
+      const spinner = ora(c.green('Updating package.json...')).start();
       const pkgPath = path.join(appFolder, 'package.json');
+
       fs.readJson(pkgPath)
       .then((pkg) => {
         pkg.name = path.basename(appFolder);
         return fs.writeJson(pkgPath, pkg, { spaces: 2 });
       })
       .then(() => {
-        console.log(c.green('✔ package.json updated.'));
+        spinner.succeed(c.green('package.json updated.'));
         resolve();
       })
-      .catch((err) => reject(new Error(`Failed to update package.json: ${err.message}`)));
+      .catch((err) => {
+        spinner.fail(c.red('Failed to update package.json.'));
+        reject(new Error(`Failed to update package.json: ${err.message}`));
+      });
     });
   }
 

package/src/spyne-file-prompt.js

@@ -8,6 +8,7 @@ import GenerateFileString from './templates/generate-file-string.js';
 import {onSaveSpyneFileToDir} from './utils/file-utils.js';
 import {generatePromptOutput} from './templates/generate-prompt-output.js';
 import {addChannelToIndexJS} from './utils/add-channel-to-index-file.js';
+import {insertChannelStrings} from './utils/insert-channel-strings-to-index-file.js';
 
 export default class SpyneFilePrompt {
 
@@ -46,7 +47,8 @@ export default class SpyneFilePrompt {
     let channelHasRegistered = false;
 
     if (fileType === 'Channel'){
-      const savedChannelToIndexProps = addChannelToIndexJS(className, fileName);
+      //const savedChannelToIndexProps = addChannelToIndexJS(className, fileName);
+      const savedChannelToIndexProps = insertChannelStrings(className, fileName);
 
       // check if channel has been registered
       channelHasRegistered = savedChannelToIndexProps.fileHasSaved;

package/src/spyne-starter-app-create.js

@@ -0,0 +1,81 @@
+import c from 'ansi-colors';
+import simpleGit from 'simple-git';
+import { spawn } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import ora from 'ora';
+
+async function installDependencies(appName) {
+  const spinner = ora({
+    text: c.cyan('Installing dependencies...'),
+    spinner: 'dots'
+  }).start();
+
+  return new Promise((resolve, reject) => {
+    // Use --silent to suppress npm logs
+    const child = spawn('npm', ['install', '--silent'], {
+      cwd: appName,
+      // stdio: 'ignore' → all output is ignored, the spinner continues unblocked
+      stdio: 'ignore',
+    });
+
+    child.on('close', (code) => {
+      if (code === 0) {
+        spinner.succeed(c.greenBright('Dependencies installed successfully!'));
+        resolve();
+      } else {
+        spinner.fail(c.red(`Failed to install dependencies (exit code: ${code}).`));
+        reject(new Error('npm install failed'));
+      }
+    });
+  });
+}
+
+export async function createNewApp(appName) {
+  const targetDir = path.resolve(process.cwd(), appName);
+  const repoUrl = 'https://github.com/nybatista/starter-app-alpha.git';
+  const git = simpleGit();
+
+  console.log(c.cyan(`\nCreating a new Spyne app in ${c.bold(appName)}...`));
+
+  // 1) Clone repository with Ora spinner
+  let spinner = ora({
+    text: c.cyan('Cloning starter-app repository...'),
+    spinner: 'dots',
+  }).start();
+
+  try {
+    await git.clone(repoUrl, targetDir, [
+      '--branch=main',
+      '--single-branch',
+      '--depth=1'
+    ]);
+
+    spinner.succeed(c.greenBright('Starter App cloned successfully!'));
+  } catch (err) {
+    spinner.fail(c.red(`Failed to clone the repository: ${err.message}`));
+    process.exit(1);
+  }
+
+  // 2) Remove .git (silent - no user message)
+  try {
+    fs.rmSync(path.join(targetDir, '.git'), { recursive: true, force: true });
+  } catch (err) {
+    console.error(c.red(`Failed to remove .git folder: ${err.message}`));
+    process.exit(1);
+  }
+
+  // 3) Asynchronous install (silent)
+  try {
+    await installDependencies(appName);
+  } catch (err) {
+    console.error(c.red(err.message));
+    process.exit(1);
+  }
+
+  // 4) Final success message
+  console.log(`\n${c.greenBright('Success!')}`);
+  console.log(c.cyan(`Created ${c.bold(appName)} at ${targetDir}\n`));
+  console.log(c.greenBright('Next steps:'));
+  console.log(c.bgCyan(c.black(`  cd ${appName} && npm start`)));
+}

package/src/templates/generate-file-string.js

@@ -1,96 +1,70 @@
 const _viewStreamTemplate = (props)=> {
- return `import {ViewStream} from 'spyne';
+ return `import { ViewStream } from 'spyne';
 
 export class ${props.className} extends ViewStream {
-    
-    constructor(props={}) {
-        
-        super(props);
-    }
-    
-    addActionListeners() {
-        // return nested array(s)
-        return [];
-    }
-    
-    broadcastEvents() {
-        // return nested array(s)
-        return [];
-    }
-   
-    onRendered() {
-    
-    }
-    
-}
+  constructor(props = {}) {
+    super(props);
+  }
+
+  addActionListeners() {
+    return [];
+  }
 
+  broadcastEvents() {
+    return [];
+  }
+
+  onRendered() {}
+}
 `
 }
 
 const _domElementTemplate = (props) => {
-  return `import {DomElement} from 'spyne';
-  
+  return `import { DomElement } from 'spyne';
+
 export class ${props.className} extends DomElement {
-  
-  constructor(props={}) {
-        
+  constructor(props = {}) {
     super(props);
   }
-  
 }
-
 `
 }
 
 
 const _channelTemplate = (props)=> {
-  return `import {Subject} from 'rxjs';
-import {Channel} from 'spyne';
-
-export class ${props.className} extends Channel{
+  return `import { Channel } from 'spyne';
 
-  constructor(name, props={}) {
-    name="${props.channelName}";
+export class ${props.className} extends Channel {
+  constructor(name, props = {}) {
+    name = '${props.channelName}';
     props.sendCachedPayload = ${props.replayLastPayload};
-    
     super(name, props);
   }
 
-  onRegistered(){
-    
-  }
+  onRegistered() {}
 
   addRegisteredActions() {
-    
     return [];
   }
 
-  onViewStreamInfo(obj) {
-    let data = obj.props();
-  }
-  
+  onViewStreamInfo() {}
 }
-
 `
 }
 
 const _spyneTraitTemplate = (props)=>{
-  return `import {SpyneTrait} from 'spyne';
+  return `import { SpyneTrait } from 'spyne';
 
 export class ${props.className} extends SpyneTrait {
-
-  constructor(context){
-    let traitPrefix = "${props.methodPrefix}";
-    
+  constructor(context) {
+    let traitPrefix = '${props.methodPrefix}';
     super(context, traitPrefix);
   }
-  
-  static ${props.methodPrefix}HelloWorld(){
-    return "Hello World";
+
+  static ${props.methodPrefix}HelloWorld() {
+    return 'Hello World';
   }
-  
 }
-
 `
 }
 

package/src/templates/generate-prompt-output.js

@@ -73,11 +73,11 @@ const outputMessage = ()=>{
 
   let messageOutput = '';
 
-  const defaultStr = colors.bgBlue(colors.black(`Successfully saved the ${fileType} file.`));
+  const defaultStr = colors.bgYellow(colors.black(`Successfully saved the ${fileType} file.`));
 
   const checkForChannelRegisteredMsg = ()=>{
     if (_channelHasRegistered === true){
-       return colors.bgBlue(colors.black(`Channel registered and file saved successfully.`));
+       return colors.bgYellow(colors.black(`Channel registered and file saved successfully.`));
     }
     return `${defaultStr}\n${createChannelRegisterSnippet()}`;
   }

package/src/ui.js

@@ -5,7 +5,7 @@ export class SpyneCliUI {
 
   constructor() {}
   static title(){
-    const figletTxt = figlet.textSync('spyne-cli 5.0', {
+    const figletTxt = figlet.textSync('spyne-cli 6.2', {
       horizontalLayout: 'universal smushing'
     })
     const chalkOutput = chalk.blue(figletTxt);

package/src/utils/insert-channel-strings-to-index-file.js

@@ -0,0 +1,119 @@
+import fs from 'fs';
+import path from 'path';
+import c from 'ansi-colors';
+//import {Data} from '../spyne-template-prompts.js';
+//const {appPath} = Data;
+
+export function insertChannelStrings(channelClassName, channelFileName, indexJsPath="./src/index.js" ) {
+  //console.log("INFO IS ",{appPath, channelClassName, channelFileName, indexJsPath})
+  try {
+    if (!fs.existsSync(indexJsPath)) {
+      console.log(c.red(`Error: ./src/index.js not found at ${indexJsPath}`));
+      return;
+    }
+
+    let fileContent = fs.readFileSync(indexJsPath, 'utf-8');
+    let lines = fileContent.split('\n');
+
+    // 1) Find the last import line
+    let lastImportIndex = -1;
+    for (let i = 0; i < lines.length; i++) {
+      // A naive check: line starts with "import "
+      // or you can also check .match(/^import\s+/)
+      if (lines[i].trim().startsWith('import ')) {
+        lastImportIndex = i;
+      }
+    }
+
+    // 2) Find the line with SpyneApp.init(...) or spyneApp.init(...)
+    //    We'll store the first occurrence
+    let initIndex = -1;
+    const initRegex = /(SpyneApp\.init\s*\()|(spyneApp\.init\s*\()/;
+    for (let i = 0; i < lines.length; i++) {
+      if (initRegex.test(lines[i])) {
+        initIndex = i;
+        break;
+      }
+    }
+
+    // 3) Build the import snippet
+    //    e.g. "import {ChannelTest_1} from 'channels/channel-test-1.js';"
+    const importSnippet = `import { ${channelClassName} } from 'channels/${channelFileName}';`;
+
+    // 4) Decide where to insert the import line
+    //    - Must be AFTER the last import
+    //    - Must be BEFORE the init line (if init line is after the last import)
+    // If init line doesn't exist or it's above the last import, we'll just place after last import.
+    let importInsertionIndex = lastImportIndex + 1;
+    if (initIndex !== -1 && initIndex > lastImportIndex) {
+      // If there's space to place it exactly before the init line
+      // we'll insert at the init line index. That effectively
+      // pushes the init line down by 1 line.
+      importInsertionIndex = Math.min(initIndex, lastImportIndex + 1);
+    }
+
+    // Insert the import line
+    lines.splice(importInsertionIndex, 0, importSnippet);
+
+    // 5) Build the registerChannel snippet
+    //    e.g. "SpyneApp.registerChannel(new ChannelTest_1());"
+    const registerSnippet = `SpyneApp.registerChannel(new ${channelClassName}());`;
+
+    // 6) Insert the register snippet right AFTER the init line, if found
+    if (initIndex !== -1) {
+      // Because we inserted one line before the init,
+      // the init line is now at initIndex+1, so the place to insert
+      // is initIndex+2. But let's re-scan for the init line to be safe,
+      // or simply adjust.
+      let updatedInitIndex = -1;
+      for (let i = 0; i < lines.length; i++) {
+        if (initRegex.test(lines[i])) {
+          updatedInitIndex = i;
+          break;
+        }
+      }
+
+      if (updatedInitIndex !== -1) {
+        lines.splice(updatedInitIndex + 1, 0, registerSnippet);
+      } else {
+        // If we somehow lost the init line, fallback to end
+        lines.push(registerSnippet);
+      }
+    } else {
+      // No init line found, let's just push it at the end or skip
+      console.log(c.yellow('Warning: SpyneApp.init(...) not found. Skipping registerChannel insertion.'));
+    }
+
+    // 7) Write the updated content back
+    fs.writeFileSync(indexJsPath, lines.join('\n'), 'utf-8');
+    //console.log(c.green(`✔ Successfully updated ./src/index.js to import and register "${channelClassName}".`));
+
+    return {
+      fileHasSaved: true,
+      errorType: null
+    };
+
+
+  } catch (error) {
+    let errorType = 'UnknownError';
+    if (error.code === 'ENOENT') {
+      errorType = 'FileNotFound';
+    } else if (error.name === 'SyntaxError') {
+      errorType = 'SyntaxError';
+    } else if (error.name === 'TypeError') {
+      errorType = 'TypeError';
+    } else if (error.name === 'PermissionError') {
+      errorType = 'PermissionError';
+    }
+    //console.warn(`spyne-cli register channel, ${errorType} incomplete `,error)
+
+    // Fail silently and return error information
+    return {
+      fileHasSaved: false,
+      errorType
+    };
+
+
+    //console.error(c.red(`Error updating index.js: ${err.message}`));
+  }
+}

package/tests/create-spyne-app.test.js

@@ -1,5 +1,4 @@
-import chai from 'chai';
-const {expect} = chai;
+import {expect} from 'chai';
 import path from 'path';
 
 import SpyneAppCreator from '../src/spyne-app-creator.js';
@@ -61,4 +60,4 @@ describe('should test app creation methods', () => {
 
 
 
-});
+});

package/tests/generate-file-prompt.test.js

@@ -1,7 +1,5 @@
 import SpyneFilePrompt from '../src/spyne-file-prompt.js';
-import chai from 'chai';
-const {expect, assert} = chai;
-
+import {expect, assert} from 'chai';
 
 
 describe('should test spyne file prompt', () => {

package/tests/generate-file-string.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-import GenerateFileString from '../src/templates/generate-file-string.js';
+import {expect, assert} from 'chai';import GenerateFileString from '../src/templates/generate-file-string.js';
 
 describe('should test file string generator', () => {
 

package/tests/generate-prompt-input-fields-methods.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-import PromptInputField from '../src/templates/generate-prompt-input-fields.js';
+import {expect, assert} from 'chai';import PromptInputField from '../src/templates/generate-prompt-input-fields.js';
 import * as changeCase from "change-case";
 
 const {

package/tests/generate-prompt-input-fields.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-import PromptInputField from '../src/templates/generate-prompt-input-fields.js';
+import {expect, assert} from 'chai';import PromptInputField from '../src/templates/generate-prompt-input-fields.js';
 
 import {MockData} from './mocks/enquirer-data.js';
 

package/tests/generate-prompt-input-object.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-import GeneratePromptInputObject from '../src/templates/generate-prompt-input-object.js';
+import {expect, assert} from 'chai';import GeneratePromptInputObject from '../src/templates/generate-prompt-input-object.js';
 import {Data} from '../src/spyne-template-prompts.js';
 import {MockData} from './mocks/enquirer-data.js';
 const {promptTypes} = Data;

package/tests/generate-prompt-output.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-import {MockData} from './mocks/enquirer-data.js';
+import {expect, assert} from 'chai';import {MockData} from './mocks/enquirer-data.js';
 import {AnswersData} from './mocks/answers.js';
 const {answersArr} = AnswersData;
 import {generatePromptOutput} from '../src/templates/generate-prompt-output.js';

package/tests/index.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-
+import {expect, assert} from 'chai';
 describe('should test cli methods', () => {
 
   it('should run cli tests', () => {

package/tests/utils/file-utils.test.js

@@ -1,6 +1,4 @@
-import chai from 'chai';
-const {expect, assert} = chai;
-import {MockData} from '../mocks/enquirer-data.js';
+import {expect, assert} from 'chai';import {MockData} from '../mocks/enquirer-data.js';
 import {AnswersData} from '../mocks/answers.js';
 const {answersArr} = AnswersData;
 import * as R  from 'ramda';
@@ -12,7 +10,7 @@ import path from 'path';
 import {onSaveSpyneFileToDir, copyDirSync, removeDir} from '../../src/utils/file-utils.js';
 
 
-const getAnswersByFileType = (fileType) => R.compose(R.head, R.filter(R.propEq('fileType', fileType)))(answersArr)
+const getAnswersByFileType = (fileType) => R.compose(R.head, R.filter(R.propEq(fileType, 'fileType')))(answersArr)
 
 const defaultStr = `
 import {Subject} from 'rxjs';