@adonisjs/assembler 6.1.3-11 → 6.1.3-13

package/build/src/bundler.js

@@ -7,12 +7,11 @@
  * file that was distributed with this source code.
  */
 import slash from 'slash';
-import copyfiles from 'cpy';
 import fs from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import { join, relative } from 'node:path';
 import { cliui } from '@poppinss/cliui';
-import { run, parseConfig } from './helpers.js';
+import { run, parseConfig, copyFiles } from './helpers.js';
 /**
  * Instance of CLIUI
  */
@@ -89,7 +88,7 @@ export class Bundler {
      */
     async #copyFiles(files, outDir) {
         try {
-            await copyfiles(files, outDir, { parents: true, cwd: this.#cwdPath });
+            await copyFiles(files, this.#cwdPath, outDir);
         }
         catch (error) {
             if (!error.message.includes("the file doesn't exist")) {

package/build/src/debug.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" resolution-mode="require"/>
+declare const _default: import("util").DebugLogger;
+export default _default;

package/build/src/debug.js

@@ -0,0 +1,10 @@
+/*
+ * @adonisjs/assembler
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+import { debuglog } from 'node:util';
+export default debuglog('adonisjs:assembler');

package/build/src/helpers.d.ts

@@ -43,3 +43,8 @@ export declare function isRcFile(filePath: string): boolean;
  *   stops after first find.
  */
 export declare function getPort(cwd: URL): Promise<number>;
+/**
+ * Helper function to copy files from relative paths or glob
+ * patterns
+ */
+export declare function copyFiles(files: string[], cwd: string, outDir: string): Promise<string[]>;

package/build/src/helpers.js

@@ -6,11 +6,16 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+import cpy from 'cpy';
+import { isNotJunk } from 'junk';
+import fastGlob from 'fast-glob';
 import getRandomPort from 'get-port';
 import { fileURLToPath } from 'node:url';
 import { execaNode, execa } from 'execa';
+import { isAbsolute, relative } from 'node:path';
 import { EnvLoader, EnvParser } from '@adonisjs/env';
 import { ConfigParser, Watcher } from '@poppinss/chokidar-ts';
+import debug from './debug.js';
 /**
  * Default set of args to pass in order to run TypeScript
  * source. Used by "run" and "runNode" scripts
@@ -140,3 +145,37 @@ export async function getPort(cwd) {
      */
     return getRandomPort({ port: 3333 });
 }
+/**
+ * Helper function to copy files from relative paths or glob
+ * patterns
+ */
+export async function copyFiles(files, cwd, outDir) {
+    /**
+     * Looping over files and create a new collection with paths
+     * and glob patterns
+     */
+    const { paths, patterns } = files.reduce((result, file) => {
+        if (fastGlob.isDynamicPattern(file)) {
+            result.patterns.push(file);
+        }
+        else {
+            result.paths.push(file);
+        }
+        return result;
+    }, { patterns: [], paths: [] });
+    debug('copyFiles inputs: %O, paths: %O, patterns: %O', files, paths, patterns);
+    /**
+     * Getting list of relative paths from glob patterns
+     */
+    const filePaths = paths.concat(await fastGlob(patterns, { cwd }));
+    /**
+     * Computing relative destination. This is because, cpy is buggy when
+     * outDir is an absolute path.
+     */
+    const destination = isAbsolute(outDir) ? relative(cwd, outDir) : outDir;
+    debug('copying files %O to destination "%s"', filePaths, destination);
+    return cpy(filePaths.filter(isNotJunk), destination, {
+        cwd: cwd,
+        flat: false,
+    });
+}

package/build/src/test_runner.js

@@ -65,7 +65,7 @@ export class TestRunner {
         })
             .map((suite) => suite.files)
             .flat(1));
-        this.#scriptArgs = this.#convertOptionsToArgs();
+        this.#scriptArgs = this.#convertOptionsToArgs().concat(this.#options.scriptArgs);
         this.#initialFiltersArgs = this.#convertFiltersToArgs(this.#options.filters);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "6.1.3-11",
+  "version": "6.1.3-13",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
   "main": "build/index.js",
   "type": "module",
@@ -66,9 +66,11 @@
     "@adonisjs/env": "^4.2.0-3",
     "@poppinss/chokidar-ts": "^4.1.0-4",
     "@poppinss/cliui": "^6.1.1-3",
-    "cpy": "^8.1.2",
+    "cpy": "^10.1.0",
     "execa": "^7.0.0",
+    "fast-glob": "^3.3.0",
     "get-port": "^7.0.0",
+    "junk": "^4.0.1",
     "picomatch": "^2.3.1",
     "slash": "^5.1.0"
   },