Optimize empty path checking

Author: melissaluu

packages/app/src/cli/services/build/steps/include-assets/copy-config-key-entry.test.ts

@@ -361,7 +361,13 @@ describe('copyConfigKeyEntry', () => {
         const outDir = joinPath(tmpDir, 'out')
         await mkdir(outDir)
         const context = makeContext({assets: ''})
-        const promise = copyConfigKeyEntry({key: 'assets', baseDir: tmpDir, outputDir: outDir, context})
+        const promise = copyConfigKeyEntry({
+          key: 'assets',
+          baseDir: tmpDir,
+          outputDir: outDir,
+          context,
+          appDirectory: tmpDir,
+        })
         await expect(promise).rejects.toThrow(AbortError)
         await expect(promise).rejects.toThrow(`'assets' can't be empty.`)
       })
@@ -372,13 +378,19 @@ describe('copyConfigKeyEntry', () => {
         const outDir = joinPath(tmpDir, 'out')
         await mkdir(outDir)
         const context = makeContext({assets: '   '})
-        const promise = copyConfigKeyEntry({key: 'assets', baseDir: tmpDir, outputDir: outDir, context})
+        const promise = copyConfigKeyEntry({
+          key: 'assets',
+          baseDir: tmpDir,
+          outputDir: outDir,
+          context,
+          appDirectory: tmpDir,
+        })
         await expect(promise).rejects.toThrow(AbortError)
         await expect(promise).rejects.toThrow(`'assets' can't be empty.`)
       })
     })
 
-    test('throws with the field name only, not the full configKey, when the key is nested', async () => {
+    test('throws with the full configKey when the key is nested', async () => {
       await inTemporaryDirectory(async (tmpDir) => {
         const outDir = joinPath(tmpDir, 'out')
         await mkdir(outDir)
@@ -388,9 +400,10 @@ describe('copyConfigKeyEntry', () => {
           baseDir: tmpDir,
           outputDir: outDir,
           context,
+          appDirectory: tmpDir,
         })
         await expect(promise).rejects.toThrow(AbortError)
-        await expect(promise).rejects.toThrow(`'assets' can't be empty.`)
+        await expect(promise).rejects.toThrow(`'extension_points[].assets' can't be empty.`)
       })
     })
   })

packages/app/src/cli/services/build/steps/include-assets/copy-config-key-entry.ts

@@ -51,6 +51,12 @@ export async function copyConfigKeyEntry(config: {
     paths = []
   }
 
+  for (const sourcePath of paths) {
+    if (sourcePath.trim() === '') {
+      throw new AbortError(`'${key}' can't be empty.`)
+    }
+  }
+
   if (paths.length === 0) {
     outputDebug(`No value for configKey '${key}', skipping\n`, stdout)
     return {filesCopied: 0, pathMap: new Map()}
@@ -62,13 +68,6 @@ export async function copyConfigKeyEntry(config: {
   // should only be copied once; the pathMap entry is reused for all references.
   const uniquePaths = [...new Set(paths)]
 
-  const fieldName = key.split('.').pop()?.replace(/\[\]$/, '') ?? key
-  for (const sourcePath of uniquePaths) {
-    if (sourcePath.trim() === '') {
-      throw new AbortError(`'${fieldName}' can't be empty.`)
-    }
-  }
-
   // Process sequentially to avoid filesystem race conditions on shared output paths.
   const pathMap = new Map<string, string | string[]>()
   let filesCopied = 0