nodi-modular 0.0.26 → 0.0.28

package/index.d.ts

@@ -1,8 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
 export function do_nothing_just_tell_wasm_bindgen_to_generate_types(): void;
-export type NodeOutput = (Map<string, Item[]> | undefined)[];
-
 /**
  * Evaluation item interoperability type.
  */
@@ -13,35 +11,126 @@ export interface GeometryTransformInterop {
     transform: TransformInterop;
 }
 
-export interface GroupInteropHandle {
-    objects: GeometryInteropHandleProxy[];
+export type NodeOutput = (Map<string, Item[]> | undefined)[];
+
+export type GeometryInteropVec = GeometryInterop[];
+
+export type NodeConnectionInteropVec = NodeConnectionInterop[];
+
+export type NodePropertyInteropVec = NodePropertyInterop[];
+
+export type NodeInteropVec = NodeInterop[];
+
+export type EdgeInteropVec = EdgeInterop[];
+
+export interface GeometrySpreadsheet {
+    points: Point3<number>[];
+    curves: CurveProxy[];
+    surfaces: SurfaceProxy[];
+    meshes: MeshInterop[];
 }
 
-/**
- * Interop struct for transform
- * Represents a 4x4 matrix as a 16-element array
- */
-export type TransformInterop = number[];
+export interface DataTreeInterop {
+    branches: IndexMap<string, string[]>;
+}
 
-export interface IndicesInteropHandle {
+export interface DataTreeFormatInterop {
+    outputs: IndexMap<string, string>;
+}
+
+export interface MeshInteropHandle {
     count: number;
-    indices: number;
+    vertices: number;
+    normals: number;
+    indices: IndicesInteropHandle | undefined;
+    transform: TransformInterop | undefined;
 }
 
 /**
- * Interop struct for evaluation results
+ * Options for adaptive tessellation to create geometry interoperability
  */
-export interface EvaluationInterop {
+export interface AdaptiveTessellationOptions {
     /**
-     * Processed nodes in the latest evaluation
+     * Whether to enable adaptive tessellation
      */
-    processedNodes: GraphNodeSet[];
+    enabled: boolean;
     /**
-     * Geometry identifiers in the latest evaluation
+     * Tolerance for the normal vector: if the L2 norm of the normal vectors is below this value, the edge is considered flat
      */
-    geometryIdentifiers: GeometryIdentifier[];
+    normTolerance: number;
+    /**
+     * Minimum number of divisions in u direction
+     */
+    minDivsU: number;
+    /**
+     * Minimum number of divisions in v direction
+     */
+    minDivsV: number;
+    /**
+     * Minimum depth for division
+     */
+    minDepth: number;
+    /**
+     * Maximum depth for division
+     */
+    maxDepth: number;
+}
+
+export type GeometryInteropHandleProxy = { variant: "Mesh"; data: MeshInteropHandle } | { variant: "Curve"; data: CurveInteropHandle } | { variant: "Group"; data: GroupInteropHandle };
+
+export interface PointListHandleUnit {
+    count: number;
+    points: number;
+}
+
+/**
+ * Point display handle for wasm interop
+ */
+export interface PointListDisplayHandle {
+    list: PointListHandleUnit[];
+    pointSize: number;
+}
+
+/**
+ * Vector display handle for wasm interop
+ * stride = 6 (3 for point, 3 for vector)
+ */
+export interface VectorDisplayHandle {
+    count: number;
+    vertices: number;
+}
+
+export type DisplayProxyHandle = { variant: "Vector"; data: VectorDisplayHandle } | { variant: "PointList"; data: PointListDisplayHandle };
+
+export type NodeSectionInterop = { type: "section"; content: NodeFolderInterop } | { type: "item"; content: NodeItemInterop };
+
+export interface NodeItemInterop {
+    key: string;
+    name: string;
 }
 
+export type NodeFolderInterop = IndexMap<string, NodeSectionInterop>;
+
+export interface NodeMapInterop {
+    folder: NodeFolderInterop;
+}
+
+/**
+ * Curve interop handle for wasm interop
+ * stride = 3 (x, y, z)
+ */
+export interface CurveInteropHandle {
+    count: number;
+    vertices: number;
+    transform: TransformInterop | undefined;
+}
+
+/**
+ * Interop struct for transform
+ * Represents a 4x4 matrix as a 16-element array
+ */
+export type TransformInterop = number[];
+
 /**
  * Interop struct for node
  */
@@ -107,41 +196,22 @@ export interface NodeMetaInterop {
     hasGeometry: boolean;
 }
 
-export interface EdgeInterop {
-    source: EdgeUnitInterop<OutputId>;
-    destination: EdgeUnitInterop<InputId>;
-    empty: boolean;
-}
-
-export interface EdgeUnitInterop<IO> {
-    node: NodeId;
-    io: IO;
-}
-
-export interface IOInterop {
-    id: string;
-    name: string;
-    accessType: AccessTypes;
-    hint: TypeHint | undefined;
-    connections: string[];
-}
-
-export interface DataTreeInterop {
-    branches: IndexMap<string, string[]>;
-}
-
-export interface DataTreeFormatInterop {
-    outputs: IndexMap<string, string>;
+/**
+ * Interop struct for evaluation results
+ */
+export interface EvaluationInterop {
+    /**
+     * Processed nodes in the latest evaluation
+     */
+    processedNodes: GraphNodeSet[];
+    /**
+     * Geometry identifiers in the latest evaluation
+     */
+    geometryIdentifiers: GeometryIdentifier[];
 }
 
-export type GeometryInteropHandleProxy = { variant: "Mesh"; data: MeshInteropHandle } | { variant: "Curve"; data: CurveInteropHandle } | { variant: "Group"; data: GroupInteropHandle };
-
-export interface MeshInteropHandle {
-    count: number;
-    vertices: number;
-    normals: number;
-    indices: IndicesInteropHandle | undefined;
-    transform: TransformInterop | undefined;
+export interface GroupInteropHandle {
+    objects: GeometryInteropHandleProxy[];
 }
 
 export interface NodeCreationSetting {
@@ -178,36 +248,6 @@ export interface NodePropertyInterop {
     disabled?: boolean;
 }
 
-/**
- * Options for adaptive tessellation to create geometry interoperability
- */
-export interface AdaptiveTessellationOptions {
-    /**
-     * Whether to enable adaptive tessellation
-     */
-    enabled: boolean;
-    /**
-     * Tolerance for the normal vector: if the L2 norm of the normal vectors is below this value, the edge is considered flat
-     */
-    normTolerance: number;
-    /**
-     * Minimum number of divisions in u direction
-     */
-    minDivsU: number;
-    /**
-     * Minimum number of divisions in v direction
-     */
-    minDivsV: number;
-    /**
-     * Minimum depth for division
-     */
-    minDepth: number;
-    /**
-     * Maximum depth for division
-     */
-    maxDepth: number;
-}
-
 export interface NodeConnectionInterop {
     outputNodeId: string;
     outputIndex: number;
@@ -216,58 +256,9 @@ export interface NodeConnectionInterop {
     inputConnectionIndex: number | undefined;
 }
 
-export interface PointListHandleUnit {
-    count: number;
-    points: number;
-}
-
-/**
- * Point display handle for wasm interop
- */
-export interface PointListDisplayHandle {
-    list: PointListHandleUnit[];
-    pointSize: number;
-}
-
-/**
- * Vector display handle for wasm interop
- * stride = 6 (3 for point, 3 for vector)
- */
-export interface VectorDisplayHandle {
+export interface IndicesInteropHandle {
     count: number;
-    vertices: number;
-}
-
-export type DisplayProxyHandle = { variant: "Vector"; data: VectorDisplayHandle } | { variant: "PointList"; data: PointListDisplayHandle };
-
-export interface GeometrySpreadsheet {
-    points: Point3<number>[];
-    curves: CurveProxy[];
-    surfaces: SurfaceProxy[];
-    meshes: MeshInterop[];
-}
-
-export type GeometryInteropVec = GeometryInterop[];
-
-export type NodeConnectionInteropVec = NodeConnectionInterop[];
-
-export type NodePropertyInteropVec = NodePropertyInterop[];
-
-export type NodeInteropVec = NodeInterop[];
-
-export type EdgeInteropVec = EdgeInterop[];
-
-export type NodeSectionInterop = { type: "section"; content: NodeFolderInterop } | { type: "item"; content: NodeItemInterop };
-
-export interface NodeItemInterop {
-    key: string;
-    name: string;
-}
-
-export type NodeFolderInterop = IndexMap<string, NodeSectionInterop>;
-
-export interface NodeMapInterop {
-    folder: NodeFolderInterop;
+    indices: number;
 }
 
 
@@ -302,14 +293,23 @@ export type Transform3<T = number> = FixedLengthArray<T, 16>;
 export type Matrix4<T = number> = FixedLengthArray<FixedLengthArray<T, 4>, 4>;
 
 
-/**
- * Curve interop handle for wasm interop
- * stride = 3 (x, y, z)
- */
-export interface CurveInteropHandle {
-    count: number;
-    vertices: number;
-    transform: TransformInterop | undefined;
+export interface IOInterop {
+    id: string;
+    name: string;
+    accessType: AccessTypes;
+    hint: TypeHint | undefined;
+    connections: string[];
+}
+
+export interface EdgeInterop {
+    source: EdgeUnitInterop<OutputId>;
+    destination: EdgeUnitInterop<InputId>;
+    empty: boolean;
+}
+
+export interface EdgeUnitInterop<IO> {
+    node: NodeId;
+    io: IO;
 }
 
 /**
@@ -334,22 +334,23 @@ export interface GeometryIdentifier {
     transform: TransformInterop;
 }
 
-export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
+export interface NodePropertyCategoryValue {
+    candidates: IndexMap<string, number>;
+    selected: number;
+}
 
-export interface Node<T> {
-    id: NodeId;
-    name: string;
-    label: string | undefined;
-    input: InputIOManager;
-    output: OutputIOManager;
-    entity: T;
-    enabled: boolean;
-    visible: boolean;
+export interface NodePropertyRangeValue {
+    value: number;
+    min: number | undefined;
+    max: number | undefined;
+    step: number | undefined;
 }
 
-export type OutputIOManager = IOManager<OutputId, InputId>;
+export type NodePropertyValue = { type: "Number"; content: number } | { type: "Range"; content: NodePropertyRangeValue } | { type: "Range2d"; content: [NodePropertyRangeValue, NodePropertyRangeValue] } | { type: "String"; content: string } | { type: "Bool"; content: boolean } | { type: "NumberVector"; content: number[] } | { type: "Category"; content: NodePropertyCategoryValue } | { type: "Vector2d"; content: [number, number] } | { type: "Vector3d"; content: [number, number, number] } | { type: "Point2d"; content: [number, number] } | { type: "Point3d"; content: [number, number, number] } | { type: "Points2d"; content: [number, number][] } | { type: "Buffer"; content: number[] };
 
-export type InputIOManager = IOManager<InputId, OutputId>;
+export type TypeHint = Internal;
+
+export type AccessTypes = "Item" | "List" | "Tree";
 
 /**
  * Graph structure
@@ -365,25 +366,51 @@ export interface Graph<T, U> {
     sub_graphs?: IndexMap<SubGraphId, SubGraph<T, U>>;
 }
 
+export interface Prune<T, U> {
+    connectedComponents: ConnectedComponents<T, U>[];
+    bypass: Connection[] | undefined;
+}
+
+export interface Node<T> {
+    id: NodeId;
+    name: string;
+    label: string | undefined;
+    input: InputIOManager;
+    output: OutputIOManager;
+    entity: T;
+    enabled: boolean;
+    visible: boolean;
+}
+
+export type OutputIOManager = IOManager<OutputId, InputId>;
+
+export type InputIOManager = IOManager<InputId, OutputId>;
+
+export interface Connection {
+    source: NodeParameter<OutputId>;
+    destination: NodeParameter<InputId>;
+}
+
+export interface NodeParameter<T> {
+    nodeId: NodeId;
+    parameterId: T;
+    parameterIndex: number;
+}
+
 export interface SubGraphIdSet {
     subGraphId: SubGraphId;
     instanceId: SubGraphInstanceId;
 }
 
-export interface NodePropertyCategoryValue {
-    candidates: Map<string, number>;
-    selected: number;
+export interface ConnectedComponentNode {
+    sources: NodeId[];
+    destinations: NodeId[];
 }
 
-export interface NodePropertyRangeValue {
-    value: number;
-    min: number | undefined;
-    max: number | undefined;
-    step: number | undefined;
+export interface ConnectedComponents<T, U> {
+    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
 }
 
-export type NodePropertyValue = { type: "Number"; content: number } | { type: "Range"; content: NodePropertyRangeValue } | { type: "Range2d"; content: [NodePropertyRangeValue, NodePropertyRangeValue] } | { type: "String"; content: string } | { type: "Bool"; content: boolean } | { type: "NumberVector"; content: number[] } | { type: "Category"; content: NodePropertyCategoryValue } | { type: "Vector2d"; content: [number, number] } | { type: "Vector3d"; content: [number, number, number] } | { type: "Point2d"; content: [number, number] } | { type: "Point3d"; content: [number, number, number] } | { type: "Points2d"; content: [number, number][] } | { type: "Buffer"; content: number[] };
-
 /**
  * Defines the dynamics of an IO parameter.
  */
@@ -395,19 +422,6 @@ export interface IOVariables {
     editable: boolean;
 }
 
-/**
- * A set of node id and instance id
- */
-export interface GraphNodeSet {
-    subGraphIdSet: SubGraphIdSet | undefined;
-    nodeId: NodeId;
-}
-
-export interface Prune<T, U> {
-    connectedComponents: ConnectedComponents<T, U>[];
-    bypass: Connection[] | undefined;
-}
-
 /**
  * A parameter for an input or output of a node.
  */
@@ -419,36 +433,20 @@ export interface IOParameter<T, U> {
     connections: U[];
 }
 
-export interface IOManager<T, U> {
-    parameters: IOParameter<T, U>[];
-}
-
-export interface Connection {
-    source: NodeParameter<OutputId>;
-    destination: NodeParameter<InputId>;
-}
-
-export interface NodeParameter<T> {
+/**
+ * A set of node id and instance id
+ */
+export interface GraphNodeSet {
+    subGraphIdSet: SubGraphIdSet | undefined;
     nodeId: NodeId;
-    parameterId: T;
-    parameterIndex: number;
-}
-
-export interface ConnectedComponentNode {
-    sources: NodeId[];
-    destinations: NodeId[];
 }
 
-export interface ConnectedComponents<T, U> {
-    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
+export interface IOManager<T, U> {
+    parameters: IOParameter<T, U>[];
 }
 
 export type GraphVariant = "Root" | { SubGraph: SubGraphId };
 
-export type TypeHint = Internal;
-
-export type AccessTypes = "Item" | "List" | "Tree";
-
 /**
  * A sub graph is a graph that is a part of a larger graph
  */
@@ -467,6 +465,8 @@ export interface SubGraph<T, U> {
     instances: SubGraphInstanceId[];
 }
 
+export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
+
 
 export type NurbsCurve3D<T = number> = {
     control_points: Point4<T>[];
@@ -871,8 +871,8 @@ export interface InitOutput {
   readonly __externref_table_dealloc: (a: number) => void;
   readonly __externref_drop_slice: (a: number, b: number) => void;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
-  readonly closure865_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure3552_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure874_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure3561_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/index.js

@@ -225,11 +225,11 @@ export function do_nothing_just_tell_wasm_bindgen_to_generate_types() {
 }
 
 function __wbg_adapter_52(arg0, arg1, arg2) {
-    wasm.closure865_externref_shim(arg0, arg1, arg2);
+    wasm.closure874_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_129(arg0, arg1, arg2, arg3) {
-    wasm.closure3552_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure3561_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const ModularFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -643,8 +643,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper3636 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 866, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper3844 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 875, __wbg_adapter_52);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/package.json

@@ -5,7 +5,7 @@
     "Masatatsu Nakamura <masatatsu.nakamura@gmail.com"
   ],
   "description": "Modular is a module project designed to import node graphs created in Nodi in JSON format, enabling the extraction of geometric data generated based on the node graph structure.",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "license": "MIT",
   "repository": {
     "type": "git",