diff --git a/modules/ecs6-class/line.ts b/modules/ecs6-class/line.ts index e2d6086..71a9f40 100644 --- a/modules/ecs6-class/line.ts +++ b/modules/ecs6-class/line.ts @@ -1,50 +1,56 @@ import Point from "./point"; export default class Line { - point1: Point - point2: Point - n: number | undefined - slope: number | undefined + point1: Point; + point2: Point; + n: number | undefined; + slope: number | undefined; + constructor({ point1 = new Point(), point2 = new Point(), n = undefined, slope = undefined }: { point1?: Point, point2?: Point, n?: number, slope?: number } = {}) { this.point1 = point1; this.point2 = point2; this.slope = slope; this.n = n; } - - - calculateSlope() { - this.slope = (this.point1.y - this.point2.y) / (this.point1.x - this.point2.x) + this.slope = (this.point1.y - this.point2.y) / (this.point1.x - this.point2.x); } - calculateNOfLineFunction() { - if (this.slope) - this.n = this.point1.y - this.slope * this.point1.x + if (this.slope !== undefined) { + this.n = this.point1.y - this.slope * this.point1.x; + } + } + ensureSlopeAndN() { + if (this.slope === undefined) { + this.calculateSlope(); + } + if (this.n === undefined) { + this.calculateNOfLineFunction(); + } } getPointOnXAsis() { - return this.getPointByY(0) + this.ensureSlopeAndN(); + return this.getPointByY(0); } - getPointOnYAsis() { - return this.getPointByX(0) + this.ensureSlopeAndN(); + return this.getPointByX(0); } - - getPointByX(x: number) { - if (this.slope && this.n) { - let y = this.slope * x + this.n - return new Point({ x, y }) + this.ensureSlopeAndN(); + if (this.slope !== undefined && this.n !== undefined) { + const y = this.slope * x + this.n; + return new Point({ x, y }); } } - getPointByY(y: number) { - if (this.slope && this.n) { - let x = (y - this.n) / this.slope; - return new Point({ x, y }) + this.ensureSlopeAndN(); + if (this.slope !== undefined && this.n !== undefined) { + const x = (y - this.n) / this.slope; + return new Point({ x, y }); } } - -} + +} \ No newline at end of file diff --git a/modules/tests/line.test.ts b/modules/tests/line.test.ts new file mode 100644 index 0000000..5aa6c89 --- /dev/null +++ b/modules/tests/line.test.ts @@ -0,0 +1,99 @@ +import Line from "../ecs6-class/line"; +import Point from "../ecs6-class/point"; + +describe("Line Class", () => { + test("Constructor initializes correctly", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 4 }); + const line = new Line({ point1, point2 }); + expect(line.point1).toEqual(point1); + expect(line.point2).toEqual(point2); + expect(line.slope).toBeUndefined(); + expect(line.n).toBeUndefined(); + }); + + test("calculateSlope calculates slope correctly", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + expect(line.slope).toBe(2); + }); + + test("calculateNOfLineFunction calculates n correctly", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + expect(line.n).toBe(0); + }); + + test("ensureSlopeAndN ensures slope and n are calculated", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + + expect(line.slope).toBeUndefined(); + expect(line.n).toBeUndefined(); + + line.ensureSlopeAndN(); + + expect(line.slope).toBe(2); + expect(line.n).toBe(0); + }); + + test("getPointOnXAsis returns correct point", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const pointOnXAxis = line.getPointOnXAsis(); + expect(pointOnXAxis).toEqual(new Point({ x: 0, y: 0 })); + }); + + test("getPointOnYAsis returns correct point", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const pointOnYAxis = line.getPointOnYAsis(); + expect(pointOnYAxis).toEqual(new Point({ x: 0, y: 0 })); + }); + + test("getPointByX calculates point correctly", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = line.getPointByX(2); + expect(point).toEqual(new Point({ x: 2, y: 4 })); + }); + + test("getPointByY calculates point correctly", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const point = line.getPointByY(4); + expect(point).toEqual(new Point({ x: 2, y: 4 })); + }); + + test("getPointByX handles undefined slope or n", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + + expect(line.slope).toBeUndefined(); + expect(line.n).toBeUndefined(); + + line.getPointByX(2); + + expect(line.slope).toBe(2); + expect(line.n).toBe(0); + }); +}); diff --git a/modules/tests/point.test.ts b/modules/tests/point.test.ts new file mode 100644 index 0000000..ca4acbe --- /dev/null +++ b/modules/tests/point.test.ts @@ -0,0 +1,67 @@ +import Point from "../ecs6-class/point"; +import Line from "../ecs6-class/line"; +// filepath: d:\chany waingort\build-tests-ts\modules\ecs6-class\point.test.ts + +describe("Point Class", () => { + test("Constructor initializes correctly", () => { + const point = new Point({ x: 5, y: 10 }); + expect(point.x).toBe(5); + expect(point.y).toBe(10); + }); + + test("Constructor initializes with default values", () => { + const point = new Point(); + expect(point.x).toBe(0); + expect(point.y).toBe(0); + }); + + test("moveVertical moves the point vertically", () => { + const point = new Point({ x: 5, y: 10 }); + point.moveVertical(3); + expect(point.y).toBe(13); // 10 + 3 + }); + + test("moveHorizontal moves the point horizontally", () => { + const point = new Point({ x: 5, y: 10 }); + point.moveHorizontal(-2); + expect(point.x).toBe(3); // 5 - 2 + }); +}); + +test("Constructor initializes with default values", () => { + const line = new Line(); + expect(line.point1).toEqual(new Point()); + expect(line.point2).toEqual(new Point()); + expect(line.slope).toBeUndefined(); + expect(line.n).toBeUndefined(); +}); + +test("Constructor initializes with custom values", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 4 }); + const line = new Line({ point1, point2, slope: 2, n: 0 }); + expect(line.point1).toEqual(point1); + expect(line.point2).toEqual(point2); + expect(line.slope).toBe(2); + expect(line.n).toBe(0); +}); + +test("getPointOnXAsis returns correct point", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const pointOnXAxis = line.getPointOnXAsis(); + expect(pointOnXAxis).toEqual(new Point({ x: 0, y: 0 })); +}); + +test("getPointOnYAsis returns correct point", () => { + const point1 = new Point({ x: 1, y: 2 }); + const point2 = new Point({ x: 3, y: 6 }); + const line = new Line({ point1, point2 }); + line.calculateSlope(); + line.calculateNOfLineFunction(); + const pointOnYAxis = line.getPointOnYAsis(); + expect(pointOnYAxis).toEqual(new Point({ x: 0, y: 0 })); +}); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 5bc5ea8..3da30fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "devDependencies": { "@types/jest": "^30.0.0", "jest": "^30.0.4", + "ts-jest": "^29.4.0", "ts-node": "^10.9.2", "typescript": "^5.8.3" } @@ -1662,6 +1663,13 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "dev": true, + "license": "MIT" + }, "node_modules/babel-jest": { "version": "30.0.4", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-30.0.4.tgz", @@ -1823,6 +1831,19 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/bser": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", @@ -2153,6 +2174,22 @@ "dev": true, "license": "MIT" }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.5.181", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.181.tgz", @@ -2300,6 +2337,29 @@ "bser": "2.1.1" } }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -2681,6 +2741,49 @@ "@pkgjs/parseargs": "^0.11.0" } }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/jest": { "version": "30.0.4", "resolved": "https://registry.npmjs.org/jest/-/jest-30.0.4.tgz", @@ -3371,6 +3474,13 @@ "node": ">=8" } }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true, + "license": "MIT" + }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -4221,6 +4331,85 @@ "node": ">=8.0" } }, + "node_modules/ts-jest": { + "version": "29.4.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.4.0.tgz", + "integrity": "sha512-d423TJMnJGu80/eSgfQ5w/R+0zFJvdtTxwtF9KzFFunOpSeD+79lHJQIiAhluJoyGRbvj9NZJsl9WjCUo0ND7Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "bs-logger": "^0.2.6", + "ejs": "^3.1.10", + "fast-json-stable-stringify": "^2.1.0", + "json5": "^2.2.3", + "lodash.memoize": "^4.1.2", + "make-error": "^1.3.6", + "semver": "^7.7.2", + "type-fest": "^4.41.0", + "yargs-parser": "^21.1.1" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "@babel/core": ">=7.0.0-beta.0 <8", + "@jest/transform": "^29.0.0 || ^30.0.0", + "@jest/types": "^29.0.0 || ^30.0.0", + "babel-jest": "^29.0.0 || ^30.0.0", + "jest": "^29.0.0 || ^30.0.0", + "jest-util": "^29.0.0 || ^30.0.0", + "typescript": ">=4.3 <6" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "@jest/transform": { + "optional": true + }, + "@jest/types": { + "optional": true + }, + "babel-jest": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "jest-util": { + "optional": true + } + } + }, + "node_modules/ts-jest/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/ts-jest/node_modules/type-fest": { + "version": "4.41.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", + "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ts-node": { "version": "10.9.2", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", diff --git a/package.json b/package.json index f9371ee..00e6f25 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,16 @@ "description": "", "main": "index.js", "scripts": { - "test": "jest" + "test": "jest", + "test:coverage": "jest --coverage" + }, + "jest": { + "preset": "ts-jest", + "testEnvironment": "node" + + }, + "compilerOptions": { + "esModuleInterop": true }, "repository": { "type": "git", @@ -22,7 +31,9 @@ "devDependencies": { "@types/jest": "^30.0.0", "jest": "^30.0.4", + "ts-jest": "^29.4.0", "ts-node": "^10.9.2", "typescript": "^5.8.3" } + } diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..5c2b3a4 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,12 @@ +{ + "compilerOptions": { + "target": "es5", + "module": "commonjs", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + }, + "include": ["src/**/*"], + "exclude": ["node_modules"] +}