@memberjunction/cli 1.1.1 → 1.1.3

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @memberjunction/cli
 $ mj COMMAND
 running command...
 $ mj (--version)
-@memberjunction/cli/1.1.1 linux-x64 node-v20.12.2
+@memberjunction/cli/1.1.3 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.1/src/commands/install/index.ts)_
+_See code: [src/commands/install/index.ts](https://github.com/MemberJunction/MJ/blob/v1.1.3/src/commands/install/index.ts)_
 
 ## `mj version`
 

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(),
@@ -123,9 +123,9 @@ MJ_CORE_SCHEMA='__mj'
 
 # If using Advanced Generation, populate this with the API key for the AI vendor you are using
 # Also, you need to configure the settings under advancedGeneration in the config.json file, including choosing the vendor.
-AI_VENDOR_API_KEY__OpenAILLM='${this.userConfig.openAIAPIKey}'  
-AI_VENDOR_API_KEY__MistralLLM='${this.userConfig.mistralAPIKey}'  
-AI_VENDOR_API_KEY__AnthropicLLM='${this.userConfig.anthropicAPIKey}'  
+AI_VENDOR_API_KEY__OpenAILLM='${this.userConfig.openAIAPIKey}'
+AI_VENDOR_API_KEY__MistralLLM='${this.userConfig.mistralAPIKey}'
+AI_VENDOR_API_KEY__AnthropicLLM='${this.userConfig.anthropicAPIKey}'
 
 #CONFIG_FILE is the name of the file that has the configuration parameters for CodeGen
 CONFIG_FILE='config.json'
@@ -155,7 +155,7 @@ UPDATE_USER_CACHE_WHEN_NOT_FOUND=1
 UPDATE_USER_CACHE_WHEN_NOT_FOUND_DELAY=5000
 
 # AUTHENTICATION SECTION - you can use MSAL or Auth0 or both for authentication services for MJAPI
-# MSAL Section 
+# MSAL Section
 WEB_CLIENT_ID=${this.userConfig.msalWebClientId}
 TENANT_ID=${this.userConfig.msalTenantId}
 
@@ -196,7 +196,7 @@ CONFIG_FILE='config.json'
             AUTH0_DOMAIN: this.userConfig.auth0Domain,
             AUTH0_CLIENTID: this.userConfig.auth0ClientId,
         };
-        await this.updateEnvironmentFiles(MJEXPLORER_DIR, config);
+        await this.updateEnvironmentFiles(node_path_1.default.join(MJEXPLORER_DIR, 'src', 'environments'), config);
         // keep on going with MJ Explorer - do the rest of the stuff
         this.log('   Running npm link for GeneratedEntities...');
         (0, node_child_process_1.execSync)('npm link ../GeneratedEntities', { stdio: 'inherit', cwd: MJEXPLORER_DIR });
@@ -221,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:',
             });
@@ -230,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,
@@ -377,6 +383,9 @@ CONFIG_FILE='config.json'
             const envFiles = files.filter((file) => envFilePattern.test(file));
             // Update each environment file.
             for (const file of envFiles) {
+                if (this.flags.verbose) {
+                    this.log(`Updating ${file}`);
+                }
                 const filePath = node_path_1.default.join(dirPath, file);
                 const data = await fs.readFile(filePath, 'utf8');
                 // Replace the values in the file.

package/oclif.manifest.json

@@ -33,5 +33,5 @@
       ]
     }
   },
-  "version": "1.1.1"
+  "version": "1.1.3"
 }

package/package.json

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