@extrahorizon/exh-cli 1.10.0-dev-105-4051888 → 1.10.0-dev-107-31b7fb4

package/build/commands/data/schemas/init.js

@@ -29,7 +29,7 @@ const handler = async function init({ name, path }) {
 exports.handler = handler;
 function createSchema(name) {
     return {
-        $schema: 'https://swagger.extrahorizon.com/cli/1.10.0/config-json-schemas/Schema.json',
+        $schema: `https://swagger.extrahorizon.com/cli/${(0, util_1.getCliVersion)()}/config-json-schemas/Schema.json`,
         name,
         description: `The ${name} schema`,
         createMode: 'allUsers',

package/build/commands/tasks/createrepo.js

@@ -34,6 +34,7 @@ async function changePackageFile(name) {
     }
     try {
         const taskConfig = JSON.parse((await (0, promises_1.readFile)(`${name}/task-config.json`)).toString());
+        taskConfig.$schema = `https://swagger.extrahorizon.com/cli/${(0, util_1.getCliVersion)()}/config-json-schemas/TaskConfig.json`;
         taskConfig.name = name;
         taskConfig.description = `${name} task`;
         await (0, promises_1.writeFile)(`${name}/task-config.json`, JSON.stringify(taskConfig, null, 4));

package/build/commands/tasks/taskConfig.js

@@ -6,6 +6,7 @@ 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;
 (function (permissionModes) {
     permissionModes["permissionRequired"] = "permissionRequired";
@@ -54,7 +55,7 @@ async function validateConfig(config) {
     const validate = new ajv_1.default().compile(taskConfigSchema);
     const valid = validate(config);
     if (!valid) {
-        const errors = getAjvErrorStrings(validate.errors);
+        const errors = (0, util_1.getAjvErrorStrings)(validate.errors);
         throw new Error(errors[0] || 'Unknown config validation error');
     }
     try {
@@ -154,16 +155,3 @@ async function* getValidatedConfigIterator({ path, name, code, entryPoint, runti
     yield taskConfig;
 }
 exports.getValidatedConfigIterator = getValidatedConfigIterator;
-function getAjvErrorStrings(errors) {
-    return errors.map(error => {
-        let message = '';
-        if (error.instancePath) {
-            const normalizedPath = error.instancePath
-                .replace(/^\//, '')
-                .replace(/\//g, '.');
-            message += `"${normalizedPath}" `;
-        }
-        message += error.message || 'has an unknown error';
-        return message;
-    });
-}

package/build/helpers/util.d.ts

@@ -2,3 +2,5 @@ import * as yargs from 'yargs';
 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 getCliVersion(): any;
+export declare function getAjvErrorStrings(errors: any[]): string[];

package/build/helpers/util.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
+exports.getAjvErrorStrings = exports.getCliVersion = exports.loadAndAssertCredentials = exports.asyncExec = exports.epilogue = void 0;
 const child_process_1 = require("child_process");
 const fs = require("fs");
+const path = require("path");
 const chalk = require("chalk");
 const constants_1 = require("../constants");
 const error_1 = require("./error");
@@ -65,3 +66,26 @@ function loadAndAssertCredentials() {
     }
 }
 exports.loadAndAssertCredentials = loadAndAssertCredentials;
+function getCliVersion() {
+    const packageJsonPath = path.join(__dirname, '../../package.json');
+    const packageJsonString = fs.readFileSync(packageJsonPath, 'utf-8');
+    return JSON.parse(packageJsonString).version;
+}
+exports.getCliVersion = getCliVersion;
+function getAjvErrorStrings(errors) {
+    return errors.map(error => {
+        let message = '';
+        if (error.instancePath) {
+            const normalizedPath = error.instancePath
+                .replace(/^\//, '')
+                .replace(/\//g, '.');
+            message += `"${normalizedPath}" `;
+        }
+        message += error.message || 'has an unknown error';
+        if (!['type', 'required'].includes(error.keyword) && error.params) {
+            message += ` ${JSON.stringify(error.params)}`;
+        }
+        return message;
+    });
+}
+exports.getAjvErrorStrings = getAjvErrorStrings;

package/build/services/localizations/assertValidFileContent.js

@@ -1,14 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertValidFileContent = void 0;
-const Joi = require("joi");
-const keyPattern = /^[a-z0-9_.-]{1,200}$/i;
-const localizationFileSchema = Joi.object()
-    .pattern(keyPattern, Joi.string());
+const ajv_1 = require("ajv");
+const util_1 = require("../../helpers/util");
+const validate = new ajv_1.default().compile({
+    type: 'object',
+    patternProperties: {
+        '^[a-z0-9_.-]{1,200}$': { type: 'string' },
+    },
+    additionalProperties: false,
+});
 function assertValidFileContent(fileName, content) {
-    const result = localizationFileSchema.validate(content);
-    if (result.error != null) {
-        throw new Error(`The content of localization file '${fileName}' is not valid: ${result.error.message}`);
+    const valid = validate(content);
+    if (!valid) {
+        const errors = (0, util_1.getAjvErrorStrings)(validate.errors);
+        throw new Error(`The content of localization file '${fileName}' is not valid: ${errors[0]}`);
     }
 }
 exports.assertValidFileContent = assertValidFileContent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.10.0-dev-105-4051888",
+  "version": "1.10.0-dev-107-31b7fb4",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",
@@ -45,7 +45,6 @@
     "ajv": "^8.11.0",
     "archiver": "^7.0.1",
     "chalk": "^4.0.0",
-    "joi": "^17.6.0",
     "lodash": "^4.17.21",
     "yargs": "^17.5.1"
   }