@prosopo/datasets-fs 0.2.14 → 0.2.16
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/dist/cli/cli.js +0 -1
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/cliCommand.js +0 -8
- package/dist/cli/cliCommand.js.map +1 -1
- package/dist/cli/cliCommandComposite.js +0 -2
- package/dist/cli/cliCommandComposite.js.map +1 -1
- package/dist/cli.js +2 -3
- package/dist/cli.js.map +1 -1
- package/dist/commands/flatten.js +0 -11
- package/dist/commands/flatten.js.map +1 -1
- package/dist/commands/generate.js +0 -11
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/generateV1.js +3 -25
- package/dist/commands/generateV1.js.map +1 -1
- package/dist/commands/generateV2.js +9 -28
- package/dist/commands/generateV2.js.map +1 -1
- package/dist/commands/get.js +0 -2
- package/dist/commands/get.js.map +1 -1
- package/dist/commands/relocate.js +0 -3
- package/dist/commands/relocate.js.map +1 -1
- package/dist/commands/resize.js +2 -14
- package/dist/commands/resize.js.map +1 -1
- package/dist/dummy.js +0 -1
- package/dist/dummy.js.map +1 -1
- package/dist/index.js +0 -13
- package/dist/index.js.map +1 -1
- package/dist/tests/lodash.test.js +0 -13
- package/dist/tests/lodash.test.js.map +1 -1
- package/dist/tests/mocked.test.js +0 -29
- package/dist/tests/mocked.test.js.map +1 -1
- package/dist/tests/utils.js +0 -19
- package/dist/tests/utils.js.map +1 -1
- package/dist/utils/input.js +0 -1
- package/dist/utils/input.js.map +1 -1
- package/dist/utils/output.js +0 -3
- package/dist/utils/output.js.map +1 -1
- package/package.json +4 -5
- package/src/cli.ts +2 -2
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../src/commands/relocate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"relocate.js","sourceRoot":"","sources":["../../src/commands/relocate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,qBAAqB,IAAI,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnD,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAA;AAIF,MAAM,OAAO,QAAS,SAAQ,qBAAqC;IAC/C,YAAY;QACxB,OAAO,UAAU,CAAA;IACrB,CAAC;IAEe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,KAAK,EAAE;gBACH,WAAW,EAAE,gEAAgE;aAChF;YACD,MAAM,EAAE;gBACJ,WAAW,EAAE,0DAA0D;aAC1E;YACD,IAAI,EAAE;gBACF,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,mCAAmC;aACnD;YACD,EAAE,EAAE;gBACA,WAAW,EAAE,sCAAsC;gBACnD,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;aACf;SACJ,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACjC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEtB,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE;YACxD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAClC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;iBACvC;aACJ;iBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBACjC,MAAM,GAAG,GAAG,IAEX,CAAA;gBACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAChC,IAAI,GAAG,KAAK,MAAM,EAAE;wBAChB,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;wBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;4BAC3B,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gCACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;gCACrC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gCACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;6BAC1C;yBACJ;qBACJ;yBAAM;wBACH,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;qBACzC;iBACJ;aACJ;YACD,OAAO,IAAI,CAAA;QACf,CAAC,CAAA;QAED,MAAM,IAAI,GAAW,IAAI,CAAC,KAAK,CAAA;QAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB,IAAI,SAAS,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;QAE7E,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;QAEpD,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;QAExC,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,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAChF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC;IAEe,cAAc;QAC1B,OAAO,wDAAwD,CAAA;IACnE,CAAC;CACJ"}
|
package/dist/commands/resize.js
CHANGED
|
@@ -47,29 +47,23 @@ export class Resize extends InputOutputCliCommand {
|
|
|
47
47
|
if (!overwrite && fs.existsSync(outDir)) {
|
|
48
48
|
throw new ProsopoEnvError(new Error(`Output directory already exists: ${outDir}`), 'FS.FILE_NOT_FOUND');
|
|
49
49
|
}
|
|
50
|
-
// create the output directory
|
|
51
50
|
const imgDir = `${outDir}/images`;
|
|
52
51
|
fs.mkdirSync(imgDir, { recursive: true });
|
|
53
|
-
// read the map file
|
|
54
52
|
const inputItems = DataSchema.parse(JSON.parse(fs.readFileSync(mapFile, 'utf8'))).items;
|
|
55
|
-
// for each item
|
|
56
53
|
const bar = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic);
|
|
57
54
|
bar.start(inputItems.length, 0);
|
|
58
55
|
const outputItems = [];
|
|
59
56
|
for (const inputItem of inputItems) {
|
|
60
57
|
bar.increment();
|
|
61
|
-
// this.logger.log(`resizing ${inputItem.data}`)
|
|
62
|
-
// read the file
|
|
63
58
|
const img = fs.readFileSync(inputItem.data);
|
|
64
|
-
// resize the image
|
|
65
59
|
const resized = await sharp(img)
|
|
66
60
|
.resize({
|
|
67
61
|
width: size,
|
|
68
62
|
height: size,
|
|
69
63
|
fit: square ? 'cover' : 'inside',
|
|
70
64
|
})
|
|
71
|
-
.removeAlpha()
|
|
72
|
-
.toColorspace('srgb')
|
|
65
|
+
.removeAlpha()
|
|
66
|
+
.toColorspace('srgb')
|
|
73
67
|
.jpeg({
|
|
74
68
|
quality: 75,
|
|
75
69
|
chromaSubsampling: '4:2:0',
|
|
@@ -82,15 +76,11 @@ export class Resize extends InputOutputCliCommand {
|
|
|
82
76
|
});
|
|
83
77
|
const tmpFilePath = `${imgDir}/tmp.jpg`;
|
|
84
78
|
await resized.toFile(tmpFilePath);
|
|
85
|
-
// read the resized image
|
|
86
79
|
const resizedImg = fs.readFileSync(tmpFilePath);
|
|
87
|
-
// hash the image
|
|
88
80
|
const hash = blake2b(resizedImg);
|
|
89
81
|
const hex = u8aToHex(hash);
|
|
90
|
-
// move the image
|
|
91
82
|
const finalFilePath = `${imgDir}/${hex}.jpg`;
|
|
92
83
|
fs.renameSync(tmpFilePath, finalFilePath);
|
|
93
|
-
// add the item to the output
|
|
94
84
|
const outputItem = {
|
|
95
85
|
...inputItem,
|
|
96
86
|
hash: hex,
|
|
@@ -99,12 +89,10 @@ export class Resize extends InputOutputCliCommand {
|
|
|
99
89
|
outputItems.push(outputItem);
|
|
100
90
|
}
|
|
101
91
|
bar.stop();
|
|
102
|
-
// write the map file
|
|
103
92
|
const outputMapFile = `${outDir}/data.json`;
|
|
104
93
|
const data = {
|
|
105
94
|
items: outputItems,
|
|
106
95
|
};
|
|
107
|
-
// verify the output
|
|
108
96
|
this.logger.info('verifying data');
|
|
109
97
|
DataSchema.parse(data);
|
|
110
98
|
this.logger.info(`writing data`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAQ,UAAU,EAAQ,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,qBAAqB,IAAI,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,WAAW,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,CAAC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC;IACnD,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAA;AAIF,MAAM,OAAO,MAAO,SAAQ,qBAAqC;IAC7C,YAAY;QACxB,OAAO,UAAU,CAAA;IACrB,CAAC;IAEe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,KAAK,EAAE;gBACH,WAAW,EAAE,8DAA8D;aAC9E;YACD,MAAM,EAAE;gBACJ,WAAW,EACP,wNAAwN;aAC/N;YACD,IAAI,EAAE;gBACF,MAAM,EAAE,IAAI;gBACZ,WAAW,EACP,gJAAgJ;aACvJ;YACD,MAAM,EAAE;gBACJ,OAAO,EAAE,IAAI;gBACb,WAAW,EACP,oJAAoJ;aAC3J;SACJ,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACjC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAA;QAEnC,MAAM,OAAO,GAAW,IAAI,CAAC,KAAK,CAAA;QAClC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YACzB,MAAM,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAA;SACnG;QACD,MAAM,MAAM,GAAW,IAAI,CAAC,MAAM,CAAA;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,KAAK,CAAA;QACzC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACrC,MAAM,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,oCAAoC,MAAM,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAA;SAC1G;
|
|
1
|
+
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":"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"}
|
package/dist/dummy.js
CHANGED
package/dist/dummy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dummy.js","sourceRoot":"","sources":["../src/dummy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dummy.js","sourceRoot":"","sources":["../src/dummy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,gBAAgB,CAAA;AACrE,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,OAAO,GAAG,CAAC,CAAA;AACjB,MAAM,eAAe,GAAG,GAAG,CAAA;AAC3B,MAAM,iBAAiB,GAAG,GAAG,CAAA;AAE7B,MAAM,cAAc,GAAmB,EAAE,CAAA;AACzC,MAAM,gBAAgB,GAAW,EAAE,CAAA;AAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,EAAE,EAAE;IACtC,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAA;IACzB,cAAc,CAAC,IAAI,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE;QACvB,IAAI,EAAE,MAAM,CAAC,EAAE;QACf,IAAI,EAAE,gBAAgB,CAAC,KAAK;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAA;CACL;AAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,EAAE,CAAC,EAAE,EAAE;IACxC,gBAAgB,CAAC,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC,EAAE;QACf,IAAI,EAAE,gBAAgB,CAAC,KAAK;QAC5B,IAAI,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAA;CACL;AAED,EAAE,CAAC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;AACjE,EAAE,CAAC,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAA;AACrE,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;AAE3G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,15 +1,2 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
1
|
export * from './cli/cli.js';
|
|
15
2
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,cAAc,CAAA"}
|
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
// Copyright 2021-2023 Prosopo (UK) Ltd.
|
|
2
|
-
//
|
|
3
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
-
// you may not use this file except in compliance with the License.
|
|
5
|
-
// You may obtain a copy of the License at
|
|
6
|
-
//
|
|
7
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
-
//
|
|
9
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
// See the License for the specific language governing permissions and
|
|
13
|
-
// limitations under the License.
|
|
14
1
|
import { describe, expect, test } from 'vitest';
|
|
15
2
|
import { rng, seedLodash } from '@prosopo/util/lodash';
|
|
16
3
|
describe('rng', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lodash.test.js","sourceRoot":"","sources":["../../src/tests/lodash.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lodash.test.js","sourceRoot":"","sources":["../../src/tests/lodash.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;IACjB,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,IAAI,GAAG,CAAC,CAAA;QACd,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAA;QACtB,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACjG,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;SAC3C;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAC3B,MAAM,IAAI,GAAG,CAAC,CAAA;QACd,MAAM,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,CAAA;QAC1B,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAC5C,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAC5C,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -13,16 +13,13 @@ import fs from 'fs';
|
|
|
13
13
|
import sharp from 'sharp';
|
|
14
14
|
describe('dataset commands', () => {
|
|
15
15
|
beforeAll(() => {
|
|
16
|
-
// substitute the repo path in the data for tests
|
|
17
16
|
substituteRepoDir();
|
|
18
|
-
// remove previous test results
|
|
19
17
|
if (fs.existsSync(`${__dirname}/test_results`)) {
|
|
20
18
|
fs.rmdirSync(`${__dirname}/test_results`, { recursive: true });
|
|
21
19
|
}
|
|
22
20
|
fs.mkdirSync(`${__dirname}/test_results`, { recursive: true });
|
|
23
21
|
});
|
|
24
22
|
afterAll(() => {
|
|
25
|
-
// restore repo path back to placeholder
|
|
26
23
|
restoreRepoDir();
|
|
27
24
|
});
|
|
28
25
|
test('labels', async () => {
|
|
@@ -34,9 +31,7 @@ describe('dataset commands', () => {
|
|
|
34
31
|
input,
|
|
35
32
|
output,
|
|
36
33
|
});
|
|
37
|
-
// make sure the results are the same as the expected results
|
|
38
34
|
fsEq(output, `${__dirname}/data/flat_resized/labels.json`);
|
|
39
|
-
// make sure there's one class per hierarchical directory
|
|
40
35
|
const content = fs.readFileSync(output).toString();
|
|
41
36
|
const labelsJson = JSON.parse(content.toString());
|
|
42
37
|
const foundLabels = labelsJson.labels;
|
|
@@ -67,29 +62,24 @@ describe('dataset commands', () => {
|
|
|
67
62
|
maxLabelled,
|
|
68
63
|
allowDuplicates: true,
|
|
69
64
|
});
|
|
70
|
-
// make sure the results are the same as the expected results
|
|
71
65
|
if (!captchasEqFs(output, `${__dirname}/data/flat_resized/captchas_v2.json`)) {
|
|
72
66
|
throw new Error(`captchas not equal`);
|
|
73
67
|
}
|
|
74
|
-
// test that the solutions array and unlabelled array per captcha never conflict
|
|
75
68
|
const content = fs.readFileSync(output).toString();
|
|
76
69
|
const captchasJson = JSON.parse(content.toString());
|
|
77
70
|
const captchas = CaptchasContainerSchema.parse(captchasJson);
|
|
78
71
|
for (const captcha of captchas.captchas) {
|
|
79
72
|
const solutions = captcha.solution;
|
|
80
73
|
const unlabelled = captcha.unlabelled;
|
|
81
|
-
// both should not be undefined
|
|
82
74
|
if (solutions === undefined || unlabelled === undefined) {
|
|
83
75
|
console.log(captcha);
|
|
84
76
|
throw new Error(`solutions or unlabelled array is undefined`);
|
|
85
77
|
}
|
|
86
78
|
for (const solution of solutions) {
|
|
87
|
-
// solution should not be in unlabelled
|
|
88
79
|
if (unlabelled.includes(solution)) {
|
|
89
80
|
throw new Error(`solution ${solution} is also in unlabelled array`);
|
|
90
81
|
}
|
|
91
82
|
}
|
|
92
|
-
// check the correct, incorrect, labelled and unlabelled distribution
|
|
93
83
|
const nCorrect = solutions.length;
|
|
94
84
|
const nUnlabelled = unlabelled.length;
|
|
95
85
|
const nIncorrect = 9 - nCorrect - nUnlabelled;
|
|
@@ -128,7 +118,6 @@ describe('dataset commands', () => {
|
|
|
128
118
|
maxCorrect: 6,
|
|
129
119
|
allowDuplicates: true,
|
|
130
120
|
});
|
|
131
|
-
// make sure the results are the same as the expected results
|
|
132
121
|
if (!captchasEqFs(output, `${__dirname}/data/flat_resized/captchas_v1.json`)) {
|
|
133
122
|
throw new Error(`captchas not equal`);
|
|
134
123
|
}
|
|
@@ -145,12 +134,9 @@ describe('dataset commands', () => {
|
|
|
145
134
|
square: true,
|
|
146
135
|
size: 128,
|
|
147
136
|
});
|
|
148
|
-
// make sure the results are the same as the expected results
|
|
149
137
|
const expected = `${__dirname}/data/flat_resized`;
|
|
150
138
|
fsEq(output, expected);
|
|
151
|
-
// check data in resized dir is all 128x128
|
|
152
139
|
for (const pth of fsWalk(output)) {
|
|
153
|
-
// if pth is not img, ignore
|
|
154
140
|
if (!pth.endsWith('.jpg') && !pth.endsWith('.jpeg') && !pth.endsWith('.png')) {
|
|
155
141
|
continue;
|
|
156
142
|
}
|
|
@@ -173,7 +159,6 @@ describe('dataset commands', () => {
|
|
|
173
159
|
to: 'newwebsite.com',
|
|
174
160
|
from: '${repo}',
|
|
175
161
|
});
|
|
176
|
-
// make sure the results are the same as the expected results
|
|
177
162
|
const expected = `${__dirname}/data/flat_resized/relocated_data.json`;
|
|
178
163
|
fsEq(output, expected);
|
|
179
164
|
});
|
|
@@ -187,28 +172,21 @@ describe('dataset commands', () => {
|
|
|
187
172
|
output,
|
|
188
173
|
overwrite: true,
|
|
189
174
|
});
|
|
190
|
-
// make sure the results are the same as the expected results
|
|
191
175
|
const expected = `${__dirname}/data/flat`;
|
|
192
176
|
fsEq(output, expected);
|
|
193
|
-
// read data json
|
|
194
177
|
const content = fs.readFileSync(`${output}/data.json`).toString();
|
|
195
178
|
const dataJson = JSON.parse(content.toString());
|
|
196
179
|
const data = DataSchema.parse(dataJson);
|
|
197
|
-
// check each image from the hierarchical data is in the flat data
|
|
198
180
|
let hierCount = 0;
|
|
199
181
|
for (const pth of fsWalk(input)) {
|
|
200
|
-
// if pth is not img, ignore
|
|
201
182
|
if (!pth.endsWith('.jpg') && !pth.endsWith('.jpeg') && !pth.endsWith('.png')) {
|
|
202
183
|
continue;
|
|
203
184
|
}
|
|
204
185
|
hierCount++;
|
|
205
|
-
// get the category
|
|
206
186
|
const category = pth.split('/').slice(-2)[0];
|
|
207
187
|
const content = fs.readFileSync(pth);
|
|
208
|
-
// check the image is in the flat data
|
|
209
188
|
let name = '';
|
|
210
189
|
for (const pth2 of fsWalk(output)) {
|
|
211
|
-
// if pth2 is not file, ignore
|
|
212
190
|
if (!fs.statSync(pth2).isFile()) {
|
|
213
191
|
continue;
|
|
214
192
|
}
|
|
@@ -225,7 +203,6 @@ describe('dataset commands', () => {
|
|
|
225
203
|
if (!name) {
|
|
226
204
|
throw new Error(`unable to find image ${pth} in output`);
|
|
227
205
|
}
|
|
228
|
-
// check the image is in the data json
|
|
229
206
|
const item = data.items.find((item) => {
|
|
230
207
|
const name2 = item.data.split('/').slice(-1)[0];
|
|
231
208
|
if (name2 !== name) {
|
|
@@ -236,25 +213,20 @@ describe('dataset commands', () => {
|
|
|
236
213
|
if (item === undefined) {
|
|
237
214
|
throw new Error(`unable to find image ${pth} in data.json`);
|
|
238
215
|
}
|
|
239
|
-
// correct name, so check category
|
|
240
216
|
if (item.label != category) {
|
|
241
217
|
throw new Error(`expected ${category} but found ${item.label}`);
|
|
242
218
|
}
|
|
243
|
-
// type should be image
|
|
244
219
|
if (item.type !== 'image') {
|
|
245
220
|
throw new Error(`expected image type but found ${item.type}`);
|
|
246
221
|
}
|
|
247
|
-
// file name should be the hash
|
|
248
222
|
if (item.hash !== name.split('.')[0]) {
|
|
249
223
|
throw new Error(`expected ${name.split('.')[0]} hash but found ${item.hash}`);
|
|
250
224
|
}
|
|
251
|
-
// hash should be the hash of the image content
|
|
252
225
|
const hash = u8aToHex(blake2b(content));
|
|
253
226
|
if (item.hash !== hash) {
|
|
254
227
|
throw new Error(`expected ${hash} hash but found ${item.hash}`);
|
|
255
228
|
}
|
|
256
229
|
}
|
|
257
|
-
// count the number of images in the flat data
|
|
258
230
|
let flatCount = 0;
|
|
259
231
|
for (const pth of fsWalk(output)) {
|
|
260
232
|
if (!pth.endsWith('.jpg') && !pth.endsWith('.jpeg') && !pth.endsWith('.png')) {
|
|
@@ -262,7 +234,6 @@ describe('dataset commands', () => {
|
|
|
262
234
|
}
|
|
263
235
|
flatCount++;
|
|
264
236
|
}
|
|
265
|
-
// check same number of images in flat data
|
|
266
237
|
if (hierCount !== flatCount) {
|
|
267
238
|
throw new Error(`expected ${hierCount} images but found ${flatCount}`);
|
|
268
239
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocked.test.js","sourceRoot":"","sources":["../../src/tests/mocked.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,SAAS,CAAC,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"mocked.test.js","sourceRoot":"","sources":["../../src/tests/mocked.test.ts"],"names":[],"mappings":"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"}
|
package/dist/tests/utils.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { CaptchasContainerSchema, DataSchema } from '@prosopo/types';
|
|
2
2
|
import { at } from '@prosopo/util';
|
|
3
3
|
import fs from 'fs';
|
|
4
|
-
// recursively list files in a directory
|
|
5
4
|
export function* fsWalk(pth, options) {
|
|
6
|
-
// if path is a directory, recurse
|
|
7
5
|
const isDir = fs.existsSync(pth) && fs.statSync(pth).isDirectory();
|
|
8
6
|
let subpaths = isDir ? fs.readdirSync(pth) : [];
|
|
9
7
|
subpaths = subpaths.map((f) => `${pth}/${f}`);
|
|
@@ -17,33 +15,26 @@ export function* fsWalk(pth, options) {
|
|
|
17
15
|
yield pth;
|
|
18
16
|
}
|
|
19
17
|
}
|
|
20
|
-
// test whether two files/dirs are equal, recursively comparing contents as required
|
|
21
18
|
export const fsEq = (pth1, pth2) => {
|
|
22
19
|
const it1 = fsWalk(pth1);
|
|
23
20
|
const it2 = fsWalk(pth2);
|
|
24
|
-
// drop the root path
|
|
25
21
|
const files1 = [...it1].map((f) => f.slice(pth1.length));
|
|
26
22
|
const files2 = [...it2].map((f) => f.slice(pth2.length));
|
|
27
23
|
if (files1.length !== files2.length) {
|
|
28
24
|
return false;
|
|
29
25
|
}
|
|
30
|
-
// sort files so in same order
|
|
31
26
|
files1.sort();
|
|
32
27
|
files2.sort();
|
|
33
28
|
if (!files1.every((f, i) => f === files2[i])) {
|
|
34
|
-
// the two lists of files are not the same
|
|
35
29
|
return false;
|
|
36
30
|
}
|
|
37
|
-
// compare contents of each file
|
|
38
31
|
for (let i = 0; i < files1.length; i++) {
|
|
39
32
|
const file1 = pth1 + at(files1, i);
|
|
40
33
|
const file2 = pth2 + at(files2, i);
|
|
41
34
|
const stat1 = fs.statSync(file1);
|
|
42
35
|
if (stat1.isDirectory()) {
|
|
43
|
-
// already checked above
|
|
44
36
|
continue;
|
|
45
37
|
}
|
|
46
|
-
// files, so compare contents
|
|
47
38
|
const content1 = fs.readFileSync(file1);
|
|
48
39
|
const content2 = fs.readFileSync(file2);
|
|
49
40
|
if (!content1.equals(content2)) {
|
|
@@ -54,7 +45,6 @@ export const fsEq = (pth1, pth2) => {
|
|
|
54
45
|
};
|
|
55
46
|
export const readDataJson = (pth) => {
|
|
56
47
|
let content = fs.readFileSync(pth).toString();
|
|
57
|
-
// TODO use getPaths() here to find the repo dir
|
|
58
48
|
content = content.replaceAll('${repo}', __dirname + '/../../../..');
|
|
59
49
|
const dataJson = JSON.parse(content.toString());
|
|
60
50
|
const data = DataSchema.parse(dataJson);
|
|
@@ -78,11 +68,9 @@ export const captchasEq = (first, second) => {
|
|
|
78
68
|
for (let i = 0; i < first.captchas.length; i++) {
|
|
79
69
|
const captcha1 = at(first.captchas, i);
|
|
80
70
|
const captcha2 = at(second.captchas, i);
|
|
81
|
-
// salts should not be the same as generated on the fly and not stored!
|
|
82
71
|
if (captcha1.salt === captcha2.salt) {
|
|
83
72
|
return false;
|
|
84
73
|
}
|
|
85
|
-
// everything else should be the same
|
|
86
74
|
const { salt: salt1, ...rest1 } = captcha1;
|
|
87
75
|
const { salt: salt2, ...rest2 } = captcha2;
|
|
88
76
|
if (JSON.stringify(rest1) !== JSON.stringify(rest2)) {
|
|
@@ -92,28 +80,21 @@ export const captchasEq = (first, second) => {
|
|
|
92
80
|
return true;
|
|
93
81
|
};
|
|
94
82
|
export const substituteRepoDir = () => {
|
|
95
|
-
// read all json files in the test data dir
|
|
96
83
|
for (const pth of fsWalk(__dirname + '/data')) {
|
|
97
84
|
if (!pth.endsWith('.json')) {
|
|
98
85
|
continue;
|
|
99
86
|
}
|
|
100
|
-
// make a backup of each file
|
|
101
87
|
fs.copyFileSync(pth, pth + '.bak');
|
|
102
|
-
// replace ${repo} with the path to the repo
|
|
103
88
|
let content = fs.readFileSync(pth).toString();
|
|
104
|
-
// TODO use getPaths() here to find the repo dir
|
|
105
89
|
content = content.replaceAll('${repo}', __dirname + '/../../../..');
|
|
106
|
-
// rewrite the file
|
|
107
90
|
fs.writeFileSync(pth, content);
|
|
108
91
|
}
|
|
109
92
|
};
|
|
110
93
|
export const restoreRepoDir = () => {
|
|
111
|
-
// read all json files in the test data dir
|
|
112
94
|
for (const pth of fsWalk(__dirname + '/data')) {
|
|
113
95
|
if (!pth.endsWith('.json')) {
|
|
114
96
|
continue;
|
|
115
97
|
}
|
|
116
|
-
// restore the backup of each file
|
|
117
98
|
fs.renameSync(pth + '.bak', pth);
|
|
118
99
|
}
|
|
119
100
|
};
|
package/dist/tests/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/tests/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,uBAAuB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACvF,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAA;AAClC,OAAO,EAAE,MAAM,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/tests/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/input.js
CHANGED
|
@@ -25,7 +25,6 @@ export class InputCliCommand extends CliCommand {
|
|
|
25
25
|
async _check(args) {
|
|
26
26
|
this.logger.debug('input _check');
|
|
27
27
|
await super._check(args);
|
|
28
|
-
// input must exist
|
|
29
28
|
if (!fs.existsSync(args.input)) {
|
|
30
29
|
throw new ProsopoEnvError(new Error(`input path does not exist: ${args.input}`), 'FS.FILE_NOT_FOUND');
|
|
31
30
|
}
|
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,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAA;AAIF,MAAM,OAAO,eAAkD,SAAQ,UAAa;IAChE,YAAY;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,cAAc;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,UAAU;QACtB,OAAO;YACH,KAAK,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,gBAAgB;aAChC;SACJ,CAAA;IACL,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAe;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACjC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAA;AAIF,MAAM,OAAO,eAAkD,SAAQ,UAAa;IAChE,YAAY;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,cAAc;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,UAAU;QACtB,OAAO;YACH,KAAK,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,gBAAgB;aAChC;SACJ,CAAA;IACL,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAe;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACjC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAExB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAA;SACxG;IACL,CAAC;CACJ"}
|
package/dist/utils/output.js
CHANGED
|
@@ -40,9 +40,7 @@ export class OutputCliCommand extends CliCommand {
|
|
|
40
40
|
async _check(args) {
|
|
41
41
|
this.logger.debug('Output _check');
|
|
42
42
|
await super._check(args);
|
|
43
|
-
// record whether output already exists
|
|
44
43
|
__classPrivateFieldSet(this, _OutputCliCommand_outputExists, fs.existsSync(args.output), "f");
|
|
45
|
-
// output must not exist, unless overwrite is true
|
|
46
44
|
if (this.outputExists()) {
|
|
47
45
|
if (!args.overwrite) {
|
|
48
46
|
throw new ProsopoEnvError(new Error(`output path already exists: ${args.output}`), 'FS.FILE_ALREADY_EXISTS');
|
|
@@ -53,7 +51,6 @@ export class OutputCliCommand extends CliCommand {
|
|
|
53
51
|
this.logger.debug('Output run');
|
|
54
52
|
await super._run(args);
|
|
55
53
|
if (args.overwrite && this.outputExists()) {
|
|
56
|
-
// if overwrite is true, delete the output directory
|
|
57
54
|
this.logger.info('cleaning output directory...');
|
|
58
55
|
fs.rmSync(args.output, { recursive: true });
|
|
59
56
|
}
|
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,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAmB,MAAM,KAAK,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;IACnC,MAAM,EAAE,MAAM,EAAE;IAChB,SAAS,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA;AAIF,MAAM,OAAO,gBAAoD,SAAQ,UAAa;IAAtF;;QACI,yCAAgB,KAAK,EAAA;IAsDzB,CAAC;IApDU,YAAY;QACf,OAAO,uBAAA,IAAI,sCAAc,CAAA;IAC7B,CAAC;IAEe,YAAY;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,cAAc;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,MAAM,EAAE;gBACJ,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,iBAAiB;aACjC;YACD,SAAS,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,0DAA0D;aAC1E;SACJ,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAgB;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAClC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAmB,MAAM,KAAK,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;IACnC,MAAM,EAAE,MAAM,EAAE;IAChB,SAAS,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA;AAIF,MAAM,OAAO,gBAAoD,SAAQ,UAAa;IAAtF;;QACI,yCAAgB,KAAK,EAAA;IAsDzB,CAAC;IApDU,YAAY;QACf,OAAO,uBAAA,IAAI,sCAAc,CAAA;IAC7B,CAAC;IAEe,YAAY;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,cAAc;QAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IACe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,MAAM,EAAE;gBACJ,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,iBAAiB;aACjC;YACD,SAAS,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,0DAA0D;aAC1E;SACJ,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAgB;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAClC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAGxB,uBAAA,IAAI,kCAAiB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAA,CAAA;QAG/C,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACjB,MAAM,IAAI,eAAe,CACrB,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,MAAM,EAAE,CAAC,EACvD,wBAAwB,CAC3B,CAAA;aACJ;SACJ;IACL,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAgB;QACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC/B,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YAEvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;YAChD,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SAC9C;IACL,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/datasets-fs",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.16",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"private": false,
|
|
@@ -28,12 +28,11 @@
|
|
|
28
28
|
"types": "./dist/index.d.ts",
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@polkadot/util": "^12.3.2",
|
|
31
|
-
"@prosopo/common": "0.2.
|
|
32
|
-
"@prosopo/types": "0.2.
|
|
33
|
-
"@prosopo/util": "0.2.
|
|
31
|
+
"@prosopo/common": "0.2.16",
|
|
32
|
+
"@prosopo/types": "0.2.16",
|
|
33
|
+
"@prosopo/util": "0.2.16",
|
|
34
34
|
"bcrypt": "^5.1.0",
|
|
35
35
|
"cli-progress": "^3.12.0",
|
|
36
|
-
"es-main": "^1.2.0",
|
|
37
36
|
"fs": "^0.0.1-security",
|
|
38
37
|
"lodash": "^4.17.21",
|
|
39
38
|
"noble-hashes": "^0.3.1",
|
package/src/cli.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { Get } from './commands/get.js'
|
|
|
7
7
|
import { Labels } from './commands/labels.js'
|
|
8
8
|
import { Relocate } from './commands/relocate.js'
|
|
9
9
|
import { Resize } from './commands/resize.js'
|
|
10
|
-
import
|
|
10
|
+
import { isMain } from '@prosopo/util'
|
|
11
11
|
|
|
12
12
|
const main = async () => {
|
|
13
13
|
const commands: CliCommandAny[] = [
|
|
@@ -25,7 +25,7 @@ const main = async () => {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
//if main process
|
|
28
|
-
if (
|
|
28
|
+
if (isMain(import.meta.url)) {
|
|
29
29
|
main()
|
|
30
30
|
.then(() => {
|
|
31
31
|
process.exit(0)
|