@extrahorizon/exh-cli 1.12.0-dev-139-711ee70 → 1.12.0-dev-141-b72e89f

package/build/commands/templates/util/buildTemplates.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildTemplates = void 0;
 const templateRepository = require("../../../repositories/templates");
+const templateV2Repository = require("../../../repositories/templatesV2");
+const utils_1 = require("./utils");
 async function buildTemplates(templateFilesByName) {
     const templates = [];
     for (const name of Object.keys(templateFilesByName)) {
@@ -11,41 +13,98 @@ async function buildTemplates(templateFilesByName) {
 }
 exports.buildTemplates = buildTemplates;
 async function buildTemplate(name, templateFilesByName, callChain = []) {
+    const newCallChain = [...callChain, name];
     if (callChain.includes(name)) {
-        throw new Error(`Circular extension detected. ${[...callChain, name].reverse().map((n) => `'${n}'`).join(' > ')}`);
+        throw new Error(`Circular extension detected. ${renderCallChain(newCallChain)}`);
     }
-    let templateFile = templateFilesByName[name];
-    if (templateFile === undefined) {
-        templateFile = await templateRepository.findByName(name);
-        if (!templateFile) {
-            throw new Error(`Template file dependency ${name} not found!`);
-        }
+    const templateFile = templateFilesByName[name];
+    if (!templateFile) {
+        throw new Error(`Template file dependency ${name} not found!`);
+    }
+    if (templateFile.extends_template) {
+        return await extendV1Template(name, templateFilesByName, newCallChain);
+    }
+    if (templateFile.extendsTemplate) {
+        return await extendV2Template(name, templateFilesByName, newCallChain);
+    }
+    return { ...templateFile, name };
+}
+async function extendV1Template(name, templateFilesByName, callChain) {
+    const { extends_template, description, schema, fields } = templateFilesByName[name];
+    if (!templateFilesByName[extends_template]) {
+        templateFilesByName[extends_template] = await templateRepository.findByName(extends_template);
+    }
+    const extendingTemplate = await buildTemplate(extends_template, templateFilesByName, callChain);
+    if (!(0, utils_1.isV1Template)(extendingTemplate)) {
+        throw v1ExtendingV2Error(extends_template, callChain);
     }
-    const { description, extends_template, schema } = templateFile;
-    let { fields } = templateFile;
-    if (extends_template) {
-        const extendingTemplate = await buildTemplate(extends_template, templateFilesByName, [...callChain, name]);
-        const match = (_fullMatch, variableName) => {
-            const value = fields[variableName];
-            if (typeof value === 'undefined') {
-                throw new Error(`Could not find a value to fill '$content.${variableName}' ` +
-                    `while extending '${extends_template}' ` +
-                    `in ${[...callChain, name].reverse().map(n => `'${n}'`).join(' > ')}`);
-            }
-            return value;
-        };
-        const extendedFields = {};
-        for (const extendingField of Object.keys(extendingTemplate.fields)) {
-            const extendedValue = extendingTemplate.fields[extendingField]
-                .replace(/\$content\.([a-z0-9_-]+)/ig, match);
-            extendedFields[extendingField] = extendedValue;
+    const resolveMatch = (_fullMatch, variableName) => {
+        const value = fields[variableName];
+        if (typeof value === 'undefined') {
+            throw v1VariableNotFoundError(variableName, extends_template, callChain);
         }
-        fields = extendedFields;
+        return value;
+    };
+    const extendedFields = {};
+    for (const extendingField of Object.keys(extendingTemplate.fields)) {
+        const extendedValue = extendingTemplate.fields[extendingField]
+            .replace(/\$content\.([a-z0-9_-]+)/ig, resolveMatch);
+        extendedFields[extendingField] = extendedValue;
     }
     return {
         name,
         description,
         schema,
-        fields,
+        fields: extendedFields,
+    };
+}
+async function extendV2Template(name, templateFilesByName, callChain) {
+    const { extendsTemplate, description, properties, outputs } = templateFilesByName[name];
+    if (!templateFilesByName[extendsTemplate]) {
+        templateFilesByName[extendsTemplate] = await templateV2Repository.findByName(extendsTemplate);
+    }
+    const extendingTemplate = await buildTemplate(extendsTemplate, templateFilesByName, callChain);
+    if ((0, utils_1.isV1Template)(extendingTemplate)) {
+        throw v2ExtendingV1Error(extendsTemplate, callChain);
+    }
+    const resolveMatch = (_fullMatch, variableName) => {
+        const value = outputs[variableName];
+        if (typeof value === 'undefined') {
+            throw v2VariableNotFoundError(variableName, extendsTemplate, callChain);
+        }
+        return value;
+    };
+    const newOutputs = {};
+    for (const output of Object.keys(extendingTemplate.outputs)) {
+        const extendedValue = extendingTemplate.outputs[output]
+            .replace(/{{[ ]*@data\.([a-zA-Z0-9_-]+)[ ]*}}/g, resolveMatch);
+        newOutputs[output] = extendedValue;
+    }
+    return {
+        name,
+        description,
+        properties,
+        outputs: newOutputs,
     };
 }
+function v1ExtendingV2Error(extendsTemplate, callChain) {
+    return new Error(`You cannot extend a v2 template ('${extendsTemplate}') in a v1 template!` +
+        `In ${renderCallChain(callChain)}`);
+}
+function v1VariableNotFoundError(variableName, extendsTemplate, callChain) {
+    return new Error(`Could not find a value to fill '$content.${variableName}' ` +
+        `while extending '${extendsTemplate}' ` +
+        `in ${renderCallChain(callChain)}`);
+}
+function v2ExtendingV1Error(extendsTemplate, callChain) {
+    return new Error(`You cannot extend a v1 template ('${extendsTemplate}') in a v2 template!` +
+        `In ${renderCallChain(callChain)}`);
+}
+function v2VariableNotFoundError(variableName, extendsTemplate, callChain) {
+    return new Error(`Could not find a value to fill '{{@data.${variableName}}}' ` +
+        `while extending '${extendsTemplate}' ` +
+        `in ${renderCallChain(callChain)}`);
+}
+function renderCallChain(callChain) {
+    return callChain.reverse().map(part => `'${part}'`).join(' > ');
+}

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

@@ -26,27 +26,32 @@ async function readTemplateJson(fileName) {
 exports.readTemplateJson = readTemplateJson;
 async function readTemplateFolder(subFolder) {
     const templateFile = await readTemplateJson(path.join(subFolder, 'template.json'));
-    const templateFields = await readTemplateFolderFieldFiles(subFolder);
-    if (!templateFile.fields) {
-        templateFile.fields = templateFields;
-    }
-    else {
+    const extraFiles = await readExtraTemplateFolderFiles(subFolder);
+    if ((0, utils_1.isV1Template)(templateFile)) {
         templateFile.fields = {
             ...templateFile.fields,
-            ...templateFields,
+            ...extraFiles,
+        };
+    }
+    else {
+        templateFile.outputs = {
+            ...templateFile.outputs,
+            ...extraFiles,
         };
     }
     return templateFile;
 }
 exports.readTemplateFolder = readTemplateFolder;
-async function readTemplateFolderFieldFiles(subFolder) {
-    const templateFields = {};
-    const folderFileNames = await (0, utils_1.listFolderContent)(subFolder);
-    const fieldFileNames = folderFileNames.filter((fileName) => fileName !== 'template.json');
-    for (const fieldFileName of fieldFileNames) {
-        const fieldName = (0, utils_1.removeFileNameExtension)(fieldFileName);
-        const fieldContent = await (0, utils_1.readTextFile)(path.join(subFolder, fieldFileName));
-        templateFields[fieldName] = fieldContent;
+async function readExtraTemplateFolderFiles(subFolder) {
+    const extraFiles = {};
+    const fileNames = await (0, utils_1.listFolderContent)(subFolder);
+    for (const fileName of fileNames) {
+        if (fileName === 'template.json') {
+            continue;
+        }
+        const name = (0, utils_1.removeFileNameExtension)(fileName);
+        const content = await (0, utils_1.readTextFile)(path.join(subFolder, fileName));
+        extraFiles[name] = content;
     }
-    return templateFields;
+    return extraFiles;
 }

package/build/commands/templates/util/uploadTemplate.js

@@ -2,7 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadTemplate = void 0;
 const templateRepository = require("../../../repositories/templates");
+const templateV2Repository = require("../../../repositories/templatesV2");
+const utils_1 = require("./utils");
 async function uploadTemplate(template) {
+    if ((0, utils_1.isV1Template)(template)) {
+        await uploadV1Template(template);
+    }
+    else {
+        await uploadV2Template(template);
+    }
+}
+exports.uploadTemplate = uploadTemplate;
+async function uploadV1Template(template) {
     const existingTemplate = await templateRepository.findByName(template.name);
     try {
         if (!existingTemplate) {
@@ -18,4 +29,19 @@ async function uploadTemplate(template) {
         throw new Error(`Error creating or updating template: ${JSON.stringify(err.response)}`);
     }
 }
-exports.uploadTemplate = uploadTemplate;
+async function uploadV2Template(template) {
+    const existingTemplate = await templateV2Repository.findByName(template.name);
+    try {
+        if (!existingTemplate) {
+            console.log(`Creating new template '${template.name}'`);
+            await templateV2Repository.create(template);
+        }
+        else {
+            console.log(`Updating existing template '${template.name}'`);
+            await templateV2Repository.update(existingTemplate.id, template);
+        }
+    }
+    catch (err) {
+        throw new Error(`Error creating or updating template: ${JSON.stringify(err.response)}`);
+    }
+}

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

@@ -2,3 +2,4 @@ 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;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeFileNameExtension = exports.readTextFile = exports.readJsonFile = exports.listFolderContent = void 0;
+exports.isV1Template = exports.removeFileNameExtension = exports.readTextFile = exports.readJsonFile = exports.listFolderContent = void 0;
 const promises_1 = require("fs/promises");
 async function listFolderContent(path) {
     return await (0, promises_1.readdir)(path);
@@ -20,3 +20,7 @@ function removeFileNameExtension(fileName) {
     return fileName.split('.')[0];
 }
 exports.removeFileNameExtension = removeFileNameExtension;
+function isV1Template(template) {
+    return !!template.schema || !!template.fields;
+}
+exports.isV1Template = isV1Template;

package/build/repositories/templates.d.ts

@@ -1,7 +1,7 @@
 import type { TemplateIn } from '@extrahorizon/javascript-sdk';
-export declare function findByName(name: string): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
-export declare function findById(id: string): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
-export declare function findAll(): Promise<import("@extrahorizon/javascript-sdk").TemplateOut[]>;
-export declare function create(data: TemplateIn): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
-export declare function update(id: string, data: TemplateIn): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
+export declare function findByName(name: string): Promise<import("@extrahorizon/javascript-sdk").Template>;
+export declare function findById(id: string): Promise<import("@extrahorizon/javascript-sdk").Template>;
+export declare function findAll(): Promise<import("@extrahorizon/javascript-sdk").Template[]>;
+export declare function create(data: TemplateIn): Promise<import("@extrahorizon/javascript-sdk").Template>;
+export declare function update(id: string, data: TemplateIn): Promise<import("@extrahorizon/javascript-sdk").Template>;
 export declare function remove(id: string): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;

package/build/repositories/templatesV2.d.ts

@@ -0,0 +1,7 @@
+import type { TemplateV2Creation } from '@extrahorizon/javascript-sdk';
+export declare function findByName(name: string): Promise<import("@extrahorizon/javascript-sdk").TemplateV2>;
+export declare function findById(id: string): Promise<import("@extrahorizon/javascript-sdk").TemplateV2>;
+export declare function findAll(): Promise<import("@extrahorizon/javascript-sdk").TemplateV2[]>;
+export declare function create(data: TemplateV2Creation): Promise<import("@extrahorizon/javascript-sdk").TemplateV2>;
+export declare function update(id: string, data: Partial<TemplateV2Creation>): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;
+export declare function remove(id: string): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;

package/build/repositories/templatesV2.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remove = exports.update = exports.create = exports.findAll = exports.findById = exports.findByName = void 0;
+const exh_1 = require("../exh");
+async function findByName(name) {
+    return await (0, exh_1.getSdk)().templatesV2.findByName(name);
+}
+exports.findByName = findByName;
+async function findById(id) {
+    return await (0, exh_1.getSdk)().templatesV2.findById(id);
+}
+exports.findById = findById;
+async function findAll() {
+    return await (0, exh_1.getSdk)().templatesV2.findAll();
+}
+exports.findAll = findAll;
+async function create(data) {
+    return await (0, exh_1.getSdk)().templatesV2.create(data);
+}
+exports.create = create;
+async function update(id, data) {
+    return await (0, exh_1.getSdk)().templatesV2.update(id, data);
+}
+exports.update = update;
+async function remove(id) {
+    return await (0, exh_1.getSdk)().templatesV2.remove(id);
+}
+exports.remove = remove;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-139-711ee70",
+  "version": "1.12.0-dev-141-b72e89f",
   "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-138-3022f93",
+    "@extrahorizon/javascript-sdk": "8.9.0-dev-139-729209a",
     "ajv": "^8.11.0",
     "archiver": "^7.0.1",
     "chalk": "^4.0.0",