@declaro/data 2.0.0-beta.115 → 2.0.0-beta.116

package/dist/ts/domain/services/base-model-service.d.ts

@@ -18,5 +18,6 @@ export declare class BaseModelService<TSchema extends AnyModelSchema> {
     getDescriptor(action: string, scope?: string): ActionDescriptor;
     getPrimaryKeyValue(input: InferLookup<TSchema>): InferPrimaryKeyType<TSchema>;
     getPrimaryKeyValue(input: InferInput<TSchema>): InferPrimaryKeyType<TSchema>;
+    getSchema(): TSchema;
 }
 //# sourceMappingURL=base-model-service.d.ts.map

package/dist/ts/domain/services/base-model-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-model-service.d.ts","sourceRoot":"","sources":["../../../../src/domain/services/base-model-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAoB,MAAM,eAAe,CAAA;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EACR,mBAAmB,EACnB,UAAU,EACV,WAAW,EACX,mBAAmB,EACtB,MAAM,qCAAqC,CAAA;AAE5C,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,gBAAgB,CAAC,OAAO,SAAS,cAAc;IACxD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IAClC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAA;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;gBAEvC,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAQ5C,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAS5C,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC;IAC7E,kBAAkB,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC;CAO/E"}
+{"version":3,"file":"base-model-service.d.ts","sourceRoot":"","sources":["../../../../src/domain/services/base-model-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAoB,MAAM,eAAe,CAAA;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EACR,mBAAmB,EACnB,UAAU,EACV,WAAW,EACX,mBAAmB,EACtB,MAAM,qCAAqC,CAAA;AAE5C,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,qBAAa,gBAAgB,CAAC,OAAO,SAAS,cAAc;IACxD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;IAClC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAC/D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAA;IACjE,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;gBAEvC,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAQ5C,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAS5C,kBAAkB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC;IAC7E,kBAAkB,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC;IAQrE,SAAS;CAGnB"}

package/dist/ts/domain/services/read-only-model-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-only-model-service.d.ts","sourceRoot":"","sources":["../../../../src/domain/services/read-only-model-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,eAAe,CAAA;AAC1D,OAAO,KAAK,EACR,WAAW,EACX,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,SAAS,EACZ,MAAM,qCAAqC,CAAA;AAG5C,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAG5D,MAAM,WAAW,YAAa,SAAQ,cAAc;CAAG;AACvD,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,cAAc,CAAE,SAAQ,cAAc;IAClF,UAAU,CAAC,EAAE,gBAAgB,CAAA;IAC7B,IAAI,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;CAC5B;AAED,qBAAa,oBAAoB,CAAC,OAAO,SAAS,cAAc,CAAE,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IAC/F;;;;;;OAMG;IACG,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAalF;;;;;;;OAOG;IACG,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAapF;;;;;OAKG;IACG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAqB/F;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;IAqBxG;;;;;OAKG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAClC,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAyBvC;;;;OAIG;IACG,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAqBlG"}
+{"version":3,"file":"read-only-model-service.d.ts","sourceRoot":"","sources":["../../../../src/domain/services/read-only-model-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,eAAe,CAAA;AAC1D,OAAO,KAAK,EACR,WAAW,EACX,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,SAAS,EACZ,MAAM,qCAAqC,CAAA;AAG5C,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE5D,MAAM,WAAW,YAAa,SAAQ,cAAc;CAAG;AACvD,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,cAAc,CAAE,SAAQ,cAAc;IAClF,UAAU,CAAC,EAAE,gBAAgB,CAAA;IAC7B,IAAI,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;CAC5B;AAED,qBAAa,oBAAoB,CAAC,OAAO,SAAS,cAAc,CAAE,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IAC/F;;;;;;OAMG;IACG,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAIlF;;;;;;;OAOG;IACG,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAIpF;;;;;OAKG;IACG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAqB/F;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;IAqBxG;;;;;OAKG;IACG,MAAM,CACR,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAClC,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAyBvC;;;;OAIG;IACG,KAAK,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAqBlG"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@declaro/data",
-    "version": "2.0.0-beta.115",
+    "version": "2.0.0-beta.116",
     "description": "A data-mapper framework for managing application data across integrated systems.",
     "main": "dist/node/index.cjs",
     "module": "dist/node/index.js",
@@ -22,9 +22,9 @@
         "@declaro/zod": "^2.0.0-beta.51"
     },
     "devDependencies": {
-        "@declaro/auth": "^2.0.0-beta.115",
-        "@declaro/core": "^2.0.0-beta.115",
-        "@declaro/zod": "^2.0.0-beta.115",
+        "@declaro/auth": "^2.0.0-beta.116",
+        "@declaro/core": "^2.0.0-beta.116",
+        "@declaro/zod": "^2.0.0-beta.116",
         "crypto-browserify": "^3.12.1",
         "typescript": "^5.8.3",
         "uuid": "^11.1.0",
@@ -43,5 +43,5 @@
         "require": "./dist/node/index.cjs",
         "browser": "./dist/browser/index.js"
     },
-    "gitHead": "a5c034ab3eb439e123c7e999efdfc7270d4e12b8"
+    "gitHead": "dcb1fc259530da343bd6557a123cc394c79e84ec"
 }

package/src/domain/services/base-model-service.ts

@@ -47,4 +47,8 @@ export class BaseModelService<TSchema extends AnyModelSchema> {
         }
         return input[this.entityMetadata.primaryKey]
     }
