jitsu-cli 0.7.0 → 0.7.5

package/lib/cli/extension/build.js

@@ -14,7 +14,7 @@ const plugin_node_resolve_1 = (0, tslib_1.__importDefault)(require("@rollup/plug
 const plugin_commonjs_1 = (0, tslib_1.__importDefault)(require("@rollup/plugin-commonjs"));
 const version_1 = require("../../lib/version");
 const _1 = require("./");
-const JSON5_1 = (0, tslib_1.__importDefault)(require("JSON5"));
+const json5_1 = (0, tslib_1.__importDefault)(require("json5"));
 async function build(args) {
     const directory = args?.[0] || "";
     let projectBase = path_1.default.isAbsolute(directory) ? directory : path_1.default.resolve(process.cwd() + "/" + directory);
@@ -28,7 +28,7 @@ async function build(args) {
     }
     let packageJson;
     try {
-        packageJson = JSON5_1.default.parse(fs_1.default.readFileSync(packageFile, "utf8"));
+        packageJson = json5_1.default.parse(fs_1.default.readFileSync(packageFile, "utf8"));
     }
     catch (e) {
         throw new Error((0, errors_1.appendError)(`Failed to parse package.json at ${projectBase}`, e));

package/lib/cli/extension/exec.js

@@ -6,7 +6,7 @@ const commander_1 = (0, tslib_1.__importDefault)(require("commander"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../lib/log"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const JSON5_1 = (0, tslib_1.__importDefault)(require("JSON5"));
+const json5_1 = (0, tslib_1.__importDefault)(require("json5"));
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
 const index_1 = require("./index");
 const indent_1 = require("../../lib/indent");
@@ -15,13 +15,13 @@ const validator_helper_1 = require("../../lib/validator-helper");
 const errors_1 = require("../../lib/errors");
 function getJson(json, file) {
     if (json) {
-        return JSON5_1.default.parse(json);
+        return json5_1.default.parse(json);
     }
     else {
         if (!fs_1.default.existsSync(file)) {
             throw new Error(`File ${file} does not exist!`);
         }
-        return JSON5_1.default.parse(fs_1.default.readFileSync(file, "utf-8"));
+        return json5_1.default.parse(fs_1.default.readFileSync(file, "utf-8"));
     }
 }
 function ellipsis(str, opts = { maxLen: 80 }) {
@@ -67,7 +67,7 @@ async function execExtension(args) {
     (0, log_1.default)().info("🛂 Executing tests destination on " + chalk_1.default.bold(projectBase));
     let events = toArray(getJson(cliOpts.json, cliOpts.file));
     let config = getJson(cliOpts.configObject, cliOpts.config);
-    let distFile = path_1.default.resolve(projectBase, (0, index_1.getDistFile)(JSON5_1.default.parse(fs_1.default.readFileSync(packageFile, "utf-8"))));
+    let distFile = path_1.default.resolve(projectBase, (0, index_1.getDistFile)(json5_1.default.parse(fs_1.default.readFileSync(packageFile, "utf-8"))));
     (0, log_1.default)().info("⌛️ Loading destination plugin (don't forget to build it before running exec!). Source: " + chalk_1.default.bold(distFile));
     if (!fs_1.default.existsSync(path_1.default.resolve(projectBase, distFile))) {
         return {

package/lib/cli/extension/index.js

@@ -11,7 +11,7 @@ const build_1 = require("./build");
 const test_1 = require("./test");
 const validate_config_1 = require("./validate-config");
 const template_1 = require("./template");
-const JSON5_1 = (0, tslib_1.__importDefault)(require("JSON5"));
+const json5_1 = (0, tslib_1.__importDefault)(require("json5"));
 const exec_1 = require("./exec");
 global.fetch = require("cross-fetch");
 const usage = `
@@ -86,7 +86,7 @@ exports.extensionCommands = {
 function validateTsConfig(tsConfigPath) {
     let tsConfig;
     try {
-        tsConfig = JSON5_1.default.parse(fs.readFileSync(tsConfigPath, "utf8"));
+        tsConfig = json5_1.default.parse(fs.readFileSync(tsConfigPath, "utf8"));
     }
     catch (e) {
         throw new Error(`${chalk_1.default.bold(tsConfigPath)} - syntax error: ${e.message}`);

package/lib/cli/extension/template.d.ts

@@ -14,6 +14,7 @@ export declare const packageJsonTemplate: ({ packageName, type, jitsuVersion }:
         build: string;
         test: string;
         "validate-config": string;
+        execute: string;
     };
     devDependencies: {
         "@jitsu/types": string;

package/lib/cli/extension/template.js

@@ -11,6 +11,7 @@ const packageJsonTemplate = ({ packageName, type, jitsuVersion = undefined }) =>
         build: "jitsu-cli extension build",
         test: "jitsu-cli extension test",
         "validate-config": "jitsu-cli extension validate-config",
+        execute: 'jitsu-cli extension exec'
     },
     devDependencies: {
         "@jitsu/types": `${jitsuVersion || "^" + version_1.jitsuCliVersion}`,

package/lib/cli/extension/validate-config.js

@@ -6,7 +6,7 @@ const commander_1 = (0, tslib_1.__importDefault)(require("commander"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const fs_1 = (0, tslib_1.__importDefault)(require("fs"));
-const JSON5_1 = (0, tslib_1.__importDefault)(require("JSON5"));
+const json5_1 = (0, tslib_1.__importDefault)(require("json5"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../lib/log"));
 const index_1 = require("./index");
 const validator_helper_1 = require("../../lib/validator-helper");
@@ -27,7 +27,7 @@ async function validateConfig(args) {
     let configObj;
     if (opts.configObject) {
         try {
-            configObj = JSON5_1.default.parse(opts.configObject);
+            configObj = json5_1.default.parse(opts.configObject);
         }
         catch (e) {
             return { success: false, message: `Malformed json (-j): ${e.message}` };
@@ -38,7 +38,7 @@ async function validateConfig(args) {
             return { success: false, message: `${opts.config} (-f) doesn't exist!` };
         }
         try {
-            configObj = JSON5_1.default.parse(fs_1.default.readFileSync(opts.config, "utf8"));
+            configObj = json5_1.default.parse(fs_1.default.readFileSync(opts.config, "utf8"));
         }
         catch (e) {
             return { success: false, message: `Malformed json in file ${opts.config} (-f): ${e.message}` };
@@ -50,7 +50,7 @@ async function validateConfig(args) {
     if (!fs_1.default.existsSync(packageFile)) {
         return { success: false, message: `Can't find package file ${packageFile}` };
     }
-    let packageObj = JSON5_1.default.parse(fs_1.default.readFileSync(packageFile, "utf8"));
+    let packageObj = json5_1.default.parse(fs_1.default.readFileSync(packageFile, "utf8"));
     let distFile = path_1.default.resolve(projectDir, (0, index_1.getDistFile)(packageObj));
     (0, log_1.default)().info("Dist file: " + distFile);
     if (!fs_1.default.existsSync(distFile)) {

package/lib/lib/template.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.write = void 0;
 const tslib_1 = require("tslib");
-const posix_1 = (0, tslib_1.__importDefault)(require("path/posix"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const fs = (0, tslib_1.__importStar)(require("fs"));
 const indent_1 = require("./indent");
 function toTemplateFunction(template) {
@@ -18,8 +18,8 @@ function toTemplateFunction(template) {
 }
 function write(dir, template, vars) {
     Object.entries(template).forEach(([fileName, template]) => {
-        let filePath = posix_1.default.resolve(dir, fileName);
-        let fileDir = posix_1.default.dirname(filePath);
+        let filePath = path_1.default.resolve(dir, fileName);
+        let fileDir = path_1.default.dirname(filePath);
         if (!fs.existsSync(fileDir)) {
             fs.mkdirSync(fileDir, { recursive: true });
         }

package/lib/lib/validator-helper.d.ts

@@ -1,3 +1,2 @@
-import { ConfigValidationResult, ConfigValidator } from "@jitsu/types/extension";
-export declare function validationResultToError(validationResult: ConfigValidationResult): string | undefined;
+import { ConfigValidator } from "@jitsu/types/extension";
 export declare function validateConfiguration(config: any, validator: ConfigValidator): Promise<(string | undefined)>;

package/lib/lib/validator-helper.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateConfiguration = exports.validationResultToError = void 0;
-function validationResultToError(validationResult) {
-    if (typeof validationResult === "boolean" && !validationResult) {
-        return "Config is not valid, an exact reason isn't specified by validator";
-    }
-    else if (typeof validationResult === "string") {
-        return "Config is not valid: " + validationResult;
+exports.validateConfiguration = void 0;
+async function validateConfiguration(config, validator) {
+    try {
+        const result = await validator(config);
+        if (typeof result === "boolean" && !result) {
+            return "Unknown error";
+        }
+        else if (typeof result === "object" && !result.ok) {
+            return result.message || "Unknown error";
+        }
+        else if (typeof result === "string") {
+            return result;
+        }
     }
-    else if (typeof validationResult === "object" && !validationResult.ok) {
-        return "Config is not valid: " + validationResult.message;
+    catch (e) {
+        return e?.message || "Unknown error";
     }
-    return undefined;
-}
-exports.validationResultToError = validationResultToError;
-async function validateConfiguration(config, validator) {
-    let validationResult = await validator(config);
-    return validationResultToError(validationResult);
 }
 exports.validateConfiguration = validateConfiguration;

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jitsu-cli",
-    "version": "0.6.0",
+    "version": "0.7.4",
     "publishConfig": {
         "access": "public"
     },
@@ -65,5 +65,5 @@
         "typescript": "^4.5.2",
         "validate-npm-package-name": "^3.0.0"
     },
-    "gitHead": "4a5222ce49da3cb6be58648c78b1111b39764fe1"
+    "gitHead": "ede64e6fc3d51e3f38315fde5633d385e0bc9178"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jitsu-cli",
-  "version": "0.7.0",
+  "version": "0.7.5",
   "publishConfig": {
     "access": "public"
   },
@@ -65,5 +65,5 @@
     "typescript": "^4.5.2",
     "validate-npm-package-name": "^3.0.0"
   },
-  "gitHead": "4d54aac819fd941c52c15e1f7716c628d80bbdc5"
+  "gitHead": "ed8f516180f0dc2feb6dc4473127f6227132e9ad"
 }