@onivoro/onix 20.0.44 → 20.0.46

package/executors.json

@@ -25,10 +25,10 @@
       "schema": "./src/executors/deploy-ecs/schema.json",
       "description": "deploy-ecs"
     },
-    "gen-axios": {
-      "implementation": "./src/executors/gen/executor",
-      "schema": "./src/executors/gen/schema.json",
-      "description": "gen-axios"
+    "openapi-gen": {
+      "implementation": "./src/executors/openapi-gen/executor",
+      "schema": "./src/executors/openapi-gen/schema.json",
+      "description": "openapi-gen"
     },
     "local": {
       "implementation": "./src/executors/local/executor",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onivoro/onix",
-  "version": "20.0.44",
+  "version": "20.0.46",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/executors/docker/executor.d.ts

@@ -1,4 +1,3 @@
-import { PromiseExecutor } from '@nx/devkit';
 import { ExecutorSchema } from './schema';
-declare const executor: PromiseExecutor<ExecutorSchema>;
-export default executor;
+declare const _default: import("@nx/devkit").PromiseExecutor<ExecutorSchema>;
+export default _default;

package/src/executors/docker/executor.js

@@ -3,22 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
-const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const { envPath, ecr, port } = options;
+const executor_factory_function_1 = require("../../functions/executor-factory.function");
+exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const { envFile, ecr, port } = options;
     const localPort = (Number(port) + 2000);
-    try {
-        const command = `open http://localhost:${localPort} & docker run -p ${localPort}:${port} --env="PORT=${port}" --env-file "${envPath}" "${ecr}"`;
-        devkit_1.logger.info(command);
-        (0, child_process_1.execSync)(command);
-        return {
-            success: true,
-        };
-    }
-    catch (error) {
-        return {
-            success: false,
-        };
-    }
-});
-exports.default = executor;
+    const command = `open http://localhost:${localPort} & docker run -p ${localPort}:${port} --env="PORT=${port}" --env-file "${envFile}" "${ecr}"`;
+    devkit_1.logger.info(command);
+    (0, child_process_1.execSync)(command);
+}));
 //# sourceMappingURL=executor.js.map

package/src/executors/docker/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/docker/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,iDAAsD;AAEtD,MAAM,QAAQ,GAAoC,CAChD,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,yBAAyB,SAAS,oBAAoB,SAAS,IAAI,IAAI,gBAAgB,IAAI,iBAAiB,OAAO,MAAM,GAAG,GAAG,CAAC;QAEhJ,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErB,IAAA,wBAAQ,EAAC,OAAO,CAAC,CAAC;QAElB,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/docker/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AAErD,iDAAyC;AACzC,yFAA4E;AAE5E,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAExC,MAAM,OAAO,GAAG,yBAAyB,SAAS,oBAAoB,SAAS,IAAI,IAAI,gBAAgB,IAAI,iBAAiB,OAAO,MAAM,GAAG,GAAG,CAAC;IAEhJ,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAErB,IAAA,wBAAQ,EAAC,OAAO,CAAC,CAAC;AACpB,CAAC,CAAA,CAAC,CAAC"}

package/src/executors/docker/schema.d.ts

@@ -1,5 +1,6 @@
 export interface ExecutorSchema {
-    envPath: string;
+    envFile: string;
     ecr: string;
+    localPort?: number;
     port: number;
 }

package/src/executors/docker/schema.json

@@ -1,11 +1,11 @@
 {
   "$schema": "https://json-schema.org/schema",
   "version": 2,
-  "title": "Db executor",
+  "title": "Docker executor",
   "description": "",
   "type": "object",
   "properties": {
-    "envPath": {
+    "envFile": {
       "type": "string",
       "description": "Path and name of the .env file to load"
     },
@@ -13,12 +13,16 @@
       "type": "string",
       "description": "Name of the ECR repository and tag (conventionally separated by a colon)"
     },
+    "localPort": {
+      "type": "number",
+      "description": "Local port to bind to localhost"
+    },
     "port": {
-      "type": "string",
+      "type": "number",
       "description": "Port docker port to bind to localhost"
     }
   },
   "required": [
-    "envPath", "ecr", "port"
+    "envFile", "ecr", "port"
   ]
 }

package/src/executors/openapi-gen/executor.d.ts

@@ -0,0 +1,3 @@
+import { ExecutorSchema } from './schema';
+declare const _default: import("@nx/devkit").PromiseExecutor<ExecutorSchema>;
+export default _default;

