@perses-dev/plugin-system 0.54.0-beta.0 → 0.54.0-beta.10

package/dist/cjs/context/ValidationProvider.js

@@ -34,7 +34,7 @@ _export(exports, {
 const _jsxruntime = require("react/jsx-runtime");
 const _react = require("react");
 const _spec = require("@perses-dev/spec");
-const _core = require("@perses-dev/core");
+const _client = require("@perses-dev/client");
 const ValidationSchemasContext = /*#__PURE__*/ (0, _react.createContext)(undefined);
 function useValidationSchemas() {
     const ctx = (0, _react.useContext)(ValidationSchemasContext);
@@ -44,11 +44,12 @@ function useValidationSchemas() {
     return ctx;
 }
 function ValidationProvider({ children }) {
-    const [datasourceEditorSchema, setDatasourceEditorSchema] = (0, _react.useState)(_core.datasourceDefinitionSchema);
+    const [datasourceEditorSchema, setDatasourceEditorSchema] = (0, _react.useState)(_client.datasourceDefinitionSchema);
     const [panelEditorSchema, setPanelEditorSchema] = (0, _react.useState)(_spec.panelEditorSchema); // TODO I don't get why this does not compile
     const [variableEditorSchema, setVariableEditorSchema] = (0, _react.useState)(_spec.variableDefinitionSchema);
+    const [annotationEditorSchema, setAnnotationEditorSchema] = (0, _react.useState)(_spec.annotationSpecSchema);
     function setDatasourceEditorSchemaPlugin(pluginSchema) {
-        setDatasourceEditorSchema((0, _core.buildDatasourceDefinitionSchema)(pluginSchema));
+        setDatasourceEditorSchema((0, _client.buildDatasourceDefinitionSchema)(pluginSchema));
     }
     function setPanelEditorSchemaPlugin(pluginSchema) {
         setPanelEditorSchema((0, _spec.buildPanelEditorSchema)(pluginSchema));
@@ -56,14 +57,19 @@ function ValidationProvider({ children }) {
     function setVariableEditorSchemaPlugin(pluginSchema) {
         setVariableEditorSchema((0, _spec.buildVariableDefinitionSchema)(pluginSchema));
     }
+    function setAnnotationEditorSchemaPlugin(pluginSchema) {
+        setAnnotationEditorSchema((0, _spec.buildAnnotationSpecSchema)(pluginSchema));
+    }
     return /*#__PURE__*/ (0, _jsxruntime.jsx)(ValidationSchemasContext.Provider, {
         value: {
             datasourceEditorSchema,
             panelEditorSchema,
             variableEditorSchema,
+            annotationEditorSchema,
             setDatasourceEditorSchemaPlugin,
             setPanelEditorSchemaPlugin,
-            setVariableEditorSchemaPlugin
+            setVariableEditorSchemaPlugin,
+            setAnnotationEditorSchemaPlugin
         },
         children: children
     });

package/dist/cjs/model/alerts-queries.js

@@ -0,0 +1,16 @@
+// Copyright 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
+});

package/dist/cjs/model/annotations.js

@@ -0,0 +1,16 @@
+// Copyright 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
+});

package/dist/cjs/model/calculations.js

@@ -0,0 +1,178 @@
+// Copyright 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: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get CALCULATIONS_CONFIG () {
+        return CALCULATIONS_CONFIG;
+    },
+    get CalculationsMap () {
+        return CalculationsMap;
+    },
+    get DEFAULT_CALCULATION () {
+        return DEFAULT_CALCULATION;
+    },
+    get getCalculation () {
+        return getCalculation;
+    },
+    get getCalculations () {
+        return getCalculations;
+    }
+});
+const DEFAULT_CALCULATION = 'last'; // aligned with cue
+const CalculationsMap = {
+    first: first,
+    last: last,
+    'first-number': firstNumber,
+    'last-number': lastNumber,
+    mean: mean,
+    sum: sum,
+    min: min,
+    max: max
+};
+const CALCULATIONS_CONFIG = {
+    first: {
+        label: 'First',
+        description: 'First value'
+    },
+    last: {
+        label: 'Last',
+        description: 'Last value'
+    },
+    'first-number': {
+        label: 'First *',
+        description: 'First numeric value'
+    },
+    'last-number': {
+        label: 'Last *',
+        description: 'Last numeric value'
+    },
+    mean: {
+        label: 'Avg',
+        description: 'Average value excluding nulls'
+    },
+    sum: {
+        label: 'Sum',
+        description: 'The sum of all values'
+    },
+    min: {
+        label: 'Min',
+        description: 'Minimum value'
+    },
+    max: {
+        label: 'Max',
+        description: 'Maximum value'
+    }
+};
+function getCalculations(values, includeCalculations) {
+    const calculations = includeCalculations.reduce((initResult, calculation)=>{
+        initResult[calculation] = undefined;
+        return initResult;
+    }, {});
+    // We save these values as separate values instead of directly setting them
+    // in the calculations because they are needed by multiple calculations.
+    let nonNullCount = 0;
+    let sum = 0;
+    // We use this large function capable of performing one or more calculations
+    // in a single iteration of the data to minimize the performance impact of
+    // generating multiple calculations for large timeseries values. This is
+    // less optimized for certain single calculations when done in isolation (e.g.
+    // `last`), but will be more performant in the more expensive cases where
+    // multiple values are being used (e.g. table legend).
+    values.forEach((tuple, i)=>{
+        const value = tuple[1];
+        if (i === 0 && 'first' in calculations) {
+            calculations.first = value;
+        }
+        if (i === values.length - 1 && 'last' in calculations) {
+            calculations.last = value;
+        }
+        // Handling specific to non-null values.
+        if (typeof value === 'number') {
+            nonNullCount += 1;
+            sum += value;
+            if ('first-number' in calculations && calculations['first-number'] === undefined) {
+                // Save the first number we see.
+                calculations['first-number'] = value;
+            }
+            if ('last-number' in calculations) {
+                // Keep setting the numbers we see, which will eventually be set to the
+                // last number when finished iterating.
+                calculations['last-number'] = value;
+            }
+            if ('min' in calculations) {
+                if (typeof calculations.min !== 'number') {
+                    // Init the first time we see a number
+                    calculations.min = value;
+                } else {
+                    // Use lowest value once initialized
+                    calculations.min = Math.min(calculations.min, value);
+                }
+            }
+            if ('max' in calculations) {
+                if (typeof calculations.max !== 'number') {
+                    // Init the first time we see a number
+                    calculations.max = value;
+                } else {
+                    // Use highest value once initialized
+                    calculations.max = Math.max(calculations.max, value);
+                }
+            }
+        }
+    });
+    // Set calculations that require iterating over all values.
+    if (nonNullCount > 0 && 'sum' in calculations) {
+        calculations.sum = sum;
+    }
+    if (nonNullCount > 0 && 'mean' in calculations) {
+        calculations.mean = sum / nonNullCount;
+    }
+    return calculations;
+}
+function getCalculation(values, calculation) {
+    return getCalculations(values, [
+        calculation
+    ])[calculation];
+}
+function first(values) {
+    return getCalculation(values, 'first');
+}
+function last(values) {
+    return getCalculation(values, 'last');
+}
+function firstNumber(values) {
+    return getCalculation(values, 'first-number');
+}
+function lastNumber(values) {
+    return getCalculation(values, 'last-number');
+}
+function mean(values) {
+    return getCalculation(values, 'mean');
+}
+function sum(values) {
+    return getCalculation(values, 'sum');
+}
+function min(values) {
+    return getCalculation(values, 'min');
+}
+function max(values) {
+    return getCalculation(values, 'max');
+}

