@constructor-io/constructorio-connect-cli 1.12.3 → 1.12.4

package/dist/commands/execute.d.ts

@@ -26,13 +26,9 @@ export declare class Execute extends RefreshConnectionsCommand {
     static examples: string[];
     input: ExecuteInputFlags;
     runCommand(): Promise<void>;
-    /**
-     * Returns the template type, which is always equal to the folder name of the template path.
-     */
-    private getTemplateType;
     private parseFlags;
     private getTemplateExecInput;
-    private calculateConnectionId;
+    private validateAndGetConnection;
     private getConnectionForTemplate;
 }
 export {};

package/dist/commands/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/commands/execute.ts"],"names":[],"mappings":"AAgCA,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,eAAO,MAAM,qBAAqB;;;;;CAKxB,CAAC;AAEX;;;GAGG;AACH,UAAU,iBAAiB;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAYD,qBAAa,OAAQ,SAAQ,yBAAyB;IACpD,MAAM,CAAC,KAAK;;;;;MAgBV;IAEF,MAAM,CAAC,WAAW,SACkK;IAEpL,MAAM,CAAC,QAAQ,WAOb;IAEF,KAAK,EAAE,iBAAiB,CAAM;IAExB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCjC;;OAEG;IACH,OAAO,CAAC,eAAe;YAKT,UAAU;YAsBV,oBAAoB;YA+CpB,qBAAqB;YA0BrB,wBAAwB;CAevC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/commands/execute.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,eAAO,MAAM,qBAAqB;;;;;CAKxB,CAAC;AAEX;;;GAGG;AACH,UAAU,iBAAiB;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAYD,qBAAa,OAAQ,SAAQ,yBAAyB;IACpD,MAAM,CAAC,KAAK;;;;;MAgBV;IAEF,MAAM,CAAC,WAAW,SACkK;IAEpL,MAAM,CAAC,QAAQ,WAOb;IAEF,KAAK,EAAE,iBAAiB,CAAM;IAExB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAkCnB,UAAU;YAsBV,oBAAoB;YAoDpB,wBAAwB;YA2BxB,wBAAwB;CAevC"}

package/dist/commands/execute.js

@@ -1,18 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Execute = exports.executePromptMessages = void 0;
-const os_1 = __importDefault(require("os"));
 const core_1 = require("@oclif/core");
 const errors_1 = require("@oclif/core/lib/errors");
-const config_1 = require("../customer/config");
-const path_1 = require("../customer/path");
-const template_source_code_1 = require("../customer/template-source-code");
 const file_loaders_1 = require("../helpers/file-loaders");
-const print_warnings_1 = require("../helpers/print-warnings");
-const ux_action_1 = require("../helpers/ux-action");
 const get_connections_request_1 = require("../http/get-connections-request");
 const send_template_execute_request_1 = require("../http/send-template-execute-request");
 const filter_connections_by_template_1 = require("../prompt-data/filter-connections-by-template");
@@ -22,6 +13,12 @@ const get_template_files_1 = require("../prompt-data/get-template-files");
 const render_prompt_1 = require("../prompt-data/render-prompt");
 const render_repeat_input_1 = require("../rendering/render-repeat-input");
 const render_template_result_1 = require("../rendering/render-template-result");
+const path_1 = require("../customer/path");
+const config_1 = require("../customer/config");
+const template_source_code_1 = require("../customer/template-source-code");
+const ux_action_1 = require("../helpers/ux-action");
+const print_warnings_1 = require("../helpers/print-warnings");
+const extract_template_type_1 = require("../helpers/extract-template-type");
 const refresh_connections_command_1 = require("./refresh-connections-command");
 exports.executePromptMessages = {
     template: "Select a template to execute",
@@ -68,7 +65,7 @@ class Execute extends refresh_connections_command_1.RefreshConnectionsCommand {
                     ? (0, file_loaders_1.getExternalDataFixture)(templateInput.externalDataPath)
                     : {},
                 connectionId: templateInput.connectionId,
-                templateType: this.getTemplateType(templateInput.templatePath),
+                templateType: (0, extract_template_type_1.extractTemplateType)(templateInput.templatePath),
             });
             (0, render_template_result_1.renderTemplateResult)(result);
             if (result.warnings.length > 0) {
@@ -84,23 +81,16 @@ class Execute extends refresh_connections_command_1.RefreshConnectionsCommand {
             (0, render_repeat_input_1.renderRepeatInput)(this, this.input);
         }
     }