package/src/executors/openapi-gen/executor.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const executor_factory_function_1 = require("../../functions/executor-factory.function");
+exports.default = (0, executor_factory_function_1.executorFactory)((_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ flavor = 'typescript-axios', openapiJsonPath, outputPath }) {
+    (0, child_process_1.execSync)(`rm -rf ${outputPath}`, { stdio: 'inherit' });
+    (0, child_process_1.execSync)(`mkdir -p ${outputPath}`, { stdio: 'inherit' });
+    (0, child_process_1.execSync)(`docker run --rm -v .:/local openapitools/openapi-generator-cli:v6.3.0 generate -i local/${openapiJsonPath} -g ${flavor} -o local/${outputPath}`, { stdio: 'inherit' });
+}));
+//# sourceMappingURL=executor.js.map

package/src/executors/openapi-gen/executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/openapi-gen/executor.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,yFAA4E;AAG5E,kBAAe,IAAA,2CAAe,EAAC,KAAqF,EAAE,oDAAhF,EAAE,MAAM,GAAG,kBAAkB,EAAE,eAAe,EAAE,UAAU,EAAkB;IAChH,IAAA,wBAAQ,EAAC,UAAU,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,IAAA,wBAAQ,EAAC,YAAY,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACzD,IAAA,wBAAQ,EAAC,2FAA2F,eAAe,OAAO,MAAM,aAAa,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACnL,CAAC,CAAA,CAAC,CAAC"}

package/src/executors/openapi-gen/schema.d.ts

@@ -0,0 +1,5 @@
+export interface ExecutorSchema {
+    flavor?: string;
+    openapiJsonPath: string;
+    outputPath: string;
+}

package/src/executors/openapi-gen/schema.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Openapi-gen executor",
+  "description": "",
+  "type": "object",
+  "properties": {
+    "flavor": {
+      "type": "string",
+      "description": "Lowercase identifier corresponding to one of the predefined openapi generator target formats. Defaults to 'typescript-axios'."
+    },
+    "openapiJsonPath": {
+      "type": "string",
+      "description": "Path to the openapi definition JSON file (or yml file)."
+    },
+    "outputPath": {
+      "type": "string",
+      "description": "Path where the output of the openapi will be written."
+    }
+  },
+  "required": [
+    "openapiJsonPath",
+    "outputPath"
+  ]
+}

package/src/executors/gen/executor.d.ts

@@ -1,4 +0,0 @@
-import { PromiseExecutor } from '@nx/devkit';
-import { ExecutorSchema } from './schema';
-declare const runExecutor: PromiseExecutor<ExecutorSchema>;
-export default runExecutor;

package/src/executors/gen/executor.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const child_process_1 = require("child_process");
-const runExecutor = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ moniker }) {
-    try {
-        (0, child_process_1.execSync)(`rm -rf libs/axios/${moniker}/src/lib`, { stdio: 'inherit' });
-        (0, child_process_1.execSync)(`mkdir -p libs/axios/${moniker}`, { stdio: 'inherit' });
-        (0, child_process_1.execSync)(`docker run --rm -v .:/local openapitools/openapi-generator-cli:v6.3.0 generate -i local/api-dox/app-api-${moniker}.json -g typescript-axios -o local/libs/axios/${moniker}/src/lib`, { stdio: 'inherit' });
-        return {
-            success: true,
-        };
-    }
-    catch (error) {
-        return { success: false };
-    }
-});
-exports.default = runExecutor;
-//# sourceMappingURL=executor.js.map

package/src/executors/gen/executor.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/gen/executor.ts"],"names":[],"mappings":";;;AAEA,iDAAyC;AAEzC,MAAM,WAAW,GAAoC,KAAoB,EAAE,oDAAf,EAAE,OAAO,EAAE;IACrE,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,qBAAqB,OAAO,UAAU,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACvE,IAAA,wBAAQ,EAAC,uBAAuB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACjE,IAAA,wBAAQ,EAAC,2GAA2G,OAAO,iDAAiD,OAAO,UAAU,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAErN,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,kBAAe,WAAW,CAAC"}

package/src/executors/gen/schema.d.ts

@@ -1,3 +0,0 @@
-export interface ExecutorSchema {
-    moniker: string;
-}

package/src/executors/gen/schema.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://json-schema.org/schema",
-  "version": 2,
-  "title": "Gen executor",
-  "description": "",
-  "type": "object",
-  "properties": {
-    "moniker": {
-      "type": "string",
-      "description": "Lowercase single-word identifier used to consistently distinguish related projects and libraries"
-    }
-  },
-  "required": []
-}