@prosopo/datasets-fs 3.0.150 → 3.0.151
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 +10 -10
- package/.turbo/turbo-build$colon$tsc.log +11 -11
- package/.turbo/turbo-build.log +9 -9
- package/CHANGELOG.md +49 -0
- package/dist/cjs/cli/cli.cjs +5 -1
- package/dist/cli/cli.d.ts.map +1 -1
- package/dist/cli/cli.js +6 -2
- package/dist/cli/cli.js.map +1 -1
- package/dist/commands/flatten.d.ts.map +1 -1
- package/dist/commands/flatten.js +5 -2
- package/dist/commands/flatten.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +13 -6
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/generateV1.d.ts.map +1 -1
- package/dist/commands/generateV1.js +21 -11
- package/dist/commands/generateV1.js.map +1 -1
- package/dist/commands/generateV2.d.ts.map +1 -1
- package/dist/commands/generateV2.js +17 -9
- package/dist/commands/generateV2.js.map +1 -1
- package/dist/commands/labels.d.ts.map +1 -1
- package/dist/commands/labels.js +5 -3
- package/dist/commands/labels.js.map +1 -1
- package/dist/commands/resize.d.ts.map +1 -1
- package/dist/commands/resize.js +9 -5
- package/dist/commands/resize.js.map +1 -1
- package/dist/errorSites.d.ts +29 -0
- package/dist/errorSites.d.ts.map +1 -0
- package/dist/errorSites.js +2 -0
- package/dist/errorSites.js.map +1 -0
- package/dist/utils/input.d.ts.map +1 -1
- package/dist/utils/input.js +7 -5
- package/dist/utils/input.js.map +1 -1
- package/dist/utils/output.d.ts.map +1 -1
- package/dist/utils/output.js +7 -5
- package/dist/utils/output.js.map +1 -1
- package/package.json +11 -11
|
@@ -3,25 +3,25 @@ ViteCommonJSConfig: .
|
|
|
3
3
|
{
|
|
4
4
|
tsConfigPaths: [
|
|
5
5
|
'/home/runner/work/captcha/captcha/packages/common/tsconfig.json',
|
|
6
|
+
'/home/runner/work/captcha/captcha/packages/types/tsconfig.json',
|
|
6
7
|
'/home/runner/work/captcha/captcha/packages/locale/tsconfig.json',
|
|
7
8
|
'/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
|
|
8
|
-
'/home/runner/work/captcha/captcha/packages/
|
|
9
|
-
'/home/runner/work/captcha/captcha/packages/
|
|
10
|
-
'/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json'
|
|
9
|
+
'/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json',
|
|
10
|
+
'/home/runner/work/captcha/captcha/packages/logger/tsconfig.json'
|
|
11
11
|
]
|
|
12
12
|
}
|
|
13
|
-
[33mThe plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the [1mresolve.tsconfigPaths[22m option. You can remove the plugin and set [1mresolve.tsconfigPaths: true[22m in your Vite config instead.[39m
|
|
14
13
|
{
|
|
15
14
|
externals: [
|
|
16
15
|
'@prosopo/common',
|
|
16
|
+
'@prosopo/types',
|
|
17
17
|
'@prosopo/locale',
|
|
18
18
|
'@prosopo/util',
|
|
19
|
-
'@prosopo/
|
|
20
|
-
'@prosopo/
|
|
21
|
-
'@prosopo/util-crypto'
|
|
19
|
+
'@prosopo/util-crypto',
|
|
20
|
+
'@prosopo/logger'
|
|
22
21
|
]
|
|
23
22
|
}
|
|
24
|
-
[
|
|
23
|
+
[33mThe plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the [1mresolve.tsconfigPaths[22m option. You can remove the plugin and set [1mresolve.tsconfigPaths: true[22m in your Vite config instead.[39m
|
|
24
|
+
[36mvite v8.1.6 [32mbuilding ssr environment for production...[36m[39m
|
|
25
25
|
Bundle build started
|
|
26
26
|
[2K
|
|
27
27
|
✓ 3 modules transformed.
|
|
@@ -29,9 +29,9 @@ rendering chunks...
|
|
|
29
29
|
computing gzip size...
|
|
30
30
|
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
|
-
dist/cjs/cli/cli.cjs 1.
|
|
32
|
+
dist/cjs/cli/cli.cjs 1.78 kB │ gzip: 0.83 kB
|
|
33
33
|
|
|
34
|
-
[32m✓ built in
|
|
34
|
+
[32m✓ built in 57ms[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/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/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/tests/data/flat_resized/captchas_v2.json
|
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
$ tsc --build --verbose
|
|
2
|
-
|
|
2
|
+
5:08:00 PM - Projects in this build:
|
|
3
3
|
* ../../dev/config/tsconfig.json
|
|
4
4
|
* ../util/tsconfig.json
|
|
5
5
|
* ../locale/tsconfig.json
|
|
6
|
-
* ../logger/tsconfig.json
|
|
7
6
|
* ../util-crypto/tsconfig.json
|
|
8
7
|
* ../types/tsconfig.json
|
|
9
8
|
* ../common/tsconfig.json
|
|
9
|
+
* ../logger/tsconfig.json
|
|
10
10
|
* tsconfig.json
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
5:08:00 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/tsconfig.tsbuildinfo'
|
|
13
13
|
|
|
14
|
-
|
|
14
|
+
5:08:00 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
5:08:00 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
|
|
17
17
|
|
|
18
|
-
|
|
18
|
+
5:08:00 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
5:08:00 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/types.test-d.ts' is older than output '../types/tsconfig.tsbuildinfo'
|
|
21
21
|
|
|
22
|
-
|
|
22
|
+
5:08:00 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/errorCodes.ts' is older than output '../common/tsconfig.tsbuildinfo'
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
5:08:00 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
5:08:00 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
|
|
27
27
|
|
|
28
|
-
|
|
28
|
+
5:08:00 PM - Building project '/home/runner/work/captcha/captcha/packages/datasets-fs/tsconfig.json'...
|
|
29
29
|
|
package/.turbo/turbo-build.log
CHANGED
|
@@ -4,25 +4,25 @@ ViteEsmConfig: .
|
|
|
4
4
|
{
|
|
5
5
|
tsConfigPaths: [
|
|
6
6
|
'/home/runner/work/captcha/captcha/packages/common/tsconfig.json',
|
|
7
|
+
'/home/runner/work/captcha/captcha/packages/types/tsconfig.json',
|
|
7
8
|
'/home/runner/work/captcha/captcha/packages/locale/tsconfig.json',
|
|
8
9
|
'/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
|
|
9
|
-
'/home/runner/work/captcha/captcha/packages/
|
|
10
|
-
'/home/runner/work/captcha/captcha/packages/
|
|
11
|
-
'/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json'
|
|
10
|
+
'/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json',
|
|
11
|
+
'/home/runner/work/captcha/captcha/packages/logger/tsconfig.json'
|
|
12
12
|
]
|
|
13
13
|
}
|
|
14
14
|
{
|
|
15
15
|
externals: [
|
|
16
16
|
'@prosopo/common',
|
|
17
|
+
'@prosopo/types',
|
|
17
18
|
'@prosopo/locale',
|
|
18
19
|
'@prosopo/util',
|
|
19
|
-
'@prosopo/
|
|
20
|
-
'@prosopo/
|
|
21
|
-
'@prosopo/util-crypto'
|
|
20
|
+
'@prosopo/util-crypto',
|
|
21
|
+
'@prosopo/logger'
|
|
22
22
|
]
|
|
23
23
|
}
|
|
24
24
|
[33mThe plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the [1mresolve.tsconfigPaths[22m option. You can remove the plugin and set [1mresolve.tsconfigPaths: true[22m in your Vite config instead.[39m
|
|
25
|
-
[36mvite v8.1.
|
|
25
|
+
[36mvite v8.1.6 [32mbuilding ssr environment for production...[36m[39m
|
|
26
26
|
Bundle build started
|
|
27
27
|
[2K
|
|
28
28
|
✓ 3 modules transformed.
|
|
@@ -30,9 +30,9 @@ rendering chunks...
|
|
|
30
30
|
computing gzip size...
|
|
31
31
|
dist/_virtual/_rolldown/runtime.js 0.04 kB │ gzip: 0.06 kB
|
|
32
32
|
dist/index.js 0.09 kB │ gzip: 0.09 kB
|
|
33
|
-
dist/cli/cli.js 1.
|
|
33
|
+
dist/cli/cli.js 1.56 kB │ gzip: 0.76 kB
|
|
34
34
|
|
|
35
|
-
[32m✓ built in
|
|
35
|
+
[32m✓ built in 82ms[39m
|
|
36
36
|
[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/tests/data/flat/data.json
|
|
37
37
|
[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/tests/data/flat_resized/captchas_v1.json
|
|
38
38
|
[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/tests/data/flat_resized/captchas_v2.json
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,54 @@
|
|
|
1
1
|
# @prosopo/datasets-fs
|
|
2
2
|
|
|
3
|
+
## 3.0.151
|
|
4
|
+
### Patch Changes
|
|
5
|
+
|
|
6
|
+
- 46b97b7: Roll up the open Dependabot updates: express 5 (with `@types/express` 5), dotenv 18, undici 8, geolib 4, vitest 5, vite 8.1.6 everywhere, 17 minor and patch bumps (Babel, mongoose, i18next, ip-address, turbo and others), `@angular/router` in the Angular demo, and a GitHub Actions bump.
|
|
7
|
+
|
|
8
|
+
The whole vitest family moves to 5.0.4, including `@vitest/coverage-v8`, because `@vitest/browser-playwright` 5 only works with vitest 5. The `@types/express-serve-static-core` override moves to 5.1.3 to match `@types/express` 5.
|
|
9
|
+
|
|
10
|
+
`@prosopo/dotenv` now loads env files with `quiet: true`. Since dotenv 17, every load prints an "injected env" line to stderr unless told not to.
|
|
11
|
+
- d2148c8: Errors now carry a fixed code and a site instead of a translation key.
|
|
12
|
+
|
|
13
|
+
Every error is a `ProsopoError` with a `code` from one list in
|
|
14
|
+
`@prosopo/common` (`ERROR_CODES`) and an `errorSite` such as `PROV-12`, which
|
|
15
|
+
names the one place it was thrown. Together they make the `errorId`, e.g.
|
|
16
|
+
`SITE_KEY_INVALID:PROV-31`, which the widget shows after the message so a
|
|
17
|
+
screenshot is enough to find the throw.
|
|
18
|
+
|
|
19
|
+
What a client sees:
|
|
20
|
+
|
|
21
|
+
- A public error (bad site key, blocked network, and so on) sends its code,
|
|
22
|
+
English message, data and errorId.
|
|
23
|
+
- Anything else sends only `BACKEND_ERROR:<site>` (or `FRONTEND_ERROR:<site>`
|
|
24
|
+
from the widget) and a status. Internal details never leave the server.
|
|
25
|
+
|
|
26
|
+
The provider no longer translates errors. The widget looks up
|
|
27
|
+
`ERRORS.<CODE>` in its catalogue and falls back to the English message. The
|
|
28
|
+
old error classes (`ProsopoApiError`, `ProsopoEnvError` and the rest), the
|
|
29
|
+
`key`/`messageEn` fields and `localiseErrorMessage` are gone.
|
|
30
|
+
|
|
31
|
+
Other changes in behaviour:
|
|
32
|
+
|
|
33
|
+
- An error with no specific code is a hidden 500.
|
|
34
|
+
- Errors no longer log themselves when they are created. The server logs each
|
|
35
|
+
unhandled one once: 5xx as errors, 4xx at debug.
|
|
36
|
+
- An invalid PoW signature is a 401 instead of a 500.
|
|
37
|
+
- `stringifyBigInts` returns a copy instead of changing its input, so frozen
|
|
38
|
+
error context can be logged.
|
|
39
|
+
- The provider's last hand-written error replies now use the same error body.
|
|
40
|
+
These were the missing-header 401s, the access-policy block, autoBan, the
|
|
41
|
+
metrics 401/403 and the rate limiter. The rate limiter answers with a new
|
|
42
|
+
public `RATE_LIMITED` (429) code.
|
|
43
|
+
- Updated dependencies [46b97b7]
|
|
44
|
+
- Updated dependencies [d2148c8]
|
|
45
|
+
- Updated dependencies [2bcf2fe]
|
|
46
|
+
- @prosopo/common@3.3.0
|
|
47
|
+
- @prosopo/logger@2.1.5
|
|
48
|
+
- @prosopo/types@5.17.0
|
|
49
|
+
- @prosopo/util@3.3.16
|
|
50
|
+
- @prosopo/util-crypto@13.6.1
|
|
51
|
+
|
|
3
52
|
## 3.0.150
|
|
4
53
|
### Patch Changes
|
|
5
54
|
|
package/dist/cjs/cli/cli.cjs
CHANGED
|
@@ -31,7 +31,11 @@ var Cli = class {
|
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
if (!this.#commands.find((c) => c.getCommandName() === "$0")) y = y.command("$0", "default command", (y) => y, () => {
|
|
34
|
-
throw new _prosopo_common.
|
|
34
|
+
throw new _prosopo_common.ProsopoError({
|
|
35
|
+
code: "CLI_INVALID_ARGUMENT",
|
|
36
|
+
errorSite: "DSFS-1",
|
|
37
|
+
context: { error: "no command specified" }
|
|
38
|
+
});
|
|
35
39
|
});
|
|
36
40
|
y = y.demandCommand().strict().showHelpOnFail(false, "Specify --help for available options");
|
|
37
41
|
return y;
|
package/dist/cli/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,qBAAa,GAAG;;IAEf,MAAM,mCAAwC;gBAElC,QAAQ,EAAE,aAAa,EAAE;IAIrC,OAAO,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,qBAAa,GAAG;;IAEf,MAAM,mCAAwC;gBAElC,QAAQ,EAAE,aAAa,EAAE;IAIrC,OAAO,CAAC,MAAM;IAiDD,IAAI,CAAC,IAAI,GAAE,MAAM,EAA0B;CAKxD"}
|
package/dist/cli/cli.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ProsopoError } from "@prosopo/common";
|
|
2
2
|
import { LogLevel, getLogger } from "@prosopo/logger";
|
|
3
3
|
import yargs from "yargs";
|
|
4
4
|
import { hideBin } from "yargs/helpers";
|
|
@@ -29,7 +29,11 @@ var Cli = class {
|
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
31
|
if (!this.#commands.find((c) => c.getCommandName() === "$0")) y = y.command("$0", "default command", (y) => y, () => {
|
|
32
|
-
throw new
|
|
32
|
+
throw new ProsopoError({
|
|
33
|
+
code: "CLI_INVALID_ARGUMENT",
|
|
34
|
+
errorSite: "DSFS-1",
|
|
35
|
+
context: { error: "no command specified" }
|
|
36
|
+
});
|
|
33
37
|
});
|
|
34
38
|
y = y.demandCommand().strict().showHelpOnFail(false, "Specify --help for available options");
|
|
35
39
|
return y;
|
package/dist/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatten.d.ts","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAEjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;EAErB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,OAAQ,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IACjD,YAAY;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;IAiBJ,IAAI,CAAC,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"flatten.d.ts","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAEN,qBAAqB,EACrB,MAAM,yBAAyB,CAAC;AAEjC,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;EAErB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,OAAQ,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IACjD,YAAY;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;IAiBJ,IAAI,CAAC,IAAI,EAAE,IAAI;CA0FrC"}
|
package/dist/commands/flatten.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
import { ProsopoError } from "@prosopo/common";
|
|
3
3
|
import { CaptchaItemTypes, DataSchema, } from "@prosopo/types";
|
|
4
4
|
import { at } from "@prosopo/util";
|
|
5
5
|
import { hexHash } from "@prosopo/util-crypto";
|
|
@@ -66,7 +66,10 @@ export class Flatten extends InputOutputCliCommand {
|
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
if (!args.allowDuplicates) {
|
|
69
|
-
throw new
|
|
69
|
+
throw new ProsopoError({
|
|
70
|
+
code: "DATASET_INVALID",
|
|
71
|
+
errorSite: "DSFS-2",
|
|
72
|
+
message: "duplicate image detected",
|
|
70
73
|
context: { image: `${label}/${image}` },
|
|
71
74
|
});
|
|
72
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatten.js","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"flatten.js","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAExE,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;
|
|
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;AAExE,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;IAkChB,OAAO,CAAC,UAAU;IAmBI,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,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
import { ProsopoError } from "@prosopo/common";
|
|
3
3
|
import { DataSchema, LabelledDataSchema, LabelsContainerSchema, } from "@prosopo/types";
|
|
4
4
|
import { lodash, setSeedGlobal } from "@prosopo/util/lodash";
|
|
5
5
|
import * as z from "zod";
|
|
@@ -72,14 +72,18 @@ export class Generate extends OutputCliCommand {
|
|
|
72
72
|
async _check(args) {
|
|
73
73
|
const labelledMapFile = args.labelled;
|
|
74
74
|
if (labelledMapFile && !fs.existsSync(labelledMapFile)) {
|
|
75
|
-
throw new
|
|
76
|
-
|
|
75
|
+
throw new ProsopoError({
|
|
76
|
+
code: "FILE_ERROR",
|
|
77
|
+
errorSite: "DSFS-3",
|
|
78
|
+
message: `labelled map file does not exist: ${labelledMapFile}`,
|
|
77
79
|
});
|
|
78
80
|
}
|
|
79
81
|
const unlabelledMapFile = args.unlabelled;
|
|
80
82
|
if (unlabelledMapFile && !fs.existsSync(unlabelledMapFile)) {
|
|
81
|
-
throw new
|
|
82
|
-
|
|
83
|
+
throw new ProsopoError({
|
|
84
|
+
code: "FILE_ERROR",
|
|
85
|
+
errorSite: "DSFS-4",
|
|
86
|
+
message: `unlabelled map file does not exist: ${unlabelledMapFile}`,
|
|
83
87
|
});
|
|
84
88
|
}
|
|
85
89
|
this.labelledMapFile = labelledMapFile || "";
|
|
@@ -139,7 +143,10 @@ const addAllUnique = (all, entries, dataType) => {
|
|
|
139
143
|
};
|
|
140
144
|
const addUnique = (all, entry, dataType) => {
|
|
141
145
|
if (all.has(entry.data)) {
|
|
142
|
-
throw new
|
|
146
|
+
throw new ProsopoError({
|
|
147
|
+
code: "DATASET_INVALID",
|
|
148
|
+
errorSite: "DSFS-5",
|
|
149
|
+
message: "duplicate image detected",
|
|
143
150
|
context: {
|
|
144
151
|
error: `Duplicate data entry in ${dataType} data: ${JSON.stringify(entry)}`,
|
|
145
152
|
},
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV1.d.ts","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAC;AAE3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;IACvC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqB1B,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"generateV1.d.ts","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAC;AAE3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;IACvC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqB1B,OAAO,CAAC,cAAc;IA+FtB,OAAO,CAAC,gBAAgB;IAwDF,IAAI,CAAC,IAAI,EAAE,IAAI;CA6CrC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
import { ProsopoError } from "@prosopo/common";
|
|
3
3
|
import { CaptchaTypes, CaptchasContainerSchema, } from "@prosopo/types";
|
|
4
4
|
import { at, get } from "@prosopo/util";
|
|
5
5
|
import { blake2AsHex } from "@prosopo/util-crypto";
|
|
@@ -47,8 +47,10 @@ export class GenerateV1 extends Generate {
|
|
|
47
47
|
for (let i = 0; i < solved; i++) {
|
|
48
48
|
bar.increment();
|
|
49
49
|
if (this.targets.length <= 1) {
|
|
50
|
-
throw new
|
|
51
|
-
|
|
50
|
+
throw new ProsopoError({
|
|
51
|
+
code: "DATASET_INVALID",
|
|
52
|
+
errorSite: "DSFS-6",
|
|
53
|
+
message: "not enough different labels in labelled data",
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
const target = at(this.targets, i % this.targets.length);
|
|
@@ -58,13 +60,17 @@ export class GenerateV1 extends Generate {
|
|
|
58
60
|
const targetItems = get(this.labelToImages, target);
|
|
59
61
|
const notTargetItems = notTargets.flatMap((notTarget) => get(this.labelToImages, notTarget));
|
|
60
62
|
if (targetItems.length < nCorrect) {
|
|
61
|
-
throw new
|
|
62
|
-
|
|
63
|
+
throw new ProsopoError({
|
|
64
|
+
code: "DATASET_INVALID",
|
|
65
|
+
errorSite: "DSFS-7",
|
|
66
|
+
message: `not enough images for target (${target})`,
|
|
63
67
|
});
|
|
64
68
|
}
|
|
65
69
|
if (notTargetItems.length < nIncorrect) {
|
|
66
|
-
throw new
|
|
67
|
-
|
|
70
|
+
throw new ProsopoError({
|
|
71
|
+
code: "DATASET_INVALID",
|
|
72
|
+
errorSite: "DSFS-8",
|
|
73
|
+
message: `not enough non-matching images for target (${target})`,
|
|
68
74
|
});
|
|
69
75
|
}
|
|
70
76
|
const correctItems = _.sampleSize(targetItems, nCorrect);
|
|
@@ -108,13 +114,17 @@ export class GenerateV1 extends Generate {
|
|
|
108
114
|
for (let i = 0; i < unsolved; i++) {
|
|
109
115
|
bar.increment();
|
|
110
116
|
if (this.unlabelled.length <= size) {
|
|
111
|
-
throw new
|
|
112
|
-
|
|
117
|
+
throw new ProsopoError({
|
|
118
|
+
code: "DATASET_INVALID",
|
|
119
|
+
errorSite: "DSFS-9",
|
|
120
|
+
message: "unlabelled map file does not contain enough data",
|
|
113
121
|
});
|
|
114
122
|
}
|
|
115
123
|
if (this.labels.length <= 0) {
|
|
116
|
-
throw new
|
|
117
|
-
|
|
124
|
+
throw new ProsopoError({
|
|
125
|
+
code: "DATASET_INVALID",
|
|
126
|
+
errorSite: "DSFS-10",
|
|
127
|
+
message: "no labels found for unlabelled data",
|
|
118
128
|
});
|
|
119
129
|
}
|
|
120
130
|
const index = _.random(0, this.labels.length - 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV1.js","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generateV1.js","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACN,YAAY,EAGZ,uBAAuB,GAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC;IACnD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAIH,MAAM,OAAO,UAAW,SAAQ,QAAwB;IACvC,YAAY;QAC3B,OAAO,UAAU,CAAC;IACnB,CAAC;IAEe,cAAc;QAC7B,OAAO,8GAA8G,CAAC;IACvH,CAAC;IAEe,UAAU;QACzB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACzC,MAAM,EAAE;gBACP,WAAW,EAAE,gDAAgD;gBAC7D,MAAM,EAAE,IAAI;aACZ;YACD,QAAQ,EAAE;gBACT,WAAW,EAAE,kDAAkD;gBAC/D,MAAM,EAAE,IAAI;aACZ;YACD,UAAU,EAAE;gBACX,WAAW,EAAE,iDAAiD;gBAC9D,MAAM,EAAE,IAAI;aACZ;YACD,UAAU,EAAE;gBACX,WAAW,EAAE,iDAAiD;gBAC9D,MAAM,EAAE,IAAI;aACZ;SACD,CAAC,CAAC;IACJ,CAAC;IAEO,cAAc,CACrB,MAAc,EACd,IAAY,EACZ,UAAkB,EAClB,UAAkB,EAClB,GAA0B;QAE1B,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;QAEnB,MAAM,cAAc,GAAuB,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAEjC,GAAG,CAAC,SAAS,EAAE,CAAC;YAEhB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,QAAQ;oBACnB,OAAO,EAAE,8CAA8C;iBACvD,CAAC,CAAC;YACJ,CAAC;YAGD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YAG5D,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAElD,MAAM,UAAU,GAAG,IAAI,GAAG,QAAQ,CAAC;YAEnC,MAAM,WAAW,GAAW,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAC5D,MAAM,cAAc,GAAW,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAC/D,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAClC,CAAC;YAEF,IAAI,WAAW,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC;gBACnC,MAAM,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,QAAQ;oBACnB,OAAO,EAAE,iCAAiC,MAAM,GAAG;iBACnD,CAAC,CAAC;YACJ,CAAC;YACD,IAAI,cAAc,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;gBACxC,MAAM,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,QAAQ;oBACnB,OAAO,EAAE,8CAA8C,MAAM,GAAG;iBAChE,CAAC,CAAC;YACJ,CAAC;YAGD,MAAM,YAAY,GAAW,CAAC,CAAC,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAGjE,MAAM,cAAc,GAAW,CAAC,CAAC,UAAU,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YAExE,IAAI,KAAK,GAAW,CAAC,GAAG,YAAY,EAAE,GAAG,cAAc,CAAC,CAAC;YACzD,IAAI,OAAO,GAAa,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7B,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YACzC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC1B,OAAO;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;iBACf,CAAC;YACH,CAAC,CAAC,CAAC;YAGH,MAAM,QAAQ,GAAkB,OAAO;iBACrC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACjB,OAAO;oBACN,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,CAAC;iBACP,CAAC;YACH,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC;iBAChD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,IAAI,CAAC,IAAI,CAAC;YAClB,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAE9D,MAAM,OAAO,GAAqB;gBACjC,IAAI;gBACJ,MAAM;gBACN,KAAK;gBACL,QAAQ;aACR,CAAC;YACF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,cAAc,CAAC;IACvB,CAAC;IAEO,gBAAgB,CACvB,QAAgB,EAChB,IAAY,EACZ,GAA0B;QAE1B,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;QAInB,MAAM,gBAAgB,GAAuB,EAAE,CAAC;QAChD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,GAAG,CAAC,SAAS,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBACpC,MAAM,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,QAAQ;oBACnB,OAAO,EAAE,kDAAkD;iBAC3D,CAAC,CAAC;YACJ,CAAC;YAGD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,qCAAqC;iBAC9C,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAEtC,MAAM,OAAO,GAAW,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAE5D,IAAI,KAAK,GAAW,CAAC,GAAG,OAAO,CAAC,CAAC;YACjC,IAAI,OAAO,GAAa,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACxD,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7B,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YACzC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC1B,OAAO;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;iBACf,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAE9D,MAAM,OAAO,GAAqB;gBACjC,IAAI;gBACJ,MAAM;gBACN,KAAK;aACL,CAAC;YACF,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACpC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvB,MAAM,OAAO,GAAW,IAAI,CAAC,MAAM,CAAC;QAGpC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;QAEnB,MAAM,IAAI,GAAW,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;QACpC,MAAM,UAAU,GAAW,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QAChD,MAAM,UAAU,GAAW,IAAI,CAAC,UAAU,IAAI,IAAI,GAAG,CAAC,CAAC;QACvD,MAAM,MAAM,GAAW,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAW,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;QAG5C,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,SAAS,CACpC,EAAE,EACF,WAAW,CAAC,OAAO,CAAC,cAAc,CAClC,CAAC;QAGF,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;QAChC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CACzC,MAAM,EACN,IAAI,EACJ,UAAU,EACV,UAAU,EACV,GAAG,CACH,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACpE,GAAG,CAAC,IAAI,EAAE,CAAC;QAEX,MAAM,MAAM,GAAa;YACxB,QAAQ,EAAE,CAAC,GAAG,cAAc,EAAE,GAAG,gBAAgB,CAAC;YAClD,MAAM,EAAE,YAAY,CAAC,SAAS;SAC9B,CAAC;QAGF,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEtC,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,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV2.d.ts","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAC;AAE3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;;IAmBvC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB1B,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"generateV2.d.ts","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAC;AAE3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;;IAmBvC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB1B,OAAO,CAAC,WAAW;IA4DG,IAAI,CAAC,IAAI,EAAE,IAAI;CAyIrC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _GenerateV2_size, _GenerateV2_minCorrect, _GenerateV2_saltRounds, _GenerateV2_allowDuplicatesLabelled, _GenerateV2_allowDuplicatesUnlabelled, _GenerateV2_minIncorrect, _GenerateV2_minLabelled, _GenerateV2_maxLabelled, _GenerateV2_count, _GenerateV2_nCorrect, _GenerateV2_nIncorrect, _GenerateV2_nLabelled, _GenerateV2_nUnlabelled, _GenerateV2_target, _GenerateV2_targets, _GenerateV2_targetItems, _GenerateV2_notTargetItems;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import fs from "node:fs";
|
|
4
|
-
import {
|
|
4
|
+
import { ProsopoError } from "@prosopo/common";
|
|
5
5
|
import { CaptchaTypes, CaptchasContainerSchema, } from "@prosopo/types";
|
|
6
6
|
import { at, get } from "@prosopo/util";
|
|
7
7
|
import { blake2AsHex } from "@prosopo/util-crypto";
|
|
@@ -71,8 +71,10 @@ export class GenerateV2 extends Generate {
|
|
|
71
71
|
setupTarget(i) {
|
|
72
72
|
const _ = lodash();
|
|
73
73
|
if (this.targets.length <= 1) {
|
|
74
|
-
throw new
|
|
75
|
-
|
|
74
|
+
throw new ProsopoError({
|
|
75
|
+
code: "DATASET_INVALID",
|
|
76
|
+
errorSite: "DSFS-11",
|
|
77
|
+
message: "not enough different labels in labelled data",
|
|
76
78
|
});
|
|
77
79
|
}
|
|
78
80
|
const target = at(this.targets, i % this.targets.length);
|
|
@@ -87,18 +89,24 @@ export class GenerateV2 extends Generate {
|
|
|
87
89
|
const targetItems = get(this.labelToImages, target);
|
|
88
90
|
const notTargetItems = notTargets.flatMap((notTarget) => get(this.labelToImages, notTarget));
|
|
89
91
|
if (this.unlabelled.length > 0 && nUnlabelled > this.unlabelled.length) {
|
|
90
|
-
throw new
|
|
91
|
-
|
|
92
|
+
throw new ProsopoError({
|
|
93
|
+
code: "DATASET_INVALID",
|
|
94
|
+
errorSite: "DSFS-12",
|
|
95
|
+
message: "not enough unlabelled data",
|
|
92
96
|
});
|
|
93
97
|
}
|
|
94
98
|
if (nCorrect > targetItems.length) {
|
|
95
|
-
throw new
|
|
96
|
-
|
|
99
|
+
throw new ProsopoError({
|
|
100
|
+
code: "DATASET_INVALID",
|
|
101
|
+
errorSite: "DSFS-13",
|
|
102
|
+
message: `not enough images for target (${target})`,
|
|
97
103
|
});
|
|
98
104
|
}
|
|
99
105
|
if (nIncorrect > notTargetItems.length) {
|
|
100
|
-
throw new
|
|
101
|
-
|
|
106
|
+
throw new ProsopoError({
|
|
107
|
+
code: "DATASET_INVALID",
|
|
108
|
+
errorSite: "DSFS-14",
|
|
109
|
+
message: `not enough non-matching images for target (${target})`,
|
|
102
110
|
});
|
|
103
111
|
}
|
|
104
112
|
__classPrivateFieldSet(this, _GenerateV2_nCorrect, nCorrect, "f");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV2.js","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";;AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generateV2.js","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";;AAcA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACN,YAAY,EAGZ,uBAAuB,GAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE3E,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC;IACnD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC;AAIH,MAAM,OAAO,UAAW,SAAQ,QAAwB;IAAxD;;QACC,2BAAQ,CAAC,EAAC;QACV,iCAAc,CAAC,EAAC;QAChB,iCAAc,EAAE,EAAC;QACjB,8CAA2B,KAAK,EAAC;QACjC,gDAA6B,KAAK,EAAC;QACnC,mCAAgB,CAAC,EAAC;QAClB,kCAAe,CAAC,EAAC;QACjB,kCAAe,CAAC,EAAC;QACjB,4BAAS,CAAC,EAAC;QACX,+BAAY,CAAC,EAAC;QACd,iCAAc,CAAC,EAAC;QAChB,gCAAa,CAAC,EAAC;QACf,kCAAe,CAAC,EAAC;QACjB,6BAAU,EAAE,EAAC;QACb,8BAAqB,EAAE,EAAC;QACxB,kCAAuB,EAAE,EAAC;QAC1B,qCAA0B,EAAE,EAAC;IAwO9B,CAAC;IAtOgB,YAAY;QAC3B,OAAO,UAAU,CAAC;IACnB,CAAC;IAEe,cAAc;QAC7B,OAAO,gJAAgJ,CAAC;IACzJ,CAAC;IAEe,UAAU;QACzB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACzC,KAAK,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,gCAAgC;aAC7C;YACD,UAAU,EAAE;gBACX,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,kDAAkD;aAC/D;YACD,YAAY,EAAE;gBACb,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,oDAAoD;aACjE;YACD,WAAW,EAAE;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,mDAAmD;aAChE;YACD,WAAW,EAAE;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,mDAAmD;aAChE;SACD,CAAC,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,CAAS;QAC5B,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,YAAY,CAAC;gBACtB,IAAI,EAAE,iBAAiB;gBACvB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,8CAA8C;aACvD,CAAC,CAAC;QACJ,CAAC;QAGD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;QAE5D,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM;YACvC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,uBAAA,IAAI,+BAAa,EAAE,uBAAA,IAAI,+BAAa,CAAC;YAChD,CAAC,CAAC,uBAAA,IAAI,wBAAM,CAAC;QAEd,MAAM,UAAU,GAAG,SAAS,GAAG,uBAAA,IAAI,8BAAY,CAAC;QAChD,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,uBAAA,IAAI,8BAAY,EAAE,UAAU,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;QACxC,MAAM,WAAW,GAAG,uBAAA,IAAI,wBAAM,GAAG,SAAS,CAAC;QAE3C,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,cAAc,GAAW,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAC/D,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAClC,CAAC;QAEF,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACxE,MAAM,IAAI,YAAY,CAAC;gBACtB,IAAI,EAAE,iBAAiB;gBACvB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,4BAA4B;aACrC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,IAAI,YAAY,CAAC;gBACtB,IAAI,EAAE,iBAAiB;gBACvB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,iCAAiC,MAAM,GAAG;aACnD,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,IAAI,YAAY,CAAC;gBACtB,IAAI,EAAE,iBAAiB;gBACvB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,8CAA8C,MAAM,GAAG;aAChE,CAAC,CAAC;QACJ,CAAC;QAED,uBAAA,IAAI,wBAAa,QAAQ,MAAA,CAAC;QAC1B,uBAAA,IAAI,0BAAe,UAAU,MAAA,CAAC;QAC9B,uBAAA,IAAI,yBAAc,SAAS,MAAA,CAAC;QAC5B,uBAAA,IAAI,2BAAgB,WAAW,MAAA,CAAC;QAChC,uBAAA,IAAI,sBAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,uBAAY,UAAU,MAAA,CAAC;QAC3B,uBAAA,IAAI,2BAAgB,WAAW,MAAA,CAAC;QAChC,uBAAA,IAAI,8BAAmB,cAAc,MAAA,CAAC;IACvC,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACpC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvB,MAAM,OAAO,GAAW,IAAI,CAAC,MAAM,CAAC;QAGpC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC;QAEnB,uBAAA,IAAI,oBAAS,IAAI,CAAC,IAAI,IAAI,CAAC,MAAA,CAAC;QAC5B,uBAAA,IAAI,0BAAe,IAAI,CAAC,UAAU,IAAI,CAAC,MAAA,CAAC;QACxC,uBAAA,IAAI,0BAAe,EAAE,MAAA,CAAC;QACtB,uBAAA,IAAI,uCACH,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,eAAe,IAAI,KAAK,MAAA,CAAC;QAC/D,uBAAA,IAAI,yCACH,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC,eAAe,IAAI,KAAK,MAAA,CAAC;QACjE,uBAAA,IAAI,4BAAiB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,CAAC,MAAA,CAAC;QACzD,uBAAA,IAAI,2BAAgB,uBAAA,IAAI,8BAAY,GAAG,uBAAA,IAAI,gCAAc,MAAA,CAAC;QAC1D,uBAAA,IAAI,2BAAgB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,uBAAA,IAAI,wBAAM,EAAE,uBAAA,IAAI,wBAAM,CAAC,MAAA,CAAC;QACzE,uBAAA,IAAI,qBAAU,IAAI,CAAC,KAAK,IAAI,CAAC,MAAA,CAAC;QAO9B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,SAAS,CACpC,EAAE,EACF,WAAW,CAAC,OAAO,CAAC,cAAc,CAClC,CAAC;QACF,GAAG,CAAC,KAAK,CAAC,uBAAA,IAAI,yBAAO,EAAE,CAAC,CAAC,CAAC;QAG1B,MAAM,QAAQ,GAAuB,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAA,IAAI,yBAAO,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,GAAG,CAAC,SAAS,EAAE,CAAC;YAEhB,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAGpB,MAAM,YAAY,GAAW,CAAC,CAAC,UAAU,CACxC,uBAAA,IAAI,+BAAa,EACjB,uBAAA,IAAI,4BAAU,CACd,CAAC;YAGF,MAAM,cAAc,GAAW,CAAC,CAAC,UAAU,CAC1C,uBAAA,IAAI,kCAAgB,EACpB,uBAAA,IAAI,8BAAY,CAChB,CAAC;YAGF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAQ,CAAC;YACxC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,eAAe,CAAC,IAAI,GAAG,uBAAA,IAAI,wBAAM,GAAG,uBAAA,IAAI,6BAAW,EAAE,CAAC;oBAE5D,MAAM,KAAK,GAAG,EAAE,CACf,IAAI,CAAC,UAAU,EACf,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CACvC,CAAC;oBACF,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,CAAC;YACF,CAAC;YAED,MAAM,WAAW,GAAW;gBAC3B,GAAG,YAAY;gBACf,GAAG,cAAc;gBACjB,GAAG,eAAe;aAClB,CAAC;YACF,IAAI,OAAO,GAAa,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9D,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7B,MAAM,KAAK,GAAG,OAAO;iBACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;iBAC9B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;iBACf,CAAC;YACH,CAAC,CAAC,CAAC;YAGJ,MAAM,QAAQ,GAAkB,OAAO;iBACrC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACjB,OAAO;oBACN,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,CAAC;iBACP,CAAC;YACH,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC;iBAChD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,IAAI,CAAC,IAAI,CAAC;YAClB,CAAC,CAAC,CAAC;YAGJ,MAAM,iBAAiB,GAAkB,OAAO;iBAC9C,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACjB,OAAO;oBACN,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,CAAC;iBACP,CAAC;YACH,CAAC,CAAC;iBACD,MAAM,CACN,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CACjE;iBACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,IAAI,CAAC,IAAI,CAAC;YAClB,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,uBAAA,IAAI,8BAAY,CAAC,CAAC,CAAC;YAE/D,MAAM,OAAO,GAAqB;gBACjC,IAAI;gBACJ,MAAM,EAAE,uBAAA,IAAI,0BAAQ;gBACpB,KAAK;gBACL,QAAQ;gBACR,UAAU,EAAE,iBAAiB;aAC7B,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QACD,GAAG,CAAC,IAAI,EAAE,CAAC;QAGX,MAAM,MAAM,GAAa;YACxB,QAAQ;YACR,MAAM,EAAE,YAAY,CAAC,SAAS;SAC9B,CAAC;QAGF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACpD,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QAClD,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,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;CACD"}
|
|
@@ -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;AAEjC,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;
|
|
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;AAEjC,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;IAiCrB,cAAc,IAAI,MAAM;CAGxC"}
|
package/dist/commands/labels.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
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";
|
|
@@ -22,8 +22,10 @@ export class Labels extends InputOutputCliCommand {
|
|
|
22
22
|
await super._run(args);
|
|
23
23
|
const file = args.input;
|
|
24
24
|
if (!fs.existsSync(file)) {
|
|
25
|
-
throw new
|
|
26
|
-
|
|
25
|
+
throw new ProsopoError({
|
|
26
|
+
code: "FILE_ERROR",
|
|
27
|
+
errorSite: "DSFS-15",
|
|
28
|
+
message: `file does not exist: ${file}`,
|
|
27
29
|
});
|
|
28
30
|
}
|
|
29
31
|
const labelled = file
|
|
@@ -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,
|
|
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;AAEjC,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,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;iBAClE,KAAK;YACR,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":"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;AAEjC,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;
|
|
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;AAEjC,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;IAuGrB,cAAc,IAAI,MAAM;CAGxC"}
|
package/dist/commands/resize.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import { blake2b } from "@noble/hashes/blake2.js";
|
|
3
|
-
import {
|
|
3
|
+
import { ProsopoError } from "@prosopo/common";
|
|
4
4
|
import { DataSchema } from "@prosopo/types";
|
|
5
5
|
import { u8aToHex } from "@prosopo/util";
|
|
6
6
|
import { lodash } from "@prosopo/util/lodash";
|
|
@@ -40,15 +40,19 @@ export class Resize extends InputOutputCliCommand {
|
|
|
40
40
|
const square = args.square ?? false;
|
|
41
41
|
const mapFile = args.input;
|
|
42
42
|
if (!fs.existsSync(mapFile)) {
|
|
43
|
-
throw new
|
|
44
|
-
|
|
43
|
+
throw new ProsopoError({
|
|
44
|
+
code: "FILE_ERROR",
|
|
45
|
+
errorSite: "DSFS-16",
|
|
46
|
+
message: `Map file does not exist: ${mapFile}`,
|
|
45
47
|
});
|
|
46
48
|
}
|
|
47
49
|
const outDir = args.output;
|
|
48
50
|
const overwrite = args.overwrite || false;
|
|
49
51
|
if (!overwrite && fs.existsSync(outDir)) {
|
|
50
|
-
throw new
|
|
51
|
-
|
|
52
|
+
throw new ProsopoError({
|
|
53
|
+
code: "FILE_ERROR",
|
|
54
|
+
errorSite: "DSFS-17",
|
|
55
|
+
message: `Output directory already exists: ${outDir}`,
|
|
52
56
|
});
|
|
53
57
|
}
|
|
54
58
|
const imgDir = `${outDir}/images`;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
declare module "@prosopo/common" {
|
|
2
|
+
interface ErrorSites {
|
|
3
|
+
"DSFS-1": true;
|
|
4
|
+
"DSFS-2": true;
|
|
5
|
+
"DSFS-3": true;
|
|
6
|
+
"DSFS-4": true;
|
|
7
|
+
"DSFS-5": true;
|
|
8
|
+
"DSFS-6": true;
|
|
9
|
+
"DSFS-7": true;
|
|
10
|
+
"DSFS-8": true;
|
|
11
|
+
"DSFS-9": true;
|
|
12
|
+
"DSFS-10": true;
|
|
13
|
+
"DSFS-11": true;
|
|
14
|
+
"DSFS-12": true;
|
|
15
|
+
"DSFS-13": true;
|
|
16
|
+
"DSFS-14": true;
|
|
17
|
+
"DSFS-15": true;
|
|
18
|
+
"DSFS-16": true;
|
|
19
|
+
"DSFS-17": true;
|
|
20
|
+
"DSFS-18": true;
|
|
21
|
+
"DSFS-19": true;
|
|
22
|
+
"DSFS-20": true;
|
|
23
|
+
"DSFS-21": true;
|
|
24
|
+
"DSFS-22": true;
|
|
25
|
+
"DSFS-23": true;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
export {};
|
|
29
|
+
//# sourceMappingURL=errorSites.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorSites.d.ts","sourceRoot":"","sources":["../src/errorSites.ts"],"names":[],"mappings":"AAcA,OAAO,QAAQ,iBAAiB,CAAC;IAChC,UAAU,UAAU;QACnB,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,QAAQ,EAAE,IAAI,CAAC;QACf,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;QAChB,SAAS,EAAE,IAAI,CAAC;KAChB;CACD;AAED,OAAO,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorSites.js","sourceRoot":"","sources":["../src/errorSites.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,qBAAa,eAAe,CAC3B,CAAC,SAAS,OAAO,eAAe,CAC/B,SAAQ,UAAU,CAAC,CAAC,CAAC;IACN,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;IAWJ,MAAM,CAAC,IAAI,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAExD,qBAAa,eAAe,CAC3B,CAAC,SAAS,OAAO,eAAe,CAC/B,SAAQ,UAAU,CAAC,CAAC,CAAC;IACN,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;IAWJ,MAAM,CAAC,IAAI,EAAE,SAAS;CAY5C"}
|
package/dist/utils/input.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import {
|
|
2
|
+
import { ProsopoError } from "@prosopo/common";
|
|
3
3
|
import * as z from "zod";
|
|
4
4
|
import { CliCommand } from "../cli/cliCommand.js";
|
|
5
5
|
export const InputArgsSchema = z.object({
|
|
@@ -7,10 +7,10 @@ export const InputArgsSchema = z.object({
|
|
|
7
7
|
});
|
|
8
8
|
export class InputCliCommand extends CliCommand {
|
|
9
9
|
getArgSchema() {
|
|
10
|
-
throw new ProsopoError("
|
|
10
|
+
throw new ProsopoError({ code: "NOT_IMPLEMENTED", errorSite: "DSFS-18" });
|
|
11
11
|
}
|
|
12
12
|
getDescription() {
|
|
13
|
-
throw new ProsopoError("
|
|
13
|
+
throw new ProsopoError({ code: "NOT_IMPLEMENTED", errorSite: "DSFS-19" });
|
|
14
14
|
}
|
|
15
15
|
getOptions() {
|
|
16
16
|
return {
|
|
@@ -26,8 +26,10 @@ export class InputCliCommand extends CliCommand {
|
|
|
26
26
|
this.logger.debug(() => ({ msg: "input _check" }));
|
|
27
27
|
await super._check(args);
|
|
28
28
|
if (!fs.existsSync(args.input)) {
|
|
29
|
-
throw new
|
|
30
|
-
|
|
29
|
+
throw new ProsopoError({
|
|
30
|
+
code: "FILE_ERROR",
|
|
31
|
+
errorSite: "DSFS-20",
|
|
32
|
+
message: `input path does not exist: ${args.input}`,
|
|
31
33
|
});
|
|
32
34
|
}
|
|
33
35
|
}
|
package/dist/utils/input.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAc/C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAIH,MAAM,OAAO,eAEX,SAAQ,UAAa;IACN,YAAY;QAC3B,MAAM,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IACe,cAAc;QAC7B,MAAM,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IACe,UAAU;QACzB,OAAO;YACN,KAAK,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,gBAAgB;aAC7B;SACD,CAAC;IACH,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAe;QAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QACnD,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,YAAY,CAAC;gBACtB,IAAI,EAAE,YAAY;gBAClB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,8BAA8B,IAAI,CAAC,KAAK,EAAE;aACnD,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAcpE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEzD,qBAAa,gBAAgB,CAC5B,CAAC,SAAS,OAAO,gBAAgB,CAChC,SAAQ,UAAU,CAAC,CAAC,CAAC;;IAGf,YAAY;IAIH,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;;;;;;;IAeJ,MAAM,CAAC,IAAI,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,KAAK,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAcpE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEzD,qBAAa,gBAAgB,CAC5B,CAAC,SAAS,OAAO,gBAAgB,CAChC,SAAQ,UAAU,CAAC,CAAC,CAAC;;IAGf,YAAY;IAIH,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;;;;;;;IAeJ,MAAM,CAAC,IAAI,EAAE,UAAU;IAmBvB,IAAI,CAAC,IAAI,EAAE,UAAU;CAS3C"}
|
package/dist/utils/output.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _OutputCliCommand_outputExists;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import fs from "node:fs";
|
|
4
|
-
import {
|
|
4
|
+
import { ProsopoError } from "@prosopo/common";
|
|
5
5
|
import { lodash } from "@prosopo/util/lodash";
|
|
6
6
|
import { boolean, object, string } from "zod";
|
|
7
7
|
import { CliCommand } from "../cli/cliCommand.js";
|
|
@@ -18,10 +18,10 @@ export class OutputCliCommand extends CliCommand {
|
|
|
18
18
|
return __classPrivateFieldGet(this, _OutputCliCommand_outputExists, "f");
|
|
19
19
|
}
|
|
20
20
|
getArgSchema() {
|
|
21
|
-
throw new ProsopoError("
|
|
21
|
+
throw new ProsopoError({ code: "NOT_IMPLEMENTED", errorSite: "DSFS-21" });
|
|
22
22
|
}
|
|
23
23
|
getDescription() {
|
|
24
|
-
throw new ProsopoError("
|
|
24
|
+
throw new ProsopoError({ code: "NOT_IMPLEMENTED", errorSite: "DSFS-22" });
|
|
25
25
|
}
|
|
26
26
|
getOptions() {
|
|
27
27
|
return lodash().merge(super.getOptions(), {
|
|
@@ -43,8 +43,10 @@ export class OutputCliCommand extends CliCommand {
|
|
|
43
43
|
__classPrivateFieldSet(this, _OutputCliCommand_outputExists, fs.existsSync(args.output), "f");
|
|
44
44
|
if (this.outputExists()) {
|
|
45
45
|
if (!args.overwrite) {
|
|
46
|
-
throw new
|
|
47
|
-
|
|
46
|
+
throw new ProsopoError({
|
|
47
|
+
code: "FILE_ERROR",
|
|
48
|
+
errorSite: "DSFS-23",
|
|
49
|
+
message: `output path already exists: ${args.output}`,
|
|
48
50
|
});
|
|
49
51
|
}
|
|
50
52
|
}
|
package/dist/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAwB,MAAM,KAAK,CAAC;AAcpE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE;IAChB,SAAS,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAIH,MAAM,OAAO,gBAEX,SAAQ,UAAa;IAFvB;;QAGC,yCAAgB,KAAK,EAAC;IAuDvB,CAAC;IArDO,YAAY;QAClB,OAAO,uBAAA,IAAI,sCAAc,CAAC;IAC3B,CAAC;IAEe,YAAY;QAC3B,MAAM,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IACe,cAAc;QAC7B,MAAM,IAAI,YAAY,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IACe,UAAU;QACzB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACzC,MAAM,EAAE;gBACP,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,iBAAiB;aAC9B;YACD,SAAS,EAAE;gBACV,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,0DAA0D;aACvE;SACD,CAAC,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAgB;QAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAGzB,uBAAA,IAAI,kCAAiB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAA,CAAC;QAGhD,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACrB,MAAM,IAAI,YAAY,CAAC;oBACtB,IAAI,EAAE,YAAY;oBAClB,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,+BAA+B,IAAI,CAAC,MAAM,EAAE;iBACrD,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;IACF,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAgB;QAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACjD,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YAE3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;YAClE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;IACF,CAAC;CACD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/datasets-fs",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.151",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"private": false,
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@noble/hashes": "2.4.0",
|
|
22
|
-
"@prosopo/common": "3.
|
|
23
|
-
"@prosopo/logger": "2.1.
|
|
24
|
-
"@prosopo/types": "5.
|
|
25
|
-
"@prosopo/util": "3.3.
|
|
26
|
-
"@prosopo/util-crypto": "13.6.
|
|
22
|
+
"@prosopo/common": "3.3.0",
|
|
23
|
+
"@prosopo/logger": "2.1.5",
|
|
24
|
+
"@prosopo/types": "5.17.0",
|
|
25
|
+
"@prosopo/util": "3.3.16",
|
|
26
|
+
"@prosopo/util-crypto": "13.6.1",
|
|
27
27
|
"bcrypt": "6.0.0",
|
|
28
28
|
"cli-progress": "3.12.0",
|
|
29
29
|
"sharp": "0.35.5",
|
|
@@ -31,21 +31,21 @@
|
|
|
31
31
|
"zod": "3.23.8"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@prosopo/config": "3.
|
|
34
|
+
"@prosopo/config": "3.5.0",
|
|
35
35
|
"@types/bcrypt": "6.0.0",
|
|
36
36
|
"@types/cli-progress": "3.11.6",
|
|
37
37
|
"@types/node": "22.10.2",
|
|
38
38
|
"@types/yargs": "17.0.35",
|
|
39
|
-
"@vitest/coverage-v8": "
|
|
39
|
+
"@vitest/coverage-v8": "5.0.4",
|
|
40
40
|
"concurrently": "9.0.1",
|
|
41
41
|
"del-cli": "6.0.0",
|
|
42
|
-
"dotenv": "
|
|
42
|
+
"dotenv": "18.0.7",
|
|
43
43
|
"npm-run-all": "4.1.5",
|
|
44
44
|
"tslib": "2.7.0",
|
|
45
45
|
"tsx": "4.20.3",
|
|
46
46
|
"typescript": "5.6.2",
|
|
47
|
-
"vite": "8.1.
|
|
48
|
-
"vitest": "
|
|
47
|
+
"vite": "8.1.6",
|
|
48
|
+
"vitest": "5.0.4"
|
|
49
49
|
},
|
|
50
50
|
"repository": {
|
|
51
51
|
"type": "git",
|