nodi-modular 0.0.33 → 0.0.34

package/index.d.ts

@@ -357,24 +357,31 @@ export interface Prune<T, U> {
     bypass: Connection[] | undefined;
 }
 
+export interface ConnectedComponentNode {
+    sources: NodeId[];
+    destinations: NodeId[];
+}
+
+export interface ConnectedComponents<T, U> {
+    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
+}
+
 export type GraphVariant = "Root" | { SubGraph: SubGraphId };
 
+export interface SubGraphIdSet {
+    subGraphId: SubGraphId;
+    instanceId: SubGraphInstanceId;
+}
+
 /**
- * A sub graph is a graph that is a part of a larger graph
+ * Defines the dynamics of an IO parameter.
  */
-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[];
+export interface IOVariables {
+    minCount: number;
+    maxCount: number;
+    defaultCount: number;
+    offset: number;
+    editable: boolean;
 }
 
 /**
@@ -388,6 +395,14 @@ export interface IOParameter<T, U> {
     connections: U[];
 }
 
+/**
+ * A set of node id and instance id
+ */
+export interface GraphNodeSet {
+    subGraphIdSet: SubGraphIdSet | undefined;
+    nodeId: NodeId;
+}
+
 /**
  * Graph structure
  */
@@ -402,41 +417,24 @@ export interface Graph<T, U> {
     sub_graphs?: IndexMap<SubGraphId, SubGraph<T, U>>;
 }
 
-export interface SubGraphIdSet {
-    subGraphId: SubGraphId;
-    instanceId: SubGraphInstanceId;
-}
-
-/**
- * Defines the dynamics of an IO parameter.
- */
-export interface IOVariables {
-    minCount: number;
-    maxCount: number;
-    defaultCount: number;
-    offset: number;
-    editable: boolean;
-}
+export type AccessTypes = "Item" | "List" | "Tree";
 
 /**
- * A set of node id and instance id
+ * A sub graph is a graph that is a part of a larger graph
  */
