@perses-dev/components 0.55.0-beta.1 → 0.55.0-beta.11

package/dist/utils/variable-interpolation.js

@@ -170,7 +170,7 @@ const VARIABLE_REGEX = /\$(\w+)|\${(\w+)(?:\.([^:^}]+))?(?::([^}]+))?}/gm;
     variables// Sorting variables by their length.
     // In order to not have a variable name have contained in another variable name.
     // i.e.: $__range replacing $__range_ms => '3600_ms' instead of '3600000'
-    .sort((a, b)=>b.length - a.length).forEach((v)=>{
+    .toSorted((a, b)=>b.length - a.length).forEach((v)=>{
         const variable = variableState[v];
         if (variable && variable.value !== undefined) {
             finalText = replaceVariable(finalText, v, variable?.value, variablesMap.get(v));
@@ -178,5 +178,81 @@ const VARIABLE_REGEX = /\$(\w+)|\${(\w+)(?:\.([^:^}]+))?(?::([^}]+))?}/gm;
     });
     return finalText;
 }
+/**
+ * Replace variables using their compact display values when available.
+ */ export function replaceVariablesForDisplay(text, variableState) {
+    const displayState = {};
+    for (const [name, state] of Object.entries(variableState)){
+        displayState[name] = state.displayValue === undefined ? state : {
+            ...state,
+            value: state.displayValue
+        };
+    }
+    return replaceVariables(text, displayState);
+}
+/**
+ * Replace dashboard variables in a URL, including those nested inside
+ * percent-encoded query parameters (e.g. Explore `data=%24var`).
+ *
+ * 1. `replaceVariables` on the raw string (unencoded `$var` still works).
+ * 2. Parse query params (URLSearchParams decodes once), expand each value,
+ *    rebuild with `append` so repeated keys are preserved.
+ * 3. Keep the original path/prefix before `?` so relative targets are unchanged
+ *    (`?data=…`, `explore?…`, not forced `/…`).
+ */ export function replaceVariablesInUrl(url, variableState) {
+    let result = replaceVariables(url, variableState);
+    try {
+        const isAbsolute = /^https?:\/\//i.test(result);
+        const isProtocolRelative = result.startsWith('//');
+        // Skip non-http schemes (mailto:, etc.) — only expand via step 1.
+        const hasNonHttpScheme = /^[a-z][a-z0-9+.-]*:/i.test(result);
+        if (!isAbsolute && !isProtocolRelative && hasNonHttpScheme) {
+            return result;
+        }
+        const parseInput = isProtocolRelative ? `http:${result}` : result;
+        const parsedUrl = new URL(parseInput, isAbsolute || isProtocolRelative ? undefined : 'http://perses.local');
+        // Rebuild query in original pair order so searchParams key order is stable.
+        const originalEntries = Array.from(parsedUrl.searchParams.entries());
+        let changed = false;
+        const replacedEntries = originalEntries.map(([key, value])=>{
+            const replacedValue = replaceVariables(value, variableState);
+            if (replacedValue !== value) {
+                changed = true;
+            }
+            return [
+                key,
+                replacedValue
+            ];
+        });
+        if (!changed) {
+            return result;
+        }
+        const keysToClear = [
+            ...new Set(originalEntries.map(([key])=>key))
+        ];
+        for (const key of keysToClear){
+            parsedUrl.searchParams.delete(key);
+        }
+        for (const [key, value] of replacedEntries){
+            parsedUrl.searchParams.append(key, value);
+        }
+        if (isAbsolute) {
+            return parsedUrl.href;
+        }
+        if (isProtocolRelative) {
+            return `//${parsedUrl.host}${parsedUrl.pathname}${parsedUrl.search}${parsedUrl.hash}`;
+        }
+        // Relative: preserve original substring before ?/# (do not force leading /).
+        const q = result.indexOf('?');
+        const h = result.indexOf('#');
+        let baseEnd = result.length;
+        if (q >= 0) baseEnd = q;
+        else if (h >= 0) baseEnd = h;
+        const base = result.slice(0, baseEnd);
+        return `${base}${parsedUrl.search}${parsedUrl.hash}`;
+    } catch  {
+        return result;
+    }
+}
 
 //# sourceMappingURL=variable-interpolation.js.map

