@open-mercato/shared 0.6.2-develop.3461.1.605f31c2c9 → 0.6.2

package/src/modules/registry.ts

@@ -4,6 +4,13 @@ import type { SyncCrudEventResult } from '../lib/crud/sync-event-types'
 import type { DashboardWidgetModule } from './dashboard/widgets'
 import type { InjectionAnyWidgetModule, ModuleInjectionTable } from './widgets/injection'
 import type { IntegrationBundle, IntegrationDefinition } from './integrations/types'
+import {
+  applyApiOverridesToManifests,
+  applyModuleOverridesToModules,
+  applyPageOverridesToManifests,
+  composeApiRouteOverrides,
+  composePageRouteOverrides,
+} from './overrides'
 
 // Context passed to dynamic metadata guards
 export type RouteVisibilityContext = { path?: string; auth?: any }
@@ -396,7 +403,11 @@ export function findApiRouteManifestMatch<T extends { path: string; methods: Htt
 let _backendRouteManifests: BackendRouteManifestEntry[] | null = null
 
 export function registerBackendRouteManifests(routes: BackendRouteManifestEntry[]) {
-  _backendRouteManifests = sortRoutesBySpecificity(routes)
+  const pageOverrides = composePageRouteOverrides()
+  const finalRoutes = Object.keys(pageOverrides).length === 0
+    ? routes
+    : applyPageOverridesToManifests(routes, pageOverrides, 'backend')
+  _backendRouteManifests = sortRoutesBySpecificity(finalRoutes)
 }
 
 export function getBackendRouteManifests(): BackendRouteManifestEntry[] {
@@ -406,7 +417,11 @@ export function getBackendRouteManifests(): BackendRouteManifestEntry[] {
 let _frontendRouteManifests: FrontendRouteManifestEntry[] | null = null
 
 export function registerFrontendRouteManifests(routes: FrontendRouteManifestEntry[]) {
-  _frontendRouteManifests = sortRoutesBySpecificity(routes)
+  const pageOverrides = composePageRouteOverrides()
+  const finalRoutes = Object.keys(pageOverrides).length === 0
+    ? routes
+    : applyPageOverridesToManifests(routes, pageOverrides, 'frontend')
+  _frontendRouteManifests = sortRoutesBySpecificity(finalRoutes)
 }
 
 export function getFrontendRouteManifests(): FrontendRouteManifestEntry[] {
@@ -416,7 +431,15 @@ export function getFrontendRouteManifests(): FrontendRouteManifestEntry[] {
 let _apiRouteManifests: ApiRouteManifestEntry[] | null = null
 
 export function registerApiRouteManifests(routes: ApiRouteManifestEntry[]) {
-  _apiRouteManifests = sortRoutesBySpecificity(routes)
+  // Apply any `entry.overrides.routes.api` overrides registered through the
+  // unified `modules.ts` dispatcher or programmatic API before storing the
+  // manifest. The composer is cheap and returns an empty object when no
+  // overrides exist, so this is a no-op for apps that do not opt in.
+  const routeOverrides = composeApiRouteOverrides()
+  const finalRoutes = Object.keys(routeOverrides).length === 0
+    ? routes
+    : applyApiOverridesToManifests(routes, routeOverrides)
+  _apiRouteManifests = sortRoutesBySpecificity(finalRoutes)
 }
 
 export function getApiRouteManifests(): ApiRouteManifestEntry[] {
@@ -430,7 +453,7 @@ export function registerCliModules(modules: Module[]) {
   if (_cliModules !== null && process.env.NODE_ENV === 'development') {
     console.debug('[Bootstrap] CLI modules re-registered (this may occur during HMR)')
   }
-  _cliModules = modules
+  _cliModules = applyModuleOverridesToModules(modules)
 }
 
 export function getCliModules(): Module[] {

package/src/modules/widgets/__tests__/injection-loader.required-modules.test.ts

@@ -173,4 +173,25 @@ describe('Injection loader — requiredModules gating (#1849)', () => {
     expect(ids).toContain(ALWAYS_AVAILABLE_WIDGET_ID)
     expect(ids).not.toContain(REQUIRES_AI_WIDGET_ID)
   })
+
+  it('loads wildcard spot entries without regex pattern execution', async () => {
+    invalidateInjectionWidgetCache()
+    registerCoreInjectionWidgets([
+      makeWidgetEntry('host', 'host/widgets/injection/always-available/widget.ts', async () => alwaysAvailableWidget),
+    ])
+    registerCoreInjectionTables([
+      {
+        moduleId: 'host',
+        table: {
+          'data-table:host.*:search-trailing': [
+            { widgetId: ALWAYS_AVAILABLE_WIDGET_ID, priority: 50 },
+          ],
+        },
+      },
+    ])
+    registerEnabledModuleIds(['host'])
+
+    const loaded = await loadInjectionWidgetsForSpot(HOST_SPOT_ID)
+    expect(loaded.map((widget) => widget.metadata.id)).toEqual([ALWAYS_AVAILABLE_WIDGET_ID])
+  })
 })

package/src/modules/widgets/injection-loader.ts

@@ -1,4 +1,5 @@
 import type { ModuleInjectionWidgetEntry } from '../registry'
+import { matchWildcardPattern } from '@open-mercato/shared/lib/patterns/wildcard'
 import type {
   InjectionAnyWidgetModule,
   InjectionDataWidgetModule,
@@ -9,6 +10,10 @@ import type {
   ModuleInjectionTable,
   InjectionWidgetPlacement,
 } from './injection'
+import {
+  applyInjectionWidgetOverridesToEntries,
+  applyInjectionWidgetOverridesToTables,
+} from '../overrides'
 
 type LoadedWidgetModule = InjectionWidgetModule<any, any> & { metadata: InjectionWidgetMetadata }
 type LoadedDataWidgetModule = InjectionDataWidgetModule & { metadata: InjectionWidgetMetadata }
@@ -137,8 +142,9 @@ export function registerCoreInjectionWidgets(entries: ModuleInjectionWidgetEntry
   if (_coreInjectionWidgetEntries !== null && process.env.NODE_ENV === 'development') {
     console.debug('[Bootstrap] Core injection widgets re-registered (this may occur during HMR)')
   }
-  _coreInjectionWidgetEntries = entries
-  writeGlobalInjectionWidgets(entries)
+  const finalEntries = applyInjectionWidgetOverridesToEntries(entries)
+  _coreInjectionWidgetEntries = finalEntries
+  writeGlobalInjectionWidgets(finalEntries)
   notifyInjectionRegistryChanged()
 }
 
@@ -159,8 +165,9 @@ export function registerCoreInjectionTables(tables: Array<{ moduleId: string; ta
   if (_coreInjectionTables !== null && process.env.NODE_ENV === 'development') {
     console.debug('[Bootstrap] Core injection tables re-registered (this may occur during HMR)')
   }
-  _coreInjectionTables = tables
-  writeGlobalInjectionTables(tables)
+  const finalTables = applyInjectionWidgetOverridesToTables(tables)
+  _coreInjectionTables = finalTables
+  writeGlobalInjectionTables(finalTables)
   notifyInjectionRegistryChanged()
 }
 
@@ -446,8 +453,7 @@ async function getResolvedEntriesForSpot(spotId: InjectionSpotId): Promise<Table
   for (const [candidateSpotId, candidateEntries] of table.entries()) {
     if (candidateSpotId === spotId) continue
     if (!candidateSpotId.includes('*')) continue
-    const pattern = new RegExp(`^${candidateSpotId.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*')}$`)
-    if (!pattern.test(spotId)) continue
+    if (!matchWildcardPattern(spotId, candidateSpotId)) continue
     wildcardEntries.push(...candidateEntries)
   }