refactor: use latest version of cpy

Author: thetutlage

src/bundler.ts

@@ -8,15 +8,14 @@
  */
 
 import slash from 'slash'
-import copyfiles from 'cpy'
 import fs from 'node:fs/promises'
 import type tsStatic from 'typescript'
 import { fileURLToPath } from 'node:url'
 import { join, relative } from 'node:path'
 import { cliui, type Logger } from '@poppinss/cliui'
 
-import { run, parseConfig } from './helpers.js'
 import type { BundlerOptions } from './types.js'
+import { run, parseConfig, copyFiles } from './helpers.js'
 
 /**
  * Instance of CLIUI
@@ -101,7 +100,7 @@ export class Bundler {
    */
   async #copyFiles(files: string[], outDir: string) {
     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")) {
         throw error

src/debug.ts

@@ -0,0 +1,12 @@
+/*
+ * @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')

src/helpers.ts

@@ -7,14 +7,19 @@
  * 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 type tsStatic from 'typescript'
 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 type { RunOptions, WatchOptions } from './types.js'
+import debug from './debug.js'
 
 /**
  * Default set of args to pass in order to run TypeScript
@@ -160,3 +165,45 @@ export async function getPort(cwd: URL): Promise<number> {
    */
   return getRandomPort({ port: 3333 })
 }
+
+/**
+ * Helper function to copy files from relative paths or glob
+ * patterns
+ */
+export async function copyFiles(files: string[], cwd: string, outDir: string) {
+  /**
+   * Looping over files and create a new collection with paths
+   * and glob patterns
+   */
+  const { paths, patterns } = files.reduce<{ patterns: string[]; paths: string[] }>(
+    (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,
+  })
+}

tests/watch.spec.ts

@@ -11,7 +11,9 @@ import ts from 'typescript'
 import { test } from '@japa/runner'
 import { watch } from '../src/helpers.js'
 
-test.group('Watcher', () => {
+test.group('Watcher', (group) => {
+  group.tap((t) => t.disableTimeout())
+
   test('watch files included by the tsconfig.json', async ({ fs, assert, cleanup }, done) => {
     assert.plan(1)