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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-file",
-  "version": "7.0.0-rc.1",
+  "version": "7.0.0-rc.3",
   "description": "File system backing for the travetto model module.",
   "keywords": [
     "datastore",
@@ -25,14 +25,14 @@
     "directory": "module/model-file"
   },
   "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

@@ -4,7 +4,7 @@ import os from 'node:os';
 import { pipeline } from 'node:stream/promises';
 import path from 'node:path';
 
-import { Class, TimeSpan, Runtime, BlobMeta, ByteRange, BinaryInput, BinaryUtil } from '@travetto/runtime';
+import { Class, TimeSpan, Runtime, BlobMeta, ByteRange, BinaryInput, BinaryUtil, JSONUtil } from '@travetto/runtime';
 import { Injectable } from '@travetto/di';
 import { Config } from '@travetto/config';
 import { Required } from '@travetto/schema';
@@ -26,7 +26,7 @@ export class FileModelConfig {
   @Required(false)
   folder: string;
   namespace: string = '.';
-  autoCreate?: boolean;
+  modifyStorage?: boolean;
   cullRate?: number | TimeSpan;
 
   async postConstruct(): Promise<void> {
@@ -34,7 +34,7 @@ export class FileModelConfig {
   }
 }
 
-const exists = (f: string): Promise<boolean> => fs.stat(f).then(() => true, () => false);
+const exists = (file: string): Promise<boolean> => fs.stat(file).then(() => true, () => false);
 
 /**
  * Standard file support
@@ -71,13 +71,13 @@ export class FileModelService implements ModelCrudSupport, ModelBlobSupport, Mod
     if (id) {
       resolved = path.resolve(resolved, id.replace(/^[/]/, '').substring(0, 3));
     }
-    let dir = resolved;
+    let folder = resolved;
     if (id) {
       resolved = path.resolve(resolved, `${id}${suffix}`);
-      dir = path.dirname(resolved);
+      folder = path.dirname(resolved);
     }
 
-    await fs.mkdir(dir, { recursive: true });
+    await fs.mkdir(folder, { recursive: true });
     return resolved;
   }
 
@@ -161,9 +161,9 @@ export class FileModelService implements ModelCrudSupport, ModelBlobSupport, Mod
     for await (const [id] of FileModelService.scanFolder(await this.#resolveName(cls, '.json'), '.json')) {
       try {
         yield await this.get(cls, id);
-      } catch (err) {
-        if (!(err instanceof NotFoundError)) {
-          throw err;
+      } catch (error) {
+        if (!(error instanceof NotFoundError)) {
+          throw error;
         }
       }
     }
@@ -193,7 +193,7 @@ export class FileModelService implements ModelCrudSupport, ModelBlobSupport, Mod
   async getBlobMeta(location: string): Promise<BlobMeta> {
     const file = await this.#find(ModelBlobNamespace, META, location);
     const content = await fs.readFile(file);
-    const text: BlobMeta = JSON.parse(content.toString('utf8'));
+    const text: BlobMeta = JSONUtil.parseSafe(content.toString('utf8'));
     return text;
   }
 
@@ -219,8 +219,8 @@ export class FileModelService implements ModelCrudSupport, ModelBlobSupport, Mod
     let deleted = 0;
     for await (const [_id, file] of FileModelService.scanFolder(await this.#resolveName(cls, '.json'), '.json')) {
       try {
-        const res = await ModelCrudUtil.load(cls, await fs.readFile(file));
-        if (ModelExpiryUtil.getExpiryState(cls, res).expired) {
+        const item = await ModelCrudUtil.load(cls, await fs.readFile(file));
+        if (ModelExpiryUtil.getExpiryState(cls, item).expired) {
           await fs.rm(file, { force: true });
           deleted += 1;
         }
@@ -231,8 +231,8 @@ export class FileModelService implements ModelCrudSupport, ModelBlobSupport, Mod
 
   // Storage management
   async createStorage(): Promise<void> {
-    const dir = path.resolve(this.config.folder, this.config.namespace);
-    await fs.mkdir(dir, { recursive: true });
+    const folder = path.resolve(this.config.folder, this.config.namespace);
+    await fs.mkdir(folder, { recursive: true });
   }
 
   async deleteStorage(): Promise<void> {