@extrahorizon/exh-cli 1.12.0-dev-143-312ba3f → 1.12.0-dev-144-b9d0b5a

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

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const chalk = require("chalk");
 const util_1 = require("../../../helpers/util");
-const schemaRepository = require("../../../repositories/schemas");
+const schemaService = require("../../../services/schemas");
 exports.command = 'delete';
 exports.desc = 'Delete a schema';
 const builder = (yargs) => (0, util_1.epilogue)(yargs).option('id', {
@@ -13,17 +12,6 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).option('id', {
 });
 exports.builder = builder;
 const handler = async ({ id }) => {
-    const disableResponse = await schemaRepository.disable(id);
-    if (disableResponse.affectedRecords !== 1) {
-        console.log(chalk.red('Failed to delete schema', id));
-        return;
-    }
-    const deleteResponse = await schemaRepository.remove(id);
-    if (deleteResponse.affectedRecords) {
-        console.log(chalk.green('Successfully deleted schema', id));
-    }
-    else {
-        console.log(chalk.red('Failed to delete schema', id));
-    }
+    await schemaService.remove(id);
 };
 exports.handler = handler;

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

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const promises_1 = require("fs/promises");
-const osPath = require("path");
 const util_1 = require("../../../helpers/util");
+const schemaService = require("../../../services/schemas");
 exports.command = 'init <name>';
 exports.desc = 'Create a basic schema configuration file';
 const builder = (yargs) => (0, util_1.epilogue)(yargs)
@@ -21,33 +20,6 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs)
 });
 exports.builder = builder;
 const handler = async function init({ name, path }) {
-    await (0, promises_1.mkdir)(path, { recursive: true });
-    const filePath = osPath.join(path, `${name}.json`);
-    await (0, promises_1.writeFile)(filePath, JSON.stringify(createSchema(name), null, 2));
-    console.log(`✅  Successfully created ${filePath}`);
+    await schemaService.init(name, path);
 };
 exports.handler = handler;
-function createSchema(name) {
-    return {
-        name,
-        description: `The ${name} schema`,
-        createMode: 'allUsers',
-        readMode: ['creator'],
-        updateMode: ['creator'],
-        deleteMode: ['creator'],
-        statuses: {
-            new: {},
-        },
-        creationTransition: {
-            type: 'manual',
-            toStatus: 'new',
-        },
-        transitions: [],
-        properties: {
-            firstProperty: {
-                type: 'string',
-            },
-        },
-        $schema: (0, util_1.getSwaggerDocumentationUrl)('config-json-schemas/Schema.json'),
-    };
-}

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

@@ -2,25 +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 schemaRepository = require("../../../repositories/schemas");
+const schemaService = require("../../../services/schemas");
 exports.command = 'list';
 exports.desc = 'List all schemas';
 const builder = (yargs) => (0, util_1.epilogue)(yargs);
 exports.builder = builder;
 const handler = async function list({ isTTY }) {
-    const schemas = await schemaRepository.fetchAll();
-    if (schemas.length < 1) {
-        return;
-    }
-    if (isTTY) {
-        console.table(schemas.map(schema => ({
-            Id: schema.id,
-            Name: schema.name,
-            Description: schema.description || '<none>',
-        })));
-    }
-    else {
-        schemas.forEach(schema => console.log([schema.id, schema.name].join(',')));
-    }
+    await schemaService.list(isTTY);
 };
 exports.handler = handler;

package/build/commands/data/schemas/sync.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="yargs" />
 export declare const command = "sync";
 export declare const desc = "Sync all schemas in a directory with the ExH cloud";
