Skip to content

Commit 8508c34

Browse files
⬆️ deps: Upgrade.
1 parent bba98bd commit 8508c34

13 files changed

+50
-112
lines changed

package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,15 @@
6464
},
6565
"dependencies": {},
6666
"devDependencies": {
67-
"@aureooms/js-array": "4.0.0",
68-
"@aureooms/js-compare": "2.0.1",
69-
"@aureooms/js-functools": "2.0.3",
70-
"@aureooms/js-itertools": "5.1.1",
71-
"@aureooms/js-memory": "4.0.0",
72-
"@aureooms/js-red-black-tree": "9.0.0",
73-
"@aureooms/js-type": "1.0.4",
7467
"@babel/core": "7.14.6",
7568
"@babel/preset-env": "7.14.7",
7669
"@babel/register": "7.14.5",
7770
"@commitlint/cli": "12.1.4",
71+
"@iterable-iterator/list": "^1.0.1",
72+
"@iterable-iterator/range": "^2.0.1",
73+
"@iterable-iterator/sorted": "^1.0.0",
7874
"@js-library/commitlint-config": "0.0.4",
75+
"@total-order/primitive": "^1.0.1",
7976
"ava": "3.15.0",
8077
"babel-plugin-transform-remove-console": "6.9.4",
8178
"babel-plugin-unassert": "3.1.0",

test/src/choice.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
import test from 'ava';
22
import {choice, _choice, randint} from '../../src/index.js';
33

4-
import {_calloc} from '@aureooms/js-memory';
5-
import {iota, copy} from '@aureooms/js-array';
4+
import {range} from '@iterable-iterator/range';
65

76
const macro = (t, type, _, choice, n, i, j) => {
8-
const calloc = _calloc(type);
9-
const a = calloc(n);
10-
const b = calloc(n);
11-
12-
iota(a, 0, n, 0);
13-
copy(a, 0, n, b, 0);
7+
const a = type.from(range(n));
8+
const b = type.from(a);
149

1510
const x = choice(b, i, j);
1611

test/src/randfloat.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import test from 'ava';
22
import {randfloat} from '../../src/index.js';
33

4-
import type from '@aureooms/js-type';
5-
64
test('randfloat', (t) => {
75
let r;
86

@@ -13,7 +11,7 @@ test('randfloat', (t) => {
1311
const check = () => {
1412
t.true(r < rj, `${r} < ${rj}`);
1513
t.true(r >= ri, `${r} >= ${ri}`);
16-
t.true(type.isfinite(r), `type.isfinite(${r})`);
14+
t.true(Number.isFinite(r), `Number.isFinite(${r})`);
1715
};
1816

1917
for (let i = 0; i < n; ++i) {

test/src/randint.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import test from 'ava';
22
import {randint} from '../../src/index.js';
33

4-
import type from '@aureooms/js-type';
5-
64
test('randint', (t) => {
75
let r;
86

@@ -13,7 +11,7 @@ test('randint', (t) => {
1311
const check = () => {
1412
t.true(r < rj, `${r} < ${rj}`);
1513
t.true(r >= ri, `${r} >= ${ri}`);
16-
t.true(type.isint(r), `type.isint(${r})`);
14+
t.true(Number.isInteger(r), `Number.isInteger(${r})`);
1715
};
1816

1917
for (let i = 0; i < n; ++i) {

test/src/randrange_only_stop.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import test from 'ava';
22
import {randrange} from '../../src/index.js';
33

4-
import type from '@aureooms/js-type';
5-
64
test('randrange only stop', (t) => {
75
let r;
86

@@ -12,7 +10,7 @@ test('randrange only stop', (t) => {
1210
const check = () => {
1311
t.true(r < rj, `${r} < ${rj}`);
1412
t.true(r >= 0, `${r} >= 0`);
15-
t.true(type.isint(r), `type.isint(${r})`);
13+
t.true(Number.isInteger(r), `Number.isInteger(${r})`);
1614
};
1715

1816
for (let i = 1; i < n; ++i) {

test/src/randrange_with_negative_step.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import test from 'ava';
22
import {randrange} from '../../src/index.js';
33

4-
import type from '@aureooms/js-type';
5-
64
test('randrange with negative step', (t) => {
75
let r;
86
let step;
@@ -15,7 +13,7 @@ test('randrange with negative step', (t) => {
1513
t.true(r <= rj, `${r} <= ${rj}`);
1614
t.true(r > ri, `${r} > ${ri}`);
1715
t.true((rj - r) % -step === 0, `(${rj} - ${r}) % (-${step}) === 0`);
18-
t.true(type.isint(r), `type.isint(${r})`);
16+
t.true(Number.isInteger(r), `Number.isInteger(${r})`);
1917
};
2018

2119
for (step = -3; step <= -1; ++step) {

test/src/randrange_with_positive_step.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import test from 'ava';
22
import {randrange} from '../../src/index.js';
33

4-
import type from '@aureooms/js-type';
5-
64
test('randrange with positive step', (t) => {
75
let r;
86
let step;
@@ -15,7 +13,7 @@ test('randrange with positive step', (t) => {
1513
t.true(r < rj, `${r} < ${rj}`);
1614
t.true(r >= ri, `${r} >= ${ri}`);
1715
t.true((r - ri) % step === 0, `(${r} - ${ri}) % ${step} === 0`);
18-
t.true(type.isint(r), `type.isint(${r})`);
16+
t.true(Number.isInteger(r), `Number.isInteger(${r})`);
1917
};
2018

2119
for (step = 1; step <= 3; ++step) {

test/src/randrange_without_step.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import test from 'ava';
22
import {randrange} from '../../src/index.js';
33

4-
import type from '@aureooms/js-type';
5-
64
test('randrange without step', (t) => {
75
let r;
86

@@ -13,7 +11,7 @@ test('randrange without step', (t) => {
1311
const check = () => {
1412
t.true(r < rj, `${r} < ${rj}`);
1513
t.true(r >= ri, `${r} >= ${ri}`);
16-
t.true(type.isint(r), `type.isint(${r})`);
14+
t.true(Number.isInteger(r), `Number.isInteger(${r})`);
1715
};
1816

1917
for (let i = 0; i < n; ++i) {

test/src/reservoir.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
import test from 'ava';
2-
import {range} from '@aureooms/js-itertools';
3-
import {increasing} from '@aureooms/js-compare';
4-
import {RedBlackTree} from '@aureooms/js-red-black-tree';
2+
import {range} from '@iterable-iterator/range';
53
import {reservoir, _waterman, randint} from '../../src/index.js';
64

75
const macro = (t, _, reservoir, k, n) => {
86
const sample = reservoir(k, range(n));
9-
const source = RedBlackTree.from(increasing, range(n));
10-
// We cannot use a Set as it would smoosh input duplicates
7+
const source = new Set(range(n));
118

12-
console.debug({sample});
139
t.is(sample.length, k);
14-
for (const i of range(Math.min(k, n))) t.true(source.remove(sample[i]));
10+
for (const i of range(Math.min(k, n))) t.true(source.delete(sample[i]));
1511
for (const i of range(n, k)) t.true(sample[i] === undefined);
1612
};
1713

test/src/sample.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
import test from 'ava';
22
import {sample, _fisheryates, randint} from '../../src/index.js';
33

4-
import {_calloc} from '@aureooms/js-memory';
5-
import {iota, copy} from '@aureooms/js-array';
6-
import {increasing} from '@aureooms/js-compare';
4+
import {range} from '@iterable-iterator/range';
5+
import {increasing} from '@total-order/primitive';
76

87
const macro = (t, type, _, sample, n, k, i, j) => {
9-
const calloc = _calloc(type);
8+
const a = type.from(range(n));
9+
const b = type.from(a);
1010

11-
const a = calloc(n);
12-
const b = calloc(n);
13-
14-
iota(a, 0, n, 0);
15-
16-
copy(a, 0, n, b, 0);
1711
sample(k, b, i, j);
1812

1913
for (let it = 0; it < i; ++it) {

test/src/shuffle.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,13 @@ import {
77
randint,
88
} from '../../src/index.js';
99

10-
import {_calloc} from '@aureooms/js-memory';
11-
import {iota, copy} from '@aureooms/js-array';
12-
import {increasing} from '@aureooms/js-compare';
10+
import {range} from '@iterable-iterator/range';
11+
import {increasing} from '@total-order/primitive';
1312

1413
const macro = (t, type, _, shuffle, n, i, j) => {
15-
const calloc = _calloc(type);
14+
const a = type.from(range(n));
15+
const b = type.from(a);
1616

17-
const a = calloc(n);
18-
const b = calloc(n);
19-
20-
iota(a, 0, n, 0);
21-
22-
copy(a, 0, n, b, 0);
2317
shuffle(b, i, j);
2418

2519
for (let it = 0; it < i; ++it) {

test/src/shuffled.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import test from 'ava';
22
import {shuffled, _fisheryates_inside_out, randint} from '../../src/index.js';
33

4-
import {list, range, sorted} from '@aureooms/js-itertools';
5-
import {increasing} from '@aureooms/js-compare';
4+
import {list} from '@iterable-iterator/list';
5+
import {range} from '@iterable-iterator/range';
6+
import {sorted} from '@iterable-iterator/sorted';
7+
import {increasing} from '@total-order/primitive';
68

79
const macro = (t, _, shuffle, i, j) => {
810
const input = list(range(i, j));

yarn.lock

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,6 @@
22
# yarn lockfile v1
33

44

5-
"@aureooms/[email protected]":
6-
version "4.0.0"
7-
resolved "https://registry.yarnpkg.com/@aureooms/js-array/-/js-array-4.0.0.tgz#ea64b7c788644f40bbb92259a6098ac14a4eca6c"
8-
integrity sha1-6mS3x4hkT0C7uSJZpgmKwUpOymw=
9-
10-
"@aureooms/js-collections-deque@^7.0.0":
11-
version "7.0.0"
12-
resolved "https://registry.yarnpkg.com/@aureooms/js-collections-deque/-/js-collections-deque-7.0.0.tgz#ff03a4901c956d277fa9d6a149104dc65c85f9ae"
13-
integrity sha512-zWtMs1sTLGHBtKrjhJ4hZKcG54o4VSthCYn6sLA7pJeOc1FSEwKFyCaJq/BuSjY7rmhNVklTGhENjLyTl7ESVA==
14-
dependencies:
15-
"@aureooms/js-error" "^5.0.3"
16-
17-
"@aureooms/[email protected]":
18-
version "2.0.1"
19-
resolved "https://registry.yarnpkg.com/@aureooms/js-compare/-/js-compare-2.0.1.tgz#4636ea0736945abbcca38d5bd56a1f405034b2f9"
20-
integrity sha512-J+gG1wlwF401ySv0mOYhIIVUuoukvZaRkIwYNH9xZTLhRyI4VxoaFi3k8GA0ebjHqndLGYJS9uEeG3cuQcg+7w==
21-
22-
"@aureooms/js-error@^5.0.3":
23-
version "5.0.3"
24-
resolved "https://registry.yarnpkg.com/@aureooms/js-error/-/js-error-5.0.3.tgz#e4cb52e3525028e4725a5886663a67a0749abf6b"
25-
integrity sha512-hGLMr9UIgPubX72V7vS69N8toMoK52emuA9jV/EOleK4m7HUF0HjdssNXZytd+udyY3996CBre89MOgTEn0Udw==
26-
27-
"@aureooms/[email protected]":
28-
version "2.0.3"
29-
resolved "https://registry.yarnpkg.com/@aureooms/js-functools/-/js-functools-2.0.3.tgz#5139d6245278193da4cf21c44666797bf40a1d6e"
30-
integrity sha1-UTnWJFJ4GT2kzyHERmZ5e/QKHW4=
31-
32-
"@aureooms/[email protected]":
33-
version "5.1.1"
34-
resolved "https://registry.yarnpkg.com/@aureooms/js-itertools/-/js-itertools-5.1.1.tgz#cebca2e4ccfcbbfbb447f60a90a86dac8f457166"
35-
integrity sha512-WP+/gtDOJeYSa1ICRSUKtJNQs+2emU25eBnR1G+HPko5m8vbzdFBo1iHbl1IHfRDOyMn40oMvpYovC1Fh6VJwA==
36-
dependencies:
37-
"@aureooms/js-collections-deque" "^7.0.0"
38-
"@aureooms/js-error" "^5.0.3"
39-
40-
"@aureooms/[email protected]":
41-
version "4.0.0"
42-
resolved "https://registry.yarnpkg.com/@aureooms/js-memory/-/js-memory-4.0.0.tgz#db87dc64b948f672d73b434ebde047b05869712c"
43-
integrity sha1-24fcZLlI9nLXO0NOveBHsFhpcSw=
44-
45-
"@aureooms/[email protected]":
46-
version "9.0.0"
47-
resolved "https://registry.yarnpkg.com/@aureooms/js-red-black-tree/-/js-red-black-tree-9.0.0.tgz#ee006f24af42749546232b2d0baa13910c98f7b2"
48-
integrity sha512-sUtY0HnwQnBUjrfwysKc6H4BJO4O2+NnrUHLqTYJyT1l1VSI+oXGffjjmMJTFpIl4L/4FEZAN0L3BiQxgR1T8g==
49-
50-
"@aureooms/[email protected]":
51-
version "1.0.4"
52-
resolved "https://registry.yarnpkg.com/@aureooms/js-type/-/js-type-1.0.4.tgz#7f9de5f5f8506ff9c8958731744b7427b62e92b7"
53-
integrity sha1-f53l9fhQb/nIlYcxdEt0J7Yukrc=
54-
555
566
version "7.12.11"
577
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -2229,6 +2179,23 @@
22292179
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
22302180
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
22312181

2182+
"@iterable-iterator/list@^1.0.0", "@iterable-iterator/list@^1.0.1":
2183+
version "1.0.1"
2184+
resolved "https://registry.yarnpkg.com/@iterable-iterator/list/-/list-1.0.1.tgz#e84fd841d7d58c2ad6d0c026f0612c8228dc97f5"
2185+
integrity sha512-234a2cf0a0YhD1Ofb3F0xSjXDkqDK1xCiLnXoMUt/DWAt/odAvJToaxEFMemiKlAUvqF6E8MSi2v2UvlIOpBUA==
2186+
2187+
"@iterable-iterator/range@^2.0.1":
2188+
version "2.0.1"
2189+
resolved "https://registry.yarnpkg.com/@iterable-iterator/range/-/range-2.0.1.tgz#3d566aa26e3df496f2ba18a2f67de4c65518e81c"
2190+
integrity sha512-JPkPH/u4AQxWyqXDOqHk4DZeQJANv67cXuiE0DLC0FTaRgExQASlbhPZJo+JVxZRXW2EOBXSzdKdJQe5w9XghA==
2191+
2192+
"@iterable-iterator/sorted@^1.0.0":
2193+
version "1.0.0"
2194+
resolved "https://registry.yarnpkg.com/@iterable-iterator/sorted/-/sorted-1.0.0.tgz#d1b93cb1bb50fe6af2851b4505d2ee2df0d406dc"
2195+
integrity sha512-raMmDjKLp25F51NGnnq3fK4lvkaHZdzB5Pt9AiMKoZKgU8gX0yM+FrdKzMG+RZswtVxre+nrR3Z6E1oGESRfzg==
2196+
dependencies:
2197+
"@iterable-iterator/list" "^1.0.0"
2198+
22322199
"@js-library/[email protected]":
22332200
version "0.0.4"
22342201
resolved "https://registry.yarnpkg.com/@js-library/commitlint-config/-/commitlint-config-0.0.4.tgz#5243a58b0d4ad36999d4b944c7770c50658c68f5"
@@ -2360,6 +2327,11 @@
23602327
dependencies:
23612328
defer-to-connect "^2.0.0"
23622329

2330+
"@total-order/primitive@^1.0.1":
2331+
version "1.0.1"
2332+
resolved "https://registry.yarnpkg.com/@total-order/primitive/-/primitive-1.0.1.tgz#7e409d303a2a3b24ed2af30bd9068027d6a4a326"
2333+
integrity sha512-BXCXyXoQIpdwFkplPRTuxFB0I1GHHia4t22bLAEqjdk48DFwQMwSbHq1EdLA81X/eFC/b6RdVxG4Q+WEcfs0aA==
2334+
23632335
"@types/cacheable-request@^6.0.1":
23642336
version "6.0.1"
23652337
resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976"

0 commit comments

Comments
 (0)