@open-mercato/shared 0.6.5-canary.4425.1.75a266b232 → 0.6.5-develop.4384.1.ce2ec6eaaa
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/dist/lib/crud/factory.js +0 -16
- package/dist/lib/crud/factory.js.map +2 -2
- package/dist/lib/di/container.js +2 -18
- package/dist/lib/di/container.js.map +2 -2
- package/dist/lib/i18n/context.js +0 -5
- package/dist/lib/i18n/context.js.map +2 -2
- package/dist/lib/version.js +1 -1
- package/dist/lib/version.js.map +1 -1
- package/dist/modules/integrations/types.js.map +2 -2
- package/package.json +2 -2
- package/src/lib/crud/__tests__/crud-factory.test.ts +0 -106
- package/src/lib/crud/factory.ts +0 -23
- package/src/lib/di/container.ts +1 -17
- package/src/lib/i18n/context.tsx +0 -11
- package/src/modules/integrations/types.ts +0 -14
- package/src/modules/notifications/handler.ts +0 -7
- package/dist/lib/crud/optimistic-lock-command.js +0 -109
- package/dist/lib/crud/optimistic-lock-command.js.map +0 -7
- package/dist/lib/crud/optimistic-lock-headers.js +0 -15
- package/dist/lib/crud/optimistic-lock-headers.js.map +0 -7
- package/dist/lib/crud/optimistic-lock-store.js +0 -52
- package/dist/lib/crud/optimistic-lock-store.js.map +0 -7
- package/dist/lib/crud/optimistic-lock.js +0 -172
- package/dist/lib/crud/optimistic-lock.js.map +0 -7
- package/src/lib/crud/__tests__/optimistic-lock-command.test.ts +0 -425
- package/src/lib/crud/__tests__/optimistic-lock-store.test.ts +0 -194
- package/src/lib/crud/__tests__/optimistic-lock.test.ts +0 -493
- package/src/lib/crud/optimistic-lock-command.ts +0 -305
- package/src/lib/crud/optimistic-lock-headers.ts +0 -30
- package/src/lib/crud/optimistic-lock-store.ts +0 -87
- package/src/lib/crud/optimistic-lock.ts +0 -379
package/dist/lib/di/container.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createContainer, asValue, InjectionMode } from "awilix";
|
|
2
2
|
import { RequestContext } from "@mikro-orm/core";
|
|
3
3
|
import { getOrm } from "@open-mercato/shared/lib/db/mikro";
|
|
4
4
|
import { BasicQueryEngine } from "@open-mercato/shared/lib/query/engine";
|
|
5
5
|
import { DefaultDataEngine } from "@open-mercato/shared/lib/data/engine";
|
|
6
6
|
import { commandRegistry, CommandBus } from "@open-mercato/shared/lib/commands";
|
|
7
7
|
import { applyDiOverridesToContainer } from "@open-mercato/shared/modules/overrides";
|
|
8
|
-
import { createOptimisticLockGuardService } from "@open-mercato/shared/lib/crud/optimistic-lock";
|
|
9
|
-
import { getAllOptimisticLockReaders } from "@open-mercato/shared/lib/crud/optimistic-lock-store";
|
|
10
8
|
const GLOBAL_KEY = "__openMercatoDiRegistrars__";
|
|
11
9
|
const BOOTSTRAP_CACHE_KEY = "__openMercatoBootstrapCache__";
|
|
12
10
|
const ENCRYPTION_ENABLED_KEY = "__openMercatoEncryptionEnabledCache__";
|
|
@@ -113,21 +111,7 @@ async function createRequestContainer() {
|
|
|
113
111
|
})),
|
|
114
112
|
dataEngine: asValue(new DefaultDataEngine(em, container)),
|
|
115
113
|
commandRegistry: asValue(commandRegistry),
|
|
116
|
-
commandBus: asValue(new CommandBus())
|
|
117
|
-
// Default OSS optimistic-lock guard. Reads from the global reader store
|
|
118
|
-
// (populated by `makeCrudRoute` auto-registration + any module-DI
|
|
119
|
-
// hand-wired calls to `registerOptimisticLockReaders`). Service is
|
|
120
|
-
// strictly additive: when `OM_OPTIMISTIC_LOCK=off` (or no header is
|
|
121
|
-
// sent) it short-circuits at validateMutation. Module-level di.ts
|
|
122
|
-
// registrations override this default via Awilix replace semantics —
|
|
123
|
-
// see the enterprise `record_locks` module for the canonical override.
|
|
124
|
-
// Spec: .ai/specs/2026-05-25-oss-optimistic-locking.md
|
|
125
|
-
crudMutationGuardService: asFunction(
|
|
126
|
-
({ em: scopedEm }) => createOptimisticLockGuardService({
|
|
127
|
-
getEm: () => scopedEm,
|
|
128
|
-
readers: getAllOptimisticLockReaders()
|
|
129
|
-
})
|
|
130
|
-
).scoped()
|
|
114
|
+
commandBus: asValue(new CommandBus())
|
|
131
115
|
});
|
|
132
116
|
for (const reg of diRegistrars) {
|
|
133
117
|
try {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/di/container.ts"],
|
|
4
|
-
"sourcesContent": ["import { asFunction, createContainer, asValue, AwilixContainer, InjectionMode, type Resolver } from 'awilix'\nimport { RequestContext } from '@mikro-orm/core'\nimport { getOrm } from '@open-mercato/shared/lib/db/mikro'\nimport { EntityManager } from '@mikro-orm/postgresql'\nimport { BasicQueryEngine } from '@open-mercato/shared/lib/query/engine'\nimport { DefaultDataEngine } from '@open-mercato/shared/lib/data/engine'\nimport { commandRegistry, CommandBus } from '@open-mercato/shared/lib/commands'\nimport { applyDiOverridesToContainer } from '@open-mercato/shared/modules/overrides'\nimport { createOptimisticLockGuardService } from '@open-mercato/shared/lib/crud/optimistic-lock'\nimport { getAllOptimisticLockReaders } from '@open-mercato/shared/lib/crud/optimistic-lock-store'\n\ntype DynamicCradle = Record<string, any>\n\nexport type AppContainer = AwilixContainer<DynamicCradle>\nexport type DiRegistrar = (container: AppContainer) => void\n\n// Registration pattern for publishable packages\n// Use globalThis to survive tsx/esbuild module duplication issue where the same\n// file can be loaded as multiple module instances when mixing dynamic and static imports\nconst GLOBAL_KEY = '__openMercatoDiRegistrars__'\n// Phase 5 \u2014 process-scoped bootstrap cache. The cache/event-bus/encryption\n// services bootstrap() creates are inherently process-scoped (they hold\n// state across requests). Caching them on globalThis after the first\n// successful bootstrap call lets every subsequent request skip the\n// `await bootstrap(container)` body and just re-register the cached\n// instances. Same globalThis pattern as registerDiRegistrars so HMR\n// keeps working.\nconst BOOTSTRAP_CACHE_KEY = '__openMercatoBootstrapCache__'\nconst ENCRYPTION_ENABLED_KEY = '__openMercatoEncryptionEnabledCache__'\n\nconst BOOTSTRAP_CACHE_KEYS = [\n 'cache',\n 'eventBus',\n 'kmsService',\n 'tenantEncryptionService',\n 'rateLimiterService',\n 'searchModuleConfigs',\n 'searchIndexer',\n] as const\n\ntype BootstrapCacheEntry = Partial<Record<(typeof BOOTSTRAP_CACHE_KEYS)[number], unknown>>\n\n// Phase 5 is opt-in. Some bootstrap services close over per-request state\n// (e.g. tenantEncryptionService captures the first request's `em.fork`, the\n// event-bus's resolver closes over the first container) so naively replaying\n// them on later requests yields stale references \u2014 observed as a 500 from\n// CRUD list endpoints in `next start`. Default OFF preserves develop's\n// per-request bootstrap. Set `OM_BOOTSTRAP_CACHE=1` to opt in once each\n// cached service is verified safe for cross-request reuse.\nfunction isBootstrapCacheEnabled(): boolean {\n const raw = process.env.OM_BOOTSTRAP_CACHE\n if (raw === undefined) return false\n const normalized = raw.trim().toLowerCase()\n if (!normalized.length) return false\n if (normalized === '0' || normalized === 'off' || normalized === 'false' || normalized === 'no') return false\n return true\n}\n\nfunction getBootstrapCache(): BootstrapCacheEntry | null {\n if (!isBootstrapCacheEnabled()) return null\n const existing = (globalThis as any)[BOOTSTRAP_CACHE_KEY]\n return existing && typeof existing === 'object' ? (existing as BootstrapCacheEntry) : null\n}\n\nfunction setBootstrapCache(entry: BootstrapCacheEntry): void {\n if (!isBootstrapCacheEnabled()) return\n ;(globalThis as any)[BOOTSTRAP_CACHE_KEY] = entry\n}\n\nfunction harvestBootstrapCache(container: AwilixContainer): BootstrapCacheEntry {\n const entry: BootstrapCacheEntry = {}\n for (const key of BOOTSTRAP_CACHE_KEYS) {\n try {\n const value: unknown = container.resolve(key as never)\n if (value !== undefined && value !== null) entry[key] = value\n } catch {\n // not registered \u2014 skip\n }\n }\n return entry\n}\n\ntype EncryptionEnabledProbe = { isEnabled?: () => boolean } | null | undefined\n\nfunction getCachedEncryptionEnabled(service: EncryptionEnabledProbe): boolean | null {\n if (!service || typeof service.isEnabled !== 'function') return false\n const cached = (globalThis as Record<string, unknown>)[ENCRYPTION_ENABLED_KEY]\n if (typeof cached === 'boolean') return cached\n try {\n const result = !!service.isEnabled()\n ;(globalThis as Record<string, unknown>)[ENCRYPTION_ENABLED_KEY] = result\n return result\n } catch {\n return null\n }\n}\n\nfunction getGlobalRegistrars(): DiRegistrar[] | null {\n return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalRegistrars(registrars: DiRegistrar[]): void {\n (globalThis as any)[GLOBAL_KEY] = registrars\n}\n\nexport function registerDiRegistrars(registrars: DiRegistrar[]) {\n const existing = getGlobalRegistrars()\n if (existing !== null && process.env.NODE_ENV === 'development') {\n console.debug('[Bootstrap] DI registrars re-registered (this may occur during HMR)')\n }\n setGlobalRegistrars(registrars)\n // Force re-bootstrap on HMR \u2014 module subscribers may have changed.\n ;(globalThis as any)[BOOTSTRAP_CACHE_KEY] = null\n ;(globalThis as any)[ENCRYPTION_ENABLED_KEY] = undefined\n}\n\nexport function getDiRegistrars(): DiRegistrar[] {\n const registrars = getGlobalRegistrars()\n if (!registrars) {\n throw new Error('[Bootstrap] DI registrars not registered. Call registerDiRegistrars() at bootstrap.')\n }\n return registrars\n}\n\n/** Test-only helper to drop the process-scoped bootstrap cache. */\nexport function resetBootstrapCache(): void {\n (globalThis as any)[BOOTSTRAP_CACHE_KEY] = null\n ;(globalThis as any)[ENCRYPTION_ENABLED_KEY] = undefined\n}\n\nfunction isAwilixResolver(value: unknown): value is Resolver<unknown> {\n return Boolean(value && typeof value === 'object' && typeof (value as { resolve?: unknown }).resolve === 'function')\n}\n\nfunction toAwilixRegistrations(registrations: Record<string, unknown>): Record<string, Resolver<any>> {\n return Object.fromEntries(\n Object.entries(registrations).map(([key, value]) => [\n key,\n isAwilixResolver(value) ? value : asValue(value),\n ]),\n )\n}\n\nexport async function createRequestContainer(): Promise<AppContainer> {\n const diRegistrars = getDiRegistrars()\n const orm = await getOrm()\n // Use a fresh event manager so request-level subscribers (e.g., encryption) don't pile up globally\n const baseEm = (RequestContext.getEntityManager() as any) ?? orm.em\n const em = baseEm.fork({ clear: true, freshEventManager: true, useContext: true }) as unknown as EntityManager\n const container = createContainer<DynamicCradle>({ injectionMode: InjectionMode.CLASSIC })\n // Core registrations\n container.register({\n em: asValue(em),\n queryEngine: asValue(new BasicQueryEngine(em, undefined, () => {\n try { return container.resolve('tenantEncryptionService') as any } catch { return null }\n })),\n dataEngine: asValue(new DefaultDataEngine(em, container as any)),\n commandRegistry: asValue(commandRegistry),\n commandBus: asValue(new CommandBus()),\n // Default OSS optimistic-lock guard. Reads from the global reader store\n // (populated by `makeCrudRoute` auto-registration + any module-DI\n // hand-wired calls to `registerOptimisticLockReaders`). Service is\n // strictly additive: when `OM_OPTIMISTIC_LOCK=off` (or no header is\n // sent) it short-circuits at validateMutation. Module-level di.ts\n // registrations override this default via Awilix replace semantics \u2014\n // see the enterprise `record_locks` module for the canonical override.\n // Spec: .ai/specs/2026-05-25-oss-optimistic-locking.md\n crudMutationGuardService: asFunction(({ em: scopedEm }: { em: EntityManager }) =>\n createOptimisticLockGuardService({\n getEm: () => scopedEm,\n readers: getAllOptimisticLockReaders(),\n }),\n ).scoped(),\n })\n // Allow modules to override/extend\n for (const reg of diRegistrars) {\n try { reg?.(container) } catch {}\n }\n // Core bootstrap (cache, event bus, encryption subscriber/KMS, module subscribers)\n // Phase 5 \u2014 process-scoped once-guard. The first request runs the full\n // bootstrap() body; later requests re-register the cached services\n // directly on this request's container without re-importing or\n // re-initializing anything. HMR clears the cache (see\n // registerDiRegistrars). Skippable if a caller already wired eventBus.\n const alreadyBootstrappedOnThisContainer = !!container.registrations?.eventBus\n if (!alreadyBootstrappedOnThisContainer) {\n const cached = getBootstrapCache()\n if (cached) {\n const replay: Record<string, any> = {}\n for (const [key, value] of Object.entries(cached)) {\n if (value !== undefined && value !== null) replay[key] = asValue(value)\n }\n if (Object.keys(replay).length > 0) container.register(replay)\n } else {\n try {\n const { bootstrap } = await import('@open-mercato/core/bootstrap') as any\n if (bootstrap && typeof bootstrap === 'function') {\n await bootstrap(container)\n setBootstrapCache(harvestBootstrapCache(container))\n }\n } catch { /* optional */ }\n }\n }\n // App-level DI override (last chance)\n // This import path resolves only in the app context, not in packages\n try {\n // @ts-ignore - @/di only exists in app context, not in packages\n const appDi = await import('@/di') as any\n if (appDi?.register) {\n try {\n const maybe = appDi.register(container)\n if (maybe && typeof maybe.then === 'function') await maybe\n } catch {}\n }\n } catch {}\n applyDiOverridesToContainer({\n register: (registrations) => container.register(toAwilixRegistrations(registrations)),\n unregister: (key) => container.register({ [key]: asValue(undefined) }),\n })\n // Ensure tenant encryption subscriber is always registered on the fresh request-scoped EM\n // Phase 5 \u2014 cache `tenantEncryptionService.isEnabled()` for the process\n // lifetime. The result depends only on config that does not change at\n // runtime, so reading it once skips a config lookup per request.\n try {\n const emForEnc = container.resolve('em') as any\n const tenantEncryptionService = container.hasRegistration('tenantEncryptionService')\n ? (container.resolve('tenantEncryptionService') as any)\n : null\n if (emForEnc && tenantEncryptionService && getCachedEncryptionEnabled(tenantEncryptionService) === true) {\n const { registerTenantEncryptionSubscriber } = await import('@open-mercato/shared/lib/encryption/subscriber')\n registerTenantEncryptionSubscriber(emForEnc, tenantEncryptionService)\n }\n } catch {\n // best-effort; do not block container creation\n }\n return container\n}\ntry {\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n require('server-only')\n} catch {\n // allow CLI/generator usage where Next server-only is not present\n}\n"],
|
|
5
|
-
"mappings": "AAAA,SAAS,
|
|
4
|
+
"sourcesContent": ["import { createContainer, asValue, AwilixContainer, InjectionMode, type Resolver } from 'awilix'\nimport { RequestContext } from '@mikro-orm/core'\nimport { getOrm } from '@open-mercato/shared/lib/db/mikro'\nimport { EntityManager } from '@mikro-orm/postgresql'\nimport { BasicQueryEngine } from '@open-mercato/shared/lib/query/engine'\nimport { DefaultDataEngine } from '@open-mercato/shared/lib/data/engine'\nimport { commandRegistry, CommandBus } from '@open-mercato/shared/lib/commands'\nimport { applyDiOverridesToContainer } from '@open-mercato/shared/modules/overrides'\n\ntype DynamicCradle = Record<string, any>\n\nexport type AppContainer = AwilixContainer<DynamicCradle>\nexport type DiRegistrar = (container: AppContainer) => void\n\n// Registration pattern for publishable packages\n// Use globalThis to survive tsx/esbuild module duplication issue where the same\n// file can be loaded as multiple module instances when mixing dynamic and static imports\nconst GLOBAL_KEY = '__openMercatoDiRegistrars__'\n// Phase 5 \u2014 process-scoped bootstrap cache. The cache/event-bus/encryption\n// services bootstrap() creates are inherently process-scoped (they hold\n// state across requests). Caching them on globalThis after the first\n// successful bootstrap call lets every subsequent request skip the\n// `await bootstrap(container)` body and just re-register the cached\n// instances. Same globalThis pattern as registerDiRegistrars so HMR\n// keeps working.\nconst BOOTSTRAP_CACHE_KEY = '__openMercatoBootstrapCache__'\nconst ENCRYPTION_ENABLED_KEY = '__openMercatoEncryptionEnabledCache__'\n\nconst BOOTSTRAP_CACHE_KEYS = [\n 'cache',\n 'eventBus',\n 'kmsService',\n 'tenantEncryptionService',\n 'rateLimiterService',\n 'searchModuleConfigs',\n 'searchIndexer',\n] as const\n\ntype BootstrapCacheEntry = Partial<Record<(typeof BOOTSTRAP_CACHE_KEYS)[number], unknown>>\n\n// Phase 5 is opt-in. Some bootstrap services close over per-request state\n// (e.g. tenantEncryptionService captures the first request's `em.fork`, the\n// event-bus's resolver closes over the first container) so naively replaying\n// them on later requests yields stale references \u2014 observed as a 500 from\n// CRUD list endpoints in `next start`. Default OFF preserves develop's\n// per-request bootstrap. Set `OM_BOOTSTRAP_CACHE=1` to opt in once each\n// cached service is verified safe for cross-request reuse.\nfunction isBootstrapCacheEnabled(): boolean {\n const raw = process.env.OM_BOOTSTRAP_CACHE\n if (raw === undefined) return false\n const normalized = raw.trim().toLowerCase()\n if (!normalized.length) return false\n if (normalized === '0' || normalized === 'off' || normalized === 'false' || normalized === 'no') return false\n return true\n}\n\nfunction getBootstrapCache(): BootstrapCacheEntry | null {\n if (!isBootstrapCacheEnabled()) return null\n const existing = (globalThis as any)[BOOTSTRAP_CACHE_KEY]\n return existing && typeof existing === 'object' ? (existing as BootstrapCacheEntry) : null\n}\n\nfunction setBootstrapCache(entry: BootstrapCacheEntry): void {\n if (!isBootstrapCacheEnabled()) return\n ;(globalThis as any)[BOOTSTRAP_CACHE_KEY] = entry\n}\n\nfunction harvestBootstrapCache(container: AwilixContainer): BootstrapCacheEntry {\n const entry: BootstrapCacheEntry = {}\n for (const key of BOOTSTRAP_CACHE_KEYS) {\n try {\n const value: unknown = container.resolve(key as never)\n if (value !== undefined && value !== null) entry[key] = value\n } catch {\n // not registered \u2014 skip\n }\n }\n return entry\n}\n\ntype EncryptionEnabledProbe = { isEnabled?: () => boolean } | null | undefined\n\nfunction getCachedEncryptionEnabled(service: EncryptionEnabledProbe): boolean | null {\n if (!service || typeof service.isEnabled !== 'function') return false\n const cached = (globalThis as Record<string, unknown>)[ENCRYPTION_ENABLED_KEY]\n if (typeof cached === 'boolean') return cached\n try {\n const result = !!service.isEnabled()\n ;(globalThis as Record<string, unknown>)[ENCRYPTION_ENABLED_KEY] = result\n return result\n } catch {\n return null\n }\n}\n\nfunction getGlobalRegistrars(): DiRegistrar[] | null {\n return (globalThis as any)[GLOBAL_KEY] ?? null\n}\n\nfunction setGlobalRegistrars(registrars: DiRegistrar[]): void {\n (globalThis as any)[GLOBAL_KEY] = registrars\n}\n\nexport function registerDiRegistrars(registrars: DiRegistrar[]) {\n const existing = getGlobalRegistrars()\n if (existing !== null && process.env.NODE_ENV === 'development') {\n console.debug('[Bootstrap] DI registrars re-registered (this may occur during HMR)')\n }\n setGlobalRegistrars(registrars)\n // Force re-bootstrap on HMR \u2014 module subscribers may have changed.\n ;(globalThis as any)[BOOTSTRAP_CACHE_KEY] = null\n ;(globalThis as any)[ENCRYPTION_ENABLED_KEY] = undefined\n}\n\nexport function getDiRegistrars(): DiRegistrar[] {\n const registrars = getGlobalRegistrars()\n if (!registrars) {\n throw new Error('[Bootstrap] DI registrars not registered. Call registerDiRegistrars() at bootstrap.')\n }\n return registrars\n}\n\n/** Test-only helper to drop the process-scoped bootstrap cache. */\nexport function resetBootstrapCache(): void {\n (globalThis as any)[BOOTSTRAP_CACHE_KEY] = null\n ;(globalThis as any)[ENCRYPTION_ENABLED_KEY] = undefined\n}\n\nfunction isAwilixResolver(value: unknown): value is Resolver<unknown> {\n return Boolean(value && typeof value === 'object' && typeof (value as { resolve?: unknown }).resolve === 'function')\n}\n\nfunction toAwilixRegistrations(registrations: Record<string, unknown>): Record<string, Resolver<any>> {\n return Object.fromEntries(\n Object.entries(registrations).map(([key, value]) => [\n key,\n isAwilixResolver(value) ? value : asValue(value),\n ]),\n )\n}\n\nexport async function createRequestContainer(): Promise<AppContainer> {\n const diRegistrars = getDiRegistrars()\n const orm = await getOrm()\n // Use a fresh event manager so request-level subscribers (e.g., encryption) don't pile up globally\n const baseEm = (RequestContext.getEntityManager() as any) ?? orm.em\n const em = baseEm.fork({ clear: true, freshEventManager: true, useContext: true }) as unknown as EntityManager\n const container = createContainer<DynamicCradle>({ injectionMode: InjectionMode.CLASSIC })\n // Core registrations\n container.register({\n em: asValue(em),\n queryEngine: asValue(new BasicQueryEngine(em, undefined, () => {\n try { return container.resolve('tenantEncryptionService') as any } catch { return null }\n })),\n dataEngine: asValue(new DefaultDataEngine(em, container as any)),\n commandRegistry: asValue(commandRegistry),\n commandBus: asValue(new CommandBus()),\n })\n // Allow modules to override/extend\n for (const reg of diRegistrars) {\n try { reg?.(container) } catch {}\n }\n // Core bootstrap (cache, event bus, encryption subscriber/KMS, module subscribers)\n // Phase 5 \u2014 process-scoped once-guard. The first request runs the full\n // bootstrap() body; later requests re-register the cached services\n // directly on this request's container without re-importing or\n // re-initializing anything. HMR clears the cache (see\n // registerDiRegistrars). Skippable if a caller already wired eventBus.\n const alreadyBootstrappedOnThisContainer = !!container.registrations?.eventBus\n if (!alreadyBootstrappedOnThisContainer) {\n const cached = getBootstrapCache()\n if (cached) {\n const replay: Record<string, any> = {}\n for (const [key, value] of Object.entries(cached)) {\n if (value !== undefined && value !== null) replay[key] = asValue(value)\n }\n if (Object.keys(replay).length > 0) container.register(replay)\n } else {\n try {\n const { bootstrap } = await import('@open-mercato/core/bootstrap') as any\n if (bootstrap && typeof bootstrap === 'function') {\n await bootstrap(container)\n setBootstrapCache(harvestBootstrapCache(container))\n }\n } catch { /* optional */ }\n }\n }\n // App-level DI override (last chance)\n // This import path resolves only in the app context, not in packages\n try {\n // @ts-ignore - @/di only exists in app context, not in packages\n const appDi = await import('@/di') as any\n if (appDi?.register) {\n try {\n const maybe = appDi.register(container)\n if (maybe && typeof maybe.then === 'function') await maybe\n } catch {}\n }\n } catch {}\n applyDiOverridesToContainer({\n register: (registrations) => container.register(toAwilixRegistrations(registrations)),\n unregister: (key) => container.register({ [key]: asValue(undefined) }),\n })\n // Ensure tenant encryption subscriber is always registered on the fresh request-scoped EM\n // Phase 5 \u2014 cache `tenantEncryptionService.isEnabled()` for the process\n // lifetime. The result depends only on config that does not change at\n // runtime, so reading it once skips a config lookup per request.\n try {\n const emForEnc = container.resolve('em') as any\n const tenantEncryptionService = container.hasRegistration('tenantEncryptionService')\n ? (container.resolve('tenantEncryptionService') as any)\n : null\n if (emForEnc && tenantEncryptionService && getCachedEncryptionEnabled(tenantEncryptionService) === true) {\n const { registerTenantEncryptionSubscriber } = await import('@open-mercato/shared/lib/encryption/subscriber')\n registerTenantEncryptionSubscriber(emForEnc, tenantEncryptionService)\n }\n } catch {\n // best-effort; do not block container creation\n }\n return container\n}\ntry {\n // eslint-disable-next-line @typescript-eslint/no-var-requires\n require('server-only')\n} catch {\n // allow CLI/generator usage where Next server-only is not present\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/lib/i18n/context.js
CHANGED
|
@@ -45,10 +45,6 @@ function useT() {
|
|
|
45
45
|
if (!ctx) throw new Error("useT must be used within I18nProvider");
|
|
46
46
|
return ctx.t;
|
|
47
47
|
}
|
|
48
|
-
function useOptionalT() {
|
|
49
|
-
const ctx = useContext(I18nContext);
|
|
50
|
-
return ctx?.t;
|
|
51
|
-
}
|
|
52
48
|
function useLocale() {
|
|
53
49
|
const ctx = useContext(I18nContext);
|
|
54
50
|
if (!ctx) throw new Error("useLocale must be used within I18nProvider");
|
|
@@ -57,7 +53,6 @@ function useLocale() {
|
|
|
57
53
|
export {
|
|
58
54
|
I18nProvider,
|
|
59
55
|
useLocale,
|
|
60
|
-
useOptionalT,
|
|
61
56
|
useT
|
|
62
57
|
};
|
|
63
58
|
//# sourceMappingURL=context.js.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/i18n/context.tsx"],
|
|
4
|
-
"sourcesContent": ["\"use client\"\nimport { createContext, useContext, useMemo, type ReactNode } from 'react'\nimport type { Locale } from './config'\n\nexport type Dict = Record<string, string>\n\nexport type TranslateParams = Record<string, string | number>\n\nexport type TranslateFn = (\n key: string,\n fallbackOrParams?: string | TranslateParams,\n params?: TranslateParams\n) => string\n\nexport type I18nContextValue = {\n locale: Locale\n t: TranslateFn\n}\n\nconst I18N_CONTEXT_KEY = '__openMercatoI18nContext'\n\ntype GlobalI18nContextStore = typeof globalThis & {\n [I18N_CONTEXT_KEY]?: ReturnType<typeof createContext<I18nContextValue | null>>\n}\n\nfunction getI18nContext() {\n const store = globalThis as GlobalI18nContextStore\n if (!store[I18N_CONTEXT_KEY]) {\n store[I18N_CONTEXT_KEY] = createContext<I18nContextValue | null>(null)\n }\n return store[I18N_CONTEXT_KEY]\n}\n\nconst I18nContext = getI18nContext()\n\nfunction format(template: string, params?: TranslateParams) {\n if (!params) return template\n return template.replace(/\\{\\{(\\w+)\\}\\}|\\{(\\w+)\\}/g, (_, doubleKey, singleKey) => {\n const key = doubleKey ?? singleKey\n if (!key) return _\n const value = params[key]\n if (value === undefined) {\n return doubleKey ? `{{${key}}}` : `{${key}}`\n }\n return String(value)\n })\n}\n\nexport function I18nProvider({ children, locale, dict }: { children: ReactNode; locale: Locale; dict: Dict }) {\n const value = useMemo<I18nContextValue>(() => ({\n locale,\n t: (key, fallbackOrParams, params) => {\n let fallback: string | undefined\n let resolvedParams: TranslateParams | undefined\n\n if (typeof fallbackOrParams === 'string') {\n fallback = fallbackOrParams\n resolvedParams = params\n } else {\n resolvedParams = fallbackOrParams ?? params\n }\n\n const template = dict[key] ?? fallback ?? key\n return format(template, resolvedParams)\n },\n }), [locale, dict])\n return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>\n}\n\nexport function useT() {\n const ctx = useContext(I18nContext)\n if (!ctx) throw new Error('useT must be used within I18nProvider')\n return ctx.t\n}\n\
|
|
5
|
-
"mappings": ";AAkES;AAjET,SAAS,eAAe,YAAY,eAA+B;AAkBnE,MAAM,mBAAmB;AAMzB,SAAS,iBAAiB;AACxB,QAAM,QAAQ;AACd,MAAI,CAAC,MAAM,gBAAgB,GAAG;AAC5B,UAAM,gBAAgB,IAAI,cAAuC,IAAI;AAAA,EACvE;AACA,SAAO,MAAM,gBAAgB;AAC/B;AAEA,MAAM,cAAc,eAAe;AAEnC,SAAS,OAAO,UAAkB,QAA0B;AAC1D,MAAI,CAAC,OAAQ,QAAO;AACpB,SAAO,SAAS,QAAQ,4BAA4B,CAAC,GAAG,WAAW,cAAc;AAC/E,UAAM,MAAM,aAAa;AACzB,QAAI,CAAC,IAAK,QAAO;AACjB,UAAM,QAAQ,OAAO,GAAG;AACxB,QAAI,UAAU,QAAW;AACvB,aAAO,YAAY,KAAK,GAAG,OAAO,IAAI,GAAG;AAAA,IAC3C;AACA,WAAO,OAAO,KAAK;AAAA,EACrB,CAAC;AACH;AAEO,SAAS,aAAa,EAAE,UAAU,QAAQ,KAAK,GAAwD;AAC5G,QAAM,QAAQ,QAA0B,OAAO;AAAA,IAC7C;AAAA,IACA,GAAG,CAAC,KAAK,kBAAkB,WAAW;AACpC,UAAI;AACJ,UAAI;AAEJ,UAAI,OAAO,qBAAqB,UAAU;AACxC,mBAAW;AACX,yBAAiB;AAAA,MACnB,OAAO;AACL,yBAAiB,oBAAoB;AAAA,MACvC;AAEA,YAAM,WAAW,KAAK,GAAG,KAAK,YAAY;AAC1C,aAAO,OAAO,UAAU,cAAc;AAAA,IACxC;AAAA,EACF,IAAI,CAAC,QAAQ,IAAI,CAAC;AAClB,SAAO,oBAAC,YAAY,UAAZ,EAAqB,OAAe,UAAS;AACvD;AAEO,SAAS,OAAO;AACrB,QAAM,MAAM,WAAW,WAAW;AAClC,MAAI,CAAC,IAAK,OAAM,IAAI,MAAM,uCAAuC;AACjE,SAAO,IAAI;AACb;
|
|
4
|
+
"sourcesContent": ["\"use client\"\nimport { createContext, useContext, useMemo, type ReactNode } from 'react'\nimport type { Locale } from './config'\n\nexport type Dict = Record<string, string>\n\nexport type TranslateParams = Record<string, string | number>\n\nexport type TranslateFn = (\n key: string,\n fallbackOrParams?: string | TranslateParams,\n params?: TranslateParams\n) => string\n\nexport type I18nContextValue = {\n locale: Locale\n t: TranslateFn\n}\n\nconst I18N_CONTEXT_KEY = '__openMercatoI18nContext'\n\ntype GlobalI18nContextStore = typeof globalThis & {\n [I18N_CONTEXT_KEY]?: ReturnType<typeof createContext<I18nContextValue | null>>\n}\n\nfunction getI18nContext() {\n const store = globalThis as GlobalI18nContextStore\n if (!store[I18N_CONTEXT_KEY]) {\n store[I18N_CONTEXT_KEY] = createContext<I18nContextValue | null>(null)\n }\n return store[I18N_CONTEXT_KEY]\n}\n\nconst I18nContext = getI18nContext()\n\nfunction format(template: string, params?: TranslateParams) {\n if (!params) return template\n return template.replace(/\\{\\{(\\w+)\\}\\}|\\{(\\w+)\\}/g, (_, doubleKey, singleKey) => {\n const key = doubleKey ?? singleKey\n if (!key) return _\n const value = params[key]\n if (value === undefined) {\n return doubleKey ? `{{${key}}}` : `{${key}}`\n }\n return String(value)\n })\n}\n\nexport function I18nProvider({ children, locale, dict }: { children: ReactNode; locale: Locale; dict: Dict }) {\n const value = useMemo<I18nContextValue>(() => ({\n locale,\n t: (key, fallbackOrParams, params) => {\n let fallback: string | undefined\n let resolvedParams: TranslateParams | undefined\n\n if (typeof fallbackOrParams === 'string') {\n fallback = fallbackOrParams\n resolvedParams = params\n } else {\n resolvedParams = fallbackOrParams ?? params\n }\n\n const template = dict[key] ?? fallback ?? key\n return format(template, resolvedParams)\n },\n }), [locale, dict])\n return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>\n}\n\nexport function useT() {\n const ctx = useContext(I18nContext)\n if (!ctx) throw new Error('useT must be used within I18nProvider')\n return ctx.t\n}\n\nexport function useLocale() {\n const ctx = useContext(I18nContext)\n if (!ctx) throw new Error('useLocale must be used within I18nProvider')\n return ctx.locale\n}\n"],
|
|
5
|
+
"mappings": ";AAkES;AAjET,SAAS,eAAe,YAAY,eAA+B;AAkBnE,MAAM,mBAAmB;AAMzB,SAAS,iBAAiB;AACxB,QAAM,QAAQ;AACd,MAAI,CAAC,MAAM,gBAAgB,GAAG;AAC5B,UAAM,gBAAgB,IAAI,cAAuC,IAAI;AAAA,EACvE;AACA,SAAO,MAAM,gBAAgB;AAC/B;AAEA,MAAM,cAAc,eAAe;AAEnC,SAAS,OAAO,UAAkB,QAA0B;AAC1D,MAAI,CAAC,OAAQ,QAAO;AACpB,SAAO,SAAS,QAAQ,4BAA4B,CAAC,GAAG,WAAW,cAAc;AAC/E,UAAM,MAAM,aAAa;AACzB,QAAI,CAAC,IAAK,QAAO;AACjB,UAAM,QAAQ,OAAO,GAAG;AACxB,QAAI,UAAU,QAAW;AACvB,aAAO,YAAY,KAAK,GAAG,OAAO,IAAI,GAAG;AAAA,IAC3C;AACA,WAAO,OAAO,KAAK;AAAA,EACrB,CAAC;AACH;AAEO,SAAS,aAAa,EAAE,UAAU,QAAQ,KAAK,GAAwD;AAC5G,QAAM,QAAQ,QAA0B,OAAO;AAAA,IAC7C;AAAA,IACA,GAAG,CAAC,KAAK,kBAAkB,WAAW;AACpC,UAAI;AACJ,UAAI;AAEJ,UAAI,OAAO,qBAAqB,UAAU;AACxC,mBAAW;AACX,yBAAiB;AAAA,MACnB,OAAO;AACL,yBAAiB,oBAAoB;AAAA,MACvC;AAEA,YAAM,WAAW,KAAK,GAAG,KAAK,YAAY;AAC1C,aAAO,OAAO,UAAU,cAAc;AAAA,IACxC;AAAA,EACF,IAAI,CAAC,QAAQ,IAAI,CAAC;AAClB,SAAO,oBAAC,YAAY,UAAZ,EAAqB,OAAe,UAAS;AACvD;AAEO,SAAS,OAAO;AACrB,QAAM,MAAM,WAAW,WAAW;AAClC,MAAI,CAAC,IAAK,OAAM,IAAI,MAAM,uCAAuC;AACjE,SAAO,IAAI;AACb;AAEO,SAAS,YAAY;AAC1B,QAAM,MAAM,WAAW,WAAW;AAClC,MAAI,CAAC,IAAK,OAAM,IAAI,MAAM,4CAA4C;AACtE,SAAO,IAAI;AACb;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/lib/version.js
CHANGED
package/dist/lib/version.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/lib/version.ts"],
|
|
4
|
-
"sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.5-
|
|
4
|
+
"sourcesContent": ["// Build-time generated version\nexport const APP_VERSION = '0.6.5-develop.4384.1.ce2ec6eaaa'\nexport const appVersion = APP_VERSION\n"],
|
|
5
5
|
"mappings": "AACO,MAAM,cAAc;AACpB,MAAM,aAAa;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/modules/integrations/types.ts"],
|
|
4
|
-
"sourcesContent": ["export type IntegrationScope = {\n organizationId: string\n tenantId: string\n
|
|
5
|
-
"mappings": "
|
|
4
|
+
"sourcesContent": ["export type IntegrationScope = {\n organizationId: string\n tenantId: string\n}\n\nexport type IntegrationCategory =\n | 'payment'\n | 'shipping'\n | 'data_sync'\n | 'communication'\n | 'webhook'\n | 'storage'\n | 'other'\n\nexport type IntegrationHubId =\n | 'payment_gateways'\n | 'shipping_carriers'\n | 'data_sync'\n | 'communication_channels'\n | 'webhook_endpoints'\n | 'storage_hubs'\n | string\n\nexport type CredentialFieldType =\n | 'text'\n | 'secret'\n | 'select'\n | 'boolean'\n | 'url'\n | 'oauth'\n | 'ssh_keypair'\n\nexport interface CredentialFieldOption {\n value: string\n label: string\n}\n\nexport interface CredentialFieldVisibleWhen {\n field: string\n equals: string | number | boolean\n}\n\nexport interface IntegrationCredentialWebhookHelp {\n kind: 'webhook_setup'\n title: string\n summary: string\n endpointPath: string\n dashboardPathLabel: string\n steps: string[]\n events?: string[]\n localDevelopment?: {\n tunnelCommand: string\n publicUrlExample: string\n note?: string\n }\n}\n\nexport interface IntegrationCredentialFieldBase {\n key: string\n label: string\n required?: boolean\n placeholder?: string\n helpText?: string\n helpDetails?: IntegrationCredentialWebhookHelp\n visibleWhen?: CredentialFieldVisibleWhen\n}\n\nexport interface IntegrationCredentialFieldText extends IntegrationCredentialFieldBase {\n type: Extract<CredentialFieldType, 'text' | 'secret' | 'url'>\n}\n\nexport interface IntegrationCredentialFieldBoolean extends IntegrationCredentialFieldBase {\n type: Extract<CredentialFieldType, 'boolean'>\n}\n\nexport interface IntegrationCredentialFieldSelect extends IntegrationCredentialFieldBase {\n type: Extract<CredentialFieldType, 'select'>\n options: CredentialFieldOption[]\n}\n\nexport interface IntegrationCredentialFieldOauth extends IntegrationCredentialFieldBase {\n type: Extract<CredentialFieldType, 'oauth'>\n authUrl?: string\n tokenUrl?: string\n scopes?: string[]\n clientIdField?: string\n clientSecretField?: string\n}\n\nexport interface IntegrationCredentialFieldSshKeypair extends IntegrationCredentialFieldBase {\n type: Extract<CredentialFieldType, 'ssh_keypair'>\n algorithm?: 'ed25519' | 'rsa'\n rsaBits?: 2048 | 3072 | 4096\n}\n\nexport type IntegrationCredentialField =\n | IntegrationCredentialFieldText\n | IntegrationCredentialFieldBoolean\n | IntegrationCredentialFieldSelect\n | IntegrationCredentialFieldOauth\n | IntegrationCredentialFieldSshKeypair\n\nexport interface IntegrationCredentialsSchema {\n fields: IntegrationCredentialField[]\n}\n\nexport interface IntegrationHealthCheckConfig {\n service: string\n}\n\nexport interface ApiVersionDefinition {\n id: string\n label: string\n status: 'stable' | 'deprecated' | 'experimental'\n default?: boolean\n changelog?: string\n deprecatedAt?: string\n sunsetAt?: string\n migrationGuide?: string\n}\n\nexport interface IntegrationBundle {\n id: string\n title: string\n description: string\n icon?: string\n package?: string\n version?: string\n author?: string\n credentials: IntegrationCredentialsSchema\n healthCheck?: IntegrationHealthCheckConfig\n}\n\nexport interface IntegrationDetailPageConfig {\n /**\n * UMES widget spot rendered on the integration detail page.\n * Widgets registered here can render inline blocks, grouped panels,\n * or additional tabs via `placement.kind`.\n */\n widgetSpotId?: string\n /**\n * Built-in tabs to hide for this integration detail page.\n * Provider modules can replace these with injected tabs using the same spot.\n */\n hiddenTabs?: IntegrationDetailBuiltInTab[]\n}\n\nexport type IntegrationDetailBuiltInTab =\n | 'credentials'\n | 'version'\n | 'health'\n | 'logs'\n | 'data-sync-schedule'\n\nexport interface IntegrationDefaultStateConfig {\n isEnabled?: boolean\n}\n\nexport interface IntegrationDefinition {\n id: string\n title: string\n icon?: string\n buildExternalUrl?: (externalId: string) => string\n bundleId?: string\n apiVersions?: ApiVersionDefinition[]\n description?: string\n category?: IntegrationCategory | string\n hub?: IntegrationHubId\n providerKey?: string\n docsUrl?: string\n package?: string\n version?: string\n author?: string\n company?: string\n license?: string\n tags?: string[]\n detailPage?: IntegrationDetailPageConfig\n defaultState?: IntegrationDefaultStateConfig\n credentials?: IntegrationCredentialsSchema\n healthCheck?: IntegrationHealthCheckConfig\n}\n\nexport interface ExternalIdEnrichment {\n _integrations: Record<string, ExternalIdMapping>\n}\n\nexport interface ExternalIdMapping {\n externalId: string\n externalUrl?: string\n lastSyncedAt?: string\n syncStatus: 'synced' | 'pending' | 'error' | 'not_synced'\n}\n\ntype IntegrationRegistryState = {\n integrations: Map<string, IntegrationDefinition>\n bundles: Map<string, IntegrationBundle>\n}\n\nconst GLOBAL_INTEGRATION_REGISTRY_KEY = '__openMercatoIntegrationRegistry__' as const\n\ntype GlobalIntegrationRegistry = typeof globalThis & {\n [GLOBAL_INTEGRATION_REGISTRY_KEY]?: IntegrationRegistryState\n}\n\nfunction getIntegrationRegistryState(): IntegrationRegistryState {\n const globalRegistry = globalThis as GlobalIntegrationRegistry\n if (!globalRegistry[GLOBAL_INTEGRATION_REGISTRY_KEY]) {\n globalRegistry[GLOBAL_INTEGRATION_REGISTRY_KEY] = {\n integrations: new Map<string, IntegrationDefinition>(),\n bundles: new Map<string, IntegrationBundle>(),\n }\n }\n return globalRegistry[GLOBAL_INTEGRATION_REGISTRY_KEY]\n}\n\nexport function registerIntegration(definition: IntegrationDefinition): void {\n getIntegrationRegistryState().integrations.set(definition.id, definition)\n}\n\nexport function registerIntegrations(definitions: IntegrationDefinition[]): void {\n const registry = getIntegrationRegistryState().integrations\n for (const definition of definitions) {\n registry.set(definition.id, definition)\n }\n}\n\nexport function registerBundle(bundle: IntegrationBundle): void {\n getIntegrationRegistryState().bundles.set(bundle.id, bundle)\n}\n\nexport function registerBundles(bundles: IntegrationBundle[]): void {\n const registry = getIntegrationRegistryState().bundles\n for (const bundle of bundles) {\n registry.set(bundle.id, bundle)\n }\n}\n\nexport function clearRegisteredIntegrations(): void {\n const registry = getIntegrationRegistryState()\n registry.integrations.clear()\n registry.bundles.clear()\n}\n\nexport function getIntegration(integrationId: string): IntegrationDefinition | undefined {\n return getIntegrationRegistryState().integrations.get(integrationId)\n}\n\nexport function getAllIntegrations(): IntegrationDefinition[] {\n return Array.from(getIntegrationRegistryState().integrations.values())\n}\n\nexport function getBundle(bundleId: string): IntegrationBundle | undefined {\n return getIntegrationRegistryState().bundles.get(bundleId)\n}\n\nexport function getAllBundles(): IntegrationBundle[] {\n return Array.from(getIntegrationRegistryState().bundles.values())\n}\n\nexport function getBundleIntegrations(bundleId: string): IntegrationDefinition[] {\n return Array.from(getIntegrationRegistryState().integrations.values()).filter((integration) => integration.bundleId === bundleId)\n}\n\nexport function resolveIntegrationCredentialsSchema(integrationId: string): IntegrationCredentialsSchema | undefined {\n const registry = getIntegrationRegistryState()\n const definition = registry.integrations.get(integrationId)\n if (!definition) return undefined\n\n if (definition.credentials && definition.credentials.fields.length > 0) {\n return definition.credentials\n }\n\n if (!definition.bundleId) return definition.credentials\n return registry.bundles.get(definition.bundleId)?.credentials\n}\n\nexport function getIntegrationTitle(integrationId: string): string {\n return getIntegrationRegistryState().integrations.get(integrationId)?.title ?? integrationId\n}\n\nexport const LEGACY_INTEGRATION_DETAIL_TABS_SPOT_ID = 'integrations.detail:tabs'\n\nexport function buildIntegrationDetailWidgetSpotId(integrationId: string): string {\n return `integrations.detail:${integrationId}`\n}\n"],
|
|
5
|
+
"mappings": "AAsMA,MAAM,kCAAkC;AAMxC,SAAS,8BAAwD;AAC/D,QAAM,iBAAiB;AACvB,MAAI,CAAC,eAAe,+BAA+B,GAAG;AACpD,mBAAe,+BAA+B,IAAI;AAAA,MAChD,cAAc,oBAAI,IAAmC;AAAA,MACrD,SAAS,oBAAI,IAA+B;AAAA,IAC9C;AAAA,EACF;AACA,SAAO,eAAe,+BAA+B;AACvD;AAEO,SAAS,oBAAoB,YAAyC;AAC3E,8BAA4B,EAAE,aAAa,IAAI,WAAW,IAAI,UAAU;AAC1E;AAEO,SAAS,qBAAqB,aAA4C;AAC/E,QAAM,WAAW,4BAA4B,EAAE;AAC/C,aAAW,cAAc,aAAa;AACpC,aAAS,IAAI,WAAW,IAAI,UAAU;AAAA,EACxC;AACF;AAEO,SAAS,eAAe,QAAiC;AAC9D,8BAA4B,EAAE,QAAQ,IAAI,OAAO,IAAI,MAAM;AAC7D;AAEO,SAAS,gBAAgB,SAAoC;AAClE,QAAM,WAAW,4BAA4B,EAAE;AAC/C,aAAW,UAAU,SAAS;AAC5B,aAAS,IAAI,OAAO,IAAI,MAAM;AAAA,EAChC;AACF;AAEO,SAAS,8BAAoC;AAClD,QAAM,WAAW,4BAA4B;AAC7C,WAAS,aAAa,MAAM;AAC5B,WAAS,QAAQ,MAAM;AACzB;AAEO,SAAS,eAAe,eAA0D;AACvF,SAAO,4BAA4B,EAAE,aAAa,IAAI,aAAa;AACrE;AAEO,SAAS,qBAA8C;AAC5D,SAAO,MAAM,KAAK,4BAA4B,EAAE,aAAa,OAAO,CAAC;AACvE;AAEO,SAAS,UAAU,UAAiD;AACzE,SAAO,4BAA4B,EAAE,QAAQ,IAAI,QAAQ;AAC3D;AAEO,SAAS,gBAAqC;AACnD,SAAO,MAAM,KAAK,4BAA4B,EAAE,QAAQ,OAAO,CAAC;AAClE;AAEO,SAAS,sBAAsB,UAA2C;AAC/E,SAAO,MAAM,KAAK,4BAA4B,EAAE,aAAa,OAAO,CAAC,EAAE,OAAO,CAAC,gBAAgB,YAAY,aAAa,QAAQ;AAClI;AAEO,SAAS,oCAAoC,eAAiE;AACnH,QAAM,WAAW,4BAA4B;AAC7C,QAAM,aAAa,SAAS,aAAa,IAAI,aAAa;AAC1D,MAAI,CAAC,WAAY,QAAO;AAExB,MAAI,WAAW,eAAe,WAAW,YAAY,OAAO,SAAS,GAAG;AACtE,WAAO,WAAW;AAAA,EACpB;AAEA,MAAI,CAAC,WAAW,SAAU,QAAO,WAAW;AAC5C,SAAO,SAAS,QAAQ,IAAI,WAAW,QAAQ,GAAG;AACpD;AAEO,SAAS,oBAAoB,eAA+B;AACjE,SAAO,4BAA4B,EAAE,aAAa,IAAI,aAAa,GAAG,SAAS;AACjF;AAEO,MAAM,yCAAyC;AAE/C,SAAS,mCAAmC,eAA+B;AAChF,SAAO,uBAAuB,aAAa;AAC7C;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@open-mercato/shared",
|
|
3
|
-
"version": "0.6.5-
|
|
3
|
+
"version": "0.6.5-develop.4384.1.ce2ec6eaaa",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"@mikro-orm/core": "^7.1.3",
|
|
93
93
|
"@mikro-orm/decorators": "^7.1.3",
|
|
94
94
|
"@mikro-orm/postgresql": "^7.1.3",
|
|
95
|
-
"@open-mercato/cache": "0.6.5-
|
|
95
|
+
"@open-mercato/cache": "0.6.5-develop.4384.1.ce2ec6eaaa",
|
|
96
96
|
"dotenv": "^17.4.2",
|
|
97
97
|
"rate-limiter-flexible": "^11.1.0",
|
|
98
98
|
"re2js": "2.8.3",
|
|
@@ -4,11 +4,6 @@ jest.mock('@open-mercato/cache', () => ({
|
|
|
4
4
|
|
|
5
5
|
import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
|
|
6
6
|
import { registerApiInterceptors } from '@open-mercato/shared/lib/crud/interceptor-registry'
|
|
7
|
-
import {
|
|
8
|
-
clearOptimisticLockReadersForTests,
|
|
9
|
-
getAllOptimisticLockReaders,
|
|
10
|
-
registerOptimisticLockReaders,
|
|
11
|
-
} from '@open-mercato/shared/lib/crud/optimistic-lock-store'
|
|
12
7
|
import { loadCustomFieldDefinitionIndex } from '@open-mercato/shared/lib/crud/custom-fields'
|
|
13
8
|
import { z } from 'zod'
|
|
14
9
|
|
|
@@ -759,104 +754,3 @@ describe('CRUD Factory', () => {
|
|
|
759
754
|
expect(body._interceptor).toEqual({ ok: true, count: 1 })
|
|
760
755
|
})
|
|
761
756
|
})
|
|
762
|
-
|
|
763
|
-
describe('CRUD Factory — optimistic-lock auto-registration', () => {
|
|
764
|
-
beforeEach(() => {
|
|
765
|
-
clearOptimisticLockReadersForTests()
|
|
766
|
-
})
|
|
767
|
-
|
|
768
|
-
afterAll(() => {
|
|
769
|
-
clearOptimisticLockReadersForTests()
|
|
770
|
-
})
|
|
771
|
-
|
|
772
|
-
function makeMinimalRoute(opts: { eventsResource: string; entity: any }) {
|
|
773
|
-
return makeCrudRoute({
|
|
774
|
-
metadata: { GET: { requireAuth: true } },
|
|
775
|
-
orm: { entity: opts.entity, idField: 'id', orgField: 'organizationId', tenantField: 'tenantId' },
|
|
776
|
-
events: { module: opts.eventsResource.split('.')[0], entity: opts.eventsResource.split('.')[1], persistent: false } as any,
|
|
777
|
-
list: { schema: z.object({}).passthrough() as any },
|
|
778
|
-
create: {
|
|
779
|
-
commandId: `${opts.eventsResource}.create`,
|
|
780
|
-
schema: z.object({}).passthrough() as any,
|
|
781
|
-
},
|
|
782
|
-
update: {
|
|
783
|
-
commandId: `${opts.eventsResource}.update`,
|
|
784
|
-
schema: z.object({ id: z.string() }).passthrough() as any,
|
|
785
|
-
},
|
|
786
|
-
del: {
|
|
787
|
-
commandId: `${opts.eventsResource}.delete`,
|
|
788
|
-
schema: z.object({ id: z.string() }).passthrough() as any,
|
|
789
|
-
},
|
|
790
|
-
})
|
|
791
|
-
}
|
|
792
|
-
|
|
793
|
-
it('auto-registers a reader for the route resourceKind at factory call time', () => {
|
|
794
|
-
expect(getAllOptimisticLockReaders()).toEqual({})
|
|
795
|
-
makeMinimalRoute({ eventsResource: 'example.todo', entity: Todo })
|
|
796
|
-
const all = getAllOptimisticLockReaders()
|
|
797
|
-
expect(Object.keys(all)).toContain('example.todo')
|
|
798
|
-
expect(typeof all['example.todo']).toBe('function')
|
|
799
|
-
})
|
|
800
|
-
|
|
801
|
-
it('does NOT override an existing hand-wired reader (IfAbsent semantics)', () => {
|
|
802
|
-
const handWired = async () => 'hand-wired'
|
|
803
|
-
registerOptimisticLockReaders({ 'example.todo': handWired })
|
|
804
|
-
makeMinimalRoute({ eventsResource: 'example.todo', entity: Todo })
|
|
805
|
-
expect(getAllOptimisticLockReaders()['example.todo']).toBe(handWired)
|
|
806
|
-
})
|
|
807
|
-
|
|
808
|
-
it('skips registration when the entity has no resolvable resourceKind', () => {
|
|
809
|
-
expect(getAllOptimisticLockReaders()).toEqual({})
|
|
810
|
-
// Route with no events.module + no command IDs → resourceKind falls back to 'resource'
|
|
811
|
-
makeCrudRoute({
|
|
812
|
-
metadata: { GET: { requireAuth: true } },
|
|
813
|
-
orm: { entity: Todo },
|
|
814
|
-
list: { schema: z.object({}).passthrough() as any },
|
|
815
|
-
} as any)
|
|
816
|
-
// 'resource' is filtered out by the auto-registration guard
|
|
817
|
-
expect(getAllOptimisticLockReaders()['resource']).toBeUndefined()
|
|
818
|
-
})
|
|
819
|
-
|
|
820
|
-
it('the registered reader projects only updatedAt and fails open on schema mismatch', async () => {
|
|
821
|
-
makeMinimalRoute({ eventsResource: 'example.todo', entity: Todo })
|
|
822
|
-
const reader = getAllOptimisticLockReaders()['example.todo']
|
|
823
|
-
expect(reader).toBeDefined()
|
|
824
|
-
let captured: { entity: unknown; filter: Record<string, unknown>; options?: Record<string, unknown> } | null = null
|
|
825
|
-
const fakeEm = {
|
|
826
|
-
async findOne(entity: unknown, filter: Record<string, unknown>, options?: Record<string, unknown>) {
|
|
827
|
-
captured = { entity, filter, options }
|
|
828
|
-
return { updatedAt: new Date('2026-05-26T07:30:00.000Z') }
|
|
829
|
-
},
|
|
830
|
-
} as never
|
|
831
|
-
const out = await reader!(fakeEm, {
|
|
832
|
-
resourceKind: 'example.todo',
|
|
833
|
-
resourceId: 'todo-1',
|
|
834
|
-
tenantId: 'tenant-1',
|
|
835
|
-
organizationId: 'org-1',
|
|
836
|
-
})
|
|
837
|
-
expect(out).toBe('2026-05-26T07:30:00.000Z')
|
|
838
|
-
expect(captured).not.toBeNull()
|
|
839
|
-
expect(captured!.entity).toBe(Todo)
|
|
840
|
-
expect(captured!.filter).toEqual({
|
|
841
|
-
id: 'todo-1',
|
|
842
|
-
tenantId: 'tenant-1',
|
|
843
|
-
organizationId: 'org-1',
|
|
844
|
-
deletedAt: null,
|
|
845
|
-
})
|
|
846
|
-
expect(captured!.options).toEqual({ fields: ['updatedAt'] })
|
|
847
|
-
|
|
848
|
-
// Fail-open contract: throwing findOne yields null, not a re-thrown error.
|
|
849
|
-
const throwingEm = {
|
|
850
|
-
async findOne() {
|
|
851
|
-
throw new Error('schema mismatch')
|
|
852
|
-
},
|
|
853
|
-
} as never
|
|
854
|
-
const safe = await reader!(throwingEm, {
|
|
855
|
-
resourceKind: 'example.todo',
|
|
856
|
-
resourceId: 'todo-1',
|
|
857
|
-
tenantId: 'tenant-1',
|
|
858
|
-
organizationId: 'org-1',
|
|
859
|
-
})
|
|
860
|
-
expect(safe).toBeNull()
|
|
861
|
-
})
|
|
862
|
-
})
|
package/src/lib/crud/factory.ts
CHANGED
|
@@ -69,8 +69,6 @@ import { runApiInterceptorsAfter, runApiInterceptorsBefore } from './interceptor
|
|
|
69
69
|
import { mergeIdFilter, parseIdsParam } from './ids'
|
|
70
70
|
import { mergeAdvancedFilters } from './advanced-filter-integration'
|
|
71
71
|
import { parseExtensionHeaders } from '../umes/extension-headers'
|
|
72
|
-
import { createGenericOptimisticLockReader } from './optimistic-lock'
|
|
73
|
-
import { registerOptimisticLockReaderIfAbsent } from './optimistic-lock-store'
|
|
74
72
|
|
|
75
73
|
type RbacServiceLike = {
|
|
76
74
|
getGrantedFeatures: (userId: string, opts: { tenantId: string | null; organizationId: string | null }) => Promise<string[]>
|
|
@@ -941,27 +939,6 @@ export function makeCrudRoute<TCreate = any, TUpdate = any, TList = any>(opts: C
|
|
|
941
939
|
const resourceKind = resourceInfo.primary
|
|
942
940
|
const resourceAliases = resourceInfo.aliases
|
|
943
941
|
const resourceTargets = expandResourceAliases(resourceKind, resourceAliases)
|
|
944
|
-
|
|
945
|
-
// OSS opt-in optimistic locking — auto-register a generic reader for every
|
|
946
|
-
// CRUD entity using the factory's own ORM config (Step 13.3 of the spec at
|
|
947
|
-
// .ai/specs/2026-05-25-oss-optimistic-locking.md). Hand-wired readers
|
|
948
|
-
// registered earlier via module DI (customers/sales) always win because we
|
|
949
|
-
// use the `IfAbsent` variant. Skipped silently when the route has no
|
|
950
|
-
// resolvable resourceKind or no ORM entity class (e.g. virtual routes).
|
|
951
|
-
if (ormCfg.entity && resourceKind && resourceKind !== 'resource') {
|
|
952
|
-
const genericReader = createGenericOptimisticLockReader({
|
|
953
|
-
entity: ormCfg.entity,
|
|
954
|
-
idField: ormCfg.idField ?? 'id',
|
|
955
|
-
tenantField: ormCfg.tenantField,
|
|
956
|
-
orgField: ormCfg.orgField,
|
|
957
|
-
softDeleteField: ormCfg.softDeleteField,
|
|
958
|
-
})
|
|
959
|
-
const keysToRegister: Record<string, typeof genericReader> = { [resourceKind]: genericReader }
|
|
960
|
-
for (const alias of resourceAliases) {
|
|
961
|
-
if (alias && alias !== resourceKind) keysToRegister[alias] = genericReader
|
|
962
|
-
}
|
|
963
|
-
registerOptimisticLockReaderIfAbsent(keysToRegister)
|
|
964
|
-
}
|
|
965
942
|
const defaultIdentifierResolver: CrudIdentifierResolver = (entity, _action) => {
|
|
966
943
|
const id = normalizeIdentifierValue((entity as any)[ormCfg.idField!])
|
|
967
944
|
const orgId = ormCfg.orgField ? normalizeIdentifierValue((entity as any)[ormCfg.orgField]) : null
|
package/src/lib/di/container.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createContainer, asValue, AwilixContainer, InjectionMode, type Resolver } from 'awilix'
|
|
2
2
|
import { RequestContext } from '@mikro-orm/core'
|
|
3
3
|
import { getOrm } from '@open-mercato/shared/lib/db/mikro'
|
|
4
4
|
import { EntityManager } from '@mikro-orm/postgresql'
|
|
@@ -6,8 +6,6 @@ import { BasicQueryEngine } from '@open-mercato/shared/lib/query/engine'
|
|
|
6
6
|
import { DefaultDataEngine } from '@open-mercato/shared/lib/data/engine'
|
|
7
7
|
import { commandRegistry, CommandBus } from '@open-mercato/shared/lib/commands'
|
|
8
8
|
import { applyDiOverridesToContainer } from '@open-mercato/shared/modules/overrides'
|
|
9
|
-
import { createOptimisticLockGuardService } from '@open-mercato/shared/lib/crud/optimistic-lock'
|
|
10
|
-
import { getAllOptimisticLockReaders } from '@open-mercato/shared/lib/crud/optimistic-lock-store'
|
|
11
9
|
|
|
12
10
|
type DynamicCradle = Record<string, any>
|
|
13
11
|
|
|
@@ -157,20 +155,6 @@ export async function createRequestContainer(): Promise<AppContainer> {
|
|
|
157
155
|
dataEngine: asValue(new DefaultDataEngine(em, container as any)),
|
|
158
156
|
commandRegistry: asValue(commandRegistry),
|
|
159
157
|
commandBus: asValue(new CommandBus()),
|
|
160
|
-
// Default OSS optimistic-lock guard. Reads from the global reader store
|
|
161
|
-
// (populated by `makeCrudRoute` auto-registration + any module-DI
|
|
162
|
-
// hand-wired calls to `registerOptimisticLockReaders`). Service is
|
|
163
|
-
// strictly additive: when `OM_OPTIMISTIC_LOCK=off` (or no header is
|
|
164
|
-
// sent) it short-circuits at validateMutation. Module-level di.ts
|
|
165
|
-
// registrations override this default via Awilix replace semantics —
|
|
166
|
-
// see the enterprise `record_locks` module for the canonical override.
|
|
167
|
-
// Spec: .ai/specs/2026-05-25-oss-optimistic-locking.md
|
|
168
|
-
crudMutationGuardService: asFunction(({ em: scopedEm }: { em: EntityManager }) =>
|
|
169
|
-
createOptimisticLockGuardService({
|
|
170
|
-
getEm: () => scopedEm,
|
|
171
|
-
readers: getAllOptimisticLockReaders(),
|
|
172
|
-
}),
|
|
173
|
-
).scoped(),
|
|
174
158
|
})
|
|
175
159
|
// Allow modules to override/extend
|
|
176
160
|
for (const reg of diRegistrars) {
|
package/src/lib/i18n/context.tsx
CHANGED
|
@@ -73,17 +73,6 @@ export function useT() {
|
|
|
73
73
|
return ctx.t
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
/**
|
|
77
|
-
* Like `useT`, but returns `undefined` instead of throwing when no
|
|
78
|
-
* `I18nProvider` is in scope. Use where a translator is desirable but not
|
|
79
|
-
* guaranteed (e.g. plumbing `t` into side-effect handlers that may run before
|
|
80
|
-
* the provider mounts) — callers MUST provide a fallback.
|
|
81
|
-
*/
|
|
82
|
-
export function useOptionalT(): TranslateFn | undefined {
|
|
83
|
-
const ctx = useContext(I18nContext)
|
|
84
|
-
return ctx?.t
|
|
85
|
-
}
|
|
86
|
-
|
|
87
76
|
export function useLocale() {
|
|
88
77
|
const ctx = useContext(I18nContext)
|
|
89
78
|
if (!ctx) throw new Error('useLocale must be used within I18nProvider')
|
|
@@ -1,20 +1,6 @@
|
|
|
1
1
|
export type IntegrationScope = {
|
|
2
2
|
organizationId: string
|
|
3
3
|
tenantId: string
|
|
4
|
-
/**
|
|
5
|
-
* Optional per-user secret scoping. When set, credential lookups and writes
|
|
6
|
-
* are scoped to a single user — used by per-user channels (Gmail, IMAP)
|
|
7
|
-
* so two users on the same tenant don't share one row.
|
|
8
|
-
*
|
|
9
|
-
* When `undefined`/`null`, behaviour is unchanged — tenant-wide credentials
|
|
10
|
-
* (e.g. shared Stripe/Akeneo API keys) keep working exactly as before.
|
|
11
|
-
*
|
|
12
|
-
* Stored on `IntegrationCredentials.user_id` (added 2026-05-26 by the email
|
|
13
|
-
* integration spec). Backed by the partial unique index
|
|
14
|
-
* `integration_credentials_user_lookup_idx` across integration, organization,
|
|
15
|
-
* tenant, and user where `user_id IS NOT NULL AND deleted_at IS NULL`.
|
|
16
|
-
*/
|
|
17
|
-
userId?: string | null
|
|
18
4
|
}
|
|
19
5
|
|
|
20
6
|
export type IntegrationCategory =
|
|
@@ -30,13 +30,6 @@ export type NotificationHandlerContext = {
|
|
|
30
30
|
userId?: string
|
|
31
31
|
features: string[]
|
|
32
32
|
currentPath: string
|
|
33
|
-
/**
|
|
34
|
-
* Optional translator, present when the dispatch happens inside a React tree
|
|
35
|
-
* with an active `I18nProvider` (the poll/SSE notification hooks). Handlers
|
|
36
|
-
* that emit user-facing copy (e.g. a toast action label) MUST localize via
|
|
37
|
-
* this when available and fall back to an English literal only when absent.
|
|
38
|
-
*/
|
|
39
|
-
t?: (key: string, fallback?: string) => string
|
|
40
33
|
toast: (options: NotificationHandlerToastOptions) => void
|
|
41
34
|
popup: (options: NotificationHandlerPopupOptions) => void
|
|
42
35
|
emitEvent: (eventName: string, detail?: unknown) => void
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
import { CrudHttpError } from "./errors.js";
|
|
2
|
-
import {
|
|
3
|
-
OPTIMISTIC_LOCK_CONFLICT_CODE,
|
|
4
|
-
OPTIMISTIC_LOCK_CONFLICT_ERROR,
|
|
5
|
-
OPTIMISTIC_LOCK_ENV_VAR,
|
|
6
|
-
OPTIMISTIC_LOCK_HEADER_NAME
|
|
7
|
-
} from "./optimistic-lock-headers.js";
|
|
8
|
-
import {
|
|
9
|
-
normalizeIsoToken,
|
|
10
|
-
parseOptimisticLockEnv
|
|
11
|
-
} from "./optimistic-lock.js";
|
|
12
|
-
function toIsoOrNull(value) {
|
|
13
|
-
if (value == null) return null;
|
|
14
|
-
if (value instanceof Date) {
|
|
15
|
-
const ms = value.getTime();
|
|
16
|
-
return Number.isFinite(ms) ? new Date(ms).toISOString() : null;
|
|
17
|
-
}
|
|
18
|
-
const trimmed = String(value).trim();
|
|
19
|
-
if (!trimmed) return null;
|
|
20
|
-
return normalizeIsoToken(trimmed);
|
|
21
|
-
}
|
|
22
|
-
function resolveConfig(envValue) {
|
|
23
|
-
return parseOptimisticLockEnv(envValue !== void 0 ? envValue : process.env[OPTIMISTIC_LOCK_ENV_VAR]);
|
|
24
|
-
}
|
|
25
|
-
function isResourceLockEnabled(config, resourceKind) {
|
|
26
|
-
if (config.mode === "off") return false;
|
|
27
|
-
if (config.mode === "all") return true;
|
|
28
|
-
return config.entities.has(resourceKind.toLowerCase());
|
|
29
|
-
}
|
|
30
|
-
function readOptimisticLockExpected(source) {
|
|
31
|
-
if (!source) return null;
|
|
32
|
-
const headers = source instanceof Headers ? source : source.headers instanceof Headers ? source.headers : null;
|
|
33
|
-
if (!headers) return null;
|
|
34
|
-
const direct = headers.get(OPTIMISTIC_LOCK_HEADER_NAME);
|
|
35
|
-
if (typeof direct === "string" && direct.trim().length > 0) return direct.trim();
|
|
36
|
-
return null;
|
|
37
|
-
}
|
|
38
|
-
function buildOptimisticLockConflictBody(currentIso, expectedIso) {
|
|
39
|
-
return {
|
|
40
|
-
error: OPTIMISTIC_LOCK_CONFLICT_ERROR,
|
|
41
|
-
code: OPTIMISTIC_LOCK_CONFLICT_CODE,
|
|
42
|
-
currentUpdatedAt: currentIso,
|
|
43
|
-
expectedUpdatedAt: expectedIso
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
function assertOptimisticLock(input) {
|
|
47
|
-
const config = resolveConfig(input.envValue);
|
|
48
|
-
if (!isResourceLockEnabled(config, input.resourceKind)) return;
|
|
49
|
-
const expectedIso = toIsoOrNull(input.expected);
|
|
50
|
-
if (expectedIso == null) return;
|
|
51
|
-
const currentIso = toIsoOrNull(input.current);
|
|
52
|
-
if (currentIso == null) return;
|
|
53
|
-
if (currentIso === expectedIso) return;
|
|
54
|
-
throw new CrudHttpError(409, buildOptimisticLockConflictBody(currentIso, expectedIso));
|
|
55
|
-
}
|
|
56
|
-
function enforceCommandOptimisticLock(input) {
|
|
57
|
-
const expected = input.expected !== void 0 && input.expected !== null ? input.expected : readOptimisticLockExpected(input.request ?? null);
|
|
58
|
-
assertOptimisticLock({
|
|
59
|
-
resourceKind: input.resourceKind,
|
|
60
|
-
resourceId: input.resourceId,
|
|
61
|
-
expected,
|
|
62
|
-
current: input.current,
|
|
63
|
-
envValue: input.envValue
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
function enforceRecordGoneIsConflict(input) {
|
|
67
|
-
const config = resolveConfig(input.envValue);
|
|
68
|
-
if (!isResourceLockEnabled(config, input.resourceKind)) return;
|
|
69
|
-
const clientSupplied = input.expected !== void 0 && input.expected !== null ? input.expected : readOptimisticLockExpected(input.request ?? null);
|
|
70
|
-
const expectedIso = toIsoOrNull(clientSupplied);
|
|
71
|
-
if (expectedIso == null) return;
|
|
72
|
-
throw new CrudHttpError(409, buildOptimisticLockConflictBody(expectedIso, expectedIso));
|
|
73
|
-
}
|
|
74
|
-
function createCommandOptimisticLockGuardService(options = {}) {
|
|
75
|
-
const resolveExpected = options.resolveExpected ?? null;
|
|
76
|
-
return {
|
|
77
|
-
async enforce(input) {
|
|
78
|
-
const config = resolveConfig(input.envValue);
|
|
79
|
-
if (!isResourceLockEnabled(config, input.resourceKind)) return;
|
|
80
|
-
const clientSupplied = input.expected !== void 0 && input.expected !== null ? input.expected : readOptimisticLockExpected(input.request ?? null);
|
|
81
|
-
const expectedFromHeader = toIsoOrNull(clientSupplied);
|
|
82
|
-
let expected = expectedFromHeader;
|
|
83
|
-
if (resolveExpected) {
|
|
84
|
-
const resolverInput = {
|
|
85
|
-
expectedFromHeader,
|
|
86
|
-
resourceKind: input.resourceKind,
|
|
87
|
-
resourceId: input.resourceId
|
|
88
|
-
};
|
|
89
|
-
expected = await resolveExpected(resolverInput);
|
|
90
|
-
}
|
|
91
|
-
assertOptimisticLock({
|
|
92
|
-
resourceKind: input.resourceKind,
|
|
93
|
-
resourceId: input.resourceId,
|
|
94
|
-
expected,
|
|
95
|
-
current: input.current,
|
|
96
|
-
envValue: input.envValue
|
|
97
|
-
});
|
|
98
|
-
}
|
|
99
|
-
};
|
|
100
|
-
}
|
|
101
|
-
export {
|
|
102
|
-
assertOptimisticLock,
|
|
103
|
-
buildOptimisticLockConflictBody,
|
|
104
|
-
createCommandOptimisticLockGuardService,
|
|
105
|
-
enforceCommandOptimisticLock,
|
|
106
|
-
enforceRecordGoneIsConflict,
|
|
107
|
-
readOptimisticLockExpected
|
|
108
|
-
};
|
|
109
|
-
//# sourceMappingURL=optimistic-lock-command.js.map
|