@constructor-io/constructorio-connect-cli 1.15.1 → 1.15.3

package/bin/dev.js

@@ -2,7 +2,7 @@
 
 void (async () => {
   const { config } = await import("dotenv");
-  config();
+  config({ quiet: true });
 
   const oclif = await import("@oclif/core");
 

package/bin/run.js

@@ -5,6 +5,6 @@ void (async () => {
   const { config } = await import("dotenv");
   const path = await import("path");
 
-  config({ path: path.join(process.cwd(), ".env") });
+  config({ quiet: true, path: path.join(process.cwd(), ".env") });
   await oclif.execute({ dir: __dirname });
 })();

package/boilerplate-repo/.github/workflows/deploy.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: "18.18.0"
+          node-version: "22.16.0"
 
       - name: Install dependencies
         run: npm ci

package/boilerplate-repo/.github/workflows/test.yml

@@ -13,11 +13,6 @@ jobs:
   check:
     name: Run tests
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node: ["20.18.0"]
-
     steps:
       - uses: actions/checkout@v3
 
@@ -28,9 +23,9 @@ jobs:
         run: echo "Missing CONNECT_AUTH_TOKEN secret" && exit 1
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node }}
+          node-version: "22.16.0"
 
       - name: Install dependencies
         run: npm ci

package/boilerplate-repo/eslint.config.mjs

@@ -25,6 +25,8 @@ export default defineConfig([
     rules: {
       "@stylistic/indent": ["error", 2],
       "@stylistic/quotes": ["error", "double"],
+      "@stylistic/quote-props": ["error", "as-needed"],
+      "@stylistic/comma-dangle": ["error", "always-multiline"],
     },
   },
 ]);

package/boilerplate-repo/test/global-setup.js

@@ -3,7 +3,7 @@
  */
 
 import { config } from "dotenv";
-config();
+config({ quiet: true });
 
 import { getConnections } from "@constructor-io/constructorio-connect-cli";
 

package/boilerplate-repo/test/setup-tests.js

@@ -3,6 +3,6 @@
  */
 
 import { config } from "dotenv";
-config();
+config({ quiet: true });
 
 process.env.TEST = "true";

package/dist/customer/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/customer/config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIlE;;;;;GAKG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC,CAsC/D;AAED;;;GAGG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAyCnF;AA8HD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,oBAAoB,CAAC;CAC3C"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/customer/config.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIlE;;;;;GAKG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC,CAsC/D;AAED;;;GAGG;AACH,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA4CnF;AA+HD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,oBAAoB,CAAC;CAC3C"}

package/dist/customer/config.js

