nodi-modular 0.0.16 → 0.0.18

package/index.d.ts

@@ -1,6 +1,11 @@
 /* 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)[];
 
 /**
@@ -8,11 +13,6 @@ export type NodeOutput = (Map<string, Item[]> | undefined)[];
  */
 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 interface GeometryTransformInterop {
-    geometry: GeometryProxy;
-    transform: TransformInterop;
-}
-
 /**
  * Interop struct for node
  */
@@ -334,12 +334,6 @@ export interface NodeMapInterop {
     folder: NodeFolderInterop;
 }
 
-export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
-
-export interface IOManager<T, U> {
-    parameters: IOParameter<T, U>[];
-}
-
 /**
  * Graph structure
  */
@@ -359,29 +353,9 @@ export interface Prune<T, U> {
     bypass: Connection[] | undefined;
 }
 
-/**
- * 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[];
-}
-
-/**
- * Defines the dynamics of an IO parameter.
- */
-export interface IOVariables {
-    minCount: number;
-    maxCount: number;
-    defaultCount: number;
-    offset: number;
-    editable: boolean;
-}
+export type GraphMappingTypes = "None" | "Bezier" | "Linear" | "Sine";
 
-export type TypeHint = Internal;
+export type GraphVariant = "Root" | { SubGraph: SubGraphId };
 
 /**
  * A sub graph is a graph that is a part of a larger graph
@@ -401,6 +375,30 @@ export interface SubGraph<T, U> {
     instances: SubGraphInstanceId[];
 }
 
+/**
+ * Defines the dynamics of an IO parameter.
+ */
+export interface IOVariables {
+    minCount: number;
+    maxCount: number;
+    defaultCount: number;
+    offset: number;
+    editable: boolean;
+}
+
+/**
+ * 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 TypeHint = Internal;
+
 export interface Node<T> {
     id: NodeId;
     name: string;
@@ -416,6 +414,15 @@ export type OutputIOManager = IOManager<OutputId, InputId>;
 
 export type InputIOManager = IOManager<InputId, OutputId>;
 
+export interface ConnectedComponentNode {
+    sources: NodeId[];
+    destinations: NodeId[];
+}
+
+export interface ConnectedComponents<T, U> {
+    nodes: IndexMap<NodeId, ConnectedComponentNode<T, U>>;
+}
+
 export interface Connection {
     source: NodeParameter<OutputId>;
     destination: NodeParameter<InputId>;
@@ -427,17 +434,6 @@ export interface NodeParameter<T> {
     parameterIndex: number;
 }
 
-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;
@@ -467,54 +463,41 @@ export interface GraphNodeSet {
 
 export type AccessTypes = "Item" | "List" | "Tree";
 
-
-export type LineCurve3D = {
-    a: Point3;
-    b: Point3;
-};
-
-
-export type PolylineCurve2D = {
-    points: Point2[];
-};
-export type PolylineCurve3D = {
-    points: Point3[];
-};
-
-/**
- * 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 IOManager<T, U> {
+    parameters: IOParameter<T, U>[];
+}
 
 /**
- * Mesh representation with vertices, normals, uv, and index
+ * An oriented box in 3D space
  */
