@extrahorizon/exh-cli 1.12.0-dev-148-901fb95 → 1.12.0-dev-150-a93c690

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

@@ -37,7 +37,7 @@
                 "$schema": { "type": "string" },
                 "description": { "type": "string" },
                 "extendsTemplate": { "type": "string" },
-                "properties": {
+                "inputs": {
                     "type": "object",
                     "additionalProperties": { "$ref": "#/definitions/TypeConfigurationV2" }
                 },

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/util/buildTemplates.js

@@ -59,7 +59,7 @@ async function extendV1Template(name, templateFilesByName, callChain) {
     };
 }
 async function extendV2Template(name, templateFilesByName, callChain) {
-    const { extendsTemplate, description, properties, outputs } = templateFilesByName[name];
+    const { extendsTemplate, description, inputs, outputs } = templateFilesByName[name];
     if (!templateFilesByName[extendsTemplate]) {
         templateFilesByName[extendsTemplate] = await templateV2Repository.findByName(extendsTemplate);
     }
@@ -77,13 +77,13 @@ async function extendV2Template(name, templateFilesByName, callChain) {
     const newOutputs = {};
     for (const output of Object.keys(extendingTemplate.outputs)) {
         const extendedValue = extendingTemplate.outputs[output]
-            .replace(/{{[ ]*@data\.([a-zA-Z0-9_-]+)[ ]*}}/g, resolveMatch);
+            .replace(/{{[ ]*@inputs\.([a-zA-Z0-9_-]+)[ ]*}}/g, resolveMatch);
         newOutputs[output] = extendedValue;
     }
     return {
         name,
         description,
-        properties,
+        inputs,
         outputs: newOutputs,
     };
 }
@@ -101,7 +101,7 @@ function v2ExtendingV1Error(extendsTemplate, callChain) {
         `In ${renderCallChain(callChain)}`);
 }
 function v2VariableNotFoundError(variableName, extendsTemplate, callChain) {
-    return new Error(`Could not find a value to fill '{{@data.${variableName}}}' ` +
+    return new Error(`Could not find a value to fill '{{@inputs.${variableName}}}' ` +
         `while extending '${extendsTemplate}' ` +
         `in ${renderCallChain(callChain)}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-148-901fb95",
+  "version": "1.12.0-dev-150-a93c690",
   "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-144-fe86b3e",
     "ajv": "^8.11.0",
     "archiver": "^7.0.1",
     "chalk": "^4.0.0",