mythix-cli 1.3.9 → 2.0.1

package/.nvmrc

@@ -0,0 +1 @@
+24.13.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Wyatt Greenway
+Copyright (c) 2023 Wyatt Greenway
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/bin/{mythix-cli.js → mythix-cli.mjs}

@@ -1,8 +1,12 @@
 #!/usr/bin/env node
 
-const Path              = require('path');
-const { spawn }         = require('child_process');
-const { CMDed, Types }  = require('cmded');
+import Path               from 'node:path';
+import { spawn }          from 'node:child_process';
+import { fileURLToPath }  from 'node:url';
+import { CMDed, Types }   from 'cmded';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = Path.dirname(__filename);
 
 function spawnCommand(command, args, options) {
   return new Promise((resolve, reject) => {
@@ -47,7 +51,7 @@ function spawnCommand(command, args, options) {
   });
 
   try {
-    config = require(argOptions.config);
+    config = await import(argOptions.config);
   } catch (error) {
     config = {};
   }
@@ -62,7 +66,7 @@ function spawnCommand(command, args, options) {
     let command = commands[i];
 
     try {
-      await spawnCommand(command, runtimeArgs.concat([ Path.resolve(__dirname, 'runner.js') ], args));
+      await spawnCommand(command, runtimeArgs.concat([ Path.resolve(__dirname, 'runner.mjs') ], args));
       break;
     } catch (error) {
       if (error.code === 'ENOENT' && (i + 1) < commands.length)

package/bin/{runner.js → runner.mjs}

@@ -1,17 +1,23 @@
-const Nife        = require('nife');
-const Path        = require('path');
-const FileSystem  = require('fs');
-const { spawn }   = require('child_process');
-
-const {
+import Path               from 'node:path';
+import FileSystem         from 'node:fs';
+import { spawn }          from 'node:child_process';
+import { fileURLToPath }  from 'node:url';
+import { createRequire }  from 'node:module';
+import Nife               from 'nife';
+
+const require     = createRequire(import.meta.url);
+const __filename  = fileURLToPath(import.meta.url);
+const __dirname   = Path.dirname(__filename);
+
+import {
   CMDed,
   showHelp,
-} = require('cmded');
+} from 'cmded';
 
-const {
+import {
   createHash,
   randomFillSync,
-} = require('crypto');
+} from 'node:crypto';
 
 function randomBytes(length) {
   let buffer = Buffer.alloc(length);
@@ -47,7 +53,6 @@ function walkDir(rootPath, _options, _callback, _allFiles, _depth) {
     else if (filterFunc instanceof RegExp && !filterFunc.match(fullFileName))
       continue;
 
-
     if (stats.isDirectory()) {
       walkDir(fullFileName, options, callback, allFiles, depth + 1);
 
@@ -102,7 +107,29 @@ function getFormattedAppDisplayName(appName) {
   return Nife.capitalize(getFormattedAppName(appName).replace(/[^a-zA-Z0-9]+/g, ' ').trim(), true);
 }
 
-function createTemplateEngineContext(templateClonePath, _appName) {
+function resolveJavascriptFileName(filePathWithoutExtension) {
+  if (FileSystem.existsSync(filePathWithoutExtension)) {
+    let stats = FileSystem.statSync(filePathWithoutExtension);
+    if (stats.isDirectory())
+      return resolveJavascriptFileName(`${filePathWithoutExtension}/index`);
+
+    return filePathWithoutExtension;
+  }
+
+  let filePath = `${filePathWithoutExtension}.mjs`;
+  if (FileSystem.existsSync(filePath))
+    return filePath;
+
+  filePath = `${filePathWithoutExtension}.cjs`;
+  if (FileSystem.existsSync(filePath))
+    return filePath;
+
+  filePath = `${filePathWithoutExtension}.js`;
+  if (FileSystem.existsSync(filePath))
+    return filePath;
+}
+
+async function createTemplateEngineContext(templateClonePath, _appName) {
   let context         = Object.create(null);
   let appName         = getFormattedAppName(_appName);
   let appDisplayName  = getFormattedAppDisplayName(_appName);
@@ -112,24 +139,26 @@ function createTemplateEngineContext(templateClonePath, _appName) {
   context.RANDOM_SHA256     = () => randomHash('sha256');
 
   try {
-    let helpersPath     = require.resolve(Path.join(templateClonePath, 'mythix-cli-template-helpers'));
-    let projectHelpers  = require(helpersPath);
+    let helpersPath     = resolveJavascriptFileName(Path.join(templateClonePath, 'mythix-cli-template-helpers'));
+    let projectHelpers  = await import(helpersPath);
     if (projectHelpers && projectHelpers.default)
       projectHelpers = projectHelpers.default;
 
     context = Object.assign({}, projectHelpers, context);
 
     FileSystem.unlinkSync(helpersPath);
-  } catch (error) {}
+  } catch (error) {
+    console.error('Unable to import helpers: ', error);
+  }
 
   return context;
 }
 
 function getTemplatedFileName(fileName, context) {
-  return fileName.replace(/__([A-Z0-9_]+)__/g, function(m, varName) {
+  return fileName.replace(/\b__([A-Z0-9_-]+)__\b/g, function(m, varName) {
     let func = context[varName];
     if (typeof func !== 'function')
-      return '';
+      return varName;
 
     return func();
   }).replace(/__/g, '');
@@ -210,7 +239,7 @@ async function createApplication(args) {
 
     await spawnProcess('npm', [ 'i' ], { env: { PWD: templateClonePath, CWD: templateClonePath }, cwd: templateClonePath });
 
-    runTemplateEngineOnProject(templateClonePath, createTemplateEngineContext(templateClonePath, args.appName));
+    runTemplateEngineOnProject(templateClonePath, await createTemplateEngineContext(templateClonePath, args.appName));
 
     console.log(`Mythix application created at ${templateClonePath}`);
     console.log('To finalize setup you need to:');
@@ -295,9 +324,20 @@ async function commandRunners(application, commandsObj, context, showHelp) {
   return false;
 }
 
+function loadJSON(filePath, defaultValue) {
+  try {
+    let content = FileSystem.readFileSync(filePath, 'utf8');
+    return JSON.parse(content);
+  } catch (error) {
+    console.error(`Error loading JSON file "${filePath}": `, error);
+    return (arguments.length > 1) ? defaultValue : {};
+  }
+}
+
+
 (async function() {
   const packageJSONPath = Path.resolve(__dirname, '..', 'package.json');
-  const packageJSON     = require(packageJSONPath);
+  const packageJSON     = loadJSON(packageJSONPath, {});
 
   // Windows hack
   if(!process.env.PWD)
@@ -389,29 +429,43 @@ async function commandRunners(application, commandsObj, context, showHelp) {
 
     let rootOptions;
     let mythixPath;
-    let mythixCLIPAth;
+    let mythixIndexPath;
     let mythixCLI;
     let config;
 
     try {
-      rootOptions   = { help, showHelp: customShowHelp, helpArgPattern: null };
-      mythixPath    = Path.dirname(require.resolve('mythix', { paths: [ process.env.PWD, Path.resolve(process.env.PWD, 'node_modules') ] }));
-      mythixCLIPAth = Path.resolve(mythixPath, 'cli');
-      mythixCLI     = require(mythixCLIPAth);
-      config        = mythixCLI.loadMythixConfig(argOptions.config);
+      rootOptions     = { help, showHelp: customShowHelp, helpArgPattern: null };
+      mythixIndexPath = Path.resolve(require.resolve('mythix', { paths: [ process.env.PWD, Path.resolve(process.env.PWD, 'node_modules') ] }));
+      mythixPath      = Path.dirname(mythixIndexPath);
+      mythixCLI       = (await import(mythixIndexPath)).CLI;
+      config          = await mythixCLI.loadMythixConfig(argOptions.config);
     } catch (error) {
       customShowHelp(help);
+
+      if (error.code !== 'MODULE_NOT_FOUND') {
+        console.error('\nError:', error.message || error);
+      } else {
+        console.log('\nNote: Run from within a mythix project to see additional commands.');
+      }
+
       process.exit(1);
     }
 
-    let Application = config.getApplicationClass(config);
+    if (!config.applicationPath) {
+      customShowHelp(help);
+      console.error('\nNo mythix application found. Run this command from within a mythix project directory,');
+      console.error('or use "mythix-cli create <app-name>" to create a new project.');
+      return process.exit(1);
+    }
+
+    let Application = await config.getApplicationClass(config);
     if (typeof Application !== 'function')
       throw new Error('Expected to find an Application class from "getApplicationClass", but none was returned.');
 
-    let application         = await mythixCLI.createApplication(Application, { autoReload: false, database: false, httpServer: false });
+    let application         = await mythixCLI.createApplication(Application, { cli: true, database: false, httpServer: false });
     let applicationOptions  = application.getOptions();
 
-    let commands = await mythixCLI.loadCommands(applicationOptions.commandsPath);
+    let commands = Application.getCommandList();
     await generateCommandHelp(application, commands, help);
 
     let commandContext = await CMDed(async (context) => {

package/package.json

@@ -1,11 +1,15 @@
 {
   "bin": {
-    "mythix-cli": "./bin/mythix-cli.js"
+    "mythix-cli": "./bin/mythix-cli.mjs"
   },
   "name": "mythix-cli",
-  "version": "1.3.9",
+  "version": "2.0.1",
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "description": "Mythix CLI utility",
-  "main": "src/index.js",
+  "main": "src/index.mjs",
+  "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -27,13 +31,18 @@
   },
   "homepage": "https://github.com/th317erd/mythix-cli#readme",
   "peerDependencies": {
-    "mythix": "^2.4.14"
+    "mythix": "^4.0.1"
+  },
+  "peerDependenciesMeta": {
+    "mythix": {
+      "optional": true
+    }
   },
   "dependencies": {
     "cmded": "^1.2.5",
-    "nife": "^1.11.3"
+    "nife": "^1.12.1"
   },
   "devDependencies": {
-    "eslint": "^8.23.0"
+    "eslint": "^8.43.0"
   }
 }

package/src/index.mjs

@@ -0,0 +1 @@
+export {};

package/src/index.js

@@ -1 +0,0 @@
-module.exports = {};