@travetto/model-redis 3.0.0-rc.1 → 3.0.0-rc.11

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-redis/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/model-redis/DOC.ts and execute "npx trv doc" to rebuild -->
 # Redis Model Support
 ## Redis backing for the travetto model module.
 
@@ -40,7 +40,7 @@ export class Init {
   
 **Code: Structure of RedisModelConfig**
 ```typescript
-import * as redis from 'redis';
+import type redis from 'redis';
 
 import { Config } from '@travetto/config';
 import { Field } from '@travetto/schema';
@@ -59,5 +59,5 @@ export class RedisModelConfig {
 }
 ```
 
-  Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L9) annotation, and so these values can be overridden using the 
-  standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Environment-aware config management using yaml files")resolution paths.
+  Additionally, you can see that the class is registered with the [@Config](https://github.com/travetto/travetto/tree/main/module/config/src/decorator.ts#L13) annotation, and so these values can be overridden using the 
+  standard [Configuration](https://github.com/travetto/travetto/tree/main/module/config#readme "Configuration support")resolution paths.

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@travetto/model-redis",
-  "displayName": "Redis Model Support",
-  "version": "3.0.0-rc.1",
+  "version": "3.0.0-rc.11",
   "description": "Redis backing for the travetto model module.",
   "keywords": [
     "typescript",
@@ -16,19 +15,30 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
+    "__index__.ts",
     "src",
     "support"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/model-redis"
   },
   "dependencies": {
-    "@travetto/config": "^3.0.0-rc.1",
-    "@travetto/model": "^3.0.0-rc.1",
-    "redis": "^4.3.0"
+    "@travetto/config": "^3.0.0-rc.11",
+    "@travetto/model": "^3.0.0-rc.11",
+    "redis": "^4.6.4"
+  },
+  "peerDependencies": {
+    "@travetto/command": "^3.0.0-rc.8"
+  },
+  "peerDependenciesMeta": {
+    "@travetto/command": {
+      "optional": true
+    }
+  },
+  "travetto": {
+    "displayName": "Redis Model Support"
   },
   "publishConfig": {
     "access": "public"

package/src/config.ts

@@ -1,4 +1,4 @@
-import * as redis from 'redis';
+import type redis from 'redis';
 
 import { Config } from '@travetto/config';
 import { Field } from '@travetto/schema';

package/src/service.ts

@@ -1,6 +1,6 @@
 import * as redis from 'redis';
 
-import { Class, ShutdownManager, Util } from '@travetto/base';
+import { ShutdownManager, type Class } from '@travetto/base';
 import { DeepPartial } from '@travetto/schema';
 import {
   ModelCrudSupport, ModelExpirySupport, ModelRegistry, ModelType, ModelStorageSupport,
@@ -12,6 +12,7 @@ import { ModelCrudUtil } from '@travetto/model/src/internal/service/crud';
 import { ModelExpiryUtil } from '@travetto/model/src/internal/service/expiry';
 import { ModelIndexedUtil } from '@travetto/model/src/internal/service/indexed';
 import { ModelStorageUtil } from '@travetto/model/src/internal/service/storage';
+import { ModelUtil } from '@travetto/model/src/internal/util';
 
 import { RedisModelConfig } from './config';
 
@@ -175,12 +176,12 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
     this.client = redis.createClient(this.config.client);
     await this.client.connect();
     await ModelStorageUtil.registerModelChangeListener(this);
-    ShutdownManager.onShutdown(this.constructor.ᚕid, () => this.client.disconnect());
+    ShutdownManager.onShutdown(this, () => this.client.disconnect());
     for (const el of ModelRegistry.getClasses()) {
       for (const idx of ModelRegistry.get(el).indices ?? []) {
         switch (idx.type) {
           case 'unique': {
-            console.error('Unique indices are not supported in redis for', { cls: el.ᚕid, idx: idx.name });
+            console.error('Unique indices are not supported in redis for', { cls: el.Ⲑid, idx: idx.name });
             break;
           }
         }
@@ -189,7 +190,7 @@ export class RedisModelService implements ModelCrudSupport, ModelExpirySupport,
   }
 
   uuid(): string {
-    return Util.uuid(32);
+    return ModelUtil.uuid(32);
   }
 
   async has<T extends ModelType>(cls: Class<T>, id: string, error?: 'notfound' | 'data'): Promise<void> {

package/support/service.redis.ts

@@ -1,9 +1,9 @@
-import { EnvUtil } from '@travetto/boot';
-import type { Service } from '@travetto/command/bin/lib/service';
+import { Env } from '@travetto/base';
+import type { CommandService } from '@travetto/command';
 
-const version = EnvUtil.get('TRV_SERVICE_REDIS', '5');
+const version = Env.get('REDIS_VERSION', '7');
 
-export const service: Service = {
+export const service: CommandService = {
   name: 'redis',
   version,
   port: 6379,