-export declare const builder: (yargs: any) => import("yargs").Argv<import("yargs").Omit<{}, "file" | "dir" | "ignoreVerificationErrors" | "dry"> & import("yargs").InferredOptionTypes<{
+export declare const builder: (yargs: any) => import("yargs").Argv<import("yargs").Omit<{}, "file" | "dir" | "dry" | "ignoreVerificationErrors"> & import("yargs").InferredOptionTypes<{
     dir: {
         demandOption: false;
         describe: string;
@@ -24,11 +24,9 @@ export declare const builder: (yargs: any) => import("yargs").Argv<import("yargs
         default: boolean;
     };
 }>>;
-export declare const handler: ({ dir, file, dry, ignoreVerificationErrors }: {
-    dir: any;
+export declare const handler: ({ file, dir, dry, ignoreVerificationErrors }: {
     file: any;
+    dir: any;
     dry: any;
     ignoreVerificationErrors: any;
 }) => Promise<void>;
-export declare function syncTargetFile(targetFile: string, dry?: boolean, ignoreVerificationErrors?: boolean): Promise<void>;
-export declare function syncTargetDir(targetDir: string, dry?: boolean, ignoreVerificationErrors?: boolean): Promise<void>;

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

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncTargetDir = exports.syncTargetFile = exports.handler = exports.builder = exports.desc = exports.command = void 0;
-const path = require("path");
-const chalk = require("chalk");
+exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const util_1 = require("../../../helpers/util");
-const listFilesInDir_1 = require("./util/listFilesInDir");
-const readJson_1 = require("./util/readJson");
-const syncSchema_1 = require("./util/syncSchema");
-const verify_1 = require("./verify");
+const schemaService = require("../../../services/schemas");
 exports.command = 'sync';
 exports.desc = 'Sync all schemas in a directory with the ExH cloud';
 const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
@@ -34,38 +29,7 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
     },
 });
 exports.builder = builder;
-const handler = async ({ dir, file, dry, ignoreVerificationErrors }) => {
-    if (!file && !dir) {
-        console.log(chalk.red('No target is chosen to be synced. Please use flags "--file" or "--dir" when syncing'));
-        process.exit(1);
-    }
-    if (dir) {
-        await syncTargetDir(path.resolve(dir || '.'), dry, ignoreVerificationErrors);
-    }
-    if (file) {
-        await syncTargetFile(path.resolve(file), dry, ignoreVerificationErrors);
-    }
+const handler = async ({ file, dir, dry, ignoreVerificationErrors }) => {
+    await schemaService.sync(file, dir, dry, ignoreVerificationErrors);
 };
 exports.handler = handler;
-async function syncTargetFile(targetFile, dry, ignoreVerificationErrors) {
-    await (0, verify_1.handler)({ dir: null, file: targetFile, ignoreVerificationErrors });
-    const filePath = path.resolve(targetFile);
-    if (!filePath.endsWith('.json')) {
-        console.log(`Ignored ${path.basename(filePath)}, not a JSON file (needs .json extension)`);
-    }
-    else {
-        console.log(chalk.bold(`Synchronizing ${path.basename(filePath)}`));
-        const targetSchema = await (0, readJson_1.readJsonFile)(filePath);
-        const syncSchema = syncSchema_1.SyncSchema.createSchemaSync(dry);
-        await syncSchema.sync(targetSchema);
-    }
-}
-exports.syncTargetFile = syncTargetFile;
-async function syncTargetDir(targetDir, dry, ignoreVerificationErrors) {
-    const targetFiles = (0, listFilesInDir_1.flatListFiles)(targetDir, '.json');
-    for (const filePath of targetFiles) {
-        await syncTargetFile(filePath, dry, ignoreVerificationErrors);
-        process.stdout.write('\n');
-    }
-}
-exports.syncTargetDir = syncTargetDir;

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

@@ -3,16 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = exports.builder = exports.desc = exports.command = void 0;
 const fs = require("fs");
 const path = require("path");
-const ajv_1 = require("ajv");
-const chalk = require("chalk");
-const metaschema = require("../../../config-json-schemas/Schema.json");
-const error_1 = require("../../../helpers/error");
 const util_1 = require("../../../helpers/util");
-const listFilesInDir_1 = require("./util/listFilesInDir");
-const schemaverify_1 = require("./util/schemaverify");
+const schemaService = require("../../../services/schemas");
 exports.command = 'verify';
 exports.desc = 'Syntactically verify a local schema';
-const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
+const builder = (yargs) => (0, util_1.epilogue)(yargs)
+    .options({
     file: {
         describe: 'schema json file which needs to be verified',
         type: 'string',
@@ -21,7 +17,8 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
         describe: 'directory containing schemas to be verified',
         type: 'string',
     },
-}).check(({ file, dir }) => {
+})
+    .check(({ file, dir }) => {
     if (file && (!fs.existsSync(path.resolve(file)) || !fs.lstatSync(path.resolve(file)).isFile())) {
         throw new Error('Schema file does not exist, please make sure you provided the correct file path');
     }
@@ -35,48 +32,6 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
 });
 exports.builder = builder;
 const handler = async ({ file, dir, ignoreVerificationErrors }) => {
-    let files = [];
-    if (dir) {
-        files = await (0, listFilesInDir_1.flatListFiles)(dir, '.json');
-    }
-    else {
-        files = [file];
-    }
-    const checkFile = (schemaPath) => {
-        let schema = {};
-        console.log(chalk.bold('Checking', schemaPath));
-        try {
-            schema = require(path.resolve(schemaPath));
-        }
-        catch (err) {
-            console.log(chalk.red(`Failed to load schema file ${file}. Possibly not a valid JSON file`));
-            console.log(err);
-            return;
-        }
-        const ajv = new ajv_1.default();
-        for (const result of (new schemaverify_1.SchemaVerify(ajv, schema, metaschema)).RunChecks()) {
-            if (result.ok) {
-                console.log(chalk.green(`${result.test}... ✓`));
-            }
-            else {
-                console.log(chalk.red(`${result.test}... x`));
-                for (const error of result.errors) {
-                    if (typeof error === 'object') {
-                        console.log('\t', chalk.red(JSON.stringify(error, null, 4)));
-                    }
-                    else {
-                        console.log('\t', chalk.red(error));
-                    }
-                }
-                if (!ignoreVerificationErrors) {
-                    throw new error_1.CommandError(`Schema ${schemaPath} contains error, please fix`);
-                }
-            }
-        }
-        console.log();
-    };
-    for (const f of files) {
-        checkFile(f);
-    }
+    await schemaService.verify(file, dir, ignoreVerificationErrors);
 };
 exports.handler = handler;

package/build/commands/sync.js

@@ -7,11 +7,11 @@ const ospath = require("path");
 const chalk = require("chalk");
 const repoConfig_1 = require("../helpers/repoConfig");
 const util_1 = require("../helpers/util");
-const dispatchers_1 = require("../services/dispatchers");
-const localizations_1 = require("../services/localizations");
-const sync_1 = require("./data/schemas/sync");
-const sync_2 = require("./tasks/sync");
-const sync_3 = require("./templates/sync");
+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");
 exports.command = 'sync';
 exports.desc = 'Sync your ExH configuration to the cloud environment';
 const builder = (yargs) => (0, util_1.epilogue)(yargs)
@@ -63,7 +63,8 @@ If not, the local directory is assumed with a default configuration which assume
         type: 'boolean',
         default: false,
     },
-}).check(async ({ path }) => {
+})
+    .check(async ({ path }) => {
     if (path !== undefined) {
         try {
             await fs.access(ospath.join(process.cwd(), path, repoConfig_1.REPO_CONFIG_FILE));
@@ -85,25 +86,25 @@ const handler = async ({ path, schemas, tasks, templates, dispatchers, cleanDisp
     if ((syncAll || schemas) && cfg.schemas) {
         console.log(chalk.green('\n ⚙️  Syncing schemas ...'));
         for (const schema of cfg.schemas) {
-            await (0, sync_1.syncTargetDir)(ospath.join(targetPath, schema), undefined, ignoreSchemaVerificationErrors);
+            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 (0, sync_3.handler)({ path: ospath.join(targetPath, template), template: null });
+            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 (0, sync_2.handler)({ path: ospath.join(targetPath, task) });
+            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 (0, localizations_1.sync)(ospath.join(targetPath, localization));
+            await localizationService.sync(ospath.join(targetPath, localization));
         }
     }
     if ((syncAll || dispatchers)) {
@@ -111,7 +112,7 @@ const handler = async ({ path, schemas, tasks, templates, dispatchers, cleanDisp
         const isValidPath = (0, fs_1.existsSync)(dispatchersPath);
         if (isValidPath) {
             console.log(chalk.green('\n ⚙️  Syncing dispatchers...'));
-            await (0, dispatchers_1.sync)(dispatchersPath, cleanDispatchers);
+            await dispatcherService.sync(dispatchersPath, cleanDispatchers);
         }
         else if (dispatchers) {
             console.log(chalk.yellow('Warning: dispatchers.json not found'));

package/build/services/schemas/index.d.ts

@@ -0,0 +1,5 @@
+export { init } from './init';
+export { verify } from './verify';
+export { sync } from './sync';
+export declare function list(isTTY?: boolean): Promise<void>;
+export declare function remove(id: string): Promise<void>;

package/build/services/schemas/index.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remove = exports.list = exports.sync = exports.verify = exports.init = void 0;
+const chalk = require("chalk");
+const schemaRepository = require("../../repositories/schemas");
+var init_1 = require("./init");
+Object.defineProperty(exports, "init", { enumerable: true, get: function () { return init_1.init; } });
+var verify_1 = require("./verify");
+Object.defineProperty(exports, "verify", { enumerable: true, get: function () { return verify_1.verify; } });
+var sync_1 = require("./sync");
+Object.defineProperty(exports, "sync", { enumerable: true, get: function () { return sync_1.sync; } });
+async function list(isTTY) {
+    const schemas = await schemaRepository.fetchAll();
+    if (schemas.length < 1) {
+        return;
+    }
+    if (isTTY) {
+        console.table(schemas.map(schema => ({
+            Id: schema.id,
+            Name: schema.name,
+            Description: schema.description || '<none>',
+        })));
+    }
+    else {
+        schemas.forEach(schema => console.log([schema.id, schema.name].join(',')));
+    }
+}
+exports.list = list;
+async function remove(id) {
+    const disableResponse = await schemaRepository.disable(id);
+    if (disableResponse.affectedRecords !== 1) {
+        console.log(chalk.red('Failed to delete schema', id));
+        return;
+    }
+    const deleteResponse = await schemaRepository.remove(id);
+    if (deleteResponse.affectedRecords) {
+        console.log(chalk.green('Successfully deleted schema', id));
+    }
+    else {
+        console.log(chalk.red('Failed to delete schema', id));
+    }
+}
+exports.remove = remove;

package/build/services/schemas/init.d.ts

@@ -0,0 +1 @@
+export declare function init(name: string, path: string): Promise<void>;

package/build/services/schemas/init.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = void 0;
+const promises_1 = require("fs/promises");
+const osPath = require("path");
+const util_1 = require("../../helpers/util");
+async function init(name, path) {
+    await (0, promises_1.mkdir)(path, { recursive: true });
+    const filePath = osPath.join(path, `${name}.json`);
+    await (0, promises_1.writeFile)(filePath, JSON.stringify(createSchema(name), null, 2));
+    console.log(`✅  Successfully created ${filePath}`);
+}
+exports.init = init;
+function createSchema(name) {
+    return {
+        name,
+        description: `The ${name} schema`,
+        createMode: 'allUsers',
+        readMode: ['creator'],
+        updateMode: ['creator'],
+        deleteMode: ['creator'],
+        statuses: {
+            new: {},
+        },
+        creationTransition: {
+            type: 'manual',
+            toStatus: 'new',
+        },
+        transitions: [],
+        properties: {
+            firstProperty: {
+                type: 'string',
+            },
+        },
+        $schema: (0, util_1.getSwaggerDocumentationUrl)('config-json-schemas/Schema.json'),
+    };
+}

package/build/services/schemas/sync.d.ts

@@ -0,0 +1,3 @@
+export declare function sync(file?: string, dir?: string, dry?: boolean, ignoreVerificationErrors?: boolean): Promise<void>;
+export declare function syncTargetFile(targetFile: string, dry?: boolean, ignoreVerificationErrors?: boolean): Promise<void>;
+export declare function syncTargetDir(targetDir: string, dry?: boolean, ignoreVerificationErrors?: boolean): Promise<void>;

package/build/services/schemas/sync.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncTargetDir = exports.syncTargetFile = exports.sync = void 0;
+const path = require("path");
+const chalk = require("chalk");
+const listFilesInDir_1 = require("./util/listFilesInDir");
+const readJson_1 = require("./util/readJson");
+const syncSchema_1 = require("./util/syncSchema");
+const verify_1 = require("./verify");
+async function sync(file, dir, dry, ignoreVerificationErrors) {
+    if (!file && !dir) {
+        console.log(chalk.red('No target is chosen to be synced. Please use flags "--file" or "--dir" when syncing'));
+        process.exit(1);
+    }
+    if (dir) {
+        await syncTargetDir(path.resolve(dir || '.'), dry, ignoreVerificationErrors);
+    }
+    if (file) {
+        await syncTargetFile(path.resolve(file), dry, ignoreVerificationErrors);
+    }
+}
+exports.sync = sync;
+async function syncTargetFile(targetFile, dry, ignoreVerificationErrors) {
+    await (0, verify_1.verify)(targetFile, null, ignoreVerificationErrors);
+    const filePath = path.resolve(targetFile);
+    if (!filePath.endsWith('.json')) {
+        console.log(`Ignored ${path.basename(filePath)}, not a JSON file (needs .json extension)`);
+    }
+    else {
+        console.log(chalk.bold(`Synchronizing ${path.basename(filePath)}`));
+        const targetSchema = await (0, readJson_1.readJsonFile)(filePath);
+        const syncSchema = syncSchema_1.SyncSchema.createSchemaSync(dry);
+        await syncSchema.sync(targetSchema);
+    }
+}
+exports.syncTargetFile = syncTargetFile;
+async function syncTargetDir(targetDir, dry, ignoreVerificationErrors) {
+    const targetFiles = (0, listFilesInDir_1.flatListFiles)(targetDir, '.json');
+    for (const filePath of targetFiles) {
+        await syncTargetFile(filePath, dry, ignoreVerificationErrors);
+        process.stdout.write('\n');
+    }
+}
+exports.syncTargetDir = syncTargetDir;

package/build/{commands/data → services}/schemas/util/syncSchema.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compareSchemaKey = exports.SyncSchema = void 0;
 const chalk = require("chalk");
 const _ = require("lodash");
-const schemaRepository = require("../../../../repositories/schemas");
+const schemaRepository = require("../../../repositories/schemas");
 const statusHelpers_1 = require("../sync/statusHelpers");
 const stripUnsupportedDescriptionFields_1 = require("./stripUnsupportedDescriptionFields");
 class SyncSchema {

package/build/services/schemas/verify.d.ts

@@ -0,0 +1 @@
+export declare function verify(file?: string, dir?: string, ignoreVerificationErrors?: boolean): Promise<void>;

package/build/services/schemas/verify.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verify = void 0;
+const path = require("path");
+const ajv_1 = require("ajv");
+const chalk = require("chalk");
+const metaschema = require("../../config-json-schemas/Schema.json");
+const error_1 = require("../../helpers/error");
+const listFilesInDir_1 = require("./util/listFilesInDir");
+const schemaverify_1 = require("./util/schemaverify");
+async function verify(file, dir, ignoreVerificationErrors) {
+    let files = [];
+    if (dir) {
+        files = await (0, listFilesInDir_1.flatListFiles)(dir, '.json');
+    }
+    else {
+        files = [file];
+    }
+    const checkFile = (schemaPath) => {
+        let schema = {};
+        console.log(chalk.bold('Checking', schemaPath));
+        try {
+            schema = require(path.resolve(schemaPath));
+        }
+        catch (err) {
+            console.log(chalk.red(`Failed to load schema file ${file}. Possibly not a valid JSON file`));
+            console.log(err);
+            return;
+        }
+        const ajv = new ajv_1.default();
+        for (const result of (new schemaverify_1.SchemaVerify(ajv, schema, metaschema)).RunChecks()) {
+            if (result.ok) {
+                console.log(chalk.green(`${result.test}... ✓`));
+            }
+            else {
+                console.log(chalk.red(`${result.test}... x`));
+                for (const error of result.errors) {
+                    if (typeof error === 'object') {
+                        console.log('\t', chalk.red(JSON.stringify(error, null, 4)));
+                    }
+                    else {
+                        console.log('\t', chalk.red(error));
+                    }
+                }
+                if (!ignoreVerificationErrors) {
+                    throw new error_1.CommandError(`Schema ${schemaPath} contains error, please fix`);
+                }
+            }
+        }
+        console.log();
+    };
+    for (const f of files) {
+        checkFile(f);
+    }
+}
+exports.verify = verify;

package/package.json

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