@extrahorizon/exh-cli 1.12.0-dev-147-8845ed1 → 1.12.0-dev-149-5031bb3

package/build/config-json-schemas/Template.json

@@ -0,0 +1,261 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "if": {
+        "description": "Try to determine if we have V1 schema",
+        "anyOf": [
+            {
+                "type": "object",
+                "required": ["version"],
+                "properties": { "version": { "const": 1 } }
+            },
+            {
+                "type": "object",
+                "required": ["schema"],
+                "properties": {
+                    "version": { "const": 1 },
+                    "schema": true
+                }
+            },
+            {
+                "type": "object",
+                "required": ["fields"],
+                "properties": {
+                    "version": { "const": 1 },
+                    "fields": true
+                }
+            }
+        ]
+    },
+    "then": { "$ref": "#/definitions/TemplateV1" },
+    "else": { "$ref": "#/definitions/TemplateV2" },
+    "definitions": {
+        "TemplateV2": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "version": { "const": 2 },
+                "$schema": { "type": "string" },
+                "description": { "type": "string" },
+                "extendsTemplate": { "type": "string" },
+                "properties": {
+                    "type": "object",
+                    "additionalProperties": { "$ref": "#/definitions/TypeConfigurationV2" }
+                },
+                "outputs": {
+                    "type": "object",
+                    "additionalProperties": { "type": "string" }
+                }
+            }
+        },
+        "TypeConfigurationV2": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": { "enum": ["object", "array", "string", "number", "boolean"] }
+            },
+            "allOf": [
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "object" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/ObjectConfigurationV2" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "array" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/ArrayConfigurationV2" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "string" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/StringConfigurationV2" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "number" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/NumberConfigurationV2" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "boolean" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/BooleanConfigurationV2" }
+                }
+            ]
+        },
+        "ObjectConfigurationV2": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["type", "properties"],
+            "properties": {
+                "type": { "const": "object" },
+                "properties": {
+                    "type": "object",
+                    "additionalProperties": { "$ref": "#/definitions/TypeConfigurationV2" }
+                }
+            }
+        },
+        "ArrayConfigurationV2": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["type", "items"],
+            "properties": {
+                "type": { "const": "array" },
+                "items": { "$ref": "#/definitions/TypeConfigurationV2" }
+            }
+        },
+        "StringConfigurationV2": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "string" }
+            }
+        },
+        "NumberConfigurationV2": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "number" }
+            }
+        },
+        "BooleanConfigurationV2": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "boolean" }
+            }
+        },
+        "TemplateV1": {
+            "type": "object",
+            "required": ["description", "schema", "fields"],
+            "properties": {
+                "version": { "const": 1 },
+                "$schema": { "type": "string" },
+                "extends_template": { "type": "string" },
+                "description": { "type": "string" },
+                "schema": { "$ref": "#/definitions/ObjectConfiguration" },
+                "fields": {
+                    "type": "object",
+                    "additionalProperties": { "type": "string" }
+                }
+            }
+        },
+        "TypeConfiguration": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": { "enum": ["object", "array", "string", "number", "boolean"] }
+            },
+            "allOf": [
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "object" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/ObjectConfiguration" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "array" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/ArrayConfiguration" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "string" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/StringConfiguration" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "number" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/NumberConfiguration" }
+                },
+                {
+                    "if": {
+                        "type": "object",
+                        "properties": {
+                            "type": { "const": "boolean" }
+                        }
+                    },
+                    "then": { "$ref": "#/definitions/BooleanConfiguration" }
+                }
+            ]
+        },
+        "ObjectConfiguration": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "object" },
+                "fields": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "$ref": "#/definitions/TypeConfiguration"
+                    }
+                }
+            }
+        },
+        "ArrayConfiguration": {
+            "type": "object",
+            "required": ["type", "type_configuration"],
+            "properties": {
+                "type": { "const": "array" },
+                "type_configuration": { "$ref": "#/definitions/TypeConfiguration" }
+            }
+        },
+        "StringConfiguration": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "string" }
+            }
+        },
+        "NumberConfiguration": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "number" }
+            }
+        },
+        "BooleanConfiguration": {
+            "type": "object",
+            "required": ["type"],
+            "properties": {
+                "type": { "const": "boolean" }
+            }
+        }
+    }
+}

