@constructor-io/constructorio-connect-cli 1.1.1 → 1.2.0

package/boilerplate-repo/package.json

@@ -18,7 +18,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "@constructor-io/constructorio-connect-cli": "latest"
-  }
+  "dependencies": {}
 }

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

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/commands/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAM,MAAM,aAAa,CAAC;AA2BjD,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,OAAO;IAClC,MAAM,CAAC,KAAK;;;;;MAgBV;IAEF,MAAM,CAAC,WAAW,SACkK;IAEpL,MAAM,CAAC,QAAQ,WAOb;IAEF,KAAK,EAAE,iBAAiB,CAAM;IAExB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAgCZ,UAAU;YAsBV,oBAAoB;YA6CpB,qBAAqB;YA0BrB,wBAAwB;CAevC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/commands/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAM,MAAM,aAAa,CAAC;AA6BjD,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,OAAO;IAClC,MAAM,CAAC,KAAK;;;;;MAgBV;IAEF,MAAM,CAAC,WAAW,SACkK;IAEpL,MAAM,CAAC,QAAQ,WAOb;IAEF,KAAK,EAAE,iBAAiB,CAAM;IAExB,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAoCZ,UAAU;YAsBV,oBAAoB;YA6CpB,qBAAqB;YA0BrB,wBAAwB;CAevC"}

package/dist/commands/execute.js

@@ -14,6 +14,9 @@ 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");
 exports.executePromptMessages = {
     template: "Select a template to execute",
     fixture: "Select a catalog fixture to run the template against",
@@ -49,10 +52,13 @@ class Execute extends core_1.Command {
         let result = null;
         try {
             const templateInput = await this.getTemplateExecInput();
+            const config = await (0, ux_action_1.uxAction)("📡 Reading your config", async () => {
+                return await (0, config_1.getRepositoryConfigFile)();
+            })();
             core_1.ux.log("\n");
             result = await (0, execute_templates_request_1.executeTemplates)({
                 template: (0, file_loaders_1.getJSONataTemplate)(templateInput.templatePath, "utf-8").toString(),
-                helpers: (0, file_loaders_1.getTemplateHelpers)("helpers.jsonata", "utf-8").toString(),
+                helpers: (await (0, template_source_code_1.getHelpersSourceCode)(config.helpers)) ?? "",
                 targetData: (0, file_loaders_1.getCatalogFixture)(templateInput.fixturePath),
                 externalData: templateInput.externalDataPath
                     ? (0, file_loaders_1.getExternalDataFixture)(templateInput.externalDataPath)

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAQ,OAAO,EAAM,MAAM,aAAa,CAAC;AAiBhD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAA4D;IAE9E,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA+BnB,UAAU;IAmBxB,OAAO,CAAC,oBAAoB;YAUd,UAAU;YAmBV,uBAAuB;WAmBvB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKvD,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAqBlC,OAAO,CAAC,0BAA0B;CA4BnC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAMA,OAAO,EAAQ,OAAO,EAAM,MAAM,aAAa,CAAC;AAiBhD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAA4D;IAE9E,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA+BnB,UAAU;IAmBxB,OAAO,CAAC,oBAAoB;YAUd,UAAU;YAsBV,uBAAuB;WAwBvB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAKvD,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAqBlC,OAAO,CAAC,0BAA0B;CA4BnC"}

package/dist/commands/init.js

@@ -100,6 +100,8 @@ class Init extends core_1.Command {
             message: "Do you want to regenerate the base repository files?",
         });
         if (shouldRefresh) {
+            // Remove node_modules to avoid any file operation conflicts
+            fs_extra_1.default.removeSync(path.join(args.repoPath, "node_modules"));
             await this.generateRepositoryFiles(args);
             this.printSuccessfulInitMessage(args.repoName);
             return;
@@ -118,6 +120,8 @@ class Init extends core_1.Command {
         })();
         (0, ux_action_1.uxAction)("📦 Installing dependencies", () => {
             (0, child_process_1.execSync)(`(cd ${args.repoPath} && npm install)`);
+            // Install the CLI package in the new repo to get the latest version
+            (0, child_process_1.execSync)(`(cd ${args.repoPath} && npm install @constructor-io/constructorio-connect-cli)`);
         })();
         Init.replaceConfigValues(config, connectionsDict, args.repoPath);
     }

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

@@ -6,9 +6,6 @@ export declare const getExternalDataFixture: (name: string, options?: fs.JsonRea
 export declare const getJSONataTemplate: (name: string, options?: BufferEncoding | (fs.ObjectEncodingOptions & {
     flag?: string | undefined;
 }) | null | undefined) => string | Buffer;
-export declare const getTemplateHelpers: (name: string, options?: BufferEncoding | (fs.ObjectEncodingOptions & {
-    flag?: string | undefined;
-}) | null | undefined) => string | Buffer;
 export declare function createFileLoader<T, S extends any[]>({ prefix, fileLoader, suggestions, }: Args<T, S>): (name: string, ...args: S) => T;
 interface Args<T, S extends any[]> {
     prefix: string;

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,SA0BP,MAAM,sCAtB3B,CAAC;AAEH,eAAO,MAAM,sBAAsB,SAoBZ,MAAM,sCAhB3B,CAAC;AAEH,eAAO,MAAM,kBAAkB,SAcR,MAAM;;yCAX3B,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,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"}

package/dist/helpers/file-loaders.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFileLoader = exports.getTemplateHelpers = exports.getJSONataTemplate = exports.getExternalDataFixture = exports.getCatalogFixture = void 0;
+exports.createFileLoader = exports.getJSONataTemplate = exports.getExternalDataFixture = exports.getCatalogFixture = void 0;
 const path_1 = __importDefault(require("path"));
 const errors_1 = require("@oclif/core/lib/errors");
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -22,10 +22,6 @@ exports.getJSONataTemplate = createFileLoader({
     prefix: "src/templates",
     fileLoader: fs_extra_1.default.readFileSync,
 });
-exports.getTemplateHelpers = createFileLoader({
-    prefix: "src/templates",
-    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));

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,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAI9C,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,GACnB,aAAa,CAAC,MAAM,CAAC,CA4CvB"}
+{"version":3,"file":"get-candidate-fixtures.d.ts","sourceRoot":"","sources":["../../src/prompt-data/get-candidate-fixtures.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAI9C,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,GACnB,aAAa,CAAC,MAAM,CAAC,CA+CvB"}

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

@@ -9,9 +9,9 @@ const errors_1 = require("@oclif/core/lib/errors");
 const find_deep_files_1 = require("../helpers/find-deep-files");
 const get_template_files_1 = require("./get-template-files");
 function getCandidateFixtures(templatePath) {
-    const templateType = templatePath.split("/")[0];
-    if (!get_template_files_1.templateTypes.includes(templateType)) {
-        throw new errors_1.CLIError(`Invalid template type: ${templateType}`, {
+    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",
@@ -47,3 +47,13 @@ function getCandidateFixtures(templatePath) {
     });
 }
 exports.getCandidateFixtures = getCandidateFixtures;
+/**
+ * Checks for any nested folder that matches a known template type.
+ */
+function extractTemplateType(templatePath) {
+    for (const type of get_template_files_1.templateTypes) {
+        if (templatePath.includes(`${type}/`)) {
+            return type;
+        }
+    }
+}

package/dist/version.d.ts

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

package/oclif.manifest.json

@@ -125,5 +125,5 @@
       ]
     }
   },
-  "version": "0.0.0"
+  "version": "1.2.0"
 }

package/package.json

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