@memberjunction/cli 1.1.0 → 1.1.2

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @memberjunction/cli
 $ mj COMMAND
 running command...
 $ mj (--version)
-@memberjunction/cli/1.1.0 linux-x64 node-v20.12.2
+@memberjunction/cli/1.1.2 linux-x64 node-v20.12.2
 $ mj --help [COMMAND]
 USAGE
   $ mj COMMAND
@@ -63,7 +63,7 @@ EXAMPLES
   $ mj install
 ```
 
-_See code: [src/commands/install/index.ts](https://github.com/MemberJunction/MJ/blob/v1.1.0/src/commands/install/index.ts)_
+_See code: [src/commands/install/index.ts](https://github.com/MemberJunction/MJ/blob/v1.1.2/src/commands/install/index.ts)_
 
 ## `mj version`
 

package/dist/commands/install/index.d.ts

@@ -118,6 +118,7 @@ export default class Install extends Command {
      * @param {...string} dirs - The directories to check.
      */
     verifyDirs(...dirs: string[]): void;
+    checkNodeVersion(): void;
     /**
      * Checks if there is at least `numGB` GB of free disk space.
      * @param {number} numGB - The number of GB to check for.

package/dist/commands/install/index.js

@@ -42,10 +42,10 @@ const MJ_BASE_DIR = 'MJ_BASE';
 const MJAPI_DIR = 'MJAPI';
 const MJEXPLORER_DIR = 'MJExplorer';
 const configSchema = zod_1.z.object({
-    dbUrl: zod_1.z.string().url(),
+    dbUrl: zod_1.z.string().min(1),
     dbInstance: zod_1.z.string(),
     dbTrustServerCertificate: zod_1.z.enum(['Y', 'N']),
-    dbDatabase: zod_1.z.string(),
+    dbDatabase: zod_1.z.string().min(1),
     dbPort: zod_1.z.number({ coerce: true }).int().positive(),
     codeGenLogin: zod_1.z.string(),
     codeGenPwD: zod_1.z.string(),
@@ -81,6 +81,7 @@ class Install extends core_1.Command {
     async run() {
         const parsed = await this.parse(Install);
         this.flags = parsed.flags;
+        this.checkNodeVersion();
         this.checkAvailableDiskSpace(2);
         this.verifyDirs(CODEGEN_DIR, GENERATED_ENTITIES_DIR, SQL_SCRIPTS_DIR, MJAPI_DIR, MJEXPLORER_DIR);
         this.userConfig = await this.getUserConfiguration();
@@ -130,16 +131,14 @@ AI_VENDOR_API_KEY__AnthropicLLM='${this.userConfig.anthropicAPIKey}'
 CONFIG_FILE='config.json'
 `;
         fs.writeFileSync(node_path_1.default.join(CODEGEN_DIR, '.env'), codeGenENV);
-        this.log('   Running npm install...');
-        (0, node_child_process_1.execSync)('npm install', { stdio: 'inherit', cwd: CODEGEN_DIR });
         this.log('   Running npm link for GeneratedEntities...');
         (0, node_child_process_1.execSync)('npm link ../GeneratedEntities', { stdio: 'inherit', cwd: CODEGEN_DIR });
         //*******************************************************************
         // Process MJAPI
         //*******************************************************************
         this.log('\n\nBootstrapping MJAPI...');
-        this.log('   Running npm install...');
-        (0, node_child_process_1.execSync)('npm install', { stdio: 'inherit', cwd: MJAPI_DIR });
+        this.log('   Running npm link for GeneratedEntities...');
+        (0, node_child_process_1.execSync)('npm link ../GeneratedEntities', { stdio: 'inherit', cwd: MJAPI_DIR });
         this.log('   Setting up MJAPI .env file...');
         const mjAPIENV = `#Database Setup
 DB_HOST='${this.userConfig.dbUrl}'
@@ -182,13 +181,11 @@ ASK_SKIP_ORGANIZATION_ID = 1
 CONFIG_FILE='config.json'
 `;
         fs.writeFileSync(node_path_1.default.join(MJAPI_DIR, '.env'), mjAPIENV);
