@onivoro/onix 20.0.54 → 20.3.0

package/executors.json

@@ -1,48 +1,38 @@
 {
   "executors": {
     "build-cli": {
-      "implementation": "./src/executors/build-cli/executor",
-      "schema": "./src/executors/build-cli/schema.json",
+      "implementation": "./onix/src/executors/build-cli/executor",
+      "schema": "./onix/src/executors/build-cli/executor/schema.json",
       "description": "build-cli"
     },
-    "typeorm": {
-      "implementation": "./src/executors/typeorm/executor",
-      "schema": "./src/executors/typeorm/schema.json",
-      "description": "typeorm"
+    "orm": {
+      "implementation": "./onix/src/executors/db/executor",
+      "schema": "./onix/src/executors/db/executor/schema.json",
+      "description": "db"
     },
     "docker-run": {
-      "implementation": "./src/executors/docker-run/executor",
-      "schema": "./src/executors/docker-run/schema.json",
+      "implementation": "./onix/src/executors/docker/executor",
+      "schema": "./onix/src/executors/docker/executor/schema.json",
       "description": "docker-run"
     },
-    "deploy-lambda": {
-      "implementation": "./src/executors/deploy-lambda/executor",
-      "schema": "./src/executors/deploy-lambda/schema.json",
-      "description": "deploy-lambda"
+    "docker-deploy": {
+      "implementation": "./onix/src/executors/deploy/executor",
+      "schema": "./onix/src/executors/deploy/executor/schema.json",
+      "description": "docker-deploy"
     },
-    "deploy-ecs": {
-      "implementation": "./src/executors/deploy-ecs/executor",
-      "schema": "./src/executors/deploy-ecs/schema.json",
-      "description": "deploy-ecs"
+    "gen-axios": {
+      "implementation": "./onix/src/executors/gen/executor",
+      "schema": "./onix/src/executors/gen/executor/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",
-      "schema": "./src/executors/local/schema.json",
-      "description": "local"
-    },
-    "xray": {
-      "implementation": "./src/executors/xray/executor",
-      "schema": "./src/executors/xray/schema.json",
-      "description": "xray"
+    "serve-locally": {
+      "implementation": "./onix/src/executors/local/executor",
+      "schema": "./onix/src/executors/local/executor/schema.json",
+      "description": "serve-locally"
     },
     "playwright": {
-      "implementation": "./src/executors/playwright/executor",
-      "schema": "./src/executors/playwright/schema.json",
+      "implementation": "./onix/src/executors/playwright/executor",
+      "schema": "./onix/src/executors/playwright/executor/schema.json",
       "description": "playwright"
     }
   }

package/package.json

@@ -1,20 +1,15 @@
 {
   "name": "@onivoro/onix",
-  "version": "20.0.54",
+  "version": "20.3.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "executors": "./executors.json",
   "dependencies": {
     "@aws-sdk/client-ecr": "^3.734.0",
-    "@aws-sdk/client-ecs": "^3.734.0",
-    "@aws-sdk/client-lambda": "^3.734.0",
-    "@aws-sdk/client-s3": "^3.735.0",
     "@aws-sdk/credential-providers": "^3.734.0",
     "@nx/devkit": "^20.3.2",
     "@nx/js": "20.3.2",
-    "@playwright/test": "^1.50.0",
-    "adm-zip": "^0.5.16",
     "esbuild": "^0.24.2",
     "esbuild-node-externals": "^1.16.0"
   },

package/src/executors/build-cli/executor.d.ts

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

package/src/executors/build-cli/executor.js

@@ -3,15 +3,18 @@ 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_factory_function_1 = require("../../functions/executor-factory.function");
-const extract_project_build_outputs_function_1 = require("../../functions/extract-project-build-outputs.function");
-exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const [outputPath] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, context.projectName);
-    const tempPath = `${outputPath}/temp`;
-    const executableOutputPath = `${outputPath}/main.js`;
-    devkit_1.logger.info(`add a bin entry to root package.json pointing at this executable => ${executableOutputPath} and re-run this if the bin entry hasn't been added yet`);
-    const command = `npx nx build ${context.projectName} && echo '#! /usr/bin/env node' > ${tempPath} && cat ${executableOutputPath} >> ${tempPath} && mv ${tempPath} ${executableOutputPath} && chmod +x ${executableOutputPath} && npm link`;
-    devkit_1.logger.info(command);
-    (0, child_process_1.execSync)(command, { stdio: 'inherit' });
-}));
+const runExecutor = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ moniker }) {
+    try {
+        const command = `nx build app-cli-${moniker} --skip-nx-cache && echo '#! /usr/bin/env node' >> dist/temp && cat dist/apps/cli/${moniker}/main.js >> dist/temp && mv dist/temp dist/apps/cli/${moniker}/main.js && chmod +x dist/apps/cli/${moniker}/main.js && npm link`;
+        devkit_1.logger.info(command);
+        (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+        return {
+            success: true,
+        };
+    }
+    catch (error) {
+        return { success: false };
+    }
+});
+exports.default = runExecutor;
 //# sourceMappingURL=executor.js.map

