@open-mercato/cli 0.4.11-develop.1925.0436f3b988 → 0.4.11-develop.1926.e34f3af1bf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.4.11-develop.1925.0436f3b988",
+  "version": "0.4.11-develop.1926.e34f3af1bf",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -58,7 +58,7 @@
     "@mikro-orm/core": "^6.6.10",
     "@mikro-orm/migrations": "^6.6.10",
     "@mikro-orm/postgresql": "^6.6.10",
-    "@open-mercato/shared": "0.4.11-develop.1925.0436f3b988",
+    "@open-mercato/shared": "0.4.11-develop.1926.e34f3af1bf",
     "pg": "8.20.0",
     "semver": "^7.7.3",
     "testcontainers": "^11.12.0",
@@ -67,10 +67,10 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.4.11-develop.1925.0436f3b988"
+    "@open-mercato/shared": "0.4.11-develop.1926.e34f3af1bf"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.4.11-develop.1925.0436f3b988",
+    "@open-mercato/shared": "0.4.11-develop.1926.e34f3af1bf",
     "@types/jest": "^30.0.0",
     "jest": "^30.2.0",
     "ts-jest": "^29.4.6"

package/src/lib/generators/__tests__/structural-contracts.test.ts

@@ -198,6 +198,7 @@ function scaffoldFixture(): ModuleEntry[] {
   touchFile(pkgModulePath('orders', 'commands', 'interceptors.ts'), `export const interceptors = [\n  { id: 'orders.audit-log', commandId: 'orders.create', phase: 'after', async handler(command: any) { return { ok: true } } },\n]\n`)
   touchFile(pkgModulePath('orders', 'acl.ts'), "export const features = ['orders.view', 'orders.create', 'orders.edit', 'orders.delete']\n")
   touchFile(pkgModulePath('orders', 'setup.ts'), "export const setup = { defaultRoleFeatures: ['orders.view'] }\n")
+  touchFile(pkgModulePath('orders', 'encryption.ts'), "export const defaultEncryptionMaps = [{ entityId: 'orders:sales_order', fields: [{ field: 'customer_email', hashField: 'customer_email_hash' }] }]\nexport default defaultEncryptionMaps\n")
   touchFile(pkgModulePath('orders', 'di.ts'), 'export function register(container: any) {}\n')
   touchFile(pkgModulePath('orders', 'i18n', 'en.json'), JSON.stringify({ orders: { list: { title: 'Orders' } } }))
   touchFile(pkgModulePath('orders', 'i18n', 'pl.json'), JSON.stringify({ orders: { list: { title: 'Zamówienia' } } }))
@@ -497,6 +498,11 @@ describe('modules.generated.ts', () => {
     expect(content).toContain('setup:')
   })
 
+  it('modules include default encryption maps from encryption.ts', () => {
+    expect(content).toContain('defaultEncryptionMaps:')
+    expect(content).toContain('ENCRYPTION_orders_')
+  })
+
   it('modules include translation locale keys', () => {
     expect(content).toContain("'en':")
     expect(content).toContain("'pl':")

package/src/lib/generators/module-registry.ts

@@ -1984,6 +1984,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
     let customFieldSetsExpr: string = '[]'
     const dashboardWidgets: string[] = []
     let setupImportName: string | null = null
+    let encryptionImportName: string | null = null
     let integrationImportName: string | null = null
 
     // === Processing order MUST match original import ID sequence ===
@@ -2099,6 +2100,12 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       if (setup) setupImportName = setup.importName
     }
 
+    // 11a. Encryption defaults: encryption.ts
+    {
+      const encryption = resolveConventionFile(roots, imps, 'encryption.ts', 'ENCRYPTION', modId, importIdRef, imports, runtimeImports)
+      if (encryption) encryptionImportName = encryption.importName
+    }
+
     // 11b. Integration manifest: integration.ts
     {
       const resolved = resolveModuleFile(roots, imps, 'integration.ts')
@@ -2235,6 +2242,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       ${customEntitiesImportName ? `customEntities: ((${customEntitiesImportName}.default ?? ${customEntitiesImportName}.entities) as any) || [],` : ''}
       ${dashboardWidgets.length ? `dashboardWidgets: [${dashboardWidgets.join(', ')}],` : ''}
       ${setupImportName ? `setup: (${setupImportName}.default ?? ${setupImportName}.setup) || undefined,` : ''}
+      ${encryptionImportName ? `defaultEncryptionMaps: ((${encryptionImportName}.default ?? ${encryptionImportName}.defaultEncryptionMaps) as import('@open-mercato/shared/modules/encryption').ModuleEncryptionMap[]) || [],` : ''}
       ${integrationImportName ? `integrations: (( ${integrationImportName}.integrations ?? (${integrationImportName}.integration ? [${integrationImportName}.integration] : []) ) as import('@open-mercato/shared/modules/integrations/types').IntegrationDefinition[]),` : ''}
       ${integrationImportName ? `bundles: (( ${integrationImportName}.bundles ?? (${integrationImportName}.bundle ? [${integrationImportName}.bundle] : []) ) as import('@open-mercato/shared/modules/integrations/types').IntegrationBundle[]),` : ''}
     }`)
@@ -2252,6 +2260,7 @@ export async function generateModuleRegistry(options: ModuleRegistryOptions): Pr
       ${featuresImportName ? `features: ((${featuresImportName}.default ?? ${featuresImportName}.features) as any) || [],` : ''}
       ${customEntitiesImportName ? `customEntities: ((${customEntitiesImportName}.default ?? ${customEntitiesImportName}.entities) as any) || [],` : ''}
       ${setupImportName ? `setup: (${setupImportName}.default ?? ${setupImportName}.setup) || undefined,` : ''}
+      ${encryptionImportName ? `defaultEncryptionMaps: ((${encryptionImportName}.default ?? ${encryptionImportName}.defaultEncryptionMaps) as import('@open-mercato/shared/modules/encryption').ModuleEncryptionMap[]) || [],` : ''}
       ${integrationImportName ? `integrations: (( ${integrationImportName}.integrations ?? (${integrationImportName}.integration ? [${integrationImportName}.integration] : []) ) as import('@open-mercato/shared/modules/integrations/types').IntegrationDefinition[]),` : ''}
       ${integrationImportName ? `bundles: (( ${integrationImportName}.bundles ?? (${integrationImportName}.bundle ? [${integrationImportName}.bundle] : []) ) as import('@open-mercato/shared/modules/integrations/types').IntegrationBundle[]),` : ''}
     }`)
@@ -2551,6 +2560,7 @@ export async function generateModuleRegistryApp(options: ModuleRegistryOptions):
     let customEntitiesImportName: string | null = null
     let dashboardWidgetsValue: WriterFunction = emptyArray()
     let setupImportName: string | null = null
+    let encryptionImportName: string | null = null
     let integrationImportName: string | null = null
 
     const indexResolved = resolveModuleFile(roots, imps, 'index.ts')
@@ -2572,6 +2582,11 @@ export async function generateModuleRegistryApp(options: ModuleRegistryOptions):
       if (setup) setupImportName = setup.importName
     }
 
