@hahnpro/flow-cli 2.16.3 → 2.16.5

package/lib/cli.mjs

@@ -9,8 +9,8 @@ import { Command } from 'commander';
 import copyfiles from 'copyfiles';
 import { execa } from 'execa';
 import FormData from 'form-data';
-import glob from 'glob';
-import HttpsProxyAgent from 'https-proxy-agent';
+import { glob } from 'glob';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
@@ -20,6 +20,8 @@ import { fileURLToPath } from 'node:url';
 import { getAccessToken, login, logout } from './auth.mjs';
 import { handleApiError, handleConvertedOutput, logger, prepareTsFile } from './utils.mjs';
 
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 const require = createRequire(import.meta.url);
 const BASE_URL = process.env.BASE_URL || process.env.PLATFORM_URL;
 const BUILD_DIR = process.env.BUILD_DIR || 'dist';
@@ -27,16 +29,16 @@ const BUILD_DIR = process.env.BUILD_DIR || 'dist';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-let axios = Axios;
+let axios = Axios.create();
 if (process.env.https_proxy || process.env.http_proxy) {
-  const httpsAgent = HttpsProxyAgent(process.env.https_proxy || process.env.http_proxy);
+  const httpsAgent = new HttpsProxyAgent(process.env.https_proxy || process.env.http_proxy);
   axios = Axios.create({ httpsAgent, proxy: false });
 }
 
 let apiToken;
 let projectsRoot = 'modules';
 
-const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json')));
+const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json')).toString());
 
 const CMD = {
   AUDIT: 'audit',
@@ -313,25 +315,24 @@ program
         cwd: project.location,
         ignore: ['node_modules/**/*', '**/package*.json', '**/tsconfig*.json'],
       };