package/src/executors/build-cli/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/build-cli/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,iDAAyC;AACzC,yFAA4E;AAC5E,mHAAoG;AAEpG,kBAAe,IAAA,2CAAe,EAAC,CAAO,OAAuB,EAAE,OAAO,EAAE,EAAE;IACxE,MAAM,CAAC,UAAU,CAAC,GAAG,IAAA,mEAA0B,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,GAAG,UAAU,OAAO,CAAC;IACtC,MAAM,oBAAoB,GAAG,GAAG,UAAU,UAAU,CAAC;IACrD,eAAM,CAAC,IAAI,CAAC,uEAAuE,oBAAoB,yDAAyD,CAAC,CAAC;IAClK,MAAM,OAAO,GAAG,gBAAgB,OAAO,CAAC,WAAW,qCAAqC,QAAQ,WAAW,oBAAoB,OAAO,QAAQ,UAAU,QAAQ,IAAI,oBAAoB,gBAAgB,oBAAoB,cAAc,CAAC;IAE3O,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAErB,IAAA,wBAAQ,EAAC,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AAC1C,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/build-cli/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AAErD,iDAAyC;AAEzC,MAAM,WAAW,GAAoC,KAAoB,EAAE,oDAAf,EAAE,OAAO,EAAE;IACrE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,oBAAoB,OAAO,qFAAqF,OAAO,uDAAuD,OAAO,sCAAsC,OAAO,sBAAsB,CAAC;QAEzQ,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErB,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,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,kBAAe,WAAW,CAAC"}

package/src/executors/build-cli/schema.d.ts

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

package/src/executors/build-cli/schema.json

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

package/src/executors/db/executor.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const { envKey, envPath, ormConfigPath, runOrRevert } = options;
+    try {
+        (0, child_process_1.execSync)(`export ${envKey}=${envPath} && npm run typeorm -- -d ${ormConfigPath} migration:${runOrRevert} -t=false`, { stdio: 'inherit' });
+        return {
+            success: true,
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+        };
+    }
+});
+exports.default = executor;
+//# sourceMappingURL=executor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/db/executor.ts"],"names":[],"mappings":";;;AAEA,iDAAyC;AAEzC,MAAM,QAAQ,GAAoC,CAChD,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAGhE,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,UAAU,MAAM,IAAI,OAAO,6BAA6B,aAAa,cAAc,WAAW,WAAW,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAE1I,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"}

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

@@ -0,0 +1,6 @@
+export interface ExecutorSchema {
+    envPath: string;
+    envKey: string;
+    ormConfigPath: string;
+    runOrRevert: string;
+}

package/src/executors/{typeorm → db}/schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json-schema.org/schema",
   "version": 2,
-  "title": "TypeORM executor",
+  "title": "Db executor",
   "description": "",
   "type": "object",
   "properties": {
@@ -9,16 +9,20 @@
       "type": "string",
       "description": "TypeORM CLI command: 'run' or 'revert'"
     },
-    "envFile": {
+    "envPath": {
       "type": "string",
       "description": "Path and name of the .env file to load"
     },
+    "envKey": {
+      "type": "string",
+      "description": "Name of the environment variable that points to the location of the envFile"
+    },
     "ormConfigPath": {
       "type": "string",
       "description": "Path and name of the ormconfig"
     }
   },
   "required": [
-    "envFile", "ormConfigPath"
+    "envPath", "envKey", "ormConfigPath"
   ]
 }

package/src/executors/deploy/executor.js