+    {
+      const encryption = resolveConventionFile(roots, imps, 'encryption.ts', 'ENCRYPTION', modId, importIdRef, imports)
+      if (encryption) encryptionImportName = encryption.importName
+    }
+
     {
       const resolved = resolveModuleFile(roots, imps, 'integration.ts')
       if (resolved) {
@@ -2745,6 +2760,17 @@ export async function generateModuleRegistryApp(options: ModuleRegistryOptions):
         }),
       })
     }
+    if (encryptionImportName) {
+      moduleEntries.push({
+        name: 'defaultEncryptionMaps',
+        value: namespaceFallback({
+          importName: encryptionImportName,
+          members: ['default', 'defaultEncryptionMaps'],
+          fallback: emptyArray(),
+          castType: "Module['defaultEncryptionMaps']",
+        }),
+      })
+    }
     if (integrationImportName) {
       moduleEntries.push({
         name: 'integrations',
@@ -2862,6 +2888,7 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
     let vectorImportName: string | null = null
     let dashboardWidgetsValue: WriterFunction = emptyArray()
     let setupImportName: string | null = null
+    let encryptionImportName: string | null = null
     let integrationImportName: string | null = null
 
     // Module metadata: index.ts (overrideable)
@@ -2885,6 +2912,12 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
       if (setup) setupImportName = setup.importName
     }
 
+    // Module encryption defaults: encryption.ts
+    {
+      const encryption = resolveConventionFile(roots, imps, 'encryption.ts', 'ENCRYPTION', modId, importIdRef, imports)
+      if (encryption) encryptionImportName = encryption.importName
+    }
+
     // Integration manifest: integration.ts
     {
       const resolved = resolveModuleFile(roots, imps, 'integration.ts')
@@ -3051,6 +3084,17 @@ export async function generateModuleRegistryCli(options: ModuleRegistryOptions):
         }),
       })
     }
+    if (encryptionImportName) {
+      moduleEntries.push({
+        name: 'defaultEncryptionMaps',
+        value: namespaceFallback({
+          importName: encryptionImportName,
+          members: ['default', 'defaultEncryptionMaps'],
+          fallback: emptyArray(),
+          castType: "Module['defaultEncryptionMaps']",
+        }),
+      })
+    }
     if (integrationImportName) {
       moduleEntries.push({
         name: 'integrations',