@open-mercato/cli 0.6.3-develop.3525.2.cc18b8a43f → 0.6.3-develop.3562.1.71049275ff

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.6.3-develop.3525.2.cc18b8a43f",
+  "version": "0.6.3-develop.3562.1.71049275ff",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -59,8 +59,8 @@
     "@mikro-orm/decorators": "^7.0.17",
     "@mikro-orm/migrations": "^7.0.17",
     "@mikro-orm/postgresql": "^7.0.17",
-    "@open-mercato/queue": "0.6.3-develop.3525.2.cc18b8a43f",
-    "@open-mercato/shared": "0.6.3-develop.3525.2.cc18b8a43f",
+    "@open-mercato/queue": "0.6.3-develop.3562.1.71049275ff",
+    "@open-mercato/shared": "0.6.3-develop.3562.1.71049275ff",
     "cross-spawn": "^7.0.6",
     "pg": "8.21.0",
     "semver": "^7.8.0",
@@ -70,10 +70,10 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.3-develop.3525.2.cc18b8a43f"
+    "@open-mercato/shared": "0.6.3-develop.3562.1.71049275ff"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.3-develop.3525.2.cc18b8a43f",
+    "@open-mercato/shared": "0.6.3-develop.3562.1.71049275ff",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.9"

package/src/__tests__/mercato.test.ts

@@ -6,6 +6,7 @@ import {
   padByCodePointWidth,
   run,
 } from '../mercato'
+import { pathIncludes } from '../lib/__tests__/path-helpers'
 
 type MockChildAutoExit = { code: number | null; signal?: NodeJS.Signals | null } | undefined
 type MockChildSpawnRouter = (args: string[]) => MockChildAutoExit
@@ -674,7 +675,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -691,7 +692,7 @@ describe('server dev managed process exits', () => {
     }))
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -715,7 +716,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -763,7 +764,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -792,7 +793,7 @@ describe('server dev managed process exits', () => {
 
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -830,7 +831,7 @@ describe('server dev managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -859,7 +860,7 @@ describe('server dev managed process exits', () => {
 
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -932,7 +933,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
       }
     })
@@ -949,7 +950,7 @@ describe('server start managed process exits', () => {
     }))
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 
@@ -973,7 +974,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
       }
     })
@@ -1022,7 +1023,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
         unlinkSync: jest.fn(),
       }
@@ -1089,7 +1090,7 @@ describe('server start managed process exits', () => {
 
       return {
         spawn: jest.fn((_command: string, args: string[]) => {
-          if (args[0]?.includes('next/dist/bin/next')) {
+          if (pathIncludes(args[0] ?? '', 'next/dist/bin/next')) {
             nextSpawnCount += 1
             if (nextSpawnCount === 1) {
               queueMicrotask(() => envChangeCallback?.('/tmp/test-app/.env'))
@@ -1106,7 +1107,7 @@ describe('server start managed process exits', () => {
     const exitCode = await mercado.run(['node', 'mercato', 'server', 'dev'])
     const { spawn } = await import('child_process')
     const nextSpawns = (spawn as jest.Mock).mock.calls.filter((call) =>
-      call[1]?.[0]?.includes('next/dist/bin/next'),
+      pathIncludes(call[1]?.[0] ?? '', 'next/dist/bin/next'),
     )
 
     expect(exitCode).toBe(0)
@@ -1132,7 +1133,7 @@ describe('server start managed process exits', () => {
       return {
         ...actual,
         existsSync: jest.fn((candidate: string) =>
-          candidate.includes('next/dist/bin/next') || candidate.includes('@open-mercato/cli/bin/mercato'),
+          pathIncludes(candidate, 'next/dist/bin/next') || pathIncludes(candidate, '@open-mercato/cli/bin/mercato'),
         ),
       }
     })
@@ -1159,7 +1160,7 @@ describe('server start managed process exits', () => {
 
     jest.doMock('child_process', () =>
       buildMockChildProcessModule((args) =>
-        args[0]?.includes('next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
+        pathIncludes(args[0] ?? '', 'next/dist/bin/next') ? { code: null, signal: 'SIGTERM' } : undefined,
       ),
     )
 

package/src/lib/__tests__/dev-env-reload.test.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { createDevEnvReloader, resolveDevEnvFilePaths } from '../dev-env-reload'
+import { normalizeTestPath } from './path-helpers'
 
 describe('dev env reload helpers', () => {
   let appDir: string
@@ -15,7 +16,7 @@ describe('dev env reload helpers', () => {
   })
 
   it('resolves app env files in low-to-high dev precedence order', () => {
-    expect(resolveDevEnvFilePaths('/tmp/app')).toEqual([
+    expect(resolveDevEnvFilePaths('/tmp/app').map(normalizeTestPath)).toEqual([
       '/tmp/app/.env',
       '/tmp/app/.env.development',
       '/tmp/app/.env.local',

package/src/lib/__tests__/path-helpers.ts

@@ -0,0 +1,7 @@
+export function normalizeTestPath(value: string): string {
+  return value.replace(/\\/g, '/')
+}
+
+export function pathIncludes(value: string, needle: string): boolean {
+  return normalizeTestPath(value).includes(normalizeTestPath(needle))
+}

package/src/lib/db/__tests__/commands.test.ts

@@ -13,6 +13,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import type { ModuleEntry, PackageResolver } from '../../resolver'
+import { normalizeTestPath } from '../../__tests__/path-helpers'
 
 describe('db commands security', () => {
   describe('sanitizeModuleId', () => {
@@ -189,7 +190,7 @@ describe('resolveGeneratedMigrationPath', () => {
       '/repo/src/modules/example/migrations',
     )
 
-    expect(result).toBe('/repo/src/modules/example/migrations/Migration20260506101927.ts')
+    expect(normalizeTestPath(result)).toBe('/repo/src/modules/example/migrations/Migration20260506101927.ts')
   })
 
   it('keeps absolute MikroORM results unchanged', () => {

package/src/lib/testing/__tests__/integration.test.ts

@@ -156,7 +156,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, 60000)
 
   it('reuses an existing environment with checkout wrapper injections only when explicitly enabled', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -184,7 +184,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, 60000)
 
   it('reuses an existing environment when /login returns a redirect status other than 302', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -216,7 +216,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, 60000)
 
   it('reuses an existing environment when /login returns healthy HTML without static asset references', async () => {
     const baseUrl = 'http://127.0.0.1:5001'
@@ -251,7 +251,7 @@ describe('integration cache and options', () => {
     } finally {
       fetchSpy.mockRestore()
     }
-  }, 20000)
+  }, 60000)
 
   it('falls back to rebuilding when the ephemeral environment state is unreachable', async () => {
     const baseUrl = 'http://127.0.0.1:5001'