taffy-layout 1.4.0 → 2.0.0

package/README.ja-JP.md

@@ -71,10 +71,7 @@ childStyle.height = "auto";
 // ノードを生成
 const child1 = tree.newLeaf(childStyle);
 const child2 = tree.newLeaf(childStyle);
-const container = tree.newWithChildren(
-  containerStyle,
-  BigUint64Array.from([child1, child2]),
-);
+const container = tree.newWithChildren(containerStyle, [child1, child2]);
 
 // レイアウト計算
 tree.computeLayout(container, { width: 300, height: 200 });

package/README.md

@@ -71,10 +71,7 @@ childStyle.height = "auto";
 // Create nodes
 const child1 = tree.newLeaf(childStyle);
 const child2 = tree.newLeaf(childStyle);
-const container = tree.newWithChildren(
-  containerStyle,
-  BigUint64Array.from([child1, child2]),
-);
+const container = tree.newWithChildren(containerStyle, [child1, child2]);
 
 // Compute layout
 tree.computeLayout(container, { width: 300, height: 200 });

package/README.zh-CN.md

@@ -71,10 +71,7 @@ childStyle.height = "auto";
 // 创建节点
 const child1 = tree.newLeaf(childStyle);
 const child2 = tree.newLeaf(childStyle);
-const container = tree.newWithChildren(
-  containerStyle,
-  BigUint64Array.from([child1, child2]),
-);
+const container = tree.newWithChildren(containerStyle, [child1, child2]);
 
 // 计算布局
 tree.computeLayout(container, { width: 300, height: 200 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taffy-layout",
-  "version": "1.4.0",
+  "version": "2.0.0",
   "description": "WebAssembly bindings for Taffy layout library",
   "keywords": [
     "layout",

package/pkg/README.md

@@ -71,10 +71,7 @@ childStyle.height = "auto";
 // Create nodes
 const child1 = tree.newLeaf(childStyle);
 const child2 = tree.newLeaf(childStyle);
-const container = tree.newWithChildren(
-  containerStyle,
-  BigUint64Array.from([child1, child2]),
-);
+const container = tree.newWithChildren(containerStyle, [child1, child2]);
 
 // Compute layout
 tree.computeLayout(container, { width: 300, height: 200 });

package/pkg/taffy_wasm.d.ts

@@ -2294,11 +2294,11 @@ export class TaffyTree {
    * const child1 = tree.newLeaf(new Style());
    * const child2 = tree.newLeaf(new Style());
    * const child3 = tree.newLeaf(new Style());
-   * const children = BigUint64Array.from([child1, child2, child3]);
+   * const children = [child1, child2, child3];
    * tree.setChildren(parentId, children);
    * ```
    */
-  setChildren(parent: bigint, children: BigUint64Array): void;
+  setChildren(parent: bigint, children: bigint[]): void;
   /**
    * Creates a new TaffyTree with pre-allocated capacity
    *
@@ -2455,7 +2455,7 @@ export class TaffyTree {
    * The children must already exist in the tree.
    *
    * @param style - The style configuration for the node
-   * @param children - Array of child node IDs (as BigUint64Array)
+   * @param children - Array of child node IDs (as bigint[])
    *
    * @returns - The node ID (`bigint`)
    *
@@ -2472,11 +2472,11 @@ export class TaffyTree {
    *
    * const container: bigint = tree.newWithChildren(
    *   containerStyle,
-   *   BigUint64Array.from([child1, child2])
+   *   [child1, child2]
    * );
    * ```
    */
-  newWithChildren(style: Style, children: BigUint64Array): bigint;
+  newWithChildren(style: Style, children: bigint[]): bigint;
   /**
    * Gets the child at a specific index
    *
@@ -2598,12 +2598,13 @@ export class TaffyTree {
    * ```typescript
    * const tree = new TaffyTree();
    * const parentId = tree.newLeaf(new Style());
+   * const child0 = tree.newLeaf(new Style());
    * const child1 = tree.newLeaf(new Style());
    * const child2 = tree.newLeaf(new Style());
    * const child3 = tree.newLeaf(new Style());
-   * tree.setChildren(parentId, BigUint64Array.from([child1, child2, child3]));
+   * tree.setChildren(parentId, [child0, child1, child2, child3]);
    *
-   * tree.removeChildrenRange(parentId, 1, 3);
+   * tree.removeChildrenRange(parentId, 1, 3); // Removes child1 and child2
    * ```
    */
   removeChildrenRange(parent: bigint, startIndex: number, endIndex: number): void;
@@ -2681,11 +2682,11 @@ export class TaffyTree {
    * const tree = new TaffyTree();
    * const id1 = tree.newLeaf(new Style());
    * const id2 = tree.newLeaf(new Style());
-   * const nodes = BigUint64Array.from([id1, id2]);
+   * const nodes = [id1, id2];
    * const contexts = tree.getDisjointNodeContextMut(nodes);
    * ```
    */
-  getDisjointNodeContextMut(children: BigUint64Array): any[];
+  getDisjointNodeContextMut(children: bigint[]): any[];
   /**
    * Creates a new empty TaffyTree
    *
@@ -2827,7 +2828,7 @@ export class TaffyTree {
    *
    * @param parent - The parent node ID
    *
-   * @returns - Array of child node IDs (`BigUint64Array`)
+   * @returns - Array of child node IDs
    *
    * @throws `TaffyError` if the parent node does not exist
    *
@@ -2835,10 +2836,10 @@ export class TaffyTree {
    * ```typescript
    * const tree = new TaffyTree();
    * const parentId = tree.newLeaf(new Style());
-   * const children: BigUint64Array = tree.children(parentId);
+   * const children = tree.children(parentId);
    * ```
    */
-  children(parent: bigint): BigUint64Array;
+  children(parent: bigint): bigint[];
   /**
    * Creates a new leaf node with the given style
    *
@@ -3112,7 +3113,7 @@ export interface InitOutput {
   readonly taffyerror_message: (a: number) => [number, number];
   readonly taffytree_addChild: (a: number, b: bigint, c: bigint) => [number, number];
   readonly taffytree_childCount: (a: number, b: bigint) => number;
-  readonly taffytree_children: (a: number, b: bigint) => [number, number, number, number];
+  readonly taffytree_children: (a: number, b: bigint) => [number, number, number];
   readonly taffytree_clear: (a: number) => void;
   readonly taffytree_computeLayout: (a: number, b: bigint, c: any) => [number, number];
   readonly taffytree_computeLayoutWithMeasure: (a: number, b: bigint, c: any, d: any) => [number, number];
@@ -3121,7 +3122,7 @@ export interface InitOutput {
   readonly taffytree_disableRounding: (a: number) => void;
   readonly taffytree_enableRounding: (a: number) => void;
   readonly taffytree_getChildAtIndex: (a: number, b: bigint, c: number) => [bigint, number, number];
-  readonly taffytree_getDisjointNodeContextMut: (a: number, b: number, c: number) => [number, number, number, number];
+  readonly taffytree_getDisjointNodeContextMut: (a: number, b: any) => [number, number, number, number];
   readonly taffytree_getLayout: (a: number, b: bigint) => [number, number, number];
   readonly taffytree_getNodeContext: (a: number, b: bigint) => [number, number, number];
   readonly taffytree_getNodeContextMut: (a: number, b: bigint) => [number, number, number];
@@ -3131,7 +3132,7 @@ export interface InitOutput {
   readonly taffytree_new: () => number;
   readonly taffytree_newLeaf: (a: number, b: number) => [bigint, number, number];
   readonly taffytree_newLeafWithContext: (a: number, b: number, c: any) => [bigint, number, number];
-  readonly taffytree_newWithChildren: (a: number, b: number, c: number, d: number) => [bigint, number, number];
+  readonly taffytree_newWithChildren: (a: number, b: number, c: any) => [bigint, number, number];
   readonly taffytree_parent: (a: number, b: bigint) => [number, bigint];
   readonly taffytree_printTree: (a: number, b: bigint) => [number, number];
   readonly taffytree_remove: (a: number, b: bigint) => [bigint, number, number];
@@ -3139,7 +3140,7 @@ export interface InitOutput {
   readonly taffytree_removeChildAtIndex: (a: number, b: bigint, c: number) => [bigint, number, number];
   readonly taffytree_removeChildrenRange: (a: number, b: bigint, c: number, d: number) => [number, number];
   readonly taffytree_replaceChildAtIndex: (a: number, b: bigint, c: number, d: bigint) => [bigint, number, number];
-  readonly taffytree_setChildren: (a: number, b: bigint, c: number, d: number) => [number, number];
+  readonly taffytree_setChildren: (a: number, b: bigint, c: any) => [number, number];
   readonly taffytree_setNodeContext: (a: number, b: bigint, c: any) => [number, number];
   readonly taffytree_setStyle: (a: number, b: bigint, c: number) => [number, number];
   readonly taffytree_totalNodeCount: (a: number) => number;

package/pkg/taffy_wasm.js

@@ -88,24 +88,11 @@ function getArrayJsValueFromWasm0(ptr, len) {
     return result;
 }
 
-function getArrayU64FromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return getBigUint64ArrayMemory0().subarray(ptr / 8, ptr / 8 + len);
-}
-
 function getArrayU8FromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
 
-let cachedBigUint64ArrayMemory0 = null;
-function getBigUint64ArrayMemory0() {
-    if (cachedBigUint64ArrayMemory0 === null || cachedBigUint64ArrayMemory0.byteLength === 0) {
-        cachedBigUint64ArrayMemory0 = new BigUint64Array(wasm.memory.buffer);
-    }
-    return cachedBigUint64ArrayMemory0;
-}
-
 let cachedDataViewMemory0 = null;
 function getDataViewMemory0() {
     if (cachedDataViewMemory0 === null || cachedDataViewMemory0.buffer.detached === true || (cachedDataViewMemory0.buffer.detached === undefined && cachedDataViewMemory0.buffer !== wasm.memory.buffer)) {
@@ -140,13 +127,6 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-function passArray64ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 8, 8) >>> 0;
-    getBigUint64ArrayMemory0().set(arg, ptr / 8);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
 function passArrayJsValueToWasm0(array, malloc) {
     const ptr = malloc(array.length * 4, 4) >>> 0;
     for (let i = 0; i < array.length; i++) {
@@ -3369,16 +3349,14 @@ export class TaffyTree {
      * const child1 = tree.newLeaf(new Style());
      * const child2 = tree.newLeaf(new Style());
      * const child3 = tree.newLeaf(new Style());
-     * const children = BigUint64Array.from([child1, child2, child3]);
+     * const children = [child1, child2, child3];
      * tree.setChildren(parentId, children);
      * ```
      * @param {bigint} parent
-     * @param {BigUint64Array} children
+     * @param {bigint[]} children
      */
     setChildren(parent, children) {
-        const ptr0 = passArray64ToWasm0(children, wasm.__wbindgen_malloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.taffytree_setChildren(this.__wbg_ptr, parent, ptr0, len0);
+        const ret = wasm.taffytree_setChildren(this.__wbg_ptr, parent, children);
         if (ret[1]) {
             throw takeFromExternrefTable0(ret[0]);
         }
@@ -3579,7 +3557,7 @@ export class TaffyTree {
      * The children must already exist in the tree.
      *
      * @param style - The style configuration for the node
-     * @param children - Array of child node IDs (as BigUint64Array)
+     * @param children - Array of child node IDs (as bigint[])
      *
      * @returns - The node ID (`bigint`)
      *
@@ -3596,18 +3574,16 @@ export class TaffyTree {
      *
      * const container: bigint = tree.newWithChildren(
      *   containerStyle,
-     *   BigUint64Array.from([child1, child2])
+     *   [child1, child2]
      * );
      * ```
      * @param {Style} style
-     * @param {BigUint64Array} children
+     * @param {bigint[]} children
      * @returns {bigint}
      */
     newWithChildren(style, children) {
         _assertClass(style, Style);
-        const ptr0 = passArray64ToWasm0(children, wasm.__wbindgen_malloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.taffytree_newWithChildren(this.__wbg_ptr, style.__wbg_ptr, ptr0, len0);
+        const ret = wasm.taffytree_newWithChildren(this.__wbg_ptr, style.__wbg_ptr, children);
         if (ret[2]) {
             throw takeFromExternrefTable0(ret[1]);
         }
@@ -3786,12 +3762,13 @@ export class TaffyTree {
      * ```typescript
      * const tree = new TaffyTree();
      * const parentId = tree.newLeaf(new Style());
+     * const child0 = tree.newLeaf(new Style());
      * const child1 = tree.newLeaf(new Style());
      * const child2 = tree.newLeaf(new Style());
      * const child3 = tree.newLeaf(new Style());
-     * tree.setChildren(parentId, BigUint64Array.from([child1, child2, child3]));
+     * tree.setChildren(parentId, [child0, child1, child2, child3]);
      *
-     * tree.removeChildrenRange(parentId, 1, 3);
+     * tree.removeChildrenRange(parentId, 1, 3); // Removes child1 and child2
      * ```
      * @param {bigint} parent
      * @param {number} startIndex
@@ -3895,22 +3872,20 @@ export class TaffyTree {
      * const tree = new TaffyTree();
      * const id1 = tree.newLeaf(new Style());
      * const id2 = tree.newLeaf(new Style());
-     * const nodes = BigUint64Array.from([id1, id2]);
+     * const nodes = [id1, id2];
      * const contexts = tree.getDisjointNodeContextMut(nodes);
      * ```
-     * @param {BigUint64Array} children
+     * @param {bigint[]} children
      * @returns {any[]}
      */
     getDisjointNodeContextMut(children) {
-        const ptr0 = passArray64ToWasm0(children, wasm.__wbindgen_malloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.taffytree_getDisjointNodeContextMut(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.taffytree_getDisjointNodeContextMut(this.__wbg_ptr, children);
         if (ret[3]) {
             throw takeFromExternrefTable0(ret[2]);
         }
-        var v2 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+        var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
-        return v2;
+        return v1;
     }
     /**
      * Creates a new empty TaffyTree
@@ -4097,7 +4072,7 @@ export class TaffyTree {
      *
      * @param parent - The parent node ID
      *
-     * @returns - Array of child node IDs (`BigUint64Array`)
+     * @returns - Array of child node IDs
      *
      * @throws `TaffyError` if the parent node does not exist
      *
@@ -4105,19 +4080,17 @@ export class TaffyTree {
      * ```typescript
      * const tree = new TaffyTree();
      * const parentId = tree.newLeaf(new Style());
-     * const children: BigUint64Array = tree.children(parentId);
+     * const children = tree.children(parentId);
      * ```
      * @param {bigint} parent
-     * @returns {BigUint64Array}
+     * @returns {bigint[]}
      */
     children(parent) {
         const ret = wasm.taffytree_children(this.__wbg_ptr, parent);
-        if (ret[3]) {
-            throw takeFromExternrefTable0(ret[2]);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
         }
-        var v1 = getArrayU64FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 8, 8);
-        return v1;
+        return takeFromExternrefTable0(ret[0]);
     }
     /**
      * Creates a new leaf node with the given style
@@ -4553,7 +4526,6 @@ function __wbg_get_imports() {
 function __wbg_finalize_init(instance, module) {
     wasm = instance.exports;
     __wbg_init.__wbindgen_wasm_module = module;
-    cachedBigUint64ArrayMemory0 = null;
     cachedDataViewMemory0 = null;
     cachedUint8ArrayMemory0 = null;
 

package/pkg/taffy_wasm_bg.wasm.d.ts

@@ -176,7 +176,7 @@ export const style_width: (a: number) => any;
 export const taffyerror_message: (a: number) => [number, number];
 export const taffytree_addChild: (a: number, b: bigint, c: bigint) => [number, number];
 export const taffytree_childCount: (a: number, b: bigint) => number;
-export const taffytree_children: (a: number, b: bigint) => [number, number, number, number];
+export const taffytree_children: (a: number, b: bigint) => [number, number, number];
 export const taffytree_clear: (a: number) => void;
 export const taffytree_computeLayout: (a: number, b: bigint, c: any) => [number, number];
 export const taffytree_computeLayoutWithMeasure: (a: number, b: bigint, c: any, d: any) => [number, number];
@@ -185,7 +185,7 @@ export const taffytree_dirty: (a: number, b: bigint) => [number, number, number]
 export const taffytree_disableRounding: (a: number) => void;
 export const taffytree_enableRounding: (a: number) => void;
 export const taffytree_getChildAtIndex: (a: number, b: bigint, c: number) => [bigint, number, number];
-export const taffytree_getDisjointNodeContextMut: (a: number, b: number, c: number) => [number, number, number, number];
+export const taffytree_getDisjointNodeContextMut: (a: number, b: any) => [number, number, number, number];
 export const taffytree_getLayout: (a: number, b: bigint) => [number, number, number];
 export const taffytree_getNodeContext: (a: number, b: bigint) => [number, number, number];
 export const taffytree_getNodeContextMut: (a: number, b: bigint) => [number, number, number];
@@ -195,7 +195,7 @@ export const taffytree_markDirty: (a: number, b: bigint) => [number, number];
 export const taffytree_new: () => number;
 export const taffytree_newLeaf: (a: number, b: number) => [bigint, number, number];
 export const taffytree_newLeafWithContext: (a: number, b: number, c: any) => [bigint, number, number];
-export const taffytree_newWithChildren: (a: number, b: number, c: number, d: number) => [bigint, number, number];
+export const taffytree_newWithChildren: (a: number, b: number, c: any) => [bigint, number, number];
 export const taffytree_parent: (a: number, b: bigint) => [number, bigint];
 export const taffytree_printTree: (a: number, b: bigint) => [number, number];
 export const taffytree_remove: (a: number, b: bigint) => [bigint, number, number];
@@ -203,7 +203,7 @@ export const taffytree_removeChild: (a: number, b: bigint, c: bigint) => [bigint
 export const taffytree_removeChildAtIndex: (a: number, b: bigint, c: number) => [bigint, number, number];
 export const taffytree_removeChildrenRange: (a: number, b: bigint, c: number, d: number) => [number, number];
 export const taffytree_replaceChildAtIndex: (a: number, b: bigint, c: number, d: bigint) => [bigint, number, number];
-export const taffytree_setChildren: (a: number, b: bigint, c: number, d: number) => [number, number];
+export const taffytree_setChildren: (a: number, b: bigint, c: any) => [number, number];
 export const taffytree_setNodeContext: (a: number, b: bigint, c: any) => [number, number];
 export const taffytree_setStyle: (a: number, b: bigint, c: number) => [number, number];
 export const taffytree_totalNodeCount: (a: number) => number;