@aloma.io/integration-sdk 3.7.1 → 3.7.3

package/build/builder/index.d.mts

@@ -1,4 +1,5 @@
 import RuntimeContext from "./runtime-context.mjs";
+export declare const TARGET_DIR: string;
 export declare class Builder {
     private data;
     config(arg: any): Builder;
@@ -6,6 +7,5 @@ export declare class Builder {
     auth(arg: any): Builder;
     build(): Promise<RuntimeContext>;
     private checkIcon;
-    private parsePackageJson;
-    private loadTypes;
+    private loadDescriptor;
 }

package/build/builder/index.mjs

@@ -3,8 +3,9 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { notEmpty } from "../internal/util/index.mjs";
 import RuntimeContext from "./runtime-context.mjs";
-const offset = '/../../../../../';
+const DIR_OFFSET = '/../../../../../';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
+export const TARGET_DIR = `${__dirname}${DIR_OFFSET}`;
 export class Builder {
     data = {
         controller: "./build/.controller.json",
@@ -22,31 +23,24 @@ export class Builder {
         return this;
     }
     async build() {
-        await this.parsePackageJson();
-        await this.loadTypes();
+        await this.loadDescriptor();
         await this.checkIcon();
         // @ts-ignore
-        const Controller = (await import(__dirname + offset + "build/controller/index.mjs")).default;
+        const Controller = (await import(TARGET_DIR + "build/controller/index.mjs")).default;
         return new RuntimeContext(new Controller(), this.data);
     }
     async checkIcon() {
         const data = this.data;
-        const root = __dirname + offset;
+        const root = TARGET_DIR;
         data.icon = `${root}/logo.png`;
     }
-    async parsePackageJson() {
-        const data = this.data;
-        const packageJson = JSON.parse(fs.readFileSync(__dirname + offset + "package.json", {
-            encoding: "utf-8",
-        }));
-        notEmpty((data.id = packageJson.connectorId), "id");
-        notEmpty((data.version = packageJson.version), "version");
-    }
-    async loadTypes() {
+    async loadDescriptor() {
         notEmpty(this.data.controller, "controller");
         const content = fs.readFileSync(this.data.controller, { encoding: 'utf-8' });
-        const { text, methods } = JSON.parse(content);
+        const { text, methods, connectorId, version } = JSON.parse(content);
         this.data.types = text;
         this.data.methods = methods;
+        notEmpty((this.data.id = connectorId), "id");
+        notEmpty((this.data.version = version), "version");
     }
 }

package/build/cli.mjs

@@ -5,6 +5,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import util from "node:util";
+import { TARGET_DIR } from "./builder/index.mjs";
 import { notEmpty } from "./internal/util/index.mjs";
 import JWE from "./internal/util/jwe/index.mjs";
 import parseTypes from "./transform/index.mjs";
@@ -89,7 +90,7 @@ program
     .command("build")
     .description("Build the current connector project")
     .action(async (str, options) => {
-    const { stdout, stderr } = await exec(`rm -rf build; mkdir -p build`);
+    const { stdout, stderr } = await exec(`rm -rf build; mkdir -p build; [ -e ./logo.png ] && cp -f ./logo.png ./build/ `);
     if (stdout)
         console.log(stdout);
     new Extractor().extract('./src/controller/index.mts', './build/.controller.json');
@@ -99,7 +100,10 @@ class Extractor {
         notEmpty(source, "source");
         fs.readFileSync(source);
         const { text, methods } = await parseTypes(source);
-        fs.writeFileSync(target, JSON.stringify({ text, methods }), { encoding: 'utf-8' });
+        const packageJson = JSON.parse(fs.readFileSync(TARGET_DIR + "package.json", {
+            encoding: "utf-8",
+        }));
+        fs.writeFileSync(target, JSON.stringify({ text, methods, connectorId: packageJson.connectorId, version: packageJson.version }), { encoding: 'utf-8' });
     }
 }
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloma.io/integration-sdk",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "",
   "author": "aloma.io",
   "license": "Apache-2.0",

package/src/builder/index.mts

@@ -4,10 +4,12 @@ import { fileURLToPath } from "node:url";
 import { notEmpty } from "../internal/util/index.mjs";
 import RuntimeContext from "./runtime-context.mjs";
 
-const offset = '/../../../../../'; 
+const DIR_OFFSET = '/../../../../../'; 
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+export const TARGET_DIR = `${__dirname}${DIR_OFFSET}`;
+
 export class Builder {
   private data: any = {
     controller: "./build/.controller.json",
@@ -31,13 +33,12 @@ export class Builder {
   }
 
   async build(): Promise<RuntimeContext> {
-    await this.parsePackageJson();
-    await this.loadTypes();
+    await this.loadDescriptor();
     await this.checkIcon();
 
     // @ts-ignore
     const Controller = (
-      await import(__dirname + offset + "build/controller/index.mjs")
+      await import(TARGET_DIR + "build/controller/index.mjs")
     ).default;
 
     return new RuntimeContext(new Controller(), this.data);
@@ -45,31 +46,21 @@ export class Builder {
 
   private async checkIcon() {
     const data = this.data;
-    const root = __dirname + offset;
+    const root = TARGET_DIR;
 
     data.icon = `${root}/logo.png`;
   }
 
-  private async parsePackageJson() {
-    const data = this.data;
-
-    const packageJson = JSON.parse(
-      fs.readFileSync(__dirname + offset + "package.json", {
-        encoding: "utf-8",
-      }),
-    );
-
-    notEmpty((data.id = packageJson.connectorId), "id");
-    notEmpty((data.version = packageJson.version), "version");
-  }
-
-  private async loadTypes() {
+  private async loadDescriptor() {
     notEmpty(this.data.controller, "controller");
 
     const content = fs.readFileSync(this.data.controller, {encoding: 'utf-8'});
-    const {text, methods} = JSON.parse(content);
+    const {text, methods, connectorId, version} = JSON.parse(content);
 
     this.data.types = text;
     this.data.methods = methods;
+
+    notEmpty((this.data.id = connectorId), "id");
+    notEmpty((this.data.version = version), "version");
   }
-}
+}

package/src/cli.mts

@@ -6,6 +6,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import util from "node:util";
+import { TARGET_DIR } from "./builder/index.mjs";
 import { notEmpty } from "./internal/util/index.mjs";
 import JWE from "./internal/util/jwe/index.mjs";
 import parseTypes from "./transform/index.mjs";
@@ -120,7 +121,7 @@ program
   .description("Build the current connector project")
   .action(async (str, options) => {
     const { stdout, stderr } = await exec(
-      `rm -rf build; mkdir -p build`,
+      `rm -rf build; mkdir -p build; [ -e ./logo.png ] && cp -f ./logo.png ./build/ `,
     );
 
     if (stdout) console.log(stdout);
@@ -135,7 +136,13 @@ class Extractor {
     fs.readFileSync(source);
     const { text, methods } = await parseTypes(source);
 
-    fs.writeFileSync(target, JSON.stringify({text, methods}), {encoding: 'utf-8'})
+    const packageJson = JSON.parse(
+      fs.readFileSync(TARGET_DIR + "package.json", {
+        encoding: "utf-8",
+      }),
+    );
+
+    fs.writeFileSync(target, JSON.stringify({text, methods, connectorId: packageJson.connectorId, version: packageJson.version}), {encoding: 'utf-8'})
   }
 }