@onivoro/onix 20.0.42 → 20.0.44

package/package.json

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

package/src/executors/deploy-lambda/schema.d.ts

@@ -1,3 +1,3 @@
-import { DeployLambdaConfig } from "onix/src/functions/deploy-lambda.function";
+import { DeployLambdaConfig } from "../../functions/deploy-lambda.function";
 
 export interface ExecutorSchema extends Omit<DeployLambdaConfig, 'sourcePath'> { }

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

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

package/src/executors/local/executor.js

@@ -4,23 +4,14 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const load_env_file_function_1 = require("../../functions/load-env-file.function");
-const runExecutor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+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 { debugPort, envFile } = options;
-    try {
-        (0, load_env_file_function_1.loadEnvFile)(envFile);
-        const inspectStatement = debugPort ? `--port=${debugPort}` : '';
-        const command = `npx nx run ${context.projectName}:serve ${inspectStatement}`;
-        devkit_1.logger.debug(command);
-        (0, child_process_1.execSync)(command, { stdio: 'inherit' });
-        return {
-            success: true,
-        };
-    }
-    catch (error) {
-        return {
-            success: false,
-        };
-    }
-});
-exports.default = runExecutor;
+    (0, load_env_file_function_1.loadEnvFile)(envFile);
+    const inspectStatement = debugPort ? `--port=${debugPort}` : '';
+    const command = `npx nx run ${context.projectName}:serve ${inspectStatement}`;
+    devkit_1.logger.debug(command);
+    const [program, ...args] = command.split(' ');
+    (0, child_process_1.spawnSync)(program, args, { stdio: 'inherit' });
+}));
 //# sourceMappingURL=executor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/local/executor.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,iDAAyC;AAEzC,mFAAqE;AAErE,MAAM,WAAW,GAAoC,CACnD,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC;QACH,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;QAErB,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,OAAO,GAAG,cAAc,OAAO,CAAC,WAAW,UAAU,gBAAgB,EAAE,CAAC;QAC9E,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,IAAA,wBAAQ,EAAC,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAExC,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,CAAA;AAED,kBAAe,WAAW,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/local/executor.ts"],"names":[],"mappings":";;;AAAA,uCAGoB;AACpB,iDAA0C;AAE1C,mFAAqE;AACrE,yFAA4E;AAE5E,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;IAErB,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhE,MAAM,OAAO,GAAG,cAAc,OAAO,CAAC,WAAW,UAAU,gBAAgB,EAAE,CAAC;IAE9E,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEtB,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9C,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACjD,CAAC,CAAA,CAAC,CAAC"}

package/src/functions/executor-factory.function.d.ts

@@ -0,0 +1,5 @@
+import { ExecutorContext, PromiseExecutor } from "@nx/devkit";
+export type TOnixPromiseExecutor<TExecutorSchema = any> = (options: TExecutorSchema, context: ExecutorContext) => Promise<void | {
+    success: boolean;
+}>;
+export declare function executorFactory<TExecutorSchema>(executor: TOnixPromiseExecutor<TExecutorSchema>): PromiseExecutor<TExecutorSchema>;

package/src/functions/executor-factory.function.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executorFactory = executorFactory;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+function executorFactory(executor) {
+    const runExecutor = (options, context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            return (yield executor(options, context)) || { success: true };
+        }
+        catch (error) {
+            devkit_1.logger.error((error === null || error === void 0 ? void 0 : error.message) || error);
+            return {
+                success: false,
+            };
+        }
+    });
+    return runExecutor;
+}
+//# sourceMappingURL=executor-factory.function.js.map

package/src/functions/executor-factory.function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor-factory.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/executor-factory.function.ts"],"names":[],"mappings":";;AAOA,0CAkBC;;AAzBD,uCAAsE;AAOtE,SAAgB,eAAe,CAAkB,QAA+C;IAE5F,MAAM,WAAW,GAAqC,CAClD,OAAwB,EACxB,OAAwB,EAC1B,EAAE;QACA,IAAI,CAAC;YACD,OAAO,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,eAAM,CAAC,KAAK,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,KAAK,CAAC,CAAC;YAEtC,OAAO;gBACH,OAAO,EAAE,KAAK;aACjB,CAAC;QACN,CAAC;IACL,CAAC,CAAA,CAAA;IAED,OAAO,WAAW,CAAC;AACvB,CAAC"}