package/dist/utils/variable-interpolation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/variable-interpolation.ts"],"sourcesContent":["// Copyright 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 { VariableValue } from '@perses-dev/spec';\n\n/**\n * Option for a variable with label and value\n */\nexport type VariableOption = { label: string; value: string };\n\n/**\n * State of a variable including its current value, options, and loading state\n */\nexport type VariableState = {\n  value: VariableValue;\n  options?: VariableOption[];\n  loading: boolean;\n  error?: Error;\n  /**\n   * If a local variable is overriding an external variable, local var will have the flag ``overriding=true``.\n   */\n  overriding?: boolean;\n  /**\n   * If a local variable is overriding an external variable, external var will have the flag ``overridden=true``.\n   */\n  overridden?: boolean;\n  defaultValue?: VariableValue;\n  customAllValue?: string;\n};\n\n/**\n * Map of variable names to their states\n */\nexport type VariableStateMap = Record<string, VariableState>;\n\n/**\n * Supported interpolation formats for variable values\n */\nexport enum InterpolationFormat {\n  CSV = 'csv',\n  DISTRIBUTED = 'distributed',\n  DOUBLEQUOTE = 'doublequote',\n  GLOB = 'glob',\n  JSON = 'json',\n  LUCENE = 'lucene',\n  PERCENTENCODE = 'percentencode',\n  PIPE = 'pipe',\n  PROMETHEUS = 'prometheus',\n  RAW = 'raw',\n  REGEX = 'regex',\n  SINGLEQUOTE = 'singlequote',\n  SQLSTRING = 'sqlstring',\n  TEXT = 'text',\n  QUERYPARAM = 'queryparam',\n  REGEX_LITERAL = 'regexliteral',\n}\n\nfunction stringToFormat(val: string | undefined): InterpolationFormat | undefined {\n  if (!val) return undefined;\n\n  const lowerVal = val.toLowerCase();\n  return Object.values(InterpolationFormat).find((format) => format === lowerVal) || undefined;\n}\n\n/**\n * Interpolate an array of values with a specific format\n */\nexport function interpolate(values: string[], name: string, format: InterpolationFormat): string {\n  switch (format) {\n    case InterpolationFormat.CSV:\n    case InterpolationFormat.RAW:\n      return values.join(',');\n    case InterpolationFormat.DISTRIBUTED: {\n      const [first, ...rest] = values;\n      return `${[first, ...rest.map((v) => `${name}=${v}`)].join(',')}`;\n    }\n    case InterpolationFormat.DOUBLEQUOTE:\n      return values.map((v) => `\"${v}\"`).join(',');\n    case InterpolationFormat.GLOB:\n      return `{${values.join(',')}}`;\n    case InterpolationFormat.JSON: {\n      // values might contain stringified JSON objects so we need to parse them first\n      // and then return a JSON stringified array to return valid JSON\n      const parsedValues = values.map((v) => {\n        try {\n          return JSON.parse(v);\n        } catch {\n          return v;\n        }\n      });\n\n      return JSON.stringify(parsedValues);\n    }\n    case InterpolationFormat.LUCENE:\n      return `(${values.map((v) => `\"${v}\"`).join(' OR ')})`;\n    case InterpolationFormat.PERCENTENCODE:\n      return encodeURIComponent(values.join(','));\n    case InterpolationFormat.PIPE:\n      return values.join('|');\n    case InterpolationFormat.REGEX: {\n      const escapedRegex = values.map((v) => v.replace(/[-/\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'));\n      return `(${escapedRegex.join('|')})`;\n    }\n    case InterpolationFormat.REGEX_LITERAL: {\n      const escapedRegex = values.map((v) => v.replace(/[-/\\\\^$*+?.()|[\\]{}]/g, '\\\\\\\\$&'));\n      return `(${escapedRegex.join('|')})`;\n    }\n    case InterpolationFormat.SINGLEQUOTE:\n      return values.map((v) => `'${v}'`).join(',');\n    case InterpolationFormat.SQLSTRING:\n      return values.map((v) => `'${v.replace(/'/g, \"''\")}'`).join(',');\n    case InterpolationFormat.TEXT:\n      return values.join(' + ');\n    case InterpolationFormat.QUERYPARAM:\n      return values.map((v) => `${name}=${encodeURIComponent(v)}`).join('&');\n    case InterpolationFormat.PROMETHEUS:\n    default:\n      return `(${values.join('|')})`;\n  }\n}\n\n/**\n * Replace a single variable in text with its value\n */\nexport function replaceVariable(\n  text: string,\n  varName: string,\n  variableValue: VariableValue,\n  varFormat?: InterpolationFormat\n): string {\n  const variableSyntax = '$' + varName;\n  const alternativeVariableSyntax = '${' + varName + (varFormat ? ':' + varFormat : '') + '}';\n\n  let replaceString = '';\n  if (Array.isArray(variableValue)) {\n    replaceString = interpolate(variableValue, varName, varFormat || InterpolationFormat.PROMETHEUS);\n  }\n  if (typeof variableValue === 'string') {\n    replaceString = interpolate([variableValue], varName, varFormat || InterpolationFormat.RAW);\n  }\n  text = text.replaceAll(variableSyntax, replaceString);\n  return text.replaceAll(alternativeVariableSyntax, replaceString);\n}\n\n// This regular expression is designed to identify variable references in a string.\n// It supports two formats for referencing variables:\n// 1. $variableName - This is a simpler format, and the regular expression captures the variable name (\\w+ matches one or more word characters).\n// 2. ${variableName} - This is a more complex format and the regular expression captures the variable name (\\w+ matches one or more word characters) in the curly braces.\n// 3. ${variableName:format} - This is a more complex format that allows specifying a format interpolation.\n\nconst VARIABLE_REGEX = /\\$(\\w+)|\\${(\\w+)(?:\\.([^:^}]+))?(?::([^}]+))?}/gm;\n\n/**\n * Returns a list of variables\n */\nexport function parseVariables(text: string): string[] {\n  const matches = new Set<string>();\n  let match;\n\n  while ((match = VARIABLE_REGEX.exec(text)) !== null) {\n    if (match) {\n      if (match[1]) {\n        // \\$(\\w+)\\\n        matches.add(match[1]);\n      } else if (match[2]) {\n        // \\${(\\w+)}\\\n        matches.add(match[2]);\n      }\n    }\n  }\n  // return unique matches\n  return Array.from(matches.values());\n}\n\n/**\n * Returns a map of variable names and its format. If no format is specified, it will be undefined.\n */\nexport function parseVariablesAndFormat(text: string): Map<string, InterpolationFormat | undefined> {\n  const matches = new Map<string, InterpolationFormat | undefined>();\n  let match;\n\n  while ((match = VARIABLE_REGEX.exec(text)) !== null) {\n    if (match) {\n      let format = undefined;\n      if (match[4]) {\n        format = match[4];\n      }\n      if (match[1]) {\n        // \\$(\\w+)\\\n        matches.set(match[1], stringToFormat(format));\n      } else if (match[2]) {\n        // \\${(\\w+)}\\\n        matches.set(match[2], stringToFormat(format));\n      }\n    }\n  }\n  return matches;\n}\n\n/**\n * Replace all variables in text with their values from the variable state map\n */\nexport function replaceVariables(text: string, variableState: VariableStateMap): string {\n  const variablesMap = parseVariablesAndFormat(text);\n  const variables = Array.from(variablesMap.keys());\n  let finalText = text;\n  variables\n    // Sorting variables by their length.\n    // In order to not have a variable name have contained in another variable name.\n    // i.e.: $__range replacing $__range_ms => '3600_ms' instead of '3600000'\n    .sort((a, b) => b.length - a.length)\n    .forEach((v) => {\n      const variable = variableState[v];\n      if (variable && variable.value !== undefined) {\n        finalText = replaceVariable(finalText, v, variable?.value, variablesMap.get(v));\n      }\n    });\n\n  return finalText;\n}\n"],"names":["InterpolationFormat","stringToFormat","val","undefined","lowerVal","toLowerCase","Object","values","find","format","interpolate","name","join","first","rest","map","v","parsedValues","JSON","parse","stringify","encodeURIComponent","escapedRegex","replace","replaceVariable","text","varName","variableValue","varFormat","variableSyntax","alternativeVariableSyntax","replaceString","Array","isArray","replaceAll","VARIABLE_REGEX","parseVariables","matches","Set","match","exec","add","from","parseVariablesAndFormat","Map","set","replaceVariables","variableState","variablesMap","variables","keys","finalText","sort","a","b","length","forEach","variable","value","get"],"mappings":"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"}
+{"version":3,"sources":["../../src/utils/variable-interpolation.ts"],"sourcesContent":["// Copyright 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 type { VariableValue } from '@perses-dev/spec';\n\n/**\n * Option for a variable with label and value\n */\nexport type VariableOption = { label: string; value: string };\n\n/**\n * State of a variable including its current value, options, and loading state\n */\nexport type VariableState = {\n  value: VariableValue;\n  /**\n   * Optional compact value for human-readable text. Query interpolation continues to use `value`.\n   */\n  displayValue?: VariableValue;\n  options?: VariableOption[];\n  loading: boolean;\n  error?: Error;\n  /**\n   * If a local variable is overriding an external variable, local var will have the flag ``overriding=true``.\n   */\n  overriding?: boolean;\n  /**\n   * If a local variable is overriding an external variable, external var will have the flag ``overridden=true``.\n   */\n  overridden?: boolean;\n  defaultValue?: VariableValue;\n  customAllValue?: string;\n};\n\n/**\n * Map of variable names to their states\n */\nexport type VariableStateMap = Record<string, VariableState>;\n\n/**\n * Supported interpolation formats for variable values\n */\nexport enum InterpolationFormat {\n  CSV = 'csv',\n  DISTRIBUTED = 'distributed',\n  DOUBLEQUOTE = 'doublequote',\n  GLOB = 'glob',\n  JSON = 'json',\n  LUCENE = 'lucene',\n  PERCENTENCODE = 'percentencode',\n  PIPE = 'pipe',\n  PROMETHEUS = 'prometheus',\n  RAW = 'raw',\n  REGEX = 'regex',\n  SINGLEQUOTE = 'singlequote',\n  SQLSTRING = 'sqlstring',\n  TEXT = 'text',\n  QUERYPARAM = 'queryparam',\n  REGEX_LITERAL = 'regexliteral',\n}\n\nfunction stringToFormat(val: string | undefined): InterpolationFormat | undefined {\n  if (!val) return undefined;\n\n  const lowerVal = val.toLowerCase();\n  return Object.values(InterpolationFormat).find((format) => format === lowerVal) || undefined;\n}\n\n/**\n * Interpolate an array of values with a specific format\n */\nexport function interpolate(values: string[], name: string, format: InterpolationFormat): string {\n  switch (format) {\n    case InterpolationFormat.CSV:\n    case InterpolationFormat.RAW:\n      return values.join(',');\n    case InterpolationFormat.DISTRIBUTED: {\n      const [first, ...rest] = values;\n      return `${[first, ...rest.map((v) => `${name}=${v}`)].join(',')}`;\n    }\n    case InterpolationFormat.DOUBLEQUOTE:\n      return values.map((v) => `\"${v}\"`).join(',');\n    case InterpolationFormat.GLOB:\n      return `{${values.join(',')}}`;\n    case InterpolationFormat.JSON: {\n      // values might contain stringified JSON objects so we need to parse them first\n      // and then return a JSON stringified array to return valid JSON\n      const parsedValues = values.map((v) => {\n        try {\n          return JSON.parse(v);\n        } catch {\n          return v;\n        }\n      });\n\n      return JSON.stringify(parsedValues);\n    }\n    case InterpolationFormat.LUCENE:\n      return `(${values.map((v) => `\"${v}\"`).join(' OR ')})`;\n    case InterpolationFormat.PERCENTENCODE:\n      return encodeURIComponent(values.join(','));\n    case InterpolationFormat.PIPE:\n      return values.join('|');\n    case InterpolationFormat.REGEX: {\n      const escapedRegex = values.map((v) => v.replace(/[-/\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'));\n      return `(${escapedRegex.join('|')})`;\n    }\n    case InterpolationFormat.REGEX_LITERAL: {\n      const escapedRegex = values.map((v) => v.replace(/[-/\\\\^$*+?.()|[\\]{}]/g, '\\\\\\\\$&'));\n      return `(${escapedRegex.join('|')})`;\n    }\n    case InterpolationFormat.SINGLEQUOTE:\n      return values.map((v) => `'${v}'`).join(',');\n    case InterpolationFormat.SQLSTRING:\n      return values.map((v) => `'${v.replace(/'/g, \"''\")}'`).join(',');\n    case InterpolationFormat.TEXT:\n      return values.join(' + ');\n    case InterpolationFormat.QUERYPARAM:\n      return values.map((v) => `${name}=${encodeURIComponent(v)}`).join('&');\n    case InterpolationFormat.PROMETHEUS:\n    default:\n      return `(${values.join('|')})`;\n  }\n}\n\n/**\n * Replace a single variable in text with its value\n */\nexport function replaceVariable(\n  text: string,\n  varName: string,\n  variableValue: VariableValue,\n  varFormat?: InterpolationFormat,\n): string {\n  const variableSyntax = '$' + varName;\n  const alternativeVariableSyntax = '${' + varName + (varFormat ? ':' + varFormat : '') + '}';\n\n  let replaceString = '';\n  if (Array.isArray(variableValue)) {\n    replaceString = interpolate(variableValue, varName, varFormat || InterpolationFormat.PROMETHEUS);\n  }\n  if (typeof variableValue === 'string') {\n    replaceString = interpolate([variableValue], varName, varFormat || InterpolationFormat.RAW);\n  }\n  text = text.replaceAll(variableSyntax, replaceString);\n  return text.replaceAll(alternativeVariableSyntax, replaceString);\n}\n\n// This regular expression is designed to identify variable references in a string.\n// It supports two formats for referencing variables:\n// 1. $variableName - This is a simpler format, and the regular expression captures the variable name (\\w+ matches one or more word characters).\n// 2. ${variableName} - This is a more complex format and the regular expression captures the variable name (\\w+ matches one or more word characters) in the curly braces.\n// 3. ${variableName:format} - This is a more complex format that allows specifying a format interpolation.\n\nconst VARIABLE_REGEX = /\\$(\\w+)|\\${(\\w+)(?:\\.([^:^}]+))?(?::([^}]+))?}/gm;\n\n/**\n * Returns a list of variables\n */\nexport function parseVariables(text: string): string[] {\n  const matches = new Set<string>();\n  let match;\n\n  while ((match = VARIABLE_REGEX.exec(text)) !== null) {\n    if (match) {\n      if (match[1]) {\n        // \\$(\\w+)\\\n        matches.add(match[1]);\n      } else if (match[2]) {\n        // \\${(\\w+)}\\\n        matches.add(match[2]);\n      }\n    }\n  }\n  // return unique matches\n  return Array.from(matches.values());\n}\n\n/**\n * Returns a map of variable names and its format. If no format is specified, it will be undefined.\n */\nexport function parseVariablesAndFormat(text: string): Map<string, InterpolationFormat | undefined> {\n  const matches = new Map<string, InterpolationFormat | undefined>();\n  let match;\n\n  while ((match = VARIABLE_REGEX.exec(text)) !== null) {\n    if (match) {\n      let format = undefined;\n      if (match[4]) {\n        format = match[4];\n      }\n      if (match[1]) {\n        // \\$(\\w+)\\\n        matches.set(match[1], stringToFormat(format));\n      } else if (match[2]) {\n        // \\${(\\w+)}\\\n        matches.set(match[2], stringToFormat(format));\n      }\n    }\n  }\n  return matches;\n}\n\n/**\n * Replace all variables in text with their values from the variable state map\n */\nexport function replaceVariables(text: string, variableState: VariableStateMap): string {\n  const variablesMap = parseVariablesAndFormat(text);\n  const variables = Array.from(variablesMap.keys());\n  let finalText = text;\n  variables\n    // Sorting variables by their length.\n    // In order to not have a variable name have contained in another variable name.\n    // i.e.: $__range replacing $__range_ms => '3600_ms' instead of '3600000'\n    .toSorted((a, b) => b.length - a.length)\n    .forEach((v) => {\n      const variable = variableState[v];\n      if (variable && variable.value !== undefined) {\n        finalText = replaceVariable(finalText, v, variable?.value, variablesMap.get(v));\n      }\n    });\n\n  return finalText;\n}\n\n/**\n * Replace variables using their compact display values when available.\n */\nexport function replaceVariablesForDisplay(text: string, variableState: VariableStateMap): string {\n  const displayState: VariableStateMap = {};\n  for (const [name, state] of Object.entries(variableState)) {\n    displayState[name] = state.displayValue === undefined ? state : { ...state, value: state.displayValue };\n  }\n  return replaceVariables(text, displayState);\n}\n\n/**\n * Replace dashboard variables in a URL, including those nested inside\n * percent-encoded query parameters (e.g. Explore `data=%24var`).\n *\n * 1. `replaceVariables` on the raw string (unencoded `$var` still works).\n * 2. Parse query params (URLSearchParams decodes once), expand each value,\n *    rebuild with `append` so repeated keys are preserved.\n * 3. Keep the original path/prefix before `?` so relative targets are unchanged\n *    (`?data=…`, `explore?…`, not forced `/…`).\n */\nexport function replaceVariablesInUrl(url: string, variableState: VariableStateMap): string {\n  let result = replaceVariables(url, variableState);\n\n  try {\n    const isAbsolute = /^https?:\\/\\//i.test(result);\n    const isProtocolRelative = result.startsWith('//');\n    // Skip non-http schemes (mailto:, etc.) — only expand via step 1.\n    const hasNonHttpScheme = /^[a-z][a-z0-9+.-]*:/i.test(result);\n    if (!isAbsolute && !isProtocolRelative && hasNonHttpScheme) {\n      return result;\n    }\n\n    const parseInput = isProtocolRelative ? `http:${result}` : result;\n    const parsedUrl = new URL(parseInput, isAbsolute || isProtocolRelative ? undefined : 'http://perses.local');\n\n    // Rebuild query in original pair order so searchParams key order is stable.\n    const originalEntries = Array.from(parsedUrl.searchParams.entries());\n    let changed = false;\n    const replacedEntries = originalEntries.map(([key, value]) => {\n      const replacedValue = replaceVariables(value, variableState);\n      if (replacedValue !== value) {\n        changed = true;\n      }\n      return [key, replacedValue] as const;\n    });\n\n    if (!changed) {\n      return result;\n    }\n\n    const keysToClear = [...new Set(originalEntries.map(([key]) => key))];\n    for (const key of keysToClear) {\n      parsedUrl.searchParams.delete(key);\n    }\n    for (const [key, value] of replacedEntries) {\n      parsedUrl.searchParams.append(key, value);\n    }\n\n    if (isAbsolute) {\n      return parsedUrl.href;\n    }\n    if (isProtocolRelative) {\n      return `//${parsedUrl.host}${parsedUrl.pathname}${parsedUrl.search}${parsedUrl.hash}`;\n    }\n\n    // Relative: preserve original substring before ?/# (do not force leading /).\n    const q = result.indexOf('?');\n    const h = result.indexOf('#');\n    let baseEnd = result.length;\n    if (q >= 0) baseEnd = q;\n    else if (h >= 0) baseEnd = h;\n    const base = result.slice(0, baseEnd);\n    return `${base}${parsedUrl.search}${parsedUrl.hash}`;\n  } catch {\n    return result;\n  }\n}\n"],"names":["InterpolationFormat","stringToFormat","val","undefined","lowerVal","toLowerCase","Object","values","find","format","interpolate","name","join","first","rest","map","v","parsedValues","JSON","parse","stringify","encodeURIComponent","escapedRegex","replace","replaceVariable","text","varName","variableValue","varFormat","variableSyntax","alternativeVariableSyntax","replaceString","Array","isArray","replaceAll","VARIABLE_REGEX","parseVariables","matches","Set","match","exec","add","from","parseVariablesAndFormat","Map","set","replaceVariables","variableState","variablesMap","variables","keys","finalText","toSorted","a","b","length","forEach","variable","value","get","replaceVariablesForDisplay","displayState","state","entries","displayValue","replaceVariablesInUrl","url","result","isAbsolute","test","isProtocolRelative","startsWith","hasNonHttpScheme","parseInput","parsedUrl","URL","originalEntries","searchParams","changed","replacedEntries","key","replacedValue","keysToClear","delete","append","href","host","pathname","search","hash","q","indexOf","h","baseEnd","base","slice"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAsCjC;;CAEC,GACD,OAAO,IAAA,AAAKA,6CAAAA;;;;;;;;;;;;;;;;;WAAAA;MAiBX;AAED,SAASC,eAAeC,GAAuB;IAC7C,IAAI,CAACA,KAAK,OAAOC;IAEjB,MAAMC,WAAWF,IAAIG,WAAW;IAChC,OAAOC,OAAOC,MAAM,CAACP,qBAAqBQ,IAAI,CAAC,CAACC,SAAWA,WAAWL,aAAaD;AACrF;AAEA;;CAEC,GACD,OAAO,SAASO,YAAYH,MAAgB,EAAEI,IAAY,EAAEF,MAA2B;IACrF,OAAQA;QACN;QACA;YACE,OAAOF,OAAOK,IAAI,CAAC;QACrB;YAAsC;gBACpC,MAAM,CAACC,OAAO,GAAGC,KAAK,GAAGP;gBACzB,OAAO,GAAG;oBAACM;uBAAUC,KAAKC,GAAG,CAAC,CAACC,IAAM,GAAGL,KAAK,CAAC,EAAEK,GAAG;iBAAE,CAACJ,IAAI,CAAC,MAAM;YACnE;QACA;YACE,OAAOL,OAAOQ,GAAG,CAAC,CAACC,IAAM,CAAC,CAAC,EAAEA,EAAE,CAAC,CAAC,EAAEJ,IAAI,CAAC;QAC1C;YACE,OAAO,CAAC,CAAC,EAAEL,OAAOK,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC;YAA+B;gBAC7B,+EAA+E;gBAC/E,gEAAgE;gBAChE,MAAMK,eAAeV,OAAOQ,GAAG,CAAC,CAACC;oBAC/B,IAAI;wBACF,OAAOE,KAAKC,KAAK,CAACH;oBACpB,EAAE,OAAM;wBACN,OAAOA;oBACT;gBACF;gBAEA,OAAOE,KAAKE,SAAS,CAACH;YACxB;QACA;YACE,OAAO,CAAC,CAAC,EAAEV,OAAOQ,GAAG,CAAC,CAACC,IAAM,CAAC,CAAC,EAAEA,EAAE,CAAC,CAAC,EAAEJ,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxD;YACE,OAAOS,mBAAmBd,OAAOK,IAAI,CAAC;QACxC;YACE,OAAOL,OAAOK,IAAI,CAAC;QACrB;YAAgC;gBAC9B,MAAMU,eAAef,OAAOQ,GAAG,CAAC,CAACC,IAAMA,EAAEO,OAAO,CAAC,yBAAyB;gBAC1E,OAAO,CAAC,CAAC,EAAED,aAAaV,IAAI,CAAC,KAAK,CAAC,CAAC;YACtC;QACA;YAAwC;gBACtC,MAAMU,eAAef,OAAOQ,GAAG,CAAC,CAACC,IAAMA,EAAEO,OAAO,CAAC,yBAAyB;gBAC1E,OAAO,CAAC,CAAC,EAAED,aAAaV,IAAI,CAAC,KAAK,CAAC,CAAC;YACtC;QACA;YACE,OAAOL,OAAOQ,GAAG,CAAC,CAACC,IAAM,CAAC,CAAC,EAAEA,EAAE,CAAC,CAAC,EAAEJ,IAAI,CAAC;QAC1C;YACE,OAAOL,OAAOQ,GAAG,CAAC,CAACC,IAAM,CAAC,CAAC,EAAEA,EAAEO,OAAO,CAAC,MAAM,MAAM,CAAC,CAAC,EAAEX,IAAI,CAAC;QAC9D;YACE,OAAOL,OAAOK,IAAI,CAAC;QACrB;YACE,OAAOL,OAAOQ,GAAG,CAAC,CAACC,IAAM,GAAGL,KAAK,CAAC,EAAEU,mBAAmBL,IAAI,EAAEJ,IAAI,CAAC;QACpE;QACA;YACE,OAAO,CAAC,CAAC,EAAEL,OAAOK,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC;AACF;AAEA;;CAEC,GACD,OAAO,SAASY,gBACdC,IAAY,EACZC,OAAe,EACfC,aAA4B,EAC5BC,SAA+B;IAE/B,MAAMC,iBAAiB,MAAMH;IAC7B,MAAMI,4BAA4B,OAAOJ,UAAWE,CAAAA,YAAY,MAAMA,YAAY,EAAC,IAAK;IAExF,IAAIG,gBAAgB;IACpB,IAAIC,MAAMC,OAAO,CAACN,gBAAgB;QAChCI,gBAAgBrB,YAAYiB,eAAeD,SAASE;IACtD;IACA,IAAI,OAAOD,kBAAkB,UAAU;QACrCI,gBAAgBrB,YAAY;YAACiB;SAAc,EAAED,SAASE;IACxD;IACAH,OAAOA,KAAKS,UAAU,CAACL,gBAAgBE;IACvC,OAAON,KAAKS,UAAU,CAACJ,2BAA2BC;AACpD;AAEA,mFAAmF;AACnF,qDAAqD;AACrD,gJAAgJ;AAChJ,0KAA0K;AAC1K,2GAA2G;AAE3G,MAAMI,iBAAiB;AAEvB;;CAEC,GACD,OAAO,SAASC,eAAeX,IAAY;IACzC,MAAMY,UAAU,IAAIC;IACpB,IAAIC;IAEJ,MAAO,AAACA,CAAAA,QAAQJ,eAAeK,IAAI,CAACf,KAAI,MAAO,KAAM;QACnD,IAAIc,OAAO;YACT,IAAIA,KAAK,CAAC,EAAE,EAAE;gBACZ,WAAW;gBACXF,QAAQI,GAAG,CAACF,KAAK,CAAC,EAAE;YACtB,OAAO,IAAIA,KAAK,CAAC,EAAE,EAAE;gBACnB,aAAa;gBACbF,QAAQI,GAAG,CAACF,KAAK,CAAC,EAAE;YACtB;QACF;IACF;IACA,wBAAwB;IACxB,OAAOP,MAAMU,IAAI,CAACL,QAAQ9B,MAAM;AAClC;AAEA;;CAEC,GACD,OAAO,SAASoC,wBAAwBlB,IAAY;IAClD,MAAMY,UAAU,IAAIO;IACpB,IAAIL;IAEJ,MAAO,AAACA,CAAAA,QAAQJ,eAAeK,IAAI,CAACf,KAAI,MAAO,KAAM;QACnD,IAAIc,OAAO;YACT,IAAI9B,SAASN;YACb,IAAIoC,KAAK,CAAC,EAAE,EAAE;gBACZ9B,SAAS8B,KAAK,CAAC,EAAE;YACnB;YACA,IAAIA,KAAK,CAAC,EAAE,EAAE;gBACZ,WAAW;gBACXF,QAAQQ,GAAG,CAACN,KAAK,CAAC,EAAE,EAAEtC,eAAeQ;YACvC,OAAO,IAAI8B,KAAK,CAAC,EAAE,EAAE;gBACnB,aAAa;gBACbF,QAAQQ,GAAG,CAACN,KAAK,CAAC,EAAE,EAAEtC,eAAeQ;YACvC;QACF;IACF;IACA,OAAO4B;AACT;AAEA;;CAEC,GACD,OAAO,SAASS,iBAAiBrB,IAAY,EAAEsB,aAA+B;IAC5E,MAAMC,eAAeL,wBAAwBlB;IAC7C,MAAMwB,YAAYjB,MAAMU,IAAI,CAACM,aAAaE,IAAI;IAC9C,IAAIC,YAAY1B;IAChBwB,SACE,qCAAqC;IACrC,gFAAgF;IAChF,yEAAyE;KACxEG,QAAQ,CAAC,CAACC,GAAGC,IAAMA,EAAEC,MAAM,GAAGF,EAAEE,MAAM,EACtCC,OAAO,CAAC,CAACxC;QACR,MAAMyC,WAAWV,aAAa,CAAC/B,EAAE;QACjC,IAAIyC,YAAYA,SAASC,KAAK,KAAKvD,WAAW;YAC5CgD,YAAY3B,gBAAgB2B,WAAWnC,GAAGyC,UAAUC,OAAOV,aAAaW,GAAG,CAAC3C;QAC9E;IACF;IAEF,OAAOmC;AACT;AAEA;;CAEC,GACD,OAAO,SAASS,2BAA2BnC,IAAY,EAAEsB,aAA+B;IACtF,MAAMc,eAAiC,CAAC;IACxC,KAAK,MAAM,CAAClD,MAAMmD,MAAM,IAAIxD,OAAOyD,OAAO,CAAChB,eAAgB;QACzDc,YAAY,CAAClD,KAAK,GAAGmD,MAAME,YAAY,KAAK7D,YAAY2D,QAAQ;YAAE,GAAGA,KAAK;YAAEJ,OAAOI,MAAME,YAAY;QAAC;IACxG;IACA,OAAOlB,iBAAiBrB,MAAMoC;AAChC;AAEA;;;;;;;;;CASC,GACD,OAAO,SAASI,sBAAsBC,GAAW,EAAEnB,aAA+B;IAChF,IAAIoB,SAASrB,iBAAiBoB,KAAKnB;IAEnC,IAAI;QACF,MAAMqB,aAAa,gBAAgBC,IAAI,CAACF;QACxC,MAAMG,qBAAqBH,OAAOI,UAAU,CAAC;QAC7C,kEAAkE;QAClE,MAAMC,mBAAmB,uBAAuBH,IAAI,CAACF;QACrD,IAAI,CAACC,cAAc,CAACE,sBAAsBE,kBAAkB;YAC1D,OAAOL;QACT;QAEA,MAAMM,aAAaH,qBAAqB,CAAC,KAAK,EAAEH,QAAQ,GAAGA;QAC3D,MAAMO,YAAY,IAAIC,IAAIF,YAAYL,cAAcE,qBAAqBnE,YAAY;QAErF,4EAA4E;QAC5E,MAAMyE,kBAAkB5C,MAAMU,IAAI,CAACgC,UAAUG,YAAY,CAACd,OAAO;QACjE,IAAIe,UAAU;QACd,MAAMC,kBAAkBH,gBAAgB7D,GAAG,CAAC,CAAC,CAACiE,KAAKtB,MAAM;YACvD,MAAMuB,gBAAgBnC,iBAAiBY,OAAOX;YAC9C,IAAIkC,kBAAkBvB,OAAO;gBAC3BoB,UAAU;YACZ;YACA,OAAO;gBAACE;gBAAKC;aAAc;QAC7B;QAEA,IAAI,CAACH,SAAS;YACZ,OAAOX;QACT;QAEA,MAAMe,cAAc;eAAI,IAAI5C,IAAIsC,gBAAgB7D,GAAG,CAAC,CAAC,CAACiE,IAAI,GAAKA;SAAM;QACrE,KAAK,MAAMA,OAAOE,YAAa;YAC7BR,UAAUG,YAAY,CAACM,MAAM,CAACH;QAChC;QACA,KAAK,MAAM,CAACA,KAAKtB,MAAM,IAAIqB,gBAAiB;YAC1CL,UAAUG,YAAY,CAACO,MAAM,CAACJ,KAAKtB;QACrC;QAEA,IAAIU,YAAY;YACd,OAAOM,UAAUW,IAAI;QACvB;QACA,IAAIf,oBAAoB;YACtB,OAAO,CAAC,EAAE,EAAEI,UAAUY,IAAI,GAAGZ,UAAUa,QAAQ,GAAGb,UAAUc,MAAM,GAAGd,UAAUe,IAAI,EAAE;QACvF;QAEA,6EAA6E;QAC7E,MAAMC,IAAIvB,OAAOwB,OAAO,CAAC;QACzB,MAAMC,IAAIzB,OAAOwB,OAAO,CAAC;QACzB,IAAIE,UAAU1B,OAAOZ,MAAM;QAC3B,IAAImC,KAAK,GAAGG,UAAUH;aACjB,IAAIE,KAAK,GAAGC,UAAUD;QAC3B,MAAME,OAAO3B,OAAO4B,KAAK,CAAC,GAAGF;QAC7B,OAAO,GAAGC,OAAOpB,UAAUc,MAAM,GAAGd,UAAUe,IAAI,EAAE;IACtD,EAAE,OAAM;QACN,OAAOtB;IACT;AACF"}

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@perses-dev/components",
-  "version": "0.55.0-beta.1",
+  "version": "0.55.0-beta.11",
   "description": "Common UI components used across Perses features",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/perses/perses.git"
+    "url": "git+https://github.com/perses/shared.git"
   },
   "bugs": {
     "url": "https://github.com/perses/perses/issues"
   },
+  "type": "module",
   "module": "dist/index.js",
-  "main": "dist/cjs/index.js",
+  "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "clean": "rimraf dist/",
     "build": "concurrently \"npm:build:*\"",
-    "build:cjs": "swc ./src -d dist/cjs --strip-leading-paths --config-file ../.cjs.swcrc",
     "build:esm": "swc ./src -d dist --strip-leading-paths --config-file ../.swcrc",
     "build:types": "tsc --project tsconfig.build.json",
     "type-check": "tsc --noEmit",
     "start": "concurrently -P \"npm:build:* -- {*}\" -- --watch",
-    "test": "cross-env TZ=UTC jest",
-    "test:watch": "cross-env TZ=UTC jest --watch",
-    "lint": "eslint src --ext .ts,.tsx",
-    "lint:fix": "eslint --fix src --ext .ts,.tsx"
+    "test": "cross-env TZ=UTC vitest run",
+    "test:watch": "cross-env TZ=UTC vitest",
+    "lint": "oxlint src",
+    "lint:fix": "oxlint --fix src"
   },
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
@@ -34,8 +34,8 @@
     "@date-fns/tz": "^1.4.1",
     "@fontsource/inter": "^5.0.0",
     "@mui/x-date-pickers": "^7.23.1",