package/dist/cjs/model/index.js

@@ -14,6 +14,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+_export_star(require("./annotations"), exports);
 _export_star(require("./datasource"), exports);
 _export_star(require("./legend"), exports);
 _export_star(require("./log-queries"), exports);
@@ -26,6 +27,9 @@ _export_star(require("./time-series-queries"), exports);
 _export_star(require("./trace-queries"), exports);
 _export_star(require("./profile-queries"), exports);
 _export_star(require("./variables"), exports);
+_export_star(require("./calculations"), exports);
+_export_star(require("./alerts-queries"), exports);
+_export_star(require("./silences-queries"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/dist/cjs/model/legend.js

@@ -43,7 +43,8 @@ _export(exports, {
         return validateLegendSpec;
     }
 });
-const _core = require("@perses-dev/core");
+const _components = require("@perses-dev/components");
+const _calculations = require("./calculations");
 const legendValues = [
     'mean',
     'first',
@@ -89,7 +90,7 @@ const LEGEND_SIZE_CONFIG = {
     }
 };
 const LEGEND_VALUE_CONFIG = legendValues.reduce((config, value)=>{
-    config[value] = _core.CALCULATIONS_CONFIG[value];
+    config[value] = _calculations.CALCULATIONS_CONFIG[value];
     return config;
 }, {});
 function validateLegendSpec(legend) {
@@ -97,13 +98,13 @@ function validateLegendSpec(legend) {
         // undefined is valid since this is how legend is hidden by default
         return true;
     }
-    if (!(0, _core.isValidLegendPosition)(legend.position)) {
+    if (!(0, _components.isValidLegendPosition)(legend.position)) {
         return false;
     }
-    if (legend.mode && !(0, _core.isValidLegendMode)(legend.mode)) {
+    if (legend.mode && !(0, _components.isValidLegendMode)(legend.mode)) {
         return false;
     }
-    if (legend.size && !(0, _core.isValidLegendSize)(legend.size)) {
+    if (legend.size && !(0, _components.isValidLegendSize)(legend.size)) {
         return false;
     }
     return true;

package/dist/cjs/model/log-volume-utils.js

@@ -1,3 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "calculateVolumeInterval", {
+    enumerable: true,
+    get: function() {
+        return calculateVolumeInterval;
+    }
+});
 // Copyright 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.
@@ -11,16 +21,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // Target number of bars for log volume histogram
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "calculateVolumeInterval", {
-    enumerable: true,
-    get: function() {
-        return calculateVolumeInterval;
-    }
-});
 const TARGET_HISTOGRAM_BARS = 40;
 // Standard intervals for histogram calculations (in milliseconds)
 const STANDARD_INTERVALS = [

package/dist/cjs/model/plugin-loading.js

@@ -20,21 +20,37 @@ Object.defineProperty(exports, "dynamicImportPluginLoader", {
         return dynamicImportPluginLoader;
     }
 });
+const _plugins = require("./plugins");
 function dynamicImportPluginLoader(plugins) {
-    const importMap = new Map(plugins.map((plugin)=>[
-            plugin.resource,
-            plugin.importPlugin
-        ]));
+    const importMap = new Map();
+    for (const p of plugins){
+        const { resource, resource: { kind, metadata: { name, registry, version } }, importPlugin } = p;
+        importMap.set((0, _plugins.getPluginModuleCompoundKey)({
+            kind,
+            name,
+            registry,
+            version
+        }), {
+            resource,
+            importPlugin
+        });
+    }
     return {
         async getInstalledPlugins () {
-            return Promise.resolve(Array.from(importMap.keys()));
+            return Promise.resolve(Array.from(importMap.values()).map((v)=>v.resource));
         },
         importPluginModule (resource) {
-            const importFn = importMap.get(resource);
-            if (importFn === undefined) {
+            const { kind, metadata: { name, version, registry } } = resource;
+            const { importPlugin } = importMap.get((0, _plugins.getPluginModuleCompoundKey)({
+                kind,
+                name,
+                registry,
+                version
+            })) || {};
+            if (importPlugin === undefined) {
                 throw new Error('Plugin not found');
             }
-            return importFn();
+            return importPlugin();
         }
     };
 }

package/dist/cjs/model/plugins.js

@@ -14,3 +14,13 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+Object.defineProperty(exports, "getPluginModuleCompoundKey", {
+    enumerable: true,
+    get: function() {
+        return getPluginModuleCompoundKey;
+    }
+});
+function getPluginModuleCompoundKey(compoundKey) {
+    const { kind, name, registry, version } = compoundKey;
+    return `${kind}:${name}:${registry ?? ''}:${version ?? ''}`;
+}

package/dist/cjs/model/silences-queries.js

@@ -0,0 +1,16 @@
+// Copyright 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
+});

package/dist/cjs/model/time-series-queries.js

@@ -14,3 +14,13 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+Object.defineProperty(exports, "isTimeSeriesValueTuple", {
+    enumerable: true,
+    get: function() {
+        return isTimeSeriesValueTuple;
+    }
+});
+function isTimeSeriesValueTuple(data) {
+    if (data.length !== 2) return false;
+    return true;
+}

package/dist/cjs/remote/PluginRuntime.js

@@ -147,7 +147,14 @@ const getPluginRuntime = ()=>{
                         requiredVersion: '^5.5.0'
                     }
                 },
-                // TODO should we add @perses-dev/spec here ?
+                '@perses-dev/spec': {
+                    version: '0.2.0-beta.2',
+                    lib: ()=>require('@perses-dev/spec'),
+                    shareConfig: {
+                        singleton: true,
+                        requiredVersion: '^0.2.0-beta.2'
+                    }
+                },
                 '@perses-dev/core': {
                     version: '0.53.1',
                     lib: ()=>require('@perses-dev/core'),
@@ -156,6 +163,14 @@ const getPluginRuntime = ()=>{
                         requiredVersion: '^0.53.1'
                     }
                 },
+                '@perses-dev/client': {
+                    version: '0.54.0-beta.1',
+                    lib: ()=>require('@perses-dev/client'),
+                    shareConfig: {
+                        singleton: true,
+                        requiredVersion: '^0.54.0-beta.1'
+                    }
+                },
                 '@perses-dev/components': {
                     version: '0.53.1',
                     lib: ()=>require('@perses-dev/components'),
@@ -268,28 +283,49 @@ const getPluginRuntime = ()=>{
     }
     return instance;
 };
-const registerRemote = (name, baseURL)=>{
+function getModuleFederationRemoteName(name, registry, version) {
+    return `${name}:${registry ?? ''}:${version ?? ''}`;
+}
+const registerRemote = (name, registry, version, baseURL)=>{
     const pluginRuntime = getPluginRuntime();
-    const existingRemote = pluginRuntime.options.remotes.find((remote)=>remote.name === name);
+    const registryName = getModuleFederationRemoteName(name, registry, version);
+    const existingRemote = pluginRuntime.options.remotes.find((remote)=>remote.name === registryName);
     if (!existingRemote) {
-        const remoteEntryURL = baseURL ? `${baseURL}/${name}/mf-manifest.json` : `/plugins/${name}/mf-manifest.json`;
+        const nameVersionRegistry = [
+            name,
+            version,
+            registry
+        ].filter(Boolean).join('~');
+        const prefix = baseURL || '/plugins';
+        const remoteEntryURL = `${prefix}/${nameVersionRegistry}/mf-manifest.json`;
         pluginRuntime.registerRemotes([
             {
-                name,
+                name: registryName,
                 entry: remoteEntryURL,
-                alias: name
+                alias: registryName
             }
         ]);
     }
 };
-const loadPlugin = async (moduleName, pluginName, baseURL)=>{
-    registerRemote(moduleName, baseURL);
+const loadPlugin = async (target)=>{
+    const { moduleName, pluginName, registry, version, baseURL } = target;
+    registerRemote(moduleName, registry, version, baseURL);
     const pluginRuntime = getPluginRuntime();
-    return pluginRuntime.loadRemote(`${moduleName}/${pluginName}`);
+    const registryName = getModuleFederationRemoteName(moduleName, registry, version);
+    return pluginRuntime.loadRemote(`${registryName}/${pluginName}`);
 };
 function usePluginRuntime({ plugin }) {
     return {
         pluginRuntime: getPluginRuntime(),
-        loadPlugin: ()=>loadPlugin(plugin.moduleName, plugin.name, plugin.baseURL)
+        loadPlugin: ()=>{
+            const { moduleName, name: pluginName, registry, version, baseURL } = plugin;
+            return loadPlugin({
+                moduleName,
+                pluginName,
+                registry,
+                version,
+                baseURL
+            });
+        }
     };
 }

package/dist/cjs/remote/remotePluginLoader.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "remotePluginLoader", {
         return remotePluginLoader;
     }
 });
+const _pluginsystem = require("@perses-dev/plugin-system");
 const _PluginRuntime = require("./PluginRuntime");
 const isPluginMetadata = (plugin)=>{
     return typeof plugin === 'object' && plugin !== null && 'kind' in plugin && 'spec' in plugin && typeof plugin.spec === 'object' && plugin.spec !== null && 'name' in plugin.spec;
@@ -59,17 +60,39 @@ function remotePluginLoader(options) {
             return pluginModules;
         },
         importPluginModule: async (resource)=>{
-            const pluginModuleName = resource.metadata.name;
+            const { name: pluginModuleName, version, registry } = resource.metadata;
             const pluginModule = {};
-            for (const plugin of resource.spec.plugins){
-                const remotePluginModule = await (0, _PluginRuntime.loadPlugin)(pluginModuleName, plugin.spec.name, pluginsAssetsPath);
+            const loadPromises = resource.spec.plugins.map(async (plugin)=>{
+                const remotePluginModule = await (0, _PluginRuntime.loadPlugin)({
+                    moduleName: pluginModuleName,
+                    pluginName: plugin.spec.name,
+                    registry,
+                    version,
+                    baseURL: pluginsAssetsPath
+                });
                 const remotePlugin = remotePluginModule?.[plugin.spec.name];
                 if (remotePlugin) {
-                    pluginModule[plugin.spec.name] = remotePlugin;
+                    return {
+                        kind: plugin.kind,
+                        name: plugin.spec.name,
+                        remotePlugin
+                    };
                 } else {
                     console.error(`RemotePluginLoader: Error loading plugin ${plugin.spec.name}`);
+                    return null;
                 }
-            }
+            });
+            const loadedPlugins = await Promise.all(loadPromises);
+            loadedPlugins.forEach((item)=>{
+                if (item?.remotePlugin) {
+                    pluginModule[(0, _pluginsystem.getPluginModuleCompoundKey)({
+                        kind: item.kind,
+                        name: item.name,
+                        registry,
+                        version
+                    })] = item.remotePlugin;
+                }
+            });
             return pluginModule;
         }
     };