+
+    public getSchema() {
+        return this.schema
+    }
 }

package/src/domain/services/model-service.test.ts

@@ -4,6 +4,7 @@ import { MockMemoryRepository } from '../../test/mock/repositories/mock-memory-r
 import { MockBookSchema, type MockBookInput } from '../../test/mock/models/mock-book-models'
 import { EventManager } from '@declaro/core'
 import { mock } from 'bun:test'
+import type { InferDetail } from '../../shared/utils/schema-inference'
 
 describe('ModelService', () => {
     const namespace = 'books'
@@ -881,16 +882,38 @@ describe('ModelService', () => {
             }
         }
 
-        class TestService extends ModelService<typeof mockSchema> {}
+        class TestServiceWithNormalization extends ModelService<typeof mockSchema> {
+            async normalizeDetail(detail: InferDetail<typeof mockSchema>): Promise<InferDetail<typeof mockSchema>> {
+                // Handle null case (e.g., when load returns null)
+                if (!detail) return detail
+
+                // Convert string dates back to Date objects
+                if (typeof detail.publishedDate === 'string') {
+                    detail.publishedDate = new Date(detail.publishedDate) as any
+                }
+                return detail
+            }
+
+            async normalizeSummary(summary: InferDetail<typeof mockSchema>): Promise<InferDetail<typeof mockSchema>> {
+                // Handle null case (e.g., when load returns null)
+                if (!summary) return summary
+
+                // Convert string dates back to Date objects
+                if (typeof summary.publishedDate === 'string') {
+                    summary.publishedDate = new Date(summary.publishedDate) as any
+                }
+                return summary
+            }
+        }
 
         let testRepository: TestRepository
-        let testService: TestService
+        let testService: TestServiceWithNormalization
 
         beforeEach(() => {
             testRepository = new TestRepository()
             emitter = new EventManager()
 
-            testService = new TestService({
+            testService = new TestServiceWithNormalization({
                 repository: testRepository,
                 emitter,
                 schema: mockSchema,
@@ -898,7 +921,7 @@ describe('ModelService', () => {
             })
         })
 
-        it('should normalize details in the create response', async () => {
+        it('should allow custom normalization of details in the create response when overridden', async () => {
             const input = { id: 200, title: 'Create Test', author: 'Creator', publishedDate: new Date() }
             const record = await testService.create(input)
 
@@ -909,7 +932,7 @@ describe('ModelService', () => {
             expect(actualDate).toBeInstanceOf(Date)
         })
 
-        it('should normalize details in the update response', async () => {
+        it('should allow custom normalization of details in the update response when overridden', async () => {
             const input = { id: 201, title: 'Update Test', author: 'Updater', publishedDate: new Date() }
             await testRepository.create(input)
 
@@ -923,7 +946,7 @@ describe('ModelService', () => {
             expect(actualDate).toBeInstanceOf(Date)
         })
 
-        it('should normalize details in the upsert response when creating', async () => {
+        it('should allow custom normalization of details in the upsert response when creating and overridden', async () => {
             const input = { id: 202, title: 'Upsert Create Test', author: 'Upserter', publishedDate: new Date() }
             const record = await testService.upsert(input)
 
@@ -934,7 +957,7 @@ describe('ModelService', () => {
             expect(actualDate).toBeInstanceOf(Date)
         })
 
-        it('should normalize details in the upsert response when updating', async () => {
+        it('should allow custom normalization of details in the upsert response when updating and overridden', async () => {
             const input = { id: 203, title: 'Upsert Update Test', author: 'Upserter', publishedDate: new Date() }
             await testRepository.create(input)
 
@@ -953,7 +976,7 @@ describe('ModelService', () => {
             expect(actualDate).toBeInstanceOf(Date)
         })
 
-        it('should normalize details in the bulkUpsert response', async () => {
+        it('should allow custom normalization of details in the bulkUpsert response when overridden', async () => {
             const input1 = { id: 204, title: 'Bulk Test 1', author: 'Bulk Author 1', publishedDate: new Date() }
             const input2 = { id: 205, title: 'Bulk Test 2', author: 'Bulk Author 2', publishedDate: new Date() }
 
@@ -968,7 +991,7 @@ describe('ModelService', () => {
             }
         })
 
-        it('should normalize details in the bulkUpsert response with mixed create and update', async () => {
+        it('should allow custom normalization of details in the bulkUpsert response with mixed create and update when overridden', async () => {
             const existingInput = { id: 206, title: 'Existing', author: 'Existing Author', publishedDate: new Date() }
             await testRepository.create(existingInput)
 
@@ -991,7 +1014,7 @@ describe('ModelService', () => {
             }
         })
 
-        it('should normalize summaries in the remove response', async () => {
+        it('should allow custom normalization of summaries in the remove response when overridden', async () => {
             const input = { id: 208, title: 'Remove Test', author: 'Remover', publishedDate: new Date() }
             await testRepository.create(input)
 
@@ -1004,7 +1027,7 @@ describe('ModelService', () => {
             expect(actualDate).toBeInstanceOf(Date)
         })
 
-        it('should normalize summaries in the restore response', async () => {
+        it('should allow custom normalization of summaries in the restore response when overridden', async () => {
             const input = { id: 209, title: 'Restore Test', author: 'Restorer', publishedDate: new Date() }
             await testRepository.create(input)
             await testRepository.remove({ id: 209 })
@@ -1017,5 +1040,21 @@ describe('ModelService', () => {
             expect(actualDate).toEqual(expectedDate)
             expect(actualDate).toBeInstanceOf(Date)
         })
+
+        it('should not normalize data by default when normalization methods are not overridden', async () => {
+            const defaultService = new ModelService({
+                repository: testRepository,
+                emitter,
+                schema: mockSchema,
+                namespace,
+            })
+
+            const input = { id: 210, title: 'Default Test', author: 'Default Author', publishedDate: new Date() }
+            const record = await defaultService.create(input)
+
+            // Should return the raw string from repository since no normalization is applied
+            expect(record.publishedDate as any).toBe('2024-01-01')
+            expect(typeof record.publishedDate).toBe('string')
+        })
     })
 })

package/src/domain/services/read-only-model-service.test.ts

@@ -335,18 +335,41 @@ describe('ReadOnlyModelService', () => {
                 return results
             }
         }
-        class TestService extends ReadOnlyModelService<typeof mockSchema> {}
 
-        let testService: TestService
+        class TestServiceWithNormalization extends ReadOnlyModelService<typeof mockSchema> {
+            async normalizeDetail(detail: InferDetail<typeof mockSchema>): Promise<InferDetail<typeof mockSchema>> {
+                // Handle null case (e.g., when load returns null)
+                if (!detail) return detail
+
+                // Convert string dates back to Date objects
+                if (typeof detail.publishedDate === 'string') {
+                    detail.publishedDate = new Date(detail.publishedDate) as any
+                }
+                return detail
+            }
+
+            async normalizeSummary(summary: InferDetail<typeof mockSchema>): Promise<InferDetail<typeof mockSchema>> {
+                // Handle null case (e.g., when load returns null)
+                if (!summary) return summary
+
+                // Convert string dates back to Date objects
+                if (typeof summary.publishedDate === 'string') {
+                    summary.publishedDate = new Date(summary.publishedDate) as any
+                }
+                return summary
+            }
+        }
+
+        let testService: TestServiceWithNormalization
 
         beforeEach(() => {
             repository = new TestRepository()
             emitter = new EventManager()
 
-            testService = new TestService({ repository, emitter, schema: mockSchema, namespace })
+            testService = new TestServiceWithNormalization({ repository, emitter, schema: mockSchema, namespace })
         })
 
-        it('should normalize details in the load response', async () => {
+        it('should allow custom normalization of details in the load response when overridden', async () => {
             const input = { id: 100, title: 'Normalization Test', author: 'Normalizer', publishedDate: new Date() }
             await repository.create(input)
 
@@ -359,7 +382,7 @@ describe('ReadOnlyModelService', () => {
             expect(actualDate).toBeInstanceOf(Date)
         })
 
-        it('should normalize details in the loadMany response', async () => {
+        it('should allow custom normalization of details in the loadMany response when overridden', async () => {
             const input1 = { id: 101, title: 'Normalization Test 1', author: 'Normalizer 1', publishedDate: new Date() }
             const input2 = { id: 102, title: 'Normalization Test 2', author: 'Normalizer 2', publishedDate: new Date() }
             await repository.create(input1)
@@ -376,7 +399,7 @@ describe('ReadOnlyModelService', () => {
             }
         })
 
-        it('should normalize details in the search response', async () => {
+        it('should allow custom normalization of summaries in the search response when overridden', async () => {
             const input1 = { id: 103, title: 'Normalization Test 3', author: 'Normalizer 3', publishedDate: new Date() }
             const input2 = { id: 104, title: 'Normalization Test 4', author: 'Normalizer 4', publishedDate: new Date() }
             await repository.create(input1)
@@ -392,5 +415,18 @@ describe('ReadOnlyModelService', () => {
                 expect(actualDate).toBeInstanceOf(Date)
             }
         })
+
+        it('should not normalize data by default when normalization methods are not overridden', async () => {
+            const defaultService = new ReadOnlyModelService({ repository, emitter, schema: mockSchema, namespace })
+
+            const input = { id: 105, title: 'Default Test', author: 'Default Author', publishedDate: new Date() }
+            await repository.create(input)
+
+            const record = await defaultService.load({ id: 105 })
+
+            // Should return the raw string from repository since no normalization is applied
+            expect(record.publishedDate as any).toBe('2024-01-01')
+            expect(typeof record.publishedDate).toBe('string')
+        })
     })
 })

package/src/domain/services/read-only-model-service.ts

@@ -10,7 +10,6 @@ import { ModelQueryEvent } from '../events/event-types'
 import { QueryEvent } from '../events/query-event'
 import { BaseModelService, type IActionOptions } from './base-model-service'
 import type { IPaginationInput } from '../models/pagination'
-import type { IUpdateOptions } from './model-service'
 
 export interface ILoadOptions extends IActionOptions {}
 export interface ISearchOptions<TSchema extends AnyModelSchema> extends IActionOptions {
@@ -27,15 +26,6 @@ export class ReadOnlyModelService<TSchema extends AnyModelSchema> extends BaseMo
      * @returns The normalized detail data.
      */
     async normalizeDetail(detail: InferDetail<TSchema>): Promise<InferDetail<TSchema>> {
-        const detailModel = this.schema.definition.detail as Model<any, any>
-        if (detailModel) {
-            const validation = await detailModel.validate(detail, { strict: false })
-            if (validation.issues) {
-                console.warn(`${detailModel.labels.singularLabel} shape did not match the expected schema`, validation)
-            } else {
-                return validation.value
-            }
-        }
         return detail
     }
 
@@ -48,15 +38,6 @@ export class ReadOnlyModelService<TSchema extends AnyModelSchema> extends BaseMo
      * @returns The normalized summary data.
      */
     async normalizeSummary(summary: InferDetail<TSchema>): Promise<InferDetail<TSchema>> {
-        const summaryModel = this.schema.definition.summary as Model<any, any>
-        if (summaryModel) {
-            const validation = await summaryModel.validate(summary, { strict: false })
-            if (validation.issues) {
-                console.warn(`${summaryModel.labels.singularLabel} shape did not match the expected schema`)
-            } else {
-                return validation.value
-            }
-        }
         return summary
     }