-    "@perses-dev/spec": "0.3.0-beta.1",
-    "@perses-dev/client": "0.55.0-beta.1",
+    "@perses-dev/spec": "0.3.0-beta.8",
+    "@perses-dev/client": "0.55.0-beta.11",
     "numbro": "^2.3.6",
     "@tanstack/match-sorter-utils": "^8.19.4",
     "@tanstack/react-table": "^8.20.5",
@@ -59,8 +59,8 @@
     "@emotion/styled": "^11.14.1",
     "@mui/material": "^6.1.10",
     "lodash": "^4.17.21",
-    "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0"
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0"
   },
   "files": [
     "dist"

package/dist/cjs/AlignSelector/AlignSelector.js

@@ -1,50 +0,0 @@
-// 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
-});
-Object.defineProperty(exports, "AlignSelector", {
-    enumerable: true,
-    get: function() {
-        return AlignSelector;
-    }
-});
-const _jsxruntime = require("react/jsx-runtime");
-const _material = require("@mui/material");
-function AlignSelector({ onChange, value = 'left', ...props }) {
-    const handleSortChange = (option)=>{
-        onChange(option);
-    };
-    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.ButtonGroup, {
-        "aria-label": "Alignement",
-        ...props,
-        children: [
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
-                onClick: ()=>handleSortChange('left'),
-                variant: value === 'left' ? 'contained' : 'outlined',
-                children: "Left"
-            }, "left"),
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
-                onClick: ()=>handleSortChange('center'),
-                variant: value === 'center' ? 'contained' : 'outlined',
-                children: "Center"
-            }, "center"),
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Button, {
-                onClick: ()=>handleSortChange('right'),
-                variant: value === 'right' ? 'contained' : 'outlined',
-                children: "Right"
-            }, "right")
-        ]
-    });
-}