-        this.log('   Running npm link for GeneratedEntities...');
-        (0, node_child_process_1.execSync)('npm link ../GeneratedEntities', { stdio: 'inherit', cwd: MJAPI_DIR });
         this.log('Running CodeGen...');
         this.renameFolderToMJ_BASE(this.userConfig.dbDatabase);
         // next, run CodeGen
         // We do not manually run the compilation for GeneratedEntities because CodeGen handles that, but notice above that we did npm install for GeneratedEntities otherwise when CodeGen attempts to compile it, it will fail.
-        (0, node_child_process_1.execSync)('npx tsx src/index.ts', { stdio: 'inherit', cwd: CODEGEN_DIR });
+        (0, node_child_process_1.execSync)('npx ts-node src/index.ts', { stdio: 'inherit', cwd: CODEGEN_DIR });
         // Process MJExplorer
         this.log('\nProcessing MJExplorer...');
         this.log('\n   Updating environment files...');
@@ -201,8 +198,6 @@ CONFIG_FILE='config.json'
         };
         await this.updateEnvironmentFiles(MJEXPLORER_DIR, config);
         // keep on going with MJ Explorer - do the rest of the stuff
-        this.log('   Running npm install...');
-        (0, node_child_process_1.execSync)('npm install', { stdio: 'inherit', cwd: MJEXPLORER_DIR });
         this.log('   Running npm link for GeneratedEntities...');
         (0, node_child_process_1.execSync)('npm link ../GeneratedEntities', { stdio: 'inherit', cwd: MJEXPLORER_DIR });
         this.log('Installation complete!');
@@ -226,7 +221,10 @@ CONFIG_FILE='config.json'
         }
         if (!userConfig) {
             this.log('\n>>> Please answer the following questions to setup the .env files for CodeGen. After this process you can manually edit the .env file in CodeGen as desired.');
-            const dbUrl = await (0, prompts_1.input)({ message: 'Enter the database server URL:' });
+            const dbUrl = await (0, prompts_1.input)({
+                message: 'Enter the database server hostname:',
+                validate: (v) => configSchema.shape.dbDatabase.safeParse(v).success,
+            });
             const dbInstance = await (0, prompts_1.input)({
                 message: 'If you are using a named instance on that server, if so, enter the name here, if not leave blank:',
             });
@@ -235,7 +233,10 @@ CONFIG_FILE='config.json'
             }))
                 ? 'Y'
                 : 'N';
-            const dbDatabase = await (0, prompts_1.input)({ message: 'Enter the database name on that server:' });
+            const dbDatabase = await (0, prompts_1.input)({
+                message: 'Enter the database name on that server:',
+                validate: (v) => configSchema.shape.dbDatabase.safeParse(v).success,
+            });
             const dbPort = await (0, prompts_1.input)({
                 message: 'Enter the port the database server listens on',
                 validate: (v) => configSchema.shape.dbPort.safeParse(v).success,
@@ -322,6 +323,12 @@ CONFIG_FILE='config.json'
             }
         });
     }
+    checkNodeVersion() {
+        const validNodeVersion = Number(process.version.replace(/^v(\d+).*/, '$1')) >= 20;
+        if (!validNodeVersion) {
+            this.error('MemberJunction requires Node.js version 20 or higher.', { exit: 1 });
+        }
+    }
     /**
      * Checks if there is at least `numGB` GB of free disk space.
      * @param {number} numGB - The number of GB to check for.
@@ -397,6 +404,10 @@ CONFIG_FILE='config.json'
         // rename the MJ_BASE set of SQL Scripts to our new dbname
         const oldFolderPath = node_path_1.default.join(SQL_SCRIPTS_DIR, GENERATED_DIR, MJ_BASE_DIR);
         const newFolderPath = node_path_1.default.join(SQL_SCRIPTS_DIR, GENERATED_DIR, dbDatabase); // Assuming dbDatabase holds the new name
+        if (!fs.existsSync(oldFolderPath)) {
+            this.warn(`SQL scripts not found at '${oldFolderPath}', skipping rename`);
+            return;
+        }
         try {
             fs.moveSync(oldFolderPath, newFolderPath);
             this.log(`Renamed ${oldFolderPath} to ${newFolderPath} successfully.`);

package/oclif.manifest.json

@@ -33,5 +33,5 @@
       ]
     }
   },
-  "version": "1.1.0"
+  "version": "1.1.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/cli",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "MemberJunction command line tools",
   "keywords": [
     "oclif"