@adonisjs/assembler 5.9.2 → 5.9.3

package/build/src/EnvParser/index.js

@@ -1,52 +1,48 @@
-"use strict";
-/*
- * @adonisjs/assembler
- *
- * (c) Harminder Virk <virk@adonisjs.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnvParser = void 0;
-const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
-const env_1 = require("@adonisjs/env");
-/**
- * Parses the env file inside the project root.
- */
-class EnvParser {
-    constructor(envFileName = '.env') {
-        this.envFileName = envFileName;
-        this.envContents = {};
-        this.parser = new env_1.EnvParser(false);
-    }
-    /**
-     * Parse .env file contents
-     */
-    async parse(rootDir) {
-        try {
-            this.envContents = this.parser.parse(await (0, fs_extra_1.readFile)((0, path_1.join)(rootDir, this.envFileName), 'utf-8'));
-        }
-        catch { }
-    }
-    /**
-     * Returns value for a key inside the `.env` file
-     */
-    get(key) {
-        return this.envContents[key];
-    }
-    /**
-     * Returns an env object for the keys that has defined values
-     */
-    asEnvObject(keys) {
-        return keys.reduce((result, key) => {
-            const value = this.get(key);
-            if (value !== undefined) {
-                result[key] = value;
-            }
-            return result;
-        }, {});
-    }
-}
-exports.EnvParser = EnvParser;
+"use strict";
+/*
+ * @adonisjs/assembler
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnvParser = void 0;
+const env_1 = require("@adonisjs/env");
+/**
+ * Parses the env file inside the project root.
+ */
+class EnvParser {
+    constructor() {
+        this.envContents = {};
+    }
+    /**
+     * Parse .env file contents
+     */
+    async parse(rootDir) {
+        const { envContents, testEnvContent } = (0, env_1.envLoader)(rootDir);
+        const envVars = new env_1.EnvParser(true).parse(envContents);
+        const testEnvVars = new env_1.EnvParser(true).parse(testEnvContent);
+        this.envContents = { ...envVars, ...testEnvVars };
+    }
+    /**
+     * Returns value for a key inside the `.env` file
+     */
+    get(key) {
+        return this.envContents[key];
+    }
+    /**
+     * Returns an env object for the keys that has defined values
+     */
+    asEnvObject(keys) {
+        return keys.reduce((result, key) => {
+            const value = this.get(key);
+            if (value !== undefined) {
+                result[key] = value;
+            }
+            return result;
+        }, {});
+    }
+}
+exports.EnvParser = EnvParser;

package/build/src/HttpServer/index.d.ts

@@ -1,34 +1,34 @@
-import Emittery from 'emittery';
-import { logger as uiLogger } from '@poppinss/cliui';
-/**
- * Exposes the API to start Node.js HTTP server as a child process. The
- * child process is full managed and cleans up when parent process
- * dies.
- */
-export declare class HttpServer extends Emittery {
-    private sourceFile;
-    private projectRoot;
-    private logger;
-    private env;
-    private childProcess?;
-    private nodeArgs;
-    constructor(sourceFile: string, projectRoot: string, nodeArgs: string[] | undefined, logger: typeof uiLogger, env?: {
-        [key: string]: string;
-    });
-    /**
-     * Whether or not the underlying process is connected
-     */
-    get isConnected(): boolean | undefined;
-    /**
-     * Start the HTTP server as a child process.
-     */
-    start(): void;
-    /**
-     * Stop the underlying process
-     */
-    stop(): void;
-    /**
-     * Restart the server by killing the old one
-     */
-    restart(): void;
-}
+import Emittery from 'emittery';
+import { logger as uiLogger } from '@poppinss/cliui';
+/**
+ * Exposes the API to start Node.js HTTP server as a child process. The
+ * child process is full managed and cleans up when parent process
+ * dies.
+ */
+export declare class HttpServer extends Emittery {
+    private sourceFile;
+    private projectRoot;
+    private logger;
+    private env;
+    private childProcess?;
+    private nodeArgs;
+    constructor(sourceFile: string, projectRoot: string, nodeArgs: string[] | undefined, logger: typeof uiLogger, env?: {
+        [key: string]: string;
+    });
+    /**
+     * Whether or not the underlying process is connected
+     */
+    get isConnected(): boolean | undefined;
+    /**
+     * Start the HTTP server as a child process.
+     */
+    start(): void;
+    /**
+     * Stop the underlying process
+     */
+    stop(): void;
+    /**
+     * Restart the server by killing the old one
+     */
+    restart(): void;
+}