-export interface GraphNodeSet {
-    subGraphIdSet: SubGraphIdSet | undefined;
-    nodeId: NodeId;
-}
-
-export type AccessTypes = "Item" | "List" | "Tree";
-
-export interface Connection {
-    source: NodeParameter<OutputId>;
-    destination: NodeParameter<InputId>;
-}
-
-export interface NodeParameter<T> {
-    nodeId: NodeId;
-    parameterId: T;
-    parameterIndex: number;
+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[];
 }
 
 export interface Node<T> {
@@ -454,13 +452,15 @@ export type OutputIOManager = IOManager<OutputId, InputId>;
 
 export type InputIOManager = IOManager<InputId, OutputId>;
 
-export interface ConnectedComponentNode {
-    sources: NodeId[];
-    destinations: NodeId[];
+export interface Connection {
+    source: NodeParameter<OutputId>;
+    destination: NodeParameter<InputId>;
 }
 
-export interface ConnectedComponents<T, U> {
-    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
+export interface NodeParameter<T> {
+    nodeId: NodeId;
+    parameterId: T;
+    parameterIndex: number;
 }
 
 export interface IOManager<T, U> {
@@ -468,10 +468,9 @@ export interface IOManager<T, U> {
 }
 
 
-export type NurbsCurve3D<T = number> = {
-    control_points: Point4<T>[];
-    knots: T[];
-    degree: T;
+export type LineCurve3D = {
+    a: Point3;
+    b: Point3;
 };
 
 /**
@@ -488,57 +487,93 @@ export interface PointCloudInterop {
     transform: Transform3<number>;
 }
 
-export type PolyCurve = CompoundCurve<number, U4>;
-
-export type NurbsCurve = NurbsCurve3D<number>;
-
 /**
- * Proxy for various curve types
+ * Plane representation with origin, normal, x axis, and y axis
  */
-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 interface Plane {
+    /**
+     * Origin coordinate of the plane
+     */
+    origin: Point3<number>;
+    /**
+     * Normal vector of the plane
+     */
+    normal: Vector3<number>;
+    /**
+     * X axis of the plane
+     */
+    xAxis: Vector3<number>;
+    /**
+     * Y axis of the plane
+     */
+    yAxis: Vector3<number>;
+}
 
 /**
  * Proxy for various surface 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 Triangle3D = {
-    a: Point3;
-    b: Point3;
-    c: Point3;
-};
-
 /**
- * Interop struct for mesh data
+ * A rectangle curve in 3D space
  */
-export interface MeshInterop {
+export interface RectangleCurve {
     /**
-     * Vertices of the mesh
+     * The base plane of the rectangle
      */
-    vertices: [number, number, number][];
+    plane: Plane;
     /**
-     * Normals of the mesh
+     * The domain of the rectangle in the plane x axis
      */
-    normals: [number, number, number][];
+    x: Domain;
     /**
-     * UV coordinates of the mesh
+     * The domain of the rectangle in the plane y axis
      */
-    uv?: [number, number][];
+    y: Domain;
+}
+
+/**
+ * An arc curve in 3D space
+ */
+export interface ArcCurve {
     /**
-     * Faces of the mesh
+     * The base plane of the arc
      */
-    faces?: [number, number, number][];
+    plane: Plane;
     /**
-     * Transform matrix of the mesh
+     * The start angle of the arc
      */
-    transform?: Transform3<number>;
+    startAngle: number;
+    /**
+     * The end angle of the arc
+     */
+    endAngle: number;
+    /**
+     * The radius of the arc
+     */
+    radius: number;
 }
 
 /**
- * Interop proxy for various geometry types
+ * Geometry 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[] };
+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 };
+
+/**
+ * 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 };
+
+/**
+ * A surface defined by three points
+ */
+export type TriangleSurface = Triangle3D;
+
+
+export type BoundingBox3D = {
+    min: Vector3;
+    max: Vector3;
+};
 
 /**
  * Interop struct for curve data
@@ -555,31 +590,39 @@ export interface CurveInterop {
 }
 
 /**
- * Mesh representation with vertices, normals, uv, and index
+ * A circular surface
  */
-export interface Mesh {
+export interface CircularSurface {
     /**
-     * Vertices of the mesh
+     * The base plane of the circle
      */
-    vertices: Point3<number>[];
+    plane: Plane;
     /**
-     * Normals of the mesh
+     * The radius of the circle
      */
-    normals: Vector3<number>[] | undefined;
+    radius: number;
+}
+
+/**
+ * A circle curve in 3D space
+ */
+export interface CircleCurve {
     /**
-     * UV coordinates of the mesh
+     * The base plane of the circle
      */
-    uv: Vector2<number>[] | undefined;
+    plane: Plane;
     /**
-     * Index of the mesh
+     * The radius of the circle
      */
-    index: [number, number, number][];
+    radius: number;
 }
 
 
-export type LineCurve3D = {
-    a: Point3;
-    b: Point3;
+export type PolylineCurve2D = {
+    points: Point2[];
+};
+export type PolylineCurve3D = {
+    points: Point3[];
 };
 
 
@@ -591,33 +634,6 @@ export type NurbsSurface3D<T = number> = {
     v_degree: T;
 };
 
-export interface Domain {
-    min: number;
-    max: number;
-}
-
-/**
- * Plane representation with origin, normal, x axis, and y axis
- */
-export interface Plane {
-    /**
-     * Origin coordinate of the plane
-     */
-    origin: Point3<number>;
-    /**
-     * Normal vector of the plane
-     */
-    normal: Vector3<number>;
-    /**
-     * X axis of the plane
-     */
-    xAxis: Vector3<number>;
-    /**
-     * Y axis of the plane
-     */
-    yAxis: Vector3<number>;
-}
-
 /**
  * An oriented box in 3D space
  */
@@ -632,53 +648,11 @@ export interface OrientedBox {
     bounds: BoundingBox3D;
 }
 
-/**
- * A geometry object with a transformation
- */
-export interface GeometryTransform {
-    /**
-     * The handle to the geometry object
-     */
-    geometry: Handle<GeometryProxy>;
-    /**
-     * Transformation matrix of the geometry
-     */
-    transform: Transform3<number>;
-}
-
-/**
- * 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 };
-
-/**
- * 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
  */
@@ -697,101 +671,127 @@ export interface EllipseCurve {
     yRadius: number;
 }
 
+export interface Domain {
+    min: number;
+    max: number;
+}
+
 /**
- * An arc curve in 3D space
+ * A collection of geometry objects
  */
-export interface ArcCurve {
+export type Group = GeometryTransform[];
+
+/**
+ * A face of a mesh with three vertices
+ */
+export interface MeshTriangleFace {
+    a: number;
+    b: number;
+    c: number;
+}
+
+
+export type NurbsCurve3D<T = number> = {
+    control_points: Point4<T>[];
+    knots: T[];
+    degree: T;
+};
+
+
+export type Triangle3D = {
+    a: Point3;
+    b: Point3;
+    c: Point3;
+};
+
+/**
+ * Interop struct for mesh data
+ */
+export interface MeshInterop {
     /**
-     * The base plane of the arc
+     * Vertices of the mesh
      */
-    plane: Plane;
+    vertices: [number, number, number][];
     /**
-     * The start angle of the arc
+     * Normals of the mesh
      */
-    startAngle: number;
+    normals: [number, number, number][];
     /**
-     * The end angle of the arc
+     * UV coordinates of the mesh
      */
-    endAngle: number;
+    uv?: [number, number][];
     /**
-     * The radius of the arc
+     * Faces of the mesh
      */
-    radius: number;
+    faces?: [number, number, number][];
+    /**
+     * Transform matrix of the mesh
+     */
+    transform?: Transform3<number>;
 }
 
 /**
- * A surface defined by a plane and two domains in x and y directions
+ * Interop proxy for various geometry types
  */
-export interface PlaneSurface {
+export type GeometryInterop = { variant: "Mesh"; data: MeshInterop } | { variant: "Curve"; data: CurveInterop } | { variant: "Point"; data: PointCloudInterop } | { variant: "Plane"; data: Plane } | { variant: "Group"; data: GeometryInterop[] };
+
+/**
+ * Mesh representation with vertices, normals, uv, and index
+ */
+export interface Mesh {
     /**
-     * The base plane of the surface
+     * Vertices of the mesh
      */
-    plane: Plane;
+    vertices: Point3<number>[];
     /**
-     * The domain in x direction
+     * Normals of the mesh
      */
-    x: Domain;
+    normals: Vector3<number>[] | undefined;
     /**
-     * The domain in y direction
+     * UV coordinates of the mesh
      */
-    y: Domain;
+    uv: Vector2<number>[] | undefined;
+    /**
+     * Index of the mesh
+     */
+    index: [number, number, number][];
 }
 
 /**
- * A circular surface
+ * A geometry object with a transformation
  */
-export interface CircularSurface {
+export interface GeometryTransform {
     /**
-     * The base plane of the circle
+     * The handle to the geometry object
      */
-    plane: Plane;
+    geometry: Handle<GeometryProxy>;
     /**
-     * The radius of the circle
+     * Transformation matrix of the geometry
      */
-    radius: number;
+    transform: Transform3<number>;
 }
 
 /**
- * A circle curve in 3D space
+ * A surface defined by a plane and two domains in x and y directions
  */
-export interface CircleCurve {
+export interface PlaneSurface {
     /**
-     * The base plane of the circle
+     * The base plane of the surface
      */
     plane: Plane;
     /**
-     * The radius of the circle
+     * The domain in x direction
      */
-    radius: number;
+    x: Domain;
+    /**
+     * The domain in y direction
+     */
+    y: Domain;
 }
 
+export type PolyCurve = CompoundCurve<number, U4>;
 
-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;
-}
+export type NurbsCurve = NurbsCurve3D<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 closure901_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure3815_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure902_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure3818_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.closure901_externref_shim(arg0, arg1, arg2);
+    wasm.closure902_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_129(arg0, arg1, arg2, arg3) {
-    wasm.closure3815_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure3818_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_wrapper4059 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 902, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper4056 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 903, __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.33",
+  "version": "0.0.34",
   "license": "MIT",
   "repository": {
     "type": "git",