package/src/functions/load-env-file.function.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadEnvFile = loadEnvFile;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
+const process_1 = require("process");
 function loadEnvFile(envFile) {
     if (envFile) {
         if ((0, fs_1.existsSync)(envFile)) {
-            loadEnvFile(envFile);
+            (0, process_1.loadEnvFile)(envFile);
         }
         else {
             devkit_1.logger.warn(`specified environment path "${envFile}" does not exist`);

package/src/functions/load-env-file.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-env-file.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/load-env-file.function.ts"],"names":[],"mappings":";;AAGA,kCAQC;AAXD,uCAAoC;AACpC,2BAAgC;AAEhC,SAAgB,WAAW,CAAC,OAAe;IACvC,IAAI,OAAO,EAAE,CAAC;QACV,IAAG,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACrB,WAAW,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,eAAM,CAAC,IAAI,CAAC,+BAA+B,OAAO,kBAAkB,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;AACL,CAAC"}
+{"version":3,"file":"load-env-file.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/load-env-file.function.ts"],"names":[],"mappings":";;AAIA,kCAQC;AAZD,uCAAoC;AACpC,2BAAgC;AAChC,qCAAyD;AAEzD,SAAgB,WAAW,CAAC,OAAe;IACvC,IAAI,OAAO,EAAE,CAAC;QACV,IAAG,IAAA,eAAU,EAAC,OAAO,CAAC,EAAE,CAAC;YACrB,IAAA,qBAAe,EAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACJ,eAAM,CAAC,IAAI,CAAC,+BAA+B,OAAO,kBAAkB,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;AACL,CAAC"}

package/src/index.d.ts

@@ -1,14 +1,15 @@
 export { playwrightConfig } from './utils/playwright.config';
 export * from './types/onix-config.type';
 export * from './plugins/plugin';
+export * from './functions/executor-factory.function';
+export * from './functions/extract-project-build-outputs.function';
+export * from './functions/extract-project-configuration.function';
+export * from './functions/load-env-file.function';
+export * from './functions/normalize-output-path.function';
 export * from './inference/add-docker-target.function';
 export * from './inference/add-docker-targets.function';
 export * from './inference/add-serve-target.function';
 export * from './inference/add-serve-targets.function';
 export * from './inference/build-onix-targets.function';
-export * from './functions/extract-project-build-outputs.function';
-export * from './functions/extract-project-configuration.function';
-export * from './functions/load-env-file.function';
-export * from './functions/normalize-output-path.function';
 export * from './inference/read-targets-cache.function';
 export * from './inference/write-targets-to-cache.function';

package/src/index.js

@@ -6,15 +6,16 @@ var playwright_config_1 = require("./utils/playwright.config");
 Object.defineProperty(exports, "playwrightConfig", { enumerable: true, get: function () { return playwright_config_1.playwrightConfig; } });
 tslib_1.__exportStar(require("./types/onix-config.type"), exports);
 tslib_1.__exportStar(require("./plugins/plugin"), exports);
+tslib_1.__exportStar(require("./functions/executor-factory.function"), exports);
+tslib_1.__exportStar(require("./functions/extract-project-build-outputs.function"), exports);
+tslib_1.__exportStar(require("./functions/extract-project-configuration.function"), exports);
+tslib_1.__exportStar(require("./functions/load-env-file.function"), exports);
+tslib_1.__exportStar(require("./functions/normalize-output-path.function"), exports);
 tslib_1.__exportStar(require("./inference/add-docker-target.function"), exports);
 tslib_1.__exportStar(require("./inference/add-docker-targets.function"), exports);
 tslib_1.__exportStar(require("./inference/add-serve-target.function"), exports);
 tslib_1.__exportStar(require("./inference/add-serve-targets.function"), exports);
 tslib_1.__exportStar(require("./inference/build-onix-targets.function"), exports);
-tslib_1.__exportStar(require("./functions/extract-project-build-outputs.function"), exports);
-tslib_1.__exportStar(require("./functions/extract-project-configuration.function"), exports);
-tslib_1.__exportStar(require("./functions/load-env-file.function"), exports);
-tslib_1.__exportStar(require("./functions/normalize-output-path.function"), exports);
 tslib_1.__exportStar(require("./inference/read-targets-cache.function"), exports);
 tslib_1.__exportStar(require("./inference/write-targets-to-cache.function"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;;AAAA,+DAA6D;AAApD,qHAAA,gBAAgB,OAAA;AAEzB,mEAAyC;AAEzC,2DAAiC;AAEjC,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,6FAAmE;AACnE,6FAAmE;AACnE,6EAAmD;AACnD,qFAA2D;AAC3D,kFAAwD;AACxD,sFAA4D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../onix/src/index.ts"],"names":[],"mappings":";;;;AAAA,+DAA6D;AAApD,qHAAA,gBAAgB,OAAA;AAEzB,mEAAyC;AAEzC,2DAAiC;AAEjC,gFAAsD;AACtD,6FAAmE;AACnE,6FAAmE;AACnE,6EAAmD;AACnD,qFAA2D;AAE3D,iFAAuD;AACvD,kFAAwD;AACxD,gFAAsD;AACtD,iFAAuD;AACvD,kFAAwD;AACxD,kFAAwD;AACxD,sFAA4D"}