@vtex/api 6.48.1-beta → 6.48.1-beta.2

package/lib/utils/appsStaleIfError.js

@@ -1,28 +1,46 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFallbackFile = exports.saveVersion = exports.updateMetaInfoCache = exports.getMetaInfoKey = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const ramda_1 = require("ramda");
 const semver = __importStar(require("semver"));
-exports.getMetaInfoKey = (account) => `${account}-meta-infos`;
+const getMetaInfoKey = (account, workspace) => `${account}-${workspace}-meta-infos`;
+exports.getMetaInfoKey = getMetaInfoKey;
 const hashMD5 = (text) => crypto_1.default
     .createHash('md5')
     .update(text)
     .digest('hex');
-exports.updateMetaInfoCache = async (cacheStorage, account, workspace, dependencies, logger) => {
+const updateMetaInfoCache = async (cacheStorage, account, workspace, dependencies, logger) => {
     if (workspace !== 'master') {
         return;
     }
-    const key = exports.getMetaInfoKey(account);
+    const key = (0, exports.getMetaInfoKey)(account, workspace);
     const hash = hashMD5(dependencies.toString());
     try {
         const storedDependencies = await cacheStorage.get(key) || '';
@@ -35,10 +53,11 @@ exports.updateMetaInfoCache = async (cacheStorage, account, workspace, dependenc
     }
     return;
 };
+exports.updateMetaInfoCache = updateMetaInfoCache;
 const getFallbackKey = (appName, major) => `${appName}@${major}`;
-exports.saveVersion = async (app, cacheStorage) => {
+const saveVersion = async (app, cacheStorage) => {
     const [appName, version] = app.split('@');
-    const major = ramda_1.head(version.split('.')) || '';
+    const major = (0, ramda_1.head)(version.split('.')) || '';
     const fallbackKey = getFallbackKey(appName, major);
     if (cacheStorage.has(fallbackKey)) {
         const savedVersion = await cacheStorage.get(fallbackKey);
@@ -50,9 +69,10 @@ exports.saveVersion = async (app, cacheStorage) => {
         await cacheStorage.set(fallbackKey, version);
     }
 };
-exports.getFallbackFile = async (app, path, cacheStorage, apps) => {
+exports.saveVersion = saveVersion;
+const getFallbackFile = async (app, path, cacheStorage, apps) => {
     const [appName, version] = app.split('@');
-    const major = ramda_1.head(version.split('.')) || '';
+    const major = (0, ramda_1.head)(version.split('.')) || '';
     const fallbackKey = getFallbackKey(appName, major);
     const fallbackVersion = await cacheStorage.get(fallbackKey);
     if (fallbackVersion) {
@@ -61,3 +81,4 @@ exports.getFallbackFile = async (app, path, cacheStorage, apps) => {
     }
     throw Error('Fallback version was not found');
 };
+exports.getFallbackFile = getFallbackFile;

package/lib/utils/billingOptions.d.ts

@@ -1,3 +1,36 @@
-import { BillingOptions, CalculationItem, FixedCalculationItem, FreeBillingOptions } from '../responses';
-export declare const isFreeBillingOptions: (billingOptions: BillingOptions) => billingOptions is FreeBillingOptions;
-export declare const isFixedCalculationItem: (item: CalculationItem) => item is FixedCalculationItem;
+export declare const isFreeBillingOptions: (billingOptions: BillingOptions) => boolean;
+export interface BillingOptions {
+    type: BILLING_TYPE;
+    support: Support;
+    availableCountries: string[];
+    plans?: Plan[];
+}
+export declare enum BILLING_TYPE {
+    FREE = "free",
+    BILLABLE = "billable",
+    SPONSORED = "sponsored"
+}
+export interface PriceMetric {
+    id: string;
+    ranges: Range[];
+    customUrl: string;
+}
+export interface Range {
+    exclusiveFrom: number;
+    inclusiveTo?: number;
+    multiplier: number;
+}
+export interface Plan {
+    id: string;
+    currency: string;
+    price: Price;
+}
+export interface Price {
+    subscription?: number;
+    metrics?: PriceMetric[];
+}
+export interface Support {
+    email: string;
+    url?: string;
+    phone?: string;
+}

package/lib/utils/billingOptions.js

@@ -1,5 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ramda_1 = require("ramda");
-exports.isFreeBillingOptions = (billingOptions) => billingOptions.free;
-exports.isFixedCalculationItem = (item) => !ramda_1.isNil(item.fixed);
+exports.BILLING_TYPE = exports.isFreeBillingOptions = void 0;
+const isFreeBillingOptions = (billingOptions) => billingOptions.type === BILLING_TYPE.FREE;
+exports.isFreeBillingOptions = isFreeBillingOptions;
+var BILLING_TYPE;
+(function (BILLING_TYPE) {
+    BILLING_TYPE["FREE"] = "free";
+    BILLING_TYPE["BILLABLE"] = "billable";
+    BILLING_TYPE["SPONSORED"] = "sponsored";
+})(BILLING_TYPE = exports.BILLING_TYPE || (exports.BILLING_TYPE = {}));

package/lib/utils/binding.d.ts

@@ -1,4 +1,4 @@
-export interface Binding {
+export interface BindingHeader {
     id?: string;
     rootPath?: string;
     locale: string;
@@ -8,6 +8,6 @@ declare enum BindingHeaderFormat {
     webframework0 = "v0+webframework",
     kuberouter0 = "v0+kuberouter"
 }
-export declare const formatBindingHeaderValue: (binding: Binding, format?: BindingHeaderFormat) => string;
-export declare const parseBindingHeaderValue: (value: string) => Binding;
+export declare const formatBindingHeaderValue: (binding: BindingHeader, format?: BindingHeaderFormat) => string;
+export declare const parseBindingHeaderValue: (value: string) => BindingHeader;
 export {};

package/lib/utils/binding.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBindingHeaderValue = exports.formatBindingHeaderValue = void 0;
 var BindingHeaderFormat;
 (function (BindingHeaderFormat) {
     BindingHeaderFormat["webframework0"] = "v0+webframework";
     BindingHeaderFormat["kuberouter0"] = "v0+kuberouter";
 })(BindingHeaderFormat || (BindingHeaderFormat = {}));
-exports.formatBindingHeaderValue = (binding, format = BindingHeaderFormat.webframework0) => {
+const formatBindingHeaderValue = (binding, format = BindingHeaderFormat.webframework0) => {
     if (format === BindingHeaderFormat.webframework0) {
         const jsonString = JSON.stringify(binding);
         return Buffer.from(jsonString, 'utf8').toString('base64');
@@ -21,7 +22,8 @@ exports.formatBindingHeaderValue = (binding, format = BindingHeaderFormat.webfra
     }
     throw new Error(`Unkown binding format: ${format}`);
 };
-exports.parseBindingHeaderValue = (value) => {
+exports.formatBindingHeaderValue = formatBindingHeaderValue;
+const parseBindingHeaderValue = (value) => {
     if (value[0] === '0' && value[1] === ',') {
         // v0+kuberouter
         const [, id, rootPath, locale, currency] = value.split(',');
@@ -36,3 +38,4 @@ exports.parseBindingHeaderValue = (value) => {
     const jsonString = Buffer.from(value, 'base64').toString('utf8');
     return JSON.parse(jsonString);
 };
+exports.parseBindingHeaderValue = parseBindingHeaderValue;

package/lib/utils/cancel.d.ts

@@ -1,3 +1,3 @@
-import { RouteHandler } from '../service/typings';
+import { ParamsContext, RecorderState, RouteHandler } from '../service/worker/runtime/typings';
 import { IOClients } from './../clients/IOClients';
-export declare function cancel<T extends IOClients, U, V>(middleware: RouteHandler<T, U, V>): RouteHandler<T, U, V>;
+export declare function cancel<T extends IOClients, U extends RecorderState, V extends ParamsContext>(middleware: RouteHandler<T, U, V>): RouteHandler<T, U, V>;

package/lib/utils/cancel.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancel = void 0;
 function cancel(middleware) {
     return async (ctx, next) => {
-        if (ctx.vtex.cancellation && ctx.vtex.cancellation.cancelled) {
+        var _a, _b;
+        if ((_b = (_a = ctx.vtex) === null || _a === void 0 ? void 0 : _a.cancellation) === null || _b === void 0 ? void 0 : _b.cancelled) {
             return;
         }
         await middleware(ctx, next);

package/lib/utils/conflicts.mock.d.ts

@@ -0,0 +1,17 @@
+export declare function getMockConflicts(path: string, base: object, mine: object, master: object): {
+    data: {
+        base: {
+            content: string;
+            mimeType: string;
+        };
+        master: {
+            content: string;
+            mimeType: string;
+        };
+        mine: {
+            content: string;
+            mimeType: string;
+        };
+        path: string;
+    }[];
+};

package/lib/utils/conflicts.mock.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMockConflicts = void 0;
+function jsonToBase64(json) {
+    return Buffer.from(JSON.stringify(json)).toString('base64');
+}
+function getMockConflicts(path, base, mine, master) {
+    return {
+        data: [
+            {
+                base: {
+                    content: jsonToBase64(base),
+                    mimeType: 'application/json',
+                },
+                master: {
+                    content: jsonToBase64(master),
+                    mimeType: 'application/json',
+                },
+                mine: {
+                    content: jsonToBase64(mine),
+                    mimeType: 'application/json',
+                },
+                path,
+            },
+        ],
+    };
+}
+exports.getMockConflicts = getMockConflicts;

package/lib/utils/domain.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PUBLIC_DOMAINS = void 0;
 const ramda_1 = require("ramda");
 const VTEX_PUBLIC_ENDPOINT = process.env.VTEX_PUBLIC_ENDPOINT || 'myvtex.com';
-exports.PUBLIC_DOMAINS = ramda_1.uniq([VTEX_PUBLIC_ENDPOINT, 'myvtex.com', 'mygocommerce.com', 'vtexsmb.com']);
+exports.PUBLIC_DOMAINS = (0, ramda_1.uniq)([VTEX_PUBLIC_ENDPOINT, 'myvtex.com', 'mygocommerce.com', 'vtexsmb.com']);

package/lib/utils/error.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanError = exports.SENSITIVE_EXCEPTION_FIELDS = exports.PICKED_AXIOS_PROPS = void 0;
 // Inspired by https://github.com/sindresorhus/serialize-error
 const ramda_1 = require("ramda");
 exports.PICKED_AXIOS_PROPS = ['baseURL', 'cacheable', 'data', 'finished', 'headers', 'method', 'timeout', 'status', 'path', 'url', 'metric', 'inflightKey', 'forceMaxAge', 'params', 'responseType'];
 exports.SENSITIVE_EXCEPTION_FIELDS = ['config', 'request', 'stack'];
 const MAX_ERROR_STRING_LENGTH = process.env.MAX_ERROR_STRING_LENGTH ? parseInt(process.env.MAX_ERROR_STRING_LENGTH, 10) : 8 * 1024;
-const findCaseInsensitive = (target, set) => ramda_1.find(t => t.toLocaleLowerCase() === target, set);
+const findCaseInsensitive = (target, set) => (0, ramda_1.find)(t => t.toLocaleLowerCase() === target, set);
 const destroyCircular = (from, seen) => {
     const to = Array.isArray(from) ? [] : {};
     seen.push(from);
@@ -52,10 +53,10 @@ const destroyCircular = (from, seen) => {
     ];
     for (const property of axiosProperties) {
         if (to[property] != null && typeof to[property] === 'object') {
-            to[property] = ramda_1.pick(exports.PICKED_AXIOS_PROPS, to[property]);
+            to[property] = (0, ramda_1.pick)(exports.PICKED_AXIOS_PROPS, to[property]);
             const headers = to[property] && to[property].headers;
             if (headers) {
-                const headerNames = ramda_1.keys(headers);
+                const headerNames = (0, ramda_1.keys)(headers);
                 const authorization = findCaseInsensitive('authorization', headerNames);
                 if (!!authorization) {
                     delete headers[authorization];
@@ -81,7 +82,7 @@ const destroyCircular = (from, seen) => {
  *
  * @param value an Error instance
  */
-exports.cleanError = (value) => {
+const cleanError = (value) => {
     if (typeof value === 'object') {
         return destroyCircular(value, []);
     }
@@ -92,3 +93,4 @@ exports.cleanError = (value) => {
     }
     return value;
 };
+exports.cleanError = cleanError;

package/lib/utils/index.js

@@ -1,14 +1,25 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./app"));
-__export(require("./error"));
-__export(require("./retry"));
-__export(require("./time"));
-__export(require("./billingOptions"));
-__export(require("./domain"));
-__export(require("./tenant"));
-__export(require("./binding"));
-__export(require("./MineWinsConflictsResolver"));
+__exportStar(require("./app"), exports);
+__exportStar(require("./error"), exports);
+__exportStar(require("./retry"), exports);
+__exportStar(require("./time"), exports);
+__exportStar(require("./billingOptions"), exports);
+__exportStar(require("./domain"), exports);
+__exportStar(require("./tenant"), exports);
+__exportStar(require("./binding"), exports);
+__exportStar(require("./MineWinsConflictsResolver"), exports);

package/lib/utils/json.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanJson = void 0;
 function cleanJson(json, targetFields) {
     for (const key of Object.keys(json)) {
         let deleted = false;

package/lib/utils/log.d.ts

@@ -1,5 +1,3 @@
-export declare const cleanLog: (log: {
-    [k: string]: any;
-}) => {
+export declare const cleanLog: (log: any) => {
     [k: string]: any;
 };

package/lib/utils/log.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanLog = void 0;
 const json_1 = require("./json");
 const SENSITIVE_FIELDS = [
     'auth',
     'authorization',
     'authtoken',
     'cookie',
-    'proxy-athorization',
+    'proxy-authorization',
     'rawheaders',
     'token',
-    'vtexIdclientautcookie',
+    'vtexidclientautcookie',
     'x-vtex-api-appkey',
     'x-vtex-api-apptoken',
     'x-vtex-credential',
     'x-vtex-session',
 ];
-exports.cleanLog = (log) => {
-    return json_1.cleanJson(log, SENSITIVE_FIELDS);
+const cleanLog = (log) => {
+    return (0, json_1.cleanJson)(log, SENSITIVE_FIELDS);
 };
+exports.cleanLog = cleanLog;

package/lib/utils/message.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeProviderFromId = exports.parseIOMessageId = exports.providerFromMessage = exports.PROVIDER_SPACER = void 0;
 exports.PROVIDER_SPACER = '::';
-exports.providerFromMessage = (message) => {
-    const { provider } = exports.parseIOMessageId(message);
+const providerFromMessage = (message) => {
+    const { provider } = (0, exports.parseIOMessageId)(message);
     return provider || 'unknown';
 };
-exports.parseIOMessageId = ({ id }) => {
+exports.providerFromMessage = providerFromMessage;
+const parseIOMessageId = ({ id }) => {
     const splitted = id.split(exports.PROVIDER_SPACER);
     if (splitted.length === 2) {
         return {
@@ -17,4 +19,9 @@ exports.parseIOMessageId = ({ id }) => {
         locator: splitted[0],
     };
 };
-exports.removeProviderFromId = (message) => (Object.assign({}, message, { id: exports.parseIOMessageId(message).locator }));
+exports.parseIOMessageId = parseIOMessageId;
+const removeProviderFromId = (message) => ({
+    ...message,
+    id: (0, exports.parseIOMessageId)(message).locator,
+});
+exports.removeProviderFromId = removeProviderFromId;

package/lib/utils/renameBy.js

@@ -1,4 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.renameBy = void 0;
 const ramda_1 = require("ramda");
-exports.renameBy = (fn, obj) => ramda_1.compose(ramda_1.fromPairs, ramda_1.map(([key, val]) => [fn(key), val]), ramda_1.toPairs)(obj);
+const renameBy = (fn, obj) => (0, ramda_1.compose)(ramda_1.fromPairs, (0, ramda_1.map)(([key, val]) => [fn(key), val]), ramda_1.toPairs)(obj);
+exports.renameBy = renameBy;

package/lib/utils/retry.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.exponentialDelay = exports.isNetworkOrIdempotentRequestError = exports.isAbortedOrNetworkErrorOrRouterTimeout = exports.isNetworkErrorOrRouterTimeout = exports.TIMEOUT_CODE = void 0;
 const axios_retry_1 = require("axios-retry");
 exports.TIMEOUT_CODE = 'ProxyTimeout';
 const printLabel = (e, message) => {
@@ -8,25 +9,27 @@ const printLabel = (e, message) => {
     }
     console.warn(e.config.label, message);
 };
-exports.isNetworkErrorOrRouterTimeout = (e) => {
-    if (axios_retry_1.isNetworkOrIdempotentRequestError(e)) {
+const isNetworkErrorOrRouterTimeout = (e) => {
+    if ((0, axios_retry_1.isNetworkOrIdempotentRequestError)(e)) {
         printLabel(e, 'Retry from network error');
         return true;
     }
-    if (e && axios_retry_1.isSafeRequestError(e) && e.response && e.response.data && e.response.data.code === exports.TIMEOUT_CODE) {
+    if (e && (0, axios_retry_1.isSafeRequestError)(e) && e.response && e.response.data && e.response.data.code === exports.TIMEOUT_CODE) {
         printLabel(e, 'Retry from timeout');
         return true;
     }
     return false;
 };
+exports.isNetworkErrorOrRouterTimeout = isNetworkErrorOrRouterTimeout;
 // Retry on timeout from our end
-exports.isAbortedOrNetworkErrorOrRouterTimeout = (e) => {
+const isAbortedOrNetworkErrorOrRouterTimeout = (e) => {
     if (e && e.code === 'ECONNABORTED') {
         printLabel(e, 'Retry from abort');
         return true;
     }
-    return exports.isNetworkErrorOrRouterTimeout(e);
+    return (0, exports.isNetworkErrorOrRouterTimeout)(e);
 };
+exports.isAbortedOrNetworkErrorOrRouterTimeout = isAbortedOrNetworkErrorOrRouterTimeout;
 var axios_retry_2 = require("axios-retry");
-exports.isNetworkOrIdempotentRequestError = axios_retry_2.isNetworkOrIdempotentRequestError;
-exports.exponentialDelay = axios_retry_2.exponentialDelay;
+Object.defineProperty(exports, "isNetworkOrIdempotentRequestError", { enumerable: true, get: function () { return axios_retry_2.isNetworkOrIdempotentRequestError; } });
+Object.defineProperty(exports, "exponentialDelay", { enumerable: true, get: function () { return axios_retry_2.exponentialDelay; } });

package/lib/utils/status.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.statusLabel = (status) => {
+exports.statusLabel = void 0;
+const statusLabel = (status) => {
     if (status >= 500) {
         return 'error';
     }
@@ -9,3 +10,4 @@ exports.statusLabel = (status) => {
     }
     return `${Math.floor(status / 100)}xx`;
 };
+exports.statusLabel = statusLabel;

package/lib/utils/tenant.d.ts

@@ -1,5 +1,5 @@
-export interface Tenant {
+export interface TenantHeader {
     locale: string;
 }
-export declare const formatTenantHeaderValue: (tenant: Tenant) => string;
-export declare const parseTenantHeaderValue: (value: string) => Tenant;
+export declare const formatTenantHeaderValue: (tenant: TenantHeader) => string;
+export declare const parseTenantHeaderValue: (value: string) => TenantHeader;

package/lib/utils/tenant.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatTenantHeaderValue = (tenant) => tenant.locale;
-exports.parseTenantHeaderValue = (value) => ({
+exports.parseTenantHeaderValue = exports.formatTenantHeaderValue = void 0;
+const formatTenantHeaderValue = (tenant) => tenant.locale;
+exports.formatTenantHeaderValue = formatTenantHeaderValue;
+const parseTenantHeaderValue = (value) => ({
     locale: value,
 });
+exports.parseTenantHeaderValue = parseTenantHeaderValue;

package/lib/utils/throwOnGraphQLErrors.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.throwOnGraphQLErrors = void 0;
 const customGraphQLError_1 = __importDefault(require("../errors/customGraphQLError"));
 function throwOnGraphQLErrors(message) {
     return function maybeGraphQLResponse(response) {

package/lib/utils/time.d.ts

@@ -1,23 +1,22 @@
 import { IOClients } from '../clients/IOClients';
 import { MetricsAccumulator } from '../metrics/MetricsAccumulator';
-import { EventHandler, RouteHandler } from '../service/typings';
+import { EventHandler, ParamsContext, RecorderState, RouteHandler } from '../service/worker/runtime/typings';
 export declare const hrToMillis: ([seconds, nanoseconds]: [number, number]) => number;
+export declare const hrToMillisFloat: ([seconds, nanoseconds]: [number, number]) => number;
+export declare const nanosecondsToSeconds: (nanoseconds: number) => number;
 export declare const hrToNano: ([seconds, nanoseconds]: [number, number]) => number;
 export declare const formatNano: (nanoseconds: number) => string;
 export declare const reduceHrToNano: (values: import("ramda").List<[number, number]>) => number;
 export declare const shrinkTimings: (name: string) => string;
-export declare const formatTimingName: ({ hopNumber, target, source }: {
-    hopNumber: number | null;
-    source: string | null;
-    target: string | null;
-}) => string;
+type TimingFormat = ReturnType<typeof parseTimingName>;
+export declare const formatTimingName: ({ hopNumber, target, source }: TimingFormat) => string;
 export declare const parseTimingName: (timing: string | undefined) => {
     hopNumber: number | null;
     source: string | null;
     target: string | null;
 };
 export declare const reduceTimings: (timingsObj: Record<string, string>) => string;
-export declare function timer<T extends IOClients, U, V>(middleware: RouteHandler<T, U, V>): RouteHandler<T, U, V>;
+export declare function timer<T extends IOClients, U extends RecorderState, V extends ParamsContext>(middleware: RouteHandler<T, U, V>): RouteHandler<T, U, V>;
 export declare function timerForEvents<T extends IOClients, U>(middleware: EventHandler<T, U>): EventHandler<T, U>;
 declare global {
     const metrics: MetricsAccumulator;
@@ -27,3 +26,4 @@ declare global {
         }
     }
 }
+export {};

package/lib/utils/time.js

@@ -1,13 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.timerForEvents = exports.timer = exports.reduceTimings = exports.parseTimingName = exports.formatTimingName = exports.shrinkTimings = exports.reduceHrToNano = exports.formatNano = exports.hrToNano = exports.nanosecondsToSeconds = exports.hrToMillisFloat = exports.hrToMillis = void 0;
 const ramda_1 = require("ramda");
-exports.hrToMillis = ([seconds, nanoseconds]) => Math.round((seconds * 1e3) + (nanoseconds / 1e6));
-exports.hrToNano = ([seconds, nanoseconds]) => seconds * 1e9 + nanoseconds;
-exports.formatNano = (nanoseconds) => `${(nanoseconds / 1e9).toFixed(0)}s ${((nanoseconds / 1e6) % 1e3).toFixed(0)}ms`;
-exports.reduceHrToNano = ramda_1.reduce((acc, hr) => acc + exports.hrToNano(hr), 0);
-exports.shrinkTimings = (name) => name.replace(/graphql/g, 'gql').replace(/server/g, 'srv');
-exports.formatTimingName = ({ hopNumber, target, source }) => `${Number.isNaN(hopNumber) ? '' : hopNumber}.${source || ''}#${target || ''}`;
-exports.parseTimingName = (timing) => {
+const logger_1 = require("../service/logger");
+const hrToMillis = ([seconds, nanoseconds]) => Math.round((seconds * 1e3) + (nanoseconds / 1e6));
+exports.hrToMillis = hrToMillis;
+const hrToMillisFloat = ([seconds, nanoseconds]) => {
+    return (seconds * 1e3) + (nanoseconds / 1e6);
+};
+exports.hrToMillisFloat = hrToMillisFloat;
+const nanosecondsToSeconds = (nanoseconds) => {
+    return nanoseconds / 1e9;
+};
+exports.nanosecondsToSeconds = nanosecondsToSeconds;
+const hrToNano = ([seconds, nanoseconds]) => seconds * 1e9 + nanoseconds;
+exports.hrToNano = hrToNano;
+const formatNano = (nanoseconds) => `${(nanoseconds / 1e9).toFixed(0)}s ${((nanoseconds / 1e6) % 1e3).toFixed(0)}ms`;
+exports.formatNano = formatNano;
+exports.reduceHrToNano = (0, ramda_1.reduce)((acc, hr) => acc + (0, exports.hrToNano)(hr), 0);
+const shrinkTimings = (name) => name.replace(/graphql/g, 'gql').replace(/server/g, 'srv');
+exports.shrinkTimings = shrinkTimings;
+const formatTimingName = ({ hopNumber, target, source }) => `${Number.isNaN(hopNumber) ? '' : hopNumber}.${source || ''}#${target || ''}`;
+exports.formatTimingName = formatTimingName;
+const parseTimingName = (timing) => {
     const [hopNumber, sourceAndTarget] = timing ? timing.split('.') : [null, null];
     const [source, target] = sourceAndTarget ? sourceAndTarget.split('#') : [null, null];
     return {
@@ -16,7 +31,9 @@ exports.parseTimingName = (timing) => {
         target,
     };
 };
-exports.reduceTimings = (timingsObj) => ramda_1.compose(ramda_1.reduce((acc, [key, dur]) => `${key};dur=${dur}, ${acc}`, ''), ramda_1.toPairs)(timingsObj);
+exports.parseTimingName = parseTimingName;
+const reduceTimings = (timingsObj) => (0, ramda_1.compose)((0, ramda_1.reduce)((acc, [key, dur]) => `${key};dur=${dur}, ${acc}`, ''), ramda_1.toPairs)(timingsObj);
+exports.reduceTimings = reduceTimings;
 function recordTimings(start, name, timings, middlewareMetrics, success) {
     // Capture the total amount of time spent in this middleware, which includes following middlewares
     const end = process.hrtime(start);
@@ -36,9 +53,9 @@ function recordTimings(start, name, timings, middlewareMetrics, success) {
     metrics.batch(label, success ? elapsed : undefined, { success: success ? 1 : 0 });
     // This middleware has added it's own metrics
     // Just add them to `timings` scoped by the middleware's name and batch them
-    const middlewareMetricsKeys = ramda_1.keys(middlewareMetrics);
+    const middlewareMetricsKeys = (0, ramda_1.keys)(middlewareMetrics);
     if (success && middlewareMetricsKeys.length > 0) {
-        ramda_1.forEach((k) => {
+        (0, ramda_1.forEach)((k) => {
             const metricEnd = middlewareMetrics[k];
             // Delete own metrics so next middleware can have empty state but still accumulate metrics batched after `await`
             delete middlewareMetrics[k];
@@ -53,7 +70,7 @@ function timer(middleware) {
         return middleware;
     }
     if (!middleware.name) {
-        console.warn('Please use a named function as handler for better metrics.', middleware.toString());
+        (0, logger_1.logOnceToDevConsole)(`Please use a named function as handler for better metrics. ${middleware.toString()}`, logger_1.LogLevel.Warn);
     }
     return async (ctx, next) => {
         if (!ctx.serverTiming) {
@@ -85,7 +102,7 @@ function timerForEvents(middleware) {
         return middleware;
     }
     if (!middleware.name) {
-        console.warn('Please use a named function as handler for better metrics.', middleware.toString());
+        (0, logger_1.logOnceToDevConsole)(`Please use a named function as handler for better metrics. ${middleware.toString()}`, logger_1.LogLevel.Warn);
     }
     return async (ctx, next) => {
         if (!ctx.timings) {