@@ -0,0 +1,33 @@
+"use strict";
+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, prefix, profile, dockerfilePath } = options;
+    try {
+        const webProjectName = context.projectName.replace('api', 'web');
+        const apiProjectPath = context.projectName.split('-').join('/').replace('app', 'apps').replace('appss', 'apps');
+        const webProjectPath = apiProjectPath.replace('api', 'web').replace('app', 'apps').replace('appss', 'apps');
+        // build api
+        child_process_1.execSync;
+        // build ui if there's a ui project in onix.config
+        // copy ui dist to api dist/assets if there's ui project in onix.config
+        // login to docker
+        // push image
+        // restart cluster service
+        const command = `export OSO_ENV=${envPath} && oso DeployImageAndUi -a ${context.projectName} -t production -p ${profile} -r us-east-2 -e ${ecr} -o ${apiProjectPath} -u ${webProjectName} -d dist/${webProjectPath} -f docker/prod/api/Dockerfile -g asdf && aws ecs update-service --cluster ${prefix}-cluster --service ${prefix}-service --force-new-deployment --profile ${profile} --region us-east-2`;
+        devkit_1.logger.info(command);
+        (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+        return {
+            success: true,
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+        };
+    }
+});
+exports.default = executor;
+//# sourceMappingURL=executor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,iDAAyC;AAEzC,MAAM,QAAQ,GAAoC,CAChD,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,cAAc,GAAG,OAAO,CAAC,WAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,OAAO,CAAC,WAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACjH,MAAM,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAE5G,YAAY;QACZ,wBAAQ,CAAA;QACR,kDAAkD;QAClD,uEAAuE;QACvE,kBAAkB;QAClB,aAAa;QACb,0BAA0B;QAC1B,MAAM,OAAO,GAAG,kBAAkB,OAAO,+BAA+B,OAAO,CAAC,WAAW,qBAAqB,OAAO,oBAAoB,GAAG,OAAO,cAAc,OAAO,cAAc,YAAY,cAAc,8EAA8E,MAAM,sBAAsB,MAAM,6CAA6C,OAAO,qBAAqB,CAAC;QAE5Y,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErB,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,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

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

@@ -0,0 +1,5 @@
+import { TOnixEnvironmentConfig } from "onix/src/types/onix-config.type";
+
+export interface ExecutorSchema extends TOnixEnvironmentConfig {
+
+}

package/src/executors/deploy/schema.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "version": 2,
+  "title": "Db executor",
+  "description": "",
+  "type": "object",
+  "properties": {
+    "envPath": {
+      "type": "string",
+      "description": "Path and name of the .env file to load"
+    },
+    "ecr": {
+      "type": "string",
+      "description": "Name of the ECR repository and tag (conventionally separated by a colon)"
+    },
+    "prefix": {
+      "type": "string",
+      "description": "Common prefix of the AWS ECS cluster and service"
+    },
+    "profile": {
+      "type": "string",
+      "description": "Either 'ivimdev' or 'ivimprod' (either of which must be defined in the ~/.aws/credentials file"
+    }
+  },
+  "required": [
+    "envPath", "ecr", "prefix", "profile"
+  ]
+}

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

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

package/src/executors/docker/executor.js

@@ -0,0 +1,24 @@
+"use strict";
+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 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;
+//# sourceMappingURL=executor.js.map

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

@@ -0,0 +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"}

package/src/executors/{docker-run → docker}/schema.d.ts

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

package/src/executors/{docker-run → docker}/schema.json

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

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

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

package/src/executors/gen/executor.js

@@ -0,0 +1,19 @@
+"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

@@ -0,0 +1 @@
+{"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

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

package/src/executors/gen/schema.json

@@ -0,0 +1,14 @@
+{
+  "$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": []
+}

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

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

package/src/executors/local/executor.js

@@ -1,17 +1,24 @@
 "use strict";
 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 load_env_file_function_1 = require("../../functions/load-env-file.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;
-    (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' });
-}));
+const runExecutor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    console.log('Running custom serve executor');
+    const { envKey, envPath } = options;
+    try {
+        const inspectStatement = options.port ? `--port=${options.port}` : '';
+        const command = `export ${envKey}=${envPath} && npx nx run ${context.projectName}:serve ${inspectStatement}`;
+        console.log(command);
+        (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+        return {
+            success: true,
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+        };
+    }
+});
+exports.default = runExecutor;
 //# 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,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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/local/executor.ts"],"names":[],"mappings":";;;AAIA,iDAAyC;AAGzC,MAAM,WAAW,GAAoC,CACnD,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;IAE7C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAEpC,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,UAAU,MAAM,IAAI,OAAO,kBAAkB,OAAO,CAAC,WAAW,UAAU,gBAAgB,EAAE,CAAC;QAC7G,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrB,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"}

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

@@ -1,4 +1,5 @@
 export interface ExecutorSchema {
-    debugPort?: number;
-    envFile?: string;
+    envPath: string;
+    envKey: string;
+    port?: number;
 }

