@extrahorizon/exh-cli 1.12.0-dev-144-b9d0b5a → 1.12.0-dev-146-310460f

package/build/commands/login.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const fs = require("fs/promises");
-const chalk = require("chalk");
-const constants_1 = require("../constants");
-const exh_1 = require("../exh");
 const util_1 = require("../helpers/util");
+const authService = require("../services/auth");
 exports.command = 'login';
 exports.desc = 'Retrieve credentials from ExH';
 const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
@@ -37,23 +34,6 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
 });
 exports.builder = builder;
 const handler = async ({ host, email, password, consumerKey, consumerSecret }) => {
-    const sdk = (0, exh_1.sdkInitOnly)(host, consumerKey, consumerSecret);
-    const response = await sdk.auth.authenticate({
-        email,
-        password,
-    });
-    try {
-        await fs.stat(constants_1.EXH_CONFIG_FILE_DIR);
-    }
-    catch (err) {
-        await fs.mkdir(constants_1.EXH_CONFIG_FILE_DIR);
-    }
-    await fs.writeFile(constants_1.EXH_CONFIG_FILE, `API_HOST=${host}
-API_OAUTH_CONSUMER_KEY=${consumerKey}
-API_OAUTH_CONSUMER_SECRET=${consumerSecret}
-API_OAUTH_TOKEN=${response.token}
-API_OAUTH_TOKEN_SECRET=${response.tokenSecret}
-`);
-    console.log(chalk.green('Wrote credentials to', constants_1.EXH_CONFIG_FILE));
+    await authService.login(host, email, password, consumerKey, consumerSecret);
 };
 exports.handler = handler;

package/build/commands/sync.d.ts

@@ -49,7 +49,7 @@ export declare const builder: (yargs: any) => import("yargs").Argv<import("yargs
         default: boolean;
     };
 }>>;
