@extrahorizon/exh-cli 1.12.0-dev-137-56e1ad4 → 1.12.0-dev-138-3fed4c5

package/build/commands/templates/sync.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="yargs" />
-import { TemplateService } from './util/templateService';
 export declare const command = "sync";
 export declare const desc = "Sync all templates in a directory with the ExH cloud";
 export declare const builder: (yargs: any) => import("yargs").Argv<import("yargs").Omit<{}, "template" | "path"> & import("yargs").InferredOptionTypes<{
@@ -15,7 +14,7 @@ export declare const builder: (yargs: any) => import("yargs").Argv<import("yargs
     };
 }>>;
 export declare const handler: ({ path, template }: {
-    path: any;
-    template: any;
+    path?: string;
+    template?: string;
 }) => Promise<void>;
-export declare function syncTargetDir(service: TemplateService, targetDir: string): Promise<void>;
+export declare function syncTargetDir(targetDir: string): Promise<void>;

package/build/commands/templates/sync.js

@@ -6,7 +6,6 @@ const ospath = require("path");
 const util_1 = require("../../helpers/util");
 const buildTemplates_1 = require("./util/buildTemplates");
 const readTemplateFiles_1 = require("./util/readTemplateFiles");
-const templateService_1 = require("./util/templateService");
 const uploadTemplate_1 = require("./util/uploadTemplate");
 const utils_1 = require("./util/utils");
 exports.command = 'sync';
@@ -36,30 +35,29 @@ const builder = (yargs) => (0, util_1.epilogue)(yargs).options({
 });
 exports.builder = builder;
 const handler = async ({ path, template }) => {
-    const service = new templateService_1.TemplateService();
     if (path) {
-        await syncTargetDir(service, ospath.resolve(path || '.'));
+        await syncTargetDir(ospath.resolve(path));
         return;
     }
     let templ = null;
-    const templateName = (0, utils_1.removeFileNameExtension)(ospath.basename(template));
     if (fs.statSync(ospath.join(process.cwd(), template)).isFile()) {
         templ = await (0, readTemplateFiles_1.readTemplateJson)(template);
     }
     else {
         templ = await (0, readTemplateFiles_1.readTemplateFolder)(template);
     }
-    await buildAndUploadTemplates(service, { [templateName]: templ });
+    const templateName = (0, utils_1.removeFileNameExtension)(ospath.basename(template));
+    await buildAndUploadTemplates({ [templateName]: templ });
 };
 exports.handler = handler;
