nodi-modular 0.0.32 → 0.0.33

package/index.d.ts

@@ -1,18 +1,18 @@
 /* tslint:disable */
 /* eslint-disable */
 export function do_nothing_just_tell_wasm_bindgen_to_generate_types(): void;
-export interface GeometryTransformInterop {
-    geometry: GeometryProxy;
-    transform: TransformInterop;
-}
-
-export type NodeOutput = (Map<string, Item[]> | undefined)[];
-
 /**
  * Evaluation item interoperability type.
  */
 export type Item = { variant: "Bool"; data: boolean } | { variant: "String"; data: string } | { variant: "Number"; data: number } | { variant: "Domain"; data: Domain } | { variant: "Vector3"; data: Vector3<number> } | { variant: "Matrix4"; data: Matrix4<number> } | { variant: "Complex"; data: Complex<number> } | { variant: "Point3"; data: Point3<number> } | { variant: "Plane"; data: Plane } | { variant: "GeometryTransform"; data: GeometryTransformInterop } | { variant: "MeshFace"; data: MeshTriangleFace };
 
+export type NodeOutput = (Map<string, Item[]> | undefined)[];
+
+export interface GeometryTransformInterop {
+    geometry: GeometryProxy;
+    transform: TransformInterop;
+}
+
 export interface GeometrySpreadsheet {
     points: Point3<number>[];
     curves: CurveProxy[];
@@ -334,6 +334,8 @@ export interface CurveInteropHandle {
     transform: TransformInterop | undefined;
 }
 
+export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
+
 export interface NodePropertyCategoryValue {
     candidates: IndexMap<string, number>;
     selected: number;
@@ -355,13 +357,24 @@ export interface Prune<T, U> {
     bypass: Connection[] | undefined;
 }
 
-export interface ConnectedComponentNode {
-    sources: NodeId[];
-    destinations: NodeId[];
-}
+export type GraphVariant = "Root" | { SubGraph: SubGraphId };
 
-export interface ConnectedComponents<T, U> {
-    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
+/**
+ * A sub graph is a graph that is a part of a larger graph
+ */
+export interface SubGraph<T, U> {
+    /**
+     * The id of the sub graph
+     */
+    id: SubGraphId;
+    /**
+     * The graph of the sub graph
+     */
+    graph: Graph<T, U>;
+    /**
+     * The instances of the sub graph
+     */
+    instances: SubGraphInstanceId[];
 }
 
 /**
@@ -375,56 +388,18 @@ export interface IOParameter<T, U> {
     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
+ * Graph structure
  */
-export interface SubGraph<T, U> {
-    /**
-     * The id of the sub graph
-     */
-    id: SubGraphId;
+export interface Graph<T, U> {
     /**
-     * The graph of the sub graph
+     * Nodes in the graph
      */
-    graph: Graph<T, U>;
+    nodes: IndexMap<NodeId, Node<T, U>>;
     /**
-     * The instances of the sub graph
+     * nested graphs
      */
-    instances: SubGraphInstanceId[];
+    sub_graphs?: IndexMap<SubGraphId, SubGraph<T, U>>;
 }
 
 export interface SubGraphIdSet {
@@ -451,94 +426,54 @@ export interface GraphNodeSet {
     nodeId: NodeId;
 }
 
-/**
- * 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 AccessTypes = "Item" | "List" | "Tree";
+
+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 interface Node<T> {
+    id: NodeId;
+    name: string;
+    label: string | undefined;
+    input: InputIOManager;
+    output: OutputIOManager;
+    entity: T;
+    enabled: boolean;
+    visible: boolean;
 }
 
-/**
- * An oriented box in 3D space
- */
-export interface OrientedBox {
-    /**
-     * The plane that the box is aligned to
-     */
-    plane: Plane;
-    /**
-     * The bounding box in the local coordinate system
-     */
-    bounds: BoundingBox3D;
+export type OutputIOManager = IOManager<OutputId, InputId>;
+
+export type InputIOManager = IOManager<InputId, OutputId>;
+
+export interface ConnectedComponentNode {
+    sources: NodeId[];
+    destinations: NodeId[];
 }
 
-/**
- * A face of a mesh with three vertices
- */
-export interface MeshTriangleFace {
-    a: number;
-    b: number;
-    c: number;
+export interface ConnectedComponents<T, U> {
+    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
 }
 
-/**
- * A circular surface
- */
-export interface CircularSurface {
-    /**
-     * The base plane of the circle
-     */
-    plane: Plane;
-    /**
-     * The radius of the circle
-     */
-    radius: number;
+export interface IOManager<T, U> {
+    parameters: IOParameter<T, U>[];
 }
 
 
-export type PolylineCurve2D = {
-    points: Point2[];
-};
-export type PolylineCurve3D = {
-    points: Point3[];
+export type NurbsCurve3D<T = number> = {
+    control_points: Point4<T>[];
+    knots: T[];
+    degree: T;
 };
 
-/**
- * An arc curve in 3D space
- */
-export interface ArcCurve {
-    /**
-     * The base plane of the arc
-     */
-    plane: Plane;
-    /**
-     * The start angle of the arc
-     */
-    startAngle: number;
-    /**
-     * The end angle of the arc
-     */
-    endAngle: number;
-    /**
-     * The radius of the arc
-     */
-    radius: number;
-}
-
 /**
  * Interop struct for point cloud data
  */
@@ -553,59 +488,19 @@ 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
- */
-export type GeometryProxy = { variant: "Curve"; data: CurveProxy } | { variant: "Surface"; data: SurfaceProxy } | { variant: "Brep"; data: Brep } | { variant: "Mesh"; data: Mesh } | { variant: "BBox"; data: OrientedBox } | { variant: "Group"; data: Group };
-
 export type PolyCurve = CompoundCurve<number, U4>;
 
+export type NurbsCurve = NurbsCurve3D<number>;
+
 /**
  * Proxy for various curve types
  */
 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 };
 
-
-export type NurbsSurface3D<T = number> = {
-    control_points: Point4<T>[][];
-    u_knots: T[];
-    v_knots: T[];
-    u_degree: T;
-    v_degree: T;
-};
-
-/**
- * A NURBS surface container
- */
-export type NurbsSurface = NurbsSurface3D<number>;
-
 /**
- * A ellipse curve in 3D space
- */
-export interface EllipseCurve {
-    /**
-     * The base plane of the ellipse
-     */
-    plane: Plane;
-    /**
-     * The x radius of the ellipse
-     */
-    xRadius: number;
-    /**
-     * The y radius of the ellipse
-     */
-    yRadius: number;
-}
-
-/**
- * A surface defined by three points
+ * Proxy for various surface types
  */
-export type TriangleSurface = Triangle3D;
+export type SurfaceProxy = { variant: "Circular"; data: CircularSurface } | { variant: "Triangle"; data: TriangleSurface } | { variant: "Plane"; data: PlaneSurface } | { variant: "NURBS"; data: NurbsSurface } | { variant: "Trimmed"; data: TrimmedSurface };
 
 
 export type Triangle3D = {
@@ -640,6 +535,11 @@ export interface MeshInterop {
     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[] };
+
 /**
  * Interop struct for curve data
  */
@@ -676,24 +576,6 @@ export interface Mesh {
     index: [number, number, number][];
 }
 
-/**
- * A rectangle curve in 3D space
- */
-export interface RectangleCurve {
-    /**
-     * The base plane of the rectangle
-     */
-    plane: Plane;
-    /**
-     * The domain of the rectangle in the plane x axis
-     */
-    x: Domain;
-    /**
-     * The domain of the rectangle in the plane y axis
-     */
-    y: Domain;
-}
-
 
 export type LineCurve3D = {
     a: Point3;
@@ -701,12 +583,19 @@ export type LineCurve3D = {
 };
 
 
-export type NurbsCurve3D<T = number> = {
-    control_points: Point4<T>[];
-    knots: T[];
-    degree: T;
+export type NurbsSurface3D<T = number> = {
+    control_points: Point4<T>[][];
+    u_knots: T[];
+    v_knots: T[];
+    u_degree: T;
+    v_degree: T;
 };
 
+export interface Domain {
+    min: number;
+    max: number;
+}
+
 /**
  * Plane representation with origin, normal, x axis, and y axis
  */
@@ -729,6 +618,20 @@ export interface Plane {
     yAxis: Vector3<number>;
 }
 
+/**
+ * An oriented box in 3D space
+ */
+export interface OrientedBox {
+    /**
+     * The plane that the box is aligned to
+     */
+    plane: Plane;
+    /**
+     * The bounding box in the local coordinate system
+     */
+    bounds: BoundingBox3D;
+}
+
 /**
  * A geometry object with a transformation
  */
@@ -744,9 +647,77 @@ export interface GeometryTransform {
 }
 
 /**
- * Proxy for various surface types
+ * Geometry proxy for various geometry types
  */
-export type SurfaceProxy = { variant: "Circular"; data: CircularSurface } | { variant: "Triangle"; data: TriangleSurface } | { variant: "Plane"; data: PlaneSurface } | { variant: "NURBS"; data: NurbsSurface } | { variant: "Trimmed"; data: TrimmedSurface };
+export type GeometryProxy = { variant: "Curve"; data: CurveProxy } | { variant: "Surface"; data: SurfaceProxy } | { variant: "Brep"; data: Brep } | { variant: "Mesh"; data: Mesh } | { variant: "BBox"; data: OrientedBox } | { variant: "Group"; data: Group };
+
+/**
+ * A surface defined by three points
+ */
+export type TriangleSurface = Triangle3D;
+
+/**
+ * A NURBS surface container
+ */
+export type NurbsSurface = NurbsSurface3D<number>;
+
+/**
+ * A rectangle curve in 3D space
+ */
+export interface RectangleCurve {
+    /**
+     * The base plane of the rectangle
+     */
+    plane: Plane;
+    /**
+     * The domain of the rectangle in the plane x axis
+     */
+    x: Domain;
+    /**
+     * The domain of the rectangle in the plane y axis
+     */
+    y: Domain;
+}
+
+/**
+ * A ellipse curve in 3D space
+ */
+export interface EllipseCurve {
+    /**
+     * The base plane of the ellipse
+     */
+    plane: Plane;
+    /**
+     * The x radius of the ellipse
+     */
+    xRadius: number;
+    /**
+     * The y radius of the ellipse
+     */
+    yRadius: number;
+}
+
+/**
+ * An arc curve in 3D space
+ */
+export interface ArcCurve {
+    /**
+     * The base plane of the arc
+     */
+    plane: Plane;
+    /**
+     * The start angle of the arc
+     */
+    startAngle: number;
+    /**
+     * The end angle of the arc
+     */
+    endAngle: number;
+    /**
+     * The radius of the arc
+     */
+    radius: number;
+}
 
 /**
  * A surface defined by a plane and two domains in x and y directions
@@ -766,18 +737,19 @@ export interface PlaneSurface {
     y: Domain;
 }
 
-export type NurbsCurve = NurbsCurve3D<number>;
-
-
-export type BoundingBox3D = {
-    min: Vector3;
-    max: Vector3;
-};
-
 /**
- * A collection of geometry objects
+ * A circular surface
  */
-export type Group = GeometryTransform[];
+export interface CircularSurface {
+    /**
+     * The base plane of the circle
+     */
+    plane: Plane;
+    /**
+     * The radius of the circle
+     */
+    radius: number;
+}
 
 /**
  * A circle curve in 3D space
@@ -793,6 +765,34 @@ export interface CircleCurve {
     radius: number;
 }
 
+
+export type PolylineCurve2D = {
+    points: Point2[];
+};
+export type PolylineCurve3D = {
+    points: Point3[];
+};
+
+
+export type BoundingBox3D = {
+    min: Vector3;
+    max: Vector3;
+};
+
+/**
+ * A collection of geometry objects
+ */
+export type Group = GeometryTransform[];
+
+/**
+ * A face of a mesh with three vertices
+ */
+export interface MeshTriangleFace {
+    a: number;
+    b: number;
+    c: number;
+}
+
 /**
  * Modular structure with a graph handle
  */
@@ -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 closure896_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure3794_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure901_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure3815_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.closure896_externref_shim(arg0, arg1, arg2);
+    wasm.closure901_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_129(arg0, arg1, arg2, arg3) {
-    wasm.closure3794_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure3815_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_wrapper4036 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 897, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper4059 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 902, __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.32",
+  "version": "0.0.33",
   "license": "MIT",
   "repository": {
     "type": "git",