@foxford/den-traces 5.0.0 → 7.0.0

package/{chunk-DAPDESIH.cjs → chunk-C54MGVV6.cjs}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/timings/index.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/timings/index.ts
 var sink = null;
 var requestSink = null;
 var upstreamErrorSink = null;
@@ -30,18 +30,18 @@ function startRequest(name, url) {
       if (done) return;
       done = true;
       const ms = performance.now() - startedAt;
-      _optionalChain([sink, 'optionalCall', _ => _(name, ms, startedAt)]);
-      _optionalChain([requestSink, 'optionalCall', _2 => _2({ bytes: null, error: String(error), ms, name, startedAt, status: null, url })]);
-      _optionalChain([upstreamErrorSink, 'optionalCall', _3 => _3({ name, reason: "network", status: null, url })]);
+      sink == null ? void 0 : sink(name, ms, startedAt);
+      requestSink == null ? void 0 : requestSink({ bytes: null, error: String(error), ms, name, startedAt, status: null, url });
+      upstreamErrorSink == null ? void 0 : upstreamErrorSink({ name, reason: "network", status: null, url });
     },
     finish(status, bytes = null) {
       if (done) return;
       done = true;
       const ms = performance.now() - startedAt;
-      _optionalChain([sink, 'optionalCall', _4 => _4(name, ms, startedAt)]);
-      _optionalChain([requestSink, 'optionalCall', _5 => _5({ bytes, ms, name, startedAt, status, url })]);
+      sink == null ? void 0 : sink(name, ms, startedAt);
+      requestSink == null ? void 0 : requestSink({ bytes, ms, name, startedAt, status, url });
       if (status < 200 || status >= 300) {
-        _optionalChain([upstreamErrorSink, 'optionalCall', _6 => _6({ name, reason: `http_${String(status)}`, status, url })]);
+        upstreamErrorSink == null ? void 0 : upstreamErrorSink({ name, reason: "http_".concat(String(status)), status, url });
       }
     }
   };

package/{chunk-PMYUYUJQ.js → chunk-IDEPG3TX.js}

@@ -30,18 +30,18 @@ function startRequest(name, url) {
       if (done) return;
       done = true;
       const ms = performance.now() - startedAt;
-      sink?.(name, ms, startedAt);
-      requestSink?.({ bytes: null, error: String(error), ms, name, startedAt, status: null, url });
-      upstreamErrorSink?.({ name, reason: "network", status: null, url });
+      sink == null ? void 0 : sink(name, ms, startedAt);
+      requestSink == null ? void 0 : requestSink({ bytes: null, error: String(error), ms, name, startedAt, status: null, url });
+      upstreamErrorSink == null ? void 0 : upstreamErrorSink({ name, reason: "network", status: null, url });
     },
     finish(status, bytes = null) {
       if (done) return;
       done = true;
       const ms = performance.now() - startedAt;
-      sink?.(name, ms, startedAt);
-      requestSink?.({ bytes, ms, name, startedAt, status, url });
+      sink == null ? void 0 : sink(name, ms, startedAt);
+      requestSink == null ? void 0 : requestSink({ bytes, ms, name, startedAt, status, url });
       if (status < 200 || status >= 300) {
-        upstreamErrorSink?.({ name, reason: `http_${String(status)}`, status, url });
+        upstreamErrorSink == null ? void 0 : upstreamErrorSink({ name, reason: "http_".concat(String(status)), status, url });
       }
     }
   };

package/index.cjs

@@ -1,31 +1,36 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
 
 
 