-async function buildAndUploadTemplates(service, templateObject) {
-    const templates = await (0, buildTemplates_1.buildTemplates)(service, templateObject);
+async function buildAndUploadTemplates(templateObject) {
+    const templates = await (0, buildTemplates_1.buildTemplates)(templateObject);
     for (const template of templates) {
-        await (0, uploadTemplate_1.uploadTemplate)(service, template);
+        await (0, uploadTemplate_1.uploadTemplate)(template);
     }
 }
-async function syncTargetDir(service, targetDir) {
+async function syncTargetDir(targetDir) {
     const templateFilesByName = await (0, readTemplateFiles_1.readTemplateFiles)(targetDir);
-    await buildAndUploadTemplates(service, templateFilesByName);
+    await buildAndUploadTemplates(templateFilesByName);
 }
 exports.syncTargetDir = syncTargetDir;

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

@@ -1,2 +1 @@
-import { TemplateService } from './templateService';
-export declare function buildTemplates(service: TemplateService, templateFilesByName: any): Promise<any[]>;
+export declare function buildTemplates(templateFilesByName: any): Promise<any[]>;

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

@@ -1,21 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildTemplates = void 0;
-async function buildTemplates(service, templateFilesByName) {
+const templateRepository = require("../../../repositories/templates");
+async function buildTemplates(templateFilesByName) {
     const templates = [];
     for (const name of Object.keys(templateFilesByName)) {
-        templates.push(await buildTemplate(service, name, templateFilesByName));
+        templates.push(await buildTemplate(name, templateFilesByName));
     }
     return templates;
 }
 exports.buildTemplates = buildTemplates;
-async function buildTemplate(service, name, templateFilesByName, callChain = []) {
+async function buildTemplate(name, templateFilesByName, callChain = []) {
     if (callChain.includes(name)) {
         throw new Error(`Circular extension detected. ${[...callChain, name].reverse().map((n) => `'${n}'`).join(' > ')}`);
     }
     let templateFile = templateFilesByName[name];
     if (templateFile === undefined) {
-        templateFile = await service.byName(name);
+        templateFile = await templateRepository.findByName(name);
         if (!templateFile) {
             throw new Error(`Template file dependency ${name} not found!`);
         }
@@ -23,7 +24,7 @@ async function buildTemplate(service, name, templateFilesByName, callChain = [])
     const { description, extends_template, schema } = templateFile;
     let { fields } = templateFile;
     if (extends_template) {
-        const extendingTemplate = await buildTemplate(service, extends_template, templateFilesByName, [...callChain, name]);
+        const extendingTemplate = await buildTemplate(extends_template, templateFilesByName, [...callChain, name]);
         const match = (_fullMatch, variableName) => {
             const value = fields[variableName];
             if (typeof value === 'undefined') {

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

@@ -1,2 +1 @@
-import { TemplateService } from './templateService';
-export declare function uploadTemplate(service: TemplateService, template: any): Promise<void>;
+export declare function uploadTemplate(template: any): Promise<void>;

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadTemplate = void 0;
-async function uploadTemplate(service, template) {
-    const existingTemplate = await service.byName(template.name);
+const templateRepository = require("../../../repositories/templates");
+async function uploadTemplate(template) {
+    const existingTemplate = await templateRepository.findByName(template.name);
     try {
         if (!existingTemplate) {
             console.log(`Creating new template '${template.name}'`);
-            await service.create(template);
+            await templateRepository.create(template);
         }
         else {
             console.log(`Updating existing template '${template.name}'`);
-            await service.update(existingTemplate.id, template);
+            await templateRepository.update(existingTemplate.id, template);
         }
     }
     catch (err) {

package/build/repositories/templates.d.ts

@@ -1,4 +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 remove(id: string): Promise<import("@extrahorizon/javascript-sdk").AffectedRecords>;

package/build/repositories/templates.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remove = exports.findAll = exports.findById = exports.findByName = void 0;
+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)().templates.findByName(name);
@@ -14,6 +14,14 @@ async function findAll() {
     return await (0, exh_1.getSdk)().templates.findAll();
 }
 exports.findAll = findAll;
+async function create(data) {
+    return await (0, exh_1.getSdk)().templates.create(data);
+}
+exports.create = create;
+async function update(id, data) {
+    return await (0, exh_1.getSdk)().templates.update(id, data);
+}
+exports.update = update;
 async function remove(id) {
     return await (0, exh_1.getSdk)().templates.remove(id);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extrahorizon/exh-cli",
-  "version": "1.12.0-dev-137-56e1ad4",
+  "version": "1.12.0-dev-138-3fed4c5",
   "main": "build/index.js",
   "exports": "./build/index.js",
   "license": "MIT",

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

@@ -1,7 +0,0 @@
-export declare class TemplateService {
-    private sdk;
-    constructor();
-    byName(name: string): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
-    update(name: string, data: any): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
-    create(data: any): Promise<import("@extrahorizon/javascript-sdk").TemplateOut>;
-}

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

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TemplateService = void 0;
-const exh_1 = require("../../../exh");
-class TemplateService {
-    constructor() {
-        this.sdk = (0, exh_1.getSdk)();
-    }
-    async byName(name) {
-        return this.sdk.templates.findByName(name);
-    }
-    async update(name, data) {
-        return this.sdk.templates.update(name, data);
-    }
-    async create(data) {
-        return this.sdk.templates.create(data);
-    }
-}
-exports.TemplateService = TemplateService;