@travetto/model 3.1.7 → 3.1.9

package/README.md

@@ -205,7 +205,7 @@ export interface ModelBulkSupport extends ModelCrudSupport {
 ```
 
 ## Declaration
-Models are declared via the [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L12) decorator, which allows the system to know that this is a class that is compatible with the module.  The only requirement for a model is the [ModelType](https://github.com/travetto/travetto/tree/main/module/model/src/types/model.ts#L9)
+Models are declared via the [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13) decorator, which allows the system to know that this is a class that is compatible with the module.  The only requirement for a model is the [ModelType](https://github.com/travetto/travetto/tree/main/module/model/src/types/model.ts#L9)
 
 **Code: ModelType**
 ```typescript
@@ -317,7 +317,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream>;
   async describeStream(location: string): Promise<StreamMeta>;
   async deleteStream(location: string): Promise<void>;
-  // Expiry Support
+  // Expiry
   async deleteExpired<T extends ModelType>(cls: Class<T>): Promise<number>;
   // Storage Support
   async createStorage(): Promise<void>;
@@ -384,7 +384,7 @@ export class MemoryPolymorphicSuite extends ModelPolymorphismSuite {
 ```
 
 ## CLI - model:export
-The module provides the ability to generate an export of the model structure from all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L12)s within the application.  This is useful for being able to generate the appropriate files to manually create the data schemas in production.
+The module provides the ability to generate an export of the model structure from all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13)s within the application.  This is useful for being able to generate the appropriate files to manually create the data schemas in production.
 
 **Terminal: Running model export**
 ```bash
@@ -407,7 +407,7 @@ Models
 ```
 
 ## CLI - model:install
-The module provides the ability to install all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L12)s within the application given the current configuration being targeted.  This is useful for being able to prepare the datastore manually.
+The module provides the ability to install all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13)s within the application given the current configuration being targeted.  This is useful for being able to prepare the datastore manually.
 
 **Terminal: Running model install**
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,13 +26,13 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^3.1.2",
+    "@travetto/config": "^3.1.3",
     "@travetto/di": "^3.1.1",
     "@travetto/registry": "^3.1.1",
-    "@travetto/schema": "^3.1.2"
+    "@travetto/schema": "^3.1.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.1.2",
+    "@travetto/cli": "^3.1.3",
     "@travetto/test": "^3.1.1"
   },
   "peerDependenciesMeta": {

package/src/internal/service/stream.ts

@@ -6,9 +6,16 @@ export const StreamModel: Class<ModelType> = Cls;
 export const STREAMS = '_streams';
 
 export class ModelStreamUtil {
-  static checkRange(start: number, end: number, size: number): void {
-    if (Number.isNaN(start) || Number.isNaN(end) || !Number.isFinite(start) || start < 0 || end >= size) {
+  static enforceRange(start: number, end: number | undefined, size: number): [start: number, end: number] {
+
+    end ??= size - 1;
+
+    if (Number.isNaN(start) || Number.isNaN(end) || !Number.isFinite(start) || start >= size || start < 0) {
       throw new AppError('Invalid position, out of range', 'data');
     }
+    if (end >= size) {
+      end = size - 1;
+    }
+    return [start, end];
   }
 }

package/src/provider/file.ts

@@ -193,9 +193,8 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
     const file = await this.#find(STREAMS, BIN, location);
     const meta = await this.describeStream(location);
-    end ??= meta.size - 1;
 
-    ModelStreamUtil.checkRange(start, end, meta.size);
+    [start, end] = ModelStreamUtil.enforceRange(start, end, meta.size);
 
     const stream = createReadStream(file, { start, end });
     return { stream, range: [start, end] };

package/src/provider/memory.ts

@@ -252,8 +252,9 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
     const streams = this.#find(STREAMS, location, 'notfound');
     const buffer = streams.get(location)!;
-    end ??= (buffer.length - 1);
-    ModelStreamUtil.checkRange(start, end, buffer.length);
+
+    [start, end] = ModelStreamUtil.enforceRange(start, end, buffer.length);
+
     const stream = await StreamUtil.bufferToStream(buffer.subarray(start, end + 1));
     return { stream, range: [start, end] };
   }

package/src/registry/decorator.ts

@@ -1,4 +1,5 @@
 import { Class } from '@travetto/base';
+import { SchemaRegistry } from '@travetto/schema';
 
 import { ModelType } from '../types/model';
 import { ModelRegistry } from './model';
@@ -15,6 +16,7 @@ export function Model(conf: Partial<ModelOptions<ModelType>> | string = {}) {
       conf = { store: conf };
     }
     ModelRegistry.register(target, conf);
+    SchemaRegistry.register(target, { baseType: conf.baseType });
     return target;
   };
 }

package/src/registry/model.ts

@@ -64,8 +64,8 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
     delete view.id.required; // Allow ids to be optional
 
     if ('type' in view && this.getBaseModel(cls) !== cls) {
-      config.subType = schema.subType; // Copy from schema
-      delete view.type.required; // Allow type to be optional
+      config.subType = !!schema.subTypeName; // Copy from schema
+      delete view[schema.subTypeField].required; // Allow type to be optional
     }
     return config;
   }

package/support/test/stream.ts

@@ -98,7 +98,12 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
     assert(subContent3.length === 1);
     assert(subContent3 === 'k');
 
+    const partialOverbounded = await service.getStreamPartial(meta.hash, 20, 40);
+    const subContent4 = (await StreamUtil.toBuffer(partialOverbounded.stream)).toString('utf8');
+    assert(subContent4.length === 6);
+    assert(subContent4.endsWith('xyz'));
+
     await assert.rejects(() => service.getStreamPartial(meta.hash, -10, 10));
-    await assert.rejects(() => service.getStreamPartial(meta.hash, 0, 27));
+    await assert.rejects(() => service.getStreamPartial(meta.hash, 30, 37));
   }
 }