@perses-dev/prometheus-plugin 0.23.1 → 0.24.0

package/dist/cjs/model/prometheus-client.js

@@ -53,12 +53,13 @@ function fetchWithGet(apiURI, params, queryOptions) {
     });
 }
 function fetchWithPost(apiURI, params, queryOptions) {
-    const { datasourceUrl  } = queryOptions;
+    const { datasourceUrl , headers  } = queryOptions;
     const url = `${datasourceUrl}${apiURI}`;
     const init = {
         method: 'POST',
         headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...headers
         },
         body: createSearchParams(params)
     };

package/dist/cjs/plugins/prometheus-datasource.js

@@ -22,7 +22,7 @@ const _model = require("../model");
 /**
  * Creates a PrometheusClient for a specific datasource spec.
  */ const createClient = (spec, options)=>{
-    const { direct_url  } = spec;
+    const { direct_url , headers  } = spec;
     const { proxyUrl  } = options;
     // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified
     const datasourceUrl = direct_url !== null && direct_url !== void 0 ? direct_url : proxyUrl;
@@ -35,16 +35,20 @@ const _model = require("../model");
             datasourceUrl
         },
         instantQuery: (params)=>(0, _model.instantQuery)(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             }),
         rangeQuery: (params)=>(0, _model.rangeQuery)(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             }),
         labelNames: (params)=>(0, _model.labelNames)(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             }),
         labelValues: (params)=>(0, _model.labelValues)(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             })
     };
 };

package/dist/cjs/plugins/prometheus-time-series-query/get-time-series-data.js

@@ -63,8 +63,6 @@ const getTimeSeriesData = async (spec, context)=>{
             end: (0, _dateFns.fromUnixTime)(end)
         },
         stepMs: step * 1000,
