@promster/marblejs 7.0.0 → 8.0.0

package/dist/declarations/src/index.d.ts

@@ -1,3 +1,5 @@
-import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
+import { type TPromsterOptions, createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from "./middleware/index.js";
 import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing } from '@promster/metrics';
+export * from '@promster/types';
+export { type TPromsterOptions };
 export { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing, };

package/dist/declarations/src/middleware/index.d.ts

@@ -1,2 +1,2 @@
-import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
-export { createMiddleware, signalIsUp, signalIsNotUp, getRequestRecorder };
+import { type TPromsterOptions, createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from "./middleware.js";
+export { type TPromsterOptions, createMiddleware, signalIsUp, signalIsNotUp, getRequestRecorder, };

package/dist/declarations/src/middleware/middleware.d.ts

@@ -1,13 +1,16 @@
-import type { TPromsterOptions } from '@promster/types';
-import type { TRequestRecorder } from '@promster/metrics';
-import type { HttpRequest } from '@marblejs/core';
+import { type TOptionalPromsterOptions, type TLabelValues } from '@promster/types';
+import { type TRequestRecorder } from '@promster/metrics';
+import { type HttpRequest, type HttpResponse } from '@marblejs/http';
 import { type Observable } from 'rxjs';
 declare const extractPath: (req: HttpRequest) => string;
 declare const getRequestRecorder: () => TRequestRecorder;
 declare const signalIsUp: () => void;
 declare const signalIsNotUp: () => void;
-type TMiddlewareOptions = {
-    options?: TPromsterOptions;
+type TSkipFunction = <TRequest extends HttpRequest, TResponse extends HttpResponse>(_req: TRequest, _res: TResponse, _labels: TLabelValues) => boolean;
+export type TPromsterOptions = {
+    options?: TOptionalPromsterOptions & {
+        skip?: TSkipFunction;
+    };
 };
-declare const createMiddleware: ({ options }?: TMiddlewareOptions) => (req$: Observable<HttpRequest>, res: HttpResponse) => Observable<HttpRequest>;
+declare const createMiddleware: ({ options }?: TPromsterOptions) => (req$: Observable<HttpRequest>, res: HttpResponse) => Observable<HttpRequest<unknown, unknown, unknown>>;
 export { createMiddleware, extractPath, getRequestRecorder, signalIsUp, signalIsNotUp, };

package/dist/promster-marblejs.cjs.d.ts

@@ -1 +1,2 @@
 export * from "./declarations/src/index";
+//# sourceMappingURL=promster-marblejs.cjs.d.ts.map

package/dist/promster-marblejs.cjs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"promster-marblejs.cjs.d.ts","sourceRoot":"","sources":["./declarations/src/index.d.ts"],"names":[],"mappings":"AAAA"}

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

@@ -6,6 +6,7 @@ var merge = require('merge-options');
 var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
 var metrics = require('@promster/metrics');
+var types = require('@promster/types');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -45,6 +46,7 @@ const recordHandler = (res, shouldSkipMetricsByEnvironment, opts) => stamp => rx
       res,
       req
     }),
+    // eslint-disable-next-line camelcase
     status_code: opts.normalizeStatusCode(res.statusCode, {
       res,
       req
@@ -68,7 +70,9 @@ const recordHandler = (res, shouldSkipMetricsByEnvironment, opts) => stamp => rx
 const createMiddleware = ({
   options
 } = {}) => {
-  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
+  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions,
+  // @ts-expect-error
+  metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
   const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
   const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
   const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
@@ -117,3 +121,9 @@ exports.createMiddleware = createMiddleware;
 exports.getRequestRecorder = getRequestRecorder;
 exports.signalIsNotUp = signalIsNotUp;
 exports.signalIsUp = signalIsUp;
+Object.keys(types).forEach(function (k) {
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return types[k]; }
+  });
+});

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

@@ -6,6 +6,7 @@ var merge = require('merge-options');
 var rxjs = require('rxjs');
 var operators = require('rxjs/operators');
 var metrics = require('@promster/metrics');
+var types = require('@promster/types');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -45,6 +46,7 @@ const recordHandler = (res, shouldSkipMetricsByEnvironment, opts) => stamp => rx
       res,
       req
     }),
+    // eslint-disable-next-line camelcase
     status_code: opts.normalizeStatusCode(res.statusCode, {
       res,
       req
@@ -68,7 +70,9 @@ const recordHandler = (res, shouldSkipMetricsByEnvironment, opts) => stamp => rx
 const createMiddleware = ({
   options
 } = {}) => {
-  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
+  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions,
+  // @ts-expect-error
+  metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
   const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
   const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
   const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
@@ -117,3 +121,9 @@ exports.createMiddleware = createMiddleware;
 exports.getRequestRecorder = getRequestRecorder;
 exports.signalIsNotUp = signalIsNotUp;
 exports.signalIsUp = signalIsUp;
+Object.keys(types).forEach(function (k) {
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return types[k]; }
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promster/marblejs",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "MarbleJs server integrations of promster",
   "main": "dist/promster-marblejs.cjs.js",
   "typings": "dist/promster-marblejs.cjs.d.ts",
@@ -36,16 +36,17 @@
     "prometheus"
   ],
   "dependencies": {
-    "@promster/metrics": "^10.0.0",
+    "@promster/metrics": "^11.0.0",
+    "@promster/types": "^5.0.0",
     "merge-options": "3.0.4",
     "rxjs": "^6.6.7",
-    "tslib": "2.4.1"
+    "tslib": "2.6.2"
   },
   "devDependencies": {
     "@marblejs/core": "4.1.0",
     "@marblejs/http": "4.1.0",
-    "fp-ts": "2.16.0",
+    "fp-ts": "2.16.1",
     "parse-prometheus-text-format": "1.1.1",
-    "@promster/server": "8.0.0"
+    "@promster/server": "9.0.0"
   }
 }