nodi-modular 0.0.25 → 0.0.26

package/index.d.ts

@@ -334,11 +334,6 @@ export interface GeometryIdentifier {
     transform: TransformInterop;
 }
 
-export interface Prune<T, U> {
-    connectedComponents: ConnectedComponents<T, U>[];
-    bypass: Connection[] | undefined;
-}
-
 export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
 
 export interface Node<T> {
@@ -356,6 +351,20 @@ export type OutputIOManager = IOManager<OutputId, InputId>;
 
 export type InputIOManager = IOManager<InputId, OutputId>;
 
+/**
+ * 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 SubGraphIdSet {
     subGraphId: SubGraphId;
     instanceId: SubGraphInstanceId;
@@ -394,6 +403,11 @@ export interface GraphNodeSet {
     nodeId: NodeId;
 }
 
+export interface Prune<T, U> {
+    connectedComponents: ConnectedComponents<T, U>[];
+    bypass: Connection[] | undefined;
+}
+
 /**
  * A parameter for an input or output of a node.
  */
@@ -405,20 +419,6 @@ 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>[];
 }
@@ -468,6 +468,65 @@ export interface SubGraph<T, U> {
 }
 
 
+export type NurbsCurve3D<T = number> = {
+    control_points: Point4<T>[];
+    knots: T[];
+    degree: T;
+};
+
+/**
+ * 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[] };
+
+/**
+ * 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>;
+}
+
+export type PolyCurve = CompoundCurve<number, U4>;
+
+export type NurbsCurve = NurbsCurve3D<number>;
+
+/**
+ * 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;
+}
+
+/**
+ * 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;
+
+/**
+ * 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[];
 };
@@ -563,14 +622,72 @@ export interface ArcCurve {
 }
 
 /**
- * A surface defined by three points
+ * An oriented box in 3D space
  */
-export type TriangleSurface = Triangle3D;
+export interface OrientedBox {
+    /**
+     * The plane that the box is aligned to
+     */
+    plane: Plane;
+    /**
+     * The bounding box in the local coordinate system
+     */
+    bounds: BoundingBox3D;
+}
 
 /**
- * Proxy for various curve types
+ * A circular surface
  */
-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 CircularSurface {
+    /**
+     * The base plane of the circle
+     */
+    plane: Plane;
+    /**
+     * The radius of the circle
+     */
+    radius: 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>;
+}
+
+/**
+ * A surface defined by a plane and two domains in x and y directions
+ */
+export interface PlaneSurface {
+    /**
+     * The base plane of the surface
+     */
+    plane: Plane;
+    /**
+     * The domain in x direction
+     */
+    x: Domain;
+    /**
+     * The domain in y direction
+     */
+    y: Domain;
+}
 
 
 export type LineCurve3D = {
@@ -579,13 +696,6 @@ 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[];
@@ -600,10 +710,10 @@ export type BoundingBox3D = {
     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[] };
+export interface Domain {
+    min: number;
+    max: number;
+}
 
 /**
  * Interop struct for curve data
@@ -641,24 +751,6 @@ export interface Mesh {
     index: [number, number, number][];
 }
 
-/**
- * A surface defined by a plane and two domains in x and y directions
- */
-export interface PlaneSurface {
-    /**
-     * The base plane of the surface
-     */
-    plane: Plane;
-    /**
-     * The domain in x direction
-     */
-    x: Domain;
-    /**
-     * The domain in y direction
-     */
-    y: Domain;
-}
-
 /**
  * A NURBS surface container
  */
@@ -682,84 +774,6 @@ export interface RectangleCurve {
     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
-     */
-    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 };
-
-export type PolyCurve = CompoundCurve<number, U4>;
-
-/**
- * A circular surface
- */
-export interface CircularSurface {
-    /**
-     * The base plane of the circle
-     */
-    plane: Plane;
-    /**
-     * The radius of the circle
-     */
-    radius: number;
-}
-
-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
- */
-export interface OrientedBox {
-    /**
-     * The plane that the box is aligned to
-     */
-    plane: Plane;
-    /**
-     * The bounding box in the local coordinate system
-     */
-    bounds: BoundingBox3D;
-}
-
 /**
  * Interop struct for point cloud data
  */
@@ -774,20 +788,6 @@ export interface PointCloudInterop {
     transform: Transform3<number>;
 }
 
-/**
- * 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;
-}
-
 /**
  * Proxy for various surface types
  */
@@ -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 closure864_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure3548_externref_shim: (a: number, b: number, c: any, d: any) => 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 __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.closure864_externref_shim(arg0, arg1, arg2);
+    wasm.closure865_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_129(arg0, arg1, arg2, arg3) {
-    wasm.closure3548_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure3552_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_wrapper3641 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 865, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper3636 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 866, __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.25",
+  "version": "0.0.26",
   "license": "MIT",
   "repository": {
     "type": "git",