package/build/src/HttpServer/index.js

@@ -1,87 +1,87 @@
-"use strict";
-/*
- * @adonisjs/assembler
- *
- * (c) Harminder Virk <virk@adonisjs.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpServer = void 0;
-const execa_1 = __importDefault(require("execa"));
-const emittery_1 = __importDefault(require("emittery"));
-/**
- * Exposes the API to start Node.js HTTP server as a child process. The
- * child process is full managed and cleans up when parent process
- * dies.
- */
-class HttpServer extends emittery_1.default {
-    constructor(sourceFile, projectRoot, nodeArgs = [], logger, env = {}) {
-        super();
-        this.sourceFile = sourceFile;
-        this.projectRoot = projectRoot;
-        this.logger = logger;
-        this.env = env;
-        this.nodeArgs = [];
-        this.nodeArgs = nodeArgs.reduce((result, arg) => {
-            result = result.concat(arg.split(' '));
-            return result;
-        }, []);
-    }
-    /**
-     * Whether or not the underlying process is connected
-     */
-    get isConnected() {
-        return this.childProcess && this.childProcess.connected && !this.childProcess.killed;
-    }
-    /**
-     * Start the HTTP server as a child process.
-     */
-    start() {
-        if (this.isConnected) {
-            throw new Error('Http server is already connected. Call restart instead');
-        }
-        this.logger.info(this.childProcess ? 're-starting http server...' : 'starting http server...');
-        this.childProcess = execa_1.default.node(this.sourceFile, [], {
-            buffer: false,
-            stdio: 'inherit',
-            cwd: this.projectRoot,
-            env: {
-                FORCE_COLOR: 'true',
-                ...this.env,
-            },
-            nodeOptions: ['-r', '@adonisjs/assembler/build/register'].concat(this.nodeArgs),
-        });
-        /**
-         * Notify about server events
-         */
-        this.childProcess.on('message', (message) => {
-            if (message && message['isAdonisJS'] && message['environment'] === 'web') {
-                this.emit('ready', message);
-            }
-        });
-        this.childProcess.on('close', (code, signal) => this.emit('close', { code, signal }));
-        this.childProcess.on('exit', (code, signal) => this.emit('exit', { code, signal }));
-    }
-    /**
-     * Stop the underlying process
-     */
-    stop() {
-        if (this.childProcess) {
-            this.childProcess.removeAllListeners();
-            this.childProcess.kill('SIGKILL');
-        }
-    }
-    /**
-     * Restart the server by killing the old one
-     */
-    restart() {
-        this.stop();
-        this.start();
-    }
-}
-exports.HttpServer = HttpServer;
+"use strict";
+/*
+ * @adonisjs/assembler
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpServer = void 0;
+const execa_1 = __importDefault(require("execa"));
+const emittery_1 = __importDefault(require("emittery"));
+/**
+ * Exposes the API to start Node.js HTTP server as a child process. The
+ * child process is full managed and cleans up when parent process
+ * dies.
+ */
+class HttpServer extends emittery_1.default {
+    constructor(sourceFile, projectRoot, nodeArgs = [], logger, env = {}) {
+        super();
+        this.sourceFile = sourceFile;
+        this.projectRoot = projectRoot;
+        this.logger = logger;
+        this.env = env;
+        this.nodeArgs = [];
+        this.nodeArgs = nodeArgs.reduce((result, arg) => {
+            result = result.concat(arg.split(' '));
+            return result;
+        }, []);
+    }
+    /**
+     * Whether or not the underlying process is connected
+     */
+    get isConnected() {
+        return this.childProcess && this.childProcess.connected && !this.childProcess.killed;
+    }
+    /**
+     * Start the HTTP server as a child process.
+     */
+    start() {
+        if (this.isConnected) {
+            throw new Error('Http server is already connected. Call restart instead');
+        }
+        this.logger.info(this.childProcess ? 're-starting http server...' : 'starting http server...');
+        this.childProcess = execa_1.default.node(this.sourceFile, [], {
+            buffer: false,
+            stdio: 'inherit',
+            cwd: this.projectRoot,
+            env: {
+                FORCE_COLOR: 'true',
+                ...this.env,
+            },
+            nodeOptions: ['-r', '@adonisjs/assembler/build/register'].concat(this.nodeArgs),
+        });
+        /**
+         * Notify about server events
+         */
+        this.childProcess.on('message', (message) => {
+            if (message && message['isAdonisJS'] && message['environment'] === 'web') {
+                this.emit('ready', message);
+            }
+        });
+        this.childProcess.on('close', (code, signal) => this.emit('close', { code, signal }));
+        this.childProcess.on('exit', (code, signal) => this.emit('exit', { code, signal }));
+    }
+    /**
+     * Stop the underlying process
+     */
+    stop() {
+        if (this.childProcess) {
+            this.childProcess.removeAllListeners();
+            this.childProcess.kill('SIGKILL');
+        }
+    }
+    /**
+     * Restart the server by killing the old one
+     */
+    restart() {
+        this.stop();
+        this.start();
+    }
+}
+exports.HttpServer = HttpServer;