package/dist/cjs/AlignSelector/index.js

@@ -1,30 +0,0 @@
-// 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
-});
-_export_star(require("./AlignSelector"), exports);
-function _export_star(from, to) {
-    Object.keys(from).forEach(function(k) {
-        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-            Object.defineProperty(to, k, {
-                enumerable: true,
-                get: function() {
-                    return from[k];
-                }
-            });
-        }
-    });
-    return from;
-}

package/dist/cjs/ColorPicker/ColorPicker.js

@@ -1,106 +0,0 @@
-// 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
-});
-Object.defineProperty(exports, "ColorPicker", {
-    enumerable: true,
-    get: function() {
-        return ColorPicker;
-    }
-});
-const _jsxruntime = require("react/jsx-runtime");
-const _material = require("@mui/material");
-const _react = require("react");
-const _reactcolorful = require("react-colorful");
-const _Circle = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Circle"));
-const _Delete = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Delete"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const ColorPicker = ({ color, onChange, onClear, palette })=>{
-    // value is the visible value for the controlled text input
-    const [value, setValue] = (0, _react.useState)(color);
-    const handleColorChange = (color)=>{
-        setValue(color);
-        onChange?.(color);
-    };
-    // we should update this if https://github.com/omgovich/react-colorful/issues/157 is resolved
-    const handleInputChange = (e)=>{
-        const inputValue = e.target.value.replace(/([^0-9A-F]+)/gi, '').substring(0, 8);
-        setValue(`#${inputValue}`); // always prefix input value with # to indicate hex format
-        // only set color if input value is a valid hex color
-        if (isValidHex(e.target.value)) {
-            onChange?.(e.target.value);
-        }
-    };
-    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
-        spacing: 1,
-        children: [
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_reactcolorful.HexColorPicker, {
-                color: color,
-                onChange: handleColorChange,
-                style: {
-                    width: '100%'
-                }
-            }),
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Stack, {
-                direction: "row",
-                flexWrap: "wrap",
-                justifyContent: "space-evenly",
-                width: "200px",
-                children: palette && palette.map((color, i)=>/*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
-                        size: "small",
-                        "aria-label": `change color to ${color}`,
-                        sx: {
-                            color
-                        },
-                        onClick: ()=>handleColorChange(color),
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Circle.default, {})
-                    }, i))
-            }),
-            /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Stack, {
-                direction: "row",
-                gap: 1,
-                alignItems: "center",
-                children: [
-                    /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.TextField, {
-                        inputProps: {
-                            'aria-label': 'enter hex color'
-                        },
-                        fullWidth: true,
-                        value: value,
-                        onChange: handleInputChange
-                    }),
-                    onClear && /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.IconButton, {
-                        onClick: onClear,
-                        children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Delete.default, {})
-                    })
-                ]
-            })
-        ]
-    });
-};
-const isValidHex = (value, alpha)=>{
-    const matcher = /^#?([0-9A-F]{3,8})$/i;
-    const match = matcher.exec(value);
-    const length = match && match[1] ? match[1].length : 0;
-    return length === 3 || // '#rgb' format
-    length === 6 || // '#rrggbb' format
-    !!alpha && length === 4 || // '#rgba' format
-    !!alpha && length === 8 // '#rrggbbaa' format
-    ;
-};

package/dist/cjs/ColorPicker/OptionsColorPicker.js

@@ -1,92 +0,0 @@
-// 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
-});
-Object.defineProperty(exports, "OptionsColorPicker", {
-    enumerable: true,
-    get: function() {
-        return OptionsColorPicker;
-    }
-});
-const _jsxruntime = require("react/jsx-runtime");
-const _react = require("react");
-const _material = require("@mui/material");
-const _Circle = /*#__PURE__*/ _interop_require_default(require("mdi-material-ui/Circle"));
-const _context = require("../context");
-const _ColorPicker = require("./ColorPicker");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function OptionsColorPicker({ label, color, size = 'small', onColorChange, onClear }) {
-    const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
-    const isOpen = Boolean(anchorEl);
-    const openColorPicker = (event)=>{
-        setAnchorEl(event.currentTarget);
-    };
-    const closeColorPicker = ()=>{
-        setAnchorEl(null);
-    };
-    const { thresholds: { defaultColor, palette } } = (0, _context.useChartsTheme)();
-    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
-        children: [
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(ColorIconButton, {
-                size: size,
-                "aria-label": `change ${label} color`,
-                isSelected: isOpen,
-                iconColor: color,
-                onClick: openColorPicker,
-                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_Circle.default, {})
-            }),
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Popover, {
-                "data-testid": "options color picker",
-                open: isOpen,
-                anchorEl: anchorEl,
-                onClose: closeColorPicker,
-                slotProps: {
-                    paper: {
-                        sx: {
-                            padding: (theme)=>theme.spacing(2)
-                        }
-                    }
-                },
-                anchorOrigin: {
-                    vertical: 'top',
-                    horizontal: 'left'
-                },
-                transformOrigin: {
-                    vertical: 'top',
-                    horizontal: 'right'
-                },
-                children: /*#__PURE__*/ (0, _jsxruntime.jsx)(_ColorPicker.ColorPicker, {
-                    color: color,
-                    palette: [
-                        defaultColor,
-                        ...palette
-                    ],
-                    onChange: onColorChange,
-                    onClear: onClear
-                })
-            })
-        ]
-    });
-}
-const ColorIconButton = (0, _material.styled)(_material.IconButton, {
-    shouldForwardProp: (props)=>props !== 'isSelected' && props !== 'iconColor'
-})(({ iconColor, isSelected })=>({
-        backgroundColor: isSelected && iconColor ? `${iconColor}3F` : 'undefined',
-        color: iconColor
-    }));

