@antv/layout 2.0.0-beta.0 → 2.0.0-beta.2

package/lib/util/format.d.ts

@@ -0,0 +1,37 @@
+import { Expr } from '../types/common.js';
+import { NodeData } from '../types/data.js';
+import { Size, STDSize } from '../types/size.js';
+
+/**
+ * Format a value into a callable function when it is a string expression.
+ * - `string` => `(context) => evaluateExpression(string, context)`
+ * - `function` => returned as-is
+ * - other => returned as-is
+ */
+declare function formatFn<TContext extends Record<string, any> = Record<string, any>>(value: unknown, argNames: (keyof TContext & string)[]): Function;
+/**
+ * Format value with multiple types into a function that returns a number
+ * @param value The value to be formatted
+ * @param defaultValue The default value when value is invalid
+ * @returns A function that returns a number
+ */
+declare function formatNumberFn<T extends NodeData = NodeData>(value: number | Expr | ((d: T) => number) | undefined, defaultValue: number, type?: 'node' | 'edge' | 'combo'): (d: T) => number;
+/**
+ * Format size config with multiple types into a function that returns a size
+ * @param value The value to be formatted
+ * @param defaultValue The default value when value is invalid
+ * @param resultIsNumber Whether to return a number (max of width/height) or size array
+ * @returns A function that returns a size
+ */
+declare function formatSizeFn<T extends NodeData = NodeData>(value?: Size | Expr | ((d: T) => Size), defaultValue?: number, type?: 'node' | 'edge' | 'combo'): (d: T) => Size;
+/**
+ * Format nodeSize and nodeSpacing into a function that returns the total size
+ * @param nodeSize The size of the node
+ * @param nodeSpacing The spacing around the node
+ * @param defaultNodeSize The default node size when value is invalid
+ * @param defaultNodeSpacing The default node spacing when value is invalid
+ * @returns A function that returns the total size (node size + spacing)
+ */
+declare const formatNodeSizeFn: (nodeSize?: string | Size | ((node: NodeData) => Size) | undefined, nodeSpacing?: string | Size | ((node: NodeData) => Size) | undefined, defaultNodeSize?: number, defaultNodeSpacing?: number) => (d: NodeData) => STDSize;
+
+export { formatFn, formatNodeSizeFn, formatNumberFn, formatSizeFn };

package/lib/util/format.js

@@ -1,15 +1,52 @@
-import { parseSize } from './size.js';
-import isFunction from '../node_modules/@antv/util/esm/lodash/is-function.js';
+import { evaluateExpression } from './expr.js';
+import { parseSize, isSize } from './size.js';
+import isNil from '../node_modules/@antv/util/esm/lodash/is-nil.js';
+import isString from '../node_modules/@antv/util/esm/lodash/is-string.js';
 import isNumber from '../node_modules/@antv/util/esm/lodash/is-number.js';
-import isObject from '../node_modules/@antv/util/esm/lodash/is-object.js';
+import isFunction from '../node_modules/@antv/util/esm/lodash/is-function.js';
 
+/**
+ * Format a value into a callable function when it is a string expression.
+ * - `string` => `(context) => evaluateExpression(string, context)`
+ * - `function` => returned as-is
+ * - other => returned as-is
+ */
+function formatFn(value, argNames) {
+    if (typeof value === 'function')
+        return value;
+    if (typeof value === 'string') {
+        const expr = value;
+        return (...argv) => {
+            const ctx = {};
+            for (let i = 0; i < argNames.length; i++) {
+                ctx[argNames[i]] = argv[i];
+            }
+            return evaluateExpression(expr, ctx);
+        };
+    }
+    return () => value;
+}
 /**
  * Format value with multiple types into a function that returns a number
  * @param value The value to be formatted
  * @param defaultValue The default value when value is invalid
  * @returns A function that returns a number
  */