-export interface Mesh {
+export interface OrientedBox {
     /**
-     * Vertices of the mesh
+     * The plane that the box is aligned to
      */
-    vertices: Point3<number>[];
+    plane: Plane;
     /**
-     * Normals of the mesh
+     * The bounding box in the local coordinate system
      */
-    normals: Vector3<number>[] | undefined;
+    bounds: BoundingBox3D;
+}
+
+/**
+ * A circular surface
+ */
+export interface CircularSurface {
     /**
-     * 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;
 }
 
-/**
- * A face of a mesh with three vertices
- */
-export interface MeshTriangleFace {
-    a: number;
-    b: number;
-    c: number;
+export interface Domain {
+    min: number;
+    max: number;
 }
 
 /**
@@ -532,66 +515,59 @@ export interface PointCloudInterop {
 }
 
 /**
- * A surface defined by three points
+ * Plane representation with origin, normal, x axis, and y axis
  */
-export type TriangleSurface = Triangle3D;
-
-export type PolyCurve = CompoundCurve<number, U4>;
+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 curve types
+ * A collection of geometry objects
  */
-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 Group = GeometryTransform[];
 
 /**
- * Interop struct for curve data
+ * A face of a mesh with three vertices
  */
-export interface CurveInterop {
-    /**
-     * Vertices of the curve
-     */
-    vertices: [number, number, number][];
-    /**
-     * Transform matrix of the curve
-     */
-    transform: Transform3<number> | undefined;
+export interface MeshTriangleFace {
+    a: number;
+    b: number;
+    c: number;
 }
 
 /**
- * A surface defined by a plane and two domains in x and y directions
+ * A geometry object with a transformation
  */
-export interface PlaneSurface {
-    /**
-     * The base plane of the surface
-     */
-    plane: Plane;
+export interface GeometryTransform {
     /**
-     * The domain in x direction
+     * The handle to the geometry object
      */
-    x: Domain;
+    geometry: Handle<GeometryProxy>;
     /**
-     * The domain in y direction
+     * Transformation matrix of the geometry
      */
-    y: Domain;
+    transform: Transform3<number>;
 }
 
 /**
- * A ellipse curve in 3D space
+ * Proxy for various curve types
  */
-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;
-}
+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 Triangle3D = {
@@ -626,6 +602,29 @@ export interface MeshInterop {
     transform?: Transform3<number>;
 }
 
+/**
+ * A surface defined by three points
+ */
+export type TriangleSurface = Triangle3D;
+
+/**
+ * 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 rectangle curve in 3D space
  */
@@ -645,19 +644,36 @@ export interface RectangleCurve {
 }
 
 /**
- * A circle curve in 3D space
+ * Interop proxy for various geometry types
  */
-export interface CircleCurve {
+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 {
     /**
-     * The base plane of the circle
+     * Vertices of the curve
      */
-    plane: Plane;
+    vertices: [number, number, number][];
     /**
-     * The radius of the circle
+     * Transform matrix of the curve
      */
-    radius: number;
+    transform: Transform3<number> | undefined;
 }
 
+/**
+ * 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 };
+
+/**
+ * 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 PolyCurve = CompoundCurve<number, U4>;
+
 /**
  * An arc curve in 3D space
  */
@@ -680,78 +696,93 @@ export interface ArcCurve {
     radius: number;
 }
 
+
+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;
+};
+
 /**
- * Plane representation with origin, normal, x axis, and y axis
+ * Mesh representation with vertices, normals, uv, and index
  */
-export interface Plane {
+export interface Mesh {
     /**
-     * Origin coordinate of the plane
+     * Vertices of the mesh
      */
-    origin: Point3<number>;
+    vertices: Point3<number>[];
     /**
-     * Normal vector of the plane
+     * Normals of the mesh
      */
-    normal: Vector3<number>;
+    normals: Vector3<number>[] | undefined;
     /**
-     * X axis of the plane
+     * UV coordinates of the mesh
      */
-    xAxis: Vector3<number>;
+    uv: Vector2<number>[] | undefined;
     /**
-     * Y axis of the plane
+     * Index of the mesh
      */
-    yAxis: Vector3<number>;
+    index: [number, number, number][];
 }
 
 /**
- * An oriented box in 3D space
+ * A NURBS surface container
  */
-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 NurbsSurface = NurbsSurface3D<number>;
+
+export type NurbsCurve = NurbsCurve3D<number>;
 
 /**
- * A geometry object with a transformation
+ * A ellipse curve in 3D space
  */
-export interface GeometryTransform {
+export interface EllipseCurve {
     /**
-     * The handle to the geometry object
+     * The base plane of the ellipse
      */
-    geometry: Handle<GeometryProxy>;
+    plane: Plane;
     /**
-     * Transformation matrix of the geometry
+     * The x radius of the ellipse
      */
-    transform: Transform3<number>;
+    xRadius: number;
+    /**
+     * The y radius of the ellipse
+     */
+    yRadius: 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 NurbsCurve3D<T = number> = {
-    control_points: Point4<T>[];
-    knots: T[];
-    degree: T;
+export type LineCurve3D = {
+    a: Point3;
+    b: Point3;
 };
 
 
-export type BoundingBox3D = {
-    min: Vector3;
-    max: Vector3;
+export type PolylineCurve2D = {
+    points: Point2[];
+};
+export type PolylineCurve3D = {
+    points: Point3[];
 };
 
 /**
- * A circular surface
+ * A circle curve in 3D space
  */
-export interface CircularSurface {
+export interface CircleCurve {
     /**
      * The base plane of the circle
      */
@@ -762,37 +793,6 @@ export interface CircularSurface {
     radius: number;
 }
 
-export type NurbsCurve = NurbsCurve3D<number>;
-
-
-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;
-}
-
-/**
- * A collection of geometry objects
- */
-export type Group = GeometryTransform[];
-
-/**
- * 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 };
-
-/**
- * A NURBS surface container
- */
-export type NurbsSurface = NurbsSurface3D<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 closure839_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure3513_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure851_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure3512_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.closure839_externref_shim(arg0, arg1, arg2);
+    wasm.closure851_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_145(arg0, arg1, arg2, arg3) {
-    wasm.closure3513_externref_shim(arg0, arg1, arg2, arg3);
+    wasm.closure3512_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const ModularFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -685,8 +685,8 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper3519 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 840, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper3565 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 852, __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.16",
+  "version": "0.0.18",
   "license": "MIT",
   "repository": {
     "type": "git",