-      glob('**/*.*', globOptions, async (error, files) => {
-        const filtered = files.filter((file) => !file.endsWith('.spec.ts'));
-        const tsJsonMap = filtered.reduce((accumulator, current, index, array) => {
-          if (current.endsWith('.ts')) {
-            // get json file for current function
-            const json = array.find((v) => v === `${current.split('.')[0]}.json`);
-            if (json) {
-              accumulator.push({
-                ts: path.join(globOptions.cwd, current),
-                json: path.join(globOptions.cwd, json),
-              });
-            }
+      const files = await glob('**/*.*', globOptions);
+      const filtered = files.filter((file) => !file.endsWith('.spec.ts'));
+      const tsJsonMap = filtered.reduce((accumulator, current, index, array) => {
+        if (current.endsWith('.ts')) {
+          // get json file for current function
+          const json = array.find((v) => v === `${current.split('.')[0]}.json`);
+          if (json) {
+            accumulator.push({
+              ts: path.join(globOptions.cwd, current),
+              json: path.join(globOptions.cwd, json),
+            });
           }
-          return accumulator;
-        }, []);
-        for (let entry of tsJsonMap) {
-          await generateSchemasForFile(entry.ts, entry.json);
         }
-      });
+        return accumulator;
+      }, []);
+      for (let entry of tsJsonMap) {
+        await generateSchemasForFile(entry.ts, entry.json);
+      }
     } catch (error) {
       if (error) logger.log(error);
       process.exit(1);
@@ -585,41 +586,37 @@ async function publishFunctions(project, update, baseUrl = BASE_URL) {
       cwd: project.location,
       ignore: ['node_modules/**/*', '**/package*.json', '**/tsconfig*.json'],
     };
-    glob('**/*.json', globOptions, async (error, files) => {
-      if (error) {
-        return reject(error);
-      }
-      const headers = { Authorization: `Bearer ${apiToken}` };
+    const files = await glob('**/*.json', globOptions).catch((error) => reject(error));
+    const headers = { Authorization: `Bearer ${apiToken}` };
 
-      for (const file of files) {
-        try {
-          const data = await fs.promises.readFile(path.join(globOptions.cwd, file));
-          const json = JSON.parse(data.toString());
-          if (json.fqn && json.category) {
-            if (update) {
-              try {
-                await axios.put(`${baseUrl}/api/flow/functions/${json.fqn}`, json, { headers });
-                logger.ok(`Flow Function "${json.fqn}" has been updated`);
-              } catch (error) {
-                logger.error(`Flow Function "${json.fqn}" could not be updated`);
-                handleApiError(error);
-              }
-            } else {
-              try {
-                await axios.post(`${baseUrl}/api/flow/functions`, json, { headers });
-                logger.ok(`Flow Function "${json.fqn}" has been created`);
-              } catch (error) {
-                logger.error(`Flow Function "${json.fqn}" could not be created`);
-                handleApiError(error);
-              }
+    for (const file of files || []) {
+      try {
+        const data = await fs.promises.readFile(path.join(globOptions.cwd, file));
+        const json = JSON.parse(data.toString());
+        if (json.fqn && json.category) {
+          if (update) {
+            try {
+              await axios.put(`${baseUrl}/api/flow/functions/${json.fqn}`, json, { headers });
+              logger.ok(`Flow Function "${json.fqn}" has been updated`);
+            } catch (error) {
+              logger.error(`Flow Function "${json.fqn}" could not be updated`);
+              handleApiError(error);
+            }
+          } else {
+            try {
+              await axios.post(`${baseUrl}/api/flow/functions`, json, { headers });
+              logger.ok(`Flow Function "${json.fqn}" has been created`);
+            } catch (error) {
+              logger.error(`Flow Function "${json.fqn}" could not be created`);
+              handleApiError(error);
             }
           }
-        } catch (error) {
-          logger.error(error);
         }
+      } catch (error) {
+        logger.error(error);
       }
-      return resolve();
-    });
+    }
+    return resolve();
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/flow-cli",
-  "version": "2.16.3",
+  "version": "2.16.5",
   "description": "CLI for managing Flow Modules",
   "license": "MIT",
   "type": "module",
@@ -27,38 +27,38 @@
   },
   "dependencies": {
     "archiver": "^5.3.1",
-    "axios": "~1.3.3",
+    "axios": "~1.4.0",
     "chalk": "^5.2.0",
     "class-transformer": "0.5.1",
     "class-validator": "~0.14.0",
-    "class-validator-jsonschema": "^4.0.0",
-    "commander": "^10.0.0",
+    "class-validator-jsonschema": "^5.0.0",
+    "commander": "^11.0.0",
     "copyfiles": "^2.4.1",
-    "dotenv": "^16.0.3",
-    "ejs": "^3.1.8",
-    "execa": "^7.0.0",
+    "dotenv": "^16.3.1",
+    "ejs": "^3.1.9",
+    "execa": "^7.1.1",
     "express": "^4.18.2",
     "form-data": "^4.0.0",
-    "get-port": "^6.1.2",
-    "glob": "^8.1.0",
-    "https-proxy-agent": "^5.0.1",
+    "get-port": "^7.0.0",
+    "glob": "^10.2.7",
+    "https-proxy-agent": "^7.0.0",
     "nconf": "^0.12.0",
-    "open": "^8.4.1",
-    "openid-client": "^5.4.0",
-    "ora": "^6.1.2",
+    "open": "^9.1.0",
+    "openid-client": "^5.4.2",
+    "ora": "^6.3.1",
     "reflect-metadata": "^0.1.13",
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.5.2",
     "@types/nconf": "^0.10.3",
-    "@types/node": "^18.13.0",
-    "eslint": "^8.34.0",
-    "eslint-plugin-unicorn": "^45.0.2",
-    "jest": "^29.4.3",
-    "prettier": "^2.8.4",
-    "typescript": "^4.9.5"
+    "@types/node": "^18.16.18",
+    "eslint": "^8.43.0",
+    "eslint-plugin-unicorn": "^47.0.0",
+    "jest": "^29.5.0",
+    "prettier": "^2.8.8",
+    "typescript": "^5.0.4"
   },
   "engines": {
     "node": "^14.13.1 || >=16.0.0"