@prosopo/datasets-fs 0.2.13 → 0.2.14

package/dist/utils/input.d.ts

@@ -1,5 +1,5 @@
+import * as z from 'zod';
 import { CliCommand } from '../cli/cliCommand.js';
-import { z } from 'zod';
 export declare const InputArgsSchema: z.ZodObject<{
     input: z.ZodString;
 }, "strip", z.ZodTypeAny, {

package/dist/utils/input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAA;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEvD,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,eAAe,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAChE,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;IAWJ,MAAM,CAAC,IAAI,EAAE,SAAS;CAQ/C"}
+{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAA;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEvD,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,eAAe,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAChE,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;IAWJ,MAAM,CAAC,IAAI,EAAE,SAAS;CAQ/C"}

package/dist/utils/input.js

@@ -1,6 +1,6 @@
+import * as z from 'zod';
 import { CliCommand } from '../cli/cliCommand.js';
 import { ProsopoEnvError } from '@prosopo/common';
-import { z } from 'zod';
 import fs from 'fs';
 export const InputArgsSchema = z.object({
     input: z.string(),

package/dist/utils/input.js.map

@@ -1 +1 @@
-{"version":3,"file":"input.js","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,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;QACxB,mBAAmB;QACnB,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"}
+{"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;QACxB,mBAAmB;QACnB,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/inputOutput.d.ts

@@ -1,5 +1,5 @@
+import * as z from 'zod';
 import { CliCommandComposite } from '../cli/cliCommandComposite.js';
-import { z } from 'zod';
 export declare const InputOutputArgsSchema: z.ZodObject<{
     input: z.ZodString;
     output: z.ZodString;

package/dist/utils/inputOutput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inputOutput.d.ts","sourceRoot":"","sources":["../../src/utils/inputOutput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAGnE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,qBAAqB;;;;;;;;;;;;EAA0C,CAAA;AAE5E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAA;AAEnE,8BAAsB,qBAAqB,CAAC,CAAC,SAAS,OAAO,qBAAqB,CAAE,SAAQ,mBAAmB,CAAC,CAAC,CAAC;;CAIjH"}
+{"version":3,"file":"inputOutput.d.ts","sourceRoot":"","sources":["../../src/utils/inputOutput.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAInE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;EAA0C,CAAA;AAE5E,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAA;AAEnE,8BAAsB,qBAAqB,CAAC,CAAC,SAAS,OAAO,qBAAqB,CAAE,SAAQ,mBAAmB,CAAC,CAAC,CAAC;;CAIjH"}

package/dist/utils/inputOutput.js.map

@@ -1 +1 @@
-{"version":3,"file":"inputOutput.js","sourceRoot":"","sources":["../../src/utils/inputOutput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAGhE,MAAM,CAAC,MAAM,qBAAqB,GAAG,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;AAI5E,MAAM,OAAgB,qBAA8D,SAAQ,mBAAsB;IAC9G;QACI,KAAK,CAAC,CAAC,IAAI,eAAe,EAAK,EAAE,IAAI,gBAAgB,EAAK,CAAC,CAAC,CAAA;IAChE,CAAC;CACJ"}
+{"version":3,"file":"inputOutput.js","sourceRoot":"","sources":["../../src/utils/inputOutput.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEhE,MAAM,CAAC,MAAM,qBAAqB,GAAG,eAAe,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;AAI5E,MAAM,OAAgB,qBAA8D,SAAQ,mBAAsB;IAC9G;QACI,KAAK,CAAC,CAAC,IAAI,eAAe,EAAK,EAAE,IAAI,gBAAgB,EAAK,CAAC,CAAC,CAAA;IAChE,CAAC;CACJ"}

package/dist/utils/output.d.ts

@@ -1,17 +1,17 @@
 /// <reference types="yargs" />
 import { CliCommand } from '../cli/cliCommand.js';
-import { z } from 'zod';
-export declare const OutputArgsSchema: z.ZodObject<{
-    output: z.ZodString;
-    overwrite: z.ZodOptional<z.ZodBoolean>;
-}, "strip", z.ZodTypeAny, {
+import { infer as zInfer } from 'zod';
+export declare const OutputArgsSchema: import("zod").ZodObject<{
+    output: import("zod").ZodString;
+    overwrite: import("zod").ZodOptional<import("zod").ZodBoolean>;
+}, "strip", import("zod").ZodTypeAny, {
     output: string;
     overwrite?: boolean | undefined;
 }, {
     output: string;
     overwrite?: boolean | undefined;
 }>;
-export type OutputArgs = z.infer<typeof OutputArgsSchema>;
+export type OutputArgs = zInfer<typeof OutputArgsSchema>;
 export declare class OutputCliCommand<T extends typeof OutputArgsSchema> extends CliCommand<T> {
     #private;
     outputExists(): boolean;

package/dist/utils/output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAGjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAA;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAEzD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,gBAAgB,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;;IAG3E,YAAY;IAIH,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;;;;;;;IAeJ,MAAM,CAAC,IAAI,EAAE,UAAU;IAkBvB,IAAI,CAAC,IAAI,EAAE,UAAU;CAS9C"}
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAA2B,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,CAAA;AAI9D,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAA;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAExD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,gBAAgB,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;;IAG3E,YAAY;IAIH,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;;;;;;;IAeJ,MAAM,CAAC,IAAI,EAAE,UAAU;IAkBvB,IAAI,CAAC,IAAI,EAAE,UAAU;CAS9C"}

package/dist/utils/output.js

@@ -2,12 +2,12 @@ var _OutputCliCommand_outputExists;
 import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { CliCommand } from '../cli/cliCommand.js';
 import { ProsopoEnvError } from '@prosopo/common';
-import { lodash } from '@prosopo/util';
-import { z } from 'zod';
+import { boolean, object, string } from 'zod';
+import { lodash } from '@prosopo/util/lodash';
 import fs from 'fs';
-export const OutputArgsSchema = z.object({
-    output: z.string(),
-    overwrite: z.boolean().optional(),
+export const OutputArgsSchema = object({
+    output: string(),
+    overwrite: boolean().optional(),
 });
 export class OutputCliCommand extends CliCommand {
     constructor() {

package/dist/utils/output.js.map

@@ -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,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACpC,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;QAExB,uCAAuC;QACvC,uBAAA,IAAI,kCAAiB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAA,CAAA;QAE/C,kDAAkD;QAClD,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;YACvC,oDAAoD;YACpD,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"}
+{"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;QAExB,uCAAuC;QACvC,uBAAA,IAAI,kCAAiB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAA,CAAA;QAE/C,kDAAkD;QAClD,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;YACvC,oDAAoD;YACpD,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

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/datasets-fs",
-    "version": "0.2.13",
+    "version": "0.2.14",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "private": false,
@@ -28,9 +28,9 @@
     "types": "./dist/index.d.ts",
     "dependencies": {
         "@polkadot/util": "^12.3.2",
-        "@prosopo/common": "0.2.13",
-        "@prosopo/types": "0.2.13",
-        "@prosopo/util": "0.2.13",
+        "@prosopo/common": "0.2.14",
+        "@prosopo/types": "0.2.14",
+        "@prosopo/util": "0.2.14",
         "bcrypt": "^5.1.0",
         "cli-progress": "^3.12.0",
         "es-main": "^1.2.0",

package/src/cli/cliCommand.ts

@@ -1,7 +1,7 @@
+import * as z from 'zod'
 import { Loggable } from '@prosopo/common'
 import { Options } from 'yargs'
 import { kebabCase } from '@prosopo/util'
-import { z } from 'zod'
 
 export abstract class CliCommand<T extends z.ZodTypeAny> extends Loggable {
     // get the options for the CLI

package/src/cli/cliCommandComposite.ts

@@ -1,6 +1,6 @@
+import * as z from 'zod'
 import { CliCommand, CliCommandAny } from './cliCommand.js'
 import { Options } from 'yargs'
-import { z } from 'zod'
 
 export abstract class CliCommandComposite<T extends z.ZodTypeAny> extends CliCommand<T> {
     #commands: CliCommandAny[] = []

package/src/commands/flatten.ts

@@ -1,9 +1,10 @@
+import * as z from 'zod'
 import { CaptchaItemTypes, Data, DataSchema, LabelledItem } from '@prosopo/types'
 import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js'
-import { at, lodash } from '@prosopo/util'
+import { at } from '@prosopo/util'
 import { blake2b } from '@noble/hashes/blake2b'
-import { u8aToHex } from '@polkadot/util'
-import { z } from 'zod'
+import { lodash } from '@prosopo/util/lodash'
+import { u8aToHex } from '@polkadot/util/u8a'
 import cliProgress from 'cli-progress'
 import fs from 'fs'
 

package/src/commands/generate.ts

@@ -1,8 +1,8 @@
+import * as z from 'zod'
 import { DataSchema, Item, LabelledDataSchema, LabelledItem, LabelsContainerSchema } from '@prosopo/types'
 import { OutputArgsSchema, OutputCliCommand } from '../utils/output.js'
 import { ProsopoEnvError } from '@prosopo/common'
-import { lodash, setSeedGlobal } from '@prosopo/util'
-import { z } from 'zod'
+import { lodash, setSeedGlobal } from '@prosopo/util/lodash'
 import fs from 'fs'
 
 export const ArgsSchema = OutputArgsSchema.extend({

package/src/commands/generateV1.ts

@@ -1,9 +1,10 @@
+import * as z from 'zod'
 import { CaptchaTypes, CaptchaWithoutId, Captchas, CaptchasContainerSchema, Item, RawSolution } from '@prosopo/types'
 import { Generate, ArgsSchema as GenerateArgsSchema } from './generate.js'
 import { ProsopoEnvError } from '@prosopo/common'
-import { at, get, lodash } from '@prosopo/util'
-import { blake2AsHex } from '@polkadot/util-crypto'
-import { z } from 'zod'
+import { at, get } from '@prosopo/util'
+import { blake2AsHex } from '@polkadot/util-crypto/blake2'
+import { lodash } from '@prosopo/util/lodash'
 import bcrypt from 'bcrypt'
 import cliProgress from 'cli-progress'
 import fs from 'fs'

package/src/commands/generateV2.ts

@@ -1,9 +1,10 @@
+import * as z from 'zod'
 import { CaptchaTypes, CaptchaWithoutId, Captchas, CaptchasContainerSchema, Item, RawSolution } from '@prosopo/types'
 import { Generate, ArgsSchema as GenerateArgsSchema } from './generate.js'
 import { ProsopoEnvError } from '@prosopo/common'
-import { at, get, lodash } from '@prosopo/util'
-import { blake2AsHex } from '@polkadot/util-crypto'
-import { z } from 'zod'
+import { at, get } from '@prosopo/util'
+import { blake2AsHex } from '@polkadot/util-crypto/blake2'
+import { lodash } from '@prosopo/util/lodash'
 import bcrypt from 'bcrypt'
 import cliProgress from 'cli-progress'
 import fs from 'fs'

package/src/commands/get.ts

@@ -1,7 +1,7 @@
+import * as z from 'zod'
 import { InputArgsSchema, InputCliCommand } from '../utils/input.js'
 import { get } from '@prosopo/util'
-import { lodash } from '@prosopo/util'
-import { z } from 'zod'
+import { lodash } from '@prosopo/util/lodash'
 import cliProgress from 'cli-progress'
 import fs from 'fs'
 

package/src/commands/labels.ts

@@ -1,8 +1,8 @@
+import * as z from 'zod'
 import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js'
 import { LabelledDataSchema, LabelledItem } from '@prosopo/types'
 import { ProsopoEnvError } from '@prosopo/common'
-import { lodash } from '@prosopo/util'
-import { z } from 'zod'
+import { lodash } from '@prosopo/util/lodash'
 import fs from 'fs'
 
 export const ArgsSchema = InputOutputArgsSchema.extend({})

package/src/commands/relocate.ts

@@ -1,6 +1,7 @@
+import * as z from 'zod'
 import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js'
-import { get, lodash } from '@prosopo/util'
-import { z } from 'zod'
+import { get } from '@prosopo/util'
+import { lodash } from '@prosopo/util/lodash'
 import fs from 'fs'
 
 export const ArgsSchema = InputOutputArgsSchema.extend({

package/src/commands/resize.ts

@@ -1,10 +1,10 @@
+import * as z from 'zod'
 import { Data, DataSchema, Item } from '@prosopo/types'
 import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js'
 import { ProsopoEnvError } from '@prosopo/common'
 import { blake2b } from '@noble/hashes/blake2b'
-import { lodash } from '@prosopo/util'
-import { u8aToHex } from '@polkadot/util'
-import { z } from 'zod'
+import { lodash } from '@prosopo/util/lodash'
+import { u8aToHex } from '@polkadot/util/u8a'
 import cliProgress from 'cli-progress'
 import fs from 'fs'
 import sharp from 'sharp'

package/src/tests/lodash.test.ts

@@ -0,0 +1,40 @@
+// Copyright 2021-2023 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { describe, expect, test } from 'vitest'
+import { rng, seedLodash } from '@prosopo/util/lodash'
+
+describe('rng', () => {
+    test('generates random numbers using a seed', () => {
+        const seed = 0
+        const rand = rng(seed)
+        const expected = [-1681090547, 408334984, 788430095, 3233831872, 963300000, -299378919, 97582850]
+        for (let i = 0; i < expected.length; i++) {
+            expect(rand.int()).to.equal(expected[i])
+        }
+    })
+})
+
+describe('seeded_lodash', () => {
+    test('shuffles an array using a seed', () => {
+        let array = [1, 2, 3, 4, 5]
+        const seed = 0
+        const _ = seedLodash(seed)
+        array = _.shuffle(array)
+        expect(array).to.deep.equal([4, 2, 1, 3, 5])
+        array = _.shuffle(array)
+        expect(array).to.deep.equal([3, 4, 1, 5, 2])
+        array = _.shuffle(array)
+        expect(array).to.deep.equal([3, 4, 5, 2, 1])
+    })
+})

package/src/tests/mocked.test.ts

@@ -8,7 +8,7 @@ import { Resize } from '../commands/resize.js'
 import { afterAll, beforeAll, describe, test } from 'vitest'
 import { blake2b } from '@noble/hashes/blake2b'
 import { captchasEqFs, fsEq, fsWalk, restoreRepoDir, substituteRepoDir } from './utils.js'
-import { u8aToHex } from '@polkadot/util'
+import { u8aToHex } from '@polkadot/util/u8a'
 import fs from 'fs'
 import sharp from 'sharp'
 

package/src/utils/input.ts

@@ -1,6 +1,6 @@
+import * as z from 'zod'
 import { CliCommand } from '../cli/cliCommand.js'
 import { ProsopoEnvError } from '@prosopo/common'
-import { z } from 'zod'
 import fs from 'fs'
 
 export const InputArgsSchema = z.object({

package/src/utils/inputOutput.ts

@@ -1,7 +1,7 @@
+import * as z from 'zod'
 import { CliCommandComposite } from '../cli/cliCommandComposite.js'
 import { InputArgsSchema, InputCliCommand } from './input.js'
 import { OutputArgsSchema, OutputCliCommand } from './output.js'
-import { z } from 'zod'
 
 export const InputOutputArgsSchema = InputArgsSchema.merge(OutputArgsSchema)
 

package/src/utils/output.ts

@@ -1,15 +1,15 @@
 import { CliCommand } from '../cli/cliCommand.js'
 import { ProsopoEnvError } from '@prosopo/common'
-import { lodash } from '@prosopo/util'
-import { z } from 'zod'
+import { boolean, object, string, infer as zInfer } from 'zod'
+import { lodash } from '@prosopo/util/lodash'
 import fs from 'fs'
 
-export const OutputArgsSchema = z.object({
-    output: z.string(),
-    overwrite: z.boolean().optional(),
+export const OutputArgsSchema = object({
+    output: string(),
+    overwrite: boolean().optional(),
 })
 
-export type OutputArgs = z.infer<typeof OutputArgsSchema>
+export type OutputArgs = zInfer<typeof OutputArgsSchema>
 
 export class OutputCliCommand<T extends typeof OutputArgsSchema> extends CliCommand<T> {
     #outputExists = false