package/build/services/templates/get.d.ts

@@ -0,0 +1,4 @@
+import { type Template, type TemplateV2 } from '@extrahorizon/javascript-sdk';
+export declare function get(name?: string, id?: string): Promise<void>;
+export declare function getFromV1(name?: string, id?: string): Promise<Template>;
+export declare function getFromV2(name?: string, id?: string): Promise<TemplateV2>;

package/build/services/templates/get.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFromV2 = exports.getFromV1 = exports.get = void 0;
+const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
+const chalk = require("chalk");
+const templateRepository = require("../../repositories/templates");
+const templateV2Repository = require("../../repositories/templatesV2");
+async function get(name, id) {
+    let template = await getFromV2(name, id);
+    if (!template) {
+        template = await getFromV1(name, id);
+    }
+    if (!template) {
+        console.log(chalk.red('Failed to get template!'));
+        return;
+    }
+    console.log(JSON.stringify(template, null, 4));
+}
+exports.get = get;
+async function getFromV1(name, id) {
+    try {
+        if (name) {
+            return await templateRepository.findByName(name);
+        }
+        if (id) {
+            return await templateRepository.findById(id);
+        }
+    }
+    catch (error) {
+        if (!(error instanceof javascript_sdk_1.ServiceNotFoundError)) {
+            throw error;
+        }
+    }
+    return null;
+}
+exports.getFromV1 = getFromV1;
+async function getFromV2(name, id) {
+    try {
+        if (name) {
+            return await templateV2Repository.findByName(name);
+        }
+        if (id) {
+            return await templateV2Repository.findById(id);
+        }
+    }
+    catch (error) {
+        if (!(error instanceof javascript_sdk_1.ServiceNotFoundError)) {
+            throw error;
+        }
+    }
+    return null;
+}
+exports.getFromV2 = getFromV2;

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

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

package/build/services/templates/index.js

@@ -1,66 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remove = exports.get = exports.list = exports.sync = void 0;
-const chalk = require("chalk");
-const templateRepository = require("../../repositories/templates");
+exports.remove = exports.list = exports.get = exports.sync = void 0;
 var sync_1 = require("./sync");
 Object.defineProperty(exports, "sync", { enumerable: true, get: function () { return sync_1.sync; } });
-async function list(isTTY) {
-    const templates = await templateRepository.findAll();
-    if (templates.length < 1) {
-        console.log(chalk.red('No templates found'));
-        return;
-    }
-    if (isTTY) {
-        console.table(templates.map(template => ({
-            Id: template.id,
-            Name: template.name,
-            Description: template.description || '<none>',
-            'Last updated': template.updateTimestamp.toISOString(),
-        })));
-    }
-    else {
-        templates.forEach(template => console.log(template));
-    }
-}
-exports.list = list;
-async function get(name, id) {
-    let template;
-    if (name) {
-        template = await templateRepository.findByName(name);
-    }
-    else if (id) {
-        template = await templateRepository.findById(id);
-    }
-    if (!template) {
-        console.log(chalk.red('Failed to get template!'));
-        return;
-    }
-    console.log(JSON.stringify(template, null, 4));
-}
-exports.get = get;
-async function remove(name, id) {
-    let template = null;
-    if (name) {
-        template = await templateRepository.findByName(name);
-    }
-    if (id) {
-        template = await templateRepository.findById(id);
-    }
-    if (!template) {
-        console.log(chalk.red('Template not found!'));
-        return;
-    }
-    try {
-        const { affectedRecords } = await templateRepository.remove(template.id);
-        if (!affectedRecords) {
-            console.log(chalk.red('Failed to remove template', name));
-            return;
-        }
-        console.log('Template deleted');
-    }
-    catch (err) {
-        console.log(chalk.red('Failed to remove template', name));
-    }
-}
-exports.remove = remove;
+var get_1 = require("./get");
+Object.defineProperty(exports, "get", { enumerable: true, get: function () { return get_1.get; } });
+var list_1 = require("./list");
+Object.defineProperty(exports, "list", { enumerable: true, get: function () { return list_1.list; } });
+var remove_1 = require("./remove");
+Object.defineProperty(exports, "remove", { enumerable: true, get: function () { return remove_1.remove; } });