@@ -100,22 +100,23 @@ async function getRepositoryConnectionsAndConfig() {
         };
     }
     catch (error) {
-        if (hasUnexpectedToken(error)) {
-            return handleUnexpectedTokenError(error, connectionsStr, fileContent);
-        }
-        else {
-            (0, print_warnings_1.printExecutionWarnings)({
-                warnings: [
-                    {
-                        type: "Config",
-                        critical: true,
-                        message: `Failed to parse the connections object in connectrc.js. Are you running a custom setup?`,
-                    },
-                ],
-                showDocsLink: false,
-            });
-            return { fileContent, existingConnections: {} };
+        // If the error is a parsing object error and the connections object does not use custom setups
+        // (ie: include process.env), it means that the connections object is not valid JSON, so we need to
+        // see whether the parse error is due to a quotation mark in the property names
+        if (hasParseObjectError(error) && !connectionsStr.includes("process.env")) {
+            return handleParseObjectError(error, connectionsStr, fileContent);
         }
+        (0, print_warnings_1.printExecutionWarnings)({
+            warnings: [
+                {
+                    type: "Config",
+                    critical: true,
+                    message: `Failed to parse the connections object in connectrc.js. Are you running a custom setup?`,
+                },
+            ],
+            showDocsLink: false,
+        });
+        return { fileContent, existingConnections: {} };
     }
 }
 /**
@@ -161,29 +162,29 @@ function isEmptyFileContent(fileContent, configPath) {
  * @returns true if the connections object is found in the connectrc.js file
  */
 function hasConfigMatch(configMatch) {
-    if (!configMatch) {
-        (0, print_warnings_1.printExecutionWarnings)({
-            warnings: [
-                {
-                    type: "Config",
-                    critical: true,
-                    message: "Could not find the `connections` variable in connectrc.js to keep your connections up to date. Are you running a custom setup?",
-                },
-            ],
-            showDocsLink: false,
-        });
-        return false;
+    if (configMatch) {
+        return true;
     }
-    return true;
+    (0, print_warnings_1.printExecutionWarnings)({
+        warnings: [
+            {
+                type: "Config",
+                critical: true,
+                message: "Could not find the `connections` variable in connectrc.js to keep your connections up to date. Are you running a custom setup?",
+            },
+        ],
+        showDocsLink: false,
+    });
+    return false;
 }
 /**
- * Checks if the error is an unexpected token error
+ * Checks if the error is a parsing object error
  * @param error The error that is thrown when getting connections from connectrc.js
- * @returns true if the error is an unexpected token error
+ * @returns true if the error is a parsing object error
  */
-function hasUnexpectedToken(error) {
+function hasParseObjectError(error) {
     return (error instanceof SyntaxError &&
-        error.message.includes("Unexpected token") &&
+        error.message.includes("Expected property name") &&
         error.message.includes("in JSON at position"));
 }
 /**
@@ -194,7 +195,7 @@ function hasUnexpectedToken(error) {
  * @param fileContent The content of connectrc.js
  * @returns The connections object and the content of connectrc.js
  */
-function handleUnexpectedTokenError(_error, connectionsStr, fileContent) {
+function handleParseObjectError(_error, connectionsStr, fileContent) {
     const QuotedConnectionStr = addQuotationMarksToProperties(connectionsStr);
     if (connectionsStr !== QuotedConnectionStr) {
         return {
@@ -202,21 +203,19 @@ function handleUnexpectedTokenError(_error, connectionsStr, fileContent) {
             existingConnections: JSON.parse(QuotedConnectionStr),
         };
     }
-    else {
-        (0, print_warnings_1.printExecutionWarnings)({
-            warnings: [
-                {
-                    type: "Config",
-                    critical: true,
-                    message: `Unable to parse the connections object. Please make sure that the config
+    (0, print_warnings_1.printExecutionWarnings)({
+        warnings: [
+            {
+                type: "Config",
+                critical: true,
+                message: `Unable to parse the connections object. Please make sure that the config
         file is defined as it was previously generated in the repo, as running custom setups to
         map your connections isn't supported when automatically updating those.`,
-                },
-            ],
-            showDocsLink: false,
-        });
-        return { fileContent, existingConnections: {} };
-    }
+            },
+        ],
+        showDocsLink: false,
+    });
+    return { fileContent, existingConnections: {} };
 }
 /**
  * Adds quotation marks to all properties in the {@link PartialConnection} make it JSON parsable

package/dist/functions/build-fixture.d.ts

@@ -7,7 +7,7 @@
  * @param type string The type of fixture
  * @param name string The name/path of the fixture
  * @param dataOverride string The data to override in the fixture
- * @returns Record<string, unknown> The fixture data
+ * @returns Record<string, unknown> or Array<Record<string, unknown>> The fixture data
  */
-export declare const buildFixture: (type: string, name: string, dataOverride?: Record<string, unknown>) => never;
+export declare const buildFixture: (type: string, name: string, dataOverride?: Record<string, unknown>) => never[];
 //# sourceMappingURL=build-fixture.d.ts.map

