@declaro/redis 2.0.0-y.0 → 2.1.1

package/dist/{redis → ts/redis}/queue.d.ts

@@ -18,3 +18,4 @@ export declare function pushMessage<T = string>(context: Context, channel: strin
  * @param channel The channel to receive messages on
  */
 export declare function onFulfillMessage<T>(context: Context, channel: string, handler: MessageHandler<T>): Promise<() => boolean>;
+//# sourceMappingURL=queue.d.ts.map

package/dist/ts/redis/queue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../src/redis/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,KAAK,cAAc,EAAe,MAAM,SAAS,CAAA;AAE1D;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,qBAOrG;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,0BAkBtG"}

package/dist/{redis → ts/redis}/redis-event-adapter.d.ts

@@ -8,3 +8,4 @@ export declare class RedisEventAdapter {
     protected onMessage: (pattern: string, channel: string, message: string) => void;
     unsubscribe(): void;
 }
+//# sourceMappingURL=redis-event-adapter.d.ts.map

package/dist/ts/redis/redis-event-adapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-event-adapter.d.ts","sourceRoot":"","sources":["../../../src/redis/redis-event-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,eAAe,CAAA;AACzD,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAEhC,qBAAa,iBAAiB;IAEtB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAC7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK;IACnC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK;gBAFjB,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK;IAsBxC,SAAS,CAAC,SAAS,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,SAAS,MAAM,UAcvE;IAED,WAAW;CAId"}

package/dist/ts/redis/redis-event-adapter.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=redis-event-adapter.test.d.ts.map

package/dist/ts/redis/redis-event-adapter.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-event-adapter.test.d.ts","sourceRoot":"","sources":["../../../src/redis/redis-event-adapter.test.ts"],"names":[],"mappings":""}

package/dist/{redis → ts/redis}/redis-middleware.d.ts

@@ -9,7 +9,12 @@ export declare const REDIS_CLIENT_KEY: unique symbol;
 export declare const REDIS_PUB_KEY: unique symbol;
 export declare const REDIS_SUB_KEY: unique symbol;
 export declare const REDIS_OPTIONS_KEY: unique symbol;
-export declare const redisMiddleware: (options?: RedisOptions) => (context: Context) => Promise<void>;
+/**
+ * @deprecated Use context's DI system instead
+ * @param options The options to pass to the Redis client
+ * @returns
+ */
+export declare const redisMiddleware: (options: RedisOptions) => (context: Context) => Promise<void>;
 /**
  * Get the centralized redis connection
  * NOTE: Do not use this connection to subscribe to events. Create your own instead with createRedis.
@@ -31,3 +36,4 @@ export declare function useRedisOptions(context: Context): RedisOptions;
  */
 export declare function createRedis(context: Context): RedisInstance;
 export declare function useRedisRepository<T = string>(context: Context): RedisRepository<T>;
+//# sourceMappingURL=redis-middleware.d.ts.map

package/dist/ts/redis/redis-middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redis-middleware.d.ts","sourceRoot":"","sources":["../../../src/redis/redis-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAO,MAAM,eAAe,CAAA;AAC5C,OAAc,EAAE,KAAK,IAAI,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,eAAO,MAAM,WAAW;;;CAGvB,CAAA;AAED,eAAO,MAAM,gBAAgB,eAAW,CAAA;AACxC,eAAO,MAAM,aAAa,eAAW,CAAA;AACrC,eAAO,MAAM,aAAa,eAAW,CAAA;AACrC,eAAO,MAAM,iBAAiB,eAAW,CAAA;AAEzC;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,SAAS,YAAY,MAAY,SAAS,OAAO,kBAmBhF,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAQxD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,CAI9D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAU3D;AAED,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,CAMnF"}

package/dist/{redis → ts/redis}/repository.d.ts

@@ -1,4 +1,4 @@
-import { Redis } from 'ioredis';
+import type { Redis } from 'ioredis';
 export declare enum RedisRepositoryEvent {
     SET = "SET",
     GET = "GET"
@@ -9,8 +9,9 @@ export declare class RedisRepository<T> {
     private readonly handlers;
     constructor(redis: Redis);
     set(id: string, item: T): Promise<'OK'>;
-    get(id: string): Promise<T>;
+    get(id: string): Promise<T | null | undefined>;
     on(event: RedisRepositoryEvent, handler: RepositoryEventHandler<T>): () => void;
     onSet(handler: RepositoryEventHandler<T>): () => void;
     onGet(handler: RepositoryEventHandler<T>): () => void;
 }
+//# sourceMappingURL=repository.d.ts.map

package/dist/ts/redis/repository.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/redis/repository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAGpC,oBAAY,oBAAoB;IAC5B,GAAG,QAAQ;IACX,GAAG,QAAQ;CACd;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,GAAG,CAAA;AAEjG,qBAAa,eAAe,CAAC,CAAC;IAMd,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK;IAL3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAGxB;gBAE8B,KAAK,EAAE,KAAK;IAErC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUvC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAgBpD,EAAE,CAAC,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAQlE,KAAK,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAIxC,KAAK,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;CAG3C"}

package/dist/{redis → ts/redis}/storage.d.ts

@@ -1,3 +1,4 @@
 import { Context } from '@declaro/core';
 export declare function set<T>(context: Context, id: string, item: T): Promise<"OK">;
-export declare function get<T>(context: Context, id: string): Promise<T>;
+export declare function get<T>(context: Context, id: string): Promise<T | null | undefined>;
+//# sourceMappingURL=storage.d.ts.map

package/dist/ts/redis/storage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../src/redis/storage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,wBAAsB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,iBAMjE;AAED,wBAAsB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,iCAQxD"}

package/dist/{redis → ts/redis}/utils.d.ts

@@ -9,5 +9,6 @@ export declare function serialize<T = string>(message: T): string;
  * @param message A JSON string to unserialize
  * @returns
  */
-export declare function unserialize<T = string>(message: string): T;
-export type MessageHandler<T = string> = (message: T) => any;
+export declare function unserialize<T = string>(message?: string | null): T | null | undefined;
+export type MessageHandler<T = string> = (message?: T) => any;
+//# sourceMappingURL=utils.d.ts.map

package/dist/ts/redis/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/redis/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,UAE/C;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS,CAKrF;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,GAAG,CAAA"}

package/dist/{settings → ts/settings}/index.d.ts

@@ -1,2 +1,3 @@
 export * from './setting';
 export * from './site';
+//# sourceMappingURL=index.d.ts.map

package/dist/ts/settings/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/settings/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,QAAQ,CAAA"}

package/dist/{settings → ts/settings}/setting.d.ts

@@ -3,10 +3,10 @@ export declare const SETTINGS_KEY = "DeclaroSettings";
 export declare const SETTINGS_NAMESPACES = "DeclaroSettingsNamespaces";
 export declare class Config<T = any> {
     readonly namespace: string;
-    readonly defaultValue?: T;
-    constructor(namespace: string, defaultValue?: T);
+    readonly defaultValue?: T | undefined;
+    constructor(namespace: string, defaultValue?: T | undefined);
     private get namespaceKey();
-    get(context: Context): Promise<T>;
+    get(context: Context): Promise<T | undefined>;
     set(context: Context, value: Partial<T>): Promise<void>;
 }
 export declare class ConfigSet<T extends object> {
@@ -20,3 +20,4 @@ export declare class ConfigSet<T extends object> {
     }>;
     get(context: Context, key: string): Promise<T>;
 }
+//# sourceMappingURL=setting.d.ts.map

package/dist/ts/settings/setting.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setting.d.ts","sourceRoot":"","sources":["../../../src/settings/setting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAIvC,eAAO,MAAM,YAAY,oBAAoB,CAAA;AAC7C,eAAO,MAAM,mBAAmB,8BAA8B,CAAA;AAE9D,qBAAa,MAAM,CAAC,CAAC,GAAG,GAAG;aACK,SAAS,EAAE,MAAM;aAAkB,YAAY,CAAC,EAAE,CAAC;gBAAnD,SAAS,EAAE,MAAM,EAAkB,YAAY,CAAC,EAAE,CAAC,YAAA;IAE/E,OAAO,KAAK,YAAY,GAEvB;IAEK,GAAG,CAAC,OAAO,EAAE,OAAO;IAWpB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;CAQhD;AAED,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM;aACP,SAAS,EAAE,MAAM;aAAkB,aAAa,EAAE,CAAC;gBAAnD,SAAS,EAAE,MAAM,EAAkB,aAAa,EAAE,CAAC;IAE/E,OAAO,KAAK,YAAY,GAEvB;IAEK,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,CAAC,CAAC,CAAM;IAa1D,MAAM,CAAC,OAAO,EAAE,OAAO;;;IAiBvB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;CAUvD"}

package/dist/{settings → ts/settings}/site.d.ts

@@ -3,3 +3,4 @@ export declare const siteConfig: ConfigSet<{
     domain: string;
     email: string;
 }>;
+//# sourceMappingURL=site.d.ts.map

package/dist/ts/settings/site.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../../src/settings/site.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,eAAO,MAAM,UAAU;;;EAGrB,CAAA"}

package/dist/{test-utils → ts/test-utils}/index.d.ts

@@ -1,2 +1,3 @@
 import { Context } from '@declaro/core';
 export declare const mockRedisMiddleware: () => (context: Context) => Promise<void>;
+//# sourceMappingURL=index.d.ts.map

package/dist/ts/test-utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAKvC,eAAO,MAAM,mBAAmB,SAAgB,SAAS,OAAO,kBAS/D,CAAA"}

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@declaro/redis",
-    "version": "2.0.0-y.0",
+    "version": "2.1.1",
     "description": "Redis tools for Declaro",
-    "main": "dist/pkg.cjs",
-    "module": "dist/pkg.mjs",
-    "types": "dist/index.d.ts",
+    "main": "dist/node/index.cjs",
+    "module": "dist/node/index.js",
+    "types": "dist/ts/index.d.ts",
     "author": "Emmert Technology LLC",
     "type": "module",
     "license": "MIT",
@@ -12,13 +12,17 @@
         "access": "public"
     },
     "scripts": {
-        "dev": "vite build --watch",
-        "build": "vite build",
-        "preview": "vite preview",
-        "test": "vitest"
+        "dev": "bun run scripts/build.ts --watch",
+        "clean": "bun rimraf dist",
+        "build:typedefs": "bun tsc --emitDeclarationOnly --outDir dist/ts -p tsconfig.json",
+        "build:js": "bun run scripts/build.ts",
+        "build": "bun run clean && bun run build:js && bun run build:typedefs",
+        "test": "bun test",
+        "test:watch": "bun test --watch",
+        "typecheck": "bun tsc --noEmit"
     },
     "devDependencies": {
-        "@declaro/core": "^2.0.0-y.0",
+        "@declaro/core": "^2.1.1",
         "@types/ioredis-mock": "^8.2.5",
         "@vitest/coverage-v8": "^0.32.2",
         "ioredis": "^5.5.0",
@@ -28,7 +32,7 @@
         "vitest": "^0.32.2"
     },
     "peerDependencies": {
-        "@declaro/core": "^2.0.0-beta.3",
+        "@declaro/core": "^2.0.0-beta.50",
         "@types/ioredis-mock": "^8.9.0",
         "ioredis": "^5.5.0",
         "ioredis-mock": "^8.9.0"
@@ -41,5 +45,18 @@
         "url": "https://github.com/emmertio/declaro/issues"
     },
     "homepage": "https://github.com/emmertio/declaro/tree/main#readme",
-    "gitHead": "639b567b4f8adfb9da9c3005c3b0ac0aca10c0e6"
+    "gitHead": "9e452f76e7d8c8b72f6ef5dfe829f28687b864de",
+    "files": [
+        "dist",
+        "src",
+        "readme.md"
+    ],
+    "exports": {
+        "bun": "./src/index.ts",
+        "types": "./dist/ts/index.d.ts",
+        "import": "./dist/node/index.js",
+        "require": "./dist/node/index.cjs",
+        "browser": "./dist/browser/index.js",
+        "default": "./dist/node/index.js"
+    }
 }