-        // TODO: Maybe do a proper Iterable implementation that defers some of this
-        // processing until its needed
         series: result.map((value)=>{
             const { metric , values  } = value;
             // Name the series after the metric labels or if no metric, use the query

package/dist/model/prometheus-client.d.ts

@@ -1,6 +1,8 @@
+import { RequestHeaders } from '@perses-dev/core';
 import { InstantQueryRequestParameters, InstantQueryResponse, LabelNamesRequestParameters, LabelNamesResponse, LabelValuesRequestParameters, LabelValuesResponse, RangeQueryRequestParameters, RangeQueryResponse } from './api-types';
 interface PrometheusClientOptions {
     datasourceUrl: string;
+    headers?: RequestHeaders;
 }
 export interface PrometheusClient {
     options: PrometheusClientOptions;
@@ -11,6 +13,7 @@ export interface PrometheusClient {
 }
 export interface QueryOptions {
     datasourceUrl: string;
+    headers?: RequestHeaders;
 }
 /**
  * Calls the `/api/v1/query` endpoint to get metrics data.

package/dist/model/prometheus-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prometheus-client.d.ts","sourceRoot":"","sources":["../../src/model/prometheus-client.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAErB,UAAU,uBAAuB;IAC/B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,uBAAuB,CAAC;IACjC,YAAY,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnF,UAAU,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7E,UAAU,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7E,WAAW,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjF;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,6BAA6B,EAAE,YAAY,EAAE,YAAY,iCAE7F;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY,+BAEzF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY,+BAEzF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,4BAA4B,EAAE,YAAY,EAAE,YAAY,gCAI3F"}
+{"version":3,"file":"prometheus-client.d.ts","sourceRoot":"","sources":["../../src/model/prometheus-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAa,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,2BAA2B,EAC3B,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,2BAA2B,EAC3B,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAErB,UAAU,uBAAuB;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,uBAAuB,CAAC;IACjC,YAAY,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnF,UAAU,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7E,UAAU,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC7E,WAAW,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;CACjF;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,6BAA6B,EAAE,YAAY,EAAE,YAAY,iCAE7F;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY,+BAEzF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,2BAA2B,EAAE,YAAY,EAAE,YAAY,+BAEzF;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,4BAA4B,EAAE,YAAY,EAAE,YAAY,gCAI3F"}

package/dist/model/prometheus-client.js

@@ -45,12 +45,13 @@ function fetchWithGet(apiURI, params, queryOptions) {
     });
 }
 function fetchWithPost(apiURI, params, queryOptions) {
-    const { datasourceUrl  } = queryOptions;
+    const { datasourceUrl , headers  } = queryOptions;
     const url = `${datasourceUrl}${apiURI}`;
     const init = {
         method: 'POST',
         headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...headers
         },
         body: createSearchParams(params)
     };

package/dist/model/prometheus-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/prometheus-client.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { fetchJson } from '@perses-dev/core';\nimport {\n  InstantQueryRequestParameters,\n  InstantQueryResponse,\n  LabelNamesRequestParameters,\n  LabelNamesResponse,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  RangeQueryRequestParameters,\n  RangeQueryResponse,\n} from './api-types';\n\ninterface PrometheusClientOptions {\n  datasourceUrl: string;\n}\n\nexport interface PrometheusClient {\n  options: PrometheusClientOptions;\n  instantQuery(params: InstantQueryRequestParameters): Promise<InstantQueryResponse>;\n  rangeQuery(params: RangeQueryRequestParameters): Promise<RangeQueryResponse>;\n  labelNames(params: LabelNamesRequestParameters): Promise<LabelNamesResponse>;\n  labelValues(params: LabelValuesRequestParameters): Promise<LabelValuesResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n}\n\n/**\n * Calls the `/api/v1/query` endpoint to get metrics data.\n */\nexport function instantQuery(params: InstantQueryRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithPost<InstantQueryRequestParameters, InstantQueryResponse>('/api/v1/query', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/query_range` endpoint to get metrics data.\n */\nexport function rangeQuery(params: RangeQueryRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithPost<RangeQueryRequestParameters, RangeQueryResponse>('/api/v1/query_range', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/labels` endpoint to get a list of label names.\n */\nexport function labelNames(params: LabelNamesRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithPost<LabelNamesRequestParameters, LabelNamesResponse>('/api/v1/labels', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.\n */\nexport function labelValues(params: LabelValuesRequestParameters, queryOptions: QueryOptions) {\n  const { labelName, ...searchParams } = params;\n  const apiURI = `/api/v1/label/${encodeURIComponent(labelName)}/values`;\n  return fetchWithGet<typeof searchParams, LabelValuesResponse>(apiURI, searchParams, queryOptions);\n}\n\nfunction fetchWithGet<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl } = queryOptions;\n\n  let url = `${datasourceUrl}${apiURI}`;\n  const urlParams = createSearchParams(params).toString();\n  if (urlParams !== '') {\n    url += `?${urlParams}`;\n  }\n  return fetchJson<TResponse>(url, { method: 'GET' });\n}\n\nfunction fetchWithPost<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl } = queryOptions;\n\n  const url = `${datasourceUrl}${apiURI}`;\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n    },\n    body: createSearchParams(params),\n  };\n  return fetchJson<TResponse>(url, init);\n}\n\n// Request parameter values we know how to serialize\ntype ParamValue = string | string[] | number | undefined;\n\n// Used to constrain the types that can be passed to createSearchParams to\n// just the ones we know how to serialize\ntype RequestParams<T> = {\n  [K in keyof T]: ParamValue;\n};\n\n/**\n * Creates URLSearchParams from a request params object.\n */\nfunction createSearchParams<T extends RequestParams<T>>(params: T) {\n  const searchParams = new URLSearchParams();\n  for (const key in params) {\n    const value: ParamValue = params[key];\n    if (value === undefined) continue;\n\n    if (typeof value === 'string') {\n      searchParams.append(key, value);\n      continue;\n    }\n\n    if (typeof value === 'number') {\n      searchParams.append(key, value.toString());\n      continue;\n    }\n\n    for (const val of value) {\n      searchParams.append(key, val);\n    }\n  }\n  return searchParams;\n}\n"],"names":["fetchJson","instantQuery","params","queryOptions","fetchWithPost","rangeQuery","labelNames","labelValues","labelName","searchParams","apiURI","encodeURIComponent","fetchWithGet","datasourceUrl","url","urlParams","createSearchParams","toString","method","init","headers","body","URLSearchParams","key","value","undefined","append","val"],"mappings":"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"}
+{"version":3,"sources":["../../src/model/prometheus-client.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { fetchJson, RequestHeaders } from '@perses-dev/core';\nimport {\n  InstantQueryRequestParameters,\n  InstantQueryResponse,\n  LabelNamesRequestParameters,\n  LabelNamesResponse,\n  LabelValuesRequestParameters,\n  LabelValuesResponse,\n  RangeQueryRequestParameters,\n  RangeQueryResponse,\n} from './api-types';\n\ninterface PrometheusClientOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface PrometheusClient {\n  options: PrometheusClientOptions;\n  instantQuery(params: InstantQueryRequestParameters): Promise<InstantQueryResponse>;\n  rangeQuery(params: RangeQueryRequestParameters): Promise<RangeQueryResponse>;\n  labelNames(params: LabelNamesRequestParameters): Promise<LabelNamesResponse>;\n  labelValues(params: LabelValuesRequestParameters): Promise<LabelValuesResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\n/**\n * Calls the `/api/v1/query` endpoint to get metrics data.\n */\nexport function instantQuery(params: InstantQueryRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithPost<InstantQueryRequestParameters, InstantQueryResponse>('/api/v1/query', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/query_range` endpoint to get metrics data.\n */\nexport function rangeQuery(params: RangeQueryRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithPost<RangeQueryRequestParameters, RangeQueryResponse>('/api/v1/query_range', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/labels` endpoint to get a list of label names.\n */\nexport function labelNames(params: LabelNamesRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithPost<LabelNamesRequestParameters, LabelNamesResponse>('/api/v1/labels', params, queryOptions);\n}\n\n/**\n * Calls the `/api/v1/label/{labelName}/values` endpoint to get a list of values for a label.\n */\nexport function labelValues(params: LabelValuesRequestParameters, queryOptions: QueryOptions) {\n  const { labelName, ...searchParams } = params;\n  const apiURI = `/api/v1/label/${encodeURIComponent(labelName)}/values`;\n  return fetchWithGet<typeof searchParams, LabelValuesResponse>(apiURI, searchParams, queryOptions);\n}\n\nfunction fetchWithGet<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl } = queryOptions;\n\n  let url = `${datasourceUrl}${apiURI}`;\n  const urlParams = createSearchParams(params).toString();\n  if (urlParams !== '') {\n    url += `?${urlParams}`;\n  }\n  return fetchJson<TResponse>(url, { method: 'GET' });\n}\n\nfunction fetchWithPost<T extends RequestParams<T>, TResponse>(apiURI: string, params: T, queryOptions: QueryOptions) {\n  const { datasourceUrl, headers } = queryOptions;\n\n  const url = `${datasourceUrl}${apiURI}`;\n  const init = {\n    method: 'POST',\n    headers: {\n      'Content-Type': 'application/x-www-form-urlencoded',\n      ...headers,\n    },\n    body: createSearchParams(params),\n  };\n  return fetchJson<TResponse>(url, init);\n}\n\n// Request parameter values we know how to serialize\ntype ParamValue = string | string[] | number | undefined;\n\n// Used to constrain the types that can be passed to createSearchParams to\n// just the ones we know how to serialize\ntype RequestParams<T> = {\n  [K in keyof T]: ParamValue;\n};\n\n/**\n * Creates URLSearchParams from a request params object.\n */\nfunction createSearchParams<T extends RequestParams<T>>(params: T) {\n  const searchParams = new URLSearchParams();\n  for (const key in params) {\n    const value: ParamValue = params[key];\n    if (value === undefined) continue;\n\n    if (typeof value === 'string') {\n      searchParams.append(key, value);\n      continue;\n    }\n\n    if (typeof value === 'number') {\n      searchParams.append(key, value.toString());\n      continue;\n    }\n\n    for (const val of value) {\n      searchParams.append(key, val);\n    }\n  }\n  return searchParams;\n}\n"],"names":["fetchJson","instantQuery","params","queryOptions","fetchWithPost","rangeQuery","labelNames","labelValues","labelName","searchParams","apiURI","encodeURIComponent","fetchWithGet","datasourceUrl","url","urlParams","createSearchParams","toString","method","headers","init","body","URLSearchParams","key","value","undefined","append","val"],"mappings":"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"}

package/dist/plugins/prometheus-datasource.d.ts

@@ -1,7 +1,9 @@
+import { RequestHeaders } from '@perses-dev/core';
 import { DatasourcePlugin } from '@perses-dev/plugin-system';
 import { PrometheusClient } from '../model';
 export interface PrometheusDatasourceSpec {
     direct_url?: string;
+    headers?: RequestHeaders;
 }
 export declare const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient>;
 //# sourceMappingURL=prometheus-datasource.d.ts.map

package/dist/plugins/prometheus-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prometheus-datasource.d.ts","sourceRoot":"","sources":["../../src/plugins/prometheus-datasource.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAqD,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE/F,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA2BD,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,wBAAwB,EAAE,gBAAgB,CAI7F,CAAC"}
+{"version":3,"file":"prometheus-datasource.d.ts","sourceRoot":"","sources":["../../src/plugins/prometheus-datasource.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAqD,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE/F,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AA2BD,eAAO,MAAM,oBAAoB,EAAE,gBAAgB,CAAC,wBAAwB,EAAE,gBAAgB,CAI7F,CAAC"}

package/dist/plugins/prometheus-datasource.js

@@ -14,7 +14,7 @@ import { instantQuery, rangeQuery, labelNames, labelValues } from '../model';
 /**
  * Creates a PrometheusClient for a specific datasource spec.
  */ const createClient = (spec, options)=>{
-    const { direct_url  } = spec;
+    const { direct_url , headers  } = spec;
     const { proxyUrl  } = options;
     // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified
     const datasourceUrl = direct_url !== null && direct_url !== void 0 ? direct_url : proxyUrl;
@@ -27,16 +27,20 @@ import { instantQuery, rangeQuery, labelNames, labelValues } from '../model';
             datasourceUrl
         },
         instantQuery: (params)=>instantQuery(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             }),
         rangeQuery: (params)=>rangeQuery(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             }),
         labelNames: (params)=>labelNames(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             }),
         labelValues: (params)=>labelValues(params, {
-                datasourceUrl
+                datasourceUrl,
+                headers
             })
     };
 };

