@adonisjs/assembler 6.1.3-20 → 6.1.3-22

package/build/src/bundler.js

@@ -8,8 +8,8 @@
  */
 import slash from 'slash';
 import fs from 'node:fs/promises';
+import { relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { join, relative } from 'node:path';
 import { cliui } from '@poppinss/cliui';
 import { run, parseConfig, copyFiles } from './helpers.js';
 /**
@@ -105,18 +105,6 @@ export class Bundler {
             .concat(additionalFilesToCopy);
         await this.#copyFiles(metaFiles, outDir);
     }
-    /**
-     * Copies .adonisrc.json file to the destination
-     */
-    async #copyAdonisRcFile(outDir) {
-        const existingContents = JSON.parse(await fs.readFile(join(this.#cwdPath, '.adonisrc.json'), 'utf-8'));
-        const compiledContents = Object.assign({}, existingContents, {
-            typescript: false,
-            lastCompiledAt: new Date().toISOString(),
-        });
-        await fs.mkdir(outDir, { recursive: true });
-        await fs.writeFile(join(outDir, '.adonisrc.json'), JSON.stringify(compiledContents, null, 2) + '\n');
-    }
     /**
      * Returns the lock file name for a given packages client
      */
@@ -200,11 +188,6 @@ export class Bundler {
         const pkgFiles = ['package.json', this.#getClientLockFile(client)];
         this.#logger.info('copying meta files to the output directory');
         await this.#copyMetaFiles(outDir, pkgFiles);
-        /**
-         * Step 6: Copy .adonisrc.json file to the build directory
-         */
-        this.#logger.info('copying .adonisrc.json file to the output directory');
-        await this.#copyAdonisRcFile(outDir);
         this.#logger.success('build completed');
         this.#logger.log('');
         /**

package/build/src/code_transformer/main.js

@@ -63,28 +63,28 @@ export class CodeTransformer {
         /**
          * Delete the existing middleware if it exists
          */
-        const existingMiddleware = arrayLiteralExpression
+        const existingMiddlewareIndex = arrayLiteralExpression
             .getElements()
             .findIndex((element) => element.getText() === middleware);
-        if (existingMiddleware !== -1) {
-            arrayLiteralExpression.removeElement(existingMiddleware);
-        }
-        /**
-         * Add the middleware to the top or bottom of the array
-         */
-        if (middlewareEntry.position === 'before') {
-            arrayLiteralExpression.insertElement(0, middleware);
-        }
-        else {
-            arrayLiteralExpression.addElement(middleware);
+        if (existingMiddlewareIndex === -1) {
+            /**
+             * Add the middleware to the top or bottom of the array
+             */
+            if (middlewareEntry.position === 'before') {
+                arrayLiteralExpression.insertElement(0, middleware);
+            }
+            else {
+                arrayLiteralExpression.addElement(middleware);
+            }
         }
     }
     /**
      * Add a new middleware to the named middleware of the given file
      */
     #addToNamedMiddleware(file, middlewareEntry) {
-        if (!middlewareEntry.name)
+        if (!middlewareEntry.name) {
             throw new Error('Named middleware requires a name.');
+        }
         const callArguments = file
             .getVariableDeclarationOrThrow('middleware')
             .getInitializerIfKindOrThrow(SyntaxKind.CallExpression)
@@ -100,20 +100,21 @@ export class CodeTransformer {
          * Check if property is already defined. If so, remove it
          */
         const existingProperty = namedMiddlewareObject.getProperty(middlewareEntry.name);
-        if (existingProperty)
-            existingProperty.remove();
-        /**
-         * Add the named middleware
-         */
-        const middleware = `${middlewareEntry.name}: () => import('${middlewareEntry.path}')`;
-        namedMiddlewareObject.insertProperty(0, middleware);
+        if (!existingProperty) {
+            /**
+             * Add the named middleware
+             */
+            const middleware = `${middlewareEntry.name}: () => import('${middlewareEntry.path}')`;
+            namedMiddlewareObject.insertProperty(0, middleware);
+        }
     }
     /**
      * Write a leading comment
      */
     #addLeadingComment(writer, comment) {
-        if (!comment)
+        if (!comment) {
             return writer.blankLine();
+        }
         return writer
             .blankLine()
             .writeLine('/*')
@@ -173,7 +174,7 @@ export class CodeTransformer {
         if (!Node.isObjectLiteralExpression(objectLiteralExpression)) {
             throw new Error(`The second argument of Env.create is not an object literal.`);
         }
-        let firstAdded = false;
+        let shouldAddComment = true;
         /**
          * Add each variable validation
          */
@@ -182,18 +183,29 @@ export class CodeTransformer {
              * Check if the variable is already defined. If so, remove it
              */
             const existingProperty = objectLiteralExpression.getProperty(variable);
-            if (existingProperty)
-                existingProperty.remove();
-            objectLiteralExpression.addPropertyAssignment({
-                name: variable,
-                initializer: validation,
-                leadingTrivia: (writer) => {
-                    if (firstAdded)
-                        return;
-                    firstAdded = true;
-                    return this.#addLeadingComment(writer, definition.leadingComment);
-                },
-            });
+            /**
+             * Do not add leading comment if one or more properties
+             * already exists
+             */
+            if (existingProperty) {
+                shouldAddComment = false;
+            }
+            /**
+             * Add property only when the property does not exist
+             */
+            if (!existingProperty) {
+                objectLiteralExpression.addPropertyAssignment({
+                    name: variable,
+                    initializer: validation,
+                    leadingTrivia: (writer) => {
+                        if (!shouldAddComment) {
+                            return;
+                        }
+                        shouldAddComment = false;
+                        return this.#addLeadingComment(writer, definition.leadingComment);
+                    },
+                });
+            }
         }
         file.formatText(this.#editorSettings);
         await file.save();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/assembler",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
-  "version": "6.1.3-20",
+  "version": "6.1.3-22",
   "engines": {
     "node": ">=18.16.0"
   },