-var _chunkDAPDESIHcjs = require('./chunk-DAPDESIH.cjs');
+var _chunkC54MGVV6cjs = require('./chunk-C54MGVV6.cjs');
 
 // src/server/install.ts
 var _async_hooks = require('async_hooks');
 
 // src/server/trace.ts
 function nameOf(named) {
-  return _nullishCoalesce(named.token.description, () => ( "?"));
+  var _a;
+  return (_a = named.token.description) != null ? _a : "?";
 }
 function describeDeclarations(app) {
+  var _a, _b, _c, _d, _e, _f, _g;
   return {
-    guards: (_nullishCoalesce(app.guards, () => ( []))).map(nameOf),
+    guards: ((_a = app.guards) != null ? _a : []).map(nameOf),
     mountsInto: app.mountsInto,
     name: app.name,
-    provides: (_nullishCoalesce(app.provides, () => ( []))).map(nameOf),
-    requires: (_nullishCoalesce(app.requires, () => ( []))).map((token) => token.description),
-    routes: (_nullishCoalesce(app.routes, () => ( []))).map(
-      (route) => typeof route === "string" ? { guards: [], source: route } : { guards: (_nullishCoalesce(route.guards, () => ( []))).map(nameOf), source: route.source }
+    provides: ((_b = app.provides) != null ? _b : []).map(nameOf),
+    requires: ((_c = app.requires) != null ? _c : []).map((token) => token.description),
+    routes: ((_d = app.routes) != null ? _d : []).map(
+      (route) => {
+        var _a2;
+        return typeof route === "string" ? { guards: [], source: route } : { guards: ((_a2 = route.guards) != null ? _a2 : []).map(nameOf), source: route.source };
+      }
     ),
-    slots: Object.keys(_nullishCoalesce(app.slots, () => ( {}))),
-    units: (_nullishCoalesce(app.units, () => ( []))).map(nameOf),
-    viewModels: (_nullishCoalesce(app.viewModels, () => ( []))).map(nameOf)
+    slots: Object.keys((_e = app.slots) != null ? _e : {}),
+    units: ((_f = app.units) != null ? _f : []).map(nameOf),
+    viewModels: ((_g = app.viewModels) != null ? _g : []).map(nameOf)
   };
 }
 var TRACE_LIMIT_BYTES = 8192;
@@ -47,7 +52,7 @@ function traceHeader(requests, startedAt) {
   return encoded;
 }
 function serverTimingHeader(marks) {
-  return marks.map(({ name, ms, startMs }) => `${name};dur=${ms.toFixed(1)};desc="@${startMs.toFixed(1)}"`).join(", ");
+  return marks.map(({ name, ms, startMs }) => "".concat(name, ";dur=").concat(ms.toFixed(1), ';desc="@').concat(startMs.toFixed(1), '"')).join(", ");
 }
 
 // src/server/install.ts
@@ -55,14 +60,17 @@ var TRACE_HEADER = "x-den-trace";
 var storage = new (0, _async_hooks.AsyncLocalStorage)();
 function recordServerTiming(name, ms, startedAt) {
   const timings = storage.getStore();
-  _optionalChain([timings, 'optionalAccess', _ => _.marks, 'access', _2 => _2.push, 'call', _3 => _3({ ms, name, startMs: (_nullishCoalesce(startedAt, () => ( performance.now() - ms))) - timings.startedAt })]);
+  timings == null ? void 0 : timings.marks.push({ ms, name, startMs: (startedAt != null ? startedAt : performance.now() - ms) - timings.startedAt });
 }
 function asked(headers) {
   return headers[TRACE_HEADER] !== void 0;
 }
 function installServerTrace(instance, options = {}) {
-  _chunkDAPDESIHcjs.setTimingSink.call(void 0, recordServerTiming);
-  _chunkDAPDESIHcjs.setRequestSink.call(void 0, (request) => _optionalChain([storage, 'access', _4 => _4.getStore, 'call', _5 => _5(), 'optionalAccess', _6 => _6.requests, 'access', _7 => _7.push, 'call', _8 => _8(request)]));
+  _chunkC54MGVV6cjs.setTimingSink.call(void 0, recordServerTiming);
+  _chunkC54MGVV6cjs.setRequestSink.call(void 0, (request) => {
+    var _a;
+    return (_a = storage.getStore()) == null ? void 0 : _a.requests.push(request);
+  });
   instance.addHook("onRequest", (_request, _reply, done) => {
     storage.run({ marks: [], requests: [], startedAt: performance.now() }, done);
   });
@@ -94,4 +102,4 @@ function installServerTrace(instance, options = {}) {
 
 
 
-exports.describeDeclarations = describeDeclarations; exports.installServerTrace = installServerTrace; exports.measure = _chunkDAPDESIHcjs.measure; exports.recordServerTiming = recordServerTiming; exports.setRequestSink = _chunkDAPDESIHcjs.setRequestSink; exports.setTimingSink = _chunkDAPDESIHcjs.setTimingSink; exports.setUpstreamErrorSink = _chunkDAPDESIHcjs.setUpstreamErrorSink; exports.startRequest = _chunkDAPDESIHcjs.startRequest; exports.traceHeader = traceHeader;
+exports.describeDeclarations = describeDeclarations; exports.installServerTrace = installServerTrace; exports.measure = _chunkC54MGVV6cjs.measure; exports.recordServerTiming = recordServerTiming; exports.setRequestSink = _chunkC54MGVV6cjs.setRequestSink; exports.setTimingSink = _chunkC54MGVV6cjs.setTimingSink; exports.setUpstreamErrorSink = _chunkC54MGVV6cjs.setUpstreamErrorSink; exports.startRequest = _chunkC54MGVV6cjs.startRequest; exports.traceHeader = traceHeader;

package/index.js

@@ -4,28 +4,33 @@ import {
   setTimingSink,
   setUpstreamErrorSink,
   startRequest
-} from "./chunk-PMYUYUJQ.js";
+} from "./chunk-IDEPG3TX.js";
 
 // src/server/install.ts
 import { AsyncLocalStorage } from "async_hooks";
 
 // src/server/trace.ts
 function nameOf(named) {
-  return named.token.description ?? "?";
+  var _a;
+  return (_a = named.token.description) != null ? _a : "?";
 }
 function describeDeclarations(app) {
+  var _a, _b, _c, _d, _e, _f, _g;
   return {
-    guards: (app.guards ?? []).map(nameOf),
+    guards: ((_a = app.guards) != null ? _a : []).map(nameOf),
     mountsInto: app.mountsInto,
     name: app.name,
-    provides: (app.provides ?? []).map(nameOf),
-    requires: (app.requires ?? []).map((token) => token.description),
-    routes: (app.routes ?? []).map(
-      (route) => typeof route === "string" ? { guards: [], source: route } : { guards: (route.guards ?? []).map(nameOf), source: route.source }
+    provides: ((_b = app.provides) != null ? _b : []).map(nameOf),
+    requires: ((_c = app.requires) != null ? _c : []).map((token) => token.description),
+    routes: ((_d = app.routes) != null ? _d : []).map(
+      (route) => {
+        var _a2;
+        return typeof route === "string" ? { guards: [], source: route } : { guards: ((_a2 = route.guards) != null ? _a2 : []).map(nameOf), source: route.source };
+      }
     ),
-    slots: Object.keys(app.slots ?? {}),
-    units: (app.units ?? []).map(nameOf),
-    viewModels: (app.viewModels ?? []).map(nameOf)
+    slots: Object.keys((_e = app.slots) != null ? _e : {}),
+    units: ((_f = app.units) != null ? _f : []).map(nameOf),
+    viewModels: ((_g = app.viewModels) != null ? _g : []).map(nameOf)
   };
 }
 var TRACE_LIMIT_BYTES = 8192;
@@ -47,7 +52,7 @@ function traceHeader(requests, startedAt) {
   return encoded;
 }
 function serverTimingHeader(marks) {
-  return marks.map(({ name, ms, startMs }) => `${name};dur=${ms.toFixed(1)};desc="@${startMs.toFixed(1)}"`).join(", ");
+  return marks.map(({ name, ms, startMs }) => "".concat(name, ";dur=").concat(ms.toFixed(1), ';desc="@').concat(startMs.toFixed(1), '"')).join(", ");
 }
 
 // src/server/install.ts
@@ -55,14 +60,17 @@ var TRACE_HEADER = "x-den-trace";
 var storage = new AsyncLocalStorage();
 function recordServerTiming(name, ms, startedAt) {
   const timings = storage.getStore();
-  timings?.marks.push({ ms, name, startMs: (startedAt ?? performance.now() - ms) - timings.startedAt });
+  timings == null ? void 0 : timings.marks.push({ ms, name, startMs: (startedAt != null ? startedAt : performance.now() - ms) - timings.startedAt });
 }
 function asked(headers) {
   return headers[TRACE_HEADER] !== void 0;
 }
 function installServerTrace(instance, options = {}) {
   setTimingSink(recordServerTiming);
-  setRequestSink((request) => storage.getStore()?.requests.push(request));
+  setRequestSink((request) => {
+    var _a;
+    return (_a = storage.getStore()) == null ? void 0 : _a.requests.push(request);
+  });
   instance.addHook("onRequest", (_request, _reply, done) => {
     storage.run({ marks: [], requests: [], startedAt: performance.now() }, done);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxford/den-traces",
-  "version": "5.0.0",
+  "version": "7.0.0",
   "description": "Метки времени, походы наружу и дев-трасса для den-приложений",
   "keywords": [
     "foxford",
@@ -32,7 +32,7 @@
   ],
   "type": "module",
   "peerDependencies": {
-    "@foxford/den": "^4.0.0"
+    "@foxford/den": "^4.2.0"
   },
   "main": "./index.cjs",
   "module": "./index.js",
@@ -55,8 +55,8 @@
   },
   "files": [
     "README.mdx",
-    "chunk-DAPDESIH.cjs",
-    "chunk-PMYUYUJQ.js",
+    "chunk-C54MGVV6.cjs",
+    "chunk-IDEPG3TX.js",
     "index.cjs",
     "index.d.cts",
     "index.d.ts",
@@ -65,6 +65,6 @@
     "services",
     "timings"
   ],
-  "sha": "46c9d1a",
+  "sha": "6bf9ff8",
   "scripts": {}
 }

package/services/index.cjs

@@ -1,37 +1,39 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkDAPDESIHcjs = require('../chunk-DAPDESIH.cjs');
+var _chunkC54MGVV6cjs = require('../chunk-C54MGVV6.cjs');
 
 // src/services/index.ts
 var SPAN = /* @__PURE__ */ Symbol("den-traces:span");
 function traceNameOf(config) {
+  var _a, _b, _c;
   if (typeof config.traceName === "string" && config.traceName !== "") {
     return config.traceName;
   }
-  const path = _nullishCoalesce((_nullishCoalesce(config.url, () => ( ""))).split("?")[0], () => ( ""));
-  return `${(_nullishCoalesce(config.method, () => ( "get"))).toLowerCase()} ${path}`;
+  const path = (_b = ((_a = config.url) != null ? _a : "").split("?")[0]) != null ? _b : "";
+  return "".concat(((_c = config.method) != null ? _c : "get").toLowerCase(), " ").concat(path);
 }
 function traceUrlOf(config) {
-  const url = _nullishCoalesce(config.url, () => ( ""));
+  var _a;
+  const url = (_a = config.url) != null ? _a : "";
   if (/^https?:\/\//.test(url) || !config.baseURL) {
     return url;
   }
-  return `${config.baseURL.replace(/\/$/, "")}/${url.replace(/^\//, "")}`;
+  return "".concat(config.baseURL.replace(/\/$/, ""), "/").concat(url.replace(/^\//, ""));
 }
 function spanOf(config) {
-  const span = _optionalChain([config, 'optionalAccess', _ => _[SPAN]]);
+  const span = config == null ? void 0 : config[SPAN];
   return typeof span === "object" && span !== null ? span : void 0;
 }
 function lengthOf(headers) {
-  const value = _optionalChain([headers, 'optionalAccess', _2 => _2["content-length"]]);
-  return _chunkDAPDESIHcjs.contentLength.call(void 0, typeof value === "string" ? value : typeof value === "number" ? String(value) : null);
+  const value = headers == null ? void 0 : headers["content-length"];
+  return _chunkC54MGVV6cjs.contentLength.call(void 0, typeof value === "string" ? value : typeof value === "number" ? String(value) : null);
 }
 function createTracePlugins() {
   return [
     {
       execute: (config) => {
-        config[SPAN] = _chunkDAPDESIHcjs.startRequest.call(void 0, traceNameOf(config), traceUrlOf(config));
+        config[SPAN] = _chunkC54MGVV6cjs.startRequest.call(void 0, traceNameOf(config), traceUrlOf(config));
         return Promise.resolve(config);
       },
       isApplicable: () => true,
@@ -40,7 +42,8 @@ function createTracePlugins() {
     },
     {
       execute: (response) => {
-        _optionalChain([spanOf, 'call', _3 => _3(response.config), 'optionalAccess', _4 => _4.finish, 'call', _5 => _5(response.status, lengthOf(response.headers))]);
+        var _a;
+        (_a = spanOf(response.config)) == null ? void 0 : _a.finish(response.status, lengthOf(response.headers));
         return Promise.resolve(response);
       },
       isApplicable: () => true,
@@ -51,9 +54,9 @@ function createTracePlugins() {
       execute: (error) => {
         const span = spanOf(error.config);
         if (error.response) {
-          _optionalChain([span, 'optionalAccess', _6 => _6.finish, 'call', _7 => _7(error.response.status, lengthOf(error.response.headers))]);
+          span == null ? void 0 : span.finish(error.response.status, lengthOf(error.response.headers));
         } else {
-          _optionalChain([span, 'optionalAccess', _8 => _8.fail, 'call', _9 => _9(error)]);
+          span == null ? void 0 : span.fail(error);
         }
         return Promise.resolve(error);
       },

package/services/index.js

@@ -1,30 +1,32 @@
 import {
   contentLength,
   startRequest
-} from "../chunk-PMYUYUJQ.js";
+} from "../chunk-IDEPG3TX.js";
 
 // src/services/index.ts
 var SPAN = /* @__PURE__ */ Symbol("den-traces:span");
 function traceNameOf(config) {
+  var _a, _b, _c;
   if (typeof config.traceName === "string" && config.traceName !== "") {
     return config.traceName;
   }
-  const path = (config.url ?? "").split("?")[0] ?? "";
-  return `${(config.method ?? "get").toLowerCase()} ${path}`;
+  const path = (_b = ((_a = config.url) != null ? _a : "").split("?")[0]) != null ? _b : "";
+  return "".concat(((_c = config.method) != null ? _c : "get").toLowerCase(), " ").concat(path);
 }
 function traceUrlOf(config) {
-  const url = config.url ?? "";
+  var _a;
+  const url = (_a = config.url) != null ? _a : "";
   if (/^https?:\/\//.test(url) || !config.baseURL) {
     return url;
   }
-  return `${config.baseURL.replace(/\/$/, "")}/${url.replace(/^\//, "")}`;
+  return "".concat(config.baseURL.replace(/\/$/, ""), "/").concat(url.replace(/^\//, ""));
 }
 function spanOf(config) {
-  const span = config?.[SPAN];
+  const span = config == null ? void 0 : config[SPAN];
   return typeof span === "object" && span !== null ? span : void 0;
 }
 function lengthOf(headers) {
-  const value = headers?.["content-length"];
+  const value = headers == null ? void 0 : headers["content-length"];
   return contentLength(typeof value === "string" ? value : typeof value === "number" ? String(value) : null);
 }
 function createTracePlugins() {
@@ -40,7 +42,8 @@ function createTracePlugins() {
     },
     {
       execute: (response) => {
-        spanOf(response.config)?.finish(response.status, lengthOf(response.headers));
+        var _a;
+        (_a = spanOf(response.config)) == null ? void 0 : _a.finish(response.status, lengthOf(response.headers));
         return Promise.resolve(response);
       },
       isApplicable: () => true,
@@ -51,9 +54,9 @@ function createTracePlugins() {
       execute: (error) => {
         const span = spanOf(error.config);
         if (error.response) {
-          span?.finish(error.response.status, lengthOf(error.response.headers));
+          span == null ? void 0 : span.finish(error.response.status, lengthOf(error.response.headers));
         } else {
-          span?.fail(error);
+          span == null ? void 0 : span.fail(error);
         }
         return Promise.resolve(error);
       },

package/timings/index.cjs

@@ -5,7 +5,7 @@
 
 
 
-var _chunkDAPDESIHcjs = require('../chunk-DAPDESIH.cjs');
+var _chunkC54MGVV6cjs = require('../chunk-C54MGVV6.cjs');
 
 
 
@@ -13,4 +13,4 @@ var _chunkDAPDESIHcjs = require('../chunk-DAPDESIH.cjs');
 
 
 
-exports.contentLength = _chunkDAPDESIHcjs.contentLength; exports.measure = _chunkDAPDESIHcjs.measure; exports.setRequestSink = _chunkDAPDESIHcjs.setRequestSink; exports.setTimingSink = _chunkDAPDESIHcjs.setTimingSink; exports.setUpstreamErrorSink = _chunkDAPDESIHcjs.setUpstreamErrorSink; exports.startRequest = _chunkDAPDESIHcjs.startRequest;
+exports.contentLength = _chunkC54MGVV6cjs.contentLength; exports.measure = _chunkC54MGVV6cjs.measure; exports.setRequestSink = _chunkC54MGVV6cjs.setRequestSink; exports.setTimingSink = _chunkC54MGVV6cjs.setTimingSink; exports.setUpstreamErrorSink = _chunkC54MGVV6cjs.setUpstreamErrorSink; exports.startRequest = _chunkC54MGVV6cjs.startRequest;

package/timings/index.js

@@ -5,7 +5,7 @@ import {
   setTimingSink,
   setUpstreamErrorSink,
   startRequest
-} from "../chunk-PMYUYUJQ.js";
+} from "../chunk-IDEPG3TX.js";
 export {
   contentLength,
   measure,