-    /**
-     * Returns the template type, which is always equal to the folder name of the template path.
-     */
-    getTemplateType(templatePath) {
-        const platformFileDelimiter = os_1.default.platform() === "win32" ? "\\" : "/";
-        return templatePath.split(platformFileDelimiter)?.[0];
-    }
     async parseFlags() {
         const { flags } = await this.parse(Execute);
         if (flags["template-path"]) {
-            this.input["template-path"] = (0, path_1.cleanupTemplatePath)(flags["template-path"]);
+            this.input["template-path"] = (0, path_1.cleanupPath)(flags["template-path"]);
         }
         if (flags["fixture-path"]) {
-            this.input["fixture-path"] = (0, path_1.cleanupFixturePath)(flags["fixture-path"]);
+            this.input["fixture-path"] = (0, path_1.cleanupPath)(flags["fixture-path"]);
         }
         if (flags["external-data-path"]) {
-            this.input["external-data-path"] = (0, path_1.cleanupExternalDataPath)(flags["external-data-path"]);
+            this.input["external-data-path"] = (0, path_1.cleanupPath)(flags["external-data-path"]);
         }
         if (flags["connection-id"]) {
             this.input["connection-id"] = flags["connection-id"];
@@ -112,9 +102,8 @@ class Execute extends refresh_connections_command_1.RefreshConnectionsCommand {
         });
         await this.parseFlags();
         if (!this.input["template-path"]) {
-            const choices = await (0, get_template_files_1.getTemplateFiles)();
             this.input["template-path"] = await (0, render_prompt_1.renderPrompt)({
-                choices,
+                choices: await (0, get_template_files_1.getTemplateFiles)(),
                 promptMessage: exports.executePromptMessages.template,
                 emptyMessage: "No templates found",
             });
@@ -136,7 +125,10 @@ class Execute extends refresh_connections_command_1.RefreshConnectionsCommand {
                 });
             }
         }
-        const connectionId = await this.calculateConnectionId(allConnections, this.input["template-path"]);
+        const connectionId = await this.validateAndGetConnection(allConnections, this.input["template-path"]);
+        // Let's make sure to re-set the input value since the user might
+        // have just chosen one
+        this.input["connection-id"] = connectionId;
         return {
             templatePath: this.input["template-path"],
             fixturePath: this.input["fixture-path"],
@@ -144,7 +136,7 @@ class Execute extends refresh_connections_command_1.RefreshConnectionsCommand {
             connectionId,
         };
     }