package/dist/plugins/prometheus-datasource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/prometheus-datasource.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { instantQuery, rangeQuery, labelNames, labelValues, PrometheusClient } from '../model';\n\nexport interface PrometheusDatasourceSpec {\n  direct_url?: string;\n}\n\n/**\n * Creates a PrometheusClient for a specific datasource spec.\n */\nconst createClient: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient>['createClient'] = (spec, options) => {\n  const { direct_url } = spec;\n  const { proxyUrl } = options;\n\n  // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified\n  const datasourceUrl = direct_url ?? proxyUrl;\n  if (datasourceUrl === undefined) {\n    throw new Error('No URL specified for Prometheus client. You can use direct_url in the spec to configure it.');\n  }\n\n  // Could think about this becoming a class, although it definitely doesn't have to be\n  return {\n    options: {\n      datasourceUrl,\n    },\n    instantQuery: (params) => instantQuery(params, { datasourceUrl }),\n    rangeQuery: (params) => rangeQuery(params, { datasourceUrl }),\n    labelNames: (params) => labelNames(params, { datasourceUrl }),\n    labelValues: (params) => labelValues(params, { datasourceUrl }),\n  };\n};\n\nexport const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient> = {\n  createClient,\n  OptionsEditorComponent: () => null,\n  createInitialOptions: () => ({ direct_url: '' }),\n};\n"],"names":["instantQuery","rangeQuery","labelNames","labelValues","createClient","spec","options","direct_url","proxyUrl","datasourceUrl","undefined","Error","params","PrometheusDatasource","OptionsEditorComponent","createInitialOptions"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAASA,YAAY,EAAEC,UAAU,EAAEC,UAAU,EAAEC,WAAW,QAA0B,UAAU,CAAC;AAM/F;;CAEC,GACD,MAAMC,YAAY,GAAiF,CAACC,IAAI,EAAEC,OAAO,GAAK;IACpH,MAAM,EAAEC,UAAU,CAAA,EAAE,GAAGF,IAAI,AAAC;IAC5B,MAAM,EAAEG,QAAQ,CAAA,EAAE,GAAGF,OAAO,AAAC;IAE7B,4FAA4F;IAC5F,MAAMG,aAAa,GAAGF,UAAU,aAAVA,UAAU,cAAVA,UAAU,GAAIC,QAAQ,AAAC;IAC7C,IAAIC,aAAa,KAAKC,SAAS,EAAE;QAC/B,MAAM,IAAIC,KAAK,CAAC,6FAA6F,CAAC,CAAC;IACjH,CAAC;IAED,qFAAqF;IACrF,OAAO;QACLL,OAAO,EAAE;YACPG,aAAa;SACd;QACDT,YAAY,EAAE,CAACY,MAAM,GAAKZ,YAAY,CAACY,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;QACjER,UAAU,EAAE,CAACW,MAAM,GAAKX,UAAU,CAACW,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;QAC7DP,UAAU,EAAE,CAACU,MAAM,GAAKV,UAAU,CAACU,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;QAC7DN,WAAW,EAAE,CAACS,MAAM,GAAKT,WAAW,CAACS,MAAM,EAAE;gBAAEH,aAAa;aAAE,CAAC;KAChE,CAAC;AACJ,CAAC,AAAC;AAEF,OAAO,MAAMI,oBAAoB,GAAiE;IAChGT,YAAY;IACZU,sBAAsB,EAAE,IAAM,IAAI;IAClCC,oBAAoB,EAAE,IAAO,CAAA;YAAER,UAAU,EAAE,EAAE;SAAE,CAAA,AAAC;CACjD,CAAC"}
+{"version":3,"sources":["../../src/plugins/prometheus-datasource.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { RequestHeaders } from '@perses-dev/core';\nimport { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { instantQuery, rangeQuery, labelNames, labelValues, PrometheusClient } from '../model';\n\nexport interface PrometheusDatasourceSpec {\n  direct_url?: string;\n  headers?: RequestHeaders;\n}\n\n/**\n * Creates a PrometheusClient for a specific datasource spec.\n */\nconst createClient: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient>['createClient'] = (spec, options) => {\n  const { direct_url, headers } = spec;\n  const { proxyUrl } = options;\n\n  // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified\n  const datasourceUrl = direct_url ?? proxyUrl;\n  if (datasourceUrl === undefined) {\n    throw new Error('No URL specified for Prometheus client. You can use direct_url in the spec to configure it.');\n  }\n\n  // Could think about this becoming a class, although it definitely doesn't have to be\n  return {\n    options: {\n      datasourceUrl,\n    },\n    instantQuery: (params) => instantQuery(params, { datasourceUrl, headers }),\n    rangeQuery: (params) => rangeQuery(params, { datasourceUrl, headers }),\n    labelNames: (params) => labelNames(params, { datasourceUrl, headers }),\n    labelValues: (params) => labelValues(params, { datasourceUrl, headers }),\n  };\n};\n\nexport const PrometheusDatasource: DatasourcePlugin<PrometheusDatasourceSpec, PrometheusClient> = {\n  createClient,\n  OptionsEditorComponent: () => null,\n  createInitialOptions: () => ({ direct_url: '' }),\n};\n"],"names":["instantQuery","rangeQuery","labelNames","labelValues","createClient","spec","options","direct_url","headers","proxyUrl","datasourceUrl","undefined","Error","params","PrometheusDatasource","OptionsEditorComponent","createInitialOptions"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAIjC,SAASA,YAAY,EAAEC,UAAU,EAAEC,UAAU,EAAEC,WAAW,QAA0B,UAAU,CAAC;AAO/F;;CAEC,GACD,MAAMC,YAAY,GAAiF,CAACC,IAAI,EAAEC,OAAO,GAAK;IACpH,MAAM,EAAEC,UAAU,CAAA,EAAEC,OAAO,CAAA,EAAE,GAAGH,IAAI,AAAC;IACrC,MAAM,EAAEI,QAAQ,CAAA,EAAE,GAAGH,OAAO,AAAC;IAE7B,4FAA4F;IAC5F,MAAMI,aAAa,GAAGH,UAAU,aAAVA,UAAU,cAAVA,UAAU,GAAIE,QAAQ,AAAC;IAC7C,IAAIC,aAAa,KAAKC,SAAS,EAAE;QAC/B,MAAM,IAAIC,KAAK,CAAC,6FAA6F,CAAC,CAAC;IACjH,CAAC;IAED,qFAAqF;IACrF,OAAO;QACLN,OAAO,EAAE;YACPI,aAAa;SACd;QACDV,YAAY,EAAE,CAACa,MAAM,GAAKb,YAAY,CAACa,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;QAC1EP,UAAU,EAAE,CAACY,MAAM,GAAKZ,UAAU,CAACY,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;QACtEN,UAAU,EAAE,CAACW,MAAM,GAAKX,UAAU,CAACW,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;QACtEL,WAAW,EAAE,CAACU,MAAM,GAAKV,WAAW,CAACU,MAAM,EAAE;gBAAEH,aAAa;gBAAEF,OAAO;aAAE,CAAC;KACzE,CAAC;AACJ,CAAC,AAAC;AAEF,OAAO,MAAMM,oBAAoB,GAAiE;IAChGV,YAAY;IACZW,sBAAsB,EAAE,IAAM,IAAI;IAClCC,oBAAoB,EAAE,IAAO,CAAA;YAAET,UAAU,EAAE,EAAE;SAAE,CAAA,AAAC;CACjD,CAAC"}

package/dist/plugins/prometheus-time-series-query/get-time-series-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-time-series-data.d.ts","sourceRoot":"","sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAkB,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAWlF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CAsEvG,CAAC"}
+{"version":3,"file":"get-time-series-data.d.ts","sourceRoot":"","sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAkB,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAWlF,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CAoEvG,CAAC"}

package/dist/plugins/prometheus-time-series-query/get-time-series-data.js

@@ -55,8 +55,6 @@ export const getTimeSeriesData = async (spec, context)=>{
             end: fromUnixTime(end)
         },
         stepMs: step * 1000,
-        // TODO: Maybe do a proper Iterable implementation that defers some of this
-        // processing until its needed
         series: result.map((value)=>{
             const { metric , values  } = value;
             // Name the series after the metric labels or if no metric, use the query

package/dist/plugins/prometheus-time-series-query/get-time-series-data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesData, TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';\nimport { fromUnixTime } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusClient,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  DEFAULT_PROM,\n} from '../../model';\nimport { getUniqueKeyForPrometheusResult, replaceTemplateVariables, formatSeriesName } from '../../utils';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query-model';\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\n) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    // Do not make a request to the backend, instead return an empty TimeSeriesData\n    return { series: [] };\n  }\n\n  const minStep = getDurationStringSeconds(spec.min_step);\n  const timeRange = getPrometheusTimeRange(context.timeRange);\n  const step = getRangeStep(timeRange, minStep, undefined, context.suggestedStepMs);\n\n  // Align the time range so that it's a multiple of the step\n  let { start, end } = timeRange;\n  const utcOffsetSec = new Date().getTimezoneOffset() * 60;\n\n  const alignedEnd = Math.floor((end + utcOffsetSec) / step) * step - utcOffsetSec;\n  const alignedStart = Math.floor((start + utcOffsetSec) / step) * step - utcOffsetSec;\n  start = alignedStart;\n  end = alignedEnd;\n\n  // Replace template variable placeholders in PromQL query\n  let query = spec.query.replace('$__rate_interval', `15s`);\n  query = replaceTemplateVariables(query, context.variableState);\n\n  // Get the datasource, using the default Prom Datasource if one isn't specified in the query\n  const client: PrometheusClient = await context.datasourceStore.getDatasourceClient(spec.datasource ?? DEFAULT_PROM);\n\n  // Make the request to Prom\n  const response = await client.rangeQuery({\n    query,\n    start,\n    end,\n    step,\n  });\n\n  // TODO: What about error responses from Prom that have a response body?\n  const result = response.data?.result ?? [];\n\n  // Transform response\n  const chartData: TimeSeriesData = {\n    // Return the time range and step we actually used for the query\n    timeRange: { start: fromUnixTime(start), end: fromUnixTime(end) },\n    stepMs: step * 1000,\n\n    // TODO: Maybe do a proper Iterable implementation that defers some of this\n    // processing until its needed\n    series: result.map((value) => {\n      const { metric, values } = value;\n\n      // Name the series after the metric labels or if no metric, use the query\n      let name = getUniqueKeyForPrometheusResult(metric);\n      if (name === '') {\n        name = query;\n      }\n\n      // query editor allows you to define an optional series_name_format\n      // property to customize legend and tooltip display\n      const formattedName = spec.series_name_format ? formatSeriesName(spec.series_name_format, metric) : name;\n\n      return {\n        name,\n        values: values.map(parseValueTuple),\n        formattedName,\n      };\n    }),\n  };\n\n  return chartData;\n};\n"],"names":["fromUnixTime","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","getUniqueKeyForPrometheusResult","replaceTemplateVariables","formatSeriesName","getTimeSeriesData","spec","context","response","query","undefined","series","minStep","min_step","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","Math","floor","alignedStart","replace","variableState","client","datasourceStore","getDatasourceClient","datasource","rangeQuery","result","data","chartData","stepMs","map","value","metric","values","name","formattedName","series_name_format"],"mappings":"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"}
+{"version":3,"sources":["../../../src/plugins/prometheus-time-series-query/get-time-series-data.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesData, TimeSeriesQueryPlugin } from '@perses-dev/plugin-system';\nimport { fromUnixTime } from 'date-fns';\nimport {\n  parseValueTuple,\n  PrometheusClient,\n  getDurationStringSeconds,\n  getPrometheusTimeRange,\n  getRangeStep,\n  DEFAULT_PROM,\n} from '../../model';\nimport { getUniqueKeyForPrometheusResult, replaceTemplateVariables, formatSeriesName } from '../../utils';\nimport { PrometheusTimeSeriesQuerySpec } from './time-series-query-model';\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<PrometheusTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\n) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    // Do not make a request to the backend, instead return an empty TimeSeriesData\n    return { series: [] };\n  }\n\n  const minStep = getDurationStringSeconds(spec.min_step);\n  const timeRange = getPrometheusTimeRange(context.timeRange);\n  const step = getRangeStep(timeRange, minStep, undefined, context.suggestedStepMs);\n\n  // Align the time range so that it's a multiple of the step\n  let { start, end } = timeRange;\n  const utcOffsetSec = new Date().getTimezoneOffset() * 60;\n\n  const alignedEnd = Math.floor((end + utcOffsetSec) / step) * step - utcOffsetSec;\n  const alignedStart = Math.floor((start + utcOffsetSec) / step) * step - utcOffsetSec;\n  start = alignedStart;\n  end = alignedEnd;\n\n  // Replace template variable placeholders in PromQL query\n  let query = spec.query.replace('$__rate_interval', `15s`);\n  query = replaceTemplateVariables(query, context.variableState);\n\n  // Get the datasource, using the default Prom Datasource if one isn't specified in the query\n  const client: PrometheusClient = await context.datasourceStore.getDatasourceClient(spec.datasource ?? DEFAULT_PROM);\n\n  // Make the request to Prom\n  const response = await client.rangeQuery({\n    query,\n    start,\n    end,\n    step,\n  });\n\n  // TODO: What about error responses from Prom that have a response body?\n  const result = response.data?.result ?? [];\n\n  // Transform response\n  const chartData: TimeSeriesData = {\n    // Return the time range and step we actually used for the query\n    timeRange: { start: fromUnixTime(start), end: fromUnixTime(end) },\n    stepMs: step * 1000,\n\n    series: result.map((value) => {\n      const { metric, values } = value;\n\n      // Name the series after the metric labels or if no metric, use the query\n      let name = getUniqueKeyForPrometheusResult(metric);\n      if (name === '') {\n        name = query;\n      }\n\n      // query editor allows you to define an optional series_name_format\n      // property to customize legend and tooltip display\n      const formattedName = spec.series_name_format ? formatSeriesName(spec.series_name_format, metric) : name;\n\n      return {\n        name,\n        values: values.map(parseValueTuple),\n        formattedName,\n      };\n    }),\n  };\n\n  return chartData;\n};\n"],"names":["fromUnixTime","parseValueTuple","getDurationStringSeconds","getPrometheusTimeRange","getRangeStep","DEFAULT_PROM","getUniqueKeyForPrometheusResult","replaceTemplateVariables","formatSeriesName","getTimeSeriesData","spec","context","response","query","undefined","series","minStep","min_step","timeRange","step","suggestedStepMs","start","end","utcOffsetSec","Date","getTimezoneOffset","alignedEnd","Math","floor","alignedStart","replace","variableState","client","datasourceStore","getDatasourceClient","datasource","rangeQuery","result","data","chartData","stepMs","map","value","metric","values","name","formattedName","series_name_format"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/prometheus-plugin",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "Prometheus plugin for Perses",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
@@ -20,7 +20,8 @@
     "build": "concurrently \"npm:build:*\"",
     "build:cjs": "swc ./src -d dist/cjs --config-file ../.cjs.swcrc",
     "build:esm": "swc ./src -d dist --config-file ../.swcrc",
-    "build:types": "tsc --emitDeclarationOnly --declaration --preserveWatchOutput",
+    "build:types": "tsc --project tsconfig.build.json",
+    "type-check": "tsc --noEmit",
     "start": "concurrently -P \"npm:build:* -- {*}\" -- --watch",
     "test": "TZ=UTC jest",
     "test:watch": "TZ=UTC jest --watch",
@@ -30,9 +31,9 @@
   "dependencies": {
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.2.0",
-    "@perses-dev/components": "0.23.1",
-    "@perses-dev/core": "0.23.1",
-    "@perses-dev/plugin-system": "0.23.1",
+    "@perses-dev/components": "0.24.0",
+    "@perses-dev/core": "0.24.0",
+    "@perses-dev/plugin-system": "0.24.0",
     "@prometheus-io/codemirror-promql": "^0.40.5",
     "@prometheus-io/lezer-promql": "^0.37.0",
     "@uiw/react-codemirror": "^4.19.1",

package/dist/cjs/utils/utils.test.js

@@ -1,172 +0,0 @@
-// Copyright 2023 The Perses Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-const _utils = require("./utils");
-describe('parseTemplateVariables()', ()=>{
-    const tests = [
-        {
-            text: 'hello $var1 world $var2',
-            variables: [
-                'var1',
-                'var2'
-            ]
-        }
-    ];
-    tests.forEach(({ text , variables  })=>{
-        it(`parses ${text}`, ()=>{
-            expect((0, _utils.parseTemplateVariables)(text)).toEqual(variables);
-        });
-    });
-});
-describe('replaceTemplateVariable()', ()=>{
-    const tests = [
-        {
-            text: 'hello $var1',
-            varName: 'var1',
-            value: 'world',
-            expected: 'hello world'
-        },
-        {
-            text: 'hello $var1 $var1',
-            varName: 'var1',
-            value: 'world',
-            expected: 'hello world world'
-        },
-        {
-            text: 'hello $var1',
-            varName: 'var1',
-            value: [
-                'world',
-                'w'
-            ],
-            expected: 'hello (world|w)'
-        },
-        {
-            text: 'hello $var1 $var1',
-            varName: 'var1',
-            value: [
-                'world',
-                'w'
-            ],
-            expected: 'hello (world|w) (world|w)'
-        }
-    ];
-    tests.forEach(({ text , value , varName , expected  })=>{
-        it(`replaces ${text} ${value}`, ()=>{
-            expect((0, _utils.replaceTemplateVariable)(text, varName, value)).toEqual(expected);
-        });
-    });
-});
-describe('replaceTemplateVariables()', ()=>{
-    const tests = [
-        {
-            text: 'hello $var1 $var2',
-            state: {
-                var1: {
-                    value: 'world',
-                    loading: false
-                },
-                var2: {
-                    value: 'world',
-                    loading: false
-                }
-            },
-            expected: 'hello world world'
-        },
-        {
-            text: 'hello $var1 $var2',
-            state: {
-                var1: {
-                    value: 'world',
-                    loading: false
-                },
-                var2: {
-                    value: [
-                        'a',
-                        'b'
-                    ],
-                    loading: false
-                }
-            },
-            expected: 'hello world (a|b)'
-        }
-    ];
-    tests.forEach(({ text , state , expected  })=>{
-        it(`replaces ${text} ${JSON.stringify(state)}`, ()=>{
-            expect((0, _utils.replaceTemplateVariables)(text, state)).toEqual(expected);
-        });
-    });
-});
-describe('formatSeriesName', ()=>{
-    it('should resolve label name tokens to label values from query response', ()=>{
-        // example from query: node_load15{instance=~\"(demo.do.prometheus.io:9100)\",job='$job'}
-        const inputFormat = 'Test {{job}} {{instance}}';
-        const metric = {
-            __name__: 'node_load15',
-            env: 'demo',
-            instance: 'demo.do.prometheus.io:9100',
-            job: 'node'
-        };
-        const output = 'Test node demo.do.prometheus.io:9100';
-        expect((0, _utils.formatSeriesName)(inputFormat, metric)).toEqual(output);
-    });
-});
-describe('getUniqueKeyForPrometheusResult', ()=>{
-    let labels = {};
-    beforeEach(()=>{
-        labels = {};
-    });
-    it('should be a formatted prometheus string', ()=>{
-        labels = {
-            ['foo']: 'bar'
-        };
-        const result = (0, _utils.getUniqueKeyForPrometheusResult)(labels);
-        expect(result).toEqual('{foo="bar"}');
-    });
-    it('should be formatted with "', ()=>{
-        labels = {
-            ['foo']: 'bar'
-        };
-        const result = (0, _utils.getUniqueKeyForPrometheusResult)(labels, {
-            removeExprWrap: true
-        });
-        expect(result).toEqual('{"foo":"bar"}');
-    });
-    it('should be formatted with __name__ removed', ()=>{
-        labels = {
-            __name__: 'node_memory_Buffers_bytes',
-            env: 'demo',
-            instance: 'demo.do.prometheus.io:9100',
-            job: 'node'
-        };
-        const result = (0, _utils.getUniqueKeyForPrometheusResult)(labels, {
-            removeExprWrap: true
-        });
-        expect(result).toEqual('{"env":"demo","instance":"demo.do.prometheus.io:9100","job":"node"}');
-    });
-    it('should return a valid query to filter by label', ()=>{
-        labels = {
-            __name__: 'node_memory_Buffers_bytes',
-            env: 'demo',
-            instance: 'demo.do.prometheus.io:9100',
-            job: 'node'
-        };
-        const result = (0, _utils.getUniqueKeyForPrometheusResult)(labels, {
-            removeExprWrap: false
-        });
-        expect(result).toEqual('node_memory_Buffers_bytes{env="demo",instance="demo.do.prometheus.io:9100",job="node"}');
-    });
-});

package/dist/utils/utils.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=utils.test.d.ts.map

package/dist/utils/utils.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.test.d.ts","sourceRoot":"","sources":["../../src/utils/utils.test.ts"],"names":[],"mappings":""}

package/dist/utils/utils.test.js

@@ -1,170 +0,0 @@
-// Copyright 2023 The Perses Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-import { parseTemplateVariables, replaceTemplateVariable, replaceTemplateVariables, formatSeriesName, getUniqueKeyForPrometheusResult } from './utils';
-describe('parseTemplateVariables()', ()=>{
-    const tests = [
-        {
-            text: 'hello $var1 world $var2',
-            variables: [
-                'var1',
-                'var2'
-            ]
-        }
-    ];
-    tests.forEach(({ text , variables  })=>{
-        it(`parses ${text}`, ()=>{
-            expect(parseTemplateVariables(text)).toEqual(variables);
-        });
-    });
-});
-describe('replaceTemplateVariable()', ()=>{
-    const tests = [
-        {
-            text: 'hello $var1',
-            varName: 'var1',
-            value: 'world',
-            expected: 'hello world'
-        },
-        {
-            text: 'hello $var1 $var1',
-            varName: 'var1',
-            value: 'world',
-            expected: 'hello world world'
-        },
-        {
-            text: 'hello $var1',
-            varName: 'var1',
-            value: [
-                'world',
-                'w'
-            ],
-            expected: 'hello (world|w)'
-        },
-        {
-            text: 'hello $var1 $var1',
-            varName: 'var1',
-            value: [
-                'world',
-                'w'
-            ],
-            expected: 'hello (world|w) (world|w)'
-        }
-    ];
-    tests.forEach(({ text , value , varName , expected  })=>{
-        it(`replaces ${text} ${value}`, ()=>{
-            expect(replaceTemplateVariable(text, varName, value)).toEqual(expected);
-        });
-    });
-});
-describe('replaceTemplateVariables()', ()=>{
-    const tests = [
-        {
-            text: 'hello $var1 $var2',
-            state: {
-                var1: {
-                    value: 'world',
-                    loading: false
-                },
-                var2: {
-                    value: 'world',
-                    loading: false
-                }
-            },
-            expected: 'hello world world'
-        },
-        {
-            text: 'hello $var1 $var2',
-            state: {
-                var1: {
-                    value: 'world',
-                    loading: false
-                },
-                var2: {
-                    value: [
-                        'a',
-                        'b'
-                    ],
-                    loading: false
-                }
-            },
-            expected: 'hello world (a|b)'
-        }
-    ];
-    tests.forEach(({ text , state , expected  })=>{
-        it(`replaces ${text} ${JSON.stringify(state)}`, ()=>{
-            expect(replaceTemplateVariables(text, state)).toEqual(expected);
-        });
-    });
-});
-describe('formatSeriesName', ()=>{
-    it('should resolve label name tokens to label values from query response', ()=>{
-        // example from query: node_load15{instance=~\"(demo.do.prometheus.io:9100)\",job='$job'}
-        const inputFormat = 'Test {{job}} {{instance}}';
-        const metric = {
-            __name__: 'node_load15',
-            env: 'demo',
-            instance: 'demo.do.prometheus.io:9100',
-            job: 'node'
-        };
-        const output = 'Test node demo.do.prometheus.io:9100';
-        expect(formatSeriesName(inputFormat, metric)).toEqual(output);
-    });
-});
-describe('getUniqueKeyForPrometheusResult', ()=>{
-    let labels = {};
-    beforeEach(()=>{
-        labels = {};
-    });
-    it('should be a formatted prometheus string', ()=>{
-        labels = {
-            ['foo']: 'bar'
-        };
-        const result = getUniqueKeyForPrometheusResult(labels);
-        expect(result).toEqual('{foo="bar"}');
-    });
-    it('should be formatted with "', ()=>{
-        labels = {
-            ['foo']: 'bar'
-        };
-        const result = getUniqueKeyForPrometheusResult(labels, {
-            removeExprWrap: true
-        });
-        expect(result).toEqual('{"foo":"bar"}');
-    });
-    it('should be formatted with __name__ removed', ()=>{
-        labels = {
-            __name__: 'node_memory_Buffers_bytes',
-            env: 'demo',
-            instance: 'demo.do.prometheus.io:9100',
-            job: 'node'
-        };
-        const result = getUniqueKeyForPrometheusResult(labels, {
-            removeExprWrap: true
-        });
-        expect(result).toEqual('{"env":"demo","instance":"demo.do.prometheus.io:9100","job":"node"}');
-    });
-    it('should return a valid query to filter by label', ()=>{
-        labels = {
-            __name__: 'node_memory_Buffers_bytes',
-            env: 'demo',
-            instance: 'demo.do.prometheus.io:9100',
-            job: 'node'
-        };
-        const result = getUniqueKeyForPrometheusResult(labels, {
-            removeExprWrap: false
-        });
-        expect(result).toEqual('node_memory_Buffers_bytes{env="demo",instance="demo.do.prometheus.io:9100",job="node"}');
-    });
-});
-
-//# sourceMappingURL=utils.test.js.map

package/dist/utils/utils.test.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/utils.test.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport {\n  parseTemplateVariables,\n  replaceTemplateVariable,\n  replaceTemplateVariables,\n  formatSeriesName,\n  getUniqueKeyForPrometheusResult,\n} from './utils';\n\ndescribe('parseTemplateVariables()', () => {\n  const tests = [\n    {\n      text: 'hello $var1 world $var2',\n      variables: ['var1', 'var2'],\n    },\n  ];\n\n  tests.forEach(({ text, variables }) => {\n    it(`parses ${text}`, () => {\n      expect(parseTemplateVariables(text)).toEqual(variables);\n    });\n  });\n});\n\ndescribe('replaceTemplateVariable()', () => {\n  const tests = [\n    {\n      text: 'hello $var1',\n      varName: 'var1',\n      value: 'world',\n      expected: 'hello world',\n    },\n    {\n      text: 'hello $var1 $var1',\n      varName: 'var1',\n      value: 'world',\n      expected: 'hello world world',\n    },\n    {\n      text: 'hello $var1',\n      varName: 'var1',\n      value: ['world', 'w'],\n      expected: 'hello (world|w)',\n    },\n    {\n      text: 'hello $var1 $var1',\n      varName: 'var1',\n      value: ['world', 'w'],\n      expected: 'hello (world|w) (world|w)',\n    },\n  ];\n\n  tests.forEach(({ text, value, varName, expected }) => {\n    it(`replaces ${text} ${value}`, () => {\n      expect(replaceTemplateVariable(text, varName, value)).toEqual(expected);\n    });\n  });\n});\n\ndescribe('replaceTemplateVariables()', () => {\n  const tests = [\n    {\n      text: 'hello $var1 $var2',\n      state: {\n        var1: { value: 'world', loading: false },\n        var2: { value: 'world', loading: false },\n      },\n      expected: 'hello world world',\n    },\n    {\n      text: 'hello $var1 $var2',\n      state: {\n        var1: { value: 'world', loading: false },\n        var2: { value: ['a', 'b'], loading: false },\n      },\n      expected: 'hello world (a|b)',\n    },\n  ];\n\n  tests.forEach(({ text, state, expected }) => {\n    it(`replaces ${text} ${JSON.stringify(state)}`, () => {\n      expect(replaceTemplateVariables(text, state)).toEqual(expected);\n    });\n  });\n});\n\ndescribe('formatSeriesName', () => {\n  it('should resolve label name tokens to label values from query response', () => {\n    // example from query: node_load15{instance=~\\\"(demo.do.prometheus.io:9100)\\\",job='$job'}\n    const inputFormat = 'Test {{job}} {{instance}}';\n\n    const metric = {\n      __name__: 'node_load15',\n      env: 'demo',\n      instance: 'demo.do.prometheus.io:9100',\n      job: 'node',\n    };\n\n    const output = 'Test node demo.do.prometheus.io:9100';\n\n    expect(formatSeriesName(inputFormat, metric)).toEqual(output);\n  });\n});\n\ndescribe('getUniqueKeyForPrometheusResult', () => {\n  let labels: { [key: string]: string } = {};\n  beforeEach(() => {\n    labels = {};\n  });\n\n  it('should be a formatted prometheus string', () => {\n    labels = { ['foo']: 'bar' };\n    const result = getUniqueKeyForPrometheusResult(labels);\n    expect(result).toEqual('{foo=\"bar\"}');\n  });\n\n  it('should be formatted with \"', () => {\n    labels = { ['foo']: 'bar' };\n    const result = getUniqueKeyForPrometheusResult(labels, { removeExprWrap: true });\n    expect(result).toEqual('{\"foo\":\"bar\"}');\n  });\n\n  it('should be formatted with __name__ removed', () => {\n    labels = {\n      __name__: 'node_memory_Buffers_bytes',\n      env: 'demo',\n      instance: 'demo.do.prometheus.io:9100',\n      job: 'node',\n    };\n    const result = getUniqueKeyForPrometheusResult(labels, { removeExprWrap: true });\n    expect(result).toEqual('{\"env\":\"demo\",\"instance\":\"demo.do.prometheus.io:9100\",\"job\":\"node\"}');\n  });\n\n  it('should return a valid query to filter by label', () => {\n    labels = {\n      __name__: 'node_memory_Buffers_bytes',\n      env: 'demo',\n      instance: 'demo.do.prometheus.io:9100',\n      job: 'node',\n    };\n    const result = getUniqueKeyForPrometheusResult(labels, { removeExprWrap: false });\n    expect(result).toEqual('node_memory_Buffers_bytes{env=\"demo\",instance=\"demo.do.prometheus.io:9100\",job=\"node\"}');\n  });\n});\n"],"names":["parseTemplateVariables","replaceTemplateVariable","replaceTemplateVariables","formatSeriesName","getUniqueKeyForPrometheusResult","describe","tests","text","variables","forEach","it","expect","toEqual","varName","value","expected","state","var1","loading","var2","JSON","stringify","inputFormat","metric","__name__","env","instance","job","output","labels","beforeEach","result","removeExprWrap"],"mappings":"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"}