@nxtedition/lib 20.4.8 → 21.0.1

package/deepstream.js

@@ -3,17 +3,22 @@ import qs from 'qs'
 import cached from './util/cached.js'
 import * as rxjs from 'rxjs'
 
+const EMPTY_OPT = {}
+const RECURSIVE_OPT = { recursive: true }
+
 function provide(ds, domain, callback, options) {
-  if (domain instanceof RegExp) {
-    domain = domain.source
-  } else {
-    domain = domain.replace('.', '\\.')
+  if (typeof domain !== 'string') {
+    throw new Error('domain must be a string')
   }
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      recursive: options === true,
-    }
+  if (options === true) {
+    options = RECURSIVE_OPT
+  } else if (options == null) {
+    options = EMPTY_OPT
+  }
+
+  if (typeof options !== 'object') {
+    throw new Error('options must be an object, nully or `true`')
   }
 
   if (options.cached) {
@@ -32,20 +37,20 @@ function provide(ds, domain, callback, options) {
     callback = cached(callback, options, (id, options, key) => key)
   }
 
-  let idExpr = '(?:([^{}]+|{.*}):)?'
+  let idExpr
   if (options.id === true) {
-    idExpr = '([^{}]+):'
+    idExpr = '^(?:[^{}]+):'
   } else if (options.id === false) {
-    idExpr = '(?:([{].*[}]):)?'
+    idExpr = '^(?:([{].*[}]):)?'
   }
 
   return ds.record.provide(
-    `^${idExpr}(${domain})(?:[?].*)${options.strict ? '' : '?'}$`,
+    `${idExpr}(?:${domain})(?:[?].*)${options.strict ? '' : '?'}$`,
     (key) => {
       const [id, options] = parseKey(key)
       return callback(id, options, key)
     },
-    { recursive: options.recursive, mode: options.mode, stringify: options.stringify },
+    options,
   )
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "20.4.8",
+  "version": "21.0.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",