geometrix 0.5.34 → 0.5.36

package/README.md

@@ -17,7 +17,7 @@ Getting started
 git clone https://github.com/charlyoleg2/parametrix
 cd parametrix
 npm -w geometrix install
-npm -w geometrix ci
+npm -w geometrix run ci
 ```
 
 Dependencies

package/dist/index.d.ts

@@ -292,6 +292,7 @@ declare abstract class AContour {
     abstract toSvg(yCeiling: number, color?: string): string;
     abstract toDxfSeg(): DxfSeg[];
     abstract toPax(): tPaxContour;
+    abstract getPerimeter(): number;
 }
 /**
  * class `Contour`
@@ -357,6 +358,7 @@ declare class Contour extends AContour {
     toSvg(yCeiling: number, color?: string): string;
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourPath;
+    getPerimeter(): number;
 }
 /**
  * class `ContourCircle`
@@ -383,6 +385,7 @@ declare class ContourCircle extends AContour {
     toSvg(yCeiling: number, color?: string): string;
     toDxfSeg(): DxfSeg[];
     toPax(): tPaxContourCircle;
+    getPerimeter(): number;
 }
 declare function contour(ix: number, iy: number, icolor?: string): Contour;
 declare function contourCircle(ix: number, iy: number, iRadius: number, icolor?: string): ContourCircle;
@@ -580,10 +583,11 @@ declare enum EFormat {
     eSVGALL = 1,
     eDXF = 2,
     eDXFALL = 3,
-    ePAX = 4,
-    eOPENSCAD = 5,
-    eJSCAD = 6,
-    eZIP = 7
+    eTXTLOG = 4,
+    ePAX = 5,
+    eOPENSCAD = 6,
+    eJSCAD = 7,
+    eZIP = 8
 }
 declare function fileTextContent(fgeom: tGeomFunc, paramVal: tParamVal, ipDef: tParamDef, eFace: string, exportFormat: EFormat): string;
 declare function fileBinContent(fgeom: tGeomFunc, tSim: number, paramVal: tParamVal, ipDef: tParamDef, exportFormat: EFormat): Promise<Blob>;

package/dist/index.js

@@ -2327,6 +2327,34 @@ var Contour = class _Contour extends AContour {
     const rPaxC = pPath.toJson();
     return rPaxC;
   }
+  getPerimeter() {
+    let rPerimeter = 0;
+    const ctrG = this.generateContour();
+    let plx = 0;
+    let ply = 0;
+    for (const seg of ctrG.segments) {
+      if (seg.sType === 6 /* eStart */) {
+        plx = seg.px;
+        ply = seg.py;
+      } else if (seg.sType === 0 /* eStroke */) {
+        const segLen = Math.sqrt((seg.px - plx) ** 2 + (seg.py - ply) ** 2);
+        plx = seg.px;
+        ply = seg.py;
+        rPerimeter += segLen;
+      } else if (seg.sType === 1 /* eArc */) {
+        const seg2 = arcSeg1To2(plx, ply, seg);
+        const daCcw = withinZero2Pi(seg2.a2 - seg2.a1);
+        const da = seg2.arcCcw ? daCcw : withinZero2Pi(2 * Math.PI - daCcw);
+        const segLen = seg.radius * da;
+        plx = seg.px;
+        ply = seg.py;
+        rPerimeter += segLen;
+      } else {
+        console.log(`err760: contour.getPerimeter has unknown segment type ${seg.sType}`);
+      }
+    }
+    return rPerimeter;
+  }
 };
 var ContourCircle = class _ContourCircle extends AContour {
   circle = true;
@@ -2408,6 +2436,10 @@ var ContourCircle = class _ContourCircle extends AContour {
     const rPaxC = paxCircle(this.px, this.py, this.radius);
     return rPaxC;
   }
+  getPerimeter() {
+    const rPerimeter = 2 * Math.PI * this.radius;
+    return rPerimeter;
+  }
 };
 function contour(ix, iy, icolor = "") {
   return new Contour(ix, iy, icolor);
@@ -3690,6 +3722,11 @@ function figureToDxf(aCtr) {
   const rDxf = dxf.stringify();
   return rDxf;
 }
+function makeLog(geome0) {
+  let rStr = "";
+  rStr += geome0.logstr;
+  return rStr;
+}
 function makePax(paramVal, geome0, ipDef) {
   const rStr = paxWrite().getPaxStr(paramVal, geome0, ipDef);
   return rStr;
@@ -3750,10 +3787,11 @@ var EFormat = /* @__PURE__ */ ((EFormat2) => {
   EFormat2[EFormat2["eSVGALL"] = 1] = "eSVGALL";
   EFormat2[EFormat2["eDXF"] = 2] = "eDXF";
   EFormat2[EFormat2["eDXFALL"] = 3] = "eDXFALL";
-  EFormat2[EFormat2["ePAX"] = 4] = "ePAX";
-  EFormat2[EFormat2["eOPENSCAD"] = 5] = "eOPENSCAD";
-  EFormat2[EFormat2["eJSCAD"] = 6] = "eJSCAD";
-  EFormat2[EFormat2["eZIP"] = 7] = "eZIP";
+  EFormat2[EFormat2["eTXTLOG"] = 4] = "eTXTLOG";
+  EFormat2[EFormat2["ePAX"] = 5] = "ePAX";
+  EFormat2[EFormat2["eOPENSCAD"] = 6] = "eOPENSCAD";
+  EFormat2[EFormat2["eJSCAD"] = 7] = "eJSCAD";
+  EFormat2[EFormat2["eZIP"] = 8] = "eZIP";
   return EFormat2;
 })(EFormat || {});
 function fileTextContent(fgeom, paramVal, ipDef, eFace, exportFormat) {
@@ -3781,11 +3819,13 @@ function fileTextContent(fgeom, paramVal, ipDef, eFace, exportFormat) {
     } else if (exportFormat === 3 /* eDXFALL */) {
       const figu = mergeFaces(geome0.fig);
       rFileContent = figureToDxf(figu.mainList);
-    } else if (exportFormat === 4 /* ePAX */) {
+    } else if (exportFormat === 4 /* eTXTLOG */) {
+      rFileContent = makeLog(geome0);
+    } else if (exportFormat === 5 /* ePAX */) {
       rFileContent = makePax(paramVal, geome0, ipDef);
-    } else if (exportFormat === 5 /* eOPENSCAD */) {
+    } else if (exportFormat === 6 /* eOPENSCAD */) {
       rFileContent = makeOpenscad(geome0);
-    } else if (exportFormat === 6 /* eJSCAD */) {
+    } else if (exportFormat === 7 /* eJSCAD */) {
       rFileContent = makeOpenjscad(geome0);
     } else {
       console.log(`err912: unknown exportFormat ${exportFormat}`);
@@ -3800,7 +3840,7 @@ async function fileBinContent(fgeom, tSim, paramVal, ipDef, exportFormat) {
   const geome1 = fgeom(tSim, paramVal);
   let rFileContent = new Blob();
   if (!geome0.calcErr && !geome1.calcErr) {
-    if (exportFormat === 7 /* eZIP */) {
+    if (exportFormat === 8 /* eZIP */) {
       rFileContent = await makeZip(paramVal, geome0, tSim, geome1, ipDef);
     } else {
       console.log(`err913: unknown exportFormat ${exportFormat}`);
@@ -3816,13 +3856,15 @@ function fileMime(exportFormat) {
     rMime = "image/svg+xml";
   } else if (exportFormat === 2 /* eDXF */ || exportFormat === 3 /* eDXFALL */) {
     rMime = "application/dxf";
-  } else if (exportFormat === 4 /* ePAX */) {
+  } else if (exportFormat === 4 /* eTXTLOG */) {
+    rMime = "text/plain";
+  } else if (exportFormat === 5 /* ePAX */) {
     rMime = "application/json";
-  } else if (exportFormat === 5 /* eOPENSCAD */) {
+  } else if (exportFormat === 6 /* eOPENSCAD */) {
     rMime = "text/plain";
-  } else if (exportFormat === 6 /* eJSCAD */) {
+  } else if (exportFormat === 7 /* eJSCAD */) {
     rMime = "text/plain";
-  } else if (exportFormat === 7 /* eZIP */) {
+  } else if (exportFormat === 8 /* eZIP */) {
     rMime = "application/zip";
   }
   return rMime;
@@ -3833,26 +3875,29 @@ function fileSuffix(exportFormat) {
     rSuffix = ".svg";
   } else if (exportFormat === 2 /* eDXF */ || exportFormat === 3 /* eDXFALL */) {
     rSuffix = ".dxf";
-  } else if (exportFormat === 4 /* ePAX */) {
+  } else if (exportFormat === 4 /* eTXTLOG */) {
+    rSuffix = ".log";
+  } else if (exportFormat === 5 /* ePAX */) {
     rSuffix = ".pax.json";
-  } else if (exportFormat === 5 /* eOPENSCAD */) {
+  } else if (exportFormat === 6 /* eOPENSCAD */) {
     rSuffix = "_noarc_openscad.scad";
-  } else if (exportFormat === 6 /* eJSCAD */) {
+  } else if (exportFormat === 7 /* eJSCAD */) {
     rSuffix = "_noarc_jscad.js";
-  } else if (exportFormat === 7 /* eZIP */) {
+  } else if (exportFormat === 8 /* eZIP */) {
     rSuffix = ".zip";
   }
   return rSuffix;
 }
 function fileBin(exportFormat) {
   let rBin = false;
-  if (exportFormat === 7 /* eZIP */) {
+  if (exportFormat === 8 /* eZIP */) {
     rBin = true;
   }
   return rBin;
 }
 
 // src/paramFile.ts
+import JSON5 from "json5";
 function createParamFile(lastModif, iPartName, idparams, comment) {
   const allVal = {
     lastModif,
@@ -3864,7 +3909,7 @@ function createParamFile(lastModif, iPartName, idparams, comment) {
   return fContentStr;
 }
 function parseParamFile(fContentStr) {
-  const wholeJson = JSON.parse(fContentStr);
+  const wholeJson = JSON5.parse(fContentStr);
   const lastModifKey = "lastModif";
   const partNameKey = "partName";
   const pValKey = "pVal";

package/package.json

@@ -1,26 +1,15 @@
 {
 	"name": "geometrix",
-	"version": "0.5.34",
+	"version": "0.5.36",
 	"description": "The 2D geometry engine of the parametrix",
-	"type": "module",
 	"private": false,
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"default": "./dist/index.js"
-		}
-	},
-	"files": [
-		"dist",
-		"!dist/**/*.map",
-		"!dist/**/*.test.*",
-		"!dist/**/*.spec.*"
-	],
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/charlyoleg2/parametrix.git"
 	},
 	"homepage": "https://charlyoleg2.github.io/parametrix/",
+	"author": "charlyoleg",
+	"license": "ISC",
 	"keywords": [
 		"cad",
 		"programmatic",
@@ -30,7 +19,19 @@
 		"arc",
 		"gear"
 	],
-	"author": "charlyoleg",
+	"type": "module",
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"default": "./dist/index.js"
+		}
+	},
+	"files": [
+		"dist",
+		"!dist/**/*.map",
+		"!dist/**/*.test.*",
+		"!dist/**/*.spec.*"
+	],
 	"tsup": {
 		"entry": [
 			"src/index.ts"
@@ -41,6 +42,14 @@
 		"sourcemap": true,
 		"clean": true
 	},
+	"prettier": {
+		"useTabs": true,
+		"singleQuote": true,
+		"trailingComma": "none",
+		"printWidth": 100,
+		"plugins": [],
+		"overrides": []
+	},
 	"scripts": {
 		"dev": "tsup --watch",
 		"build": "tsup",
@@ -54,10 +63,11 @@
 		"clean": "shx rm -fr dist node_modules"
 	},
 	"dependencies": {
-		"@zip.js/zip.js": "^2.7.41"
+		"@zip.js/zip.js": "^2.7.44",
+		"json5": "^2.2.3"
 	},
 	"devDependencies": {
-		"@types/node": "^20.12.5",
+		"@types/node": "^20.12.10",
 		"@typescript-eslint/eslint-plugin": "^7.0.1",
 		"@typescript-eslint/parser": "^7.0.1",
 		"eslint": "^8.57.0",
@@ -66,15 +76,7 @@
 		"prettier": "^3.2.5",
 		"shx": "^0.3.4",
 		"tsup": "^8.0.2",
-		"typescript": "^5.4.4",
-		"vitest": "^1.4.0"
-	},
-	"prettier": {
-		"useTabs": true,
-		"singleQuote": true,
-		"trailingComma": "none",
-		"printWidth": 100,
-		"plugins": [],
-		"overrides": []
+		"typescript": "^5.4.5",
+		"vitest": "^1.6.0"
 	}
 }