package/dist/cjs/ColorPicker/index.js

@@ -1,31 +0,0 @@
-// 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
-});
-_export_star(require("./ColorPicker"), exports);
-_export_star(require("./OptionsColorPicker"), exports);
-function _export_star(from, to) {
-    Object.keys(from).forEach(function(k) {
-        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-            Object.defineProperty(to, k, {
-                enumerable: true,
-                get: function() {
-                    return from[k];
-                }
-            });
-        }
-    });
-    return from;
-}

package/dist/cjs/ContentWithLegend/ContentWithLegend.js

@@ -1,71 +0,0 @@
-// 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
-});
-Object.defineProperty(exports, "ContentWithLegend", {
-    enumerable: true,
-    get: function() {
-        return ContentWithLegend;
-    }
-});
-const _jsxruntime = require("react/jsx-runtime");
-const _material = require("@mui/material");
-const _model = require("../model");
-const _Legend = require("../Legend");
-const _contentwithlegendmodel = require("./model/content-with-legend-model");
-function ContentWithLegend({ children, legendProps, width, height, spacing = 0, legendSize, minChildrenWidth = 100, minChildrenHeight = 100 }) {
-    const theme = (0, _material.useTheme)();
-    const { content, legend, margin } = (0, _contentwithlegendmodel.getContentWithLegendLayout)({
-        width,
-        height,
-        legendProps,
-        minChildrenHeight,
-        minChildrenWidth,
-        spacing,
-        theme,
-        legendSize: (0, _model.getLegendSize)(legendSize)
-    });
-    return /*#__PURE__*/ (0, _jsxruntime.jsxs)(_material.Box, {
-        style: {
-            width,
-            height
-        },
-        sx: {
-            position: 'relative',
-            overflow: 'hidden'
-        },
-        children: [
-            /*#__PURE__*/ (0, _jsxruntime.jsx)(_material.Box, {
-                style: {
-                    width: content.width,
-                    height: content.height
-                },
-                sx: {
-                    marginRight: `${margin.right}px`,
-                    marginBottom: `${margin.bottom}px`
-                },
-                children: typeof children === 'function' ? children({
-                    width: content.width,
-                    height: content.height
-                }) : children
-            }),
-            legendProps && legend.show && /*#__PURE__*/ (0, _jsxruntime.jsx)(_Legend.Legend, {
-                ...legendProps,
-                height: legend.height,
-                width: legend.width
-            })
-        ]
-    });
-}

package/dist/cjs/ContentWithLegend/index.js

@@ -1,30 +0,0 @@
-// 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
-});
-_export_star(require("./ContentWithLegend"), exports);
-function _export_star(from, to) {
-    Object.keys(from).forEach(function(k) {
-        if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
-            Object.defineProperty(to, k, {
-                enumerable: true,
-                get: function() {
-                    return from[k];
-                }
-            });
-        }
-    });
-    return from;
-}