-    async calculateConnectionId(allConnections, templatePath) {
+    async validateAndGetConnection(allConnections, templatePath) {
         let connection = allConnections.find((c) => c.id === this.input["connection-id"]);
         if (this.input["connection-id"] && !connection) {
             throw new errors_1.CLIError(`Connection with ID ${this.input["connection-id"]} not found`, {
@@ -153,7 +145,6 @@ class Execute extends refresh_connections_command_1.RefreshConnectionsCommand {
         }
         if (!connection) {
             connection = await this.getConnectionForTemplate(templatePath, allConnections);
-            this.input["connection-id"] = connection.id;
         }
         return connection.id;
     }

package/dist/commands/generate-fixture.js

@@ -12,10 +12,10 @@ const file_exists_1 = require("../helpers/file-exists");
 const ux_action_1 = require("../helpers/ux-action");
 const get_fixture_1 = require("../http/get-fixture");
 const render_prompt_1 = require("../prompt-data/render-prompt");
-const select_connections_1 = require("../prompt-data/select-connections");
 const render_tip_1 = require("../rendering/render-tip");
 const types_1 = require("../types");
 const check_if_connection_needs_mapping_1 = require("../helpers/check-if-connection-needs-mapping");
+const select_connections_1 = require("../prompt-data/select-connections");
 const refresh_connections_command_1 = require("./refresh-connections-command");
 class GenerateFixture extends refresh_connections_command_1.RefreshConnectionsCommand {
     static args = {};
@@ -73,7 +73,7 @@ Finally, if the file already exists you'll be prompted to overwrite it.
         }
     }
     getFixturePath(type, filename) {
-        return (0, path_2.getCustomerPath)(path_1.default.join("src", "fixtures", type, filename.replace(/\.[^/.]+$/, "") + ".json"));
+        return (0, path_2.getCustomerOSSpecificPath)(path_1.default.join("src", "fixtures", type, filename.replace(/\.[^/.]+$/, "") + ".json"));
     }
 }
 exports.default = GenerateFixture;

package/dist/customer/config.js

@@ -47,7 +47,7 @@ const path_1 = require("./path");
  * If the file is not found, it throws a CLIError with a message indicating the expected path.
  */
 async function getRepositoryConfigFile() {
-    const configPath = (0, path_1.getCustomerPath)("connectrc.js");
+    const configPath = (0, path_1.getCustomerOSSpecificPath)("connectrc.js");
     try {
         return require(configPath);
     }
@@ -81,7 +81,7 @@ pointing to the correct connectrc.js directory.`,
  * @returns The connections object and the content of the connectrc.js file in {@link RawConfigContent}
  */
 async function getRepositoryConnectionsAndConfig() {
-    const configPath = (0, path_1.getCustomerPath)("connectrc.js");
+    const configPath = (0, path_1.getCustomerOSSpecificPath)("connectrc.js");
     const fileContent = await readRawConfigFile(configPath);
     // Get the connections object from the content of the connectrc.js file
     const configMatch = fileContent.match(/const\s+connections\s*=\s*({[\s\S]*?});/);

package/dist/customer/path.d.ts

@@ -1,26 +1,25 @@
 /**
- * @returns The provided path prepended with the root directory.
- */
-export declare function getCustomerPath(path: string): string;
-/**
- * Cleans up the template path, removing the root directory and the 'src/templates' prefix.
+ * @returns The provided path prepended with the root directory - in the user's OS path pattern.
  *
- * This is needed to support the use of absolute paths in the templates, since those will
- * be added later on when reading the files.
+ * E.g. Unix: /path/to/file
+ * E.g. Windows: C:\path\to\file
  */
-export declare function cleanupTemplatePath(path: string | undefined): string;
+export declare function getCustomerOSSpecificPath(path: string): string;
 /**
- * Cleans up the fixture path, removing the root directory and the 'src/fixtures' prefix.
+ * Receives either a relative or absolute path for a given template file.
  *
- * This is needed to support the use of absolute paths in the templates, since those will
- * be added later on when reading the files.
- */
-export declare function cleanupFixturePath(path: string | undefined): string;
-/**
- * Cleans up the external data path, removing the root directory and the 'src/external-data' prefix.
+ * Unix
+ * - src/templates/variation/variation.jsonata
+ * - ./src/templates/variation/variation.jsonata
+ * - /usr/username/templates-folder/src/templates/variation/variation.jsonata
+ *
+ * Windows
+ * - src\templates\variation\variation.jsonata
+ * - .\src\templates\variation\variation.jsonata
+ * - C:\users\username\templates-folder\src\templates\variation\variation.jsonata
  *
- * This is needed to support the use of absolute paths in the templates, since those will
- * be added later on when reading the files.
+ * And returns a relative unix path WITHOUT its type prefix (e.g "src/templates"), like so:
+ * - variation/variation.jsonata
  */
-export declare function cleanupExternalDataPath(path: string | undefined): string;
+export declare function cleanupPath(filePath: string | undefined): string;
 //# sourceMappingURL=path.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/customer/path.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,UAE3C;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,UAI3D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,UAI1D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,UAI/D"}
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../src/customer/path.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,UAErD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,UAiCvD"}

package/dist/customer/path.js

@@ -1,59 +1,59 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCustomerPath = getCustomerPath;
-exports.cleanupTemplatePath = cleanupTemplatePath;
-exports.cleanupFixturePath = cleanupFixturePath;
-exports.cleanupExternalDataPath = cleanupExternalDataPath;
+exports.getCustomerOSSpecificPath = getCustomerOSSpecificPath;
+exports.cleanupPath = cleanupPath;
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 const path_1 = require("path");
-const os_1 = __importDefault(require("os"));
 /**
- * @returns The provided path prepended with the root directory.
+ * @returns The provided path prepended with the root directory - in the user's OS path pattern.
+ *
+ * E.g. Unix: /path/to/file
+ * E.g. Windows: C:\path\to\file
  */
-function getCustomerPath(path) {
+function getCustomerOSSpecificPath(path) {
     return (0, path_1.join)(process.cwd(), process.env.REPOSITORY_ROOT_DIRECTORY || "", path);
 }
 /**
- * Cleans up the template path, removing the root directory and the 'src/templates' prefix.
+ * Receives either a relative or absolute path for a given template file.
  *
- * This is needed to support the use of absolute paths in the templates, since those will
- * be added later on when reading the files.
- */
-function cleanupTemplatePath(path) {
-    return cleanupDelimiters(cleanupAbsolutePath(path).replace((0, path_1.join)("src", "templates"), ""));
-}
-/**
- * Cleans up the fixture path, removing the root directory and the 'src/fixtures' prefix.
+ * Unix
+ * - src/templates/variation/variation.jsonata
+ * - ./src/templates/variation/variation.jsonata
+ * - /usr/username/templates-folder/src/templates/variation/variation.jsonata
  *
- * This is needed to support the use of absolute paths in the templates, since those will
- * be added later on when reading the files.
- */
-function cleanupFixturePath(path) {
-    return cleanupDelimiters(cleanupAbsolutePath(path).replace((0, path_1.join)("src", "fixtures"), ""));
-}
-/**
- * Cleans up the external data path, removing the root directory and the 'src/external-data' prefix.
+ * Windows
+ * - src\templates\variation\variation.jsonata
+ * - .\src\templates\variation\variation.jsonata
+ * - C:\users\username\templates-folder\src\templates\variation\variation.jsonata
  *
- * This is needed to support the use of absolute paths in the templates, since those will
- * be added later on when reading the files.
+ * And returns a relative unix path WITHOUT its type prefix (e.g "src/templates"), like so:
+ * - variation/variation.jsonata
  */
-function cleanupExternalDataPath(path) {
-    return cleanupDelimiters(cleanupAbsolutePath(path).replace((0, path_1.join)("src", "external-data"), ""));
-}
-function cleanupAbsolutePath(path) {
-    if (!path) {
+function cleanupPath(filePath) {
+    if (!filePath) {
         return "";
     }
-    const replacedPath = path.replace(process.cwd(), "");
-    return cleanupDelimiters(replacedPath);
-}
-function cleanupDelimiters(path) {
-    const platformFileDelimiter = os_1.default.platform() === "win32" ? "\\" : "/";
-    let replacedPath = path.replace(process.cwd(), "");
-    if (replacedPath.startsWith(`${platformFileDelimiter}${platformFileDelimiter}`)) {
+    /**
+     * E.g /src/templates/variation/variation.jsonata
+     * E.g ./src/templates/variation/variation.jsonata
+     * E.g src/templates/variation/variation.jsonata
+     */
+    const relativePath = filePath
+        .replace(process.cwd(), "") //
+        .replace(/\\/g, "/");
+    /**
+     * E.g variation/variation.jsonata
+     * E.g /variation/variation.jsonata
+     * E.g ./variation/variation.jsonata
+     */
+    let replacedPath = relativePath
+        .replace("src/templates/", "")
+        .replace("src/fixtures/", "")
+        .replace("src/external-data/", "");
+    if (replacedPath.startsWith("/")) {
+        replacedPath = replacedPath.slice(1);
+    }
+    if (replacedPath.startsWith("./")) {
         replacedPath = replacedPath.slice(2);
     }
     return replacedPath;

package/dist/customer/template-source-code.js

@@ -13,7 +13,7 @@ async function loadSourceCode(path) {
         return undefined;
     }
     try {
-        return await (0, promises_1.readFile)((0, path_1.getCustomerPath)(path), "utf-8");
+        return await (0, promises_1.readFile)((0, path_1.getCustomerOSSpecificPath)(path), "utf-8");
     }
     catch (error) {
         throw new errors_1.CLIError(`Could not load "${path}" file. Please check your connectrc.js file.`);

package/dist/helpers/extract-template-type.d.ts

@@ -0,0 +1,6 @@
+import { type TemplatePath, type TemplateType } from "../types";
+/**
+ * Checks for any nested folder that matches a known template type.
+ */
+export declare function extractTemplateType(templatePath: TemplatePath): TemplateType;
+//# sourceMappingURL=extract-template-type.d.ts.map

package/dist/helpers/extract-template-type.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extract-template-type.d.ts","sourceRoot":"","sources":["../../src/helpers/extract-template-type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAiB,MAAM,UAAU,CAAC;AAE/E;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY,CAkB5E"}

package/dist/helpers/extract-template-type.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractTemplateType = extractTemplateType;
+const errors_1 = require("@oclif/core/lib/errors");
+const types_1 = require("../types");
+/**
+ * Checks for any nested folder that matches a known template type.
+ */
+function extractTemplateType(templatePath) {
+    for (const type of types_1.TemplateTypes) {
+        if (templatePath.includes(`${type}/`)) {
+            return type;
+        }
+    }
+    throw new errors_1.CLIError(`Couldn't find the template type by looking at its path: ${templatePath}`, {
+        suggestions: [
+            "Check that the template file path is correct",
+            "Check that your templates are in the correctly named directory for their type (e.g. 'item.jsonata' in the 'templates/item' directory",
+            "Check that you are using a valid template type: " +
+                types_1.TemplateTypes.join(", "),
+        ],
+    });
+}

