@visactor/vchart 1.10.3 → 1.10.4

package/esm/util/spec/index.js

@@ -1,14 +1,4 @@
 export * from "./background";
 
-export * from "./clone-deep";
-
-export * from "./common";
-
-export * from "./merge-spec";
-
-export * from "../theme/merge-theme";
-
-export * from "../theme/preprocess";
-
 export * from "./transform";
 //# sourceMappingURL=index.js.map

package/esm/util/spec/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC","file":"index.js","sourcesContent":["export * from './background';\nexport * from './clone-deep';\nexport * from './common';\nexport * from './merge-spec';\nexport * from '../theme/merge-theme';\nexport * from '../theme/preprocess';\nexport * from './transform';\n"]}
+{"version":3,"sources":["../src/util/spec/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC","file":"index.js","sourcesContent":["export * from './background';\nexport * from './transform';\n"]}

package/esm/util/spec/transform.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/transform.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAIpE,MAAM,UAAU,aAAa,CAC3B,IAAa,EACb,UAEI;IACF,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CACb;IAED,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM,EAAE;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAW,EAAE;YAC7B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBAEnD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;oBAChB,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtC,SAAS;iBACV;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aACjD;SACF;QACD,OAAO,MAAM,CAAC;KACf;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;KACjD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAOD,MAAM,UAAU,iBAAiB,CAAC,IAAiB,EAAE,MAAW;IAC9D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAW,EAAE;YAC7B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBAEnD,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBACxD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC5C,SAAS;iBACV;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;aACpD;SACF;QACD,OAAO,MAAM,CAAC;KACf;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAQ,IAAsB,CAAC,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;KACtF;IACD,OAAO,IAAI,CAAC;AACd,CAAC","file":"transform.js","sourcesContent":["import type { ISeriesSpec } from '../../typings';\nimport { isArray, isPlainObject, isString } from '@visactor/vutils';\n\n// todo 以目前的场景来看，并没有递归的需要。\n// 考虑到不确定性，还是递归处理spec对象，时间消耗很少\nexport function specTransform(\n  spec: unknown,\n  special: {\n    [key: string]: (v: unknown) => unknown;\n  } = {\n    data: v => v\n  }\n): unknown {\n  if (!spec) {\n    return spec;\n  }\n  // 如果是普通对象\n  if (spec.constructor === Object) {\n    const result: any = {};\n    for (const key in spec as any) {\n      if (Object.prototype.hasOwnProperty.call(spec, key)) {\n        // todo 特殊处理怎样更合理?\n        if (special[key]) {\n          result[key] = special[key](spec[key]);\n          continue;\n        }\n        result[key] = specTransform(spec[key], special);\n      }\n    }\n    return result;\n  }\n  // 如果是数组\n  if (isArray(spec)) {\n    return spec.map(s => specTransform(s, special));\n  }\n  return spec;\n}\n\n/**\n * functionTransform is used to replace the function registered by the instance\n * @param spec\n * @returns\n */\nexport function functionTransform(spec: ISeriesSpec, VChart: any): any {\n  if (!spec) {\n    return spec;\n  }\n  // 如果是普通对象\n  if (isPlainObject(spec)) {\n    const result: any = {};\n    for (const key in spec as any) {\n      if (Object.prototype.hasOwnProperty.call(spec, key)) {\n        // 如果使用了注册函数\n        if (isString(spec[key]) && VChart.getFunction(spec[key])) {\n          result[key] = VChart.getFunction(spec[key]);\n          continue;\n        }\n        result[key] = functionTransform(spec[key], VChart);\n      }\n    }\n    return result;\n  }\n  // 如果是数组\n  if (isArray(spec)) {\n    return (spec as ISeriesSpec[]).map((s: ISeriesSpec) => functionTransform(s, VChart));\n  }\n  return spec;\n}\n"]}
+{"version":3,"sources":["../src/util/spec/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAKpE,MAAM,UAAU,aAAa,CAC3B,IAAa,EACb,UAEI;IACF,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CACb;IAED,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM,EAAE;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAW,EAAE;YAC7B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBAEnD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;oBAChB,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtC,SAAS;iBACV;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aACjD;SACF;QACD,OAAO,MAAM,CAAC;KACf;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;KACjD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAOD,MAAM,UAAU,iBAAiB,CAAC,IAAiB,EAAE,MAAW;IAC9D,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAW,EAAE;YAC7B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBAEnD,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBACxD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC5C,SAAS;iBACV;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;aACpD;SACF;QACD,OAAO,MAAM,CAAC;KACf;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAQ,IAAsB,CAAC,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;KACtF;IACD,OAAO,IAAI,CAAC;AACd,CAAC","file":"transform.js","sourcesContent":["import { isArray, isPlainObject, isString } from '@visactor/vutils';\nimport type { ISeriesSpec } from '../../typings';\n\n// todo 以目前的场景来看，并没有递归的需要。\n// 考虑到不确定性，还是递归处理spec对象，时间消耗很少\nexport function specTransform(\n  spec: unknown,\n  special: {\n    [key: string]: (v: unknown) => unknown;\n  } = {\n    data: v => v\n  }\n): unknown {\n  if (!spec) {\n    return spec;\n  }\n  // 如果是普通对象\n  if (spec.constructor === Object) {\n    const result: any = {};\n    for (const key in spec as any) {\n      if (Object.prototype.hasOwnProperty.call(spec, key)) {\n        // todo 特殊处理怎样更合理?\n        if (special[key]) {\n          result[key] = special[key](spec[key]);\n          continue;\n        }\n        result[key] = specTransform(spec[key], special);\n      }\n    }\n    return result;\n  }\n  // 如果是数组\n  if (isArray(spec)) {\n    return spec.map(s => specTransform(s, special));\n  }\n  return spec;\n}\n\n/**\n * functionTransform is used to replace the function registered by the instance\n * @param spec\n * @returns\n */\nexport function functionTransform(spec: ISeriesSpec, VChart: any): any {\n  if (!spec) {\n    return spec;\n  }\n  // 如果是普通对象\n  if (isPlainObject(spec)) {\n    const result: any = {};\n    for (const key in spec as any) {\n      if (Object.prototype.hasOwnProperty.call(spec, key)) {\n        // 如果使用了注册函数\n        if (isString(spec[key]) && VChart.getFunction(spec[key])) {\n          result[key] = VChart.getFunction(spec[key]);\n          continue;\n        }\n        result[key] = functionTransform(spec[key], VChart);\n      }\n    }\n    return result;\n  }\n  // 如果是数组\n  if (isArray(spec)) {\n    return (spec as ISeriesSpec[]).map((s: ISeriesSpec) => functionTransform(s, VChart));\n  }\n  return spec;\n}\n"]}

package/esm/util/theme/merge-theme.js

@@ -4,7 +4,7 @@ import { transformColorSchemeToStandardStruct } from "../../theme/color-scheme/u
 
 import { seriesMarkInfoMap } from "../../series/interface/theme";
 
-import { mergeSpec } from "../spec/merge-spec";
+import { mergeSpec } from "@visactor/vutils-extension";
 
 export function mergeTheme(target, ...sources) {
     return mergeSpec(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));

package/esm/util/theme/merge-theme.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/theme/merge-theme.ts"],"names":[],"mappings":"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","file":"merge-theme.js","sourcesContent":["import type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { array } from '@visactor/vutils';\nimport type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, ITheme } from '../../theme';\nimport { transformColorSchemeToStandardStruct } from '../../theme/color-scheme/util';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport type { ISeriesTheme } from '../../series/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeriesMarkInfo } from '../../series/interface/common';\nimport { seriesMarkInfoMap } from '../../series/interface/theme';\nimport { mergeSpec } from '../spec/merge-spec';\n\nexport function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme> {\n  return mergeSpec(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));\n}\n\nfunction transformThemeToMerge(theme?: Maybe<ITheme>): Maybe<ITheme> {\n  if (!theme) {\n    return theme;\n  }\n\n  // 将色板转化为标准形式\n  const colorScheme = transformColorSchemeToMerge(theme.colorScheme);\n\n  // 将全局 mark 主题 merge 进系列主题\n  const { series } = theme;\n  const { mark: markByType, markByName } = theme;\n  let newSeriesTheme;\n  if (markByType || markByName) {\n    newSeriesTheme = Object.keys(seriesMarkInfoMap).reduce((newSeriesTheme, key) => {\n      const value = series?.[key] ?? {};\n      newSeriesTheme[key] = transformSeriesThemeToMerge(value, key, markByType, markByName);\n      return newSeriesTheme;\n    }, {} as ISeriesTheme);\n  }\n\n  return Object.assign({}, theme, {\n    colorScheme,\n    token: theme.token ?? {},\n    series: Object.assign({}, theme.series, newSeriesTheme)\n  } as Partial<ITheme>);\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme> {\n  if (colorScheme) {\n    colorScheme = Object.keys(colorScheme).reduce<IThemeColorScheme>((scheme, key) => {\n      const value = colorScheme[key];\n      scheme[key] = transformColorSchemeToStandardStruct(value);\n      return scheme;\n    }, {} as IThemeColorScheme);\n  }\n  return colorScheme;\n}\n\n/** 将全局 mark 主题 merge 进系列主题 */\nexport function transformSeriesThemeToMerge(\n  seriesTheme: any,\n  seriesType: string,\n  markByType: IGlobalMarkThemeByType,\n  markByName: IGlobalMarkThemeByName\n): any {\n  if (!seriesMarkInfoMap[seriesType]) {\n    return seriesTheme;\n  }\n  const newTheme: any = {};\n  Object.values<ISeriesMarkInfo>(seriesMarkInfoMap[seriesType]).forEach(({ type, name }) => {\n    newTheme[name] = mergeSpec({}, markByType?.[array(type)[0]], markByName?.[name], seriesTheme?.[name]);\n  });\n  return {\n    ...seriesTheme,\n    ...newTheme\n  };\n}\n"]}
+{"version":3,"sources":["../src/util/theme/merge-theme.ts"],"names":[],"mappings":"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","file":"merge-theme.js","sourcesContent":["import type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { array } from '@visactor/vutils';\nimport type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, ITheme } from '../../theme';\nimport { transformColorSchemeToStandardStruct } from '../../theme/color-scheme/util';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport type { ISeriesTheme } from '../../series/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport type { ISeriesMarkInfo } from '../../series/interface/common';\nimport { seriesMarkInfoMap } from '../../series/interface/theme';\nimport { mergeSpec } from '@visactor/vutils-extension';\n\nexport function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme> {\n  return mergeSpec(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));\n}\n\nfunction transformThemeToMerge(theme?: Maybe<ITheme>): Maybe<ITheme> {\n  if (!theme) {\n    return theme;\n  }\n\n  // 将色板转化为标准形式\n  const colorScheme = transformColorSchemeToMerge(theme.colorScheme);\n\n  // 将全局 mark 主题 merge 进系列主题\n  const { series } = theme;\n  const { mark: markByType, markByName } = theme;\n  let newSeriesTheme;\n  if (markByType || markByName) {\n    newSeriesTheme = Object.keys(seriesMarkInfoMap).reduce((newSeriesTheme, key) => {\n      const value = series?.[key] ?? {};\n      newSeriesTheme[key] = transformSeriesThemeToMerge(value, key, markByType, markByName);\n      return newSeriesTheme;\n    }, {} as ISeriesTheme);\n  }\n\n  return Object.assign({}, theme, {\n    colorScheme,\n    token: theme.token ?? {},\n    series: Object.assign({}, theme.series, newSeriesTheme)\n  } as Partial<ITheme>);\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme> {\n  if (colorScheme) {\n    colorScheme = Object.keys(colorScheme).reduce<IThemeColorScheme>((scheme, key) => {\n      const value = colorScheme[key];\n      scheme[key] = transformColorSchemeToStandardStruct(value);\n      return scheme;\n    }, {} as IThemeColorScheme);\n  }\n  return colorScheme;\n}\n\n/** 将全局 mark 主题 merge 进系列主题 */\nexport function transformSeriesThemeToMerge(\n  seriesTheme: any,\n  seriesType: string,\n  markByType: IGlobalMarkThemeByType,\n  markByName: IGlobalMarkThemeByName\n): any {\n  if (!seriesMarkInfoMap[seriesType]) {\n    return seriesTheme;\n  }\n  const newTheme: any = {};\n  Object.values<ISeriesMarkInfo>(seriesMarkInfoMap[seriesType]).forEach(({ type, name }) => {\n    newTheme[name] = mergeSpec({}, markByType?.[array(type)[0]], markByName?.[name], seriesTheme?.[name]);\n  });\n  return {\n    ...seriesTheme,\n    ...newTheme\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vchart",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "charts lib based @visactor/VGrammar",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -84,9 +84,9 @@
     "@size-limit/file": "9.0.0",
     "rimraf": "3.0.2",
     "@internal/typescript-json-schema": "0.0.1",
+    "@internal/ts-config": "0.0.1",
     "@internal/eslint-config": "0.0.1",
-    "@internal/bundler": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/bundler": "0.0.1"
   },
   "dependencies": {
     "@visactor/vutils": "~0.18.1",
@@ -102,7 +102,7 @@
     "@visactor/vgrammar-hierarchy": "0.12.8",
     "@visactor/vgrammar-sankey": "0.12.8",
     "@visactor/vgrammar-util": "0.12.8",
-    "@visactor/vutils-extension": "1.10.3"
+    "@visactor/vutils-extension": "1.10.4"
   },
   "publishConfig": {
     "access": "public",

package/cjs/util/spec/clone-deep.d.ts

@@ -1 +0,0 @@
-export declare function cloneDeepSpec(spec: any, excludeKeys?: string[]): any;

package/cjs/util/spec/clone-deep.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.cloneDeepSpec = void 0;
-
-const vutils_1 = require("@visactor/vutils"), common_1 = require("./common");
-
-function cloneDeepSpec(spec, excludeKeys = [ "data" ]) {
-    const value = spec;
-    let result;
-    if (!(0, vutils_1.isValid)(value) || "object" != typeof value) return value;
-    if ((0, common_1.isDataView)(value) || (0, common_1.isHTMLElement)(value)) return value;
-    const isArr = (0, vutils_1.isArray)(value), length = value.length;
-    result = isArr ? new Array(length) : "object" == typeof value ? {} : (0, vutils_1.isBoolean)(value) || (0, 
-    vutils_1.isNumber)(value) || (0, vutils_1.isString)(value) ? value : (0, vutils_1.isDate)(value) ? new Date(+value) : void 0;
-    const props = isArr ? void 0 : Object.keys(Object(value));
-    let index = -1;
-    if (result) for (;++index < (props || value).length; ) {
-        const key = props ? props[index] : index, subValue = value[key];
-        (null == excludeKeys ? void 0 : excludeKeys.includes(key.toString())) ? result[key] = subValue : result[key] = cloneDeepSpec(subValue, excludeKeys);
-    }
-    return result;
-}
-
-exports.cloneDeepSpec = cloneDeepSpec;
-//# sourceMappingURL=clone-deep.js.map

package/cjs/util/spec/clone-deep.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/util/spec/clone-deep.ts"],"names":[],"mappings":";;;AAAA,6CAA2F;AAC3F,qCAAqD;AAMrD,SAAgB,aAAa,CAAC,IAAS,EAAE,cAAwB,CAAC,MAAM,CAAC;IACvE,MAAM,KAAK,GAAG,IAAI,CAAC;IAEnB,IAAI,MAAM,CAAC;IACX,IAAI,CAAC,IAAA,gBAAO,EAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAChD,OAAO,KAAK,CAAC;KACd;IAGD,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;QAC7C,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,IAAA,gBAAO,EAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,KAAK,EAAE;QACT,MAAM,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KAC5B;SAEI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAClC,MAAM,GAAG,EAAE,CAAC;KACb;SAEI,IAAI,IAAA,kBAAS,EAAC,KAAK,CAAC,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;QAC/D,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,EAAE;QACxB,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;KAC3B;SAEI;QACH,MAAM,GAAG,SAAS,CAAC;KACpB;IAKD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7D,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;IACf,IAAI,MAAM,EAAE;QACV,OAAO,EAAE,KAAK,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,MAAM,EAAE;YACxC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE;gBACzC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;aACxB;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;aACpD;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArDD,sCAqDC","file":"clone-deep.js","sourcesContent":["import { isArray, isBoolean, isDate, isNumber, isString, isValid } from '@visactor/vutils';\nimport { isDataView, isHTMLElement } from './common';\n\n/**\n * 深拷贝 spec，为避免循环引用，DataView 维持原有引用\n * @param spec 原spec\n */\nexport function cloneDeepSpec(spec: any, excludeKeys: string[] = ['data']) {\n  const value = spec;\n\n  let result;\n  if (!isValid(value) || typeof value !== 'object') {\n    return value;\n  }\n\n  // 判断是不是不能深拷贝的对象\n  if (isDataView(value) || isHTMLElement(value)) {\n    return value;\n  }\n\n  const isArr = isArray(value);\n  const length = value.length;\n  // 不考虑特殊数组的额外处理\n  if (isArr) {\n    result = new Array(length);\n  }\n  // 不考虑 buffer / arguments 类型的处理以及 prototype 的额外处理\n  else if (typeof value === 'object') {\n    result = {};\n  }\n  // 不建议使用作为 Boolean / Number / String 作为构造器\n  else if (isBoolean(value) || isNumber(value) || isString(value)) {\n    result = value;\n  } else if (isDate(value)) {\n    result = new Date(+value);\n  }\n  // 不考虑 ArrayBuffer / DataView / TypedArray / map / set / regexp / symbol 类型\n  else {\n    result = undefined;\n  }\n\n  // 不考虑 map / set / TypedArray 类型的赋值\n\n  // 不考虑对象的 symbol 属性\n  const props = isArr ? undefined : Object.keys(Object(value));\n\n  let index = -1;\n  if (result) {\n    while (++index < (props || value).length) {\n      const key = props ? props[index] : index;\n      const subValue = value[key];\n      if (excludeKeys?.includes(key.toString())) {\n        result[key] = subValue;\n      } else {\n        result[key] = cloneDeepSpec(subValue, excludeKeys);\n      }\n    }\n  }\n\n  return result;\n}\n"]}

package/cjs/util/spec/common.d.ts

@@ -1,3 +0,0 @@
-import { DataView } from '@visactor/vdataset';
-export declare function isDataView(obj: any): obj is DataView;
-export declare function isHTMLElement(obj: any): obj is Element;

package/cjs/util/spec/common.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.isHTMLElement = exports.isDataView = void 0;
-
-const vdataset_1 = require("@visactor/vdataset");
-
-function isDataView(obj) {
-    return obj instanceof vdataset_1.DataView;
-}
-
-function isHTMLElement(obj) {
-    try {
-        return obj instanceof Element;
-    } catch (_a) {
-        const htmlElementKeys = [ "children", "innerHTML", "classList", "setAttribute", "tagName", "getBoundingClientRect" ], keys = Object.keys(obj);
-        return htmlElementKeys.every((key => keys.includes(key)));
-    }
-}
-
-exports.isDataView = isDataView, exports.isHTMLElement = isHTMLElement;
-//# sourceMappingURL=common.js.map

package/cjs/util/spec/common.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/util/spec/common.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAE9C,SAAgB,UAAU,CAAC,GAAQ;IACjC,OAAO,GAAG,YAAY,mBAAQ,CAAC;AACjC,CAAC;AAFD,gCAEC;AAED,SAAgB,aAAa,CAAC,GAAQ;IACpC,IAAI;QACF,OAAO,GAAG,YAAY,OAAO,CAAC;KAC/B;IAAC,WAAM;QAEN,MAAM,eAAe,GAAsB;YACzC,UAAU;YACV,WAAW;YACX,WAAW;YACX,cAAc;YACd,SAAS;YACT,uBAAuB;SACxB,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;KACzD;AACH,CAAC;AAhBD,sCAgBC","file":"common.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\n\nexport function isDataView(obj: any): obj is DataView {\n  return obj instanceof DataView;\n}\n\nexport function isHTMLElement(obj: any): obj is Element {\n  try {\n    return obj instanceof Element;\n  } catch {\n    // 跨端 plan B\n    const htmlElementKeys: (keyof Element)[] = [\n      'children',\n      'innerHTML',\n      'classList',\n      'setAttribute',\n      'tagName',\n      'getBoundingClientRect'\n    ];\n    const keys = Object.keys(obj);\n    return htmlElementKeys.every(key => keys.includes(key));\n  }\n}\n"]}

package/cjs/util/spec/merge-spec.d.ts

@@ -1,5 +0,0 @@
-export declare function mergeSpec(target: any, ...sources: any[]): any;
-export declare function mergeSpecWithFilter(target: any, filter: string | {
-    type: string;
-    index: number;
-}, spec: any, forceMerge: boolean): void;

package/cjs/util/spec/merge-spec.js

@@ -1,69 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: !0
-}), exports.mergeSpecWithFilter = exports.mergeSpec = void 0;
-
-const vutils_1 = require("@visactor/vutils");
-
-function baseMerge(target, source, shallowArray = !1) {
-    if (source) {
-        if (target === source) return;
-        if ((0, vutils_1.isValid)(source) && "object" == typeof source) {
-            const iterable = Object(source), props = [];
-            for (const key in iterable) props.push(key);
-            let {length: length} = props, propIndex = -1;
-            for (;length--; ) {
-                const key = props[++propIndex];
-                (0, vutils_1.isValid)(iterable[key]) && "object" == typeof iterable[key] && !(0, 
-                vutils_1.isArray)(target[key]) ? baseMergeDeep(target, source, key, shallowArray) : assignMergeValue(target, key, iterable[key]);
-            }
-        }
-    }
-}
-
-function baseMergeDeep(target, source, key, shallowArray = !1) {
-    const objValue = target[key], srcValue = source[key];
-    let newValue = source[key], isCommon = !0;
-    if ((0, vutils_1.isArray)(srcValue)) {
-        if (shallowArray) newValue = []; else if ((0, vutils_1.isArray)(objValue)) newValue = objValue; else if ((0, 
-        vutils_1.isArrayLike)(objValue)) {
-            newValue = new Array(objValue.length);
-            let index = -1;
-            const length = objValue.length;
-            for (;++index < length; ) newValue[index] = objValue[index];
-        }
-    } else (0, vutils_1.isPlainObject)(srcValue) ? (newValue = null != objValue ? objValue : {}, 
-    "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
-    isCommon && baseMerge(newValue, srcValue, shallowArray), assignMergeValue(target, key, newValue);
-}
-
-function assignMergeValue(target, key, value) {
-    (void 0 !== value && !eq(target[key], value) || void 0 === value && !(key in target)) && (target[key] = value);
-}
-
-function eq(value, other) {
-    return value === other || Number.isNaN(value) && Number.isNaN(other);
-}
-
-function mergeSpec(target, ...sources) {
-    let sourceIndex = -1;
-    const length = sources.length;
-    for (;++sourceIndex < length; ) {
-        baseMerge(target, sources[sourceIndex], !0);
-    }
-    return target;
-}
-
-function mergeSpecWithFilter(target, filter, spec, forceMerge) {
-    Object.keys(target).forEach((k => {
-        if ((0, vutils_1.isObject)(filter)) filter.type === k && ((0, vutils_1.isArray)(target[k]) ? target[k].length >= filter.index && (target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec) : target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec); else if ((0, 
-        vutils_1.isArray)(target[k])) {
-            const index = target[k].findIndex((_s => _s.id === filter));
-            index >= 0 && (target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec);
-        } else target.id === filter && (target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec);
-    }));
-}
-
-exports.mergeSpec = mergeSpec, exports.mergeSpecWithFilter = mergeSpecWithFilter;
-//# sourceMappingURL=merge-spec.js.map

package/cjs/util/spec/merge-spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/util/spec/merge-spec.ts"],"names":[],"mappings":"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","file":"merge-spec.js","sourcesContent":["import { isArray, isArrayLike, isObject, isPlainObject, isValid } from '@visactor/vutils';\nimport type { StringOrNumber } from '../../typings';\n\nfunction baseMerge(target: any, source: any, shallowArray: boolean = false) {\n  if (source) {\n    if (target === source) {\n      return;\n    }\n    if (isValid(source) && typeof source === 'object') {\n      // baseFor\n      const iterable = Object(source);\n      const props = [];\n      // keysIn\n      for (const key in iterable) {\n        props.push(key);\n      }\n      let { length } = props;\n      let propIndex = -1;\n      while (length--) {\n        const key = props[++propIndex];\n        if (\n          isValid(iterable[key]) &&\n          typeof iterable[key] === 'object' &&\n          !isArray(target[key]) // VChart 特有逻辑\n        ) {\n          baseMergeDeep(target, source, key, shallowArray);\n        } else {\n          assignMergeValue(target, key, iterable[key]);\n        }\n      }\n    }\n  }\n}\n\n// 由于目前 VChart 内部对 spec 会先执行一次深拷贝，merge 暂时不考虑 source 中有环的问题\nfunction baseMergeDeep(target: object, source: object, key: string, shallowArray: boolean = false) {\n  const objValue = target[key];\n  const srcValue = source[key];\n  let newValue = source[key];\n  let isCommon = true;\n  // 不考虑 buffer / typedArray 类型\n  if (isArray(srcValue)) {\n    if (shallowArray) {\n      // 依据参数对数组做浅拷贝\n      newValue = [];\n    } else if (isArray(objValue)) {\n      newValue = objValue;\n    } else if (isArrayLike(objValue)) {\n      // 如果 source 为数组，则 target 的 arrayLike 对象也视作为数组处理\n      newValue = new Array(objValue.length);\n      let index = -1;\n      const length = objValue.length;\n      while (++index < length) {\n        newValue[index] = objValue[index];\n      }\n    }\n  }\n  // else if (isArray(srcValue) && shallowArray) {\n  //   newValue = [];\n  // }\n  // 不考虑 argument 类型\n  else if (isPlainObject(srcValue)) {\n    newValue = objValue ?? {};\n    // 不考虑 prototype 的额外处理\n    if (typeof objValue === 'function' || typeof objValue !== 'object') {\n      newValue = {};\n    }\n  } else {\n    isCommon = false;\n  }\n  // 对 class 等复杂对象或者浅拷贝的 array 不做拷贝处理\n  if (isCommon) {\n    baseMerge(newValue, srcValue, shallowArray);\n  }\n  assignMergeValue(target, key, newValue);\n}\n\nfunction assignMergeValue(target: object, key: string, value: any) {\n  if ((value !== undefined && !eq(target[key], value)) || (value === undefined && !(key in target))) {\n    // 不考虑 __proto__ 的赋值处理\n    target[key] = value;\n  }\n}\n\nfunction eq(value: any, other: any) {\n  return value === other || (Number.isNaN(value) && Number.isNaN(other));\n}\n\n/* 与原生的 lodash merge 差异在于对数组是否应用最后一个 source 的结果\n * 以及对一些特殊情况的处理，比如对数组类型 padding 和对象类型的 padding 的 merge\n */\nexport function mergeSpec(target: any, ...sources: any[]): any {\n  let sourceIndex = -1;\n  const length = sources.length;\n  while (++sourceIndex < length) {\n    const source = sources[sourceIndex];\n    baseMerge(target, source, true);\n  }\n  return target;\n}\n\nexport function mergeSpecWithFilter(\n  target: any,\n  filter: string | { type: string; index: number },\n  spec: any,\n  forceMerge: boolean\n) {\n  Object.keys(target).forEach(k => {\n    if (isObject(filter)) {\n      if (filter.type === k) {\n        if (isArray(target[k])) {\n          if (target[k].length >= filter.index) {\n            target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec;\n          }\n        } else {\n          target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n        }\n      }\n    } else {\n      // filter === user id\n      if (isArray(target[k])) {\n        const index = target[k].findIndex((_s: { id: StringOrNumber }) => _s.id === filter);\n        if (index >= 0) {\n          target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec;\n        }\n      } else if (target.id === filter) {\n        target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n      }\n    }\n  });\n}\n"]}

package/esm/util/spec/clone-deep.d.ts

@@ -1 +0,0 @@
-export declare function cloneDeepSpec(spec: any, excludeKeys?: string[]): any;

package/esm/util/spec/clone-deep.js

@@ -1,20 +0,0 @@
-import { isArray, isBoolean, isDate, isNumber, isString, isValid } from "@visactor/vutils";
-
-import { isDataView, isHTMLElement } from "./common";
-
-export function cloneDeepSpec(spec, excludeKeys = [ "data" ]) {
-    const value = spec;
-    let result;
-    if (!isValid(value) || "object" != typeof value) return value;
-    if (isDataView(value) || isHTMLElement(value)) return value;
-    const isArr = isArray(value), length = value.length;
-    result = isArr ? new Array(length) : "object" == typeof value ? {} : isBoolean(value) || isNumber(value) || isString(value) ? value : isDate(value) ? new Date(+value) : void 0;
-    const props = isArr ? void 0 : Object.keys(Object(value));
-    let index = -1;
-    if (result) for (;++index < (props || value).length; ) {
-        const key = props ? props[index] : index, subValue = value[key];
-        (null == excludeKeys ? void 0 : excludeKeys.includes(key.toString())) ? result[key] = subValue : result[key] = cloneDeepSpec(subValue, excludeKeys);
-    }
-    return result;
-}
-//# sourceMappingURL=clone-deep.js.map

package/esm/util/spec/clone-deep.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/util/spec/clone-deep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMrD,MAAM,UAAU,aAAa,CAAC,IAAS,EAAE,cAAwB,CAAC,MAAM,CAAC;IACvE,MAAM,KAAK,GAAG,IAAI,CAAC;IAEnB,IAAI,MAAM,CAAC;IACX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAChD,OAAO,KAAK,CAAC;KACd;IAGD,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE;QAC7C,OAAO,KAAK,CAAC;KACd;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAE5B,IAAI,KAAK,EAAE;QACT,MAAM,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;KAC5B;SAEI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAClC,MAAM,GAAG,EAAE,CAAC;KACb;SAEI,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC/D,MAAM,GAAG,KAAK,CAAC;KAChB;SAAM,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;QACxB,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;KAC3B;SAEI;QACH,MAAM,GAAG,SAAS,CAAC;KACpB;IAKD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7D,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;IACf,IAAI,MAAM,EAAE;QACV,OAAO,EAAE,KAAK,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,MAAM,EAAE;YACxC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE;gBACzC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;aACxB;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;aACpD;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","file":"clone-deep.js","sourcesContent":["import { isArray, isBoolean, isDate, isNumber, isString, isValid } from '@visactor/vutils';\nimport { isDataView, isHTMLElement } from './common';\n\n/**\n * 深拷贝 spec，为避免循环引用，DataView 维持原有引用\n * @param spec 原spec\n */\nexport function cloneDeepSpec(spec: any, excludeKeys: string[] = ['data']) {\n  const value = spec;\n\n  let result;\n  if (!isValid(value) || typeof value !== 'object') {\n    return value;\n  }\n\n  // 判断是不是不能深拷贝的对象\n  if (isDataView(value) || isHTMLElement(value)) {\n    return value;\n  }\n\n  const isArr = isArray(value);\n  const length = value.length;\n  // 不考虑特殊数组的额外处理\n  if (isArr) {\n    result = new Array(length);\n  }\n  // 不考虑 buffer / arguments 类型的处理以及 prototype 的额外处理\n  else if (typeof value === 'object') {\n    result = {};\n  }\n  // 不建议使用作为 Boolean / Number / String 作为构造器\n  else if (isBoolean(value) || isNumber(value) || isString(value)) {\n    result = value;\n  } else if (isDate(value)) {\n    result = new Date(+value);\n  }\n  // 不考虑 ArrayBuffer / DataView / TypedArray / map / set / regexp / symbol 类型\n  else {\n    result = undefined;\n  }\n\n  // 不考虑 map / set / TypedArray 类型的赋值\n\n  // 不考虑对象的 symbol 属性\n  const props = isArr ? undefined : Object.keys(Object(value));\n\n  let index = -1;\n  if (result) {\n    while (++index < (props || value).length) {\n      const key = props ? props[index] : index;\n      const subValue = value[key];\n      if (excludeKeys?.includes(key.toString())) {\n        result[key] = subValue;\n      } else {\n        result[key] = cloneDeepSpec(subValue, excludeKeys);\n      }\n    }\n  }\n\n  return result;\n}\n"]}

package/esm/util/spec/common.d.ts

@@ -1,3 +0,0 @@
-import { DataView } from '@visactor/vdataset';
-export declare function isDataView(obj: any): obj is DataView;
-export declare function isHTMLElement(obj: any): obj is Element;

package/esm/util/spec/common.js

@@ -1,15 +0,0 @@
-import { DataView } from "@visactor/vdataset";
-
-export function isDataView(obj) {
-    return obj instanceof DataView;
-}
-
-export function isHTMLElement(obj) {
-    try {
-        return obj instanceof Element;
-    } catch (_a) {
-        const htmlElementKeys = [ "children", "innerHTML", "classList", "setAttribute", "tagName", "getBoundingClientRect" ], keys = Object.keys(obj);
-        return htmlElementKeys.every((key => keys.includes(key)));
-    }
-}
-//# sourceMappingURL=common.js.map

package/esm/util/spec/common.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/util/spec/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,MAAM,UAAU,UAAU,CAAC,GAAQ;IACjC,OAAO,GAAG,YAAY,QAAQ,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAQ;IACpC,IAAI;QACF,OAAO,GAAG,YAAY,OAAO,CAAC;KAC/B;IAAC,WAAM;QAEN,MAAM,eAAe,GAAsB;YACzC,UAAU;YACV,WAAW;YACX,WAAW;YACX,cAAc;YACd,SAAS;YACT,uBAAuB;SACxB,CAAC;QACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,OAAO,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;KACzD;AACH,CAAC","file":"common.js","sourcesContent":["import { DataView } from '@visactor/vdataset';\n\nexport function isDataView(obj: any): obj is DataView {\n  return obj instanceof DataView;\n}\n\nexport function isHTMLElement(obj: any): obj is Element {\n  try {\n    return obj instanceof Element;\n  } catch {\n    // 跨端 plan B\n    const htmlElementKeys: (keyof Element)[] = [\n      'children',\n      'innerHTML',\n      'classList',\n      'setAttribute',\n      'tagName',\n      'getBoundingClientRect'\n    ];\n    const keys = Object.keys(obj);\n    return htmlElementKeys.every(key => keys.includes(key));\n  }\n}\n"]}

package/esm/util/spec/merge-spec.d.ts

@@ -1,5 +0,0 @@
-export declare function mergeSpec(target: any, ...sources: any[]): any;
-export declare function mergeSpecWithFilter(target: any, filter: string | {
-    type: string;
-    index: number;
-}, spec: any, forceMerge: boolean): void;

package/esm/util/spec/merge-spec.js

@@ -1,57 +0,0 @@
-import { isArray, isArrayLike, isObject, isPlainObject, isValid } from "@visactor/vutils";
-
-function baseMerge(target, source, shallowArray = !1) {
-    if (source) {
-        if (target === source) return;
-        if (isValid(source) && "object" == typeof source) {
-            const iterable = Object(source), props = [];
-            for (const key in iterable) props.push(key);
-            let {length: length} = props, propIndex = -1;
-            for (;length--; ) {
-                const key = props[++propIndex];
-                isValid(iterable[key]) && "object" == typeof iterable[key] && !isArray(target[key]) ? baseMergeDeep(target, source, key, shallowArray) : assignMergeValue(target, key, iterable[key]);
-            }
-        }
-    }
-}
-
-function baseMergeDeep(target, source, key, shallowArray = !1) {
-    const objValue = target[key], srcValue = source[key];
-    let newValue = source[key], isCommon = !0;
-    if (isArray(srcValue)) {
-        if (shallowArray) newValue = []; else if (isArray(objValue)) newValue = objValue; else if (isArrayLike(objValue)) {
-            newValue = new Array(objValue.length);
-            let index = -1;
-            const length = objValue.length;
-            for (;++index < length; ) newValue[index] = objValue[index];
-        }
-    } else isPlainObject(srcValue) ? (newValue = null != objValue ? objValue : {}, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
-    isCommon && baseMerge(newValue, srcValue, shallowArray), assignMergeValue(target, key, newValue);
-}
-
-function assignMergeValue(target, key, value) {
-    (void 0 !== value && !eq(target[key], value) || void 0 === value && !(key in target)) && (target[key] = value);
-}
-
-function eq(value, other) {
-    return value === other || Number.isNaN(value) && Number.isNaN(other);
-}
-
-export function mergeSpec(target, ...sources) {
-    let sourceIndex = -1;
-    const length = sources.length;
-    for (;++sourceIndex < length; ) {
-        baseMerge(target, sources[sourceIndex], !0);
-    }
-    return target;
-}
-
-export function mergeSpecWithFilter(target, filter, spec, forceMerge) {
-    Object.keys(target).forEach((k => {
-        if (isObject(filter)) filter.type === k && (isArray(target[k]) ? target[k].length >= filter.index && (target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec) : target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec); else if (isArray(target[k])) {
-            const index = target[k].findIndex((_s => _s.id === filter));
-            index >= 0 && (target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec);
-        } else target.id === filter && (target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec);
-    }));
-}
-//# sourceMappingURL=merge-spec.js.map

package/esm/util/spec/merge-spec.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/util/spec/merge-spec.ts"],"names":[],"mappings":"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","file":"merge-spec.js","sourcesContent":["import { isArray, isArrayLike, isObject, isPlainObject, isValid } from '@visactor/vutils';\nimport type { StringOrNumber } from '../../typings';\n\nfunction baseMerge(target: any, source: any, shallowArray: boolean = false) {\n  if (source) {\n    if (target === source) {\n      return;\n    }\n    if (isValid(source) && typeof source === 'object') {\n      // baseFor\n      const iterable = Object(source);\n      const props = [];\n      // keysIn\n      for (const key in iterable) {\n        props.push(key);\n      }\n      let { length } = props;\n      let propIndex = -1;\n      while (length--) {\n        const key = props[++propIndex];\n        if (\n          isValid(iterable[key]) &&\n          typeof iterable[key] === 'object' &&\n          !isArray(target[key]) // VChart 特有逻辑\n        ) {\n          baseMergeDeep(target, source, key, shallowArray);\n        } else {\n          assignMergeValue(target, key, iterable[key]);\n        }\n      }\n    }\n  }\n}\n\n// 由于目前 VChart 内部对 spec 会先执行一次深拷贝，merge 暂时不考虑 source 中有环的问题\nfunction baseMergeDeep(target: object, source: object, key: string, shallowArray: boolean = false) {\n  const objValue = target[key];\n  const srcValue = source[key];\n  let newValue = source[key];\n  let isCommon = true;\n  // 不考虑 buffer / typedArray 类型\n  if (isArray(srcValue)) {\n    if (shallowArray) {\n      // 依据参数对数组做浅拷贝\n      newValue = [];\n    } else if (isArray(objValue)) {\n      newValue = objValue;\n    } else if (isArrayLike(objValue)) {\n      // 如果 source 为数组，则 target 的 arrayLike 对象也视作为数组处理\n      newValue = new Array(objValue.length);\n      let index = -1;\n      const length = objValue.length;\n      while (++index < length) {\n        newValue[index] = objValue[index];\n      }\n    }\n  }\n  // else if (isArray(srcValue) && shallowArray) {\n  //   newValue = [];\n  // }\n  // 不考虑 argument 类型\n  else if (isPlainObject(srcValue)) {\n    newValue = objValue ?? {};\n    // 不考虑 prototype 的额外处理\n    if (typeof objValue === 'function' || typeof objValue !== 'object') {\n      newValue = {};\n    }\n  } else {\n    isCommon = false;\n  }\n  // 对 class 等复杂对象或者浅拷贝的 array 不做拷贝处理\n  if (isCommon) {\n    baseMerge(newValue, srcValue, shallowArray);\n  }\n  assignMergeValue(target, key, newValue);\n}\n\nfunction assignMergeValue(target: object, key: string, value: any) {\n  if ((value !== undefined && !eq(target[key], value)) || (value === undefined && !(key in target))) {\n    // 不考虑 __proto__ 的赋值处理\n    target[key] = value;\n  }\n}\n\nfunction eq(value: any, other: any) {\n  return value === other || (Number.isNaN(value) && Number.isNaN(other));\n}\n\n/* 与原生的 lodash merge 差异在于对数组是否应用最后一个 source 的结果\n * 以及对一些特殊情况的处理，比如对数组类型 padding 和对象类型的 padding 的 merge\n */\nexport function mergeSpec(target: any, ...sources: any[]): any {\n  let sourceIndex = -1;\n  const length = sources.length;\n  while (++sourceIndex < length) {\n    const source = sources[sourceIndex];\n    baseMerge(target, source, true);\n  }\n  return target;\n}\n\nexport function mergeSpecWithFilter(\n  target: any,\n  filter: string | { type: string; index: number },\n  spec: any,\n  forceMerge: boolean\n) {\n  Object.keys(target).forEach(k => {\n    if (isObject(filter)) {\n      if (filter.type === k) {\n        if (isArray(target[k])) {\n          if (target[k].length >= filter.index) {\n            target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec;\n          }\n        } else {\n          target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n        }\n      }\n    } else {\n      // filter === user id\n      if (isArray(target[k])) {\n        const index = target[k].findIndex((_s: { id: StringOrNumber }) => _s.id === filter);\n        if (index >= 0) {\n          target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec;\n        }\n      } else if (target.id === filter) {\n        target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n      }\n    }\n  });\n}\n"]}