package/src/redis/queue.ts

@@ -33,11 +33,12 @@ export async function onFulfillMessage<T>(context: Context, channel: string, han
     let shouldContinue = true
 
     while (shouldContinue) {
-        const [msgChannel, message] = await conn.brpop(channel, 1000)
+        const result = await conn.brpop(channel, 1000)
+        const [msgChannel, message] = result ?? []
 
         try {
-            const payload = unserialize<T>(message)
-            await handler(payload)
+            const payload = unserialize<T>(message ?? '')
+            await handler(payload ?? undefined)
         } catch (e) {
             pushMessage(context, channel, message)
         }

package/src/redis/redis-middleware.ts

@@ -12,22 +12,28 @@ export const REDIS_PUB_KEY = Symbol()
 export const REDIS_SUB_KEY = Symbol()
 export const REDIS_OPTIONS_KEY = Symbol()
 
-export const redisMiddleware = (options?: RedisOptions) => async (context: Context) => {
+/**
+ * @deprecated Use context's DI system instead
+ * @param options The options to pass to the Redis client
+ * @returns
+ */
+export const redisMiddleware = (options: RedisOptions) => async (context: Context) => {
     context.provide(REDIS_OPTIONS_KEY, options)
 
     context.on(App.Events.Init, async (context) => {
         const redis = new Redis(options)
 
         context.provide(REDIS_CLIENT_KEY, redis)
-        await context.emit(RedisEvents.Connect, redis)
+        await context.emit(RedisEvents.Connect)
     })
 
     context.on(App.Events.Destroy, async (context) => {
         const redis = useRedis(context)
-        await context.emit(RedisEvents.Destroy, redis)
+        await context.emit(RedisEvents.Destroy)
     })
 
-    context.on(RedisEvents.Destroy, async (context, redis: RedisInstance) => {
+    context.on(RedisEvents.Destroy, async (context) => {
+        const redis = useRedis(context)
         await redis.quit()
     })
 }
@@ -57,7 +63,7 @@ export function useRedis(context: Context): RedisInstance {
 export function useRedisOptions(context: Context): RedisOptions {
     const options = context.inject<RedisOptions>(REDIS_OPTIONS_KEY)
 
-    return options
+    return options!
 }
 
 /**

package/src/redis/repository.ts

@@ -1,4 +1,4 @@
-import { Redis } from 'ioredis'
+import type { Redis } from 'ioredis'
 import { serialize, unserialize } from './utils'
 
 export enum RedisRepositoryEvent {
@@ -26,12 +26,18 @@ export class RedisRepository<T> {
         return result
     }
 
-    async get(id: string): Promise<T> {
+    async get(id: string): Promise<T | null | undefined> {
         const payload = await this.redis.get(id)
 
+        if (!payload) {
+            return null
+        }
+
         const item = unserialize<T>(payload)
 
-        await Promise.all(this.handlers.GET.map((handler) => handler(RedisRepositoryEvent.GET, id, item)))
+        if (item) {
+            await Promise.all(this.handlers.GET.map((handler) => handler(RedisRepositoryEvent.GET, id, item)))
+        }
 
         return item
     }

package/src/redis/utils.ts

@@ -12,8 +12,11 @@ export function serialize<T = string>(message: T) {
  * @param message A JSON string to unserialize
  * @returns
  */
-export function unserialize<T = string>(message: string): T {
+export function unserialize<T = string>(message?: string | null): T | null | undefined {
+    if (!message) {
+        return null as any
+    }
     return JSON.parse(message)
 }
 
-export type MessageHandler<T = string> = (message: T) => any
+export type MessageHandler<T = string> = (message?: T) => any

package/src/settings/setting.ts

@@ -27,7 +27,7 @@ export class Config<T = any> {
         const redis = useRedis(context)
 
         const existingValues = await this.get(context)
-        const merged = merge.all([this.defaultValue, existingValues, value])
+        const merged = merge.all([this.defaultValue ?? {}, existingValues ?? {}, value])
         const body = JSON.stringify(merged)
         await redis.set(this.namespaceKey, body)
     }