datastore-api 6.1.0 → 6.2.1

package/dist/datastore-api.cjs.development.js

@@ -10,460 +10,572 @@ var assertateDebug = require('assertate-debug');
 var Debug = require('debug');
 var promClient = require('prom-client');
 
+function _OverloadYield(e, d) {
+  this.v = e, this.k = d;
+}
+function _arrayLikeToArray(r, a) {
+  (null == a || a > r.length) && (a = r.length);
+  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
+  return n;
+}
+function _asyncIterator(r) {
+  var n,
+    t,
+    o,
+    e = 2;
+  for ("undefined" != typeof Symbol && (t = Symbol.asyncIterator, o = Symbol.iterator); e--;) {
+    if (t && null != (n = r[t])) return n.call(r);
+    if (o && null != (n = r[o])) return new AsyncFromSyncIterator(n.call(r));
+    t = "@@asyncIterator", o = "@@iterator";
+  }
+  throw new TypeError("Object is not async iterable");
+}
+function AsyncFromSyncIterator(r) {
+  function AsyncFromSyncIteratorContinuation(r) {
+    if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object."));
+    var n = r.done;
+    return Promise.resolve(r.value).then(function (r) {
+      return {
+        value: r,
+        done: n
+      };
+    });
+  }
+  return AsyncFromSyncIterator = function (r) {
+    this.s = r, this.n = r.next;
+  }, AsyncFromSyncIterator.prototype = {
+    s: null,
+    n: null,
+    next: function () {
+      return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments));
+    },
+    return: function (r) {
+      var n = this.s.return;
+      return void 0 === n ? Promise.resolve({
+        value: r,
+        done: !0
+      }) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments));
+    },
+    throw: function (r) {
+      var n = this.s.return;
+      return void 0 === n ? Promise.reject(r) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments));
+    }
+  }, new AsyncFromSyncIterator(r);
+}
+function asyncGeneratorStep(n, t, e, r, o, a, c) {
+  try {
+    var i = n[a](c),
+      u = i.value;
+  } catch (n) {
+    return void e(n);
+  }
+  i.done ? t(u) : Promise.resolve(u).then(r, o);
+}
+function _asyncToGenerator(n) {
+  return function () {
+    var t = this,
+      e = arguments;
+    return new Promise(function (r, o) {
+      var a = n.apply(t, e);
+      function _next(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
+      }
+      function _throw(n) {
+        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
+      }
+      _next(void 0);
+    });
+  };
+}
+function _awaitAsyncGenerator(e) {
+  return new _OverloadYield(e, 0);
+}
+function _construct(t, e, r) {
+  if (_isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
+  var o = [null];
+  o.push.apply(o, e);
+  var p = new (t.bind.apply(t, o))();
+  return r && _setPrototypeOf(p, r.prototype), p;
+}
+function _createForOfIteratorHelperLoose(r, e) {
+  var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (t) return (t = t.call(r)).next.bind(t);
+  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) {
+    t && (r = t);
+    var o = 0;
+    return function () {
+      return o >= r.length ? {
+        done: !0
+      } : {
+        done: !1,
+        value: r[o++]
+      };
+    };
+  }
+  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
+    }
+    return n;
+  }, _extends.apply(null, arguments);
+}
+function _getPrototypeOf(t) {
+  return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) {
+    return t.__proto__ || Object.getPrototypeOf(t);
+  }, _getPrototypeOf(t);
+}
+function _inheritsLoose(t, o) {
+  t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
+}
+function _isNativeFunction(t) {
+  try {
+    return -1 !== Function.toString.call(t).indexOf("[native code]");
+  } catch (n) {
+    return "function" == typeof t;
+  }
+}
+function _isNativeReflectConstruct() {
+  try {
+    var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+  } catch (t) {}
+  return (_isNativeReflectConstruct = function () {
+    return !!t;
+  })();
+}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
-    return exports;
+    return e;
   };
