Skip to content

refactor: rewrite of geometryutil as typescript #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

refactor: rewrite of geometryutil as typescript #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa18cbe
refactor: rewrite of geometryutil as typescript
Dexus May 20, 2025
5e728e7
refactor: remove geometryutil.js script references and update imports
Dexus May 20, 2025
8be70d3
refactor: remove geometryutil.js script
Dexus May 20, 2025
ccfd475
refactor: implement UMD module for geometryutil and update build process
Dexus May 20, 2025
6d50a2e
refactor: add rollup-plugin-swc-minify for improved minification in b…
Dexus May 20, 2025
8d33955
redefine bounds instead of single values
Dexus May 22, 2025
b5bb43f
tests for geometryutil and refactor/cleanup the code
Dexus May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import tseslint from 'typescript-eslint';
export default tseslint.config(
eslint.configs.recommended,
tseslint.configs.recommended,
{ignores:['**/*.js', '**/node_modules/**']},
{ ignores: ['**/*.js', '**/node_modules/**'] }
);
12 changes: 12 additions & 0 deletions helper_scripts/build_ts_and_umd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const { execSync } = require('child_process');
const path = require('path');

// Build the main TypeScript files
console.log('Building main TypeScript files...');
execSync('npx tsc', { stdio: 'inherit' });

// Build the UMD modules using Rollup
console.log('Building UMD modules with Rollup...');
execSync('npx rollup -c rollup.config.mjs', { stdio: 'inherit' });
Copy link
Collaborator

@willmurnane willmurnane May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not familiar with UMD modules, what benefit do they give?

Copy link
Member Author

@Dexus Dexus May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see https://github.com/deepnest-next/deepnest/pull/132/files#diff-73f5a0c098eeed918ec330da8ffc45e7f4ca600d9bb969d0a9dea4b5d2909c85R197


console.log('Build complete!');
18 changes: 18 additions & 0 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

/** @type {import("jest").Config} **/
module.exports = {
testEnvironment: "node",
workerIdleMemoryLimit: 0.2,
transform: {
'^.+\\.[jt]sx?$': [
'ts-jest',
{
useESM: true,
tsconfig: 'tsconfig.jest.json',
},
],
},
testMatch: [
'**/tests/**/*.test.ts'
],
};
1 change: 0 additions & 1 deletion main/background.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!doctype html>
<html>
<head>
<script src="util/geometryutil.js"></script>
<script src="util/clipper.js"></script>
<script src="util/parallel.js"></script>
<script type="module">
Expand Down
3 changes: 2 additions & 1 deletion main/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { NfpCache } from '../build/nfpDb.js';
import { HullPolygon } from '../build/util/HullPolygon.js';
import * as GeometryUtil from '../build/util/geometryutil.js';
Copy link
Collaborator

@willmurnane willmurnane May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are both built versions necessary, or should this import the UMD as well?

Copy link
Member Author

@Dexus Dexus May 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both are needed the UMD is for the worker, and the non UMD is used in non worker context.


window.onload = function () {
const { ipcRenderer } = require('electron');
Expand Down Expand Up @@ -193,7 +194,7 @@ window.onload = function () {
}

p.require('../../main/util/clipper.js');
p.require('../../main/util/geometryutil.js');
p.require('../../build/util/umd/geometryutil.umd.js');

p.map(process).then(function (processed) {
function getPart(source) {
Expand Down
1 change: 1 addition & 0 deletions main/deepnest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import { Point } from '../build/util/point.js';
import { HullPolygon } from '../build/util/HullPolygon.js';
import * as GeometryUtil from '../build/util/geometryutil.js';

const { simplifyPolygon: simplifyPoly } = require("@deepnest/svg-preprocessor");

Expand Down
1 change: 0 additions & 1 deletion main/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<script src="util/pathsegpolyfill.js"></script>
<script src="util/clipper.js"></script>
<script src="util/parallel.js"></script>
<script src="util/geometryutil.js"></script>
<script src="util/interact.js"></script>
<script src="util/ractive.js"></script>
<script src="util/svgpanzoom.js"></script>
Expand Down
1 change: 1 addition & 0 deletions main/svgparser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import '../build/util/domparser.js';
// Dependencies
import { Matrix } from '../build/util/matrix.js';
import { Point } from '../build/util/point.js';
import * as GeometryUtil from '../build/util/geometryutil.js';

export class SvgParser {
constructor(){
Expand Down
Loading
Loading