@onivoro/onix 20.5.60 → 20.5.62

package/package.json

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

package/src/executors/typeorm-db-client/executor.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const load_env_file_function_1 = require("../../functions/load-env-file.function");
 const executor_factory_function_1 = require("../../functions/executor-factory.function");
-const child_process_1 = require("child_process");
-const os_1 = require("os");
 const interpolate_environment_expression_function_1 = require("../../functions/interpolate-environment-expression.function");
+const child_process_1 = require("child_process");
 exports.default = (0, executor_factory_function_1.executorFactory)((options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const { envFile, host, db, password, port, user, type, httpPort } = options || {};
     if (envFile) {
@@ -13,18 +12,19 @@ exports.default = (0, executor_factory_function_1.executorFactory)((options, con
     }
     const http = (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(httpPort);
     const literalHost = (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(host);
-    const resolvedHost = ['localhost', '127.0.0.1'].includes(literalHost) ? 'host.docker.internal' : literalHost;
-    (0, child_process_1.execSync)(`docker` + ' ' + [
-        'run',
-        `-p ${http}:${http}`,
-        `--env="DV_HOST=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(resolvedHost)}"`,
-        `--env="DV_DB=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(db)}"`,
-        `--env="DV_PASSWORD=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(password)}"`,
-        `--env="DV_PORT=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(port)}"`,
-        `--env="DV_USER=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(user)}"`,
-        `--env="DV_TYPE=${(0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(type)}"`,
-        `--env="PORT=${http}"`,
-        `icedlee337/datavore:${((0, os_1.arch)() === 'arm64') ? 'arm64v8' : 'amd64'}`
-    ].join(' '));
+    const env = {
+        DV_HOST: (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(literalHost),
+        DV_DB: (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(db),
+        DV_PASSWORD: (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(password),
+        DV_PORT: (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(port),
+        DV_USER: (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(user),
+        DV_TYPE: (0, interpolate_environment_expression_function_1.interpolateEnvironmentExpression)(type),
+        PORT: http,
+    };
+    Object.entries(env)
+        .forEach(([key, value]) => {
+        process.env[key] = value;
+    });
+    (0, child_process_1.spawn)('npx', ['--yes', '@onivoro/app-server-datavore'], { env });
 }));
 //# sourceMappingURL=executor.js.map

package/src/executors/typeorm-db-client/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/typeorm-db-client/executor.ts"],"names":[],"mappings":";;;AAEA,mFAAqE;AACrE,yFAA4E;AAC5E,iDAAyC;AACzC,2BAA0B;AAC1B,6HAA+G;AAE/G,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,EACT,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,IAAI,OAAO,EAAE,CAAC;QACZ,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,8EAAgC,EAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAA,8EAAgC,EAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,WAAW,CAAC;IAE7G,IAAA,wBAAQ,EAAC,QAAQ,GAAG,GAAG,GAAG;QACxB,KAAK;QACL,MAAM,IAAI,IAAI,IAAI,EAAE;QACpB,kBAAkB,IAAA,8EAAgC,EAAC,YAAY,CAAC,GAAG;QACnE,gBAAgB,IAAA,8EAAgC,EAAC,EAAE,CAAC,GAAG;QACvD,sBAAsB,IAAA,8EAAgC,EAAC,QAAQ,CAAC,GAAG;QACnE,kBAAkB,IAAA,8EAAgC,EAAC,IAAI,CAAC,GAAG;QAC3D,kBAAkB,IAAA,8EAAgC,EAAC,IAAI,CAAC,GAAG;QAC3D,kBAAkB,IAAA,8EAAgC,EAAC,IAAI,CAAC,GAAG;QAC3D,eAAe,IAAI,GAAG;QACtB,uBAAuB,CAAC,IAAA,SAAI,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE;KACpE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEf,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/typeorm-db-client/executor.ts"],"names":[],"mappings":";;;AAEA,mFAAqE;AACrE,yFAA4E;AAC5E,6HAA+G;AAC/G,iDAAsC;AAEtC,kBAAe,IAAA,2CAAe,EAAC,CAC7B,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,QAAQ,EACT,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,IAAI,OAAO,EAAE,CAAC;QACZ,IAAA,oCAAW,EAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,8EAAgC,EAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAA,8EAAgC,EAAC,IAAI,CAAC,CAAC;IAE3D,MAAM,GAAG,GAAG;QACV,OAAO,EAAE,IAAA,8EAAgC,EAAC,WAAW,CAAC;QACtD,KAAK,EAAE,IAAA,8EAAgC,EAAC,EAAE,CAAC;QAC3C,WAAW,EAAE,IAAA,8EAAgC,EAAC,QAAQ,CAAC;QACvD,OAAO,EAAE,IAAA,8EAAgC,EAAC,IAAI,CAAC;QAC/C,OAAO,EAAE,IAAA,8EAAgC,EAAC,IAAI,CAAC;QAC/C,OAAO,EAAE,IAAA,8EAAgC,EAAC,IAAI,CAAC;QAC/C,IAAI,EAAE,IAAI;KACX,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEL,IAAA,qBAAK,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,8BAA8B,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;AACnE,CAAC,CAAA,CAAC,CAAC"}