@travetto/model-memory 7.0.0-rc.1 → 7.0.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-memory",
-  "version": "7.0.0-rc.1",
+  "version": "7.0.0-rc.3",
   "description": "Memory backing for the travetto model module.",
   "keywords": [
     "datastore",
@@ -25,14 +25,14 @@
     "directory": "module/model-memory"
   },
   "dependencies": {
-    "@travetto/config": "^7.0.0-rc.1",
-    "@travetto/di": "^7.0.0-rc.1",
-    "@travetto/model": "^7.0.0-rc.1",
-    "@travetto/schema": "^7.0.0-rc.1"
+    "@travetto/config": "^7.0.0-rc.3",
+    "@travetto/di": "^7.0.0-rc.3",
+    "@travetto/model": "^7.0.0-rc.3",
+    "@travetto/schema": "^7.0.0-rc.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.1",
-    "@travetto/test": "^7.0.0-rc.1"
+    "@travetto/cli": "^7.0.0-rc.3",
+    "@travetto/test": "^7.0.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/service.ts

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { buffer as toBuffer } from 'node:stream/consumers';
 
-import { Class, TimeSpan, DeepPartial, castTo, BlobMeta, ByteRange, BinaryInput, BinaryUtil } from '@travetto/runtime';
+import { Class, TimeSpan, DeepPartial, castTo, BlobMeta, ByteRange, BinaryInput, BinaryUtil, JSONUtil } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import {
@@ -17,13 +17,13 @@ type StoreType = Map<string, Buffer>;
 
 @Config('model.memory')
 export class MemoryModelConfig {
-  autoCreate?: boolean = true;
+  modifyStorage?: boolean = true;
   namespace?: string;
   cullRate?: number | TimeSpan;
 }
 
 function indexName<T extends ModelType>(cls: Class<T>, idx: IndexConfig<T> | string, suffix?: string): string {
-  return [cls.Ⲑid, typeof idx === 'string' ? idx : idx.name, suffix].filter(x => !!x).join(':');
+  return [cls.Ⲑid, typeof idx === 'string' ? idx : idx.name, suffix].filter(part => !!part).join(':');
 }
 
 function getFirstId(data: Map<string, unknown> | Set<string>, value?: string | number): string | undefined {
@@ -31,7 +31,7 @@ function getFirstId(data: Map<string, unknown> | Set<string>, value?: string | n
   if (data instanceof Set) {
     id = data.values().next().value;
   } else {
-    id = [...data.entries()].find(([, v]) => value === undefined || v === value)?.[0];
+    id = [...data.entries()].find(([, item]) => value === undefined || item === value)?.[0];
   }
   return id;
 }
@@ -81,9 +81,9 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
         const { key } = ModelIndexedUtil.computeIndexKey(cls, idx, castTo(item));
         this.#indices[idx.type].get(idxName)?.get(key)?.delete(id);
       }
-    } catch (err) {
-      if (!(err instanceof NotFoundError)) {
-        throw err;
+    } catch (error) {
+      if (!(error instanceof NotFoundError)) {
+        throw error;
       }
     }
   }
@@ -146,14 +146,14 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
   }
 
   async postConstruct(): Promise<void> {
-    await ModelStorageUtil.registerModelChangeListener(this);
+    await ModelStorageUtil.storageInitialization(this);
     ModelExpiryUtil.registerCull(this);
 
-    for (const el of ModelRegistryIndex.getClasses()) {
-      for (const idx of ModelRegistryIndex.getConfig(el).indices ?? []) {
+    for (const cls of ModelRegistryIndex.getClasses()) {
+      for (const idx of ModelRegistryIndex.getConfig(cls).indices ?? []) {
         switch (idx.type) {
           case 'unique': {
-            console.error('Unique indices are not supported for', { cls: el.Ⲑid, idx: idx.name });
+            console.error('Unique indices are not supported for', { cls: cls.Ⲑid, idx: idx.name });
             break;
           }
         }
@@ -165,14 +165,14 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
   async get<T extends ModelType>(cls: Class<T>, id: string): Promise<T> {
     const store = this.#getStore(cls);
     if (store.has(id)) {
-      const res = await ModelCrudUtil.load(cls, store.get(id)!);
-      if (res) {
+      const result = await ModelCrudUtil.load(cls, store.get(id)!);
+      if (result) {
         if (ModelRegistryIndex.getConfig(cls).expiresAt) {
-          if (!ModelExpiryUtil.getExpiryState(cls, res).expired) {
-            return res;
+          if (!ModelExpiryUtil.getExpiryState(cls, result).expired) {
+            return result;
           }
         } else {
-          return res;
+          return result;
         }
       }
     }
@@ -221,9 +221,9 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
     for (const id of this.#getStore(cls).keys()) {
       try {
         yield await this.get(cls, id);
-      } catch (err) {
-        if (!(err instanceof NotFoundError)) {
-          throw err;
+      } catch (error) {
+        if (!(error instanceof NotFoundError)) {
+          throw error;
         }
       }
     }
@@ -255,7 +255,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
 
   async getBlobMeta(location: string): Promise<BlobMeta> {
     const metaContent = this.#find(ModelBlobMetaNamespace, location, 'notfound');
-    const meta: BlobMeta = JSON.parse(metaContent.get(location)!.toString('utf8'));
+    const meta: BlobMeta = JSONUtil.parseSafe(metaContent.get(location)!);
     return meta;
   }
 
@@ -281,8 +281,8 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
     let deleted = 0;
     for (const key of [...store.keys()]) {
       try {
-        const res = await ModelCrudUtil.load(cls, store.get(key)!);
-        if (ModelExpiryUtil.getExpiryState(cls, res).expired) {
+        const result = await ModelCrudUtil.load(cls, store.get(key)!);
+        if (ModelExpiryUtil.getExpiryState(cls, result).expired) {
           store.delete(key);
           deleted += 1;
         }
@@ -301,7 +301,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelBlobSupport, M
     this.#indices.unsorted.clear();
   }
 
-  async createModel<T extends ModelType>(cls: Class<T>): Promise<void> {
+  async upsertModel<T extends ModelType>(cls: Class<T>): Promise<void> {
     for (const idx of ModelRegistryIndex.getConfig(cls).indices ?? []) {
       if (idx.type === 'sorted' || idx.type === 'unsorted') {
         this.#indices[idx.type].set(indexName(cls, idx), new Map());