package/build/src/Manifest/index.d.ts

@@ -1,32 +1,32 @@
-import { logger as uiLogger } from '@poppinss/cliui';
-/**
- * Exposes the API to execute generate manifest file
- */
-export declare class Manifest {
-    private appRoot;
-    private logger;
-    /**
-     * The maximum number of times we should attempt to generate
-     * the manifest file before giving up.
-     *
-     * This number may sound too big, but in real world scanerio, we
-     * have seen encountered malformed JSON between 10-12 times.
-     *
-     * The JSON gets malformed, when a parallel process (node ace serve --watch)
-     * is trying to update it.
-     */
-    private maxAttempts;
-    private attempts;
-    constructor(appRoot: string, logger: typeof uiLogger);
-    /**
-     * Returns a boolean telling if the error message is pointing
-     * towards invalid or empty JSON file read attempt.
-     */
-    private isMalformedJSONError;
-    /**
-     * Generates the manifest file. We ignore `generate:manifest` errors for
-     * now, since it's a secondary task for us and one should run it
-     * in seperate process to find the actual errors.
-     */
-    generate(): Promise<boolean>;
-}
+import { logger as uiLogger } from '@poppinss/cliui';
+/**
+ * Exposes the API to execute generate manifest file
+ */
+export declare class Manifest {
+    private appRoot;
+    private logger;
+    /**
+     * The maximum number of times we should attempt to generate
+     * the manifest file before giving up.
+     *
+     * This number may sound too big, but in real world scanerio, we
+     * have seen encountered malformed JSON between 10-12 times.
+     *
+     * The JSON gets malformed, when a parallel process (node ace serve --watch)
+     * is trying to update it.
+     */
+    private maxAttempts;
+    private attempts;
+    constructor(appRoot: string, logger: typeof uiLogger);
+    /**
+     * Returns a boolean telling if the error message is pointing
+     * towards invalid or empty JSON file read attempt.
+     */
+    private isMalformedJSONError;
+    /**
+     * Generates the manifest file. We ignore `generate:manifest` errors for
+     * now, since it's a secondary task for us and one should run it
+     * in seperate process to find the actual errors.
+     */
+    generate(): Promise<boolean>;
+}

package/build/src/Manifest/index.js