package/dist/helpers/file-exists.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-exists.d.ts","sourceRoot":"","sources":["../../src/helpers/file-exists.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAO5E"}
+{"version":3,"file":"file-exists.d.ts","sourceRoot":"","sources":["../../src/helpers/file-exists.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,OAAO,CAU5E"}

package/dist/helpers/file-exists.js

@@ -9,9 +9,11 @@ const path_1 = require("../customer/path");
  * @returns boolean
  */
 function fileExists(filepath, isCustomerPath = false) {
-    const fullpath = isCustomerPath ? filepath : (0, path_1.getCustomerPath)(filepath);
+    const fullPath = isCustomerPath
+        ? filepath
+        : (0, path_1.getCustomerOSSpecificPath)(filepath);
     try {
-        return (0, fs_extra_1.existsSync)(fullpath);
+        return (0, fs_extra_1.existsSync)(fullPath);
     }
     catch {
         return false;

package/dist/helpers/file-loaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-loaders.d.ts","sourceRoot":"","sources":["../../src/helpers/file-loaders.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,UAAU,CAAC;AAI1B,eAAO,MAAM,iBAAiB,SAqBP,MAAM,sCAjB3B,CAAC;AAEH,eAAO,MAAM,sBAAsB,SAeZ,MAAM,sCAX3B,CAAC;AAEH,eAAO,MAAM,kBAAkB,SASR,MAAM;;yCAN3B,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,EAAE,EACnD,MAAM,EACN,UAAU,EACV,WAAgB,GACjB,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAc9C;AAED,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB"}
+{"version":3,"file":"file-loaders.d.ts","sourceRoot":"","sources":["../../src/helpers/file-loaders.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,UAAU,CAAC;AAI1B,eAAO,MAAM,iBAAiB,SAqBP,MAAM,sCAjB3B,CAAC;AAEH,eAAO,MAAM,sBAAsB,SAeZ,MAAM,sCAX3B,CAAC;AAEH,eAAO,MAAM,kBAAkB,SASR,MAAM;;yCAN3B,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE,EAAE,EACnD,MAAM,EACN,UAAU,EACV,WAAgB,GACjB,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAkB9C;AAED,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,SAAS,GAAG,EAAE;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB"}

package/dist/helpers/file-loaders.js

@@ -24,13 +24,13 @@ exports.getJSONataTemplate = createFileLoader({
     fileLoader: fs_extra_1.default.readFileSync,
 });
 function createFileLoader({ prefix, fileLoader, suggestions = [], }) {
-    return function (name, ...args) {
-        const filePath = (0, path_2.getCustomerPath)(path_1.default.join(prefix, name));
+    return function (filename, ...args) {
+        const absolutePath = (0, path_2.getCustomerOSSpecificPath)(path_1.default.join(prefix, filename));
         try {
-            return fileLoader(filePath, ...args);
+            return fileLoader(absolutePath, ...args);
         }
         catch (error) {
-            throw new errors_1.CLIError(`Error while loading ${filePath}: ${error.message}`, {
+            throw new errors_1.CLIError(`Error while loading ${absolutePath}: ${error.message}`, {
                 suggestions: [
                     "Ensure the file exists and is named correctly",
                     ...suggestions,

package/dist/helpers/find-deep-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-deep-files.d.ts","sourceRoot":"","sources":["../../src/helpers/find-deep-files.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAWnD"}
+{"version":3,"file":"find-deep-files.d.ts","sourceRoot":"","sources":["../../src/helpers/find-deep-files.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAanD"}

package/dist/helpers/find-deep-files.js

@@ -13,10 +13,11 @@ const path_2 = require("../customer/path");
  * @returns All files in the given directory, including in subdirectories
  */
 function findDeepFiles(dir) {
-    const files = fs_extra_1.default.readdirSync((0, path_2.getCustomerPath)(dir));
+    const files = fs_extra_1.default.readdirSync((0, path_2.getCustomerOSSpecificPath)(dir));
     return files.reduce((files, currentPath) => {
         const fullPath = path_1.default.join(dir, currentPath);
-        if (fs_extra_1.default.statSync((0, path_2.getCustomerPath)(fullPath)).isDirectory()) {
+        const resolvedPath = (0, path_2.getCustomerOSSpecificPath)(fullPath);
+        if (fs_extra_1.default.statSync(resolvedPath).isDirectory()) {
             return [...files, ...findDeepFiles(fullPath)];
         }
         else {

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

@@ -37,9 +37,9 @@ exports.refreshConnectionsList = refreshConnectionsList;
 const fs = __importStar(require("fs/promises"));
 const cli_ux_1 = require("@oclif/core/lib/cli-ux");
 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 should_update_connections_list_1 = require("./should-update-connections-list");
 const ux_action_1 = require("./ux-action");
@@ -86,7 +86,7 @@ async function checkConfigFileState() {
 }
 async function updateConfigFile() {
     const formattedConnections = await fetchNewConnections();
-    const rcPath = (0, path_1.getCustomerPath)("connectrc.js");
+    const rcPath = (0, path_1.getCustomerOSSpecificPath)("connectrc.js");
     const { fileContent } = await (0, config_1.getRepositoryConnectionsAndConfig)();
     if (!fileContent) {
         return;

package/dist/prompt-data/filter-connections-by-template.d.ts

@@ -1,8 +1,8 @@
+import { type TemplatePath, type PromptChoices } from "../types";
 import { type ConnectionResponseDto } from "../http/get-connections-request";
-import { type PromptChoices } from "../types";
 /**
  * Returns all connections that are associated with a template by checking
  * the config file.
  */
-export declare function filterConnectionsByTemplate(templatePath: string, connections: ConnectionResponseDto[]): Promise<PromptChoices<ConnectionResponseDto>>;
+export declare function filterConnectionsByTemplate(templatePath: TemplatePath, connections: ConnectionResponseDto[]): Promise<PromptChoices<ConnectionResponseDto>>;
 //# sourceMappingURL=filter-connections-by-template.d.ts.map

package/dist/prompt-data/filter-connections-by-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-connections-by-template.d.ts","sourceRoot":"","sources":["../../src/prompt-data/filter-connections-by-template.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,qBAAqB,EAAE,GACnC,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC,CA2C/C"}
+{"version":3,"file":"filter-connections-by-template.d.ts","sourceRoot":"","sources":["../../src/prompt-data/filter-connections-by-template.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAG7E;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,qBAAqB,EAAE,GACnC,OAAO,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC,CAoC/C"}

package/dist/prompt-data/filter-connections-by-template.js

@@ -1,30 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterConnectionsByTemplate = filterConnectionsByTemplate;
-const path_1 = __importDefault(require("path"));
 const config_1 = require("../customer/config");
+const path_1 = require("../customer/path");
 /**
  * Returns all connections that are associated with a template by checking
  * the config file.
  */
 async function filterConnectionsByTemplate(templatePath, connections) {
     const config = await (0, config_1.getRepositoryConfigFile)();
-    const prefix = path_1.default.join("src", "templates");
-    let fullPath = templatePath;
-    if (!templatePath.startsWith(prefix)) {
-        fullPath = path_1.default.join(prefix, templatePath);
-    }
     // All connection ids that references this template
     const configConnectionIds = config.environments.reduce((connectionIds, environment) => {
         for (const templateConfig of environment.templates) {
-            const templatePaths = Object.values(templateConfig.paths)
-                .map((filePath) => path_1.default.normalize(path_1.default.resolve(filePath)))
-                .map((filePath) => filePath.replace(/\\/g, "/")); // this is needed to check the path in all OS
+            const templatePaths = Object.values(templateConfig.paths).map((filePath) => (0, path_1.cleanupPath)(filePath));
             // environment doesn't even target this template
-            if (!templatePaths.includes(path_1.default.resolve(fullPath).replace(/\\/g, "/"))) {
+            if (!templatePaths.includes(templatePath)) {
                 continue;
             }
             for (const id of templateConfig.connection_ids) {

package/dist/prompt-data/get-candidate-fixtures.d.ts

@@ -1,3 +1,6 @@
-import { type PromptChoices } from "../types";
-export declare function getCandidateFixtures(templatePath: string): PromptChoices<string>;
+import { type PromptChoices, type TemplatePath } from "../types";
+/**
+ * @returns The CLEANED fixtures paths as prompt choices
+ */
+export declare function getCandidateFixtures(templatePath: TemplatePath): PromptChoices<string>;
 //# sourceMappingURL=get-candidate-fixtures.d.ts.map

package/dist/prompt-data/get-candidate-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-candidate-fixtures.d.ts","sourceRoot":"","sources":["../../src/prompt-data/get-candidate-fixtures.ts"],"names":[],"mappings":"AAKA,OAAO,EAAoC,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAEhF,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,GACnB,aAAa,CAAC,MAAM,CAAC,CAqDvB"}
+{"version":3,"file":"get-candidate-fixtures.d.ts","sourceRoot":"","sources":["../../src/prompt-data/get-candidate-fixtures.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,YAAY,EAClB,MAAM,UAAU,CAAC;AAIlB;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,YAAY,GACzB,aAAa,CAAC,MAAM,CAAC,CAqCvB"}

package/dist/prompt-data/get-candidate-fixtures.js

@@ -7,19 +7,13 @@ exports.getCandidateFixtures = getCandidateFixtures;
 const path_1 = __importDefault(require("path"));
 const errors_1 = require("@oclif/core/lib/errors");
 const find_deep_files_1 = require("../helpers/find-deep-files");
-const types_1 = require("../types");
+const extract_template_type_1 = require("../helpers/extract-template-type");
+const path_2 = require("../customer/path");
+/**
+ * @returns The CLEANED fixtures paths as prompt choices
+ */
 function getCandidateFixtures(templatePath) {
-    const templateType = extractTemplateType(templatePath);
-    if (!templateType) {
-        throw new errors_1.CLIError(`Couldn't find the template type by looking at its path: ${templatePath}`, {
-            suggestions: [
-                "Check that the template file path is correct",
-                "Check that your templates are in the correctly named directory for their type (e.g. 'item.jsonata' in the 'templates/item' directory",
-                "Check that you are using a valid template type: " +
-                    types_1.TemplateTypes.join(", "),
-            ],
-        });
-    }
+    const templateType = (0, extract_template_type_1.extractTemplateType)(templatePath);
     const fixtureType = templateType === "grouping"
         ? "variation" //
         : templateType;
@@ -41,20 +35,10 @@ function getCandidateFixtures(templatePath) {
     return fixtureFullPaths
         .filter((fixturePath) => path_1.default.extname(fixturePath) === ".json")
         .map((fixturePath) => {
-        const fixtureRelativePath = path_1.default.relative(path_1.default.join("src", "fixtures"), fixturePath);
+        const fixtureRelativePath = (0, path_2.cleanupPath)(fixturePath);
         return {
             name: fixtureRelativePath,
             value: fixtureRelativePath,
         };
     });
 }
-/**
- * Checks for any nested folder that matches a known template type.
- */
-function extractTemplateType(templatePath) {
-    for (const type of types_1.TemplateTypes) {
-        if (templatePath.includes(path_1.default.join(`${type}/`))) {
-            return type;
-        }
-    }
-}

package/dist/prompt-data/get-template-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-template-files.d.ts","sourceRoot":"","sources":["../../src/prompt-data/get-template-files.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAavE"}
+{"version":3,"file":"get-template-files.d.ts","sourceRoot":"","sources":["../../src/prompt-data/get-template-files.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAgBvE"}

package/dist/prompt-data/get-template-files.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTemplateFiles = getTemplateFiles;
 const path_1 = __importDefault(require("path"));
 const find_deep_files_1 = require("../helpers/find-deep-files");
+const path_2 = require("../customer/path");
 /**
  * Get a prompt-ready list of template files in the user repository
  */
@@ -13,11 +14,13 @@ async function getTemplateFiles() {
     const filePath = path_1.default.join("src", "templates");
     const files = getTemplatePaths(filePath);
     const filteredFiles = files.filter((file) => file.endsWith(".jsonata") && !file.includes("helpers"));
-    const filePathSlash = path_1.default.join(filePath, " ").trim(); // needed to add a space to the end to avoid removing the last slash
-    return filteredFiles.map((file) => ({
-        name: file.replace(filePathSlash, ""),
-        value: file.replace(filePathSlash, ""),
-    }));
+    return filteredFiles.map((file) => {
+        const relativePath = (0, path_2.cleanupPath)(file);
+        return {
+            name: relativePath,
+            value: relativePath,
+        };
+    });
 }
 /**
  * @param typePath The full type path. E.g.

package/dist/types.d.ts

@@ -49,6 +49,15 @@ export declare enum CatalogFixtureType {
     MAPPING = "mapping"
 }
 export declare const TemplateTypes: readonly ["item", "variation", "item_group", "grouping", "mapping"];
+/**
+ * The unix relative path of a given template.
+ * With NO prefixed "/" or "./".
+ *
+ * E.g
+ * - staging/item/en_CA/item.jsonata
+ * - variation/variation.jsonata
+ */
+export type TemplatePath = string;
 export type TemplateType = (typeof TemplateTypes)[number];
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,YAAY,EAAE,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,KAAK,CAAC;YACf,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;YAC7C,cAAc,EAAE,MAAM,EAAE,CAAC;SAC1B,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAErE,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAEjE,UAAU,aAAa;IACrB,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AACD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACtC;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,aAAa,qEAMhB,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,YAAY,EAAE,KAAK,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,KAAK,CAAC;YACf,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;YAC7C,cAAc,EAAE,MAAM,EAAE,CAAC;SAC1B,CAAC,CAAC;KACJ,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAErE,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC;AAEjE,UAAU,aAAa;IACrB,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AACD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,wBAAwB,EAAE,CAAC;CACtC;AAED,oBAAY,kBAAkB;IAC5B,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,aAAa,qEAMhB,CAAC;AAEX;;;;;;;GAOG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC;AAElC,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC"}

package/dist/version.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "1.12.3";
+declare const _default: "1.12.4";
 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.12.3';
+exports.default = '1.12.4';

package/oclif.manifest.json

@@ -190,5 +190,5 @@
       ]
     }
   },
-  "version": "1.12.3"
+  "version": "1.12.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-connect-cli",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "description": "CLI tool to enable users to interface with the Constructor Connect Ecosystem",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",