nodi-modular 0.0.31 → 0.0.32

package/index.d.ts

@@ -1,13 +1,13 @@
 /* tslint:disable */
 /* eslint-disable */
 export function do_nothing_just_tell_wasm_bindgen_to_generate_types(): void;
-export type NodeOutput = (Map<string, Item[]> | undefined)[];
-
 export interface GeometryTransformInterop {
     geometry: GeometryProxy;
     transform: TransformInterop;
 }
 
+export type NodeOutput = (Map<string, Item[]> | undefined)[];
+
 /**
  * Evaluation item interoperability type.
  */
@@ -20,6 +20,27 @@ export interface GeometrySpreadsheet {
     meshes: MeshInterop[];
 }
 
+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;
+}
+
+export interface IOInterop {
+    id: string;
+    name: string;
+    accessType: AccessTypes;
+    hint: TypeHint | undefined;
+    connections: string[];
+}
+
 /**
  * Interop struct for evaluation results
  */
@@ -34,95 +55,37 @@ export interface EvaluationInterop {
     geometryIdentifiers: GeometryIdentifier[];
 }
 
-export type GeometryInteropHandleProxy = { variant: "Mesh"; data: MeshInteropHandle } | { variant: "Curve"; data: CurveInteropHandle } | { variant: "Group"; data: GroupInteropHandle };
-
-export interface EdgeInterop {
-    source: EdgeUnitInterop<OutputId>;
-    destination: EdgeUnitInterop<InputId>;
-    empty: boolean;
-}
-
-export interface EdgeUnitInterop<IO> {
-    node: NodeId;
-    io: IO;
-}
-
-export interface GroupInteropHandle {
-    objects: GeometryInteropHandleProxy[];
+export interface MeshInteropHandle {
+    count: number;
+    vertices: number;
+    normals: number;
+    indices: IndicesInteropHandle | undefined;
+    transform: TransformInterop | undefined;
 }
 
-export interface NodeCreationSetting {
-    id: NodeId;
-    variant: string;
-    name?: string;
-    label?: string;
-    inputs?: number;
-    outputs?: number;
-    properties: NodePropertyInterop[];
-    enabled?: boolean;
-    visible?: boolean;
+export interface PointListHandleUnit {
+    count: number;
+    points: number;
 }
 
 /**
- * Options for adaptive tessellation to create geometry interoperability
+ * Point display handle for wasm interop
  */
-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;
-    inputNodeId: string;
-    inputIndex: number;
-    inputConnectionIndex: number | undefined;
-}
-
-export interface IndicesInteropHandle {
-    count: number;
-    indices: number;
+export interface PointListDisplayHandle {
+    list: PointListHandleUnit[];
+    pointSize: number;
 }
 
 /**
- * Curve interop handle for wasm interop
- * stride = 3 (x, y, z)
+ * Vector display handle for wasm interop
+ * stride = 6 (3 for point, 3 for vector)
  */
-export interface CurveInteropHandle {
+export interface VectorDisplayHandle {
     count: number;
     vertices: number;
-    transform: TransformInterop | undefined;
 }
 
-export interface IOInterop {
-    id: string;
-    name: string;
-    accessType: AccessTypes;
-    hint: TypeHint | undefined;
-    connections: string[];
-}
+export type DisplayProxyHandle = { variant: "Vector"; data: VectorDisplayHandle } | { variant: "PointList"; data: PointListDisplayHandle };
 
 /**
  * Interop struct for node
@@ -189,49 +152,39 @@ export interface NodeMetaInterop {
     hasGeometry: boolean;
 }
 
-export interface MeshInteropHandle {
-    count: number;
-    vertices: number;
-    normals: number;
-    indices: IndicesInteropHandle | undefined;
-    transform: TransformInterop | undefined;
-}
+export type GeometryInteropHandleProxy = { variant: "Mesh"; data: MeshInteropHandle } | { variant: "Curve"; data: CurveInteropHandle } | { variant: "Group"; data: GroupInteropHandle };
 
-export interface PointListHandleUnit {
-    count: number;
-    points: number;
+export interface EdgeInterop {
+    source: EdgeUnitInterop<OutputId>;
+    destination: EdgeUnitInterop<InputId>;
+    empty: boolean;
 }
 
-/**
- * Point display handle for wasm interop
- */
-export interface PointListDisplayHandle {
-    list: PointListHandleUnit[];
-    pointSize: number;
+export interface EdgeUnitInterop<IO> {
+    node: NodeId;
+    io: IO;
 }
 
 /**
- * Vector display handle for wasm interop
- * stride = 6 (3 for point, 3 for vector)
+ * Geometry identifier
  */
-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;
+export interface GeometryIdentifier {
+    /**
+     * Parent node ID
+     */
+    graphNodeSet?: GraphNodeSet;
+    /**
+     * Output ID that the geometry is belonged to
+     */
+    outputId: OutputId;
+    /**
+     * Geometry ID
+     */
+    geometryId: ID<GeometryProxy>;
+    /**
+     * Transform matrix in interop format
+     */
+    transform: TransformInterop;
 }
 
 
@@ -266,28 +219,6 @@ export type Transform3<T = number> = FixedLengthArray<T, 16>;
 export type Matrix4<T = number> = FixedLengthArray<FixedLengthArray<T, 4>, 4>;
 
 
-/**
- * Geometry identifier
- */
-export interface GeometryIdentifier {
-    /**
-     * Parent node ID
-     */
-    graphNodeSet?: GraphNodeSet;
-    /**
-     * Output ID that the geometry is belonged to
-     */
-    outputId: OutputId;
-    /**
-     * Geometry ID
-     */
-    geometryId: ID<GeometryProxy>;
-    /**
-     * Transform matrix in interop format
-     */
-    transform: TransformInterop;
-}
-
 export type GeometryInteropVec = GeometryInterop[];
 
 export type NodeConnectionInteropVec = NodeConnectionInterop[];
@@ -334,6 +265,75 @@ export interface NodePropertyInterop {
  */
 export type TransformInterop = number[];
 
+export interface GroupInteropHandle {
+    objects: GeometryInteropHandleProxy[];
+}
+
+export interface NodeCreationSetting {
+    id: NodeId;
+    variant: string;
+    name?: string;
+    label?: string;
+    inputs?: number;
+    outputs?: number;
+    properties: NodePropertyInterop[];
+    enabled?: boolean;
+    visible?: 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;
+    inputNodeId: string;
+    inputIndex: number;
+    inputConnectionIndex: number | undefined;
+}
+
+export interface IndicesInteropHandle {
+    count: number;
+    indices: number;
+}
+
+/**
+ * Curve interop handle for wasm interop
+ * stride = 3 (x, y, z)
+ */
+export interface CurveInteropHandle {
+    count: number;
+    vertices: number;
+    transform: TransformInterop | undefined;
+}
+
 export interface NodePropertyCategoryValue {
     candidates: IndexMap<string, number>;
     selected: number;
@@ -350,8 +350,65 @@ export type NodePropertyValue = { type: "Number"; content: number } | { type: "R
 
 export type TypeHint = Internal;
 
+export interface Prune<T, U> {
+    connectedComponents: ConnectedComponents<T, U>[];
+    bypass: Connection[] | undefined;
+}
+
+export interface ConnectedComponentNode {
+    sources: NodeId[];
+    destinations: NodeId[];
+}
+
+export interface ConnectedComponents<T, U> {
+    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
+}
+
+/**
+ * A parameter for an input or output of a node.
+ */
+export interface IOParameter<T, U> {
+    id: T;
+    name: string;
+    access_type: AccessTypes;
+    hint?: TypeHint;
+    connections: U[];
+}
+
 export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
 
+export interface Connection {
+    source: NodeParameter<OutputId>;
+    destination: NodeParameter<InputId>;
+}
+
+export interface NodeParameter<T> {
+    nodeId: NodeId;
+    parameterId: T;
+    parameterIndex: number;
+}
+
+export interface IOManager<T, U> {
+    parameters: IOParameter<T, U>[];
+}
+
+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 type GraphVariant = "Root" | { SubGraph: SubGraphId };
+
 /**
  * A sub graph is a graph that is a part of a larger graph
  */
@@ -370,47 +427,6 @@ export interface SubGraph<T, U> {
     instances: SubGraphInstanceId[];
 }
 
-export interface Prune<T, U> {
-    connectedComponents: ConnectedComponents<T, U>[];
-    bypass: Connection[] | undefined;
-}
-
-export type GraphVariant = "Root" | { SubGraph: SubGraphId };
-
-/**
- * A parameter for an input or output of a node.
- */
-export interface IOParameter<T, U> {
-    id: T;
-    name: string;
-    access_type: AccessTypes;
-    hint?: TypeHint;
-    connections: U[];
-}
-
-/**
- * Graph structure
- */
-export interface Graph<T, U> {
-    /**
-     * Nodes in the graph
-     */
-    nodes: IndexMap<NodeId, Node<T, U>>;
-    /**
-     * nested graphs
-     */
-    sub_graphs?: IndexMap<SubGraphId, SubGraph<T, U>>;
-}
-
-export interface ConnectedComponentNode {
-    sources: NodeId[];
-    destinations: NodeId[];
-}
-
-export interface ConnectedComponents<T, U> {
-    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
-}
-
 export interface SubGraphIdSet {
     subGraphId: SubGraphId;
     instanceId: SubGraphInstanceId;
@@ -435,46 +451,27 @@ export interface GraphNodeSet {
     nodeId: NodeId;
 }
 
-export type AccessTypes = "Item" | "List" | "Tree";
-
-export interface IOManager<T, U> {
-    parameters: IOParameter<T, U>[];
-}
-
-export interface Node<T> {
-    id: NodeId;
-    name: string;
-    label: string | undefined;
-    input: InputIOManager;
-    output: OutputIOManager;
-    entity: T;
-    enabled: boolean;
-    visible: boolean;
+/**
+ * Graph structure
+ */
+export interface Graph<T, U> {
+    /**
+     * Nodes in the graph
+     */
+    nodes: IndexMap<NodeId, Node<T, U>>;
+    /**
+     * nested graphs
+     */
+    sub_graphs?: IndexMap<SubGraphId, SubGraph<T, U>>;
 }
 
-export type OutputIOManager = IOManager<OutputId, InputId>;
-
-export type InputIOManager = IOManager<InputId, OutputId>;
-
-export interface Connection {
-    source: NodeParameter<OutputId>;
-    destination: NodeParameter<InputId>;
-}
+export type AccessTypes = "Item" | "List" | "Tree";
 
-export interface NodeParameter<T> {
-    nodeId: NodeId;
-    parameterId: T;
-    parameterIndex: number;
+export interface Domain {
+    min: number;
+    max: number;
 }
 
-
-export type PolylineCurve2D = {
-    points: Point2[];
-};
-export type PolylineCurve3D = {
-    points: Point3[];
-};
-
 /**
  * An oriented box in 3D space
  */
@@ -489,11 +486,6 @@ export interface OrientedBox {
     bounds: BoundingBox3D;
 }
 
-/**
- * A collection of geometry objects
- */
-export type Group = GeometryTransform[];
-
 /**
  * A face of a mesh with three vertices
  */
@@ -503,6 +495,28 @@ export interface MeshTriangleFace {
     c: number;
 }
 
+/**
+ * A circular surface
+ */
+export interface CircularSurface {
+    /**
+     * The base plane of the circle
+     */
+    plane: Plane;
+    /**
+     * The radius of the circle
+     */
+    radius: number;
+}
+
+
+export type PolylineCurve2D = {
+    points: Point2[];
+};
+export type PolylineCurve3D = {
+    points: Point3[];
+};
+
 /**
  * An arc curve in 3D space
  */
@@ -539,6 +553,11 @@ export interface PointCloudInterop {
     transform: Transform3<number>;
 }
 
+/**
+ * Interop proxy for various geometry types
+ */
+export type GeometryInterop = { variant: "Mesh"; data: MeshInterop } | { variant: "Curve"; data: CurveInterop } | { variant: "Point"; data: PointCloudInterop } | { variant: "Plane"; data: Plane } | { variant: "Group"; data: GeometryInterop[] };
+
 /**
  * Geometry proxy for various geometry types
  */
@@ -551,20 +570,6 @@ export type PolyCurve = CompoundCurve<number, U4>;
  */
 export type CurveProxy = { variant: "Line"; data: LineCurve3D } | { variant: "Arc"; data: ArcCurve } | { variant: "Circle"; data: CircleCurve } | { variant: "Ellipse"; data: EllipseCurve } | { variant: "Rectangle"; data: RectangleCurve } | { variant: "Polyline"; data: PolylineCurve3D } | { variant: "NURBS"; data: NurbsCurve } | { variant: "Poly"; data: PolyCurve };
 
-/**
- * A circle curve in 3D space
- */
-export interface CircleCurve {
-    /**
-     * The base plane of the circle
-     */
-    plane: Plane;
-    /**
-     * The radius of the circle
-     */
-    radius: number;
-}
-
 
 export type NurbsSurface3D<T = number> = {
     control_points: Point4<T>[][];
@@ -575,52 +580,32 @@ export type NurbsSurface3D<T = number> = {
 };
 
 /**
- * A surface defined by three points
+ * A NURBS surface container
  */
-export type TriangleSurface = Triangle3D;
+export type NurbsSurface = NurbsSurface3D<number>;
 
 /**
- * A surface defined by a plane and two domains in x and y directions
+ * A ellipse curve in 3D space
  */
-export interface PlaneSurface {
+export interface EllipseCurve {
     /**
-     * The base plane of the surface
+     * The base plane of the ellipse
      */
     plane: Plane;
     /**
-     * The domain in x direction
+     * The x radius of the ellipse
      */
-    x: Domain;
+    xRadius: number;
     /**
-     * The domain in y direction
+     * The y radius of the ellipse
      */
-    y: Domain;
+    yRadius: number;
 }
 
 /**
- * A NURBS surface container
- */
-export type NurbsSurface = NurbsSurface3D<number>;
-
-/**
- * A circular surface
+ * A surface defined by three points
  */
-export interface CircularSurface {
-    /**
-     * The base plane of the circle
-     */
-    plane: Plane;
-    /**
-     * The radius of the circle
-     */
-    radius: number;
-}
-
-
-export type BoundingBox3D = {
-    min: Vector3;
-    max: Vector3;
-};
+export type TriangleSurface = Triangle3D;
 
 
 export type Triangle3D = {
@@ -655,6 +640,20 @@ export interface MeshInterop {
     transform?: Transform3<number>;
 }
 
+/**
+ * Interop struct for curve data
+ */
+export interface CurveInterop {
+    /**
+     * Vertices of the curve
+     */
+    vertices: [number, number, number][];
+    /**
+     * Transform matrix of the curve
+     */
+    transform: Transform3<number> | undefined;
+}
+
 /**
  * Mesh representation with vertices, normals, uv, and index
  */
@@ -678,17 +677,21 @@ export interface Mesh {
 }
 
 /**
- * Interop struct for curve data
+ * A rectangle curve in 3D space
  */
-export interface CurveInterop {
+export interface RectangleCurve {
     /**
-     * Vertices of the curve
+     * The base plane of the rectangle
      */
-    vertices: [number, number, number][];
+    plane: Plane;
     /**
-     * Transform matrix of the curve
+     * The domain of the rectangle in the plane x axis
      */
-    transform: Transform3<number> | undefined;
+    x: Domain;
+    /**
+     * The domain of the rectangle in the plane y axis
+     */
+    y: Domain;
 }
 
 
@@ -704,16 +707,6 @@ export type NurbsCurve3D<T = number> = {
     degree: T;
 };
 
-export interface Domain {
-    min: number;
-    max: number;
-}
-
-/**
- * Interop proxy for various geometry types
- */
-export type GeometryInterop = { variant: "Mesh"; data: MeshInterop } | { variant: "Curve"; data: CurveInterop } | { variant: "Point"; data: PointCloudInterop } | { variant: "Plane"; data: Plane } | { variant: "Group"; data: GeometryInterop[] };
-
 /**
  * Plane representation with origin, normal, x axis, and y axis
  */
@@ -756,41 +749,48 @@ export interface GeometryTransform {
 export type SurfaceProxy = { variant: "Circular"; data: CircularSurface } | { variant: "Triangle"; data: TriangleSurface } | { variant: "Plane"; data: PlaneSurface } | { variant: "NURBS"; data: NurbsSurface } | { variant: "Trimmed"; data: TrimmedSurface };
 
 /**
- * A rectangle curve in 3D space
+ * A surface defined by a plane and two domains in x and y directions
  */
-export interface RectangleCurve {
+export interface PlaneSurface {
     /**
-     * The base plane of the rectangle
+     * The base plane of the surface
      */
     plane: Plane;
     /**
-     * The domain of the rectangle in the plane x axis
+     * The domain in x direction
      */
     x: Domain;
     /**
-     * The domain of the rectangle in the plane y axis
+     * The domain in y direction
      */
     y: Domain;
 }
 
 export type NurbsCurve = NurbsCurve3D<number>;
 
+
+export type BoundingBox3D = {
+    min: Vector3;
+    max: Vector3;
+};
+
 /**
- * A ellipse curve in 3D space
+ * A collection of geometry objects
  */
-export interface EllipseCurve {
+export type Group = GeometryTransform[];
+
+/**
+ * A circle curve in 3D space
+ */
+export interface CircleCurve {
     /**
-     * The base plane of the ellipse
+     * The base plane of the circle
      */
     plane: Plane;
     /**
-     * The x radius of the ellipse
-     */
-    xRadius: number;
-    /**
-     * The y radius of the ellipse
+     * The radius of the circle
      */
-    yRadius: number;
+    radius: number;
 }
 
 /**
@@ -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 closure893_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure3806_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure896_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure3794_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.closure893_externref_shim(arg0, arg1, arg2);
+    wasm.closure896_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_129(arg0, arg1, arg2, arg3) {
-    wasm.closure3806_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure3794_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const ModularFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -425,10 +425,10 @@ function __wbg_get_imports() {
         const ret = Object.entries(arg0);
         return ret;
     };
-    imports.wbg.__wbg_getRandomValues_3c9c0d586e575a16 = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_getRandomValues_38a1ff1ea09f6cc7 = function() { return handleError(function (arg0, arg1) {
         globalThis.crypto.getRandomValues(getArrayU8FromWasm0(arg0, arg1));
     }, arguments) };
-    imports.wbg.__wbg_getRandomValues_e14bd3de0db61032 = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_getRandomValues_3c9c0d586e575a16 = function() { return handleError(function (arg0, arg1) {
         globalThis.crypto.getRandomValues(getArrayU8FromWasm0(arg0, arg1));
     }, arguments) };
     imports.wbg.__wbg_getTime_46267b1c24877e30 = function(arg0) {
@@ -643,8 +643,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper4049 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 894, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper4036 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 897, __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.31",
+  "version": "0.0.32",
   "license": "MIT",
   "repository": {
     "type": "git",