package/src/executors/local/schema.json

@@ -5,14 +5,21 @@
   "description": "",
   "type": "object",
   "properties": {
+    "envPath": {
+      "type": "string",
+      "description": "Path and name of the .env file to load"
+    },
+    "envKey": {
+      "type": "string",
+      "description": "Name of the environment variable that points to the location of the envFile"
+    },
     "debugPort": {
       "type": "number",
       "description": "Debug port"
-    },
-    "envFile": {
-      "type": "string",
-      "description": "Path and name of the .env file to load"
     }
   },
-  "required": []
+  "required": [
+    "envPath",
+    "envKey"
+  ]
 }

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

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

package/src/executors/playwright/executor.js

@@ -3,15 +3,19 @@ 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_factory_function_1 = require("../../functions/executor-factory.function");
-const load_env_file_function_1 = require("../../functions/load-env-file.function");
-const extract_project_configuration_function_1 = require("../../functions/extract-project-configuration.function");
-exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const { envFile } = options;
-    (0, load_env_file_function_1.loadEnvFile)(envFile);
-    const root = (0, extract_project_configuration_function_1.extractProjectConfiguration)(context, context.projectName).root;
-    const command = `playwright test -c ${root}/playwright.config.ts`;
-    devkit_1.logger.info(command);
-    (0, child_process_1.execSync)(command, { stdio: 'inherit' });
-}));
+const get_project_path_from_name_function_1 = require("../../utils/get-project-path-from-name.function");
+const runExecutor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const command = `playwright test -c ${(0, get_project_path_from_name_function_1.getProjectPathFromName)(context.projectName)}/playwright.config.ts`;
+        devkit_1.logger.info(command);
+        (0, child_process_1.execSync)(command, { stdio: 'inherit' });
+        return {
+            success: true,
+        };
+    }
+    catch (error) {
+        return { success: false };
+    }
+});
+exports.default = runExecutor;
 //# sourceMappingURL=executor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/playwright/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,iDAAyC;AACzC,yFAA4E;AAC5E,mFAAqE;AACrE,mHAAqG;AAErG,kBAAe,IAAA,2CAAe,EAAC,CAAO,OAAuB,EAAE,OAAO,EAAE,EAAE;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;IAErB,MAAM,IAAI,GAAG,IAAA,oEAA2B,EAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;IAE5E,MAAM,OAAO,GAAG,sBAAsB,IAAI,uBAAuB,CAAC;IAElE,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAErB,IAAA,wBAAQ,EAAC,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AAC1C,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/playwright/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAqD;AAErD,iDAAyC;AACzC,yGAAyF;AAEzF,MAAM,WAAW,GAAoC,CAAO,OAAO,EAAE,OAAO,EAAE,EAAE;IAC9E,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,sBAAsB,IAAA,4DAAsB,EAAC,OAAO,CAAC,WAAY,CAAC,uBAAuB,CAAC;QAE1G,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErB,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,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,kBAAe,WAAW,CAAC"}

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

@@ -1,3 +1,2 @@
 export interface ExecutorSchema {
-    envFile?: string;
 }

package/src/executors/playwright/schema.json

@@ -1,14 +1,10 @@
 {
   "$schema": "https://json-schema.org/schema",
   "version": 2,
-  "title": "Playwright executor",
+  "title": "Gen executor",
   "description": "",
   "type": "object",
   "properties": {
-    "envFile": {
-      "type": "string",
-      "description": "Path and name of the .env file to load"
-    }
   },
   "required": []
 }

