refactor(modeling): changed imports to directly import from single fi…

…les when possible (#1267)
jscad · Jul 2, 2023 · 639d7af · 639d7af
1 parent 6e50bb6
commit 639d7af
Show file tree

Hide file tree

Showing 68 changed files with 35,109 additions and 1,271 deletions.
diff --git a/packages/modeling/dist/jscad-modeling.es.js b/packages/modeling/dist/jscad-modeling.es.js
diff --git a/packages/modeling/dist/jscad-modeling.min.js b/packages/modeling/dist/jscad-modeling.min.js
diff --git a/packages/modeling/package.json b/packages/modeling/package.json
@@ -14,7 +14,7 @@
     "coverage": "nyc --all --reporter=html --reporter=text npm test",
     "test": "ava 'src/**/*.test.js' --verbose --timeout 2m",
     "test:tsd": "tsd",
-    "version": "npm run build && git add dist"
+    "version": "pnpm run build && git add dist"
   },
   "contributors": [
     {

diff --git a/packages/modeling/src/colors/colorize.js b/packages/modeling/src/colors/colorize.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as geom2 from '../geometries/geom2/index.js'
 import * as geom3 from '../geometries/geom3/index.js'

diff --git a/packages/modeling/src/colors/hslToRgb.js b/packages/modeling/src/colors/hslToRgb.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import { hueToColorComponent } from './hueToColorComponent.js'
 

diff --git a/packages/modeling/src/colors/hsvToRgb.js b/packages/modeling/src/colors/hsvToRgb.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 /**
  * Converts HSV color values to RGB color values.

diff --git a/packages/modeling/src/colors/rgbToHex.js b/packages/modeling/src/colors/rgbToHex.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 /**
  * Convert the given RGB color values to CSS color notation (string)

diff --git a/packages/modeling/src/colors/rgbToHsl.js b/packages/modeling/src/colors/rgbToHsl.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 /**
  * Converts an RGB color value to HSL.

diff --git a/packages/modeling/src/colors/rgbToHsv.js b/packages/modeling/src/colors/rgbToHsv.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 /**
  * Converts an RGB color value to HSV.

diff --git a/packages/modeling/src/connectors/transformationBetween.js b/packages/modeling/src/connectors/transformationBetween.js
@@ -3,7 +3,7 @@ import * as plane from '../maths/plane/index.js'
 import * as vec2 from '../maths/vec2/index.js'
 import * as vec3 from '../maths/vec3/index.js'
 
-import { OrthonormalFormula } from '../maths/utils/index.js'
+import { OrthonormalFormula } from '../maths/utils/OrthonormalFormula.js'
 
 import { transform } from './transform.js'
 

diff --git a/packages/modeling/src/geometries/geom2/validate.js b/packages/modeling/src/geometries/geom2/validate.js
@@ -1,5 +1,6 @@
 import * as vec2 from '../../maths/vec2/index.js'
-import { intersect } from '../../maths/utils/index.js'
+
+import { intersect } from '../../maths/utils/intersect.js'
 
 import { isA } from './isA.js'
 import { toOutlines } from './toOutlines.js'

diff --git a/packages/modeling/src/geometries/poly2/isSimple.js b/packages/modeling/src/geometries/poly2/isSimple.js
@@ -1,4 +1,4 @@
-import { intersect } from '../../maths/utils/index.js'
+import { intersect } from '../../maths/utils/intersect.js'
 
 /**
  * Check whether the given polygon is simple, i.e. does not intersect itself.

diff --git a/packages/modeling/src/geometries/poly2/measureArea.js b/packages/modeling/src/geometries/poly2/measureArea.js
@@ -1,4 +1,4 @@
-import { area } from '../../maths/utils/index.js'
+import { area } from '../../maths/utils/area.js'
 
 /**
  * Measure the area under the given polygon.

diff --git a/packages/modeling/src/measurements/measureAggregateArea.js b/packages/modeling/src/measurements/measureAggregateArea.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import { measureArea } from './measureArea.js'
 

diff --git a/packages/modeling/src/measurements/measureAggregateBoundingBox.js b/packages/modeling/src/measurements/measureAggregateBoundingBox.js
@@ -1,4 +1,5 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
+
 import * as vec3 from '../maths/vec3/index.js'
 
 import { measureBoundingBox } from './measureBoundingBox.js'

diff --git a/packages/modeling/src/measurements/measureAggregateEpsilon.js b/packages/modeling/src/measurements/measureAggregateEpsilon.js
@@ -1,6 +1,8 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
-import { geom2, geom3, path2 } from '../geometries/index.js'
+import * as geom2 from '../geometries/geom2/index.js'
+import * as geom3 from '../geometries/geom3/index.js'
+import * as path2 from '../geometries/path2/index.js'
 
 import { measureAggregateBoundingBox } from './measureAggregateBoundingBox.js'
 import { calculateEpsilonFromBounds } from './calculateEpsilonFromBounds.js'

diff --git a/packages/modeling/src/measurements/measureAggregateVolume.js b/packages/modeling/src/measurements/measureAggregateVolume.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import { measureVolume } from './measureVolume.js'
 

diff --git a/packages/modeling/src/measurements/measureArea.js b/packages/modeling/src/measurements/measureArea.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as geom2 from '../geometries/geom2/index.js'
 import * as geom3 from '../geometries/geom3/index.js'

diff --git a/packages/modeling/src/measurements/measureBoundingBox.js b/packages/modeling/src/measurements/measureBoundingBox.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as vec2 from '../maths/vec2/index.js'
 import * as vec3 from '../maths/vec3/index.js'

diff --git a/packages/modeling/src/measurements/measureBoundingSphere.js b/packages/modeling/src/measurements/measureBoundingSphere.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as vec2 from '../maths/vec2/index.js'
 import * as vec3 from '../maths/vec3/index.js'

diff --git a/packages/modeling/src/measurements/measureCenter.js b/packages/modeling/src/measurements/measureCenter.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import { measureBoundingBox } from './measureBoundingBox.js'
 

diff --git a/packages/modeling/src/measurements/measureCenterOfMass.js b/packages/modeling/src/measurements/measureCenterOfMass.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as vec3 from '../maths/vec3/index.js'
 

diff --git a/packages/modeling/src/measurements/measureDimensions.js b/packages/modeling/src/measurements/measureDimensions.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import { measureBoundingBox } from './measureBoundingBox.js'
 

diff --git a/packages/modeling/src/measurements/measureEpsilon.js b/packages/modeling/src/measurements/measureEpsilon.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as geom2 from '../geometries/geom2/index.js'
 import * as geom3 from '../geometries/geom3/index.js'

diff --git a/packages/modeling/src/measurements/measureVolume.js b/packages/modeling/src/measurements/measureVolume.js
@@ -1,4 +1,4 @@
-import { flatten } from '../utils/index.js'
+import { flatten } from '../utils/flatten.js'
 
 import * as geom2 from '../geometries/geom2/index.js'
 import * as geom3 from '../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/booleans/intersect.js b/packages/modeling/src/operations/booleans/intersect.js
@@ -1,4 +1,5 @@
-import { areAllShapesTheSameType, flatten } from '../../utils/index.js'
+import { areAllShapesTheSameType } from '../../utils/areAllShapesTheSameType.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/booleans/intersectGeom2.js b/packages/modeling/src/operations/booleans/intersectGeom2.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import { INTERSECTION } from './martinez/operation.js'
 import { boolean } from './martinez/index.js'

diff --git a/packages/modeling/src/operations/booleans/intersectGeom3.js b/packages/modeling/src/operations/booleans/intersectGeom3.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import { retessellate } from '../modifiers/retessellate.js'
 

diff --git a/packages/modeling/src/operations/booleans/mayOverlap.js b/packages/modeling/src/operations/booleans/mayOverlap.js
@@ -1,6 +1,7 @@
 import { EPS } from '../../maths/constants.js'
 
-import { measureBoundingBox } from '../../measurements/index.js'
+import { measureBoundingBox } from '../../measurements/measureBoundingBox.js'
+
 
 /*
  * Determine if the given geometries overlap by comparing min and max bounds.

diff --git a/packages/modeling/src/operations/booleans/scission.js b/packages/modeling/src/operations/booleans/scission.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom3 from '../../geometries/geom3/index.js'
 

diff --git a/packages/modeling/src/operations/booleans/scissionGeom3.js b/packages/modeling/src/operations/booleans/scissionGeom3.js
@@ -1,6 +1,6 @@
 import * as vec3 from '../../maths/vec3/index.js'
 
-import { measureEpsilon } from '../../measurements/index.js'
+import { measureEpsilon } from '../../measurements/measureEpsilon.js'
 
 import * as geom3 from '../../geometries/geom3/index.js'
 

diff --git a/packages/modeling/src/operations/booleans/subtract.js b/packages/modeling/src/operations/booleans/subtract.js
@@ -1,4 +1,5 @@
-import { areAllShapesTheSameType, flatten } from '../../utils/index.js'
+import { areAllShapesTheSameType } from '../../utils/areAllShapesTheSameType.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/booleans/subtractGeom2.js b/packages/modeling/src/operations/booleans/subtractGeom2.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import { DIFFERENCE } from './martinez/operation.js'
 import { boolean } from './martinez/index.js'

diff --git a/packages/modeling/src/operations/booleans/subtractGeom3.js b/packages/modeling/src/operations/booleans/subtractGeom3.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import { retessellate } from '../modifiers/retessellate.js'
 

diff --git a/packages/modeling/src/operations/booleans/union.js b/packages/modeling/src/operations/booleans/union.js
@@ -1,4 +1,5 @@
-import { areAllShapesTheSameType, flatten } from '../../utils/index.js'
+import { areAllShapesTheSameType } from '../../utils/areAllShapesTheSameType.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/booleans/unionGeom2.js b/packages/modeling/src/operations/booleans/unionGeom2.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import { UNION } from './martinez/operation.js'
 import { boolean } from './martinez/index.js'

diff --git a/packages/modeling/src/operations/booleans/unionGeom3.js b/packages/modeling/src/operations/booleans/unionGeom3.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import { retessellate } from '../modifiers/retessellate.js'
 

diff --git a/packages/modeling/src/operations/expansions/expand.js b/packages/modeling/src/operations/expansions/expand.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/expansions/expandGeom3.js b/packages/modeling/src/operations/expansions/expandGeom3.js
@@ -1,6 +1,6 @@
 import * as geom3 from '../../geometries/geom3/index.js'
 
-import { union } from '../booleans/index.js'
+import { union } from '../booleans/union.js'
 
 import { expandShell } from './expandShell.js'
 

diff --git a/packages/modeling/src/operations/expansions/expandPath2.js b/packages/modeling/src/operations/expansions/expandPath2.js
@@ -1,4 +1,4 @@
-import { area } from '../../maths/utils/index.js'
+import { area } from '../../maths/utils/area.js'
 
 import * as vec2 from '../../maths/vec2/index.js'
 

diff --git a/packages/modeling/src/operations/expansions/expandShell.js b/packages/modeling/src/operations/expansions/expandShell.js
@@ -3,12 +3,12 @@ import { EPS, TAU } from '../../maths/constants.js'
 import * as mat4 from '../../maths/mat4/index.js'
 import * as vec3 from '../../maths/vec3/index.js'
 
-import { fnNumberSort } from '../../utils/index.js'
+import { fnNumberSort } from '../../utils/fnNumberSort.js'
 
 import * as geom3 from '../../geometries/geom3/index.js'
 import * as poly3 from '../../geometries/poly3/index.js'
 
-import { sphere } from '../../primitives/index.js'
+import { sphere } from '../../primitives/sphere.js'
 
 import { retessellate } from '../modifiers/retessellate.js'
 

diff --git a/packages/modeling/src/operations/expansions/offset.js b/packages/modeling/src/operations/expansions/offset.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as path2 from '../../geometries/path2/index.js'

diff --git a/packages/modeling/src/operations/expansions/offsetFromPoints.js b/packages/modeling/src/operations/expansions/offsetFromPoints.js
@@ -1,6 +1,7 @@
 import { EPS, TAU } from '../../maths/constants.js'
 
-import { area, intersect } from '../../maths/utils/index.js'
+import { area } from '../../maths/utils/area.js'
+import { intersect } from '../../maths/utils/intersect.js'
 
 import * as line2 from '../../maths/line2/index.js'
 import * as vec2 from '../../maths/vec2/index.js'

diff --git a/packages/modeling/src/operations/extrusions/extrudeLinear.js b/packages/modeling/src/operations/extrusions/extrudeLinear.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as path2 from '../../geometries/path2/index.js'

diff --git a/packages/modeling/src/operations/extrusions/extrudeRectangular.js b/packages/modeling/src/operations/extrusions/extrudeRectangular.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as path2 from '../../geometries/path2/index.js'

diff --git a/packages/modeling/src/operations/extrusions/extrudeRectangularGeom2.js b/packages/modeling/src/operations/extrusions/extrudeRectangularGeom2.js
@@ -1,9 +1,9 @@
-import { area } from '../../maths/utils/index.js'
+import { area } from '../../maths/utils/area.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as path2 from '../../geometries/path2/index.js'
 
-import { expand } from '../expansions/index.js'
+import { expand } from '../expansions/expand.js'
 
 import { extrudeLinearGeom2 } from './extrudeLinearGeom2.js'
 

diff --git a/packages/modeling/src/operations/extrusions/extrudeRectangularPath2.js b/packages/modeling/src/operations/extrusions/extrudeRectangularPath2.js
@@ -1,6 +1,6 @@
 import * as path2 from '../../geometries/path2/index.js'
 
-import { expand } from '../expansions/index.js'
+import { expand } from '../expansions/expand.js'
 
 import { extrudeLinearGeom2 } from './extrudeLinearGeom2.js'
 

diff --git a/packages/modeling/src/operations/extrusions/extrudeRotate.js b/packages/modeling/src/operations/extrusions/extrudeRotate.js
@@ -1,7 +1,7 @@
 import { TAU } from '../../maths/constants.js'
 import * as mat4 from '../../maths/mat4/index.js'
 
-import { mirrorX } from '../transforms/index.js'
+import { mirrorX } from '../transforms/mirror.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as slice from '../../geometries/slice/index.js'

diff --git a/packages/modeling/src/operations/extrusions/project.js b/packages/modeling/src/operations/extrusions/project.js
@@ -1,6 +1,7 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
+
+import { aboutEqualNormals } from '../../maths/utils/aboutEqualNormals.js'
 
-import { aboutEqualNormals } from '../../maths/utils/index.js'
 import * as plane from '../../maths/plane/index.js'
 import * as mat4 from '../../maths/mat4/index.js'
 import * as vec2 from '../../maths/vec2/index.js'
@@ -9,7 +10,7 @@ import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'
 import * as poly3 from '../../geometries/poly3/index.js'
 
-import { measureEpsilon } from '../../measurements/index.js'
+import { measureEpsilon } from '../../measurements/measureEpsilon.js'
 
 import { unionGeom2 } from '../booleans/unionGeom2.js'
 

diff --git a/packages/modeling/src/operations/hulls/hull.js b/packages/modeling/src/operations/hulls/hull.js
@@ -1,4 +1,5 @@
-import { areAllShapesTheSameType, flatten } from '../../utils/index.js'
+import { areAllShapesTheSameType } from '../../utils/areAllShapesTheSameType.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/hulls/hullChain.js b/packages/modeling/src/operations/hulls/hullChain.js
@@ -1,6 +1,6 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
-import { union } from '../booleans/index.js'
+import { union } from '../booleans/union.js'
 
 import { hull } from './hull.js'
 

diff --git a/packages/modeling/src/operations/hulls/hullGeom2.js b/packages/modeling/src/operations/hulls/hullGeom2.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 

diff --git a/packages/modeling/src/operations/hulls/hullGeom3.js b/packages/modeling/src/operations/hulls/hullGeom3.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as geom3 from '../../geometries/geom3/index.js'
 import * as poly3 from '../../geometries/poly3/index.js'

diff --git a/packages/modeling/src/operations/hulls/hullPath2.js b/packages/modeling/src/operations/hulls/hullPath2.js
@@ -1,4 +1,4 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
 import * as path2 from '../../geometries/path2/index.js'
 

diff --git a/packages/modeling/src/operations/modifiers/generalize.js b/packages/modeling/src/operations/modifiers/generalize.js
@@ -1,6 +1,6 @@
-import { flatten } from '../../utils/index.js'
+import { flatten } from '../../utils/flatten.js'
 
-import { measureEpsilon } from '../../measurements/index.js'
+import { measureEpsilon } from '../../measurements/measureEpsilon.js'
 
 import * as geom2 from '../../geometries/geom2/index.js'
 import * as geom3 from '../../geometries/geom3/index.js'

diff --git a/packages/modeling/src/operations/modifiers/mergePolygons.js b/packages/modeling/src/operations/modifiers/mergePolygons.js
@@ -1,4 +1,4 @@
-import { aboutEqualNormals } from '../../maths/utils/index.js'
+import { aboutEqualNormals } from '../../maths/utils/aboutEqualNormals.js'
 
 import * as vec3 from '../../maths/vec3/index.js'