Skip to content

Commit 87d53ad

Browse files
Merge pull request #1 from Codex-/pr_updates
Pr updates
2 parents c576f24 + c2bc92f commit 87d53ad

File tree

8 files changed

+5602
-4268
lines changed

8 files changed

+5602
-4268
lines changed

jest.config.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
import type { Config } from "@jest/types";
22
import { join } from "path";
3-
import type { TsJestGlobalOptions } from "ts-jest";
4-
5-
const tsJestCfg: TsJestGlobalOptions = {
6-
tsconfig: join(__dirname, "tsconfig.json"),
7-
};
83

94
const config: Config.InitialOptions = {
10-
globals: {
11-
"ts-jest": tsJestCfg,
12-
},
135
moduleFileExtensions: ["ts", "js", "json", "node"],
146
roots: ["<rootDir>/src"],
157
testEnvironment: "node",
168
testRegex: "(\\.|/)(test|spec)\\.ts$",
179
transform: {
18-
"^.+\\.ts$": "ts-jest",
10+
"^.+\\.ts$": [
11+
"ts-jest",
12+
{
13+
tsconfig: join(__dirname, "tsconfig.json"),
14+
},
15+
],
1916
},
2017
};
2118

package-lock.json

Lines changed: 5268 additions & 4074 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"types": "lib/index.d.ts",
1616
"scripts": {
1717
"build": "tsc",
18+
"build:package": "tsc -p tsconfig.build.json",
1819
"test": "node --expose-gc ./node_modules/jest/bin/jest",
19-
"package": "tsc -p tsconfig.json",
20-
"release": "tsc -p tsconfig.json && node --expose-gc ./node_modules/jest/bin/jest && release-it"
20+
"release": "npm run build:package && npm run test && release-it"
2121
},
2222
"license": "Apache-2.0",
2323
"bugs": {
@@ -28,12 +28,12 @@
2828
"lib"
2929
],
3030
"devDependencies": {
31-
"@types/jest": "^27.4.1",
32-
"jest": "^27.5.1",
33-
"ts-jest": "^27.1.4",
34-
"ts-node": "^10.7.0",
35-
"typescript": "^4.6.3",
36-
"release-it": "^14.14.2"
31+
"@types/jest": "^29.4.0",
32+
"jest": "^29.4.3",
33+
"ts-jest": "^29.0.5",
34+
"ts-node": "^10.9.1",
35+
"typescript": "^4.8.4",
36+
"release-it": "^15.6.0"
3737
},
3838
"author": "Daniel Lemire <lemire@gmail.com> (http://lemire.me/en/)"
3939
}

src/BitSet.difference2.spec.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,14 @@ bitsetTest(({ name, build, arrayEqual }) => {
138138
mb2.difference2(mb1);
139139
expect(mb1.size()).toBe(2); // bad diff2
140140
});
141+
142+
it("difference2 the same prototype provided", () => {
143+
const a1 = [1, 2, 4, 5, 10];
144+
const a2 = [1, 2, 4, 5, 10, 100, 1000];
145+
const mb1 = build(a1);
146+
const mb2 = build(a2);
147+
const mb3 = mb1.difference2(mb2);
148+
expect(mb3.constructor).toStrictEqual(mb2.constructor);
149+
});
141150
});
142151
});

0 commit comments

Comments
 (0)