-  var exports = {},
-    Op = Object.prototype,
-    hasOwn = Op.hasOwnProperty,
-    defineProperty = Object.defineProperty || function (obj, key, desc) {
-      obj[key] = desc.value;
+  var t,
+    e = {},
+    r = Object.prototype,
+    n = r.hasOwnProperty,
+    o = Object.defineProperty || function (t, e, r) {
+      t[e] = r.value;
     },
-    $Symbol = "function" == typeof Symbol ? Symbol : {},
-    iteratorSymbol = $Symbol.iterator || "@@iterator",
-    asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator",
-    toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
-  function define(obj, key, value) {
-    return Object.defineProperty(obj, key, {
-      value: value,
+    i = "function" == typeof Symbol ? Symbol : {},
+    a = i.iterator || "@@iterator",
+    c = i.asyncIterator || "@@asyncIterator",
+    u = i.toStringTag || "@@toStringTag";
+  function define(t, e, r) {
+    return Object.defineProperty(t, e, {
+      value: r,
       enumerable: !0,
       configurable: !0,
       writable: !0
-    }), obj[key];
+    }), t[e];
   }
   try {
     define({}, "");
-  } catch (err) {
-    define = function (obj, key, value) {
-      return obj[key] = value;
+  } catch (t) {
+    define = function (t, e, r) {
+      return t[e] = r;
     };
   }
-  function wrap(innerFn, outerFn, self, tryLocsList) {
-    var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator,
-      generator = Object.create(protoGenerator.prototype),
-      context = new Context(tryLocsList || []);
-    return defineProperty(generator, "_invoke", {
-      value: makeInvokeMethod(innerFn, self, context)
-    }), generator;
+  function wrap(t, e, r, n) {
+    var i = e && e.prototype instanceof Generator ? e : Generator,
+      a = Object.create(i.prototype),
+      c = new Context(n || []);
+    return o(a, "_invoke", {
+      value: makeInvokeMethod(t, r, c)
+    }), a;
   }
-  function tryCatch(fn, obj, arg) {
+  function tryCatch(t, e, r) {
     try {
       return {
         type: "normal",
-        arg: fn.call(obj, arg)
+        arg: t.call(e, r)
       };
-    } catch (err) {
+    } catch (t) {
       return {
         type: "throw",
-        arg: err
+        arg: t
       };
     }
   }
-  exports.wrap = wrap;
-  var ContinueSentinel = {};
+  e.wrap = wrap;
+  var h = "suspendedStart",
+    l = "suspendedYield",
+    f = "executing",
+    s = "completed",
+    y = {};
   function Generator() {}
   function GeneratorFunction() {}
   function GeneratorFunctionPrototype() {}
-  var IteratorPrototype = {};
-  define(IteratorPrototype, iteratorSymbol, function () {
+  var p = {};
+  define(p, a, function () {
     return this;
   });
-  var getProto = Object.getPrototypeOf,
-    NativeIteratorPrototype = getProto && getProto(getProto(values([])));
-  NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype);
-  var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
-  function defineIteratorMethods(prototype) {
-    ["next", "throw", "return"].forEach(function (method) {
-      define(prototype, method, function (arg) {
-        return this._invoke(method, arg);
+  var d = Object.getPrototypeOf,
+    v = d && d(d(values([])));
+  v && v !== r && n.call(v, a) && (p = v);
+  var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p);
+  function defineIteratorMethods(t) {
+    ["next", "throw", "return"].forEach(function (e) {
+      define(t, e, function (t) {
+        return this._invoke(e, t);
       });
     });
   }
-  function AsyncIterator(generator, PromiseImpl) {
-    function invoke(method, arg, resolve, reject) {
-      var record = tryCatch(generator[method], generator, arg);
-      if ("throw" !== record.type) {
-        var result = record.arg,
-          value = result.value;
-        return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) {
-          invoke("next", value, resolve, reject);
-        }, function (err) {
-          invoke("throw", err, resolve, reject);
-        }) : PromiseImpl.resolve(value).then(function (unwrapped) {
-          result.value = unwrapped, resolve(result);
-        }, function (error) {
-          return invoke("throw", error, resolve, reject);
+  function AsyncIterator(t, e) {
+    function invoke(r, o, i, a) {
+      var c = tryCatch(t[r], t, o);
+      if ("throw" !== c.type) {
+        var u = c.arg,
+          h = u.value;
+        return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) {
+          invoke("next", t, i, a);
+        }, function (t) {
+          invoke("throw", t, i, a);
+        }) : e.resolve(h).then(function (t) {
+          u.value = t, i(u);
+        }, function (t) {
+          return invoke("throw", t, i, a);
         });
       }
-      reject(record.arg);
+      a(c.arg);
     }
-    var previousPromise;
-    defineProperty(this, "_invoke", {
-      value: function (method, arg) {
+    var r;
+    o(this, "_invoke", {
+      value: function (t, n) {
         function callInvokeWithMethodAndArg() {
-          return new PromiseImpl(function (resolve, reject) {
-            invoke(method, arg, resolve, reject);
+          return new e(function (e, r) {
+            invoke(t, n, e, r);
           });
         }
-        return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
       }
     });
   }
-  function makeInvokeMethod(innerFn, self, context) {
-    var state = "suspendedStart";
-    return function (method, arg) {
-      if ("executing" === state) throw new Error("Generator is already running");
-      if ("completed" === state) {
-        if ("throw" === method) throw arg;
-        return doneResult();
+  function makeInvokeMethod(e, r, n) {
+    var o = h;
+    return function (i, a) {
+      if (o === f) throw Error("Generator is already running");
+      if (o === s) {
+        if ("throw" === i) throw a;
+        return {
+          value: t,
+          done: !0
+        };
       }
-      for (context.method = method, context.arg = arg;;) {
-        var delegate = context.delegate;
-        if (delegate) {
-          var delegateResult = maybeInvokeDelegate(delegate, context);
-          if (delegateResult) {
-            if (delegateResult === ContinueSentinel) continue;
-            return delegateResult;
+      for (n.method = i, n.arg = a;;) {
+        var c = n.delegate;
+        if (c) {
+          var u = maybeInvokeDelegate(c, n);
+          if (u) {
+            if (u === y) continue;
+            return u;
           }
         }
-        if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) {
-          if ("suspendedStart" === state) throw state = "completed", context.arg;
-          context.dispatchException(context.arg);
-        } else "return" === context.method && context.abrupt("return", context.arg);
-        state = "executing";
-        var record = tryCatch(innerFn, self, context);
-        if ("normal" === record.type) {
-          if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue;
+        if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) {
+          if (o === h) throw o = s, n.arg;
+          n.dispatchException(n.arg);
+        } else "return" === n.method && n.abrupt("return", n.arg);
+        o = f;
+        var p = tryCatch(e, r, n);
+        if ("normal" === p.type) {
+          if (o = n.done ? s : l, p.arg === y) continue;
           return {
-            value: record.arg,
-            done: context.done
+            value: p.arg,
+            done: n.done
           };
         }
-        "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg);
+        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
       }
     };
   }
-  function maybeInvokeDelegate(delegate, context) {
-    var methodName = context.method,
-      method = delegate.iterator[methodName];
-    if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel;
-    var record = tryCatch(method, delegate.iterator, context.arg);
-    if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
-    var info = record.arg;
-    return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel);
+  function maybeInvokeDelegate(e, r) {
+    var n = r.method,
+      o = e.iterator[n];
+    if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y;
+    var i = tryCatch(o, e.iterator, r.arg);
+    if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y;
+    var a = i.arg;
+    return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y);
   }
-  function pushTryEntry(locs) {
-    var entry = {
-      tryLoc: locs[0]
+  function pushTryEntry(t) {
+    var e = {
+      tryLoc: t[0]
     };
-    1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry);
+    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
   }
-  function resetTryEntry(entry) {
-    var record = entry.completion || {};
-    record.type = "normal", delete record.arg, entry.completion = record;
+  function resetTryEntry(t) {
+    var e = t.completion || {};
+    e.type = "normal", delete e.arg, t.completion = e;
   }
-  function Context(tryLocsList) {
+  function Context(t) {
     this.tryEntries = [{
       tryLoc: "root"
-    }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
+    }], t.forEach(pushTryEntry, this), this.reset(!0);
   }
-  function values(iterable) {
-    if (iterable) {
-      var iteratorMethod = iterable[iteratorSymbol];
-      if (iteratorMethod) return iteratorMethod.call(iterable);
-      if ("function" == typeof iterable.next) return iterable;
-      if (!isNaN(iterable.length)) {
-        var i = -1,
-          next = function next() {
-            for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next;
-            return next.value = undefined, next.done = !0, next;
+  function values(e) {
+    if (e || "" === e) {
+      var r = e[a];
+      if (r) return r.call(e);
+      if ("function" == typeof e.next) return e;
+      if (!isNaN(e.length)) {
+        var o = -1,
+          i = function next() {
+            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
+            return next.value = t, next.done = !0, next;
           };
-        return next.next = next;
+        return i.next = i;
       }
     }
-    return {
-      next: doneResult
-    };
-  }
-  function doneResult() {
-    return {
-      value: undefined,
-      done: !0
-    };
+    throw new TypeError(typeof e + " is not iterable");
   }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", {
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
     value: GeneratorFunctionPrototype,
     configurable: !0
-  }), defineProperty(GeneratorFunctionPrototype, "constructor", {
+  }), o(GeneratorFunctionPrototype, "constructor", {
     value: GeneratorFunction,
     configurable: !0
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) {
-    var ctor = "function" == typeof genFun && genFun.constructor;
-    return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name));
-  }, exports.mark = function (genFun) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun;
-  }, exports.awrap = function (arg) {
+  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
+    var e = "function" == typeof t && t.constructor;
+    return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
+  }, e.mark = function (t) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t;
+  }, e.awrap = function (t) {
     return {
-      __await: arg
+      __await: t
     };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
+  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
     return this;
-  }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
-    void 0 === PromiseImpl && (PromiseImpl = Promise);
-    var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
-    return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
-      return result.done ? result.value : iter.next();
+  }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
+    void 0 === i && (i = Promise);
+    var a = new AsyncIterator(wrap(t, r, n, o), i);
+    return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
+      return t.done ? t.value : a.next();
     });
-  }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () {
+  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
     return this;
-  }), define(Gp, "toString", function () {
+  }), define(g, "toString", function () {
     return "[object Generator]";
-  }), exports.keys = function (val) {
-    var object = Object(val),
-      keys = [];
-    for (var key in object) keys.push(key);
-    return keys.reverse(), function next() {
-      for (; keys.length;) {
-        var key = keys.pop();
-        if (key in object) return next.value = key, next.done = !1, next;
+  }), e.keys = function (t) {
+    var e = Object(t),
+      r = [];
+    for (var n in e) r.push(n);
+    return r.reverse(), function next() {
+      for (; r.length;) {
+        var t = r.pop();
+        if (t in e) return next.value = t, next.done = !1, next;
       }
       return next.done = !0, next;
     };
-  }, exports.values = values, Context.prototype = {
+  }, e.values = values, Context.prototype = {
     constructor: Context,
-    reset: function (skipTempReset) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined);
+    reset: function (e) {
+      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
     },
     stop: function () {
       this.done = !0;
-      var rootRecord = this.tryEntries[0].completion;
-      if ("throw" === rootRecord.type) throw rootRecord.arg;
+      var t = this.tryEntries[0].completion;
+      if ("throw" === t.type) throw t.arg;
       return this.rval;
     },
-    dispatchException: function (exception) {
-      if (this.done) throw exception;
-      var context = this;
-      function handle(loc, caught) {
-        return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught;
+    dispatchException: function (e) {
+      if (this.done) throw e;
+      var r = this;
+      function handle(n, o) {
+        return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o;
       }
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i],
-          record = entry.completion;
-        if ("root" === entry.tryLoc) return handle("end");
-        if (entry.tryLoc <= this.prev) {
-          var hasCatch = hasOwn.call(entry, "catchLoc"),
-            hasFinally = hasOwn.call(entry, "finallyLoc");
-          if (hasCatch && hasFinally) {
-            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
-            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
-          } else if (hasCatch) {
-            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+      for (var o = this.tryEntries.length - 1; o >= 0; --o) {
+        var i = this.tryEntries[o],
+          a = i.completion;
+        if ("root" === i.tryLoc) return handle("end");
+        if (i.tryLoc <= this.prev) {
+          var c = n.call(i, "catchLoc"),
+            u = n.call(i, "finallyLoc");
+          if (c && u) {
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
+          } else if (c) {
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
           } else {
-            if (!hasFinally) throw new Error("try statement without catch or finally");
-            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+            if (!u) throw Error("try statement without catch or finally");
+            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
           }
         }
       }
     },
-    abrupt: function (type, arg) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
-          var finallyEntry = entry;
+    abrupt: function (t, e) {
+      for (var r = this.tryEntries.length - 1; r >= 0; --r) {
+        var o = this.tryEntries[r];
+        if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) {
+          var i = o;
           break;
         }
       }
-      finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null);
-      var record = finallyEntry ? finallyEntry.completion : {};
-      return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record);
+      i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null);
+      var a = i ? i.completion : {};
+      return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a);
     },
-    complete: function (record, afterLoc) {
-      if ("throw" === record.type) throw record.arg;
-      return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel;
+    complete: function (t, e) {
+      if ("throw" === t.type) throw t.arg;
+      return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y;
     },
-    finish: function (finallyLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel;
+    finish: function (t) {
+      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
+        var r = this.tryEntries[e];
+        if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y;
       }
     },
-    catch: function (tryLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc === tryLoc) {
-          var record = entry.completion;
-          if ("throw" === record.type) {
-            var thrown = record.arg;
-            resetTryEntry(entry);
+    catch: function (t) {
+      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
+        var r = this.tryEntries[e];
+        if (r.tryLoc === t) {
+          var n = r.completion;
+          if ("throw" === n.type) {
+            var o = n.arg;
+            resetTryEntry(r);
           }
-          return thrown;
+          return o;
         }
       }
-      throw new Error("illegal catch attempt");
+      throw Error("illegal catch attempt");
     },
-    delegateYield: function (iterable, resultName, nextLoc) {
+    delegateYield: function (e, r, n) {
       return this.delegate = {
-        iterator: values(iterable),
-        resultName: resultName,
-        nextLoc: nextLoc
-      }, "next" === this.method && (this.arg = undefined), ContinueSentinel;
+        iterator: values(e),
+        resultName: r,
+        nextLoc: n
+      }, "next" === this.method && (this.arg = t), y;
     }
-  }, exports;
+  }, e;
 }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
+function _setPrototypeOf(t, e) {
+  return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
+    return t.__proto__ = e, t;
+  }, _setPrototypeOf(t, e);
+}
+function _unsupportedIterableToArray(r, a) {
+  if (r) {
+    if ("string" == typeof r) return _arrayLikeToArray(r, a);
+    var t = {}.toString.call(r).slice(8, -1);
+    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
   }
 }
-function _asyncToGenerator(fn) {
+function _wrapAsyncGenerator(e) {
   return function () {
-    var self = this,
-      args = arguments;
-    return new Promise(function (resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(undefined);
-    });
+    return new AsyncGenerator(e.apply(this, arguments));
   };
 }
-function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
+function AsyncGenerator(e) {
+  var r, t;
+  function resume(r, t) {
+    try {
+      var n = e[r](t),
+        o = n.value,
+        u = o instanceof _OverloadYield;
+      Promise.resolve(u ? o.v : o).then(function (t) {
+        if (u) {
+          var i = "return" === r ? "return" : "next";
+          if (!o.k || t.done) return resume(i, t);
+          t = e[i](t).value;
         }
-      }
+        settle(n.done ? "return" : "normal", t);
+      }, function (e) {
+        resume("throw", e);
+      });
+    } catch (e) {
+      settle("throw", e);
     }
-    return target;
-  };
-  return _extends.apply(this, arguments);
-}
-function _inheritsLoose(subClass, superClass) {
-  subClass.prototype = Object.create(superClass.prototype);
-  subClass.prototype.constructor = subClass;
-  _setPrototypeOf(subClass, superClass);
-}
-function _getPrototypeOf(o) {
-  _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
-    return o.__proto__ || Object.getPrototypeOf(o);
-  };
-  return _getPrototypeOf(o);
-}
-function _setPrototypeOf(o, p) {
-  _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
-    o.__proto__ = p;
-    return o;
-  };
-  return _setPrototypeOf(o, p);
-}
-function _isNativeReflectConstruct() {
-  if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-  if (Reflect.construct.sham) return false;
-  if (typeof Proxy === "function") return true;
-  try {
-    Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
-    return true;
-  } catch (e) {
-    return false;
   }
-}
-function _construct(Parent, args, Class) {
-  if (_isNativeReflectConstruct()) {
-    _construct = Reflect.construct.bind();
-  } else {
-    _construct = function _construct(Parent, args, Class) {
-      var a = [null];
-      a.push.apply(a, args);
-      var Constructor = Function.bind.apply(Parent, a);
-      var instance = new Constructor();
-      if (Class) _setPrototypeOf(instance, Class.prototype);
-      return instance;
-    };
+  function settle(e, n) {
+    switch (e) {
+      case "return":
+        r.resolve({
+          value: n,
+          done: !0
+        });
+        break;
+      case "throw":
+        r.reject(n);
+        break;
+      default:
+        r.resolve({
+          value: n,
+          done: !1
+        });
+    }
+    (r = r.next) ? resume(r.key, r.arg) : t = null;
   }
-  return _construct.apply(null, arguments);
-}
-function _isNativeFunction(fn) {
-  return Function.toString.call(fn).indexOf("[native code]") !== -1;
+  this._invoke = function (e, n) {
+    return new Promise(function (o, u) {
+      var i = {
+        key: e,
+        arg: n,
+        resolve: o,
+        reject: u,
+        next: null
+      };
+      t ? t = t.next = i : (r = t = i, resume(e, n));
+    });
+  }, "function" != typeof e.return && (this.return = void 0);
 }
-function _wrapNativeSuper(Class) {
-  var _cache = typeof Map === "function" ? new Map() : undefined;
-  _wrapNativeSuper = function _wrapNativeSuper(Class) {
-    if (Class === null || !_isNativeFunction(Class)) return Class;
-    if (typeof Class !== "function") {
-      throw new TypeError("Super expression must either be null or a function");
-    }
-    if (typeof _cache !== "undefined") {
-      if (_cache.has(Class)) return _cache.get(Class);
-      _cache.set(Class, Wrapper);
+AsyncGenerator.prototype["function" == typeof Symbol && Symbol.asyncIterator || "@@asyncIterator"] = function () {
+  return this;
+}, AsyncGenerator.prototype.next = function (e) {
+  return this._invoke("next", e);
+}, AsyncGenerator.prototype.throw = function (e) {
+  return this._invoke("throw", e);
+}, AsyncGenerator.prototype.return = function (e) {
+  return this._invoke("return", e);
+};
+function _wrapNativeSuper(t) {
+  var r = "function" == typeof Map ? new Map() : void 0;
+  return _wrapNativeSuper = function (t) {
+    if (null === t || !_isNativeFunction(t)) return t;
+    if ("function" != typeof t) throw new TypeError("Super expression must either be null or a function");
+    if (void 0 !== r) {
+      if (r.has(t)) return r.get(t);
+      r.set(t, Wrapper);
     }
     function Wrapper() {
-      return _construct(Class, arguments, _getPrototypeOf(this).constructor);
+      return _construct(t, arguments, _getPrototypeOf(this).constructor);
     }
-    Wrapper.prototype = Object.create(Class.prototype, {
+    return Wrapper.prototype = Object.create(t.prototype, {
       constructor: {
         value: Wrapper,
-        enumerable: false,
-        writable: true,
-        configurable: true
+        enumerable: !1,
+        writable: !0,
+        configurable: !0
       }
-    });
-    return _setPrototypeOf(Wrapper, Class);
-  };
-  return _wrapNativeSuper(Class);
-}
-function _assertThisInitialized(self) {
-  if (self === void 0) {
-    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-  }
-  return self;
-}
-function _unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
-function _arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
+    }), _setPrototypeOf(Wrapper, t);
+  }, _wrapNativeSuper(t);
 }
-function _createForOfIteratorHelperLoose(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (it) return (it = it.call(o)).next.bind(it);
-  if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-    if (it) o = it;
-    var i = 0;
-    return function () {
-      if (i >= o.length) return {
-        done: true
-      };
-      return {
-        done: false,
-        value: o[i++]
-      };
-    };
-  }
-  throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+
+/*
+ * assert.ts
+ *
+ * Created by Dr. Maximillian Dornseif 2025-04-11 in datastore-api 6.0.1
+ */
+/**
+ * Generates an type assertion message for the given `value`
+ *
+ * @param value value being type-checked
+ * @param type the expected value as a string; eg 'string', 'boolean', 'number'
+ * @param variableName the name of the variable being type-checked
+ * @param additionalMessage further information on failure
+ */
+var AssertionMessage = function AssertionMessage(value, type, variableName, additionalMessage) {
+  var message = variableName ? variableName + " must be of type '" + type + "', '" + assertateDebug.getType(value) + "' provided" : "expected value of type '" + type + "', '" + assertateDebug.getType(value) + "' provided";
+  return additionalMessage ? message + ": " + additionalMessage : message;
+};
+/**
+ * Type-checks the provided `value` to be a symbol, throws an Error if it is not
+ *
+ * @param value the value to type-check as a symbol
+ * @param variableName the name of the variable to be type-checked
+ * @param additionalMessage further information on failure
+ * @throws {Error}
+ */
+function assertIsKey(value, variableName, additionalMessage) {
+  assertateDebug.assert(datastore.Datastore.isKey(value), AssertionMessage(value, "Key", variableName, additionalMessage));
 }
 
 /** @ignore */
@@ -590,24 +702,49 @@ var Dstore = /*#__PURE__*/function () {
     assertateDebug.assertIsObject(ret, 'entity[Datastore.KEY]/entity._keyStr', "Entity is missing the datastore Key: " + JSON.stringify(ent));
     return ret;
   }
-  /** `fixKeys()` is called for all [[IDstoreEntry]]sa returned from [[Dstore]].
+  /** `fixKeys()` is called for all [[IDstoreEntry]] returned from [[Dstore]].
    *
    * Is ensures that besides `entity[Datastore.KEY]` there is `_keyStr` to be leveraged by [[readKey]].
    *
    * @internal
    */;
   _proto.fixKeys = function fixKeys(entities) {
-    var _this = this;
+    var _this2 = this;
     entities.forEach(function (x) {
       if (!!(x != null && x[datastore.Datastore.KEY]) && x[datastore.Datastore.KEY]) {
         assertateDebug.assertIsDefined(x[datastore.Datastore.KEY]);
         assertateDebug.assertIsObject(x[datastore.Datastore.KEY]);
         // Old TypesScript has problems with symbols as a property
-        x._keyStr = _this.keySerialize(x[datastore.Datastore.KEY]);
+        x._keyStr = _this2.keySerialize(x[datastore.Datastore.KEY]);
       }
     });
     return entities;
   }
+  /** this is for save, insert, update and upsert  and ensures _kkeyStr() handling.
+   *
+   */;
+  _proto.prepareEntitiesForDatastore = function prepareEntitiesForDatastore(entities) {
+    for (var _iterator2 = _createForOfIteratorHelperLoose(entities), _step2; !(_step2 = _iterator2()).done;) {
+      var e = _step2.value;
+      assertateDebug.assertIsObject(e.key);
+      assertateDebug.assertIsObject(e.data);
+      this.fixKeys([e.data]);
+      e.excludeLargeProperties = e.excludeLargeProperties === undefined ? true : e.excludeLargeProperties;
+      e.data = _extends({}, e.data, {
+        _keyStr: undefined
+      });
+    }
+  }
+  /** this is for save, insert, update and upsert  and ensures _kkeyStr() handling.
+   *
+   */;
+  _proto.prepareEntitiesFromDatastore = function prepareEntitiesFromDatastore(entities) {
+    for (var _iterator3 = _createForOfIteratorHelperLoose(entities), _step3; !(_step3 = _iterator3()).done;) {
+      var e = _step3.value;
+      e.data[datastore.Datastore.KEY] = e.key;
+      this.fixKeys([e.data]);
+    }
+  }
   /** `get()` reads a [[IDstoreEntry]] from the Datastore.
    *
    * It returns [[IDstoreEntry]] or `null` if not found.
@@ -625,7 +762,7 @@ var Dstore = /*#__PURE__*/function () {
   _proto.get =
   /*#__PURE__*/
   function () {
-    var _get = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key) {
+    var _get = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(key) {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -670,7 +807,7 @@ var Dstore = /*#__PURE__*/function () {
   _proto.getMulti =
   /*#__PURE__*/
   function () {
-    var _getMulti = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(keys) {
+    var _getMulti = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(keys) {
       var results, metricEnd, _yield$this$getDoT$ge, entities, entitiesByKey;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -767,7 +904,7 @@ var Dstore = /*#__PURE__*/function () {
   _proto.set =
   /*#__PURE__*/
   function () {
-    var _set = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, data) {
+    var _set = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, data) {
       var saveEntity;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -832,26 +969,17 @@ var Dstore = /*#__PURE__*/function () {
   _proto.save =
   /*#__PURE__*/
   function () {
-    var _save = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(entities) {
-      var ret, metricEnd, _iterator, _step, e, _iterator2, _step2, _e;
+    var _save = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(entities) {
+      var ret, metricEnd;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             assertateDebug.assertIsArray(entities);
             metricEnd = metricHistogram.startTimer();
             _context4.prev = 2;
+            this.prepareEntitiesForDatastore(entities);
             // Within Transaction we don't get any answer here!
             // [ { mutationResults: [ [Object], [Object] ], indexUpdates: 51 } ]
-            for (_iterator = _createForOfIteratorHelperLoose(entities); !(_step = _iterator()).done;) {
-              e = _step.value;
-              assertateDebug.assertIsObject(e.key);
-              assertateDebug.assertIsObject(e.data);
-              this.fixKeys([e.data]);
-              e.excludeLargeProperties = e.excludeLargeProperties === undefined ? true : e.excludeLargeProperties;
-              e.data = _extends({}, e.data, {
-                _keyStr: undefined
-              });
-            }
             _context4.next = 6;
             return this.getDoT().save(entities);
           case 6:
@@ -863,11 +991,7 @@ var Dstore = /*#__PURE__*/function () {
             _context4.t0 = undefined;
           case 9:
             ret = _context4.t0;
-            for (_iterator2 = _createForOfIteratorHelperLoose(entities); !(_step2 = _iterator2()).done;) {
-              _e = _step2.value;
-              _e.data[datastore.Datastore.KEY] = _e.key;
-              this.fixKeys([_e.data]);
-            }
+            this.prepareEntitiesFromDatastore(entities);
             _context4.next = 19;
             break;
           case 13:
@@ -921,7 +1045,7 @@ var Dstore = /*#__PURE__*/function () {
   _proto.insert =
   /*#__PURE__*/
   function () {
-    var _insert = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(entities) {
+    var _insert = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(entities) {
       var ret, metricEnd;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -929,43 +1053,45 @@ var Dstore = /*#__PURE__*/function () {
             assertateDebug.assertIsArray(entities);
             metricEnd = metricHistogram.startTimer();
             _context5.prev = 2;
-            _context5.next = 5;
+            this.prepareEntitiesForDatastore(entities);
+            _context5.next = 6;
             return this.getDoT().insert(entities);
-          case 5:
+          case 6:
             _context5.t0 = _context5.sent;
             if (_context5.t0) {
-              _context5.next = 8;
+              _context5.next = 9;
               break;
             }
             _context5.t0 = undefined;
-          case 8:
+          case 9:
             ret = _context5.t0;
-            _context5.next = 17;
+            this.prepareEntitiesFromDatastore(entities);
+            _context5.next = 19;
             break;
-          case 11:
-            _context5.prev = 11;
+          case 13:
+            _context5.prev = 13;
             _context5.t1 = _context5["catch"](2);
             // console.error(error)
             metricFailureCounter.inc({
               operation: 'insert'
             });
-            _context5.next = 16;
+            _context5.next = 18;
             return promises.setImmediate();
-          case 16:
+          case 18:
             throw new DstoreError('datastore.insert error', _context5.t1);
-          case 17:
-            _context5.prev = 17;
+          case 19:
+            _context5.prev = 19;
             metricEnd({
               operation: 'insert'
             });
-            return _context5.finish(17);
-          case 20:
+            return _context5.finish(19);
+          case 22:
             return _context5.abrupt("return", ret);
-          case 21:
+          case 23:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, this, [[2, 11, 17, 20]]);
+      }, _callee5, this, [[2, 13, 19, 22]]);
     }));
     function insert(_x6) {
       return _insert.apply(this, arguments);
@@ -993,7 +1119,7 @@ var Dstore = /*#__PURE__*/function () {
   _proto.update =
   /*#__PURE__*/
   function () {
-    var _update = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(entities) {
+    var _update = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(entities) {
       var ret, metricEnd;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -1007,43 +1133,45 @@ var Dstore = /*#__PURE__*/function () {
             });
             metricEnd = metricHistogram.startTimer();
             _context6.prev = 4;
-            _context6.next = 7;
+            this.prepareEntitiesForDatastore(entities);
+            _context6.next = 8;
             return this.getDoT().update(entities);
-          case 7:
+          case 8:
             _context6.t0 = _context6.sent;
             if (_context6.t0) {
-              _context6.next = 10;
+              _context6.next = 11;
               break;
             }
             _context6.t0 = undefined;
-          case 10:
+          case 11:
             ret = _context6.t0;
-            _context6.next = 19;
+            this.prepareEntitiesFromDatastore(entities);
+            _context6.next = 21;
             break;
-          case 13:
-            _context6.prev = 13;
+          case 15:
+            _context6.prev = 15;
             _context6.t1 = _context6["catch"](4);
             // console.error(error)
             metricFailureCounter.inc({
               operation: 'update'
             });
-            _context6.next = 18;
+            _context6.next = 20;
             return promises.setImmediate();
-          case 18:
+          case 20:
             throw new DstoreError('datastore.update error', _context6.t1);
-          case 19:
-            _context6.prev = 19;
+          case 21:
+            _context6.prev = 21;
             metricEnd({
               operation: 'update'
             });
-            return _context6.finish(19);
-          case 22:
+            return _context6.finish(21);
+          case 24:
             return _context6.abrupt("return", ret);
-          case 23:
+          case 25:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, this, [[4, 13, 19, 22]]);
+      }, _callee6, this, [[4, 15, 21, 24]]);
     }));
     function update(_x7) {
       return _update.apply(this, arguments);
@@ -1067,7 +1195,7 @@ var Dstore = /*#__PURE__*/function () {
   _proto["delete"] =
   /*#__PURE__*/
   function () {
-    var _delete2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(keys) {
+    var _delete2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(keys) {
       var ret, metricEnd;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -1140,7 +1268,7 @@ var Dstore = /*#__PURE__*/function () {
     }
   };
   _proto.runQuery = /*#__PURE__*/function () {
-    var _runQuery = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(query) {
+    var _runQuery = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(query) {
       var ret, metricEnd, _yield$this$getDoT$ru, entities, info;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -1192,14 +1320,15 @@ var Dstore = /*#__PURE__*/function () {
    * @param selection selectionList of [[Query]] select() calls.
    * @param cursor unsupported so far.
    *
+   * @throws [[DstoreError]]
    * @category Datastore Drop-In
    */
   ;
   _proto.query =
   /*#__PURE__*/
   function () {
-    var _query = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(kindName, filters, limit, ordering, selection, cursor) {
-      var q, _iterator3, _step3, filterSpec, _iterator4, _step4, orderField;
+    var _query = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(kindName, filters, limit, ordering, selection, cursor) {
+      var q, _iterator4, _step4, filterSpec, _iterator5, _step5, orderField, ret;
       return _regeneratorRuntime().wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -1220,14 +1349,14 @@ var Dstore = /*#__PURE__*/function () {
             assertateDebug.assertIsNumber(limit);
             _context9.prev = 7;
             q = this.createQuery(kindName);
-            for (_iterator3 = _createForOfIteratorHelperLoose(filters); !(_step3 = _iterator3()).done;) {
-              filterSpec = _step3.value;
+            for (_iterator4 = _createForOfIteratorHelperLoose(filters); !(_step4 = _iterator4()).done;) {
+              filterSpec = _step4.value;
               assertateDebug.assertIsObject(filterSpec);
               // @ts-ignore
               q.filter(_construct(datastore.PropertyFilter, filterSpec));
             }
-            for (_iterator4 = _createForOfIteratorHelperLoose(ordering); !(_step4 = _iterator4()).done;) {
-              orderField = _step4.value;
+            for (_iterator5 = _createForOfIteratorHelperLoose(ordering); !(_step5 = _iterator5()).done;) {
+              orderField = _step5.value;
               q.order(orderField);
             }
             if (limit > 0) {
@@ -1237,32 +1366,165 @@ var Dstore = /*#__PURE__*/function () {
               q.select(selection);
             }
             _context9.next = 15;
-            return this.runQuery(q);
+            return this.getDoT().runQuery(q);
           case 15:
-            return _context9.abrupt("return", _context9.sent);
-          case 18:
-            _context9.prev = 18;
+            ret = _context9.sent;
+            return _context9.abrupt("return", [this.fixKeys(ret[0]), ret[1]]);
+          case 19:
+            _context9.prev = 19;
             _context9.t0 = _context9["catch"](7);
-            _context9.next = 22;
+            _context9.next = 23;
             return promises.setImmediate();
-          case 22:
+          case 23:
             throw new DstoreError('datastore.query error', _context9.t0, {
               kindName: kindName,
               filters: filters,
               limit: limit,
               ordering: ordering
             });
-          case 23:
+          case 24:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, this, [[7, 18]]);
+      }, _callee9, this, [[7, 19]]);
     }));
     function query(_x10, _x11, _x12, _x13, _x14, _x15) {
       return _query.apply(this, arguments);
     }
     return query;
   }()
+  /** `iterate()` is a modernized version of `query()`.
+   *
+   * It takes a Parameter object and returns an AsyncIterable.
+   * Entities returned have been processed by `fixKeys()`.
+   *
+   * Can be used with `for await` loops like this:
+   *
+   * ```typescript
+   * for await (const entity of dstore.iterate({ kindName: 'p_ReservierungsAbruf', filters: [['verbucht', '=', true]]})) {
+   *   console.log(entity)
+   * }
+   * ```
+   *
+   * @param kindName Name of the [[Datastore]][Kind](https://cloud.google.com/datastore/docs/concepts/entities#kinds_and_identifiers) ("Table") which should be searched.
+   * @param filters List of [[Query]] filter() calls.
+   * @param limit Maximum Number of Results to return.
+   * @param ordering List of [[Query]] order() calls.
+   * @param selection selectionList of [[Query]] select() calls.
+   *
+   * @throws [[DstoreError]]
+   * @category Additional
+   */
+  ;
+  _proto.iterate = function iterate(_ref) {
+    var _this = this;
+    var kindName = _ref.kindName,
+      _ref$filters = _ref.filters,
+      filters = _ref$filters === void 0 ? [] : _ref$filters,
+      _ref$limit = _ref.limit,
+      limit = _ref$limit === void 0 ? 2500 : _ref$limit,
+      _ref$ordering = _ref.ordering,
+      ordering = _ref$ordering === void 0 ? [] : _ref$ordering,
+      _ref$selection = _ref.selection,
+      selection = _ref$selection === void 0 ? [] : _ref$selection;
+    return _wrapAsyncGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var q, _iterator6, _step6, filterSpec, _iterator7, _step7, orderField, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _entity, ret;
+      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
+          case 0:
+            assertateDebug.assertIsString(kindName);
+            assertateDebug.assertIsArray(filters);
+            assertateDebug.assertIsNumber(limit);
+            _context10.prev = 3;
+            q = _this.getDoT().createQuery(kindName);
+            for (_iterator6 = _createForOfIteratorHelperLoose(filters); !(_step6 = _iterator6()).done;) {
+              filterSpec = _step6.value;
+              assertateDebug.assertIsObject(filterSpec);
+              // @ts-ignore
+              q.filter(_construct(datastore.PropertyFilter, filterSpec));
+            }
+            for (_iterator7 = _createForOfIteratorHelperLoose(ordering); !(_step7 = _iterator7()).done;) {
+              orderField = _step7.value;
+              q.order(orderField);
+            }
+            if (limit > 0) {
+              q.limit(limit);
+            }
+            if (selection.length > 0) {
+              q.select(selection);
+            }
+            _iteratorAbruptCompletion = false;
+            _didIteratorError = false;
+            _context10.prev = 11;
+            _iterator = _asyncIterator(q.runStream());
+          case 13:
+            _context10.next = 15;
+            return _awaitAsyncGenerator(_iterator.next());
+          case 15:
+            if (!(_iteratorAbruptCompletion = !(_step = _context10.sent).done)) {
+              _context10.next = 25;
+              break;
+            }
+            _entity = _step.value;
+            ret = _this.fixKeys([_entity])[0];
+            assertateDebug.assertIsDefined(ret, 'datastore.iterate: entity is undefined');
+            assertIsKey(ret[datastore.Datastore.KEY]);
+            _context10.next = 22;
+            return ret;
+          case 22:
+            _iteratorAbruptCompletion = false;
+            _context10.next = 13;
+            break;
+          case 25:
+            _context10.next = 31;
+            break;
+          case 27:
+            _context10.prev = 27;
+            _context10.t0 = _context10["catch"](11);
+            _didIteratorError = true;
+            _iteratorError = _context10.t0;
+          case 31:
+            _context10.prev = 31;
+            _context10.prev = 32;
+            if (!(_iteratorAbruptCompletion && _iterator["return"] != null)) {
+              _context10.next = 36;
+              break;
+            }
+            _context10.next = 36;
+            return _awaitAsyncGenerator(_iterator["return"]());
+          case 36:
+            _context10.prev = 36;
+            if (!_didIteratorError) {
+              _context10.next = 39;
+              break;
+            }
+            throw _iteratorError;
+          case 39:
+            return _context10.finish(36);
+          case 40:
+            return _context10.finish(31);
+          case 41:
+            _context10.next = 48;
+            break;
+          case 43:
+            _context10.prev = 43;
+            _context10.t1 = _context10["catch"](3);
+            _context10.next = 47;
+            return _awaitAsyncGenerator(promises.setImmediate());
+          case 47:
+            throw new DstoreError('datastore.query error', _context10.t1, {
+              kindName: kindName,
+              filters: filters,
+              limit: limit,
+              ordering: ordering
+            });
+          case 48:
+          case "end":
+            return _context10.stop();
+        }
+      }, _callee10, null, [[3, 43], [11, 27, 31, 41], [32,, 36, 40]]);
+    }))();
+  }
   /** Allocate one ID in the Datastore.
    *
    * Currently (late 2021) there is no documentation provided by Google for the underlying node function.
@@ -1273,31 +1535,30 @@ var Dstore = /*#__PURE__*/function () {
    * The ID is a string encoded large number. This function will never return the same ID twice for any given Datastore.
    * If you provide a kindName the ID will be namespaced to this kind.
    * In fact the generated ID is namespaced via an incomplete [[Key]] of the given Kind.
-   */
-  ;
+   */;
   _proto.allocateOneId =
   /*#__PURE__*/
   function () {
-    var _allocateOneId = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(kindName) {
+    var _allocateOneId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(kindName) {
       var ret;
-      return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
             if (kindName === void 0) {
               kindName = 'Numbering';
             }
             assertateDebug.assertIsString(kindName);
-            _context10.next = 4;
+            _context11.next = 4;
             return this.datastore.allocateIds(this.key([kindName]), 1);
           case 4:
-            ret = _context10.sent[0][0].id;
+            ret = _context11.sent[0][0].id;
             assertateDebug.assertIsString(ret);
-            return _context10.abrupt("return", ret);
+            return _context11.abrupt("return", ret);
           case 7:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10, this);
+      }, _callee11, this);
     }));
     function allocateOneId(_x16) {
       return _allocateOneId.apply(this, arguments);
@@ -1316,72 +1577,72 @@ var Dstore = /*#__PURE__*/function () {
   _proto.runInTransaction =
   /*#__PURE__*/
   function () {
-    var _runInTransaction = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(func) {
+    var _runInTransaction = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(func) {
       var ret, transaction;
-      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             transaction = this.datastore.transaction();
-            _context12.next = 3;
-            return transactionAsyncLocalStorage.run(transaction, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+            _context13.next = 3;
+            return transactionAsyncLocalStorage.run(transaction, /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
               var _yield$transaction$ru, transactionInfo, transactionRunApiResponse, commitApiResponse, rollbackInfo;
-              return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-                while (1) switch (_context11.prev = _context11.next) {
+              return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+                while (1) switch (_context12.prev = _context12.next) {
                   case 0:
-                    _context11.next = 2;
+                    _context12.next = 2;
                     return transaction.run();
                   case 2:
-                    _yield$transaction$ru = _context11.sent;
+                    _yield$transaction$ru = _context12.sent;
                     transactionInfo = _yield$transaction$ru[0];
                     transactionRunApiResponse = _yield$transaction$ru[1];
-                    _context11.prev = 5;
-                    _context11.next = 8;
+                    _context12.prev = 5;
+                    _context12.next = 8;
                     return func();
                   case 8:
-                    ret = _context11.sent;
-                    _context11.next = 20;
+                    ret = _context12.sent;
+                    _context12.next = 20;
                     break;
                   case 11:
-                    _context11.prev = 11;
-                    _context11.t0 = _context11["catch"](5);
-                    _context11.next = 15;
+                    _context12.prev = 11;
+                    _context12.t0 = _context12["catch"](5);
+                    _context12.next = 15;
                     return transaction.rollback();
                   case 15:
-                    rollbackInfo = _context11.sent;
-                    debug('Transaction failed, rollback initiated: %O  %O %O %O', transactionInfo, transactionRunApiResponse, rollbackInfo, _context11.t0);
-                    _context11.next = 19;
+                    rollbackInfo = _context12.sent;
+                    debug('Transaction failed, rollback initiated: %O  %O %O %O', transactionInfo, transactionRunApiResponse, rollbackInfo, _context12.t0);
+                    _context12.next = 19;
                     return promises.setImmediate();
                   case 19:
-                    throw new DstoreError('datastore.transaction execution error', _context11.t0);
+                    throw new DstoreError('datastore.transaction execution error', _context12.t0);
                   case 20:
-                    _context11.prev = 20;
-                    _context11.next = 23;
+                    _context12.prev = 20;
+                    _context12.next = 23;
                     return transaction.commit();
                   case 23:
-                    commitApiResponse = _context11.sent[0];
-                    _context11.next = 32;
+                    commitApiResponse = _context12.sent[0];
+                    _context12.next = 32;
                     break;
                   case 26:
-                    _context11.prev = 26;
-                    _context11.t1 = _context11["catch"](20);
-                    debug('Transaction commit failed: %O %O %O %O ret: %O', transactionInfo, transactionRunApiResponse, commitApiResponse, _context11.t1, ret);
-                    _context11.next = 31;
+                    _context12.prev = 26;
+                    _context12.t1 = _context12["catch"](20);
+                    debug('Transaction commit failed: %O %O %O %O ret: %O', transactionInfo, transactionRunApiResponse, commitApiResponse, _context12.t1, ret);
+                    _context12.next = 31;
                     return promises.setImmediate();
                   case 31:
-                    throw new DstoreError('datastore.transaction execution error', _context11.t1);
+                    throw new DstoreError('datastore.transaction execution error', _context12.t1);
                   case 32:
                   case "end":
-                    return _context11.stop();
+                    return _context12.stop();
                 }
-              }, _callee11, null, [[5, 11], [20, 26]]);
+              }, _callee12, null, [[5, 11], [20, 26]]);
             })));
           case 3:
-            return _context12.abrupt("return", ret);
+            return _context13.abrupt("return", ret);
           case 4:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12, this);
+      }, _callee13, this);
     }));
     function runInTransaction(_x17) {
       return _runInTransaction.apply(this, arguments);
@@ -1391,58 +1652,29 @@ var Dstore = /*#__PURE__*/function () {
   return Dstore;
 }();
 var DstoreError = /*#__PURE__*/function (_Error) {
-  _inheritsLoose(DstoreError, _Error);
   function DstoreError(message, originalError, extensions) {
-    var _this2$stack, _originalError$stack, _originalError$stack$, _originalError$stack$2, _this2$stack2, _this2$stack2$split, _this2$stack2$split$s;
-    var _this2;
-    _this2 = _Error.call(this, message + ": " + (originalError == null ? void 0 : originalError.message)) || this;
+    var _this3$stack, _originalError$stack, _this3$stack2;
+    var _this3;
+    _this3 = _Error.call(this, message + ": " + (originalError == null ? void 0 : originalError.message)) || this;
     // if no name provided, use the default. defineProperty ensures that it stays non-enumerable
-    _this2.extensions = void 0;
-    _this2.originalError = void 0;
-    if (!_this2.name) {
-      Object.defineProperty(_assertThisInitialized(_this2), 'name', {
+    _this3.extensions = void 0;
+    _this3.originalError = void 0;
+    if (!_this3.name) {
+      Object.defineProperty(_this3, 'name', {
         value: 'DstoreError'
       });
     }
     // metadata: Metadata { internalRepr: Map(0) {}, options: {} },
-    _this2.originalError = originalError;
-    _this2.extensions = _extends({}, extensions);
-    _this2.stack = (((_this2$stack = _this2.stack) == null ? void 0 : _this2$stack.split('\n')[0]) || '') + '\n' + ((originalError == null ? void 0 : (_originalError$stack = originalError.stack) == null ? void 0 : (_originalError$stack$ = _originalError$stack.split('\n')) == null ? void 0 : (_originalError$stack$2 = _originalError$stack$.slice(1)) == null ? void 0 : _originalError$stack$2.join('\n')) || '') + '\n' + (((_this2$stack2 = _this2.stack) == null ? void 0 : (_this2$stack2$split = _this2$stack2.split('\n')) == null ? void 0 : (_this2$stack2$split$s = _this2$stack2$split.slice(1)) == null ? void 0 : _this2$stack2$split$s.join('\n')) || '');
+    _this3.originalError = originalError;
+    _this3.extensions = _extends({}, extensions);
+    _this3.stack = (((_this3$stack = _this3.stack) == null ? void 0 : _this3$stack.split('\n')[0]) || '') + '\n' + ((originalError == null || (_originalError$stack = originalError.stack) == null || (_originalError$stack = _originalError$stack.split('\n')) == null || (_originalError$stack = _originalError$stack.slice(1)) == null ? void 0 : _originalError$stack.join('\n')) || '') + '\n' + (((_this3$stack2 = _this3.stack) == null || (_this3$stack2 = _this3$stack2.split('\n')) == null || (_this3$stack2 = _this3$stack2.slice(1)) == null ? void 0 : _this3$stack2.join('\n')) || '');
     // These are usually present on Datastore Errors
     // logger.error({ err: originalError, extensions }, message);
-    return _this2;
+    return _this3;
   }
+  _inheritsLoose(DstoreError, _Error);
   return DstoreError;
-}( /*#__PURE__*/_wrapNativeSuper(Error));
-
-/*
- * assert.ts
- *
- * Created by Dr. Maximillian Dornseif 2025-04-11 in datastore-api 6.0.1
- */
-/**
- * Generates an type assertion message for the given `value`
- *
- * @param value value being type-checked
- * @param type the expected value as a string; eg 'string', 'boolean', 'number'
- * @param variableName the name of the variable being type-checked
- * @param additionalMessage further information on failure
- */
-var AssertionMessage = function AssertionMessage(value, type, variableName, additionalMessage) {
-  var message = variableName ? variableName + " must be of type '" + type + "', '" + assertateDebug.getType(value) + "' provided" : "expected value of type '" + type + "', '" + assertateDebug.getType(value) + "' provided";
-  return additionalMessage ? message + ": " + additionalMessage : message;
-};
-/**
- * Type-checks the provided `value` to be a symbol, throws an Error if it is not
- *
- * @param value the value to type-check as a symbol
- * @param variableName the name of the variable to be type-checked
- * @param additionalMessage further information on failure
- * @throws {Error}
- */
-function assertIsKey(value, variableName, additionalMessage) {
-  assertateDebug.assert(datastore.Datastore.isKey(value), AssertionMessage(value, "Key", variableName, additionalMessage));
-}
+}(/*#__PURE__*/_wrapNativeSuper(Error));
 
 Object.defineProperty(exports, 'Datastore', {
   enumerable: true,