@mblaney/holster 2.3.2 → 2.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mblaney/holster",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Holster is a service that allows synchronising data between devices using Node, Deno, Bun or the browser.",
   "type": "module",
   "main": "index.js",

package/src/holster.js

@@ -416,10 +416,10 @@ const Holster = opt => {
           return
         }
 
-        // lex requires a callback as it's not included in the chain below.
+        // lex isn't part of the chain below, so without a callback the
+        // result is returned as a promise instead.
         if (lex && typeof cb !== "function") {
-          console.log("error lex requires a callback function")
-          return
+          return new Promise(resolve => api(ctxid).get(key, lex, resolve, _opt))
         }
 
         // Top level keys are added to a root node so their values don't need
@@ -462,10 +462,12 @@ const Holster = opt => {
           return
         }
 
-        // lex requires a callback as it's not included in the chain below.
+        // lex isn't part of the chain below, so without a callback the
+        // result is returned as a promise instead.
         if (lex && typeof cb !== "function") {
-          console.log("error lex requires a callback function")
-          return
+          return new Promise(resolve =>
+            api(ctxid).next(key, lex, resolve, _opt),
+          )
         }
 
         const ctx = allctx.get(ctxid)
@@ -982,10 +984,10 @@ const Holster = opt => {
               return
             }
 
-            // lex requires a callback as it's not included in the chain below.
+            // lex isn't part of the chain below, so without a callback the
+            // result is returned as a promise instead.
             if (lex && !cb) {
-              console.log("error lex requires a callback function")
-              return
+              return new Promise(resolve => user.get(keys, lex, resolve, _opt))
             }
 
             ctxid = utils.text.random()

package/ts/src/holster.ts

@@ -37,11 +37,8 @@ export interface HolsterAPI {
       cb: (data: unknown) => void,
       _opt?: WireOptions,
     ): HolsterAPI
-    (
-      key: string | null,
-      lex?: LexWithDot,
-      _opt?: WireOptions,
-    ): AwaitableHolsterAPI
+    (key: string | null, lex: LexWithDot, _opt?: WireOptions): Promise<unknown>
+    (key: string | null, lex?: null, _opt?: WireOptions): AwaitableHolsterAPI
   }
   next: {
     (
@@ -55,11 +52,8 @@ export interface HolsterAPI {
       cb: (data: unknown) => void,
       _opt?: WireOptions,
     ): HolsterAPI
-    (
-      key: string | null,
-      lex?: LexWithDot,
-      _opt?: WireOptions,
-    ): AwaitableHolsterAPI
+    (key: string | null, lex: LexWithDot, _opt?: WireOptions): Promise<unknown>
+    (key: string | null, lex?: null, _opt?: WireOptions): AwaitableHolsterAPI
   }
   put: {
     (
@@ -601,9 +595,12 @@ const Holster = (opt?: HolsterOptions | string | string[]): HolsterAPI => {
           return this
         }
 
+        // lex isn't part of the chain below, so without a callback the
+        // result is returned as a promise instead.
         if (lexFilter && typeof callback !== "function") {
-          console.log("error lex requires a callback function")
-          return this
+          return new Promise(resolve =>
+            api(ctxid).get(key, lexFilter, resolve, opts),
+          ) as never
         }
 
         ctxid = utils.text.random()
@@ -662,9 +659,12 @@ const Holster = (opt?: HolsterOptions | string | string[]): HolsterAPI => {
           return this
         }
 
+        // lex isn't part of the chain below, so without a callback the
+        // result is returned as a promise instead.
         if (lexFilter && typeof callback !== "function") {
-          console.log("error lex requires a callback function")
-          return this
+          return new Promise(resolve =>
+            api(ctxid).next(key, lexFilter, resolve, opts),
+          ) as never
         }
 
         const ctx = allctx.get(ctxid)
@@ -1266,9 +1266,12 @@ const Holster = (opt?: HolsterOptions | string | string[]): HolsterAPI => {
               return this
             }
 
+            // lex isn't part of the chain below, so without a callback the
+            // result is returned as a promise instead.
             if (lexFilter && !callback) {
-              console.log("error lex requires a callback function")
-              return this
+              return new Promise(resolve =>
+                user.get!(keys, lexFilter, resolve, opts),
+              ) as never
             }
 
             ctxid = utils.text.random()

package/ts/src/user.ts

@@ -9,7 +9,7 @@ import SEA from "./sea.ts"
 import type {
   UserIdentity,
   HolsterOptions,
-  LexFilter,
+  LexWithDot,
   WireOptions,
 } from "./schemas.ts"
 import type {HolsterAPI, AwaitableHolsterAPI} from "./holster.ts"
@@ -45,7 +45,7 @@ export interface UserInterface {
   get?: {
     (
       keys: string | string[],
-      lex: LexFilter,
+      lex: LexWithDot,
       cb: (data: unknown) => void,
       _opt?: WireOptions,
     ): HolsterAPI
@@ -56,7 +56,12 @@ export interface UserInterface {
     ): HolsterAPI
     (
       keys: string | string[],
-      lex?: LexFilter,
+      lex: LexWithDot,
+      _opt?: WireOptions,
+    ): Promise<unknown>
+    (
+      keys: string | string[],
+      lex?: null,
       _opt?: WireOptions,
     ): AwaitableHolsterAPI
   }