@nzz/q-cli 2.0.0-beta.10 → 2.0.0-beta.13

package/dist/createCustomCodeItem.js

@@ -15,7 +15,11 @@ export default function (command) {
         const qConfigPath = resolve(command.config);
         if (!existsSync(qConfigPath)) {
             logError(`Couldn't find config file: '${qConfigPath}'.\nCreate a config file in the current directory or pass the path to the config file with the option -c <path>`);
-            return;
+            process.exit(1);
+        }
+        if (!command.environment) {
+            logError('Environment is required');
+            process.exit(1);
         }
         // Get the Q server URL and access token from the environment variables or 1Password
         const qServerUrl = getQServerUrl(command.environment);

package/dist/enums.js

@@ -3,4 +3,5 @@ export var Environment;
     Environment["PRODUCTION"] = "production";
     Environment["STAGING"] = "staging";
     Environment["TEST"] = "test";
+    Environment["LOCAL"] = "local";
 })(Environment || (Environment = {}));

package/dist/index.js

@@ -21,34 +21,12 @@ function main() {
         program.version(version).description('Q Toolbox cli');
         program
             .command('new-custom-code')
-            .option('-d, --dir [path]', 'the base directory to bootstrap the new custom code project in')
+            .argument('<path>', 'the base directory to bootstrap the new custom code project in')
             .description('bootstrap a new custom code project')
-            .action((command) => {
-            newCustomCode(command);
+            .action(() => {
+            const dir = program.args[1];
+            newCustomCode({ dir });
         });
-        program
-            .command('new-et-utils-package')
-            .option('-d, --dir [path]', 'the base directory to bootstrap the new tool in, defaults to the tools name')
-            .description('bootstrap a new ed-tech utility package')
-            .action(() => __awaiter(this, void 0, void 0, function* () {
-            //   const name = program.args[1];
-            //   const author = program.args[2] || 'TODO: Set package author name';
-            //   const description = program.args[3] || 'TODO: Write a package description';
-            //   if (!name) {
-            //     console.error(errorColor('no package name given'));
-            //     process.exit(1);
-            //   }
-            //   const baseDir = program.dir || name;
-            //   const textReplacements = [
-            //     { regex: new RegExp('<package-name>', 'g'), replaceWith: name },
-            //     { regex: new RegExp('<author-name>', 'g'), replaceWith: author },
-            //     {
-            //       regex: new RegExp('<package-description>', 'g'),
-            //       replaceWith: description,
-            //     },
-            //   ];
-            //   await bootstrap('et-utils-package', baseDir, textReplacements);
-        }));
         program
             .command('update-item')
             .description('update q item')
@@ -57,14 +35,6 @@ function main() {
             .action((command) => __awaiter(this, void 0, void 0, function* () {
             yield updateItem(command);
         }));
-        program
-            .command('copy-item')
-            .description('copies an existing q item')
-            .option('-c, --config [path]', 'set config path which defines the q items to be copied. defaults to ./q.config.json', `${process.cwd()}/q.config.json`)
-            .option('-e, --environment [env]', 'set environment where the existing q item is found, defaults to copy all items of all environments defined in config')
-            .action((command) => __awaiter(this, void 0, void 0, function* () {
-            // await copyItem(command);
-        }));
         program
             .command('create-custom-code-item')
             .description('creates a new q custom code item in the db and adds it to the q config file')

package/dist/updateItem.js

@@ -14,6 +14,39 @@ import FormData from 'form-data';
 import fetch from 'node-fetch'; // Use node-fetch instead of native fetch, because native fetch seems to have issues with FormData/uploading files
 import { getAccessToken, getQServerUrl, logError, logSuccess, updateItem } from './utils.js';
 import updateSchemaJson from './assets/updateSchema.json' with { type: 'json' };
+import { Environment } from './enums.js';
+const envCredentials = {
+    [Environment.LOCAL]: {
+        qServerUrl: '',
+        accessToken: '',
+    },
+    [Environment.TEST]: {
+        qServerUrl: '',
+        accessToken: '',
+    },
+    [Environment.STAGING]: {
+        qServerUrl: '',
+        accessToken: '',
+    },
+    [Environment.PRODUCTION]: {
+        qServerUrl: '',
+        accessToken: '',
+    },
+};
+/**
+ * Get the Q server URL and access token from the environment variables or 1Password
+ * @param environment The environment to get the credentials for
+ * @returns The Q server URL and access token
+ */
+function getEnvCredentials(environment) {
+    if (envCredentials[environment].qServerUrl === '' || envCredentials[environment].accessToken === '') {
+        envCredentials[environment] = {
+            qServerUrl: getQServerUrl(environment),
+            accessToken: getAccessToken(environment),
+        };
+    }
+    return envCredentials[environment];
+}
 function validateConfig(metaSchema, qConfig) {
     const ajv = new Ajv({ allErrors: true });
     let isValid = true;
@@ -107,16 +140,37 @@ export default function (command) {
             logError(`A problem occurred while validating the config file: ${validationResult.errorsText}`);
             process.exit(1);
         }
-        // Get the Q server URL and access token from the environment variables or 1Password
-        const qServerUrl = getQServerUrl(command.environment);
-        const accessToken = getAccessToken(command.environment);
-        console.log(`Updating items on server ${qServerUrl}...`);
+        let qServerUrl;
+        let accessToken;
+        let environmentToUpdate;
         for (const item of qConfig.items) {
             for (const environment of item.environments) {
-                // Skip if the environment is not the one we want to update
-                if (command.environment !== environment.name)
+                // If the environment is specified, use that environment
+                if (command.environment && !environmentToUpdate) {
+                    // Skip if the environment is not the one we want to update
+                    if (command.environment !== environment.name)
+                        continue;
+                    environmentToUpdate = command.environment;
+                    // Get the credentials for the current environment
+                    const credentials = getEnvCredentials(environmentToUpdate);
+                    qServerUrl = credentials.qServerUrl;
+                    accessToken = credentials.accessToken;
+                    console.log(`Updating items on server ${qServerUrl}...`);
+                }
+                else if (!command.environment && environmentToUpdate !== environment.name) {
+                    // Otherwise, use the environment from the config
+                    environmentToUpdate = environment.name;
+                    // Get the credentials for the current environment
+                    const credentials = getEnvCredentials(environmentToUpdate);
+                    qServerUrl = credentials.qServerUrl;
+                    accessToken = credentials.accessToken;
+                    console.log(`Updating items on server ${qServerUrl}...`);
+                }
+                else {
+                    // If the environment is not specified, skip the environment
                     continue;
-                console.log(`Updating item ${environment.id} on ${environment.name} environment...`);
+                }
+                console.log(`Updating item ${environment.id} on ${environmentToUpdate} environment...`);
                 let qDoc = structuredClone(item.item);
                 qDoc._id = environment.id;
                 // Process the 'path' properties and upload files
@@ -128,7 +182,7 @@ export default function (command) {
                 // Update the item on the Q server
                 const result = yield updateItem(qDoc, qServerUrl, accessToken);
                 if (result.success) {
-                    logSuccess(`Successfully updated item with id ${environment.id} on ${environment.name} environment`);
+                    logSuccess(`Successfully updated item with id ${environment.id} on ${environmentToUpdate} environment`);
                 }
                 else {
                     logError(result.msg);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@nzz/q-cli",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.13",
   "description": "",
   "type": "module",
   "main": "./src/index.ts",
   "bin": {
-    "q": "./dist/index.js"
+    "Q": "./dist/index.js"
   },
   "files": [
     "dist"