@travetto/model 4.0.6 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "4.0.6",
+  "version": "4.1.0",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,14 +26,14 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^4.0.6",
-    "@travetto/di": "^4.0.6",
-    "@travetto/registry": "^4.0.6",
-    "@travetto/schema": "^4.0.6"
+    "@travetto/config": "^4.1.0",
+    "@travetto/di": "^4.1.0",
+    "@travetto/registry": "^4.1.0",
+    "@travetto/schema": "^4.1.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.7",
-    "@travetto/test": "^4.0.6"
+    "@travetto/cli": "^4.1.0",
+    "@travetto/test": "^4.1.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/internal/service/stream.ts

@@ -1,21 +1,6 @@
-import { AppError, Class } from '@travetto/base';
+import { Class } from '@travetto/base';
 import { ModelType } from '../../types/model';
 
 class Cls { id: string; }
 export const StreamModel: Class<ModelType> = Cls;
-export const STREAMS = '_streams';
-
-export class ModelStreamUtil {
-  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];
-  }
-}
+export const STREAMS = '_streams';

package/src/provider/file.ts

@@ -21,7 +21,7 @@ import { ModelCrudUtil } from '../internal/service/crud';
 import { ModelExpiryUtil } from '../internal/service/expiry';
 import { NotFoundError } from '../error/not-found';
 import { ExistsError } from '../error/exists';
-import { ModelStreamUtil, StreamModel, STREAMS } from '../internal/service/stream';
+import { StreamModel, STREAMS } from '../internal/service/stream';
 
 type Suffix = '.bin' | '.meta' | '.json' | '.expires';
 
@@ -194,7 +194,7 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
     const file = await this.#find(STREAMS, BIN, location);
     const meta = await this.describeStream(location);
 
-    [start, end] = ModelStreamUtil.enforceRange(start, end, meta.size);
+    [start, end] = StreamUtil.enforceRange(start, end, meta.size);
 
     const stream = createReadStream(file, { start, end });
     return { stream, range: [start, end] };

package/src/provider/memory.ts

@@ -18,7 +18,7 @@ import { ExistsError } from '../error/exists';
 import { ModelIndexedSupport } from '../service/indexed';
 import { ModelIndexedUtil } from '../internal/service/indexed';
 import { ModelStorageUtil } from '../internal/service/storage';
-import { ModelStreamUtil, StreamModel, STREAMS } from '../internal/service/stream';
+import { StreamModel, STREAMS } from '../internal/service/stream';
 import { IndexConfig } from '../registry/types';
 
 const STREAM_META = `${STREAMS}_meta`;
@@ -253,7 +253,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
     const streams = this.#find(STREAMS, location, 'notfound');
     const buffer = streams.get(location)!;
 
-    [start, end] = ModelStreamUtil.enforceRange(start, end, buffer.length);
+    [start, end] = StreamUtil.enforceRange(start, end, buffer.length);
 
     const stream = await StreamUtil.bufferToStream(buffer.subarray(start, end + 1));
     return { stream, range: [start, end] };