package/build/services/templates/list.d.ts

@@ -0,0 +1 @@
+export declare function list(isTTY: boolean): Promise<void>;

package/build/services/templates/list.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.list = void 0;
+const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
+const chalk = require("chalk");
+const templateRepository = require("../../repositories/templates");
+const templateV2Repository = require("../../repositories/templatesV2");
+async function list(isTTY) {
+    const templates = [];
+    try {
+        const templatesV1 = await templateRepository.findAll();
+        templates.push(...templatesV1);
+    }
+    catch (error) {
+        if (!(error instanceof javascript_sdk_1.ServiceNotFoundError)) {
+            throw error;
+        }
+    }
+    try {
+        const templatesV2 = await templateV2Repository.findAll();
+        templates.push(...templatesV2);
+    }
+    catch (error) {
+        if (!(error instanceof javascript_sdk_1.ServiceNotFoundError)) {
+            throw error;
+        }
+    }
+    if (templates.length < 1) {
+        console.log(chalk.red('No templates found'));
+        return;
+    }
+    if (isTTY) {
+        console.table(templates.map(template => ({
+            Id: template.id,
+            Name: template.name,
+            Description: template.description || '<none>',
+            'Last updated': template.updateTimestamp.toISOString(),
+        })));
+    }
+    else {
+        templates.forEach(template => console.log(template));
+    }
+}
+exports.list = list;

package/build/services/templates/remove.d.ts

@@ -0,0 +1 @@
+export declare function remove(name?: string, id?: string): Promise<void>;

package/build/services/templates/remove.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remove = void 0;
+const javascript_sdk_1 = require("@extrahorizon/javascript-sdk");
+const chalk = require("chalk");
+const templateRepository = require("../../repositories/templates");
+const templateV2Repository = require("../../repositories/templatesV2");
+const get_1 = require("./get");
+async function remove(name, id) {
+    let isRemoved = await removeFromV2(name, id);
+    if (!isRemoved) {
+        isRemoved = await removeFromV1(name, id);
+    }
+    if (!isRemoved) {
+        console.log(chalk.red('Template not found!'));
+    }
+    else {
+        console.log('Template deleted');
+    }
+}
+exports.remove = remove;
+async function removeFromV1(name, id) {
+    const template = await (0, get_1.getFromV1)(name, id);
+    if (!template) {
+        return false;
+    }
+    try {
+        await templateRepository.remove(template.id);
+        return true;
+    }
+    catch (error) {
+        if (!(error instanceof javascript_sdk_1.ServiceNotFoundError)) {
+            throw error;
+        }
+    }
+    return false;
+}
+async function removeFromV2(name, id) {
+    const template = await (0, get_1.getFromV2)(name, id);
+    if (!template) {
+        return false;
+    }
+    try {
+        await templateV2Repository.remove(template.id);
+        return true;
+    }
+    catch (error) {
+        if (!(error instanceof javascript_sdk_1.ServiceNotFoundError)) {
+            throw error;
+        }
+    }
+    return false;
+}

package/build/services/templates/sync.js

