@extrahorizon/exh-cli 1.12.0-dev-145-36d98c7 → 1.12.0-dev-146-310460f

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/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-145-36d98c7",
+  "version": "1.12.0-dev-146-310460f",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",