-function formatNumberFn(value, defaultValue) {
+function formatNumberFn(value, defaultValue, type = 'node') {
+    // If value is undefined, return default value function
+    if (isNil(value)) {
+        return () => defaultValue;
+    }
+    // If value is an expression, return a function that evaluates the expression
+    if (isString(value)) {
+        const numberFn = formatFn(value, [type]);
+        return (d) => {
+            const evaluated = numberFn(d);
+            if (isNumber(evaluated))
+                return evaluated;
+            return defaultValue;
+        };
+    }
     // If value is a function, return it directly
     if (isFunction(value)) {
         return value;
@@ -28,11 +65,21 @@ function formatNumberFn(value, defaultValue) {
  * @param resultIsNumber Whether to return a number (max of width/height) or size array
  * @returns A function that returns a size
  */
-function formatSizeFn(value, defaultValue = 10) {
+function formatSizeFn(value, defaultValue = 10, type = 'node') {
     // If value is undefined, return default value function
-    if (!value) {
+    if (isNil(value)) {
         return () => defaultValue;
     }
+    // If value is an expression, return a function that evaluates the expression
+    if (isString(value)) {
+        const sizeFn = formatFn(value, [type]);
+        return (d) => {
+            const evaluated = sizeFn(d);
+            if (isSize(evaluated))
+                return evaluated;
+            return defaultValue;
+        };
+    }
     // If value is a function, return it directly
     if (isFunction(value)) {
         return value;
@@ -45,10 +92,6 @@ function formatSizeFn(value, defaultValue = 10) {
     if (Array.isArray(value)) {
         return () => value;
     }
-    // If value is an object with width and height
-    if (isObject(value) && value.width && value.height) {
-        return () => [value.width, value.height];
-    }
     return () => defaultValue;
 }
 /**
@@ -56,17 +99,18 @@ function formatSizeFn(value, defaultValue = 10) {
  * @param nodeSize The size of the node
  * @param nodeSpacing The spacing around the node
  * @param defaultNodeSize The default node size when value is invalid
+ * @param defaultNodeSpacing The default node spacing when value is invalid
  * @returns A function that returns the total size (node size + spacing)
  */
-const formatNodeSizeFn = (nodeSize, nodeSpacing, defaultNodeSize = 10) => {
-    const nodeSpacingFunc = formatNumberFn(nodeSpacing, 0);
+const formatNodeSizeFn = (nodeSize, nodeSpacing, defaultNodeSize = 10, defaultNodeSpacing = 0) => {
+    const nodeSpacingFunc = formatSizeFn(nodeSpacing, defaultNodeSpacing);
     const nodeSizeFunc = formatSizeFn(nodeSize, defaultNodeSize);
-    return (node) => {
-        const size = nodeSizeFunc(node);
-        const spacing = nodeSpacingFunc(node);
-        return Math.max(...parseSize(size)) + spacing;
+    return (d) => {
+        const [sizeW, sizeH, sizeD] = parseSize(nodeSizeFunc(d));
+        const [spacingW, spacingH, spacingD] = parseSize(nodeSpacingFunc(d));
+        return [sizeW + spacingW, sizeH + spacingH, sizeD + spacingD];
     };
 };
 
-export { formatNodeSizeFn, formatNumberFn, formatSizeFn };
+export { formatFn, formatNodeSizeFn, formatNumberFn, formatSizeFn };
 //# sourceMappingURL=format.js.map

package/lib/util/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sources":["../../src/util/src/util/format.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAIA;;;;;AAKG;AACG,SAAU,cAAc,CAC5B,KAA+C,EAC/C,YAAoB,EAAA;;AAGpB,IAAA,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;AACrB,QAAA,OAAO,KAAK;AACb,IAAA;;AAGD,IAAA,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnB,QAAA,OAAO,MAAM,KAAK;AACnB,IAAA;;AAGD,IAAA,OAAO,MAAM,YAAY;AAC3B;AAEA;;;;;;AAMG;SACa,YAAY,CAC1B,KAAoE,EACpE,eAAuB,EAAE,EAAA;;IAGzB,IAAI,CAAC,KAAK,EAAE;AACV,QAAA,OAAO,MAAM,YAAY;AAC1B,IAAA;;AAGD,IAAA,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;AACrB,QAAA,OAAO,KAAK;AACb,IAAA;;AAGD,IAAA,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnB,QAAA,OAAO,MAAM,KAAK;AACnB,IAAA;;AAGD,IAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,QAAA,OAAO,MAAM,KAAK;AACnB,IAAA;;AAGD,IAAA,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;AAClD,QAAA,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;AACzC,IAAA;AAED,IAAA,OAAO,MAAM,YAAY;AAC3B;AAEA;;;;;;AAMG;AACI,MAAM,gBAAgB,GAAG,CAC9B,QAIa,EACb,WAA+D,EAC/D,eAAA,GAA0B,EAAE,KACK;IACjC,MAAM,eAAe,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC;IAE5D,OAAO,CAAC,IAAe,KAAI;AACzB,QAAA,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;AAC/B,QAAA,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC;AACrC,QAAA,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO;AAC/C,IAAA,CAAC;AACH;;;;"}
+{"version":3,"file":"format.js","sources":["../../src/util/src/util/format.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/util/order.d.ts

@@ -1,7 +1,7 @@
-import { NodeData, LayoutNode } from '../types/data.js';
 import { GraphLib } from '../model/data.js';
+import { Sorter } from '../types/common.js';
+import { NodeData } from '../types/data.js';
 
-type SortComparator<N extends NodeData = NodeData> = (nodeA: LayoutNode<N>, nodeB: LayoutNode<N>, nodes: LayoutNode<N>[]) => -1 | 0 | 1;
 declare function orderByDegree<N extends NodeData = NodeData>(model: GraphLib<N>, order?: 'asc' | 'desc'): GraphLib<N>;
 /**
  * 按 ID 排序
@@ -10,11 +10,10 @@ declare function orderById<N extends NodeData = NodeData>(model: GraphLib<N>): G
 /**
  * 按自定义比较函数排序
  */
-declare function orderBySorter<N extends NodeData = NodeData>(model: GraphLib<N>, sorter: (a: NodeData, b: NodeData) => -1 | 0 | 1): GraphLib<N>;
+declare function orderBySorter<N extends NodeData = NodeData>(model: GraphLib<N>, sorter: Sorter<N>): GraphLib<N>;
 /**
  * Order nodes according to graph topology
  */
 declare function orderByTopology<N extends NodeData = NodeData>(model: GraphLib<N>, directed?: boolean): GraphLib<N>;
 
 export { orderByDegree, orderById, orderBySorter, orderByTopology };
-export type { SortComparator };

package/lib/util/order.js.map

@@ -1 +1 @@
-{"version":3,"file":"order.js","sources":["../../src/util/src/util/order.ts"],"sourcesContent":[null],"names":["sort"],"mappings":"AASA;;AAEG;AACH,SAASA,MAAI,CACX,KAAkB,EAClB,SAAyD,EAAA;AAEzD,IAAA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE;AAE3B,IAAA,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;AACrB,IAAA,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;AAEzB,IAAA,OAAO,KAAK;AACd;SAEgB,aAAa,CAC3B,KAAkB,EAClB,QAAwB,MAAM,EAAA;IAE9B,OAAOA,MAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAI;QAClC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,IAAG,KAAK,KAAK,KAAK,EAAE;AAClB,YAAA,OAAO,OAAO,GAAG,OAAO,CAAC;AAC1B,QAAA;AACD,QAAA,OAAO,OAAO,GAAG,OAAO,CAAC;AAC3B,IAAA,CAAC,CAAC;AACJ;AAEA;;AAEG;AACG,SAAU,SAAS,CACvB,KAAkB,EAAA;IAElB,OAAOA,MAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAI;AAClC,QAAA,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE;AACpB,QAAA,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE;QAEpB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACtD,OAAO,GAAG,GAAG,GAAG;AACjB,QAAA;AAED,QAAA,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC/C,IAAA,CAAC,CAAC;AACJ;AAEA;;AAEG;AACG,SAAU,aAAa,CAC3B,KAAkB,EAClB,MAAgD,EAAA;IAEhD,OAAOA,MAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAI;QAClC,MAAM,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;AACtC,QAAA,OAAO,MAAM,CAAC,CAAE,EAAE,CAAE,CAAC;AACvB,IAAA,CAAC,CAAC;AACJ;AAEA;;AAEG;SACa,eAAe,CAC7B,KAAkB,EAClB,WAAoB,KAAK,EAAA;AAEzB,IAAA,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE;IAE3B,IAAI,CAAC,KAAK,CAAC;AAAE,QAAA,OAAO,KAAK;AAEzB,IAAA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE;IAC3B,MAAM,YAAY,GAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,SAAS,GAA8B,EAAE;IAC/C,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI;IAE7B,IAAI,CAAC,GAAG,CAAC;IACT,IAAI,CAAC,GAAG,CAAC;AACT,IAAA,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,KAAI;QACzB,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,YAAA,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC;AACnD,YAAA,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;YACxE,MAAM,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;YACxC,MAAM,UAAU,GAAG;AAChB,iBAAA,SAAS,CAAC,aAAa,EAAE,MAAM;AAC/B,iBAAA,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;AAEpB,YAAA,IACE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,aAAa,KAAK,UAAU,IAAI,UAAU;AAC1D,gBAAA,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EACnB;AACA,gBAAA,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;AACvB,gBAAA,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI;AACzB,gBAAA,CAAC,EAAE;AACJ,YAAA;AAAM,iBAAA;gBACL,MAAM,QAAQ,GAAG;AACf,sBAAE,KAAK,CAAC,UAAU,CAAC,aAAa;AAChC,sBAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC;gBAClC,IAAI,UAAU,GAAG,KAAK;AAEtB,gBAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACxC,oBAAA,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC;oBAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;AACjC,oBAAA,IACE,KAAK;AACL,wBAAA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;AAC/C,wBAAA,CAAC,SAAS,CAAC,OAAO,CAAC,EACnB;AACA,wBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;AACxB,wBAAA,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI;wBACzB,UAAU,GAAG,IAAI;wBACjB;AACD,oBAAA;AACF,gBAAA;gBAED,IAAI,EAAE,GAAG,CAAC;gBACV,OAAO,CAAC,UAAU,EAAE;oBAClB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE;wBAC5B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC5B,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI;wBAC9B,UAAU,GAAG,IAAI;AAClB,oBAAA;AACD,oBAAA,EAAE,EAAE;oBACJ,IAAI,EAAE,KAAK,CAAC,EAAE;wBACZ;AACD,oBAAA;AACF,gBAAA;AACF,YAAA;AACF,QAAA;AACD,QAAA,CAAC,EAAE;AACL,IAAA,CAAC,CAAC;;AAGF,IAAA,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC;AAEhC,IAAA,OAAO,KAAK;AACd;;;;"}
+{"version":3,"file":"order.js","sources":["../../src/util/src/util/order.ts"],"sourcesContent":[null],"names":["sort"],"mappings":"AAGA;;AAEG;AACH,SAASA,MAAI,CACX,KAAkB,EAClB,SAAyD,EAAA;AAEzD,IAAA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE;AAE3B,IAAA,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;AACrB,IAAA,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC;AAEzB,IAAA,OAAO,KAAK;AACd;SAEgB,aAAa,CAC3B,KAAkB,EAClB,QAAwB,MAAM,EAAA;IAE9B,OAAOA,MAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAI;QAClC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,IAAI,KAAK,KAAK,KAAK,EAAE;AACnB,YAAA,OAAO,OAAO,GAAG,OAAO,CAAC;AAC1B,QAAA;AACD,QAAA,OAAO,OAAO,GAAG,OAAO,CAAC;AAC3B,IAAA,CAAC,CAAC;AACJ;AAEA;;AAEG;AACG,SAAU,SAAS,CACvB,KAAkB,EAAA;IAElB,OAAOA,MAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAI;AAClC,QAAA,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE;AACpB,QAAA,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE;QAEpB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACtD,OAAO,GAAG,GAAG,GAAG;AACjB,QAAA;AAED,QAAA,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC/C,IAAA,CAAC,CAAC;AACJ;AAEA;;AAEG;AACG,SAAU,aAAa,CAC3B,KAAkB,EAClB,MAAiB,EAAA;IAEjB,OAAOA,MAAI,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAI;QAClC,MAAM,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;AACtC,QAAA,OAAO,MAAM,CAAC,CAAE,EAAE,CAAE,CAAC;AACvB,IAAA,CAAC,CAAC;AACJ;AAEA;;AAEG;SACa,eAAe,CAC7B,KAAkB,EAClB,WAAoB,KAAK,EAAA;AAEzB,IAAA,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE;IAE3B,IAAI,CAAC,KAAK,CAAC;AAAE,QAAA,OAAO,KAAK;AAEzB,IAAA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE;IAC3B,MAAM,YAAY,GAAoB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,SAAS,GAA8B,EAAE;IAC/C,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI;IAE7B,IAAI,CAAC,GAAG,CAAC;IACT,IAAI,CAAC,GAAG,CAAC;AACT,IAAA,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,KAAI;QACzB,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,YAAA,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC;AACnD,YAAA,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;YACxE,MAAM,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;YACxC,MAAM,UAAU,GAAG;AAChB,iBAAA,SAAS,CAAC,aAAa,EAAE,MAAM;AAC/B,iBAAA,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;AAEpB,YAAA,IACE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,aAAa,KAAK,UAAU,IAAI,UAAU;AAC1D,gBAAA,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EACnB;AACA,gBAAA,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;AACvB,gBAAA,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI;AACzB,gBAAA,CAAC,EAAE;AACJ,YAAA;AAAM,iBAAA;gBACL,MAAM,QAAQ,GAAG;AACf,sBAAE,KAAK,CAAC,UAAU,CAAC,aAAa;AAChC,sBAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC;gBAClC,IAAI,UAAU,GAAG,KAAK;AAEtB,gBAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACxC,oBAAA,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC;oBAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;AACjC,oBAAA,IACE,KAAK;AACL,wBAAA,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;AAC/C,wBAAA,CAAC,SAAS,CAAC,OAAO,CAAC,EACnB;AACA,wBAAA,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;AACxB,wBAAA,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI;wBACzB,UAAU,GAAG,IAAI;wBACjB;AACD,oBAAA;AACF,gBAAA;gBAED,IAAI,EAAE,GAAG,CAAC;gBACV,OAAO,CAAC,UAAU,EAAE;oBAClB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE;wBAC5B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;wBAC5B,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI;wBAC9B,UAAU,GAAG,IAAI;AAClB,oBAAA;AACD,oBAAA,EAAE,EAAE;oBACJ,IAAI,EAAE,KAAK,CAAC,EAAE;wBACZ;AACD,oBAAA;AACF,gBAAA;AACF,YAAA;AACF,QAAA;AACD,QAAA,CAAC,EAAE;AACL,IAAA,CAAC,CAAC;;AAGF,IAAA,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC;AAEhC,IAAA,OAAO,KAAK;AACd;;;;"}

package/lib/util/size.d.ts

@@ -1,5 +1,6 @@
 import { Size, STDSize } from '../types/size.js';
 
 declare function parseSize(size?: Size): STDSize;
+declare function isSize(value: unknown): value is Size;
 
-export { parseSize };
+export { isSize, parseSize };

package/lib/util/size.js

@@ -10,6 +10,14 @@ function parseSize(size) {
     const [x, y = x, z = x] = size;
     return [x, y, z];
 }
+function isSize(value) {
+    if (isNumber(value))
+        return true;
+    if (Array.isArray(value)) {
+        return value.every((item) => isNumber(item));
+    }
+    return false;
+}
 
-export { parseSize };
+export { isSize, parseSize };
 //# sourceMappingURL=size.js.map

package/lib/util/size.js.map

@@ -1 +1 @@
-{"version":3,"file":"size.js","sources":["../../src/util/src/util/size.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAGM,SAAU,SAAS,CAAC,IAAW,EAAA;AACnC,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3B,IAAI,QAAQ,CAAC,IAAI,CAAC;AAAE,QAAA,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;SACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;AAAE,QAAA,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACnE,IAAA,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI;AAC9B,IAAA,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAClB;;;;"}
+{"version":3,"file":"size.js","sources":["../../src/util/src/util/size.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAGM,SAAU,SAAS,CAAC,IAAW,EAAA;AACnC,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3B,IAAI,QAAQ,CAAC,IAAI,CAAC;AAAE,QAAA,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;SACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;AAAE,QAAA,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AACnE,IAAA,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI;AAC9B,IAAA,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAClB;AAEM,SAAU,MAAM,CAAC,KAAc,EAAA;IACnC,IAAI,QAAQ,CAAC,KAAK,CAAC;AAAE,QAAA,OAAO,IAAI;AAChC,IAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,QAAA,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC7C,IAAA;AACD,IAAA,OAAO,KAAK;AACd;;;;"}