package/dist/functions/build-fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-fixture.d.ts","sourceRoot":"","sources":["../../src/functions/build-fixture.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,MAAM,EACZ,MAAM,MAAM,EACZ,eAAc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,UAK3C,CAAC"}
+{"version":3,"file":"build-fixture.d.ts","sourceRoot":"","sources":["../../src/functions/build-fixture.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GACvB,MAAM,MAAM,EACZ,MAAM,MAAM,EACZ,eAAc,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,YAW3C,CAAC"}

package/dist/functions/build-fixture.js

@@ -16,10 +16,15 @@ const file_loaders_1 = require("../helpers/file-loaders");
  * @param type string The type of fixture
  * @param name string The name/path of the fixture
  * @param dataOverride string The data to override in the fixture
- * @returns Record<string, unknown> The fixture data
+ * @returns Record<string, unknown> or Array<Record<string, unknown>> The fixture data
  */
 const buildFixture = (type, name, dataOverride = {}) => {
     const data = (0, file_loaders_1.getCatalogFixture)(path_1.default.join(type, name));
+    if (Array.isArray(data)) {
+        return data.map((item) => {
+            return (0, remeda_1.mergeDeep)(item, dataOverride);
+        });
+    }
     return (0, remeda_1.mergeDeep)(data, dataOverride);
 };
 exports.buildFixture = buildFixture;

package/dist/helpers/lint-config-file.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Adds rules to the eslint config file and then executes npm run lint
+ */
+export declare function lintConfigFile(): Promise<void>;
+/**
+ * Adds rules to eslint.config.js file
+ * @param rules Array of strings of rules, where the rule name within the string is in single quotes
+ * ie: [`'@stylistic/js/quote-props': ['error', 'as-needed']`],
+ * where '@stylistic/js/quote-props' is in single quotes
+ */
+export declare function addRuleToConfig(rules: string[]): Promise<void>;
+//# sourceMappingURL=lint-config-file.d.ts.map

package/dist/helpers/lint-config-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lint-config-file.d.ts","sourceRoot":"","sources":["../../src/helpers/lint-config-file.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAsB,cAAc,kBAQnC;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,iBA2BpD"}

package/dist/helpers/lint-config-file.js

@@ -0,0 +1,78 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lintConfigFile = lintConfigFile;
+exports.addRuleToConfig = addRuleToConfig;
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs/promises"));
+const path_1 = require("../customer/path");
+/**
+ * Adds rules to the eslint config file and then executes npm run lint
+ */
+async function lintConfigFile() {
+    await addRuleToConfig([
+        `'@stylistic/js/quote-props': ['error', 'as-needed']`,
+        `'@stylistic/js/comma-dangle': ['error', 'always-multiline']`,
+    ]);
+    const repoPath = (0, path_1.getCustomerOSSpecificPath)("");
+    (0, child_process_1.execSync)(`(cd ${repoPath} && eslint . --fix)`);
+}
+/**
+ * Adds rules to eslint.config.js file
+ * @param rules Array of strings of rules, where the rule name within the string is in single quotes
+ * ie: [`'@stylistic/js/quote-props': ['error', 'as-needed']`],
+ * where '@stylistic/js/quote-props' is in single quotes
+ */
+async function addRuleToConfig(rules) {
+    const eslintConfigPath = (0, path_1.getCustomerOSSpecificPath)("eslint.config.js");
+    const eslintConfig = await fs.readFile(eslintConfigPath, "utf-8");
+    const missingRules = rules.filter((rule) => {
+        // Extract rule names (part between single quotes, eg: "@stylistic/js/quote-props")
+        // to check for existence
+        const ruleNameMatch = rule.match(/^'([^']+)'/);
+        // If we can't extract rule name, don't add it to eslint
+        if (!ruleNameMatch)
+            return false;
+        const ruleName = ruleNameMatch[1];
+        return !eslintConfig.includes(ruleName);
+    });
+    if (missingRules.length === 0) {
+        return;
+    }
+    // Add all missing rules
+    const rulesString = missingRules.map((rule) => `${rule},`).join("\n    ");
+    const updatedConfig = eslintConfig.replace(/(rules:\s*\{\s*)/, `$1${rulesString}\n    `);
+    await fs.writeFile(eslintConfigPath, updatedConfig, "utf-8");
+}

package/dist/helpers/refresh-connections-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refresh-connections-list.d.ts","sourceRoot":"","sources":["../../src/helpers/refresh-connections-list.ts"],"names":[],"mappings":"AAcA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAY5D"}
+{"version":3,"file":"refresh-connections-list.d.ts","sourceRoot":"","sources":["../../src/helpers/refresh-connections-list.ts"],"names":[],"mappings":"AAeA,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC,CAa5D"}

package/dist/helpers/refresh-connections-list.js

@@ -37,10 +37,11 @@ exports.refreshConnectionsList = refreshConnectionsList;
 const fs = __importStar(require("fs/promises"));
 const core_1 = require("@oclif/core");
 const config_1 = require("../customer/config");
+const path_1 = require("../customer/path");
 const get_connections_request_1 = require("../http/get-connections-request");
 const render_prompt_1 = require("../prompt-data/render-prompt");
-const path_1 = require("../customer/path");
 const build_config_file_1 = require("./build-config-file");
+const lint_config_file_1 = require("./lint-config-file");
 const should_update_connections_list_1 = require("./should-update-connections-list");
 const ux_action_1 = require("./ux-action");
 async function refreshConnectionsList() {
@@ -50,6 +51,7 @@ async function refreshConnectionsList() {
             return;
         }
         await updateConfigFile();
+        await (0, lint_config_file_1.lintConfigFile)();
     }
     catch (error) {
         core_1.ux.stdout(`Error refreshing connections list: ${error.message}`);
@@ -70,19 +72,15 @@ async function promptForUpdate() {
     });
 }
 async function checkConfigFileState() {
-    const formattedConnections = await fetchNewConnections();
+    const newConnections = await fetchNewConnections();
     const { fileContent, existingConnections } = await (0, config_1.getRepositoryConnectionsAndConfig)();
     if (!fileContent) {
         return false;
     }
-    if (!(0, should_update_connections_list_1.shouldUpdateConnectionList)(existingConnections, formattedConnections)) {
-        return false;
-    }
-    const update = await promptForUpdate();
-    if (!update) {
+    if (!(0, should_update_connections_list_1.shouldUpdateConnectionList)(existingConnections, newConnections)) {
         return false;
     }
-    return true;
+    return await promptForUpdate();
 }
 async function updateConfigFile() {
     const formattedConnections = await fetchNewConnections();
@@ -94,9 +92,7 @@ async function updateConfigFile() {
     await (0, ux_action_1.uxAction)("Updating connectrc.js", async () => {
         const updatedContent = fileContent.replace(
         // Match the connections object in connectrc.js
-        /const\s+connections\s*=\s*({[\s\S]*?});/, 
-        // Replace the connections object with the new formatted connections
-        `const connections = ${JSON.stringify(formattedConnections, null, 2)};`);
+        /const\s+connections\s*=\s*({[\s\S]*?});/, `const connections = ${JSON.stringify(formattedConnections, null, 2)};`);
         await fs.writeFile(rcPath, updatedContent, "utf-8");
     })();
     core_1.ux.stdout("🎉 Successfully updated connections in connectrc.js");

package/dist/version.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "1.15.1";
+declare const _default: "1.15.3";
 export default _default;
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '1.15.1';
+exports.default = '1.15.3';

package/oclif.manifest.json

@@ -199,5 +199,5 @@
       ]
     }
   },
-  "version": "1.15.1"
+  "version": "1.15.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-connect-cli",
-  "version": "1.15.1",
+  "version": "1.15.3",
   "description": "CLI tool to enable users to interface with the Constructor Connect Ecosystem",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -67,7 +67,7 @@
     "axios": "^1.6.8",
     "axios-retry": "^4.4.1",
     "cli-highlight": "^2.1.11",
-    "dotenv": "^16.4.5",
+    "dotenv": "^17.0.1",
     "fs-extra": "^11.2.0",
     "json-stringify-pretty-compact": "^3.0.0",
     "kleur": "^4.1.5",