fix(update-helpers): manage nested directories paths

Author: Avivbens

package.json

@@ -55,7 +55,9 @@
         "moduleNameMapper": {
             "^@db/(.*)$": "<rootDir>/common/db/$1",
             "^@common/(.*)$": "<rootDir>/common/$1",
-            "^@auth/(.*)$": "<rootDir>/auth/$1"
+            "^@auth/(.*)$": "<rootDir>/auth/$1",
+            "^@models/(.*)$": "<rootDir>/models/$1",
+            "^@bundler/(.*)$": "<rootDir>/bundler/$1"
         },
         "rootDir": "src",
         "testEnvironment": "node",

src/bundler/services/updates-helpers.service.spec.ts

@@ -35,7 +35,7 @@ describe('includeUpdatesHelpers', () => {
             productionScripts: ['src/bookmarks.ts'],
         })
 
-        globMock.mockResolvedValue(['src/bookmarks.ts'])
+        globMock.mockResolvedValue(['esbuild/bookmarks.js'])
     })
 
     it('should not do anything if not enabled', async () => {
@@ -431,3 +431,86 @@ describe('dropUpdateHelpers', () => {
         expect(Object.keys(finalWorkflow.uidata).every((k) => !k.includes(MANAGED_BY_FAST_ALFRED_PREFIX))).toBe(true)
     })
 })
+
+describe('Nested directory handling', () => {
+    const globMock = glob as unknown as jest.Mock
+    const readConfigFileMock = readConfigFile as jest.Mock
+    const readWorkflowMetadataMock = readWorkflowMetadata as jest.Mock
+    const writeWorkflowMetadataMock = writeWorkflowMetadata as jest.Mock
+    const buildOptionsMock = require('../utils/bundler.utils').buildOptions as jest.Mock
+
+    beforeEach(() => {
+        jest.clearAllMocks()
+        readConfigFileMock.mockResolvedValue({
+            updates: {
+                bundleHelpers: true,
+            },
+        })
+    })
+
+    it('should match nested script paths with ** glob pattern', async () => {
+        buildOptionsMock.mockResolvedValue({
+            targetDir: 'esbuild',
+            assetsDir: 'assets',
+            productionScripts: ['src/main/**/*.ts'],
+        })
+
+        globMock.mockResolvedValue([
+            'esbuild/translate/translate.js',
+            'esbuild/translate/select-language.js',
+            'esbuild/tones.js',
+        ])
+
+        const mockWorkflow = JSON.parse(JSON.stringify(workflowMock))
+        mockWorkflow.objects.push({
+            type: 'alfred.workflow.input.scriptfilter',
+            uid: 'NESTED-UID',
+            config: {
+                script: 'esbuild/translate/translate.js',
+            },
+        })
+        mockWorkflow.connections['NESTED-UID'] = [{ destinationuid: 'ACTION-UID', modifiers: 0 }]
+        mockWorkflow.uidata['NESTED-UID'] = { xpos: 100, ypos: 100 }
+
+        readWorkflowMetadataMock.mockResolvedValue(mockWorkflow)
+
+        await includeUpdatesHelpers()
+
+        expect(writeWorkflowMetadataMock).toHaveBeenCalledTimes(1)
+        const finalWorkflow = writeWorkflowMetadataMock.mock.calls[0][0]
+        const conditionalUid = CONDITIONAL_OBJECT_UID('NESTED-UID', 'ACTION-UID')
+
+        expect(finalWorkflow.connections['NESTED-UID'][0].destinationuid).toBe(conditionalUid)
+    })
+
+    it('should match flat script paths with single-level glob', async () => {
+        buildOptionsMock.mockResolvedValue({
+            targetDir: 'esbuild',
+            assetsDir: 'assets',
+            productionScripts: ['src/main/*.ts'],
+        })
+
+        globMock.mockResolvedValue(['esbuild/tones.js'])
+
+        const mockWorkflow = JSON.parse(JSON.stringify(workflowMock))
+        mockWorkflow.objects.push({
+            type: 'alfred.workflow.input.scriptfilter',
+            uid: 'FLAT-UID',
+            config: {
+                script: 'esbuild/tones.js',
+            },
+        })
+        mockWorkflow.connections['FLAT-UID'] = [{ destinationuid: 'ACTION-UID', modifiers: 0 }]
+        mockWorkflow.uidata['FLAT-UID'] = { xpos: 100, ypos: 100 }
+
+        readWorkflowMetadataMock.mockResolvedValue(mockWorkflow)
+
+        await includeUpdatesHelpers()
+
+        expect(writeWorkflowMetadataMock).toHaveBeenCalledTimes(1)
+        const finalWorkflow = writeWorkflowMetadataMock.mock.calls[0][0]
+        const conditionalUid = CONDITIONAL_OBJECT_UID('FLAT-UID', 'ACTION-UID')
+
+        expect(finalWorkflow.connections['FLAT-UID'][0].destinationuid).toBe(conditionalUid)
+    })
+})

src/bundler/services/updates-helpers.service.ts

@@ -1,5 +1,5 @@
 import { glob } from 'glob'
-import { basename, extname, join } from 'node:path'
+import { basename, join, relative } from 'node:path'
 import { readConfigFile } from '@common/user-config.service'
 import { readWorkflowMetadata, writeWorkflowMetadata } from '@common/workflow-metadata.service'
 import { UserConfigVariables } from '@models/client-updates-config.model'
@@ -123,15 +123,12 @@ async function getTargetUids(
         return []
     }
 
-    const sourceFiles = await glob(productionScripts)
+    const builtJsFiles = await glob(`${targetDir}/**/*.js`)
 
-    const mainScriptPaths = sourceFiles.map((file) => {
-        const suffix = extname(file)
-        const baseName = basename(file, suffix)
-
-        const targetedFile = `${baseName}.js`
+    const mainScriptPaths = builtJsFiles.map((filePath) => {
+        const relativePath = relative(targetDir, filePath)
         const targetDirName = basename(targetDir)
-        return join(targetDirName, targetedFile)
+        return join(targetDirName, relativePath)
     })
 
     const targetUids: string[] = workflow?.objects