@orion-js/core 3.1.12 → 3.1.22

package/lib/build/index.js

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const safe_1 = __importDefault(require("colors/safe"));
 const execute_1 = __importDefault(require("../helpers/execute"));
 const writeIndex_1 = __importDefault(require("../start/watchAndCompile/writeIndex"));
-const writeEnvFile_1 = require("../start/watchAndCompile/writeEnvFile");
 const compile_1 = require("./compile");
-async function default_1({ output, envPath }) {
+async function default_1({ output }) {
     if (!output) {
         output = './build';
     }
@@ -17,7 +16,6 @@ async function default_1({ output, envPath }) {
     console.log(safe_1.default.bold('Compiling your app...'));
     (0, compile_1.compile)({ output });
     (0, writeIndex_1.default)({ basePath: output });
-    (0, writeEnvFile_1.writeEnvFile)({ basePath: output, envPath, createDtsFile: false });
     console.log(safe_1.default.bold('Build created'));
 }
 exports.default = default_1;

package/lib/index.js

@@ -14,8 +14,6 @@ const test_1 = __importDefault(require("./test"));
 require("./handleErrors");
 const version_1 = __importDefault(require("./version"));
 require("dotenv/config");
-const init_1 = __importDefault(require("./env/init"));
-const add_1 = __importDefault(require("./env/add"));
 const program = new commander_1.Command();
 const run = function (action) {
     return async function (...args) {
@@ -32,25 +30,13 @@ program
     .description('Run the Orionjs app')
     .option('--shell', 'Opens a shell in Chrome developer tools')
     .option('--clean', 'Build the typescript project from scratch')
-    .option('--env-path <path>', 'Specify the env file name')
     .action(run(start_1.default));
 program.command('test').allowUnknownOption().description('Deprecated command').action(run(test_1.default));
 program
     .command('build')
     .description('Compiles an Orionjs app and exports it to a simple nodejs app')
     .option('-o, --output [output]', 'Output directory')
-    .option('--env-path <path>', 'Specify the env file name')
     .action(run(build_1.default));
-program
-    .command('env-init')
-    .description('Creates a new encrypted env file')
-    .option('--env-path <path>', 'Specify the env file name')
-    .action(run(init_1.default));
-program
-    .command('env-add')
-    .description('Adds a new environment to the encrypted env file')
-    .option('--env-path <path>', 'Specify the env file name')
-    .action(run(add_1.default));
 program
     .command('create')
     .description('Creates a new Orionjs project')

package/lib/start/runner/index.js

@@ -36,7 +36,6 @@ function getRunner(options) {
     return {
         restart,
         stop,
-        envPath: options.envPath,
         basePath: `${process.cwd()}/.orion/build`
     };
 }

package/lib/start/watchAndCompile/getHost.js

@@ -9,7 +9,6 @@ const getConfigPath_1 = require("./getConfigPath");
 const reports_1 = require("./reports");
 const safe_1 = __importDefault(require("colors/safe"));
 const writeIndex_1 = __importDefault(require("./writeIndex"));
-const writeEnvFile_1 = require("./writeEnvFile");
 function getHost(runner) {
     const reportWatchStatusChanged = (diagnostic) => {
         if (diagnostic.category !== 3)
@@ -28,7 +27,6 @@ function getHost(runner) {
                 }
             }
             (0, writeIndex_1.default)({ basePath: runner.basePath });
-            (0, writeEnvFile_1.writeEnvFile)({ basePath: runner.basePath, envPath: runner.envPath, createDtsFile: true });
             runner.restart();
         }
     };

package/lib/start/watchAndCompile/writeEnvFile.js

@@ -3,52 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeEnvFile = exports.getDts = exports.watchEnvFile = void 0;
-const getConfig_1 = require("../../env/add/getConfig");
-const writeFile_1 = __importDefault(require("../../helpers/writeFile"));
+exports.watchEnvFile = void 0;
 const chokidar_1 = __importDefault(require("chokidar"));
 const safe_1 = __importDefault(require("colors/safe"));
-const getFileContents_1 = __importDefault(require("../../helpers/getFileContents"));
+const env_1 = require("@orion-js/env");
+const envFilePath = process.env.ORION_ENV_FILE_PATH;
+const dtsFilePath = './app/env.d.ts';
 const watchEnvFile = async (runner) => {
-    if (!runner.envPath)
+    if (!envFilePath)
         return;
-    const filePath = runner.envPath;
-    chokidar_1.default.watch(filePath, { ignoreInitial: true }).on('change', async () => {
-        (0, exports.writeEnvFile)({
-            envPath: runner.envPath,
-            basePath: runner.basePath,
-            createDtsFile: true
-        });
+    (0, env_1.writeDtsFileFromConfigFile)(envFilePath, dtsFilePath);
+    chokidar_1.default.watch(envFilePath, { ignoreInitial: true }).on('change', async () => {
         console.log(safe_1.default.bold(`=> Environment file changed. Restarting...`));
+        (0, env_1.writeDtsFileFromConfigFile)(envFilePath, dtsFilePath);
         runner.restart();
     });
 };
 exports.watchEnvFile = watchEnvFile;
-const getDts = config => {
-    const keys = [...Object.keys(config.cleanKeys), ...Object.keys(config.encryptedKeys)];
-    return `declare module '@orion-js/env' {
-  export const env: {
-${keys.map(key => `    ${key}: string;`).join('\n')}
-  }
-}
-`;
-};
-exports.getDts = getDts;
-const writeEnvFile = async ({ basePath, envPath, createDtsFile }) => {
-    const filePath = `${basePath}/env.js`;
-    if (!envPath) {
-        (0, writeFile_1.default)(filePath, `global.__orion_env__ = null`);
-        return;
-    }
-    const config = (0, getConfig_1.getConfig)(envPath);
-    const configJSON = JSON.stringify(config, null, 2);
-    if (createDtsFile) {
-        const currentFile = (0, getFileContents_1.default)('./app/env.d.ts');
-        const dts = (0, exports.getDts)(config);
-        if (currentFile !== dts) {
-            (0, writeFile_1.default)('./app/env.d.ts', dts);
-        }
-    }
-    (0, writeFile_1.default)(filePath, `global.__orion_env__ = ${configJSON}`);
-};
-exports.writeEnvFile = writeEnvFile;

package/lib/start/watchAndCompile/writeIndex/index.js

@@ -21,7 +21,6 @@ moduleAlias.addAlias('app', path)
     const indexPath = `${basePath}/index.js`;
     (0, writeFile_1.default)(indexPath, `"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./env");
 require("./moduleAlias");
 require("./app");
   `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/core",
-  "version": "3.1.12",
+  "version": "3.1.22",
   "main": "index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "upgrade-interactive": "yarn upgrade-interactive"
   },
   "dependencies": {
-    "@orion-js/crypto": "^3.1.12",
+    "@orion-js/env": "^3.1.22",
     "chokidar": "3.5.3",
     "colors": "^1.4.0",
     "commander": "^8.3.0",
@@ -34,7 +34,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "a6b82a931bea3179dfac4099579096c4f7a780bb",
+  "gitHead": "51b5af5952a486e40392381f769c69cfdfdc7b5e",
   "devDependencies": {
     "@shelf/jest-mongodb": "^2.1.0",
     "@types/prompts": "^2.0.14"

package/lib/env/add/encryptValue.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encryptValue = void 0;
-const crypto_1 = require("@orion-js/crypto");
-const encryptValue = (key, value, config) => {
-    if (key.startsWith('_')) {
-        const newKey = key.replace(/^_/, '');
-        config.cleanKeys[newKey] = value;
-        return;
-    }
-    config.encryptedKeys[key] = crypto_1.asymmetric.encrypt(config.publicKey, value);
-};
-exports.encryptValue = encryptValue;

package/lib/env/add/getConfig.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = void 0;
-const getFileContents_1 = __importDefault(require("../../helpers/getFileContents"));
-const yaml_1 = __importDefault(require("yaml"));
-const getConfig = (envPath) => {
-    const configFile = (0, getFileContents_1.default)(envPath);
-    if (!configFile) {
-        throw new Error('No config file found');
-    }
-    return yaml_1.default.parse(configFile);
-};
-exports.getConfig = getConfig;

package/lib/env/add/getParams.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParams = void 0;
-const prompts_1 = __importDefault(require("prompts"));
-const getParams = async (config) => {
-    const response = await (0, prompts_1.default)([
-        {
-            type: 'text',
-            name: 'key',
-            message: 'Key'
-        },
-        {
-            type: 'text',
-            name: 'value',
-            message: 'Value'
-        }
-    ]);
-    return {
-        key: response.key,
-        value: response.value
-    };
-};
-exports.getParams = getParams;

package/lib/env/add/index.js

@@ -1,35 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const encryptValue_1 = require("./encryptValue");
-const getConfig_1 = require("./getConfig");
-const getParams_1 = require("./getParams");
-const yaml_1 = __importDefault(require("yaml"));
-const writeFile_1 = __importDefault(require("../../helpers/writeFile"));
-const sortObjectByKeys = (object) => {
-    const sorted = {};
-    Object.keys(object)
-        .sort()
-        .forEach(key => {
-        sorted[key] = object[key];
-    });
-    return sorted;
-};
-async function envAdd({ envPath }) {
-    if (!envPath) {
-        envPath = '.env.local.yml';
-    }
-    const config = (0, getConfig_1.getConfig)(envPath);
-    const { key, value } = await (0, getParams_1.getParams)(config);
-    if (!value)
-        return;
-    (0, encryptValue_1.encryptValue)(key, value, config);
-    // sort keys alphabetically
-    config.cleanKeys = sortObjectByKeys(config.cleanKeys);
-    config.encryptedKeys = sortObjectByKeys(config.encryptedKeys);
-    const text = yaml_1.default.stringify(config);
-    (0, writeFile_1.default)(envPath, text);
-}
-exports.default = envAdd;

package/lib/env/init/index.js

@@ -1,28 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const crypto_1 = require("@orion-js/crypto");
-const yaml_1 = __importDefault(require("yaml"));
-const writeFile_1 = __importDefault(require("../../helpers/writeFile"));
-async function envInit({ envPath }) {
-    if (!envPath) {
-        envPath = '.env.local.yml';
-    }
-    const keypair = crypto_1.asymmetric.generateKeys();
-    const envFile = {
-        version: '1.0',
-        publicKey: keypair.encryptKey,
-        cleanKeys: {},
-        encryptedKeys: {}
-    };
-    const text = yaml_1.default.stringify(envFile);
-    (0, writeFile_1.default)(envPath, text);
-    console.log('');
-    console.log(`Environment file created. You need to use the following key to decrypt the environment variables:`);
-    console.log('');
-    console.log(keypair.decryptKey);
-    console.log('');
-}
-exports.default = envInit;