@promster/metrics 9.1.2 → 9.1.5

package/dist/promster-metrics.cjs.dev.js

@@ -386,7 +386,7 @@ const normalizeStatusCode = statusCode => statusCode;
 
 const urlValueParser = new UrlValueParser__default["default"]();
 
-const normalizePath = path => urlValueParser.replacePathValues(url__default["default"].parse(path).pathname);
+const normalizePath = path => urlValueParser.replacePathValues(url__default["default"].parse(path).pathname, '#val');
 
 const normalizeMethod = method => method.toLowerCase();
 
@@ -396,121 +396,39 @@ const defaultNormalizers = {
   normalizeMethod
 };
 
-function _checkPrivateRedeclaration(obj, privateCollection) {
-  if (privateCollection.has(obj)) {
-    throw new TypeError("Cannot initialize the same private elements twice on an object");
-  }
-}
-
-function _classPrivateFieldInitSpec(obj, privateMap, value) {
-  _checkPrivateRedeclaration(obj, privateMap);
-  privateMap.set(obj, value);
-}
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function _classApplyDescriptorSet(receiver, descriptor, value) {
-  if (descriptor.set) {
-    descriptor.set.call(receiver, value);
-  } else {
-    if (!descriptor.writable) {
-      throw new TypeError("attempted to set read only private field");
-    }
-
-    descriptor.value = value;
-  }
-}
-
-function _classExtractFieldDescriptor(receiver, privateMap, action) {
-  if (!privateMap.has(receiver)) {
-    throw new TypeError("attempted to " + action + " private field on non-instance");
-  }
-
-  return privateMap.get(receiver);
-}
-
-function _classPrivateFieldSet(receiver, privateMap, value) {
-  var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set");
-  _classApplyDescriptorSet(receiver, descriptor, value);
-  return value;
-}
-
-function _classApplyDescriptorGet(receiver, descriptor) {
-  if (descriptor.get) {
-    return descriptor.get.call(receiver);
-  }
-
-  return descriptor.value;
-}
-
-function _classPrivateFieldGet(receiver, privateMap) {
-  var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get");
-  return _classApplyDescriptorGet(receiver, descriptor);
-}
-
-var _startTime = /*#__PURE__*/new WeakMap();
-
-var _endTime = /*#__PURE__*/new WeakMap();
-
 class Timing {
-  constructor() {
-    _classPrivateFieldInitSpec(this, _startTime, {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldInitSpec(this, _endTime, {
-      writable: true,
-      value: void 0
-    });
+  static NS_PER_SEC = BigInt(1e9);
+  #startTime;
+  #endTime;
 
+  constructor() {
     this.reset();
   }
 
   value() {
-    const startTime = _classPrivateFieldGet(this, _startTime);
-
-    const endTime = _classPrivateFieldGet(this, _endTime);
-
+    const startTime = this.#startTime;
+    const endTime = this.#endTime;
     if (!endTime || !startTime) return {
       seconds: undefined
     };
     return {
-      seconds: Number((endTime - startTime) / Timing.NS_PER_SEC)
+      seconds: Number(endTime - startTime) / Number(Timing.NS_PER_SEC)
     };
   }
 
   reset() {
-    _classPrivateFieldSet(this, _startTime, process.hrtime.bigint());
-
-    _classPrivateFieldSet(this, _endTime, undefined);
-
+    this.#startTime = process.hrtime.bigint();
+    this.#endTime = undefined;
     return this;
   }
 
   end() {
-    _classPrivateFieldSet(this, _endTime, process.hrtime.bigint());
-
+    this.#endTime = process.hrtime.bigint();
     return this;
   }
 
 }
 
-_defineProperty(Timing, "NS_PER_SEC", BigInt(1e9));
-
 const timing = {
   start() {
     return new Timing();

package/dist/promster-metrics.cjs.prod.js

@@ -386,7 +386,7 @@ const normalizeStatusCode = statusCode => statusCode;
 
 const urlValueParser = new UrlValueParser__default["default"]();
 
-const normalizePath = path => urlValueParser.replacePathValues(url__default["default"].parse(path).pathname);
+const normalizePath = path => urlValueParser.replacePathValues(url__default["default"].parse(path).pathname, '#val');
 
 const normalizeMethod = method => method.toLowerCase();
 
@@ -396,121 +396,39 @@ const defaultNormalizers = {
   normalizeMethod
 };
 
-function _checkPrivateRedeclaration(obj, privateCollection) {
-  if (privateCollection.has(obj)) {
-    throw new TypeError("Cannot initialize the same private elements twice on an object");
-  }
-}
-
-function _classPrivateFieldInitSpec(obj, privateMap, value) {
-  _checkPrivateRedeclaration(obj, privateMap);
-  privateMap.set(obj, value);
-}
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function _classApplyDescriptorSet(receiver, descriptor, value) {
-  if (descriptor.set) {
-    descriptor.set.call(receiver, value);
-  } else {
-    if (!descriptor.writable) {
-      throw new TypeError("attempted to set read only private field");
-    }
-
-    descriptor.value = value;
-  }
-}
-
-function _classExtractFieldDescriptor(receiver, privateMap, action) {
-  if (!privateMap.has(receiver)) {
-    throw new TypeError("attempted to " + action + " private field on non-instance");
-  }
-
-  return privateMap.get(receiver);
-}
-
-function _classPrivateFieldSet(receiver, privateMap, value) {
-  var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set");
-  _classApplyDescriptorSet(receiver, descriptor, value);
-  return value;
-}
-
-function _classApplyDescriptorGet(receiver, descriptor) {
-  if (descriptor.get) {
-    return descriptor.get.call(receiver);
-  }
-
-  return descriptor.value;
-}
-
-function _classPrivateFieldGet(receiver, privateMap) {
-  var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get");
-  return _classApplyDescriptorGet(receiver, descriptor);
-}
-
-var _startTime = /*#__PURE__*/new WeakMap();
-
-var _endTime = /*#__PURE__*/new WeakMap();
-
 class Timing {
-  constructor() {
-    _classPrivateFieldInitSpec(this, _startTime, {
-      writable: true,
-      value: void 0
-    });
-
-    _classPrivateFieldInitSpec(this, _endTime, {
-      writable: true,
-      value: void 0
-    });
+  static NS_PER_SEC = BigInt(1e9);
+  #startTime;
+  #endTime;
 
+  constructor() {
     this.reset();
   }
 
   value() {
-    const startTime = _classPrivateFieldGet(this, _startTime);
-
-    const endTime = _classPrivateFieldGet(this, _endTime);
-
+    const startTime = this.#startTime;
+    const endTime = this.#endTime;
     if (!endTime || !startTime) return {
       seconds: undefined
     };
     return {
-      seconds: Number((endTime - startTime) / Timing.NS_PER_SEC)
+      seconds: Number(endTime - startTime) / Number(Timing.NS_PER_SEC)
     };
   }
 
   reset() {
-    _classPrivateFieldSet(this, _startTime, process.hrtime.bigint());
-
-    _classPrivateFieldSet(this, _endTime, undefined);
-
+    this.#startTime = process.hrtime.bigint();
+    this.#endTime = undefined;
     return this;
   }
 
   end() {
-    _classPrivateFieldSet(this, _endTime, process.hrtime.bigint());
-
+    this.#endTime = process.hrtime.bigint();
     return this;
   }
 
 }
 
-_defineProperty(Timing, "NS_PER_SEC", BigInt(1e9));
-
 const timing = {
   start() {
     return new Timing();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promster/metrics",
-  "version": "9.1.2",
+  "version": "9.1.5",
   "description": "Metrics utilities used by all other server integrations",
   "main": "dist/promster-metrics.cjs.js",
   "typings": "dist/promster-metrics.cjs.d.ts",
@@ -40,19 +40,18 @@
     "lodash.once": "4.1.1",
     "merge-options": "3.0.4",
     "optional": "0.1.4",
-    "ts-essentials": "9.0.0",
+    "ts-essentials": "9.1.2",
     "tslib": "2.3.1",
-    "url": "0.11.0",
     "url-value-parser": "2.1.0"
   },
   "devDependencies": {
-    "@promster/types": "^3.2.2",
-    "@types/lodash": "4.14.178",
+    "@promster/types": "^3.2.4",
+    "@types/lodash": "4.14.180",
     "prom-client": "14.0.1",
-    "typescript": "4.5.4"
+    "typescript": "4.6.2"
   },
   "optionalDependencies": {
-    "@sematext/gc-stats": "1.5.5"
+    "@sematext/gc-stats": "1.5.7"
   },
   "peerDependencies": {
     "prom-client": "13.x.x || 14.x"