package/src/{inference → functions}/add-db-target.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-db-target.function.js","sourceRoot":"","sources":["../../../../onix/src/inference/add-db-target.function.ts"],"names":[],"mappings":";;AAIA,kCA2BC;AA7BD,wFAA0E;AAE1E,SAAgB,WAAW,CAAC,WAAmB,EAAE,MAA8B,EAAE,OAAiD,EAAE,WAAgB,EAAE,WAAW;IAC/J,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAElD,IAAI,aAAa,EAAE,CAAC;QAClB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACtC,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,EAAE,CAAC;YAEjG,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,OAAO,EAAE,UAAU,MAAM,IAAI,OAAO,6BAA6B,aAAa,cAAc,WAAW,WAAW;gBAClH,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;gBAC/B,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,CAAC,IAAI,4CAAe,EAAE,CAAC;gBAClC,MAAM,EAAE;oBACN,GAAG,CAAC,YAAY,IAAI,WAAW;wBAC7B,CAAC,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC;wBAC/B,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBAC5B;wBACE,oBAAoB,EAAE,EAAE;qBACzB;iBACF;gBACD,QAAQ,EAAE;oBACR,YAAY,EAAE,CAAC,kBAAkB,EAAE,KAAK,CAAC;oBACzC,WAAW,EAAE,+BAA+B;iBAC7C;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"add-db-target.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/add-db-target.function.ts"],"names":[],"mappings":";;AAIA,kCA2BC;AA7BD,wFAA0E;AAE1E,SAAgB,WAAW,CAAC,WAAmB,EAAE,MAA8B,EAAE,OAAiD,EAAE,WAAgB,EAAE,WAAW;IAC/J,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAElD,IAAI,aAAa,EAAE,CAAC;QAClB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACtC,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI,WAAW,EAAE,CAAC;YAEjG,OAAO,CAAC,UAAU,CAAC,GAAG;gBACpB,OAAO,EAAE,UAAU,MAAM,IAAI,OAAO,6BAA6B,aAAa,cAAc,WAAW,WAAW;gBAClH,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;gBAC/B,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,CAAC,IAAI,4CAAe,EAAE,CAAC;gBAClC,MAAM,EAAE;oBACN,GAAG,CAAC,YAAY,IAAI,WAAW;wBAC7B,CAAC,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC;wBAC/B,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;oBAC5B;wBACE,oBAAoB,EAAE,EAAE;qBACzB;iBACF;gBACD,QAAQ,EAAE;oBACR,YAAY,EAAE,CAAC,kBAAkB,EAAE,KAAK,CAAC;oBACzC,WAAW,EAAE,+BAA+B;iBAC7C;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/src/{inference → functions}/add-db-targets.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-db-targets.function.js","sourceRoot":"","sources":["../../../../onix/src/inference/add-db-targets.function.ts"],"names":[],"mappings":";;AAIA,oCAIC;AAND,qEAAuD;AAEvD,SAAgB,YAAY,CAAC,UAAuB,EAAE,OAAiD,EAAE,WAAgB,EAAE,WAAW;IAClI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE;QAC5E,IAAA,oCAAW,EAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"add-db-targets.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/add-db-targets.function.ts"],"names":[],"mappings":";;AAIA,oCAIC;AAND,qEAAuD;AAEvD,SAAgB,YAAY,CAAC,UAAuB,EAAE,OAAiD,EAAE,WAAgB,EAAE,WAAW;IAClI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE;QAC5E,IAAA,oCAAW,EAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;AACP,CAAC"}

package/src/{inference → functions}/add-docker-deploy-target.function.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-docker-deploy-target.function.js","sourceRoot":"","sources":["../../../../onix/src/inference/add-docker-deploy-target.function.ts"],"names":[],"mappings":";;AAGA,sDAmBC;AAnBD,SAAgB,qBAAqB,CAAC,WAAmB,EAAE,MAA8B,EAAE,OAAiD,EAAE,WAAgB,EAAE,WAAW;IACvK,MAAM,UAAU,GAAG,sBAAsB,WAAW,EAAE,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAE9D,MAAM,OAAO,GAAG,mBAAmB,GAAG,OAAO,cAAc,qBAAqB,GAAG,EAAE,CAAC;IAEtF,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;QACxB,OAAO,CAAC,UAAU,CAAC,GAAG;YAClB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;YAC/B,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE;gBACN,YAAY,EAAE,CAAC,QAAQ,CAAC;gBACxB,WAAW,EAAE,gEAAgE;aAChF;SACJ,CAAC;IACN,CAAC;AACL,CAAC"}
+{"version":3,"file":"add-docker-deploy-target.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/add-docker-deploy-target.function.ts"],"names":[],"mappings":";;AAGA,sDAmBC;AAnBD,SAAgB,qBAAqB,CAAC,WAAmB,EAAE,MAA8B,EAAE,OAAiD,EAAE,WAAgB,EAAE,WAAW;IACvK,MAAM,UAAU,GAAG,sBAAsB,WAAW,EAAE,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;IAE9D,MAAM,OAAO,GAAG,mBAAmB,GAAG,OAAO,cAAc,qBAAqB,GAAG,EAAE,CAAC;IAEtF,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;QACxB,OAAO,CAAC,UAAU,CAAC,GAAG;YAClB,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE;YAC/B,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE;gBACN,YAAY,EAAE,CAAC,QAAQ,CAAC;gBACxB,WAAW,EAAE,gEAAgE;aAChF;SACJ,CAAC;IACN,CAAC;AACL,CAAC"}