## 树线图元(TreePath)
@@ -118,5 +118,5 @@ registerGlyph('candle', {
K 线图示例：
-
+
diff --git a/docs/site/tutorials/marks/grammar-mark.md b/docs/site/tutorials/marks/semantic-mark.md
similarity index 100%
rename from docs/site/tutorials/marks/grammar-mark.md
rename to docs/site/tutorials/marks/semantic-mark.md
diff --git a/docs/site/tutorials/menu.ts b/docs/site/tutorials/menu.ts
index e0411b837..564c008bb 100644
--- a/docs/site/tutorials/menu.ts
+++ b/docs/site/tutorials/menu.ts
@@ -27,7 +27,7 @@ export const tutorialsMenu = [
menu: '基础图元'
},
{
- name: 'grammar-mark',
+ name: 'semantic-mark',
menu: '语义图元'
},
{
diff --git a/docs/site/tutorials/quick-start.md b/docs/site/tutorials/quick-start.md
index f563b39dc..c571798cb 100644
--- a/docs/site/tutorials/quick-start.md
+++ b/docs/site/tutorials/quick-start.md
@@ -2,8 +2,6 @@
VGrammar 是一个面向数据可视化的语法引擎，提供了一套声明式的 Specification 以及等价的 API 形式接口，允许用户自由创作属于自己的可视化作品。
-
-
# 获取 VGrammar
目前，开发者可以通过 npm 以及 github 两种方式获取 VGrammar 资源。
diff --git a/packages/vgrammar-coordinate/CHANGELOG.json b/packages/vgrammar-coordinate/CHANGELOG.json
index 2fdbd2601..79ece6a6b 100644
--- a/packages/vgrammar-coordinate/CHANGELOG.json
+++ b/packages/vgrammar-coordinate/CHANGELOG.json
@@ -1,6 +1,18 @@
{
"name": "@visactor/vgrammar-coordinate",
"entries": [
+ {
+ "version": "0.3.1",
+ "tag": "@visactor/vgrammar-coordinate_v0.3.1",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.0",
"tag": "@visactor/vgrammar-coordinate_v0.3.0",
diff --git a/packages/vgrammar-coordinate/CHANGELOG.md b/packages/vgrammar-coordinate/CHANGELOG.md
index bc6130572..abfb78fac 100644
--- a/packages/vgrammar-coordinate/CHANGELOG.md
+++ b/packages/vgrammar-coordinate/CHANGELOG.md
@@ -1,6 +1,11 @@
# Change Log - @visactor/vgrammar-coordinate
-This log was last generated on Wed, 28 Jun 2023 03:31:17 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.1
+Fri, 07 Jul 2023 04:16:33 GMT
+
+_Version update only_
## 0.3.0
Wed, 28 Jun 2023 03:31:17 GMT
diff --git a/packages/vgrammar-coordinate/__tests__/tsconfig.json b/packages/vgrammar-coordinate/__tests__/tsconfig.json
new file mode 100644
index 000000000..0136581ef
--- /dev/null
+++ b/packages/vgrammar-coordinate/__tests__/tsconfig.json
@@ -0,0 +1,10 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar-coordinate/package.json b/packages/vgrammar-coordinate/package.json
index 4d1592c48..aa43af296 100644
--- a/packages/vgrammar-coordinate/package.json
+++ b/packages/vgrammar-coordinate/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-coordinate",
- "version": "0.3.0",
+ "version": "0.3.1",
"description": "Coordinates for VGrammar",
"keywords": [
"coordinate",
@@ -34,7 +34,7 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
- "@visactor/vgrammar-util": "workspace:0.3.0",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
"@visactor/vutils": "~0.11.1"
},
"devDependencies": {
diff --git a/packages/vgrammar-coordinate/tsconfig.test.json b/packages/vgrammar-coordinate/tsconfig.test.json
deleted file mode 100644
index 1a87cbec1..000000000
--- a/packages/vgrammar-coordinate/tsconfig.test.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"]
- }
- },
- "references": []
-}
diff --git a/packages/vgrammar-hierarchy/CHANGELOG.json b/packages/vgrammar-hierarchy/CHANGELOG.json
index 3237a5f0b..271dc33e4 100644
--- a/packages/vgrammar-hierarchy/CHANGELOG.json
+++ b/packages/vgrammar-hierarchy/CHANGELOG.json
@@ -1,6 +1,21 @@
{
"name": "@visactor/vgrammar-hierarchy",
"entries": [
+ {
+ "version": "0.3.2",
+ "tag": "@visactor/vgrammar-hierarchy_v0.3.2",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar\" from `0.3.1` to `0.3.2`"
+ },
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.1",
"tag": "@visactor/vgrammar-hierarchy_v0.3.1",
diff --git a/packages/vgrammar-hierarchy/CHANGELOG.md b/packages/vgrammar-hierarchy/CHANGELOG.md
index 84767240a..3323198e5 100644
--- a/packages/vgrammar-hierarchy/CHANGELOG.md
+++ b/packages/vgrammar-hierarchy/CHANGELOG.md
@@ -1,6 +1,11 @@
# Change Log - @visactor/vgrammar-hierarchy
-This log was last generated on Fri, 30 Jun 2023 09:22:01 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.2
+Fri, 07 Jul 2023 04:16:33 GMT
+
+_Version update only_
## 0.3.1
Fri, 30 Jun 2023 09:22:01 GMT
diff --git a/packages/vgrammar-hierarchy/__tests__/tsconfig.json b/packages/vgrammar-hierarchy/__tests__/tsconfig.json
new file mode 100644
index 000000000..52f7bc419
--- /dev/null
+++ b/packages/vgrammar-hierarchy/__tests__/tsconfig.json
@@ -0,0 +1,12 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"],
+ "@visactor/vgrammar-coordinate": ["../../vgrammar-coordinate/src"],
+ "@visactor/vgrammar": ["../../vgrammar/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar-hierarchy/package.json b/packages/vgrammar-hierarchy/package.json
index 468c6a57b..e60237aed 100644
--- a/packages/vgrammar-hierarchy/package.json
+++ b/packages/vgrammar-hierarchy/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-hierarchy",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "Layout of hierarchical data for VGrammar",
"keywords": [
"hierarchy",
@@ -38,10 +38,10 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
- "@visactor/vgrammar": "workspace:0.3.1",
- "@visactor/vgrammar-util": "workspace:0.3.0",
+ "@visactor/vgrammar": "workspace:0.3.2",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
"@visactor/vutils": "~0.11.1",
- "@visactor/vrender": "~0.11.1"
+ "@visactor/vrender": "~0.12.0"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
diff --git a/packages/vgrammar-hierarchy/tsconfig.test.json b/packages/vgrammar-hierarchy/tsconfig.test.json
deleted file mode 100644
index 8ce25293f..000000000
--- a/packages/vgrammar-hierarchy/tsconfig.test.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"],
- "@visactor/vgrammar-coordinate": ["../vgrammar-coordinate/src"],
- "@visactor/vgrammar": ["../vgrammar/src"]
- }
- },
- "references": []
-}
diff --git a/packages/vgrammar-projection/CHANGELOG.json b/packages/vgrammar-projection/CHANGELOG.json
index e0f893e8f..b38656d69 100644
--- a/packages/vgrammar-projection/CHANGELOG.json
+++ b/packages/vgrammar-projection/CHANGELOG.json
@@ -1,6 +1,26 @@
{
"name": "@visactor/vgrammar-projection",
"entries": [
+ {
+ "version": "0.3.2",
+ "tag": "@visactor/vgrammar-projection_v0.3.2",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "patch": [
+ {
+ "comment": "test(vgrammar-util): add test case of vgrammar-util and remove some useless function"
+ }
+ ],
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ },
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar\" from `0.3.1` to `0.3.2`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.1",
"tag": "@visactor/vgrammar-projection_v0.3.1",
diff --git a/packages/vgrammar-projection/CHANGELOG.md b/packages/vgrammar-projection/CHANGELOG.md
index 7e0402a66..d1994687b 100644
--- a/packages/vgrammar-projection/CHANGELOG.md
+++ b/packages/vgrammar-projection/CHANGELOG.md
@@ -1,6 +1,13 @@
# Change Log - @visactor/vgrammar-projection
-This log was last generated on Fri, 30 Jun 2023 09:22:01 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.2
+Fri, 07 Jul 2023 04:16:33 GMT
+
+### Patches
+
+- test(vgrammar-util): add test case of vgrammar-util and remove some useless function
## 0.3.1
Fri, 30 Jun 2023 09:22:01 GMT
diff --git a/packages/vgrammar-projection/__tests__/tsconfig.json b/packages/vgrammar-projection/__tests__/tsconfig.json
new file mode 100644
index 000000000..52f7bc419
--- /dev/null
+++ b/packages/vgrammar-projection/__tests__/tsconfig.json
@@ -0,0 +1,12 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"],
+ "@visactor/vgrammar-coordinate": ["../../vgrammar-coordinate/src"],
+ "@visactor/vgrammar": ["../../vgrammar/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar-projection/package.json b/packages/vgrammar-projection/package.json
index 1d467db19..8abd34d30 100644
--- a/packages/vgrammar-projection/package.json
+++ b/packages/vgrammar-projection/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-projection",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "Projections for map, used in VGrammar.",
"keywords": [
"projection",
@@ -41,8 +41,8 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
- "@visactor/vgrammar-util": "workspace:0.3.0",
- "@visactor/vgrammar": "workspace:0.3.1",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
+ "@visactor/vgrammar": "workspace:0.3.2",
"@visactor/vutils": "~0.11.1",
"d3-geo": "^1.11.6"
},
diff --git a/packages/vgrammar-projection/src/projection.ts b/packages/vgrammar-projection/src/projection.ts
index b0a33b84f..560c08334 100644
--- a/packages/vgrammar-projection/src/projection.ts
+++ b/packages/vgrammar-projection/src/projection.ts
@@ -7,8 +7,8 @@
* @license
*/
-import { array, isFunction, isNil } from '@visactor/vutils';
-import { error, mergeConfig } from '@visactor/vgrammar-util';
+import { array, isFunction, isNil, merge } from '@visactor/vutils';
+import { error } from '@visactor/vgrammar-util';
import { projection, projectionProperties } from './projections';
import type { IView, GrammarType, IGrammarBase } from '@visactor/vgrammar';
// eslint-disable-next-line no-duplicate-imports
@@ -79,7 +79,7 @@ export class Projection extends GrammarBase implements IProjection {
parse(spec: ProjectionSpec) {
super.parse(spec);
- this.spec = mergeConfig(this.spec, spec);
+ this.spec = merge({}, this.spec, spec);
this.attach(parseProjection(spec, this.view));
return this;
diff --git a/packages/vgrammar-projection/tsconfig.test.json b/packages/vgrammar-projection/tsconfig.test.json
deleted file mode 100644
index 8ce25293f..000000000
--- a/packages/vgrammar-projection/tsconfig.test.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"],
- "@visactor/vgrammar-coordinate": ["../vgrammar-coordinate/src"],
- "@visactor/vgrammar": ["../vgrammar/src"]
- }
- },
- "references": []
-}
diff --git a/packages/vgrammar-sankey/CHANGELOG.json b/packages/vgrammar-sankey/CHANGELOG.json
index 73de0fadb..b8e365f9c 100644
--- a/packages/vgrammar-sankey/CHANGELOG.json
+++ b/packages/vgrammar-sankey/CHANGELOG.json
@@ -1,6 +1,21 @@
{
"name": "@visactor/vgrammar-sankey",
"entries": [
+ {
+ "version": "0.3.2",
+ "tag": "@visactor/vgrammar-sankey_v0.3.2",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar\" from `0.3.1` to `0.3.2`"
+ },
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.1",
"tag": "@visactor/vgrammar-sankey_v0.3.1",
diff --git a/packages/vgrammar-sankey/CHANGELOG.md b/packages/vgrammar-sankey/CHANGELOG.md
index 9fd1fa5ed..209b171e0 100644
--- a/packages/vgrammar-sankey/CHANGELOG.md
+++ b/packages/vgrammar-sankey/CHANGELOG.md
@@ -1,6 +1,11 @@
# Change Log - @visactor/vgrammar-sankey
-This log was last generated on Fri, 30 Jun 2023 09:22:01 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.2
+Fri, 07 Jul 2023 04:16:33 GMT
+
+_Version update only_
## 0.3.1
Fri, 30 Jun 2023 09:22:01 GMT
diff --git a/packages/vgrammar-sankey/__tests__/tsconfig.json b/packages/vgrammar-sankey/__tests__/tsconfig.json
new file mode 100644
index 000000000..52f7bc419
--- /dev/null
+++ b/packages/vgrammar-sankey/__tests__/tsconfig.json
@@ -0,0 +1,12 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"],
+ "@visactor/vgrammar-coordinate": ["../../vgrammar-coordinate/src"],
+ "@visactor/vgrammar": ["../../vgrammar/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar-sankey/package.json b/packages/vgrammar-sankey/package.json
index a3afe918c..8c81e9360 100644
--- a/packages/vgrammar-sankey/package.json
+++ b/packages/vgrammar-sankey/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-sankey",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "Layout of sankey chart, used by VGrammar",
"keywords": [
"sankey",
@@ -36,9 +36,9 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
- "@visactor/vrender": "~0.11.1",
- "@visactor/vgrammar": "workspace:0.3.1",
- "@visactor/vgrammar-util": "workspace:0.3.0",
+ "@visactor/vrender": "~0.12.0",
+ "@visactor/vgrammar": "workspace:0.3.2",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
"@visactor/vutils": "~0.11.1"
},
"devDependencies": {
diff --git a/packages/vgrammar-sankey/tsconfig.test.json b/packages/vgrammar-sankey/tsconfig.test.json
deleted file mode 100644
index 8ce25293f..000000000
--- a/packages/vgrammar-sankey/tsconfig.test.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"],
- "@visactor/vgrammar-coordinate": ["../vgrammar-coordinate/src"],
- "@visactor/vgrammar": ["../vgrammar/src"]
- }
- },
- "references": []
-}
diff --git a/packages/vgrammar-util/CHANGELOG.json b/packages/vgrammar-util/CHANGELOG.json
index 903c210e1..c4ef3be79 100644
--- a/packages/vgrammar-util/CHANGELOG.json
+++ b/packages/vgrammar-util/CHANGELOG.json
@@ -1,6 +1,18 @@
{
"name": "@visactor/vgrammar-util",
"entries": [
+ {
+ "version": "0.3.1",
+ "tag": "@visactor/vgrammar-util_v0.3.1",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "patch": [
+ {
+ "comment": "test(vgrammar-util): add test case of vgrammar-util and remove some useless function"
+ }
+ ]
+ }
+ },
{
"version": "0.3.0",
"tag": "@visactor/vgrammar-util_v0.3.0",
diff --git a/packages/vgrammar-util/CHANGELOG.md b/packages/vgrammar-util/CHANGELOG.md
index 6c4711d89..1eb8c1249 100644
--- a/packages/vgrammar-util/CHANGELOG.md
+++ b/packages/vgrammar-util/CHANGELOG.md
@@ -1,6 +1,13 @@
# Change Log - @visactor/vgrammar-util
-This log was last generated on Wed, 28 Jun 2023 03:31:17 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.1
+Fri, 07 Jul 2023 04:16:33 GMT
+
+### Patches
+
+- test(vgrammar-util): add test case of vgrammar-util and remove some useless function
## 0.3.0
Wed, 28 Jun 2023 03:31:17 GMT
diff --git a/packages/vgrammar-util/__tests__/accessor.test.ts b/packages/vgrammar-util/__tests__/accessor.test.ts
new file mode 100644
index 000000000..1156f517f
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/accessor.test.ts
@@ -0,0 +1,57 @@
+import { accessor } from '../src';
+
+test('accessor a arrow function', () => {
+ const func = () => {
+ return 'a';
+ };
+ const fields = ['a', 'b', 'c'];
+ const fname = 'accessor';
+
+ const a1 = accessor(func);
+ expect(a1).toBe(func);
+ expect(a1.fields).toEqual([]);
+ expect(a1.fname).toBeUndefined();
+
+ const a2 = accessor(func, fields);
+ expect(a2).toBe(func);
+ expect(a2.fields).toBe(fields);
+ expect(a2.fname).toBeUndefined();
+
+ const a3 = accessor(func, null, fname);
+ expect(a3).toBe(func);
+ expect(a3.fields).toEqual([]);
+ expect(a3.fname).toBe(fname);
+
+ const a4 = accessor(func, fields, fname);
+ expect(a4).toBe(func);
+ expect(a4.fields).toBe(fields);
+ expect(a4.fname).toBe(fname);
+});
+
+test('accessor a simple function', () => {
+ function test() {
+ return 'test';
+ }
+ const fields = ['a', 'b', 'c'];
+ const fname = 'accessor';
+
+ const a1 = accessor(test);
+ expect(a1).toBe(test);
+ expect(a1.fields).toEqual([]);
+ expect(a1.fname).toBeUndefined();
+
+ const a2 = accessor(test, fields);
+ expect(a2).toBe(test);
+ expect(a2.fields).toBe(fields);
+ expect(a2.fname).toBeUndefined();
+
+ const a3 = accessor(test, null, fname);
+ expect(a3).toBe(test);
+ expect(a3.fields).toEqual([]);
+ expect(a3.fname).toBe(fname);
+
+ const a4 = accessor(test, fields, fname);
+ expect(a4).toBe(test);
+ expect(a4.fields).toBe(fields);
+ expect(a4.fname).toBe(fname);
+});
diff --git a/packages/vgrammar-util/__tests__/accessors.test.ts b/packages/vgrammar-util/__tests__/accessors.test.ts
new file mode 100644
index 000000000..5cd7043b5
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/accessors.test.ts
@@ -0,0 +1,55 @@
+import { id, identity, zero, one, truthy, falsy, emptyObject } from '../src';
+
+test('accessor id()', () => {
+ expect(id.fields).toEqual(['id']);
+ expect(id.fname).toBe('id');
+ expect(id({ id: 2 })).toBe(2);
+});
+
+test('accessor identity()', () => {
+ expect(identity.fields).toEqual([]);
+ expect(identity.fname).toBe('identity');
+
+ const a = { a: 3 };
+ expect(identity(a)).toBe(a);
+});
+
+test('accessor zero()', () => {
+ expect(zero.fields).toEqual([]);
+ expect(zero.fname).toBe('zero');
+
+ const a = { a: 3 };
+ expect(zero(a)).toBe(0);
+});
+
+test('accessor one()', () => {
+ expect(one.fields).toEqual([]);
+ expect(one.fname).toBe('one');
+
+ const a = { a: 3 };
+ expect(one(a)).toBe(1);
+});
+
+test('accessor truthy()', () => {
+ expect(truthy.fields).toEqual([]);
+ expect(truthy.fname).toBe('true');
+
+ const a = { a: 3 };
+ expect(truthy(a)).toBeTruthy();
+});
+
+test('accessor falsy()', () => {
+ expect(falsy.fields).toEqual([]);
+ expect(falsy.fname).toBe('false');
+
+ const a = { a: 3 };
+ expect(falsy(a)).toBeFalsy();
+});
+
+test('accessor emptyObject()', () => {
+ expect(emptyObject.fields).toEqual([]);
+ expect(emptyObject.fname).toBe('emptyObject');
+
+ const a = { a: 3 };
+ expect(emptyObject(a)).toEqual({});
+});
diff --git a/packages/vgrammar-util/__tests__/extent.test.ts b/packages/vgrammar-util/__tests__/extent.test.ts
new file mode 100644
index 000000000..f4ef34b1f
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/extent.test.ts
@@ -0,0 +1,55 @@
+import { extent } from '../src';
+
+test('extent(arr)', () => {
+ expect(extent([1, 2])).toEqual([1, 2]);
+ expect(extent([])).toEqual([undefined, undefined]);
+ expect(extent([NaN, undefined, null, NaN])).toEqual([undefined, undefined]);
+ expect(extent([1, 1])).toEqual([1, 1]);
+ expect(extent([Infinity, 1])).toEqual([1, Infinity]);
+ expect(extent([undefined, 33, 1])).toEqual([1, 33]);
+ expect(extent([null, 33, 1])).toEqual([1, 33]);
+ expect(extent([NaN, 33, 1])).toEqual([1, 33]);
+ expect(extent([NaN, undefined, null, 1])).toEqual([1, 1]);
+ expect(extent([NaN, undefined, null, 'test'])).toEqual([undefined, undefined]);
+});
+
+test('extent(arr, func)', () => {
+ const func = (entry: any) => {
+ return entry?.value;
+ };
+
+ expect(extent([{ value: 1 }, 2], func)).toEqual([1, 1]);
+ expect(extent([], func)).toEqual([undefined, undefined]);
+ expect(extent([NaN, undefined, null, NaN], func)).toEqual([undefined, undefined]);
+ expect(extent([{ value: 1 }, { value: 1 }], func)).toEqual([1, 1]);
+ expect(
+ extent(
+ [Infinity, 1].map(e => ({ value: e })),
+ func
+ )
+ ).toEqual([1, Infinity]);
+ expect(
+ extent(
+ [undefined, 33, 1].map(e => ({ value: e })),
+ func
+ )
+ ).toEqual([1, 33]);
+ expect(
+ extent(
+ [null, 33, 1].map(e => ({ value: e })),
+ func
+ )
+ ).toEqual([1, 33]);
+ expect(
+ extent(
+ [NaN, 33, 1].map(e => ({ value: e })),
+ func
+ )
+ ).toEqual([1, 33]);
+ expect(
+ extent(
+ [NaN, undefined, null, 1].map(e => ({ value: e })),
+ func
+ )
+ ).toEqual([1, 1]);
+});
diff --git a/packages/vgrammar-util/__tests__/getter.test.ts b/packages/vgrammar-util/__tests__/getter.test.ts
new file mode 100644
index 000000000..da1564148
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/getter.test.ts
@@ -0,0 +1,7 @@
+import { getter } from '../src';
+
+test('getter(arr)', () => {
+ expect(getter(['a'])({ a: 1 })).toEqual(1);
+ expect(getter(['a', 'b'])({ a: { b: 1 } })).toEqual(1);
+ expect(getter(['a', 'b'])({ a: { b: { c: 2 } } })).toEqual({ c: 2 });
+});
diff --git a/packages/vgrammar-util/__tests__/isEqual.test.ts b/packages/vgrammar-util/__tests__/isEqual.test.ts
new file mode 100644
index 000000000..0d002e8e5
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/isEqual.test.ts
@@ -0,0 +1,44 @@
+import { isEqual } from '../src';
+
+test('isEqual() of simple type', function () {
+ expect(isEqual('any', 1, 1)).toBeTruthy();
+ expect(isEqual('any', undefined, undefined)).toBeTruthy();
+ expect(isEqual('any', undefined, null)).toBeTruthy();
+ expect(isEqual('any', null, null)).toBeTruthy();
+ expect(isEqual('any', null, 1)).toBeFalsy();
+ expect(isEqual('any', undefined, 1)).toBeFalsy();
+ expect(isEqual('any', 1, null)).toBeFalsy();
+ expect(isEqual('any', 1, undefined)).toBeFalsy();
+ expect(isEqual('any', 'test', 'test')).toBeTruthy();
+ expect(isEqual('any', true, true)).toBeTruthy();
+ expect(isEqual('any', false, false)).toBeTruthy();
+});
+
+test('isEqual() of array', function () {
+ const arrA = ['a', 'b'];
+ const arrB = ['a', 'b'];
+ const arrC = ['b', 'b'];
+ const objD = { '0': 'a', '1': 'b' };
+
+ expect(isEqual('any', arrA, arrA)).toBeTruthy();
+ expect(isEqual('0', arrA, arrA)).toBeTruthy();
+ expect(isEqual('0', arrA, arrB)).toBeTruthy();
+ expect(isEqual('0', arrB, arrC)).toBeFalsy();
+ expect(isEqual('1', arrB, arrC)).toBeFalsy();
+ expect(isEqual('1', arrB, arrC, false)).toBeFalsy();
+ expect(isEqual('0', arrA, objD)).toBeFalsy();
+});
+
+test('isEqual() of object', function () {
+ const objA = { '0': 'a', '1': 'b', '2': { test: '1' } };
+ const objB = { '0': [1, 2], '1': 'c', '2': { test: '1' } };
+ const objC = { '0': [1, 2], '1': 'd' };
+ const objD = { '0': 'a', '1': 'b' };
+
+ expect(isEqual('0', objA, objD)).toBeTruthy();
+ expect(isEqual('1', objA, objD)).toBeTruthy();
+ expect(isEqual('2', objA, objB, false)).toBeFalsy();
+ expect(isEqual('2', objA, objB)).toBeTruthy();
+ expect(isEqual('0', objC, objB)).toBeTruthy();
+ expect(isEqual('0', objC, objB, false)).toBeFalsy();
+});
diff --git a/packages/vgrammar-util/__tests__/logger.test.ts b/packages/vgrammar-util/__tests__/logger.test.ts
new file mode 100644
index 000000000..85265f94e
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/logger.test.ts
@@ -0,0 +1,211 @@
+import { Logger, setLogLevel, setLogger, getLogger, clearLogger } from '../src';
+import { jest } from '@jest/globals';
+
+test('getLogger() and clearLogger()', function () {
+ const logger1 = getLogger();
+ const logger2 = getLogger(2);
+ const logger3 = getLogger();
+
+ expect(logger1).toBe(logger2);
+ expect(logger2).toBe(logger3);
+ expect(logger1.level()).toBe(2);
+
+ clearLogger();
+
+ const logger4 = getLogger(3);
+
+ expect(logger4).not.toBe(logger2);
+ expect(logger4.level()).toBe(3);
+
+ clearLogger();
+
+ const logger5 = getLogger();
+
+ expect(logger5.level()).toBe(0);
+ expect(logger5).not.toBe(logger2);
+ expect(logger5).not.toBe(logger3);
+ expect(logger5).not.toBe(logger4);
+
+ clearLogger();
+
+ const logger6 = getLogger(undefined, 'error');
+ expect(logger6.level()).toBe(0);
+ expect(logger6).not.toBe(logger2);
+ expect(logger6).not.toBe(logger3);
+ expect(logger6).not.toBe(logger4);
+ expect(logger6).not.toBe(logger5);
+
+ setLogLevel(2);
+ expect(logger6.level()).toBe(2);
+});
+
+test('setLogger()', () => {
+ const customLogger = {
+ canLogInfo() {
+ return true;
+ },
+ canLogDebug() {
+ return true;
+ },
+ canLogError() {
+ return true;
+ },
+ canLogWarn() {
+ return true;
+ },
+ level() {
+ return 0;
+ },
+ error() {
+ return customLogger;
+ },
+ warn() {
+ return customLogger;
+ },
+ info() {
+ return customLogger;
+ },
+ debug() {
+ return customLogger;
+ }
+ };
+
+ setLogger(customLogger);
+
+ expect(getLogger()).toBe(customLogger);
+});
+
+test('Logger(0)', () => {
+ const logger = new Logger();
+ const logSpy = jest.spyOn(global.console, 'log');
+ const errorSpy = jest.spyOn(global.console, 'error');
+ const warnSpy = jest.spyOn(global.console, 'warn');
+
+ expect(logger.level()).toBe(0);
+ expect(logger.canLogError()).toBeFalsy();
+ expect(logger.canLogWarn()).toBeFalsy();
+ expect(logger.canLogInfo()).toBeFalsy();
+ expect(logger.canLogDebug()).toBeFalsy();
+ logger.info('info');
+ logger.debug('debug');
+ logger.warn('warn');
+ logger.error('error');
+ expect(logSpy).not.toHaveBeenCalled();
+ logSpy.mockRestore();
+ expect(errorSpy).not.toHaveBeenCalled();
+ errorSpy.mockRestore();
+ expect(warnSpy).not.toHaveBeenCalled();
+ warnSpy.mockRestore();
+});
+
+test('Logger(1)', () => {
+ const logger = new Logger();
+ const logSpy = jest.spyOn(global.console, 'log');
+ const errorSpy = jest.spyOn(global.console, 'error');
+ const warnSpy = jest.spyOn(global.console, 'warn');
+
+ logger.level(1);
+ expect(logger.level()).toBe(1);
+ expect(logger.canLogError()).toBeTruthy();
+ expect(logger.canLogWarn()).toBeFalsy();
+ expect(logger.canLogInfo()).toBeFalsy();
+ expect(logger.canLogDebug()).toBeFalsy();
+
+ logger.error('error');
+ logger.info('info');
+ logger.debug('debug');
+ logger.warn('warn');
+ expect(errorSpy).toHaveBeenCalled();
+ expect(errorSpy).toHaveBeenCalledTimes(1);
+ expect(logSpy).not.toHaveBeenCalled();
+ expect(warnSpy).not.toHaveBeenCalled();
+ logSpy.mockRestore();
+ errorSpy.mockRestore();
+ warnSpy.mockRestore();
+});
+
+test('Logger(2)', () => {
+ const logger = new Logger();
+ const logSpy = jest.spyOn(global.console, 'log');
+ const errorSpy = jest.spyOn(global.console, 'error');
+ const warnSpy = jest.spyOn(global.console, 'warn');
+
+ logger.level(2);
+ expect(logger.level()).toBe(2);
+ expect(logger.canLogError()).toBeTruthy();
+ expect(logger.canLogWarn()).toBeTruthy();
+ expect(logger.canLogInfo()).toBeFalsy();
+ expect(logger.canLogDebug()).toBeFalsy();
+
+ logger.info('test');
+ logger.debug('test');
+ logger.warn('test');
+ logger.error('test');
+ expect(errorSpy).toHaveBeenCalled();
+ expect(errorSpy).toHaveBeenCalledTimes(1);
+ expect(warnSpy).toHaveBeenCalled();
+ expect(warnSpy).toHaveBeenCalledTimes(1);
+ expect(logSpy).not.toHaveBeenCalled();
+
+ logSpy.mockRestore();
+ errorSpy.mockRestore();
+ warnSpy.mockRestore();
+});
+
+test('Logger(3)', () => {
+ const logger = new Logger();
+ const logSpy = jest.spyOn(global.console, 'log');
+ const errorSpy = jest.spyOn(global.console, 'error');
+ const warnSpy = jest.spyOn(global.console, 'warn');
+
+ logger.level(3);
+ expect(logger.level()).toBe(3);
+ expect(logger.canLogError()).toBeTruthy();
+ expect(logger.canLogWarn()).toBeTruthy();
+ expect(logger.canLogInfo()).toBeTruthy();
+ expect(logger.canLogDebug()).toBeFalsy();
+
+ logger.info('test');
+ logger.debug('test');
+ logger.warn('test');
+ logger.error('test');
+ expect(errorSpy).toHaveBeenCalled();
+ expect(errorSpy).toHaveBeenCalledTimes(1);
+ expect(warnSpy).toHaveBeenCalled();
+ expect(warnSpy).toHaveBeenCalledTimes(1);
+ expect(logSpy).toHaveBeenCalled();
+ expect(logSpy).toHaveBeenCalledTimes(1);
+
+ logSpy.mockRestore();
+ errorSpy.mockRestore();
+ warnSpy.mockRestore();
+});
+
+test('Logger(4)', () => {
+ const logger = new Logger();
+ const logSpy = jest.spyOn(global.console, 'log');
+ const errorSpy = jest.spyOn(global.console, 'error');
+ const warnSpy = jest.spyOn(global.console, 'warn');
+
+ logger.level(4);
+ expect(logger.level()).toBe(4);
+ expect(logger.canLogError()).toBeTruthy();
+ expect(logger.canLogWarn()).toBeTruthy();
+ expect(logger.canLogInfo()).toBeTruthy();
+ expect(logger.canLogDebug()).toBeTruthy();
+
+ logger.info('test');
+ logger.debug('test');
+ logger.warn('test');
+ logger.error('test');
+ expect(errorSpy).toHaveBeenCalled();
+ expect(errorSpy).toHaveBeenCalledTimes(1);
+ expect(warnSpy).toHaveBeenCalled();
+ expect(warnSpy).toHaveBeenCalledTimes(1);
+ expect(logSpy).toHaveBeenCalled();
+ expect(logSpy).toHaveBeenCalledTimes(2);
+
+ logSpy.mockRestore();
+ errorSpy.mockRestore();
+ warnSpy.mockRestore();
+});
diff --git a/packages/vgrammar-util/__tests__/mergeConfig.test.ts b/packages/vgrammar-util/__tests__/mergeConfig.test.ts
deleted file mode 100644
index d3e980b44..000000000
--- a/packages/vgrammar-util/__tests__/mergeConfig.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Adapted from vega by University of Washington Interactive Data Lab
- * https://vega.github.io/vega/
- * Licensed under the BSD-3-Clause
-
- * url: https://github.com/vega/vega/blob/main/packages/vega-util/test/mergeConfig-test.js
- * License: https://github.com/vega/vega/blob/main/LICENSE
- * @license
- */
-
-import { mergeConfig } from '../src/mergeConfig';
-
-test('mergeConfig merges configuration objects', () => {
- expect(
- mergeConfig(
- { mark: { fill: 'blue', stroke: { value: 'black' }, dashArray: [1, 2] } },
- { mark: { stroke: { signal: '"black"' }, dashArray: [3, 4] } }
- )
- ).toEqual({
- mark: { fill: 'blue', stroke: { signal: '"black"' }, dashArray: [3, 4] }
- });
-});
-
-test('mergeConfig merges legend objects', () => {
- expect(
- mergeConfig(
- {
- legend: {
- orient: 'right',
- titlePadding: 5,
- layout: {
- anchor: 'start',
- left: { anchor: 'middle' },
- right: { anchor: 'start', direction: 'horizontal' }
- }
- }
- },
- {
- legend: {
- orient: 'left',
- layout: {
- anchor: 'middle',
- right: { anchor: 'middle' }
- }
- }
- }
- )
- ).toEqual({
- legend: {
- orient: 'left',
- titlePadding: 5,
- layout: {
- anchor: 'middle',
- left: { anchor: 'middle' },
- right: { anchor: 'middle' }
- }
- }
- });
-});
-
-test('mergeConfig merges signal arrays', () => {
- expect(
- mergeConfig(
- {
- signals: [
- { name: 'foo', value: 1 },
- { name: 'bar', value: 2 }
- ]
- },
- {
- signals: [
- { name: 'foo', value: 3 },
- { name: 'baz', value: 4 }
- ]
- }
- )
- ).toEqual({
- signals: [
- { name: 'foo', value: 3 },
- { name: 'baz', value: 4 },
- { name: 'bar', value: 2 }
- ]
- });
-});
-
-test('mergeConfig handles empty arguments', () => {
- const c = { autosize: 'pad' };
- expect(mergeConfig()).toEqual({});
- expect(mergeConfig(null)).toEqual({});
- expect(mergeConfig(undefined)).toEqual({});
- expect(mergeConfig(c, null, undefined)).toEqual(c);
- expect(mergeConfig(null, c, undefined)).toEqual(c);
- expect(mergeConfig(null, undefined, c)).toEqual(c);
-});
diff --git a/packages/vgrammar-util/__tests__/regression-linear.test.ts b/packages/vgrammar-util/__tests__/regression-linear.test.ts
new file mode 100644
index 000000000..b481d17c3
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/regression-linear.test.ts
@@ -0,0 +1,17 @@
+import { regressionLinear } from '../src';
+
+test('regressionLinear()', function () {
+ const arr = [
+ {
+ x: 1,
+ y: 2
+ },
+ {
+ x: 2,
+ y: 4
+ }
+ ];
+ const res = regressionLinear(arr);
+ expect(res.coef).toEqual([0, 2]);
+ expect(res.predict(1)).toBeCloseTo(2);
+});
diff --git a/packages/vgrammar-util/__tests__/splitAccessPath.test.ts b/packages/vgrammar-util/__tests__/splitAccessPath.test.ts
new file mode 100644
index 000000000..5c874a3c2
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/splitAccessPath.test.ts
@@ -0,0 +1,13 @@
+import { splitAccessPath } from '../src';
+
+test('splitAccessPath()', function () {
+ expect(splitAccessPath('')).toEqual([]);
+ expect(splitAccessPath('a.b')).toEqual(['a', 'b']);
+ expect(splitAccessPath('a[b]')).toEqual(['a', 'b']);
+ expect(splitAccessPath('a."b"')).toEqual(['a', '"b"']);
+ expect(splitAccessPath("a['b']")).toEqual(['a', 'b']);
+ expect(splitAccessPath('a["b"]')).toEqual(['a', 'b']);
+ expect(splitAccessPath('a["b"].c')).toEqual(['a', 'b', 'c']);
+
+ expect(splitAccessPath('a.\\b')).toEqual(['a', 'b']);
+});
diff --git a/packages/vgrammar-util/__tests__/tsconfig.json b/packages/vgrammar-util/__tests__/tsconfig.json
new file mode 100644
index 000000000..1fdfda84f
--- /dev/null
+++ b/packages/vgrammar-util/__tests__/tsconfig.json
@@ -0,0 +1,6 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {},
+ "references": []
+}
diff --git a/packages/vgrammar-util/package.json b/packages/vgrammar-util/package.json
index 4adbdef9f..f65b9b579 100644
--- a/packages/vgrammar-util/package.json
+++ b/packages/vgrammar-util/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-util",
- "version": "0.3.0",
+ "version": "0.3.1",
"description": "The common utils functions of VGrammar",
"keywords": [
"utils",
diff --git a/packages/vgrammar-util/src/constants.ts b/packages/vgrammar-util/src/constants.ts
deleted file mode 100644
index 9b8ebf812..000000000
--- a/packages/vgrammar-util/src/constants.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const defaultFont = 'sans-serif';
-export const defaultFontSize = 11;
-export const defaultSymbolSize = 30;
-export const defaultStrokeWidth = 2;
-export const defaultColor = '#4c78a8';
-export const black = '#000';
-export const gray = '#888';
-export const lightGray = '#ddd';
diff --git a/packages/vgrammar-util/src/extent.ts b/packages/vgrammar-util/src/extent.ts
index 29b1aa27c..a60e2161c 100644
--- a/packages/vgrammar-util/src/extent.ts
+++ b/packages/vgrammar-util/src/extent.ts
@@ -7,14 +7,14 @@
* @license
*/
-import { isFunction, isNil } from '@visactor/vutils';
+import { isFunction, isNumber, isNil } from '@visactor/vutils';
import type { ReturnNumberFunction } from './types';
/**
* Return an array with minimum and maximum values, in the
* form [min, max]. Ignores null, undefined, and NaN values.
*/
-export const extent = (array: number[], func?: ReturnNumberFunction) => {
+export const extent = (array: any[], func?: ReturnNumberFunction) => {
const valueGetter = isFunction(func) ? func : (val: any) => val;
let min: number;
let max: number;
@@ -25,7 +25,7 @@ export const extent = (array: number[], func?: ReturnNumberFunction) => {
// find first valid value
for (let i = 0; i < n; i += 1) {
const value = valueGetter(array[i]);
- if (!isNil(value) && !Number.isNaN(value)) {
+ if (isNumber(value) && !Number.isNaN(value)) {
if (isNil(min)) {
min = value;
max = value;
diff --git a/packages/vgrammar-util/src/index.ts b/packages/vgrammar-util/src/index.ts
index 686f367bb..a779169a0 100644
--- a/packages/vgrammar-util/src/index.ts
+++ b/packages/vgrammar-util/src/index.ts
@@ -14,8 +14,6 @@ export { id, identity, zero, one, truthy, falsy, emptyObject } from './accessors
export { Logger, setLogLevel, setLogger, getLogger, clearLogger } from './logger';
-export { mergeConfig, writeConfig } from './mergeConfig';
-
export { compare, ascending } from './compare';
export { error } from './error';
export { extent } from './extent';
@@ -26,7 +24,6 @@ export { splitAccessPath } from './splitAccessPath';
export { toPercent } from './toPercent';
-export * as vGrammarConstants from './constants';
export * from './types';
export { regressionLinear } from './regression-linear';
diff --git a/packages/vgrammar-util/src/logger.ts b/packages/vgrammar-util/src/logger.ts
index 4fabc8218..026ead731 100644
--- a/packages/vgrammar-util/src/logger.ts
+++ b/packages/vgrammar-util/src/logger.ts
@@ -48,7 +48,7 @@ export class Logger implements ILogger {
}
canLogWarn() {
- return this._level >= LoggerLevel.Error;
+ return this._level >= LoggerLevel.Warn;
}
level(): number;
@@ -91,9 +91,9 @@ export class Logger implements ILogger {
}
}
-let defaultLogger: Logger = null;
+let defaultLogger: ILogger = null;
-export const setLogger = (logger: Logger) => {
+export const setLogger = (logger: ILogger) => {
defaultLogger = logger;
};
diff --git a/packages/vgrammar-util/src/mergeConfig.ts b/packages/vgrammar-util/src/mergeConfig.ts
deleted file mode 100644
index 2499a84a9..000000000
--- a/packages/vgrammar-util/src/mergeConfig.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Adapted from vega by University of Washington Interactive Data Lab
- * https://vega.github.io/vega/
- * Licensed under the BSD-3-Clause
-
- * url: https://github.com/vega/vega/blob/main/packages/vega-util/src/mergeConfig.js
- * License: https://github.com/vega/vega/blob/main/LICENSE
- * @license
- */
-
-import { isArray, isFunction, isNil, isObject } from '@visactor/vutils';
-
-const isLegalKey = (key: string) => key !== '__proto__';
-
-export const writeConfig = (output: any, key: string, value: any, recurse?: boolean | Record
) => {
- if (!isLegalKey(key)) {
- return;
- }
-
- if (isObject(value) && !isArray(value) && !isFunction(value)) {
- if (!isObject(output[key])) {
- output[key] = {};
- }
-
- const outputValue = output[key];
-
- Object.keys(value).forEach((subKey: string) => {
- if (recurse && (recurse === true || recurse[subKey])) {
- writeConfig(outputValue, subKey, value[subKey]);
- } else if (isLegalKey(subKey)) {
- outputValue[subKey] = value[subKey];
- }
- });
- } else {
- output[key] = value;
- }
-};
-
-function mergeNamed(a: any[], b: any[]) {
- if (isNil(a)) {
- return b;
- }
-
- const map = {};
- const out: any[] = [];
-
- const add = (_: any) => {
- if (!map[_.name]) {
- map[_.name] = 1;
- out.push(_);
- }
- };
-
- b.forEach(add);
- a.forEach(add);
- return out;
-}
-
-export const mergeConfig = (...configs: any[]) => {
- return configs.reduce((out, source) => {
- if (!source) {
- return out;
- }
- Object.keys(source).forEach(key => {
- if (key === 'signals') {
- // for signals, we merge the signals arrays
- // source signals take precedence over
- // existing signals with the same name
- out.signals = mergeNamed(out.signals, source.signals);
- } else {
- // otherwise, merge objects subject to recursion constraints
- // for legend block, recurse for the layout entry only
- // for style block, recurse for all properties
- // otherwise, no recursion: objects overwrite, no merging
- const r = key === 'legend' ? { layout: 1 } : key === 'style' ? true : null;
- writeConfig(out, key, source[key], r);
- }
- });
-
- return out;
- }, {});
-};
diff --git a/packages/vgrammar-util/src/regression-linear.ts b/packages/vgrammar-util/src/regression-linear.ts
index 109f7c812..d12f79525 100644
--- a/packages/vgrammar-util/src/regression-linear.ts
+++ b/packages/vgrammar-util/src/regression-linear.ts
@@ -15,52 +15,7 @@ export function ordinaryLeastSquares(uX: number, uY: number, uXY: number, uX2: n
return [intercept, slope];
}
-/* Adapted from vega by University of Washington Interactive Data Lab
- * https://vega.github.io/vega/
- * Licensed under the BSD-3-Clause
-
- * url: https://github.com/vega/vega/blob/main/packages/vega-statistics/src/regression/points.js
- * License: https://github.com/vega/vega/blob/main/LICENSE
- * @license
- */
-export function points(data: any[], x: (datum: any) => number, y: (datum: any) => number, sort?: boolean) {
- data = data.filter(d => {
- let u = x(d);
- let v = y(d);
- return !isNil(u) && (u = +u) >= u && !isNil(v) && (v = +v) >= v;
- });
-
- if (sort) {
- data.sort((a, b) => x(a) - x(b));
- }
- const n = data.length;
- const X = new Float64Array(n);
- const Y = new Float64Array(n);
-
- // extract values, calculate means
- let i = 0;
- let ux: number = 0;
- let uy: number = 0;
- let xv;
- let yv;
-
- data.forEach(d => {
- X[i] = xv = +x(d);
- Y[i] = yv = +y(d);
- ++i;
- ux += (xv - ux) / i;
- uy += (yv - uy) / i;
- });
-
- // mean center the data
- for (i = 0; i < n; ++i) {
- X[i] -= ux;
- Y[i] -= uy;
- }
-
- return [X, Y, ux, uy];
-}
// Adapted from d3-regression by Harry Stevens
// License: https://github.com/HarryStevens/d3-regression/blob/master/LICENSE
export function visitPoints(
@@ -107,7 +62,11 @@ export function rSquared(
// Adapted from d3-regression by Harry Stevens
// License: https://github.com/HarryStevens/d3-regression/blob/master/LICENSE
-export function regressionLinear(data: any[], x: (datum: any) => number, y: (datum: any) => number) {
+export function regressionLinear(
+ data: any[],
+ x: (datum: any) => number = datum => datum.x,
+ y: (datum: any) => number = datum => datum.y
+) {
let X = 0;
let Y = 0;
let XY = 0;
diff --git a/packages/vgrammar-util/tsconfig.test.json b/packages/vgrammar-util/tsconfig.test.json
deleted file mode 100644
index 5f8554df5..000000000
--- a/packages/vgrammar-util/tsconfig.test.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {},
- "references": []
-}
diff --git a/packages/vgrammar-wordcloud-shape/CHANGELOG.json b/packages/vgrammar-wordcloud-shape/CHANGELOG.json
index 031a87332..5f5f8a81d 100644
--- a/packages/vgrammar-wordcloud-shape/CHANGELOG.json
+++ b/packages/vgrammar-wordcloud-shape/CHANGELOG.json
@@ -1,6 +1,21 @@
{
"name": "@visactor/vgrammar-wordcloud-shape",
"entries": [
+ {
+ "version": "0.3.2",
+ "tag": "@visactor/vgrammar-wordcloud-shape_v0.3.2",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar\" from `0.3.1` to `0.3.2`"
+ },
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.1",
"tag": "@visactor/vgrammar-wordcloud-shape_v0.3.1",
diff --git a/packages/vgrammar-wordcloud-shape/CHANGELOG.md b/packages/vgrammar-wordcloud-shape/CHANGELOG.md
index 09b859c5a..5e4ec77f8 100644
--- a/packages/vgrammar-wordcloud-shape/CHANGELOG.md
+++ b/packages/vgrammar-wordcloud-shape/CHANGELOG.md
@@ -1,6 +1,11 @@
# Change Log - @visactor/vgrammar-wordcloud-shape
-This log was last generated on Fri, 30 Jun 2023 09:22:01 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.2
+Fri, 07 Jul 2023 04:16:33 GMT
+
+_Version update only_
## 0.3.1
Fri, 30 Jun 2023 09:22:01 GMT
diff --git a/packages/vgrammar-wordcloud-shape/__tests__/tsconfig.json b/packages/vgrammar-wordcloud-shape/__tests__/tsconfig.json
new file mode 100644
index 000000000..52f7bc419
--- /dev/null
+++ b/packages/vgrammar-wordcloud-shape/__tests__/tsconfig.json
@@ -0,0 +1,12 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"],
+ "@visactor/vgrammar-coordinate": ["../../vgrammar-coordinate/src"],
+ "@visactor/vgrammar": ["../../vgrammar/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar-wordcloud-shape/package.json b/packages/vgrammar-wordcloud-shape/package.json
index 4bd7973b5..cd3566b11 100644
--- a/packages/vgrammar-wordcloud-shape/package.json
+++ b/packages/vgrammar-wordcloud-shape/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-wordcloud-shape",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "Layout WordCloud in specified shape, this is a transform for VGrammar.",
"keywords": [
"wordcloud",
@@ -34,10 +34,10 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
- "@visactor/vrender": "~0.11.1",
- "@visactor/vgrammar": "workspace:0.3.1",
+ "@visactor/vrender": "~0.12.0",
+ "@visactor/vgrammar": "workspace:0.3.2",
"@visactor/vscale": "~0.11.1",
- "@visactor/vgrammar-util": "workspace:0.3.0",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
"@visactor/vutils": "~0.11.1"
},
"devDependencies": {
diff --git a/packages/vgrammar-wordcloud-shape/tsconfig.test.json b/packages/vgrammar-wordcloud-shape/tsconfig.test.json
deleted file mode 100644
index 8ce25293f..000000000
--- a/packages/vgrammar-wordcloud-shape/tsconfig.test.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"],
- "@visactor/vgrammar-coordinate": ["../vgrammar-coordinate/src"],
- "@visactor/vgrammar": ["../vgrammar/src"]
- }
- },
- "references": []
-}
diff --git a/packages/vgrammar-wordcloud/CHANGELOG.json b/packages/vgrammar-wordcloud/CHANGELOG.json
index b89422b3c..f5a96595b 100644
--- a/packages/vgrammar-wordcloud/CHANGELOG.json
+++ b/packages/vgrammar-wordcloud/CHANGELOG.json
@@ -1,6 +1,21 @@
{
"name": "@visactor/vgrammar-wordcloud",
"entries": [
+ {
+ "version": "0.3.2",
+ "tag": "@visactor/vgrammar-wordcloud_v0.3.2",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar\" from `0.3.1` to `0.3.2`"
+ },
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.1",
"tag": "@visactor/vgrammar-wordcloud_v0.3.1",
diff --git a/packages/vgrammar-wordcloud/CHANGELOG.md b/packages/vgrammar-wordcloud/CHANGELOG.md
index 90cb6dc1f..87e7f263a 100644
--- a/packages/vgrammar-wordcloud/CHANGELOG.md
+++ b/packages/vgrammar-wordcloud/CHANGELOG.md
@@ -1,6 +1,11 @@
# Change Log - @visactor/vgrammar-wordcloud
-This log was last generated on Fri, 30 Jun 2023 09:22:01 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.2
+Fri, 07 Jul 2023 04:16:33 GMT
+
+_Version update only_
## 0.3.1
Fri, 30 Jun 2023 09:22:01 GMT
diff --git a/packages/vgrammar-wordcloud/__tests__/tsconfig.json b/packages/vgrammar-wordcloud/__tests__/tsconfig.json
new file mode 100644
index 000000000..52f7bc419
--- /dev/null
+++ b/packages/vgrammar-wordcloud/__tests__/tsconfig.json
@@ -0,0 +1,12 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"],
+ "@visactor/vgrammar-coordinate": ["../../vgrammar-coordinate/src"],
+ "@visactor/vgrammar": ["../../vgrammar/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar-wordcloud/package.json b/packages/vgrammar-wordcloud/package.json
index 83aaba0d4..ce0dfaf6d 100644
--- a/packages/vgrammar-wordcloud/package.json
+++ b/packages/vgrammar-wordcloud/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-wordcloud",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "WordCloud layout transform for VGrammar",
"keywords": [
"wordcloud",
@@ -34,9 +34,9 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
- "@visactor/vrender": "~0.11.1",
- "@visactor/vgrammar": "workspace:0.3.1",
- "@visactor/vgrammar-util": "workspace:0.3.0",
+ "@visactor/vrender": "~0.12.0",
+ "@visactor/vgrammar": "workspace:0.3.2",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
"@visactor/vutils": "~0.11.1"
},
"devDependencies": {
diff --git a/packages/vgrammar-wordcloud/tsconfig.test.json b/packages/vgrammar-wordcloud/tsconfig.test.json
deleted file mode 100644
index 8ce25293f..000000000
--- a/packages/vgrammar-wordcloud/tsconfig.test.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"],
- "@visactor/vgrammar-coordinate": ["../vgrammar-coordinate/src"],
- "@visactor/vgrammar": ["../vgrammar/src"]
- }
- },
- "references": []
-}
diff --git a/packages/vgrammar/CHANGELOG.json b/packages/vgrammar/CHANGELOG.json
index 29ae18d87..f35c4eca1 100644
--- a/packages/vgrammar/CHANGELOG.json
+++ b/packages/vgrammar/CHANGELOG.json
@@ -1,6 +1,35 @@
{
"name": "@visactor/vgrammar",
"entries": [
+ {
+ "version": "0.3.2",
+ "tag": "@visactor/vgrammar_v0.3.2",
+ "date": "Fri, 07 Jul 2023 04:16:33 GMT",
+ "comments": {
+ "patch": [
+ {
+ "comment": "fix: remove useless api of View: `ignoreRender()`, fix the definition of `IViewConstructor`"
+ },
+ {
+ "comment": "feat: add a new api `getImageBuffer` to View\n\n"
+ },
+ {
+ "comment": "fix: crosshair can read `radius` and `center` from encode result, fix #42\n\n"
+ },
+ {
+ "comment": "feat: add config `align` to layout config, fix #43\n\n"
+ }
+ ],
+ "dependency": [
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-coordinate\" from `0.3.0` to `0.3.1`"
+ },
+ {
+ "comment": "Updating dependency \"@visactor/vgrammar-util\" from `0.3.0` to `0.3.1`"
+ }
+ ]
+ }
+ },
{
"version": "0.3.1",
"tag": "@visactor/vgrammar_v0.3.1",
diff --git a/packages/vgrammar/CHANGELOG.md b/packages/vgrammar/CHANGELOG.md
index 4e1143d6b..352f0c037 100644
--- a/packages/vgrammar/CHANGELOG.md
+++ b/packages/vgrammar/CHANGELOG.md
@@ -1,6 +1,22 @@
# Change Log - @visactor/vgrammar
-This log was last generated on Fri, 30 Jun 2023 09:22:01 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jul 2023 04:16:33 GMT and should not be manually modified.
+
+## 0.3.2
+Fri, 07 Jul 2023 04:16:33 GMT
+
+### Patches
+
+- fix: remove useless api of View: `ignoreRender()`, fix the definition of `IViewConstructor`
+- feat: add a new api `getImageBuffer` to View
+
+
+- fix: crosshair can read `radius` and `center` from encode result, fix #42
+
+
+- feat: add config `align` to layout config, fix #43
+
+
## 0.3.1
Fri, 30 Jun 2023 09:22:01 GMT
diff --git a/packages/vgrammar/__tests__/tsconfig.json b/packages/vgrammar/__tests__/tsconfig.json
new file mode 100644
index 000000000..ff168de88
--- /dev/null
+++ b/packages/vgrammar/__tests__/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../tsconfig.json",
+ "include": ["./", "../src"],
+ "compilerOptions": {
+ "paths": {
+ "@visactor/vgrammar-util": ["../../vgrammar-util/src"],
+ "@visactor/vgrammar-coordinate": ["../../vgrammar-coordinate/src"]
+ }
+ },
+ "references": []
+}
diff --git a/packages/vgrammar/package.json b/packages/vgrammar/package.json
index 4a14490cc..b3d9db04d 100644
--- a/packages/vgrammar/package.json
+++ b/packages/vgrammar/package.json
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "VGrammar is a visual grammar library",
"keywords": [
"grammar",
@@ -36,11 +36,11 @@
"ci": "node github-ci.js"
},
"dependencies": {
- "@visactor/vgrammar-coordinate": "workspace:0.3.0",
- "@visactor/vrender": "~0.11.1",
- "@visactor/vgrammar-util": "workspace:0.3.0",
+ "@visactor/vgrammar-coordinate": "workspace:0.3.1",
+ "@visactor/vrender": "~0.12.0",
+ "@visactor/vgrammar-util": "workspace:0.3.1",
"@visactor/vscale": "~0.11.1",
- "@visactor/vrender-components": "~0.11.1",
+ "@visactor/vrender-components": "~0.12.0",
"@visactor/vutils": "~0.11.1"
},
"devDependencies": {
diff --git a/packages/vgrammar/src/component/crosshair.ts b/packages/vgrammar/src/component/crosshair.ts
index 571272a95..e7b0067f7 100644
--- a/packages/vgrammar/src/component/crosshair.ts
+++ b/packages/vgrammar/src/component/crosshair.ts
@@ -54,13 +54,13 @@ const computeCrosshairStartEnd = (
scale: IBaseScale,
type: CrosshairType,
groupSize: { width: number; height: number },
- config: { radius: number; center: IPointLike },
+ config: CrosshairSpec['componentConfig'],
offset: number = 0
) => {
const start = { x: 0, y: 0 };
const end = { x: 0, y: 0 };
- const radius = config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2;
- const center = config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 };
+ const radius = type === 'angle' ? config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2 : null;
+ const center = type === 'angle' ? config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 } : null;
let current = 0;
if (isDiscrete(scale.type)) {
@@ -110,12 +110,22 @@ export const generateLineCrosshairAttributes = (
scale: IBaseScale,
type: CrosshairType,
groupSize: { width: number; height: number },
- config: { radius: number; center: IPointLike },
- addition?: RecursivePartial
+ config: CrosshairSpec['componentConfig'],
+ addition?: RecursivePartial & CrosshairSpec['componentConfig']
): LineCrosshairAttrs => {
const crosshairTheme = defaultTheme.lineCrosshair;
const offset = scale.type === 'band' ? (scale as IBandLikeScale).bandwidth() / 2 : 0;
- const points = computeCrosshairStartEnd(point, scale, type, groupSize, config, offset);
+ const points = computeCrosshairStartEnd(
+ point,
+ scale,
+ type,
+ groupSize,
+ {
+ radius: addition?.radius ?? config?.radius,
+ center: addition?.center ?? config?.center
+ },
+ offset
+ );
return merge({}, crosshairTheme, points, addition ?? {});
};
@@ -124,7 +134,7 @@ export const generateRectCrosshairAttributes = (
scale: IBaseScale,
type: CrosshairType,
groupSize: { width: number; height: number },
- config: { radius: number; center: IPointLike },
+ config: CrosshairSpec['componentConfig'],
addition?: RecursivePartial
): RectCrosshairAttrs => {
const crosshairTheme = defaultTheme.rectCrosshair;
@@ -165,12 +175,13 @@ export const generateSectorCrosshairAttributes = (
scale: IBaseScale,
type: CrosshairType,
groupSize: { width: number; height: number },
- config: { radius: number; center: IPointLike },
+ config: CrosshairSpec['componentConfig'],
addition?: RecursivePartial
): SectorCrosshairAttrs => {
const crosshairTheme = defaultTheme.sectorCrosshair;
- const radius = config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2;
- const center = config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 };
+ const radius = addition?.radius ?? config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2;
+ const center = (addition?.center ??
+ config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 }) as IPointLike;
const defaultAngle = crosshairTheme.endAngle - crosshairTheme.startAngle;
const angle = scale.type === 'band' || scale.type === 'point' ? (scale as IBandLikeScale).step() : defaultAngle;
let currentAngle = 0;
@@ -190,12 +201,12 @@ export const generateCircleCrosshairAttributes = (
scale: IBaseScale,
type: CrosshairType,
groupSize: { width: number; height: number },
- config: { radius: number; center: IPointLike },
+ config: CrosshairSpec['componentConfig'],
addition?: RecursivePartial
): CircleCrosshairAttrs => {
const crosshairTheme = defaultTheme.circleCrosshair;
const radius = config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2;
- const center = config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 };
+ const center = addition?.center ?? config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 };
let currentRadius = 0;
if (isDiscrete(scale.type)) {
const radius = Math.sqrt((point.x - center.x) ** 2 + (point.y - center.y) ** 2);
@@ -203,8 +214,10 @@ export const generateCircleCrosshairAttributes = (
} else if (isContinuous(scale.type)) {
currentRadius = Math.min(radius, Math.sqrt((point.x - center.x) ** 2 + (point.y - center.y) ** 2));
}
+
const startAngle = crosshairTheme.startAngle;
const endAngle = crosshairTheme.endAngle;
+
return merge({}, crosshairTheme, { center, radius: currentRadius, startAngle, endAngle }, addition ?? {});
};
@@ -213,12 +226,12 @@ export const generatePolygonCrosshairAttributes = (
scale: IBaseScale,
type: CrosshairType,
groupSize: { width: number; height: number },
- config: { radius: number; center: IPointLike },
+ config: CrosshairSpec['componentConfig'],
addition?: RecursivePartial
): PolygonCrosshairAttrs => {
const crosshairTheme = defaultTheme.circleCrosshair;
- const radius = config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2;
- const center = config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 };
+ const radius = addition?.radius ?? config?.radius ?? Math.min(groupSize.width, groupSize.height) / 2;
+ const center = addition?.center ?? config?.center ?? { x: groupSize.width / 2, y: groupSize.height / 2 };
let currentRadius = 0;
if (isDiscrete(scale.type)) {
const radius = Math.sqrt((point.x - center.x) ** 2 + (point.y - center.y) ** 2);
diff --git a/packages/vgrammar/src/graph/animation/config.ts b/packages/vgrammar/src/graph/animation/config.ts
index 363b65796..c22a393d8 100644
--- a/packages/vgrammar/src/graph/animation/config.ts
+++ b/packages/vgrammar/src/graph/animation/config.ts
@@ -1,5 +1,4 @@
-import { array, isFunction, isNil } from '@visactor/vutils';
-import { mergeConfig } from '@visactor/vgrammar-util';
+import { array, isFunction, isNil, merge } from '@visactor/vutils';
import type { IElement } from '../../types';
import type {
IAnimationConfig,
@@ -27,7 +26,7 @@ function transformToTimelineConfig(animationConfig: IAnimationConfig): IAnimatio
totalTime: typeConfig.totalTime,
oneByOne: typeConfig.oneByOne ?? DefaultAnimationOneByOne,
loop: typeConfig.loop ?? DefaultAnimationLoop,
- controlOptions: mergeConfig(DefaultAnimationControlOptions, typeConfig.controlOptions ?? {}),
+ controlOptions: merge({}, DefaultAnimationControlOptions, typeConfig.controlOptions ?? {}),
timeSlices: [
{
duration: typeConfig.duration ?? DefaultAnimationDuration,
@@ -59,7 +58,7 @@ function transformToTimelineConfig(animationConfig: IAnimationConfig): IAnimatio
totalTime: (animationConfig as IAnimationTimeline).totalTime,
oneByOne: (animationConfig as IAnimationTimeline).oneByOne ?? DefaultAnimationOneByOne,
loop: (animationConfig as IAnimationTimeline).loop ?? DefaultAnimationLoop,
- controlOptions: mergeConfig(DefaultAnimationControlOptions, animationConfig.controlOptions ?? {}),
+ controlOptions: merge({}, DefaultAnimationControlOptions, animationConfig.controlOptions ?? {}),
timeSlices: formattedTimeSlices.map(timeSlice => {
return {
duration: timeSlice.duration,
diff --git a/packages/vgrammar/src/graph/layout/layout.ts b/packages/vgrammar/src/graph/layout/layout.ts
index b038a5cfd..0e7724073 100644
--- a/packages/vgrammar/src/graph/layout/layout.ts
+++ b/packages/vgrammar/src/graph/layout/layout.ts
@@ -28,8 +28,14 @@ export const defaultDoLayout = (layoutMarks: IMark[], options: ILayoutOptions, v
} else if (isFunction(layoutSpec.callback)) {
layoutSpec.callback.call(null, mark as IGroupMark, layoutChildren, bounds, options);
} else if ((layoutSpec as MarkRelativeContainerSpec).display === 'relative') {
- const viewBounds = doRelativeLayout(mark as IGroupMark, layoutChildren, bounds, options);
if (layoutSpec.updateViewSignals) {
+ const oldViewBox = view.getViewBox();
+
+ if (oldViewBox) {
+ bounds.intersect(oldViewBox);
+ }
+
+ const viewBounds = doRelativeLayout(mark as IGroupMark, layoutChildren, bounds, options);
const viewWidth = viewBounds.width();
const viewHeight = viewBounds.height();
const padding = {
@@ -42,6 +48,8 @@ export const defaultDoLayout = (layoutMarks: IMark[], options: ILayoutOptions, v
(view as any).updateSignal(SIGNAL_VIEW_WIDTH, viewWidth);
(view as any).updateSignal(SIGNAL_VIEW_HEIGHT, viewHeight);
(view as any).updateSignal(SIGNAL_PADDING, padding);
+ } else {
+ doRelativeLayout(mark as IGroupMark, layoutChildren, bounds, options);
}
} else if ((layoutSpec as MarkGridContainerSpec).display === 'grid') {
doGridLayout(mark as IGroupMark, layoutChildren, bounds, options);
diff --git a/packages/vgrammar/src/graph/layout/relative.ts b/packages/vgrammar/src/graph/layout/relative.ts
index 6d33387b5..b2c61c3f6 100644
--- a/packages/vgrammar/src/graph/layout/relative.ts
+++ b/packages/vgrammar/src/graph/layout/relative.ts
@@ -78,9 +78,13 @@ export const doRelativeLayout = (
viewBounds.y2 = parentLayoutBounds.y2 - minDeltaY2;
}
- const currentBounds = viewBounds.clone();
+ let curTopY = parentLayoutBounds.y1;
+ let curBottomY = viewBounds.y2;
+ let curLeftX = parentLayoutBounds.x1;
+ let curRightX = viewBounds.x2;
- for (let i = children.length - 1; i >= 0; i--) {
+ for (let i = 0, len = children.length; i < len; i++) {
+ // from inner to outer
const child = children[i];
const layoutSpec = child.getSpec().layout as MarkRelativeItemSpec;
const padding = normalizePadding(layoutSpec.padding);
@@ -90,41 +94,55 @@ export const doRelativeLayout = (
const childHeight = Math.min(bounds.height() + padding.top + padding.bottom, maxChildHeight);
if (layoutSpec.position === 'top') {
- child.layoutBounds = new Bounds().set(
- viewBounds.x1,
- currentBounds.y1 - childHeight,
- viewBounds.x2,
- currentBounds.y1
- );
- currentBounds.y1 = currentBounds.y1 - childHeight;
+ child.layoutBounds = new Bounds().set(viewBounds.x1, curTopY, viewBounds.x2, curTopY + childHeight);
+ curTopY += childHeight;
} else {
- child.layoutBounds = new Bounds().set(
- viewBounds.x1,
- currentBounds.y2,
- viewBounds.x2,
- currentBounds.y2 + childHeight
- );
- currentBounds.y2 = currentBounds.y2 + childHeight;
+ child.layoutBounds = new Bounds().set(viewBounds.x1, curBottomY, viewBounds.x2, curBottomY + childHeight);
+ curBottomY += childHeight;
+ }
+
+ if (layoutSpec.align) {
+ const childWidth = bounds.width() + padding.left + padding.right;
+
+ if (childWidth < viewBounds.width()) {
+ if (layoutSpec.align === 'center') {
+ child.layoutBounds.x1 = (viewBounds.x1 + viewBounds.x2) / 2 - childWidth / 2;
+ child.layoutBounds.x2 = child.layoutBounds.x1 + childWidth;
+ } else if (layoutSpec.align === 'right') {
+ child.layoutBounds.x1 = viewBounds.x2 - childWidth;
+ child.layoutBounds.x2 = viewBounds.x2;
+ } else if (layoutSpec.align === 'left') {
+ child.layoutBounds.x1 = viewBounds.x1;
+ child.layoutBounds.x2 = viewBounds.x1 + childWidth;
+ }
+ }
}
} else if (layoutSpec.position === 'left' || layoutSpec.position === 'right') {
const childWidth = Math.min(bounds.width() + padding.left + padding.right, maxChildWidth);
if (layoutSpec.position === 'left') {
- child.layoutBounds = new Bounds().set(
- currentBounds.x1 - childWidth,
- viewBounds.y1,
- currentBounds.x1,
- viewBounds.y2
- );
- currentBounds.x1 = currentBounds.x1 - childWidth;
+ child.layoutBounds = new Bounds().set(curLeftX, viewBounds.y1, curLeftX + childWidth, viewBounds.y2);
+ curLeftX += childWidth;
} else {
- child.layoutBounds = new Bounds().set(
- currentBounds.x2,
- viewBounds.y1,
- currentBounds.x2 + childWidth,
- viewBounds.y2
- );
- currentBounds.x2 = currentBounds.x2 + childWidth;
+ child.layoutBounds = new Bounds().set(curRightX, viewBounds.y1, curRightX + childWidth, viewBounds.y2);
+ curRightX += childWidth;
+ }
+
+ if (layoutSpec.align) {
+ const childHeight = bounds.height() + padding.top + padding.bottom;
+
+ if (childWidth < viewBounds.width()) {
+ if (layoutSpec.align === 'middle') {
+ child.layoutBounds.y1 = (viewBounds.y1 + viewBounds.y2) / 2 - childHeight / 2;
+ child.layoutBounds.y2 = child.layoutBounds.y1 + childHeight;
+ } else if (layoutSpec.align === 'bottom') {
+ child.layoutBounds.y1 = viewBounds.y2 - childHeight;
+ child.layoutBounds.y2 = viewBounds.y2;
+ } else if (layoutSpec.align === 'top') {
+ child.layoutBounds.y1 = viewBounds.y1;
+ child.layoutBounds.y2 = viewBounds.y1 + childHeight;
+ }
+ }
}
} else {
child.layoutBounds = viewBounds;
diff --git a/packages/vgrammar/src/types/component.ts b/packages/vgrammar/src/types/component.ts
index 3ee075610..2951c493b 100644
--- a/packages/vgrammar/src/types/component.ts
+++ b/packages/vgrammar/src/types/component.ts
@@ -4,6 +4,7 @@ import type { ComponentEnum } from '../graph';
import type { Nil, RecursivePartial } from './base';
import type { IComponent, IData, IMark, IScale } from './grammar';
import type { ChannelEncodeType, ComponentSpec, FieldEncodeType, MarkFunctionType, ScaleEncodeType } from './mark';
+import type { IPointLike } from '@visactor/vutils';
// scale component
@@ -68,6 +69,7 @@ export interface CrosshairSpec extends ScaleComponentSpec {
componentType: ComponentEnum.crosshair;
crosshairType?: CrosshairType;
crosshairShape?: CrosshairShape;
+ componentConfig?: { radius?: number; center?: IPointLike };
}
// slider component
diff --git a/packages/vgrammar/src/types/mark.ts b/packages/vgrammar/src/types/mark.ts
index 52e8049f0..2b4138d8f 100644
--- a/packages/vgrammar/src/types/mark.ts
+++ b/packages/vgrammar/src/types/mark.ts
@@ -134,6 +134,7 @@ export interface MarkBaseLayoutSpec {
export interface MarkRelativeItemSpec extends MarkBaseLayoutSpec {
position?: 'top' | 'bottom' | 'left' | 'right' | 'content' | 'auto' | string;
padding?: CommonPaddingSpec;
+ align?: 'left' | 'right' | 'center' | 'top' | 'bottom' | 'middle';
}
export interface MarkRelativeContainerSpec extends MarkBaseLayoutSpec {
diff --git a/packages/vgrammar/src/types/view.ts b/packages/vgrammar/src/types/view.ts
index b00fb7c52..f66e79a6e 100644
--- a/packages/vgrammar/src/types/view.ts
+++ b/packages/vgrammar/src/types/view.ts
@@ -1,6 +1,6 @@
import type { EventEmitter, IBounds, IBoundsLike } from '@visactor/vutils';
import type { EnvType, IStage, IColor, IOption3D, ILayer } from '@visactor/vrender';
-import type { Logger } from '@visactor/vgrammar-util';
+import type { ILogger, Logger } from '@visactor/vgrammar-util';
import type { CoordinateType } from '@visactor/vgrammar-coordinate';
import type { DataSpec } from './data';
import type { SignalFunctionType, SignalSpec } from './signal';
@@ -148,7 +148,7 @@ export interface IView {
readonly rootMark: IGroupMark;
readonly animate: IBaseAnimate;
readonly grammars: IRecordedGrammars;
- readonly logger: Logger;
+ readonly logger: ILogger;
// --- Grammar API ---
signal: (value?: T, update?: SignalFunctionType) => ISignal;
@@ -200,7 +200,6 @@ export interface IView {
runSync: (morphConfig?: IMorphConfig) => this;
runBefore: (callback: (view: IView) => void) => this;
runAfter: (callback: (view: IView) => void) => this;
- ignoreRender: (ignore: boolean) => this;
// --- Global Config API ---
background: (value?: IColor) => IColor;
@@ -214,6 +213,7 @@ export interface IView {
top: number;
bottom: number;
};
+ getViewBox: () => IBounds;
// --- Event API ---
addEventListener: (type: string, handler: BaseEventHandler, options?: any) => this;
@@ -236,10 +236,11 @@ export interface IView {
restartProgressive: () => boolean;
release: () => void;
+ getImageBuffer: () => Buffer;
}
export interface IViewConstructor {
- new (spec: ViewSpec, options?: IViewOptions, config?: IViewThemeConfig): IView;
+ new (options?: IViewOptions, config?: IViewThemeConfig): IView;
}
export interface ViewSpec {
diff --git a/packages/vgrammar/src/view/View.ts b/packages/vgrammar/src/view/View.ts
index 2285ee9a6..29ba0a911 100644
--- a/packages/vgrammar/src/view/View.ts
+++ b/packages/vgrammar/src/view/View.ts
@@ -1,3 +1,4 @@
+import type { IBounds } from '@visactor/vutils';
import { EventEmitter, debounce, isNil, isObject, isString, getContainerSize } from '@visactor/vutils';
import type { IColor } from '@visactor/vrender';
// eslint-disable-next-line no-duplicate-imports
@@ -33,7 +34,7 @@ import type {
IComponent,
ComponentSpec
} from '../types/';
-import type { Logger } from '@visactor/vgrammar-util';
+import type { ILogger } from '@visactor/vgrammar-util';
// eslint-disable-next-line no-duplicate-imports
import { setLogger, getLogger } from '@visactor/vgrammar-util';
import { unregisterRuntimeTransforms } from '../transforms/register';
@@ -57,7 +58,8 @@ import {
SIGNAL_VIEW_HEIGHT,
DEFAULT_PADDING,
EVENT_SOURCE_VIEW,
- EVENT_SOURCE_WINDOW
+ EVENT_SOURCE_WINDOW,
+ SIGNAL_VIEW_BOX
} from './constants';
import { Signal } from './signal';
import { Scale } from './scale';
@@ -105,14 +107,12 @@ export default class View extends EventEmitter implements IView {
/** renderer */
renderer: IRenderer;
animate: IBaseAnimate;
- /** 增加参数 指定当前的 evaluate 是否是不进行绘制的 */
- private _runIgnoreRender: boolean;
rootMark: IGroupMark;
/** 生命周期相关的钩子 */
hooks: Hooks;
- logger: Logger;
+ logger: ILogger;
grammars: IRecordedGrammars;
@@ -586,6 +586,12 @@ export default class View extends EventEmitter implements IView {
return signal.output() as boolean;
}
+ getViewBox() {
+ const signal = this.getSignalById(SIGNAL_VIEW_BOX);
+
+ return signal?.output() as IBounds;
+ }
+
// --- Layout ---
updateLayoutTag() {
@@ -714,15 +720,10 @@ export default class View extends EventEmitter implements IView {
return this;
}
- ignoreRender(ignore: boolean) {
- this._runIgnoreRender = ignore;
- return this;
- }
-
private doRender(immediately: boolean) {
this.emit(HOOK_EVENT.BEFORE_DO_RENDER);
// render as needed
- if (!this._runIgnoreRender && this.renderer) {
+ if (this.renderer) {
if (!this._progressiveMarks) {
this.animate.animate();
}
@@ -947,6 +948,26 @@ export default class View extends EventEmitter implements IView {
return this;
}
+ /**
+ * 目前仅支持 node 环境，用于 node 端的图片导出
+ * @returns
+ */
+ getImageBuffer() {
+ if (this._options.mode !== 'node') {
+ this.logger.error(new TypeError('getImageBuffer() now only support node environment.'));
+ return;
+ }
+ const stage = this.renderer?.stage?.();
+ if (stage) {
+ stage.render();
+ const buffer = stage.window.getImageBuffer();
+ return buffer;
+ }
+ this.logger.error(new ReferenceError(`render is not defined`));
+
+ return null;
+ }
+
// --- Mark Tree ---
traverseMarkTree(apply: (mark: IMark) => any, filter?: (mark: IMark) => boolean, leafFirst?: boolean) {
@@ -1367,8 +1388,6 @@ export default class View extends EventEmitter implements IView {
// 生命周期事件（包含原性能测试钩子）
this.hooks = this._options.hooks;
}
-
- this._runIgnoreRender = false;
this.container = null;
// initialize renderer, handler and event management
diff --git a/packages/vgrammar/tsconfig.test.json b/packages/vgrammar/tsconfig.test.json
deleted file mode 100644
index c0ce4d27e..000000000
--- a/packages/vgrammar/tsconfig.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "include": ["./__tests__"],
- "compilerOptions": {
- "paths": {
- "@visactor/vgrammar-util": ["../vgrammar-util/src"],
- "@visactor/vgrammar-coordinate": ["../vgrammar-coordinate/src"]
- }
- },
- "references": []
-}
diff --git a/share/jest-config/jest.base.js b/share/jest-config/jest.base.js
index 5fdf79c3c..897b0e871 100644
--- a/share/jest-config/jest.base.js
+++ b/share/jest-config/jest.base.js
@@ -14,7 +14,7 @@ module.exports = {
esModuleInterop: true,
experimentalDecorators: true,
module: 'ESNext',
- tsconfig: '/tsconfig.test.json',
+ tsconfig: '/__tests__/tsconfig.json',
// ts-jest configuration goes here
}
]
diff --git a/tools/bundler/src/logic/babel.config.ts b/tools/bundler/src/logic/babel.config.ts
index e750fbdb1..adf848073 100644
--- a/tools/bundler/src/logic/babel.config.ts
+++ b/tools/bundler/src/logic/babel.config.ts
@@ -1,10 +1,15 @@
-import type { PluginItem } from '@babel/core';
+import type { PluginItem, TransformOptions } from '@babel/core';
export type BabelPlugins = {
presets: PluginItem[];
plugins: PluginItem[];
};
-export function getBabelPlugins(packageName: string): BabelPlugins {
+export function getBabelPlugins(
+ packageName: string,
+ options?: {
+ envOptions?: TransformOptions;
+ }
+): BabelPlugins {
const plugins = [
require.resolve('@babel/plugin-proposal-export-default-from'),
require.resolve('@babel/plugin-proposal-class-properties'),
@@ -21,7 +26,7 @@ export function getBabelPlugins(packageName: string): BabelPlugins {
const presets = [
require.resolve('@babel/preset-react'),
- require.resolve('@babel/preset-env'),
+ [require.resolve('@babel/preset-env'), { targets: 'defaults and not IE 11', ...options?.envOptions }],
require.resolve('@babel/preset-typescript')
];
diff --git a/tools/bundler/src/tasks/umd.ts b/tools/bundler/src/tasks/umd.ts
index eebf4dcda..b36b72bf6 100644
--- a/tools/bundler/src/tasks/umd.ts
+++ b/tools/bundler/src/tasks/umd.ts
@@ -16,7 +16,11 @@ function packageNameToPath(name: string) {
return name.replace('@', '').replace('/', '_');
}
export async function buildUmd(config: Config, projectRoot: string, rawPackageJson: RawPackageJson, minify: boolean) {
- const babelPlugins = getBabelPlugins(rawPackageJson.name);
+ const babelPlugins = getBabelPlugins(rawPackageJson.name, {
+ envOptions: {
+ targets: config.targets
+ }
+ });
const entry = path.resolve(
projectRoot,
config.sourceDir,