@prosopo/datasets-fs 3.0.161 → 3.0.163
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build$colon$cjs.log +1 -1
- package/.turbo/turbo-build$colon$tsc.log +10 -10
- package/CHANGELOG.md +32 -0
- package/README.md +17 -16
- package/dist/tsc/commands/generate.d.ts.map +1 -1
- package/dist/tsc/commands/generate.js +4 -5
- package/dist/tsc/commands/generate.js.map +1 -1
- package/dist/tsc/commands/get.d.ts.map +1 -1
- package/dist/tsc/commands/get.js +2 -1
- package/dist/tsc/commands/get.js.map +1 -1
- package/dist/tsc/commands/labels.d.ts.map +1 -1
- package/dist/tsc/commands/labels.js +2 -2
- package/dist/tsc/commands/labels.js.map +1 -1
- package/dist/tsc/commands/relocate.d.ts.map +1 -1
- package/dist/tsc/commands/relocate.js +2 -1
- package/dist/tsc/commands/relocate.js.map +1 -1
- package/dist/tsc/commands/resize.d.ts.map +1 -1
- package/dist/tsc/commands/resize.js +2 -1
- package/dist/tsc/commands/resize.js.map +1 -1
- package/dist/tsc/tests/readJsonFile.unit.test.d.ts +2 -0
- package/dist/tsc/tests/readJsonFile.unit.test.d.ts.map +1 -0
- package/dist/tsc/tests/readJsonFile.unit.test.js +34 -0
- package/dist/tsc/tests/readJsonFile.unit.test.js.map +1 -0
- package/dist/tsc/utils/readJsonFile.d.ts +2 -0
- package/dist/tsc/utils/readJsonFile.d.ts.map +1 -0
- package/dist/tsc/utils/readJsonFile.js +4 -0
- package/dist/tsc/utils/readJsonFile.js.map +1 -0
- package/dist/types/commands/generate.d.ts.map +1 -1
- package/dist/types/commands/get.d.ts.map +1 -1
- package/dist/types/commands/labels.d.ts.map +1 -1
- package/dist/types/commands/relocate.d.ts.map +1 -1
- package/dist/types/commands/resize.d.ts.map +1 -1
- package/dist/types/tests/readJsonFile.unit.test.d.ts +2 -0
- package/dist/types/tests/readJsonFile.unit.test.d.ts.map +1 -0
- package/dist/types/utils/readJsonFile.d.ts +2 -0
- package/dist/types/utils/readJsonFile.d.ts.map +1 -0
- package/package.json +6 -6
|
@@ -31,7 +31,7 @@ dist/cjs/index.cjs 0.15 kB │ gzip: 0.14 kB
|
|
|
31
31
|
dist/cjs/_virtual/_rolldown/runtime.cjs 1.00 kB │ gzip: 0.50 kB
|
|
32
32
|
dist/cjs/cli/cli.cjs 1.78 kB │ gzip: 0.83 kB
|
|
33
33
|
|
|
34
|
-
[32m✓ built in
|
|
34
|
+
[32m✓ built in 75ms[39m
|
|
35
35
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/datasets-fs/src/tests/data/flat/data.json to /home/runner/work/captcha/captcha/packages/datasets-fs/dist/cjs/tests/data/flat/data.json
|
|
36
36
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/datasets-fs/src/tests/data/flat_resized/captchas_v1.json to /home/runner/work/captcha/captcha/packages/datasets-fs/dist/cjs/tests/data/flat_resized/captchas_v1.json
|
|
37
37
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/datasets-fs/src/tests/data/flat_resized/captchas_v2.json to /home/runner/work/captcha/captcha/packages/datasets-fs/dist/cjs/tests/data/flat_resized/captchas_v2.json
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
$ tsc --build --verbose
|
|
2
|
-
|
|
2
|
+
4:56:18 PM - Projects in this build:
|
|
3
3
|
* ../../dev/config/tsconfig.json
|
|
4
4
|
* ../util/tsconfig.json
|
|
5
5
|
* ../locale/tsconfig.json
|
|
@@ -9,21 +9,21 @@ $ tsc --build --verbose
|
|
|
9
9
|
* ../logger/tsconfig.json
|
|
10
10
|
* tsconfig.json
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
4:56:18 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/dist/tsc/tsconfig.tsbuildinfo'
|
|
13
13
|
|
|
14
|
-
|
|
14
|
+
4:56:18 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/dist/tsc/tsconfig.tsbuildinfo'
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
4:56:18 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/dist/tsc/tsconfig.tsbuildinfo'
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
4:56:18 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/dist/tsc/tsconfig.tsbuildinfo'
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
4:56:18 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/types.test-d.ts' is older than output '../types/dist/tsc/tsconfig.tsbuildinfo'
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
4:56:18 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/tests/errorSites.unit.test.ts' is older than output '../common/dist/tsc/tsconfig.tsbuildinfo'
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
4:56:18 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/logger.ts' is older than output '../logger/dist/tsc/tsconfig.tsbuildinfo'
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
4:56:18 PM - Project 'tsconfig.json' is out of date because output file 'dist/tsc/tsconfig.tsbuildinfo' does not exist
|
|
27
27
|
|
|
28
|
-
|
|
28
|
+
4:56:18 PM - Building project '/home/runner/work/captcha/captcha/packages/datasets-fs/tsconfig.json'...
|
|
29
29
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,37 @@
|
|
|
1
1
|
# @prosopo/datasets-fs
|
|
2
2
|
|
|
3
|
+
## 3.0.163
|
|
4
|
+
### Patch Changes
|
|
5
|
+
|
|
6
|
+
- 223ec85: Self-hosting no longer needs a Rust toolchain. The guide used `pnpm run build:all`, which also compiles the provider's Rust addons and fails without `cargo`, even though the provider runs from the prebuilt image and nothing built on the host uses those addons. The new `pnpm run build:self-hosted` builds only what the env script and the widget need. `build:all` is unchanged.
|
|
7
|
+
|
|
8
|
+
`docker-compose.self-hosted.yml` now sets `platform: linux/amd64` on the provider and Caddy, because those images are only published for amd64; the guide says ARM hosts run them under emulation. Its default Caddy image moves from 2.5.9 to 2.5.12: `docker/provider.Caddyfile` uses `crawler_list`, which 2.5.9 does not have, so Caddy would not start.
|
|
9
|
+
|
|
10
|
+
The `@prosopo/datasets-fs` `cli` script pointed at `dist/esm/cli.js`, which the build never writes. It now runs `dist/tsc/cli.js`, the file `build:tsc` writes, and the guide and the package README build and run the CLI that way.
|
|
11
|
+
|
|
12
|
+
Other corrections in the guide: the detector example runs `bundle` (`detector-botd` has no `build` script), and the expected startup log line is `bundle pool loaded {"count":0}`.
|
|
13
|
+
- Updated dependencies [b80b627]
|
|
14
|
+
- Updated dependencies [007f43c]
|
|
15
|
+
- @prosopo/types@5.25.0
|
|
16
|
+
- @prosopo/common@3.3.2
|
|
17
|
+
|
|
18
|
+
## 3.0.162
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- cdea91f: Stop malformed input from turning into silent wrong values or unhandled throws. Numbers from env vars, headers, request fields and CLI flags are now parsed strictly: "12abc" is no longer read as 12, and an empty string is no longer read as 0. A bad request timestamp now gets a 400 response instead of a 500 or NaN. JSON reads name the file or source that was bad, and JSON writes no longer throw on bigints. Composite IP addresses and dates that cannot be read are now rejected instead of crashing or slipping through as an Invalid Date.
|
|
22
|
+
- Updated dependencies [91ef450]
|
|
23
|
+
- Updated dependencies [7c58be4]
|
|
24
|
+
- Updated dependencies [cdea91f]
|
|
25
|
+
- Updated dependencies [f679760]
|
|
26
|
+
- Updated dependencies [cf9a1bb]
|
|
27
|
+
- Updated dependencies [cdea91f]
|
|
28
|
+
- Updated dependencies [ec4ed10]
|
|
29
|
+
- @prosopo/types@5.24.0
|
|
30
|
+
- @prosopo/logger@2.1.8
|
|
31
|
+
- @prosopo/util-crypto@13.6.4
|
|
32
|
+
- @prosopo/util@3.5.0
|
|
33
|
+
- @prosopo/common@3.3.2
|
|
34
|
+
|
|
3
35
|
## 3.0.161
|
|
4
36
|
### Patch Changes
|
|
5
37
|
|
package/README.md
CHANGED
|
@@ -6,15 +6,15 @@ You need this only if you want image CAPTCHAs. `pow` needs no imagery, and `puzz
|
|
|
6
6
|
procedurally at request time. See the [self-hosting guide](https://docs.prosopo.io/en/self-hosting/) for the wider
|
|
7
7
|
context.
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
After `pnpm run build:self-hosted` in the repository root, build the CLI once, then run it from this package directory:
|
|
10
10
|
|
|
11
11
|
```bash
|
|
12
|
-
pnpm --filter @prosopo/datasets-fs run build
|
|
13
|
-
node dist/cli.js --help
|
|
12
|
+
pnpm --filter @prosopo/datasets-fs run build:tsc
|
|
13
|
+
node dist/tsc/cli.js --help
|
|
14
14
|
```
|
|
15
15
|
|
|
16
16
|
Commands: `flatten`, `labels`, `resize`, `relocate`, `get`, `generate-v1`, `generate-v2`. Every command takes
|
|
17
|
-
`--input`/`--in`, `--output`/`--out` and `--overwrite`; run `node dist/cli.js <command> --help` for the rest.
|
|
17
|
+
`--input`/`--in`, `--output`/`--out` and `--overwrite`; run `node dist/tsc/cli.js <command> --help` for the rest.
|
|
18
18
|
|
|
19
19
|
## The images must be publicly reachable
|
|
20
20
|
|
|
@@ -42,7 +42,7 @@ Collapses the tree into a single image directory plus a `data.json` mapping each
|
|
|
42
42
|
renamed to their content hash.
|
|
43
43
|
|
|
44
44
|
```bash
|
|
45
|
-
node dist/cli.js flatten --in ./data --out ./flat --overwrite
|
|
45
|
+
node dist/tsc/cli.js flatten --in ./data --out ./flat --overwrite
|
|
46
46
|
```
|
|
47
47
|
|
|
48
48
|
`./flat/data.json` looks like this — note the `items` wrapper, and that `data` is still a local path at this stage:
|
|
@@ -63,7 +63,7 @@ node dist/cli.js flatten --in ./data --out ./flat --overwrite
|
|
|
63
63
|
### 2. Extract the labels
|
|
64
64
|
|
|
65
65
|
```bash
|
|
66
|
-
node dist/cli.js labels --in ./flat/data.json --out ./labels.json --overwrite
|
|
66
|
+
node dist/tsc/cli.js labels --in ./flat/data.json --out ./labels.json --overwrite
|
|
67
67
|
```
|
|
68
68
|
|
|
69
69
|
```json
|
|
@@ -73,7 +73,7 @@ node dist/cli.js labels --in ./flat/data.json --out ./labels.json --overwrite
|
|
|
73
73
|
### 3. Resize (optional)
|
|
74
74
|
|
|
75
75
|
```bash
|
|
76
|
-
node dist/cli.js resize --in ./flat/data.json --out ./resized --size 128 --square --overwrite
|
|
76
|
+
node dist/tsc/cli.js resize --in ./flat/data.json --out ./resized --size 128 --square --overwrite
|
|
77
77
|
```
|
|
78
78
|
|
|
79
79
|
### 4. Point the entries at your host
|
|
@@ -81,18 +81,19 @@ node dist/cli.js resize --in ./flat/data.json --out ./resized --size 128 --squar
|
|
|
81
81
|
Upload the images, then rewrite the local paths to the URLs they now live at:
|
|
82
82
|
|
|
83
83
|
```bash
|
|
84
|
-
node dist/cli.js relocate \
|
|
84
|
+
node dist/tsc/cli.js relocate \
|
|
85
85
|
--in ./flat/data.json \
|
|
86
86
|
--out ./data-hosted.json \
|
|
87
|
-
--from /
|
|
87
|
+
--from "$PWD/flat/images" \
|
|
88
88
|
--to https://img.example.com \
|
|
89
89
|
--overwrite
|
|
90
90
|
```
|
|
91
91
|
|
|
92
|
-
Check every URL actually
|
|
92
|
+
Check every URL actually loads before going further. `get` logs `failed` for each one that doesn't, but still exits 0,
|
|
93
|
+
so read its output:
|
|
93
94
|
|
|
94
95
|
```bash
|
|
95
|
-
node dist/cli.js get --in ./data-hosted.json
|
|
96
|
+
node dist/tsc/cli.js get --in ./data-hosted.json
|
|
96
97
|
```
|
|
97
98
|
|
|
98
99
|
### 5. Generate the captchas
|
|
@@ -100,7 +101,7 @@ node dist/cli.js get --in ./data-hosted.json
|
|
|
100
101
|
`generate-v2` mixes labelled and unlabelled images into a single round:
|
|
101
102
|
|
|
102
103
|
```bash
|
|
103
|
-
node dist/cli.js generate-v2 \
|
|
104
|
+
node dist/tsc/cli.js generate-v2 \
|
|
104
105
|
--out ./captchas.json \
|
|
105
106
|
--labelled ./data-hosted.json \
|
|
106
107
|
--unlabelled ./data-hosted.json \
|
|
@@ -147,8 +148,8 @@ docker compose exec provider /nodejs/bin/node /usr/src/app/provider.cli.bundle.j
|
|
|
147
148
|
The fixtures under `src/tests/data` were produced with:
|
|
148
149
|
|
|
149
150
|
```bash
|
|
150
|
-
node dist/cli.js flatten --in ./src/tests/data/hierarchical --out ./src/tests/data/flat --overwrite
|
|
151
|
-
node dist/cli.js resize --square --size 128 --in ./src/tests/data/flat/data.json --out ./src/tests/data/flat_resized --overwrite
|
|
152
|
-
node dist/cli.js labels --in ./src/tests/data/flat_resized/data.json --out ./src/tests/data/flat_resized/labels.json --overwrite
|
|
153
|
-
node dist/cli.js relocate --from '${repo}' --to newwebsite.com --in ./src/tests/data/flat_resized/data.json --out ./src/tests/data/flat_resized/relocated_data.json --overwrite
|
|
151
|
+
node dist/tsc/cli.js flatten --in ./src/tests/data/hierarchical --out ./src/tests/data/flat --overwrite
|
|
152
|
+
node dist/tsc/cli.js resize --square --size 128 --in ./src/tests/data/flat/data.json --out ./src/tests/data/flat_resized --overwrite
|
|
153
|
+
node dist/tsc/cli.js labels --in ./src/tests/data/flat_resized/data.json --out ./src/tests/data/flat_resized/labels.json --overwrite
|
|
154
|
+
node dist/tsc/cli.js relocate --from '${repo}' --to newwebsite.com --in ./src/tests/data/flat_resized/data.json --out ./src/tests/data/flat_resized/relocated_data.json --overwrite
|
|
154
155
|
```
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,IAAI,EAET,KAAK,YAAY,EAEjB,MAAM,gBAAgB,CAAC;AAexB,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAoB,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,IAAI,EAET,KAAK,YAAY,EAEjB,MAAM,gBAAgB,CAAC;AAexB,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAoB,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,8BAAsB,QAAQ,CAC7B,CAAC,SAAS,cAAc,CACvB,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACZ,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA6CJ,MAAM,CAAC,IAAI,EAAE,IAAI;IAsBvC,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,UAAU,EAAE,IAAI,EAAE,CAAM;IACxB,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,eAAe,SAAM;IACrB,iBAAiB,SAAM;IACvB,aAAa,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,CAAA;KAAE,CAAM;IAChD,OAAO,EAAE,MAAM,EAAE,CAAM;IACvB,UAAU,SAAM;IAEhB,OAAO,CAAC,QAAQ;IA8BhB,OAAO,CAAC,UAAU;IAeI,IAAI,CAAC,IAAI,EAAE,IAAI;CAWrC;AAED,eAAO,MAAM,eAAe,aACjB,YAAY,EAAE,cACZ,IAAI,EAAE,WACT;IACR,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACpC,SAOD,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { DataSchema, LabelledDataSchema, LabelsContainerSchema, } from "@prosopo
|
|
|
4
4
|
import { lodash, setSeedGlobal } from "@prosopo/util/lodash";
|
|
5
5
|
import * as z from "zod";
|
|
6
6
|
import { OutputArgsSchema, OutputCliCommand } from "../utils/output.js";
|
|
7
|
+
import { readJsonFile } from "../utils/readJsonFile.js";
|
|
7
8
|
export const ArgsSchema = OutputArgsSchema.extend({
|
|
8
9
|
labels: z.string().optional(),
|
|
9
10
|
labelled: z.string().optional(),
|
|
@@ -93,10 +94,10 @@ export class Generate extends OutputCliCommand {
|
|
|
93
94
|
const allowDuplicatesLabelled = args.allowDuplicatesLabelled || args.allowDuplicates || false;
|
|
94
95
|
const allowDuplicatesUnlabelled = args.allowDuplicatesUnlabelled || args.allowDuplicates || false;
|
|
95
96
|
this.labelled = this.labelledMapFile
|
|
96
|
-
? LabelledDataSchema.parse(
|
|
97
|
+
? LabelledDataSchema.parse(readJsonFile(this.labelledMapFile)).items
|
|
97
98
|
: [];
|
|
98
99
|
this.unlabelled = this.unlabelledMapFile
|
|
99
|
-
? DataSchema.parse(
|
|
100
|
+
? DataSchema.parse(readJsonFile(this.unlabelledMapFile)).items
|
|
100
101
|
: [];
|
|
101
102
|
checkDuplicates(this.labelled, this.unlabelled, {
|
|
102
103
|
allowDuplicatesLabelled,
|
|
@@ -113,9 +114,7 @@ export class Generate extends OutputCliCommand {
|
|
|
113
114
|
loadLabels(args) {
|
|
114
115
|
this.labels = [];
|
|
115
116
|
if (args.labels && fs.existsSync(args.labels)) {
|
|
116
|
-
this.labels.push(...[
|
|
117
|
-
...LabelsContainerSchema.parse(JSON.parse(fs.readFileSync(args.labels, "utf8"))).labels,
|
|
118
|
-
]);
|
|
117
|
+
this.labels.push(...[...LabelsContainerSchema.parse(readJsonFile(args.labels)).labels]);
|
|
119
118
|
}
|
|
120
119
|
else {
|
|
121
120
|
this.labels.push(...[...this.targets]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACN,UAAU,EAEV,kBAAkB,EAElB,qBAAqB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAc7D,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/get.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/get.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGrE,eAAO,MAAM,UAAU;;;;;;EAA6B,CAAC;AACrD,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAC3C,qBAAa,GAAI,SAAQ,eAAe,CAAC,cAAc,CAAC;IACvC,YAAY;;;;;;;IAIZ,UAAU;;;;;;;;;;;;IAQJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAyErB,cAAc,IAAI,MAAM;CAGxC"}
|
package/dist/tsc/commands/get.js
CHANGED
|
@@ -4,6 +4,7 @@ import { lodash } from "@prosopo/util/lodash";
|
|
|
4
4
|
import cliProgress from "cli-progress";
|
|
5
5
|
import * as z from "zod";
|
|
6
6
|
import { InputArgsSchema, InputCliCommand } from "../utils/input.js";
|
|
7
|
+
import { readJsonFile } from "../utils/readJsonFile.js";
|
|
7
8
|
export const ArgsSchema = InputArgsSchema.extend({});
|
|
8
9
|
export class Get extends InputCliCommand {
|
|
9
10
|
getArgSchema() {
|
|
@@ -41,7 +42,7 @@ export class Get extends InputCliCommand {
|
|
|
41
42
|
return data;
|
|
42
43
|
};
|
|
43
44
|
const file = args.input;
|
|
44
|
-
const data =
|
|
45
|
+
const data = readJsonFile(file);
|
|
45
46
|
await traverse(data);
|
|
46
47
|
bar.start(list.length, 0);
|
|
47
48
|
for (const url of list) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,WAAW,MAAM,cAAc,CAAC;AAcvC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/commands/get.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/commands/labels.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAC9B,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/commands/labels.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAC9B,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;EAAmC,CAAC;AAC3D,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAChD,YAAY;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;IAWJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAgCrB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -3,6 +3,7 @@ import { ProsopoError } from "@prosopo/common";
|
|
|
3
3
|
import { LabelledDataSchema } from "@prosopo/types";
|
|
4
4
|
import { lodash } from "@prosopo/util/lodash";
|
|
5
5
|
import { InputOutputArgsSchema, InputOutputCliCommand, } from "../utils/inputOutput.js";
|
|
6
|
+
import { readJsonFile } from "../utils/readJsonFile.js";
|
|
6
7
|
export const ArgsSchema = InputOutputArgsSchema.extend({});
|
|
7
8
|
export class Labels extends InputOutputCliCommand {
|
|
8
9
|
getArgSchema() {
|
|
@@ -29,8 +30,7 @@ export class Labels extends InputOutputCliCommand {
|
|
|
29
30
|
});
|
|
30
31
|
}
|
|
31
32
|
const labelled = file
|
|
32
|
-
? LabelledDataSchema.parse(
|
|
33
|
-
.items
|
|
33
|
+
? LabelledDataSchema.parse(readJsonFile(file)).items
|
|
34
34
|
: [];
|
|
35
35
|
const labels = new Set();
|
|
36
36
|
for (const item of labelled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../../src/commands/labels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAe9C,OAAO,EACN,qBAAqB,EACrB,qBAAqB,GACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../../src/commands/labels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAqB,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAe9C,OAAO,EACN,qBAAqB,EACrB,qBAAqB,GACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAI3D,MAAM,OAAO,MAAO,SAAQ,qBAAqC;IAChD,YAAY;QAC3B,OAAO,UAAU,CAAC;IACnB,CAAC;IAEe,UAAU;QACzB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACzC,KAAK,EAAE;gBACN,WAAW,EAAE,oCAAoC;aACjD;YACD,MAAM,EAAE;gBACP,WAAW,EAAE,8CAA8C;aAC3D;SACD,CAAC,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACpC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,YAAY,CAAC;gBACtB,IAAI,EAAE,YAAY;gBAClB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,wBAAwB,IAAI,EAAE;aACvC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAmB,IAAI;YACpC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;YACpD,CAAC,CAAC,EAAE,CAAC;QAEN,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,UAAU,CAAC,IAAI,EAAE,CAAC;QAElB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC3D,SAAS,EAAE,IAAI;SACf,CAAC,CAAC;QACH,EAAE,CAAC,aAAa,CACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAC/C,CAAC;IACH,CAAC;IAEe,cAAc;QAC7B,OAAO,+BAA+B,CAAC;IACxC,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relocate.d.ts","sourceRoot":"","sources":["../../../src/commands/relocate.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"relocate.d.ts","sourceRoot":"","sources":["../../../src/commands/relocate.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;EAGrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,QAAS,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAClD,YAAY;;;;;;;;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;;;;;;;;;;;IAsBJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAiDrB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -3,6 +3,7 @@ import { get } from "@prosopo/util";
|
|
|
3
3
|
import { lodash } from "@prosopo/util/lodash";
|
|
4
4
|
import * as z from "zod";
|
|
5
5
|
import { InputOutputArgsSchema, InputOutputCliCommand, } from "../utils/inputOutput.js";
|
|
6
|
+
import { readJsonFile } from "../utils/readJsonFile.js";
|
|
6
7
|
export const ArgsSchema = InputOutputArgsSchema.extend({
|
|
7
8
|
from: z.string(),
|
|
8
9
|
to: z.string(),
|
|
@@ -67,7 +68,7 @@ export class Relocate extends InputOutputCliCommand {
|
|
|
67
68
|
};
|
|
68
69
|
const file = args.input;
|
|
69
70
|
this.logger.info(() => ({ data: args, msg: "relocate" }));
|
|
70
|
-
let data =
|
|
71
|
+
let data = readJsonFile(file);
|
|
71
72
|
data = replace(data, args.from, args.to);
|
|
72
73
|
fs.mkdirSync(args.output.split("/").slice(0, -1).join("/"), {
|
|
73
74
|
recursive: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../../src/commands/relocate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAc9C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EACN,qBAAqB,EACrB,qBAAqB,GACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../../src/commands/relocate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../src/commands/resize.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../src/commands/resize.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;EAGrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAChD,YAAY;;;;;;;;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;;;;;;;;;IAuBJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAqGrB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -8,6 +8,7 @@ import cliProgress from "cli-progress";
|
|
|
8
8
|
import sharp from "sharp";
|
|
9
9
|
import * as z from "zod";
|
|
10
10
|
import { InputOutputArgsSchema, InputOutputCliCommand, } from "../utils/inputOutput.js";
|
|
11
|
+
import { readJsonFile } from "../utils/readJsonFile.js";
|
|
11
12
|
export const ArgsSchema = InputOutputArgsSchema.extend({
|
|
12
13
|
size: z.number(),
|
|
13
14
|
square: z.boolean().optional(),
|
|
@@ -57,7 +58,7 @@ export class Resize extends InputOutputCliCommand {
|
|
|
57
58
|
}
|
|
58
59
|
const imgDir = `${outDir}/images`;
|
|
59
60
|
fs.mkdirSync(imgDir, { recursive: true });
|
|
60
|
-
const inputItems = DataSchema.parse(
|
|
61
|
+
const inputItems = DataSchema.parse(readJsonFile(mapFile)).items;
|
|
61
62
|
const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
|
|
62
63
|
bar.start(inputItems.length, 0);
|
|
63
64
|
const outputItems = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../../src/commands/resize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAa,UAAU,EAAa,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAc1B,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EACN,qBAAqB,EACrB,qBAAqB,GACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../../src/commands/resize.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readJsonFile.unit.test.d.ts","sourceRoot":"","sources":["../../../src/tests/readJsonFile.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
5
|
+
import { readJsonFile } from "../utils/readJsonFile.js";
|
|
6
|
+
describe("readJsonFile", () => {
|
|
7
|
+
let dir;
|
|
8
|
+
beforeEach(() => {
|
|
9
|
+
dir = fs.mkdtempSync(path.join(os.tmpdir(), "datasets-fs-json-"));
|
|
10
|
+
});
|
|
11
|
+
afterEach(() => {
|
|
12
|
+
fs.rmSync(dir, { recursive: true, force: true });
|
|
13
|
+
});
|
|
14
|
+
const write = (name, text) => {
|
|
15
|
+
const file = path.join(dir, name);
|
|
16
|
+
fs.writeFileSync(file, text);
|
|
17
|
+
return file;
|
|
18
|
+
};
|
|
19
|
+
it("parses a JSON file", () => {
|
|
20
|
+
expect(readJsonFile(write("ok.json", '{"items":[1]}'))).toEqual({
|
|
21
|
+
items: [1],
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
it("names the file when it is not JSON", () => {
|
|
25
|
+
const file = write("bad.json", "{not json");
|
|
26
|
+
expect(() => readJsonFile(file)).toThrow(file);
|
|
27
|
+
});
|
|
28
|
+
it("reads large integers as numbers, as the dataset schemas expect", () => {
|
|
29
|
+
expect(readJsonFile(write("big.json", "[9007199254740993]"))).toEqual([
|
|
30
|
+
9007199254740992,
|
|
31
|
+
]);
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
//# sourceMappingURL=readJsonFile.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readJsonFile.unit.test.js","sourceRoot":"","sources":["../../../src/tests/readJsonFile.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,IAAI,GAAW,CAAC;IAEhB,UAAU,CAAC,GAAG,EAAE;QACf,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,IAAY,EAAU,EAAE;QACpD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAClC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACb,CAAC,CAAC;IAEF,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC7B,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,CAAC,CAAC,CAAC;SACV,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5C,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACzE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACrE,gBAAgB;SAChB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readJsonFile.d.ts","sourceRoot":"","sources":["../../../src/utils/readJsonFile.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,OAG1C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readJsonFile.js","sourceRoot":"","sources":["../../../src/utils/readJsonFile.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAQ1C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAW,EAAE,CACrD,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,CACrE,WAAW,IAAI,EAAE,CACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,IAAI,EAET,KAAK,YAAY,EAEjB,MAAM,gBAAgB,CAAC;AAexB,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAoB,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/commands/generate.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,IAAI,EAET,KAAK,YAAY,EAEjB,MAAM,gBAAgB,CAAC;AAexB,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAoB,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,8BAAsB,QAAQ,CAC7B,CAAC,SAAS,cAAc,CACvB,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IACZ,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA6CJ,MAAM,CAAC,IAAI,EAAE,IAAI;IAsBvC,QAAQ,EAAE,YAAY,EAAE,CAAM;IAC9B,UAAU,EAAE,IAAI,EAAE,CAAM;IACxB,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,eAAe,SAAM;IACrB,iBAAiB,SAAM;IACvB,aAAa,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,CAAA;KAAE,CAAM;IAChD,OAAO,EAAE,MAAM,EAAE,CAAM;IACvB,UAAU,SAAM;IAEhB,OAAO,CAAC,QAAQ;IA8BhB,OAAO,CAAC,UAAU;IAeI,IAAI,CAAC,IAAI,EAAE,IAAI;CAWrC;AAED,eAAO,MAAM,eAAe,aACjB,YAAY,EAAE,cACZ,IAAI,EAAE,WACT;IACR,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACpC,SAOD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/get.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/get.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAmB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGrE,eAAO,MAAM,UAAU;;;;;;EAA6B,CAAC;AACrD,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAC3C,qBAAa,GAAI,SAAQ,eAAe,CAAC,cAAc,CAAC;IACvC,YAAY;;;;;;;IAIZ,UAAU;;;;;;;;;;;;IAQJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAyErB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/commands/labels.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAC9B,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../../src/commands/labels.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAC9B,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;EAAmC,CAAC;AAC3D,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAChD,YAAY;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;IAWJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAgCrB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relocate.d.ts","sourceRoot":"","sources":["../../../src/commands/relocate.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"relocate.d.ts","sourceRoot":"","sources":["../../../src/commands/relocate.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;EAGrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,QAAS,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAClD,YAAY;;;;;;;;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;;;;;;;;;;;IAsBJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAiDrB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../src/commands/resize.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../../src/commands/resize.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAGjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;EAGrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAChD,YAAY;;;;;;;;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;;;;;;;;;IAuBJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAqGrB,cAAc,IAAI,MAAM;CAGxC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readJsonFile.unit.test.d.ts","sourceRoot":"","sources":["../../../src/tests/readJsonFile.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readJsonFile.d.ts","sourceRoot":"","sources":["../../../src/utils/readJsonFile.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,OAG1C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/datasets-fs",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.163",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"private": false,
|
|
@@ -20,10 +20,10 @@
|
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@noble/hashes": "2.4.0",
|
|
22
22
|
"@prosopo/common": "3.3.2",
|
|
23
|
-
"@prosopo/logger": "2.1.
|
|
24
|
-
"@prosopo/types": "5.
|
|
25
|
-
"@prosopo/util": "3.
|
|
26
|
-
"@prosopo/util-crypto": "13.6.
|
|
23
|
+
"@prosopo/logger": "2.1.8",
|
|
24
|
+
"@prosopo/types": "5.25.0",
|
|
25
|
+
"@prosopo/util": "3.5.0",
|
|
26
|
+
"@prosopo/util-crypto": "13.6.4",
|
|
27
27
|
"bcrypt": "6.0.0",
|
|
28
28
|
"cli-progress": "3.12.0",
|
|
29
29
|
"sharp": "0.35.5",
|
|
@@ -71,6 +71,6 @@
|
|
|
71
71
|
"build:cjs": "NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV",
|
|
72
72
|
"build:types": "tsc --project tsconfig.types.json",
|
|
73
73
|
"test": "NODE_ENV=${NODE_ENV:-test}; pnpm exec vitest run --config ./vite.test.config.ts",
|
|
74
|
-
"cli": "node ./dist/
|
|
74
|
+
"cli": "node ./dist/tsc/cli.js"
|
|
75
75
|
}
|
|
76
76
|
}
|