nodi-modular 0.0.21 → 0.0.22

package/index.d.ts

@@ -372,11 +372,6 @@ export interface GraphNodeSet {
     nodeId: NodeId;
 }
 
-export interface Prune<T, U> {
-    connectedComponents: ConnectedComponents<T, U>[];
-    bypass: Connection[] | undefined;
-}
-
 export interface ConnectedComponentNode {
     sources: NodeId[];
     destinations: NodeId[];
@@ -397,6 +392,20 @@ export interface IOParameter<T, U> {
     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 IOManager<T, U> {
     parameters: IOParameter<T, U>[];
 }
@@ -447,31 +456,130 @@ export interface NodeParameter<T> {
 
 export type GraphVariant = "Root" | { SubGraph: SubGraphId };
 
+export interface Prune<T, U> {
+    connectedComponents: ConnectedComponents<T, U>[];
+    bypass: Connection[] | undefined;
+}
+
+export type TypeHint = Internal;
+
+export type AccessTypes = "Item" | "List" | "Tree";
+
+export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
+
+
+export type LineCurve3D = {
+    a: Point3;
+    b: Point3;
+};
+
+
+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 type BoundingBox3D = {
+    min: Vector3;
+    max: Vector3;
+};
+
 /**
- * Graph structure
+ * Interop struct for curve data
  */
-export interface Graph<T, U> {
+export interface CurveInterop {
     /**
-     * Nodes in the graph
+     * Vertices of the curve
      */
-    nodes: IndexMap<NodeId, Node<T, U>>;
+    vertices: [number, number, number][];
     /**
-     * nested graphs
+     * Transform matrix of the curve
      */
-    sub_graphs?: IndexMap<SubGraphId, SubGraph<T, U>>;
+    transform: Transform3<number> | undefined;
 }
 
-export type TypeHint = Internal;
+/**
+ * A collection of geometry objects
+ */
+export type Group = GeometryTransform[];
 
-export type AccessTypes = "Item" | "List" | "Tree";
+/**
+ * Mesh representation with vertices, normals, uv, and index
+ */
+export interface Mesh {
+    /**
+     * Vertices of the mesh
+     */
+    vertices: Point3<number>[];
+    /**
+     * Normals of the mesh
+     */
+    normals: Vector3<number>[] | undefined;
+    /**
+     * UV coordinates of the mesh
+     */
+    uv: Vector2<number>[] | undefined;
+    /**
+     * Index of the mesh
+     */
+    index: [number, number, number][];
+}
 
-export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
+/**
+ * A face of a mesh with three vertices
+ */
+export interface MeshTriangleFace {
+    a: number;
+    b: number;
+    c: number;
+}
 
-export interface Domain {
-    min: number;
-    max: number;
+/**
+ * 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;
 }
 
+export type NurbsCurve = NurbsCurve3D<number>;
+
+/**
+ * A surface defined by three points
+ */
+export type TriangleSurface = Triangle3D;
+
+/**
+ * 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 PolylineCurve2D = {
     points: Point2[];
@@ -622,42 +730,35 @@ export interface OrientedBox {
 }
 
 /**
- * A collection of geometry objects
- */
-export type Group = GeometryTransform[];
-
-/**
- * A face of a mesh with three vertices
+ * Interop proxy for various geometry types
  */
-export interface MeshTriangleFace {
-    a: number;
-    b: number;
-    c: number;
-}
+export type GeometryInterop = { variant: "Mesh"; data: MeshInterop } | { variant: "Curve"; data: CurveInterop } | { variant: "Point"; data: PointCloudInterop } | { variant: "Plane"; data: Plane } | { variant: "Group"; data: GeometryInterop[] };
 
 /**
- * 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 surface defined by three points
+ * Geometry proxy for various geometry types
  */
-export type TriangleSurface = Triangle3D;
+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 };
+export type PolyCurve = CompoundCurve<number, U4>;
+
+export interface Domain {
+    min: number;
+    max: number;
+}
 
 /**
  * Interop struct for point cloud data
@@ -678,121 +779,20 @@ export interface PointCloudInterop {
  */
 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 LineCurve3D = {
-    a: Point3;
-    b: Point3;
-};
-
-
-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 type BoundingBox3D = {
-    min: Vector3;
-    max: Vector3;
-};
-
-/**
- * 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
- */
-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
- */
-export interface Mesh {
-    /**
-     * Vertices of the mesh
-     */
-    vertices: Point3<number>[];
-    /**
-     * Normals of the mesh
-     */
-    normals: Vector3<number>[] | undefined;
-    /**
-     * UV coordinates of the mesh
-     */
-    uv: Vector2<number>[] | undefined;
-    /**
-     * Index of the mesh
-     */
-    index: [number, number, number][];
-}
-
-/**
- * A NURBS surface container
- */
-export type NurbsSurface = NurbsSurface3D<number>;
-
-/**
- * A rectangle curve in 3D space
+ * A circular surface
  */
-export interface RectangleCurve {
+export interface CircularSurface {
     /**
-     * The base plane of the rectangle
+     * The base plane of the circle
      */
     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 NurbsCurve = NurbsCurve3D<number>;
-
-/**
- * A geometry object with a transformation
- */
-export interface GeometryTransform {
-    /**
-     * The handle to the geometry object
-     */
-    geometry: Handle<GeometryProxy>;
-    /**
-     * Transformation matrix of the geometry
+     * The radius of the circle
      */
-    transform: Transform3<number>;
+    radius: 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 };
-
-export type PolyCurve = CompoundCurve<number, U4>;
-
 /**
  * Modular structure with a graph handle
  */
@@ -871,7 +871,7 @@ 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 closure861_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure862_externref_shim: (a: number, b: number, c: any) => void;
   readonly closure3520_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }

package/index.js

@@ -225,7 +225,7 @@ export function do_nothing_just_tell_wasm_bindgen_to_generate_types() {
 }
 
 function __wbg_adapter_52(arg0, arg1, arg2) {
-    wasm.closure861_externref_shim(arg0, arg1, arg2);
+    wasm.closure862_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_129(arg0, arg1, arg2, arg3) {
@@ -643,8 +643,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper3621 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 862, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper3617 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 863, __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.21",
+  "version": "0.0.22",
   "license": "MIT",
   "repository": {
     "type": "git",