@perses-dev/core 0.0.0-snapshot-scatterplot-fix-imports-95e1b59 → 0.0.0-snapshot-explorer-plugin-c4a7621

package/dist/cjs/utils/fetch.js

@@ -36,28 +36,22 @@ _export(exports, {
         return fetchJson;
     }
 });
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
 async function fetch(...args) {
     const response = await global.fetch(...args);
     if (response.ok === false) {
-        const json = await response.json();
-        if (json.error) {
-            throw new UserFriendlyError(json.error, response.status);
+        const contentType = response.headers.get('content-type');
+        if (contentType?.includes('application/json')) {
+            const json = await response.json();
+            if (json.error) {
+                throw new UserFriendlyError(json.error, response.status);
+            }
+            if (json.message) {
+                throw new UserFriendlyError(json.message, response.status);
+            }
         }
-        if (json.message) {
-            throw new UserFriendlyError(json.message, response.status);
+        const text = await response.text();
+        if (text) {
+            throw new UserFriendlyError(text, response.status);
         }
         throw new FetchError(response);
     }
@@ -69,17 +63,17 @@ async function fetchJson(...args) {
     return json;
 }
 class FetchError extends Error {
+    status;
     constructor(response){
         super(`${response.status} ${response.statusText}`);
-        _define_property(this, "status", void 0);
         this.status = response.status;
         Object.setPrototypeOf(this, FetchError.prototype);
     }
 }
 class UserFriendlyError extends Error {
+    status;
     constructor(message, status){
         super(message);
-        _define_property(this, "status", void 0);
         this.status = status;
         Object.setPrototypeOf(this, UserFriendlyError.prototype);
     }

package/dist/cjs/utils/index.js

@@ -21,7 +21,10 @@ _export_star(require("./memo"), exports);
 _export_star(require("./panel-refs"), exports);
 _export_star(require("./text"), exports);
 _export_star(require("./time-series-data"), exports);
+_export_star(require("./transform-data"), exports);
+_export_star(require("./value-mapping"), exports);
 _export_star(require("./types"), exports);
+_export_star(require("./regexp"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/dist/cjs/utils/memo.js

@@ -39,8 +39,7 @@ function useMemoized(factory, deps) {
     const ref = (0, _react.useRef)();
     let areEqual = true;
     for(let i = 0; i < deps.length; i++){
-        var _ref_current;
-        if (((_ref_current = ref.current) === null || _ref_current === void 0 ? void 0 : _ref_current.deps[i]) !== deps[i]) {
+        if (ref.current?.deps[i] !== deps[i]) {
             areEqual = false;
             break;
         }

package/dist/cjs/utils/regexp.js

@@ -0,0 +1,54 @@
+// Copyright 2024 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.
+/**
+ * Checks if a string is a regex pattern.
+ */ "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    createRegexFromString: function() {
+        return createRegexFromString;
+    },
+    isRegexPattern: function() {
+        return isRegexPattern;
+    }
+});
+function isRegexPattern(input) {
+    return Boolean(input?.startsWith('/'));
+}
+function createRegexFromString(input) {
+    if (!input) {
+        throw new Error('Input string cannot be empty');
+    }
+    if (!isRegexPattern(input)) {
+        return new RegExp(`^${input}$`);
+    }
+    const regexPattern = /^\/(.+)\/([gimy]*)$/;
+    const matches = input.match(regexPattern);
+    if (!matches) {
+        throw new Error(`Invalid regular expression format: ${input}`);
+    }
+    const [, pattern = '', flags = ''] = matches;
+    try {
+        return new RegExp(pattern, flags);
+    } catch (error) {
+        throw new Error(`Failed to create RegExp ${error}`);
+    }
+}

package/dist/cjs/utils/text.js

@@ -21,57 +21,32 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    getDashboardDisplayName: function() {
-        return getDashboardDisplayName;
+    getResourceDisplayName: function() {
+        return getResourceDisplayName;
     },
-    getDashboardExtendedDisplayName: function() {
-        return getDashboardExtendedDisplayName;
-    },
-    getDatasourceDisplayName: function() {
-        return getDatasourceDisplayName;
-    },
-    getDatasourceExtendedDisplayName: function() {
-        return getDatasourceExtendedDisplayName;
-    },
-    getVariableDisplayName: function() {
-        return getVariableDisplayName;
-    },
-    getVariableExtendedDisplayName: function() {
-        return getVariableExtendedDisplayName;
+    getResourceExtendedDisplayName: function() {
+        return getResourceExtendedDisplayName;
     }
 });
-function getDashboardDisplayName(dashboard) {
-    var _dashboard_spec_display;
-    var _dashboard_spec_display_name;
-    return (_dashboard_spec_display_name = (_dashboard_spec_display = dashboard.spec.display) === null || _dashboard_spec_display === void 0 ? void 0 : _dashboard_spec_display.name) !== null && _dashboard_spec_display_name !== void 0 ? _dashboard_spec_display_name : dashboard.metadata.name;
-}
-function getVariableDisplayName(variable) {
-    var _variable_spec_spec_display;
-    var _variable_spec_spec_display_name;
-    return (_variable_spec_spec_display_name = (_variable_spec_spec_display = variable.spec.spec.display) === null || _variable_spec_spec_display === void 0 ? void 0 : _variable_spec_spec_display.name) !== null && _variable_spec_spec_display_name !== void 0 ? _variable_spec_spec_display_name : variable.metadata.name;
-}
-function getDatasourceDisplayName(datasource) {
-    var _datasource_spec_display;
-    return ((_datasource_spec_display = datasource.spec.display) === null || _datasource_spec_display === void 0 ? void 0 : _datasource_spec_display.name) || datasource.metadata.name;
-}
-function getDashboardExtendedDisplayName(dashboard) {
-    var _dashboard_spec_display;
-    if ((_dashboard_spec_display = dashboard.spec.display) === null || _dashboard_spec_display === void 0 ? void 0 : _dashboard_spec_display.name) {
-        return `${dashboard.spec.display.name} (Name: ${dashboard.metadata.name})`;
+function getResourceDisplayName(resource) {
+    // Variables
+    if (resource.spec.spec?.display?.name) {
+        return resource.spec.spec.display.name;
     }
-    return dashboard.metadata.name;
-}
-function getVariableExtendedDisplayName(variable) {
-    var _variable_spec_spec_display;
-    if ((_variable_spec_spec_display = variable.spec.spec.display) === null || _variable_spec_spec_display === void 0 ? void 0 : _variable_spec_spec_display.name) {
-        return `${variable.spec.spec.display.name} (Name: ${variable.metadata.name})`;
+    // Other resources with display
+    if (resource.spec.display?.name) {
+        return resource.spec.display.name;
     }
-    return variable.metadata.name;
+    return resource.metadata.name;
 }
-function getDatasourceExtendedDisplayName(datasource) {
-    var _datasource_spec_display;
-    if ((_datasource_spec_display = datasource.spec.display) === null || _datasource_spec_display === void 0 ? void 0 : _datasource_spec_display.name) {
-        return `${datasource.spec.display.name} (Name: ${datasource.metadata.name})`;
+function getResourceExtendedDisplayName(resource) {
+    // Variables
+    if (resource.spec.spec?.display?.name) {
+        return `${resource.spec.spec.display.name} (ID: ${resource.metadata.name})`;
+    }
+    // Other resources with display
+    if (resource.spec.display?.name) {
+        return `${resource.spec.display.name} (ID: ${resource.metadata.name})`;
     }
-    return datasource.metadata.name;
+    return resource.metadata.name;
 }

package/dist/cjs/utils/transform-data.js

@@ -0,0 +1,167 @@
+// Copyright 2024 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
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    applyJoinTransform: function() {
+        return applyJoinTransform;
+    },
+    applyMergeColumnsTransform: function() {
+        return applyMergeColumnsTransform;
+    },
+    applyMergeIndexedColumnsTransform: function() {
+        return applyMergeIndexedColumnsTransform;
+    },
+    applyMergeSeriesTransform: function() {
+        return applyMergeSeriesTransform;
+    },
+    transformData: function() {
+        return transformData;
+    },
+    useTransformData: function() {
+        return useTransformData;
+    }
+});
+const _react = require("react");
+function applyJoinTransform(data, columns) {
+    // If column is undefined or empty, return data as is
+    if (columns.length === 0) {
+        return data;
+    }
+    const rowHashed = {};
+    for (const row of data){
+        const rowHash = Object.keys(row).filter((k)=>columns.includes(k)).map((k)=>row[k]).join('|');
+        const rowHashedValue = rowHashed[rowHash];
+        if (rowHashedValue) {
+            rowHashed[rowHash] = {
+                ...rowHashedValue,
+                ...row
+            };
+        } else {
+            rowHashed[rowHash] = {
+                ...row
+            };
+        }
+    }
+    return Object.values(rowHashed);
+}
+function applyMergeColumnsTransform(data, selectedColumns, outputName) {
+    const result = [];
+    for (const row of data){
+        const columns = Object.keys(row).filter((k)=>selectedColumns.includes(k));
+        const selectedColumnValues = {};
+        for (const column of columns){
+            selectedColumnValues[column] = row[column];
+            delete row[column];
+        }
+        for (const column of columns){
+            result.push({
+                ...row,
+                [outputName]: selectedColumnValues[column]
+            });
+        }
+        if (columns.length === 0) {
+            result.push(row);
+        }
+    }
+    return result;
+}
+function applyMergeIndexedColumnsTransform(data, column) {
+    const result = [];
+    for (const entry of data){
+        const indexedColumns = Object.keys(entry).filter((k)=>new RegExp('^(' + column + ' #\\d+)|(' + column + ')$').test(k));
+        const indexedColumnValues = {};
+        for (const indexedColumn of indexedColumns){
+            indexedColumnValues[indexedColumn] = entry[indexedColumn];
+            delete entry[indexedColumn];
+        }
+        for (const indexedColumn of indexedColumns){
+            result.push({
+                ...entry,
+                [column]: indexedColumnValues[indexedColumn]
+            });
+        }
+        if (indexedColumns.length === 0) {
+            result.push(entry);
+        }
+    }
+    return result;
+}
+function applyMergeSeriesTransform(data) {
+    let result = [
+        ...data
+    ];
+    const labelColumns = Array.from(new Set(data.flatMap(Object.keys).map((label)=>label.replace(/ #\d+/, '')).filter((label)=>label !== 'value')));
+    for (const label of labelColumns){
+        result = applyMergeIndexedColumnsTransform(result, label);
+    }
+    result = applyJoinTransform(result, labelColumns);
+    return result;
+}
+function transformData(data, transforms) {
+    let result = data;
+    // Apply transforms by their orders
+    for (const transform of transforms ?? []){
+        if (transform.spec.disabled) continue;
+        switch(transform.kind){
+            case 'JoinByColumnValue':
+                {
+                    if (transform.spec.columns && transform.spec.columns.length > 0) {
+                        result = applyJoinTransform(result, transform.spec.columns);
+                    }
+                    break;
+                }
+            case 'MergeIndexedColumns':
+                {
+                    if (transform.spec.column) {
+                        result = applyMergeIndexedColumnsTransform(result, transform.spec.column);
+                    }
+                    break;
+                }
+            case 'MergeColumns':
+                {
+                    if (transform.spec.columns && transform.spec.columns.length > 0 && transform.spec.name) {
+                        result = applyMergeColumnsTransform(result, transform.spec.columns, transform.spec.name);
+                    }
+                    break;
+                }
+            case 'MergeSeries':
+                {
+                    result = applyMergeSeriesTransform(result);
+                    break;
+                }
+        }
+    }
+    // Ordering data column alphabetically
+    result = result.map((row)=>{
+        return Object.keys(row).sort().reduce((obj, key)=>{
+            obj[key] = row[key];
+            return obj;
+        }, {});
+    });
+    return result;
+}
+function useTransformData(data, transforms) {
+    return (0, _react.useMemo)(()=>transformData(data, transforms), [
+        data,
+        transforms
+    ]);
+}

package/dist/cjs/utils/value-mapping.js

@@ -0,0 +1,105 @@
+// Copyright 2024 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
+});
+Object.defineProperty(exports, "applyValueMapping", {
+    enumerable: true,
+    get: function() {
+        return applyValueMapping;
+    }
+});
+const _regexp = require("./regexp");
+function applyValueMapping(value, mappings = []) {
+    if (!mappings.length) {
+        return {
+            value
+        };
+    }
+    const mappedItem = {
+        value
+    };
+    mappings.forEach((mapping)=>{
+        switch(mapping.kind){
+            case 'Value':
+                {
+                    const valueOptions = mapping.spec;
+                    if (String(valueOptions.value) === String(value)) {
+                        mappedItem.value = valueOptions.result.value || mappedItem.value;
+                        mappedItem.color = valueOptions.result.color;
+                    }
+                    break;
+                }
+            case 'Range':
+                {
+                    const rangeOptions = mapping.spec;
+                    const newValue = value;
+                    if (rangeOptions.from === undefined && rangeOptions.to === undefined) {
+                        break;
+                    }
+                    const from = rangeOptions.from !== undefined ? rangeOptions.from : -Infinity;
+                    const to = rangeOptions.to !== undefined ? rangeOptions.to : Infinity;
+                    if (newValue >= from && newValue <= to) {
+                        mappedItem.value = rangeOptions.result.value || mappedItem.value;
+                        mappedItem.color = rangeOptions.result.color;
+                    }
+                    break;
+                }
+            case 'Regex':
+                {
+                    const regexOptions = mapping.spec;
+                    const stringValue = value.toString();
+                    if (!regexOptions.pattern) {
+                        break;
+                    }
+                    const regex = (0, _regexp.createRegexFromString)(regexOptions.pattern);
+                    if (stringValue.match(regex)) {
+                        if (regexOptions.result.value !== null) {
+                            mappedItem.value = stringValue.replace(regex, regexOptions.result.value.toString() || '') || mappedItem.value;
+                            mappedItem.color = regexOptions.result.color;
+                        }
+                    }
+                    break;
+                }
+            case 'Misc':
+                {
+                    const miscOptions = mapping.spec;
+                    if (isMiscValueMatch(miscOptions.value, value)) {
+                        mappedItem.value = miscOptions.result.value || mappedItem.value;
+                        mappedItem.color = miscOptions.result.color;
+                    }
+                    break;
+                }
+            default:
+                break;
+        }
+    });
+    return mappedItem;
+}
+function isMiscValueMatch(miscValue, value) {
+    switch(miscValue){
+        case 'empty':
+            return value === '';
+        case 'null':
+            return value === null || value === undefined;
+        case 'NaN':
+            return Number.isNaN(value);
+        case 'true':
+            return value === true;
+        case 'false':
+            return value === false;
+        default:
+            return false;
+    }
+}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './constants';
 export * from './model';
+export * from './schema';
 export * from './utils';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -12,6 +12,7 @@
 // limitations under the License.
 export * from './constants';
 export * from './model';
+export * from './schema';
 export * from './utils';
 
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.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\nexport * from './constants';\nexport * from './model';\nexport * from './utils';\n"],"names":[],"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;AAEjC,cAAc,cAAc;AAC5B,cAAc,UAAU;AACxB,cAAc,UAAU"}
+{"version":3,"sources":["../src/index.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\nexport * from './constants';\nexport * from './model';\nexport * from './schema';\nexport * from './utils';\n"],"names":[],"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;AAEjC,cAAc,cAAc;AAC5B,cAAc,UAAU;AACxB,cAAc,WAAW;AACzB,cAAc,UAAU"}

package/dist/model/calculations.d.ts

@@ -1,4 +1,4 @@
-import { TimeSeriesValueTuple } from '@perses-dev/core';
+import { TimeSeriesValueTuple } from './time-series-queries';
 export declare const DEFAULT_CALCULATION: CalculationType;
 export declare const CalculationsMap: {
     first: typeof first;

package/dist/model/calculations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculations.d.ts","sourceRoot":"","sources":["../../src/model/calculations.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,eAAO,MAAM,mBAAmB,EAAE,eAA+B,CAAC;AAElE,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,eAAe,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAiC3E,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAElD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,SAAS,eAAe,EAAE,EACpE,MAAM,EAAE,oBAAoB,EAAE,EAC9B,mBAAmB,EAAE,YAAY,GAChC,MAAM,CAGP,OAAO,CAAC,eAAe,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,EAC9C,gBAAgB,CACjB,CA8EA;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,WAAW,EAAE,eAAe,oBAE1F;AAED,iBAAS,KAAK,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE/D;AAED,iBAAS,IAAI,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE9D;AAED,iBAAS,WAAW,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAErE;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAEpE;AAED,iBAAS,IAAI,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE9D;AAED,iBAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE7D;AAED,iBAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE7D;AAED,iBAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE7D"}
+{"version":3,"file":"calculations.d.ts","sourceRoot":"","sources":["../../src/model/calculations.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,eAAO,MAAM,mBAAmB,EAAE,eAAwB,CAAC;AAE3D,eAAO,MAAM,eAAe;;;;;;;;;CAS3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,eAAe,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAiC3E,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAElD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,SAAS,eAAe,EAAE,EACpE,MAAM,EAAE,oBAAoB,EAAE,EAC9B,mBAAmB,EAAE,YAAY,GAChC,MAAM,CAGP,OAAO,CAAC,eAAe,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,EAC9C,gBAAgB,CACjB,CA8EA;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,WAAW,EAAE,eAAe,GAAG,gBAAgB,CAE7G;AAED,iBAAS,KAAK,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE/D;AAED,iBAAS,IAAI,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE9D;AAED,iBAAS,WAAW,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAErE;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAEpE;AAED,iBAAS,IAAI,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE9D;AAED,iBAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE7D;AAED,iBAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE7D;AAED,iBAAS,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,gBAAgB,CAE7D"}

package/dist/model/calculations.js

@@ -10,7 +10,7 @@
 // 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.
-export const DEFAULT_CALCULATION = 'last-number';
+export const DEFAULT_CALCULATION = 'last'; // aligned with cue
 export const CalculationsMap = {
     first: first,
     last: last,

package/dist/model/calculations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/calculations.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 { TimeSeriesValueTuple } from '@perses-dev/core';\n\nexport const DEFAULT_CALCULATION: CalculationType = 'last-number';\n\nexport const CalculationsMap = {\n  first: first,\n  last: last,\n  'first-number': firstNumber,\n  'last-number': lastNumber,\n  mean: mean,\n  sum: sum,\n  min: min,\n  max: max,\n};\n\nexport type CalculationType = keyof typeof CalculationsMap;\n\nexport type CalculationConfig = {\n  label: string;\n  description: string;\n};\n\nexport const CALCULATIONS_CONFIG: Readonly<Record<CalculationType, CalculationConfig>> = {\n  first: {\n    label: 'First',\n    description: 'First value',\n  },\n  last: {\n    label: 'Last',\n    description: 'Last value',\n  },\n  'first-number': {\n    label: 'First *',\n    description: 'First numeric value',\n  },\n  'last-number': {\n    label: 'Last *',\n    description: 'Last numeric value',\n  },\n  mean: {\n    label: 'Avg',\n    description: 'Average value excluding nulls',\n  },\n  sum: {\n    label: 'Sum',\n    description: 'The sum of all values',\n  },\n  min: {\n    label: 'Min',\n    description: 'Minimum value',\n  },\n  max: {\n    label: 'Max',\n    description: 'Maximum value',\n  },\n} as const;\n\ntype CalculationValue = number | null | undefined;\n\n/**\n * Calculate a multiple values for a set of time series data.\n *\n * @param values - Array of time series data.\n * @param includeCalculations - Array of calculations to include.\n */\nexport function getCalculations<IncludeCalcs extends CalculationType[]>(\n  values: TimeSeriesValueTuple[],\n  includeCalculations: IncludeCalcs\n): Record<\n  // This extract combined with the generics above keeps the key of the returned\n  // record to *just* the specified calculations.\n  Extract<CalculationType, IncludeCalcs[number]>,\n  CalculationValue\n> {\n  const calculations = includeCalculations.reduce(\n    (initResult, calculation) => {\n      initResult[calculation] = undefined;\n      return initResult;\n    },\n    {} as Record<string, CalculationValue>\n  );\n\n  // We save these values as separate values instead of directly setting them\n  // in the calculations because they are needed by multiple calculations.\n  let nonNullCount = 0;\n  let sum = 0;\n\n  // We use this large function capable of performing one or more calculations\n  // in a single iteration of the data to minimize the performance impact of\n  // generating multiple calculations for large timeseries values. This is\n  // less optimized for certain single calculations when done in isolation (e.g.\n  // `last`), but will be more performant in the more expensive cases where\n  // multiple values are being used (e.g. table legend).\n  values.forEach((tuple, i) => {\n    const value = tuple[1];\n\n    if (i === 0 && 'first' in calculations) {\n      calculations.first = value;\n    }\n    if (i === values.length - 1 && 'last' in calculations) {\n      calculations.last = value;\n    }\n\n    // Handling specific to non-null values.\n    if (typeof value === 'number') {\n      nonNullCount += 1;\n      sum += value;\n\n      if ('first-number' in calculations && calculations['first-number'] === undefined) {\n        // Save the first number we see.\n        calculations['first-number'] = value;\n      }\n\n      if ('last-number' in calculations) {\n        // Keep setting the numbers we see, which will eventually be set to the\n        // last number when finished iterating.\n        calculations['last-number'] = value;\n      }\n\n      if ('min' in calculations) {\n        if (typeof calculations.min !== 'number') {\n          // Init the first time we see a number\n          calculations.min = value;\n        } else {\n          // Use lowest value once initialized\n          calculations.min = Math.min(calculations.min, value);\n        }\n      }\n\n      if ('max' in calculations) {\n        if (typeof calculations.max !== 'number') {\n          // Init the first time we see a number\n          calculations.max = value;\n        } else {\n          // Use highest value once initialized\n          calculations.max = Math.max(calculations.max, value);\n        }\n      }\n    }\n  });\n\n  // Set calculations that require iterating over all values.\n  if (nonNullCount > 0 && 'sum' in calculations) {\n    calculations.sum = sum;\n  }\n\n  if (nonNullCount > 0 && 'mean' in calculations) {\n    calculations.mean = sum / nonNullCount;\n  }\n\n  return calculations;\n}\n\n/**\n * Calculate a single value for a set of time series data.\n *\n * Use `getCalculations` instead if you need multiple calculations.\n *\n * @param values - Array of time series data.\n * @param calculation - Name of the calculation to calculate.\n */\nexport function getCalculation(values: TimeSeriesValueTuple[], calculation: CalculationType) {\n  return getCalculations(values, [calculation])[calculation];\n}\n\nfunction first(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'first');\n}\n\nfunction last(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'last');\n}\n\nfunction firstNumber(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'first-number');\n}\n\nfunction lastNumber(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'last-number');\n}\n\nfunction mean(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'mean');\n}\n\nfunction sum(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'sum');\n}\n\nfunction min(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'min');\n}\n\nfunction max(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'max');\n}\n"],"names":["DEFAULT_CALCULATION","CalculationsMap","first","last","firstNumber","lastNumber","mean","sum","min","max","CALCULATIONS_CONFIG","label","description","getCalculations","values","includeCalculations","calculations","reduce","initResult","calculation","undefined","nonNullCount","forEach","tuple","i","value","length","Math","getCalculation"],"mappings":"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"}
+{"version":3,"sources":["../../src/model/calculations.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 { TimeSeriesValueTuple } from './time-series-queries';\n\nexport const DEFAULT_CALCULATION: CalculationType = 'last'; // aligned with cue\n\nexport const CalculationsMap = {\n  first: first,\n  last: last,\n  'first-number': firstNumber,\n  'last-number': lastNumber,\n  mean: mean,\n  sum: sum,\n  min: min,\n  max: max,\n};\n\nexport type CalculationType = keyof typeof CalculationsMap;\n\nexport type CalculationConfig = {\n  label: string;\n  description: string;\n};\n\nexport const CALCULATIONS_CONFIG: Readonly<Record<CalculationType, CalculationConfig>> = {\n  first: {\n    label: 'First',\n    description: 'First value',\n  },\n  last: {\n    label: 'Last',\n    description: 'Last value',\n  },\n  'first-number': {\n    label: 'First *',\n    description: 'First numeric value',\n  },\n  'last-number': {\n    label: 'Last *',\n    description: 'Last numeric value',\n  },\n  mean: {\n    label: 'Avg',\n    description: 'Average value excluding nulls',\n  },\n  sum: {\n    label: 'Sum',\n    description: 'The sum of all values',\n  },\n  min: {\n    label: 'Min',\n    description: 'Minimum value',\n  },\n  max: {\n    label: 'Max',\n    description: 'Maximum value',\n  },\n} as const;\n\ntype CalculationValue = number | null | undefined;\n\n/**\n * Calculate a multiple values for a set of time series data.\n *\n * @param values - Array of time series data.\n * @param includeCalculations - Array of calculations to include.\n */\nexport function getCalculations<IncludeCalcs extends CalculationType[]>(\n  values: TimeSeriesValueTuple[],\n  includeCalculations: IncludeCalcs\n): Record<\n  // This extract combined with the generics above keeps the key of the returned\n  // record to *just* the specified calculations.\n  Extract<CalculationType, IncludeCalcs[number]>,\n  CalculationValue\n> {\n  const calculations = includeCalculations.reduce(\n    (initResult, calculation) => {\n      initResult[calculation] = undefined;\n      return initResult;\n    },\n    {} as Record<string, CalculationValue>\n  );\n\n  // We save these values as separate values instead of directly setting them\n  // in the calculations because they are needed by multiple calculations.\n  let nonNullCount = 0;\n  let sum = 0;\n\n  // We use this large function capable of performing one or more calculations\n  // in a single iteration of the data to minimize the performance impact of\n  // generating multiple calculations for large timeseries values. This is\n  // less optimized for certain single calculations when done in isolation (e.g.\n  // `last`), but will be more performant in the more expensive cases where\n  // multiple values are being used (e.g. table legend).\n  values.forEach((tuple, i) => {\n    const value = tuple[1];\n\n    if (i === 0 && 'first' in calculations) {\n      calculations.first = value;\n    }\n    if (i === values.length - 1 && 'last' in calculations) {\n      calculations.last = value;\n    }\n\n    // Handling specific to non-null values.\n    if (typeof value === 'number') {\n      nonNullCount += 1;\n      sum += value;\n\n      if ('first-number' in calculations && calculations['first-number'] === undefined) {\n        // Save the first number we see.\n        calculations['first-number'] = value;\n      }\n\n      if ('last-number' in calculations) {\n        // Keep setting the numbers we see, which will eventually be set to the\n        // last number when finished iterating.\n        calculations['last-number'] = value;\n      }\n\n      if ('min' in calculations) {\n        if (typeof calculations.min !== 'number') {\n          // Init the first time we see a number\n          calculations.min = value;\n        } else {\n          // Use lowest value once initialized\n          calculations.min = Math.min(calculations.min, value);\n        }\n      }\n\n      if ('max' in calculations) {\n        if (typeof calculations.max !== 'number') {\n          // Init the first time we see a number\n          calculations.max = value;\n        } else {\n          // Use highest value once initialized\n          calculations.max = Math.max(calculations.max, value);\n        }\n      }\n    }\n  });\n\n  // Set calculations that require iterating over all values.\n  if (nonNullCount > 0 && 'sum' in calculations) {\n    calculations.sum = sum;\n  }\n\n  if (nonNullCount > 0 && 'mean' in calculations) {\n    calculations.mean = sum / nonNullCount;\n  }\n\n  return calculations;\n}\n\n/**\n * Calculate a single value for a set of time series data.\n *\n * Use `getCalculations` instead if you need multiple calculations.\n *\n * @param values - Array of time series data.\n * @param calculation - Name of the calculation to calculate.\n */\nexport function getCalculation(values: TimeSeriesValueTuple[], calculation: CalculationType): CalculationValue {\n  return getCalculations(values, [calculation])[calculation];\n}\n\nfunction first(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'first');\n}\n\nfunction last(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'last');\n}\n\nfunction firstNumber(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'first-number');\n}\n\nfunction lastNumber(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'last-number');\n}\n\nfunction mean(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'mean');\n}\n\nfunction sum(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'sum');\n}\n\nfunction min(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'min');\n}\n\nfunction max(values: TimeSeriesValueTuple[]): CalculationValue {\n  return getCalculation(values, 'max');\n}\n"],"names":["DEFAULT_CALCULATION","CalculationsMap","first","last","firstNumber","lastNumber","mean","sum","min","max","CALCULATIONS_CONFIG","label","description","getCalculations","values","includeCalculations","calculations","reduce","initResult","calculation","undefined","nonNullCount","forEach","tuple","i","value","length","Math","getCalculation"],"mappings":"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"}

package/dist/model/datasource.d.ts

@@ -1,10 +1,15 @@
 import { Definition, UnknownSpec } from './definitions';
 import { Metadata, ProjectMetadata } from './resource';
 import { Display } from './display';
+export interface DatasourceSpec<PluginSpec = UnknownSpec> {
+    display?: Display;
+    default: boolean;
+    plugin: Definition<PluginSpec>;
+}
 /**
  * A Datasource that's available across all projects.
  */
-export interface GlobalDatasource {
+export interface GlobalDatasourceResource {
     kind: 'GlobalDatasource';
     metadata: Metadata;
     spec: DatasourceSpec;
@@ -12,17 +17,12 @@ export interface GlobalDatasource {
 /**
  * A Datasource resource, that belongs to a project.
  */
-export interface ProjectDatasource {
+export interface DatasourceResource {
     kind: 'Datasource';
     metadata: ProjectMetadata;
     spec: DatasourceSpec;
 }
-export type Datasource = ProjectDatasource | GlobalDatasource;
-export interface DatasourceSpec<PluginSpec = UnknownSpec> {
-    display?: Display;
-    default: boolean;
-    plugin: Definition<PluginSpec>;
-}
+export type Datasource = DatasourceResource | GlobalDatasourceResource;
 /**
  * A selector for pointing at a specific Datasource.
  */

package/dist/model/datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/model/datasource.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,cAAc,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,cAAc,CAAC;CACtB;AAED,MAAM,MAAM,UAAU,GAAG,iBAAiB,GAAG,gBAAgB,CAAC;AAE9D,MAAM,WAAW,cAAc,CAAC,UAAU,GAAG,WAAW;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;CACtB"}
+{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/model/datasource.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,WAAW,cAAc,CAAC,UAAU,GAAG,WAAW;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,cAAc,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,eAAe,CAAC;IAC1B,IAAI,EAAE,cAAc,CAAC;CACtB;AAED,MAAM,MAAM,UAAU,GAAG,kBAAkB,GAAG,wBAAwB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;CACtB"}