@@ -1,88 +1,88 @@
-"use strict";
-/*
- * @adonisjs/assembler
- *
- * (c) Harminder Virk <virk@adonisjs.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Manifest = void 0;
-const execa_1 = __importDefault(require("execa"));
-const WARN_MESSAGE = [
-    'Unable to generate manifest file.',
-    'Check the following error for more info',
-].join(' ');
-/**
- * Exposes the API to execute generate manifest file
- */
-class Manifest {
-    constructor(appRoot, logger) {
-        this.appRoot = appRoot;
-        this.logger = logger;
-        /**
-         * The maximum number of times we should attempt to generate
-         * the manifest file before giving up.
-         *
-         * This number may sound too big, but in real world scanerio, we
-         * have seen encountered malformed JSON between 10-12 times.
-         *
-         * The JSON gets malformed, when a parallel process (node ace serve --watch)
-         * is trying to update it.
-         */
-        this.maxAttempts = 15;
-        this.attempts = 0;
-    }
-    /**
-     * Returns a boolean telling if the error message is pointing
-     * towards invalid or empty JSON file read attempt.
-     */
-    isMalformedJSONError(error) {
-        return error.includes('Unexpected end of JSON input');
-    }
-    /**
-     * Generates the manifest file. We ignore `generate:manifest` errors for
-     * now, since it's a secondary task for us and one should run it
-     * in seperate process to find the actual errors.
-     */
-    async generate() {
-        try {
-            const response = await (0, execa_1.default)(process.execPath, ['ace', 'generate:manifest'], {
-                buffer: true,
-                cwd: this.appRoot,
-                env: {
-                    FORCE_COLOR: 'true',
-                },
-            });
-            /**
-             * Log success
-             */
-            if (response.stdout) {
-                this.logger.log(response.stdout);
-            }
-            return true;
-        }
-        catch (error) {
-            if (this.isMalformedJSONError(error.stderr) && this.attempts < this.maxAttempts) {
-                this.attempts++;
-                return this.generate();
-            }
-            /**
-             * Print warning on error
-             */
-            this.logger.warning(WARN_MESSAGE);
-            if (error.stderr) {
-                this.logger.logError(error.stderr);
-            }
-            if (error.stdout) {
-                this.logger.logError(error.stdout);
-            }
-            return false;
-        }
-    }
-}
-exports.Manifest = Manifest;
+"use strict";
+/*
+ * @adonisjs/assembler
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Manifest = void 0;
+const execa_1 = __importDefault(require("execa"));
+const WARN_MESSAGE = [
+    'Unable to generate manifest file.',
+    'Check the following error for more info',
+].join(' ');
+/**
+ * Exposes the API to execute generate manifest file
+ */
+class Manifest {
+    constructor(appRoot, logger) {
+        this.appRoot = appRoot;
+        this.logger = logger;
+        /**
+         * The maximum number of times we should attempt to generate
+         * the manifest file before giving up.
+         *
+         * This number may sound too big, but in real world scanerio, we
+         * have seen encountered malformed JSON between 10-12 times.
+         *
+         * The JSON gets malformed, when a parallel process (node ace serve --watch)
+         * is trying to update it.
+         */
+        this.maxAttempts = 15;
+        this.attempts = 0;
+    }
+    /**
+     * Returns a boolean telling if the error message is pointing
+     * towards invalid or empty JSON file read attempt.
+     */
+    isMalformedJSONError(error) {
+        return error.includes('Unexpected end of JSON input');
+    }
+    /**
+     * Generates the manifest file. We ignore `generate:manifest` errors for
+     * now, since it's a secondary task for us and one should run it
+     * in seperate process to find the actual errors.
+     */
+    async generate() {
+        try {
+            const response = await (0, execa_1.default)(process.execPath, ['ace', 'generate:manifest'], {
+                buffer: true,
+                cwd: this.appRoot,
+                env: {
+                    FORCE_COLOR: 'true',
+                },
+            });
+            /**
+             * Log success
+             */
+            if (response.stdout) {
+                this.logger.log(response.stdout);
+            }
+            return true;
+        }
+        catch (error) {
+            if (this.isMalformedJSONError(error.stderr) && this.attempts < this.maxAttempts) {
+                this.attempts++;
+                return this.generate();
+            }
+            /**
+             * Print warning on error
+             */
+            this.logger.warning(WARN_MESSAGE);
+            if (error.stderr) {
+                this.logger.logError(error.stderr);
+            }
+            if (error.stdout) {
+                this.logger.logError(error.stdout);
+            }
+            return false;
+        }
+    }
+}
+exports.Manifest = Manifest;