-export declare const handler: ({ path, schemas, tasks, templates, dispatchers, cleanDispatchers, localizations, ignoreSchemaVerificationErrors, }: {
+export declare const handler: (options: {
     path?: string;
     schemas?: boolean;
     tasks?: boolean;

package/build/commands/sync.js

@@ -1,17 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const fs_1 = require("fs");
 const fs = require("fs/promises");
 const ospath = require("path");
-const chalk = require("chalk");
 const repoConfig_1 = require("../helpers/repoConfig");
 const util_1 = require("../helpers/util");
-const dispatcherService = require("../services/dispatchers");
-const localizationService = require("../services/localizations");
-const schemaService = require("../services/schemas");
-const taskService = require("../services/tasks");
-const templateService = require("../services/templates");
+const syncService = require("../services/sync");
 exports.command = 'sync';
 exports.desc = 'Sync your ExH configuration to the cloud environment';
 const builder = (yargs) => (0, util_1.epilogue)(yargs)
@@ -79,44 +73,7 @@ If not, the local directory is assumed with a default configuration which assume
     return true;
 });
 exports.builder = builder;
-const handler = async ({ path, schemas, tasks, templates, dispatchers, cleanDispatchers, localizations, ignoreSchemaVerificationErrors, }) => {
-    const targetPath = path || '.';
-    const cfg = await (0, repoConfig_1.getRepoConfig)(targetPath);
-    const syncAll = !(schemas || tasks || templates || dispatchers || localizations);
-    if ((syncAll || schemas) && cfg.schemas) {
-        console.log(chalk.green('\n ⚙️  Syncing schemas ...'));
-        for (const schema of cfg.schemas) {
-            await schemaService.sync(ospath.join(targetPath, schema), undefined, false, ignoreSchemaVerificationErrors);
-        }
-    }
-    if ((syncAll || templates) && cfg.templates) {
-        console.log(chalk.green('\n ⚙️  Syncing templates...'));
-        for (const template of cfg.templates) {
-            await templateService.sync(ospath.join(targetPath, template));
-        }
-    }
-    if ((syncAll || tasks) && cfg.tasks) {
-        console.log(chalk.green('\n ⚙️  Syncing tasks...'));
-        for (const task of cfg.tasks) {
-            await taskService.sync({ path: ospath.join(targetPath, task) });
-        }
-    }
-    if ((syncAll || localizations) && cfg.localizations) {
-        console.log(chalk.green('\n ⚙️  Syncing localizations...'));
-        for (const localization of cfg.localizations) {
-            await localizationService.sync(ospath.join(targetPath, localization));
-        }
-    }
-    if ((syncAll || dispatchers)) {
-        const dispatchersPath = ospath.join(targetPath, 'dispatchers.json');
-        const isValidPath = (0, fs_1.existsSync)(dispatchersPath);
-        if (isValidPath) {
-            console.log(chalk.green('\n ⚙️  Syncing dispatchers...'));
-            await dispatcherService.sync(dispatchersPath, cleanDispatchers);
-        }
-        else if (dispatchers) {
-            console.log(chalk.yellow('Warning: dispatchers.json not found'));
-        }
-    }
+const handler = async (options) => {
+    await syncService.sync(options);
 };
 exports.handler = handler;

package/build/commands/whoami.js

@@ -2,19 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const util_1 = require("../helpers/util");
-const authRepository = require("../repositories/auth");
+const authService = require("../services/auth");
 exports.command = 'whoami';
 exports.desc = 'Shows the currently logged in user';
 const builder = (yargs) => (0, util_1.epilogue)(yargs);
 exports.builder = builder;
-const handler = async function list() {
-    const host = authRepository.getHost();
-    if (!host) {
-        console.log('No ExH cluster host was found in the configuration.');
-        return;
-    }
-    console.log('You are targeting:', host);
-    const currentUser = await authRepository.fetchMe();
-    console.log('You are logged in as:', currentUser.email);
+const handler = async function whoami() {
+    await authService.whoami();
 };
 exports.handler = handler;

package/build/helpers/util.d.ts

@@ -3,4 +3,5 @@ export declare function epilogue(y: yargs.Argv): yargs.Argv;
 export declare function asyncExec(cmd: string): Promise<string>;
 export declare function loadAndAssertCredentials(): void;
 export declare function getSwaggerDocumentationUrl(subPath: string): string;
+export declare function ajvValidate<T>(schema: any, data: any): asserts data is T;
 export declare function getAjvErrorStrings(errors: any[]): string[];

package/build/helpers/util.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAjvErrorStrings = exports.getSwaggerDocumentationUrl = exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
+exports.getAjvErrorStrings = exports.ajvValidate = exports.getSwaggerDocumentationUrl = exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
 const child_process_1 = require("child_process");
 const fs = require("fs");
 const path = require("path");
+const ajv_1 = require("ajv");
 const chalk = require("chalk");
 const constants_1 = require("../constants");
 const error_1 = require("./error");
@@ -80,6 +81,15 @@ function getSwaggerDocumentationUrl(subPath) {
     throw new Error(`Unknown CLI version format: ${packageVersion}`);
 }
 exports.getSwaggerDocumentationUrl = getSwaggerDocumentationUrl;
+function ajvValidate(schema, data) {
+    const validate = new ajv_1.default().compile(schema);
+    const valid = validate(data);
+    if (!valid) {
+        const errors = getAjvErrorStrings(validate.errors);
+        throw new Error(errors[0] || 'Unknown config validation error');
+    }
+}
+exports.ajvValidate = ajvValidate;
 function getAjvErrorStrings(errors) {
     return errors.map(error => {
         let message = '';

package/build/services/auth.d.ts

@@ -0,0 +1,2 @@
+export declare function login(host: string, email: string, password: string, consumerKey: string, consumerSecret: string): Promise<void>;
+export declare function whoami(): Promise<void>;

package/build/services/auth.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.whoami = exports.login = void 0;
+const fs = require("fs/promises");
+const chalk = require("chalk");
+const constants_1 = require("../constants");
+const exh_1 = require("../exh");
+const authRepository = require("../repositories/auth");
+async function login(host, email, password, consumerKey, consumerSecret) {
+    const sdk = (0, exh_1.sdkInitOnly)(host, consumerKey, consumerSecret);
+    const response = await sdk.auth.authenticate({
+        email,
+        password,
+    });
+    try {
+        await fs.stat(constants_1.EXH_CONFIG_FILE_DIR);
+    }
+    catch (err) {
+        await fs.mkdir(constants_1.EXH_CONFIG_FILE_DIR);
+    }
+    await fs.writeFile(constants_1.EXH_CONFIG_FILE, `API_HOST=${host}
+API_OAUTH_CONSUMER_KEY=${consumerKey}
+API_OAUTH_CONSUMER_SECRET=${consumerSecret}
+API_OAUTH_TOKEN=${response.token}
+API_OAUTH_TOKEN_SECRET=${response.tokenSecret}
+`);
+    console.log(chalk.green('Wrote credentials to', constants_1.EXH_CONFIG_FILE));
+}
+exports.login = login;
+async function whoami() {
+    const host = authRepository.getHost();
+    if (!host) {
+        console.log('No ExH cluster host was found in the configuration.');
+        return;
+    }
+    console.log('You are targeting:', host);
+    const currentUser = await authRepository.fetchMe();
+    console.log('You are logged in as:', currentUser.email);
+}
+exports.whoami = whoami;

package/build/services/sync.d.ts

@@ -0,0 +1,10 @@
+export declare function sync({ path, schemas, tasks, templates, dispatchers, cleanDispatchers, localizations, ignoreSchemaVerificationErrors, }: {
+    path?: string;
+    schemas?: boolean;
+    tasks?: boolean;
+    templates?: boolean;
+    dispatchers?: boolean;
+    cleanDispatchers?: boolean;
+    localizations?: boolean;
+    ignoreSchemaVerificationErrors?: boolean;
+}): Promise<void>;

package/build/services/sync.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sync = void 0;
+const fs_1 = require("fs");
+const ospath = require("path");
+const chalk = require("chalk");
+const repoConfig_1 = require("../helpers/repoConfig");
+const dispatcherService = require("../services/dispatchers");
+const localizationService = require("../services/localizations");
+const schemaService = require("../services/schemas");
+const taskService = require("../services/tasks");
+const templateService = require("../services/templates");
+async function sync({ path, schemas, tasks, templates, dispatchers, cleanDispatchers, localizations, ignoreSchemaVerificationErrors, }) {
+    const targetPath = path || '.';
+    const cfg = await (0, repoConfig_1.getRepoConfig)(targetPath);
+    const syncAll = !(schemas || tasks || templates || dispatchers || localizations);
+    if ((syncAll || schemas) && cfg.schemas) {
+        console.log(chalk.green('\n ⚙️  Syncing schemas ...'));
+        for (const schema of cfg.schemas) {
+            await schemaService.sync(ospath.join(targetPath, schema), undefined, false, ignoreSchemaVerificationErrors);
+        }
+    }
+    if ((syncAll || templates) && cfg.templates) {
+        console.log(chalk.green('\n ⚙️  Syncing templates...'));
+        for (const template of cfg.templates) {
+            await templateService.sync(ospath.join(targetPath, template));
+        }
+    }
+    if ((syncAll || tasks) && cfg.tasks) {
+        console.log(chalk.green('\n ⚙️  Syncing tasks...'));
+        for (const task of cfg.tasks) {
+            await taskService.sync({ path: ospath.join(targetPath, task) });
+        }
+    }
+    if ((syncAll || localizations) && cfg.localizations) {
+        console.log(chalk.green('\n ⚙️  Syncing localizations...'));
+        for (const localization of cfg.localizations) {
+            await localizationService.sync(ospath.join(targetPath, localization));
+        }
+    }
+    if ((syncAll || dispatchers)) {
+        const dispatchersPath = ospath.join(targetPath, 'dispatchers.json');
+        const isValidPath = (0, fs_1.existsSync)(dispatchersPath);
+        if (isValidPath) {
+            console.log(chalk.green('\n ⚙️  Syncing dispatchers...'));
+            await dispatcherService.sync(dispatchersPath, cleanDispatchers);
+        }
+        else if (dispatchers) {
+            console.log(chalk.yellow('Warning: dispatchers.json not found'));
+        }
+    }
+}
+exports.sync = sync;

package/build/services/tasks/taskConfig.d.ts

@@ -24,6 +24,6 @@ export interface TaskConfig {
     };
 }
 export declare function assertExecutionPermission(mode: string): asserts mode is permissionModes | undefined;
-export declare function validateConfig(config: TaskConfig): Promise<boolean>;
+export declare function validateConfig(config: any): Promise<boolean>;
 export declare function loadSingleConfigFile(path: string): Promise<TaskConfig>;
 export declare function getValidatedConfigIterator({ path, name, code, entryPoint, runtime, description, timeLimit, memoryLimit, executionPermission, env, defaultPriority }: any): AsyncGenerator<TaskConfig>;

package/build/services/tasks/taskConfig.js

@@ -4,7 +4,6 @@ exports.getValidatedConfigIterator = exports.loadSingleConfigFile = exports.vali
 const assert_1 = require("assert");
 const fs = require("fs/promises");
 const ospath = require("path");
-const ajv_1 = require("ajv");
 const taskConfigSchema = require("../../config-json-schemas/TaskConfig.json");
 const util_1 = require("../../helpers/util");
 var permissionModes;
@@ -52,12 +51,7 @@ function replaceConfigVariables(config) {
     return result;
 }
 async function validateConfig(config) {
-    const validate = new ajv_1.default().compile(taskConfigSchema);
-    const valid = validate(config);
-    if (!valid) {
-        const errors = (0, util_1.getAjvErrorStrings)(validate.errors);
-        throw new Error(errors[0] || 'Unknown config validation error');
-    }
+    (0, util_1.ajvValidate)(taskConfigSchema, config);
     try {
         await fs.access(config.path);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-144-b9d0b5a",
+  "version": "1.12.0-dev-146-310460f",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",