@@ -14,7 +14,7 @@ async function sync(path, template) {
     }
     let templ = null;
     if (fs.statSync(ospath.join(process.cwd(), template)).isFile()) {
-        templ = await (0, readTemplateFiles_1.readTemplateJson)(template);
+        templ = await (0, readTemplateFiles_1.readAndValidateTemplateJson)(template);
     }
     else {
         templ = await (0, readTemplateFiles_1.readTemplateFolder)(template);

package/build/services/templates/util/models.d.ts

@@ -0,0 +1,12 @@
+import type { TemplateCreation, TemplateV2Creation } from '@extrahorizon/javascript-sdk';
+export declare type TemplateConfig = TemplateV1Config | TemplateV2Config;
+export interface TemplateV1Config extends TemplateCreation {
+    version?: 1;
+    $schema?: string;
+    extends_template?: string;
+}
+export interface TemplateV2Config extends TemplateV2Creation {
+    version?: 2;
+    $schema?: string;
+    extendsTemplate?: string;
+}

package/build/services/templates/util/models.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/services/templates/util/readTemplateFiles.d.ts

@@ -1,3 +1,4 @@
+import type { TemplateConfig } from './models';
 export declare function readTemplateFiles(targetFolder: string): Promise<{}>;
-export declare function readTemplateJson(fileName: string): Promise<any>;
-export declare function readTemplateFolder(subFolder: string): Promise<any>;
+export declare function readAndValidateTemplateJson(fileName: string): Promise<TemplateConfig>;
+export declare function readTemplateFolder(subFolder: string): Promise<TemplateConfig>;

package/build/services/templates/util/readTemplateFiles.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readTemplateFolder = exports.readTemplateJson = exports.readTemplateFiles = void 0;
+exports.readTemplateFolder = exports.readAndValidateTemplateJson = exports.readTemplateFiles = void 0;
 const fs = require("fs/promises");
 const path = require("path");
+const templateConfigSchema = require("../../../config-json-schemas/Template.json");
+const util_1 = require("../../../helpers/util");
 const utils_1 = require("./utils");
 async function readTemplateFiles(targetFolder) {
     const fileNames = await (0, utils_1.listFolderContent)(targetFolder);
@@ -14,18 +16,25 @@ async function readTemplateFiles(targetFolder) {
         }
         else if (fileName.endsWith('.json')) {
             const templateName = (0, utils_1.removeFileNameExtension)(fileName);
-            templateFilesByName[templateName] = await readTemplateJson(filePath);
+            templateFilesByName[templateName] = await readAndValidateTemplateJson(filePath);
         }
     }
     return templateFilesByName;
 }
 exports.readTemplateFiles = readTemplateFiles;
-async function readTemplateJson(fileName) {
-    return (0, utils_1.readJsonFile)(fileName);
+async function readAndValidateTemplateJson(fileName) {
+    try {
+        const content = await (0, utils_1.readJsonFile)(fileName);
+        (0, util_1.ajvValidate)(templateConfigSchema, content);
+        return content;
+    }
+    catch (error) {
+        throw new Error(`Error while reading template file ${fileName}: ${error.message}`);
+    }
 }
-exports.readTemplateJson = readTemplateJson;
+exports.readAndValidateTemplateJson = readAndValidateTemplateJson;
 async function readTemplateFolder(subFolder) {
-    const templateFile = await readTemplateJson(path.join(subFolder, 'template.json'));
+    const templateFile = await readAndValidateTemplateJson(path.join(subFolder, 'template.json'));
     const extraFiles = await readExtraTemplateFolderFiles(subFolder);
     if ((0, utils_1.isV1Template)(templateFile)) {
         templateFile.fields = {

package/build/services/templates/util/utils.d.ts

@@ -1,5 +1,6 @@
+import type { TemplateV1Config } from './models';
 export declare function listFolderContent(path: string): Promise<string[]>;
 export declare function readJsonFile(path: string): Promise<any>;
 export declare function readTextFile(path: string): Promise<string>;
 export declare function removeFileNameExtension(fileName: string): string;
-export declare function isV1Template(template: any): boolean;
+export declare function isV1Template(template: any): template is TemplateV1Config;

package/build/services/templates/util/utils.js

@@ -21,6 +21,8 @@ function removeFileNameExtension(fileName) {
 }
 exports.removeFileNameExtension = removeFileNameExtension;
 function isV1Template(template) {
-    return !!template.schema || !!template.fields;
+    return (template.version === 1 ||
+        !!template.schema ||
+        !!template.fields);
 }
 exports.isV1Template = isV1Template;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-147-8845ed1",
+  "version": "1.12.0-dev-149-5031bb3",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",
@@ -41,7 +41,7 @@
     "typescript": "4.5.5"
   },
   "dependencies": {
-    "@extrahorizon/javascript-sdk": "8.9.0-dev-139-729209a",
+    "@extrahorizon/javascript-sdk": "8.9.0-dev-141-b21be6e",
     "ajv": "^8.11.0",
     "archiver": "^7.0.1",
     "chalk": "^4.0.0",