@prosopo/datasets 0.1.10 → 0.1.14

package/dist/js/captcha/captcha.d.ts

@@ -1,4 +1,4 @@
-import { AssetsResolver, Captcha, CaptchaSolution, CaptchaWithoutId, DatasetRaw, HashedItem, HashedSolution, Item, RawSolution } from '../types/index';
+import { AssetsResolver, Captcha, CaptchaSolution, CaptchaWithoutId, DatasetRaw, HashedItem, HashedSolution, Item, RawSolution } from '@prosopo/types';
 /**
  * Parse a dataset
  * @return {JSON} captcha dataset, stored in JSON
@@ -10,7 +10,7 @@ export declare function parseCaptchaDataset(datasetJSON: JSON): DatasetRaw;
  * @param {JSON} captchaJSON captcha solutions received from the api
  * @return {CaptchaSolution[]} an array of parsed and sorted captcha solutions
  */
-export declare function parseAndSortCaptchaSolutions(captchaJSON: JSON): CaptchaSolution[];
+export declare function parseAndSortCaptchaSolutions(captchaJSON: CaptchaSolution[]): CaptchaSolution[];
 export declare function captchaSort<T extends {
     captchaId: string;
 }>(a: T, b: T): number;
@@ -34,6 +34,10 @@ export declare function compareCaptchaSolutions(received: CaptchaSolution[], sto
  * @return {string} the hex string hash
  */
 export declare function computeCaptchaHash(captcha: CaptchaWithoutId, includeSolution: boolean | undefined, includeSalt: boolean | undefined, sortItemHashes: boolean): string;
+/** Compute the hash of a captcha item, downloading the image if necessary
+ * @param  {Item} item
+ * @return {Promise<HashedItem>} the hex string hash of the item
+ */
 export declare function computeItemHash(item: Item): Promise<HashedItem>;
 /**
  * Converts an indexed captcha solution to a hashed captcha solution or simply returns the hash if it is already hashed
@@ -61,8 +65,8 @@ export declare function computePendingRequestHash(captchaIds: string[], userAcco
  */
 export declare function parseCaptchaAssets(item: Item, assetsResolver: AssetsResolver | undefined): {
     path: string;
-    hash?: string | undefined;
+    type: import("@prosopo/types").CaptchaItemTypes;
     data: string;
-    type: import("../types/captcha").CaptchaItemTypes;
+    hash?: string | undefined;
 };
 //# sourceMappingURL=captcha.d.ts.map

package/dist/js/captcha/captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,cAAc,EACd,OAAO,EACP,eAAe,EAEf,gBAAgB,EAChB,UAAU,EAEV,UAAU,EACV,cAAc,EACd,IAAI,EACJ,WAAW,EACd,MAAM,gBAAgB,CAAA;AAOvB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,IAAI,GAAG,UAAU,CAMjE;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,IAAI,GAAG,eAAe,EAAE,CAQjF;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAEtE;AAED,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,eAAe,EAAE,EAC3B,MAAM,EAAE,OAAO,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAwBvC;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAO/F;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,eAAe,qBAAQ,EACvB,WAAW,qBAAQ,EACnB,cAAc,EAAE,OAAO,GACxB,MAAM,CAkBR;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAQrE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,SAAS,EAAE,WAAW,EAAE,GAAG,cAAc,EAAE,EAC3C,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,GAC1B,cAAc,EAAE,CAgBlB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,UAElE;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,SAAS;;;;;EAExF"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"AAeA,OAAO,EACH,cAAc,EACd,OAAO,EACP,eAAe,EAEf,gBAAgB,EAChB,UAAU,EAEV,UAAU,EACV,cAAc,EACd,IAAI,EACJ,WAAW,EACd,MAAM,gBAAgB,CAAA;AAOvB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,IAAI,GAAG,UAAU,CAMjE;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,CAQ9F;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAEtE;AAED,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,eAAe,EAAE,EAC3B,MAAM,EAAE,OAAO,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAwBvC;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAO/F;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,eAAe,qBAAQ,EACvB,WAAW,qBAAQ,EACnB,cAAc,EAAE,OAAO,GACxB,MAAM,CAkBR;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,CAQrE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACjC,SAAS,EAAE,WAAW,EAAE,GAAG,cAAc,EAAE,EAC3C,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,GAC1B,cAAc,EAAE,CAgBlB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,eAAe,UAGlE;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzG;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,GAAG,SAAS;;;;;EAExF"}

package/dist/js/captcha/captcha.js

@@ -17,9 +17,9 @@ const tslib_1 = require("tslib");
 //
 // You should have received a copy of the GNU General Public License
 // along with provider.  If not, see <http://www.gnu.org/licenses/>.
-const index_1 = require("../types/index");
+const types_1 = require("@prosopo/types");
+const common_1 = require("@prosopo/common");
 const util_1 = require("./util");
-const error_1 = require("../types/error");
 const util_2 = require("@polkadot/util");
 // import {encodeAddress} from "@polkadot/util-crypto";
 /**
@@ -29,10 +29,10 @@ const util_2 = require("@polkadot/util");
  */
 function parseCaptchaDataset(datasetJSON) {
     try {
-        return index_1.DatasetSchema.parse(datasetJSON);
+        return types_1.DatasetSchema.parse(datasetJSON);
     }
     catch (err) {
-        throw new error_1.ProsopoEnvError(err, 'ERRORS.DATASET.PARSE_ERROR');
+        throw new common_1.ProsopoEnvError(err, 'ERRORS.DATASET.PARSE_ERROR');
     }
 }
 exports.parseCaptchaDataset = parseCaptchaDataset;
@@ -43,12 +43,12 @@ exports.parseCaptchaDataset = parseCaptchaDataset;
  */
 function parseAndSortCaptchaSolutions(captchaJSON) {
     try {
-        const parsed = index_1.CaptchaSolutionArraySchema.parse(captchaJSON);
+        const parsed = types_1.CaptchaSolutionArraySchema.parse(captchaJSON);
         parsed.map((captcha) => (Object.assign(Object.assign({}, captcha), { solution: captcha.solution.sort() })));
         return parsed;
     }
     catch (err) {
-        throw new error_1.ProsopoEnvError(err, 'ERRORS.CAPTCHA.PARSE_ERROR');
+        throw new common_1.ProsopoEnvError(err, 'ERRORS.CAPTCHA.PARSE_ERROR');
     }
 }
 exports.parseAndSortCaptchaSolutions = parseAndSortCaptchaSolutions;
@@ -61,7 +61,7 @@ function sortAndComputeHashes(received, stored) {
     stored.sort(captchaSort);
     return stored.map(({ salt, items = [], target = '', captchaId, solved }, index) => {
         if (captchaId != received[index].captchaId) {
-            throw new error_1.ProsopoEnvError('CAPTCHA.ID_MISMATCH');
+            throw new common_1.ProsopoEnvError('CAPTCHA.ID_MISMATCH');
         }
         return {
             hash: computeCaptchaHash({
@@ -104,10 +104,10 @@ function computeCaptchaHash(captcha, includeSolution = false, includeSalt = fals
                 return item.hash;
             }
             else {
-                throw new error_1.ProsopoEnvError('CAPTCHA.MISSING_ITEM_HASH', computeCaptchaHash.name, undefined, index);
+                throw new common_1.ProsopoEnvError('CAPTCHA.MISSING_ITEM_HASH', computeCaptchaHash.name, undefined, index);
             }
         });
-        return (0, util_1.hexHashArray)([
+        return (0, common_1.hexHashArray)([
             captcha.target,
             ...(includeSolution && captcha.solution ? captcha.solution.sort() : []),
             includeSalt ? captcha.salt : '',
@@ -115,20 +115,24 @@ function computeCaptchaHash(captcha, includeSolution = false, includeSalt = fals
         ]);
     }
     catch (err) {
-        throw new error_1.ProsopoEnvError(err);
+        throw new common_1.ProsopoEnvError(err);
     }
 }
 exports.computeCaptchaHash = computeCaptchaHash;
+/** Compute the hash of a captcha item, downloading the image if necessary
+ * @param  {Item} item
+ * @return {Promise<HashedItem>} the hex string hash of the item
+ */
 function computeItemHash(item) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (item.type === 'text') {
-            return Object.assign(Object.assign({}, item), { hash: (0, util_1.hexHash)(item.data) });
+            return Object.assign(Object.assign({}, item), { hash: (0, common_1.hexHash)(item.data) });
         }
         else if (item.type === 'image') {
-            return Object.assign(Object.assign({}, item), { hash: (0, util_1.hexHash)(yield (0, util_1.downloadImage)(item.data)) });
+            return Object.assign(Object.assign({}, item), { hash: (0, common_1.hexHash)(yield (0, util_1.downloadImage)(item.data)) });
         }
         else {
-            throw new error_1.ProsopoEnvError('CAPTCHA.INVALID_ITEM_FORMAT');
+            throw new common_1.ProsopoEnvError('CAPTCHA.INVALID_ITEM_FORMAT');
         }
     });
 }
@@ -143,10 +147,10 @@ function matchItemsToSolutions(solutions, items) {
     return ((solutions === null || solutions === void 0 ? void 0 : solutions.map((solution) => {
         const hash = items && items[solution] && items[solution].hash ? items[solution].hash : solution;
         if (!hash) {
-            throw new error_1.ProsopoEnvError('CAPTCHA.MISSING_ITEM_HASH');
+            throw new common_1.ProsopoEnvError('CAPTCHA.MISSING_ITEM_HASH');
         }
         if (!(0, util_2.isHex)(hash)) {
-            throw new error_1.ProsopoEnvError('CAPTCHA.INVALID_ITEM_HASH');
+            throw new common_1.ProsopoEnvError('CAPTCHA.INVALID_ITEM_HASH');
         }
         return hash;
     })) || []);
@@ -158,7 +162,8 @@ exports.matchItemsToSolutions = matchItemsToSolutions;
  * @return {string} the hex string hash
  */
 function computeCaptchaSolutionHash(captcha) {
-    return (0, util_1.hexHashArray)([captcha.captchaId, captcha.captchaContentId, [...captcha.solution].sort(), captcha.salt]);
+    // TODO: should the captchaContentId be validated?
+    return (0, common_1.hexHashArray)([captcha.captchaId, captcha.captchaContentId, [...captcha.solution].sort(), captcha.salt]);
 }
 exports.computeCaptchaSolutionHash = computeCaptchaSolutionHash;
 /**
@@ -169,7 +174,7 @@ exports.computeCaptchaSolutionHash = computeCaptchaSolutionHash;
  * @return {string}
  */
 function computePendingRequestHash(captchaIds, userAccount, salt) {
-    return (0, util_1.hexHashArray)([...captchaIds.sort(), userAccount, salt]);
+    return (0, common_1.hexHashArray)([...captchaIds.sort(), userAccount, salt]);
 }
 exports.computePendingRequestHash = computePendingRequestHash;
 /**

package/dist/js/captcha/captcha.js.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../../src/js/captcha/captcha.ts"],"names":[],"mappings":"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"}

package/dist/js/captcha/dataset.d.ts

@@ -1,5 +1,5 @@
-import { Dataset, DatasetRaw } from '../types/dataset';
 import { CaptchaMerkleTree } from './merkle';
+import { Dataset, DatasetRaw } from '@prosopo/types';
 export declare function buildDataset(datasetRaw: DatasetRaw): Promise<Dataset>;
 export declare function buildCaptchaTree(dataset: Dataset, includeSolution: boolean, includeSalt: boolean, sortItemHashes: boolean): Promise<CaptchaMerkleTree>;
 export declare function addItemHashesAndSolutionHashesToDataset(datasetRaw: DatasetRaw): Promise<Dataset>;

package/dist/js/captcha/dataset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAGtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAG5C,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB3E;AAED,wBAAsB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,OAAO,EACxB,WAAW,EAAE,OAAO,EACpB,cAAc,EAAE,OAAO,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,uCAAuC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBtG"}
+{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAIpD,wBAAsB,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAmB3E;AAED,wBAAsB,gBAAgB,CAClC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,OAAO,EACxB,WAAW,EAAE,OAAO,EACpB,cAAc,EAAE,OAAO,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAY5B;AAED,wBAAsB,uCAAuC,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAgBtG"}

package/dist/js/captcha/dataset.js

@@ -2,23 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addItemHashesAndSolutionHashesToDataset = exports.buildCaptchaTree = exports.buildDataset = void 0;
 const tslib_1 = require("tslib");
-const captcha_1 = require("./captcha");
 const merkle_1 = require("./merkle");
-const error_1 = require("../types/error");
+const common_1 = require("@prosopo/common");
+const captcha_1 = require("./captcha");
 function buildDataset(datasetRaw) {
     var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const dataset = yield addItemHashesAndSolutionHashesToDataset(datasetRaw);
-        // console.log(dataset.captchas[0])
-        // dataset.captchas.map((captcha: CaptchaWithoutId) => {
-        //     if (captcha.target === 'car') {
-        //         console.log(captcha)
-        //     }
-        // })
-        // process.exit(0)
         const contentTree = yield buildCaptchaTree(dataset, false, false, true);
         const solutionTree = yield buildCaptchaTree(dataset, true, true, false);
-        dataset.captchas = dataset.captchas.map((captcha, index) => (Object.assign(Object.assign({}, captcha), { captchaId: solutionTree.leaves[index].hash, captchaContentId: contentTree.leaves[index].hash })));
+        dataset.captchas = dataset.captchas.map((captcha, index) => {
+            var _a, _b;
+            return (Object.assign(Object.assign({}, captcha), { captchaId: solutionTree.leaves[index].hash, captchaContentId: contentTree.leaves[index].hash, datasetId: (_a = solutionTree.root) === null || _a === void 0 ? void 0 : _a.hash, datasetContentId: (_b = contentTree.root) === null || _b === void 0 ? void 0 : _b.hash }));
+        });
         dataset.solutionTree = solutionTree.layers;
         dataset.contentTree = contentTree.layers;
         dataset.datasetId = (_a = solutionTree.root) === null || _a === void 0 ? void 0 : _a.hash;
@@ -37,7 +33,7 @@ function buildCaptchaTree(dataset, includeSolution, includeSalt, sortItemHashes)
             return tree;
         }
         catch (err) {
-            throw new error_1.ProsopoEnvError('DATASET.HASH_ERROR');
+            throw new common_1.ProsopoEnvError('DATASET.HASH_ERROR');
         }
     });
 }

package/dist/js/captcha/dataset.js.map

@@ -1 +1 @@
-{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":";;;;AAEA,uCAAsF;AACtF,qCAA4C;AAC5C,0CAAgD;AAEhD,SAAsB,YAAY,CAAC,UAAsB;;;QACrD,MAAM,OAAO,GAAG,MAAM,uCAAuC,CAAC,UAAU,CAAC,CAAA;QACzE,mCAAmC;QACnC,wDAAwD;QACxD,sCAAsC;QACtC,+BAA+B;QAC/B,QAAQ;QACR,KAAK;QACL,kBAAkB;QAClB,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACvE,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACvE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CACnC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CACf,CAAC,gCACM,OAAO,KACV,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAC1C,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,GACvC,CAAA,CACpB,CAAA;QACD,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAA;QAC1C,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAA;QACxC,OAAO,CAAC,SAAS,GAAG,MAAA,YAAY,CAAC,IAAI,0CAAE,IAAI,CAAA;QAC3C,OAAO,CAAC,gBAAgB,GAAG,MAAA,WAAW,CAAC,IAAI,0CAAE,IAAI,CAAA;QACjD,OAAO,OAAO,CAAA;;CACjB;AAxBD,oCAwBC;AAED,SAAsB,gBAAgB,CAClC,OAAgB,EAChB,eAAwB,EACxB,WAAoB,EACpB,cAAuB;;QAEvB,IAAI;YACA,MAAM,IAAI,GAAG,IAAI,0BAAiB,EAAE,CAAA;YACpC,MAAM,qBAAqB,qBAAQ,OAAO,CAAE,CAAA;YAC5C,MAAM,aAAa,GAAG,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACjE,IAAA,4BAAkB,EAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAC,CAC5E,CAAA;YACD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YACzB,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,uBAAe,CAAC,oBAAoB,CAAC,CAAA;SAClD;IACL,CAAC;CAAA;AAjBD,4CAiBC;AAED,SAAsB,uCAAuC,CAAC,UAAsB;;QAChF,OAAO,gCACA,UAAU,KACb,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CACvB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE,wDAAC,OAAA,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAA,GAAA,CAAC,CAAC,CAAA;gBAE/F,qDACO,OAAO,KACV,KAAK,KAEF,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,IAAA,+BAAqB,EAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,EACtG;YACL,CAAC,CAAA,CAAC,CACL,GACO,CAAA;IAChB,CAAC;CAAA;AAhBD,0FAgBC"}
+{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../src/js/captcha/dataset.ts"],"names":[],"mappings":";;;;AACA,qCAA4C;AAE5C,4CAAiD;AACjD,uCAAsF;AAEtF,SAAsB,YAAY,CAAC,UAAsB;;;QACrD,MAAM,OAAO,GAAG,MAAM,uCAAuC,CAAC,UAAU,CAAC,CAAA;QACzE,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACvE,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QACvE,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CACnC,CAAC,OAAyB,EAAE,KAAa,EAAE,EAAE;;YACzC,OAAA,CAAC,gCACM,OAAO,KACV,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAC1C,gBAAgB,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAChD,SAAS,EAAE,MAAA,YAAY,CAAC,IAAI,0CAAE,IAAI,EAClC,gBAAgB,EAAE,MAAA,WAAW,CAAC,IAAI,0CAAE,IAAI,GAC/B,CAAA,CAAA;SAAA,CACpB,CAAA;QACD,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC,MAAM,CAAA;QAC1C,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAA;QACxC,OAAO,CAAC,SAAS,GAAG,MAAA,YAAY,CAAC,IAAI,0CAAE,IAAI,CAAA;QAC3C,OAAO,CAAC,gBAAgB,GAAG,MAAA,WAAW,CAAC,IAAI,0CAAE,IAAI,CAAA;QACjD,OAAO,OAAO,CAAA;;CACjB;AAnBD,oCAmBC;AAED,SAAsB,gBAAgB,CAClC,OAAgB,EAChB,eAAwB,EACxB,WAAoB,EACpB,cAAuB;;QAEvB,IAAI;YACA,MAAM,IAAI,GAAG,IAAI,0BAAiB,EAAE,CAAA;YACpC,MAAM,qBAAqB,qBAAQ,OAAO,CAAE,CAAA;YAC5C,MAAM,aAAa,GAAG,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACjE,IAAA,4BAAkB,EAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAC,CAC5E,CAAA;YACD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YACzB,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,wBAAe,CAAC,oBAAoB,CAAC,CAAA;SAClD;IACL,CAAC;CAAA;AAjBD,4CAiBC;AAED,SAAsB,uCAAuC,CAAC,UAAsB;;QAChF,OAAO,gCACA,UAAU,KACb,QAAQ,EAAE,MAAM,OAAO,CAAC,GAAG,CACvB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE,wDAAC,OAAA,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAA,GAAA,CAAC,CAAC,CAAA;gBAE/F,qDACO,OAAO,KACV,KAAK,KAEF,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,IAAA,+BAAqB,EAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,EACtG;YACL,CAAC,CAAA,CAAC,CACL,GACO,CAAA;IAChB,CAAC;CAAA;AAhBD,0FAgBC"}

package/dist/js/captcha/merkle.d.ts

@@ -1,4 +1,4 @@
-import { MerkleLayer, MerkleLeaf, MerkleNodeInterface, MerkleProof } from '../types/merkle';
+import { MerkleLayer, MerkleLeaf, MerkleNodeInterface, MerkleProof } from '@prosopo/types';
 declare class MerkleNode implements MerkleNodeInterface {
     hash: string;
     parent: string | null;

package/dist/js/captcha/merkle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merkle.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAA;AAE7G,cAAM,UAAW,YAAW,mBAAmB;IAC3C,IAAI,EAAE,MAAM,CAAA;IAEZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBAET,IAAI,KAAA;CAInB;AAED,qBAAa,iBAAiB;IAC1B,MAAM,EAAE,UAAU,EAAE,CAAA;IAEpB,MAAM,EAAE,WAAW,EAAE,CAAA;IAErB,IAAI,EAAE,UAAU,GAAG,SAAS,CAAA;;IAO5B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAetB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE;IAyBpC,YAAY,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA,GAAG,UAAU;IAO/C,KAAK,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW;CA0B3C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAkBzE"}
+{"version":3,"file":"merkle.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,mBAAmB,EAAE,WAAW,EAAoB,MAAM,gBAAgB,CAAA;AAG5G,cAAM,UAAW,YAAW,mBAAmB;IAC3C,IAAI,EAAE,MAAM,CAAA;IAEZ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBAET,IAAI,KAAA;CAInB;AAED,qBAAa,iBAAiB;IAC1B,MAAM,EAAE,UAAU,EAAE,CAAA;IAEpB,MAAM,EAAE,WAAW,EAAE,CAAA;IAErB,IAAI,EAAE,UAAU,GAAG,SAAS,CAAA;;IAO5B,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE;IAetB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE;IAyBpC,YAAY,CAAC,SAAS,KAAA,EAAE,UAAU,KAAA,GAAG,UAAU;IAO/C,KAAK,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW;CA0B3C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAkBzE"}

package/dist/js/captcha/merkle.js

@@ -1,22 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyProof = exports.CaptchaMerkleTree = void 0;
-// Copyright (C) 2021-2022 Prosopo (UK) Ltd.
-// This file is part of provider <https://github.com/prosopo/provider>.
-//
-// provider is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// provider is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with provider.  If not, see <http://www.gnu.org/licenses/>.
-const util_1 = require("./util");
+const common_1 = require("@prosopo/common");
 class MerkleNode {
     constructor(hash) {
         this.hash = hash;
@@ -63,7 +48,7 @@ class CaptchaMerkleTree {
         return this.buildMerkleTree(parents);
     }
     createParent(leftChild, rightChild) {
-        const parent = new MerkleNode((0, util_1.hexHashArray)([leftChild.hash, rightChild.hash]));
+        const parent = new MerkleNode((0, common_1.hexHashArray)([leftChild.hash, rightChild.hash]));
         leftChild.parent = parent;
         rightChild.parent = parent;
         return parent;
@@ -91,7 +76,7 @@ class CaptchaMerkleTree {
             }
             proofTree.push([pair[0], pair[1]]);
             layerNum += 1;
-            leafHash = (0, util_1.hexHashArray)(pair);
+            leafHash = (0, common_1.hexHashArray)(pair);
         }
         return [...proofTree, [this.layers[this.layers.length - 1][0]]];
     }
@@ -103,7 +88,7 @@ function verifyProof(leaf, proof) {
             return false;
         }
         for (const [layerIndex, layer] of proof.entries()) {
-            leaf = (0, util_1.hexHashArray)(layer);
+            leaf = (0, common_1.hexHashArray)(layer);
             if (proof[layerIndex + 1].indexOf(leaf) === -1) {
                 return false;
             }

package/dist/js/captcha/merkle.js.map

@@ -1 +1 @@
-{"version":3,"file":"merkle.js","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merkle.js","sourceRoot":"","sources":["../../../src/js/captcha/merkle.ts"],"names":[],"mappings":"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"}

package/dist/js/captcha/util.d.ts

@@ -1,7 +1,2 @@
-export declare const HEX_HASH_BIT_LENGTH = 256;
-export declare const ARRAY_JOINER = "";
-export declare function hexHash(data: string | Uint8Array, bitLength?: 256 | 512 | 64 | 128 | 384 | undefined): string;
-export declare function hexHashArray<T>(arr: T[]): string;
-export declare function arrayJoin<T>(arr: T[], joiner?: string): string;
 export declare function downloadImage(url: string): Promise<Uint8Array>;
 //# sourceMappingURL=util.d.ts.map

package/dist/js/captcha/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,mBAAmB,MAAM,CAAA;AACtC,eAAO,MAAM,YAAY,KAAK,CAAA;AAE9B,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,EAAE,SAAS,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,SAAS,GAAG,MAAM,CAG7G;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,MAAM,CAEhD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAQpE"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":"AAkBA,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAQpE"}

package/dist/js/captcha/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadImage = exports.arrayJoin = exports.hexHashArray = exports.hexHash = exports.ARRAY_JOINER = exports.HEX_HASH_BIT_LENGTH = void 0;
+exports.downloadImage = void 0;
 const tslib_1 = require("tslib");
 // Copyright (C) 2021-2022 Prosopo (UK) Ltd.
 // This file is part of provider <https://github.com/prosopo/provider>.
@@ -17,31 +17,15 @@ const tslib_1 = require("tslib");
 //
 // You should have received a copy of the GNU General Public License
 // along with provider.  If not, see <http://www.gnu.org/licenses/>.
-const util_crypto_1 = require("@polkadot/util-crypto");
+const common_1 = require("@prosopo/common");
 const axios_1 = tslib_1.__importDefault(require("axios"));
-const index_1 = require("../types/index");
-exports.HEX_HASH_BIT_LENGTH = 256;
-exports.ARRAY_JOINER = '';
-function hexHash(data, bitLength) {
-    // default bit length is 256
-    return (0, util_crypto_1.blake2AsHex)(data, bitLength);
-}
-exports.hexHash = hexHash;
-function hexHashArray(arr) {
-    return hexHash(arrayJoin(arr));
-}
-exports.hexHashArray = hexHashArray;
-function arrayJoin(arr, joiner) {
-    return arr.join(joiner ? joiner : exports.ARRAY_JOINER);
-}
-exports.arrayJoin = arrayJoin;
 function downloadImage(url) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             return new Uint8Array((yield axios_1.default.get(url, { url, method: 'GET', responseType: 'arraybuffer' })).data);
         }
         catch (error) {
-            throw new index_1.ProsopoEnvError(error, downloadImage.name);
+            throw new common_1.ProsopoEnvError(error, downloadImage.name);
         }
     });
 }

package/dist/js/captcha/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,8DAA8D;AAC9D,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,uDAAmD;AACnD,0DAA0B;AAC1B,0CAAgD;AAEnC,QAAA,mBAAmB,GAAG,GAAG,CAAA;AACzB,QAAA,YAAY,GAAG,EAAE,CAAA;AAE9B,SAAgB,OAAO,CAAC,IAAyB,EAAE,SAAkD;IACjG,4BAA4B;IAC5B,OAAO,IAAA,yBAAW,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AACvC,CAAC;AAHD,0BAGC;AAED,SAAgB,YAAY,CAAI,GAAQ;IACpC,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AAClC,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CAAI,GAAQ,EAAE,MAAe;IAClD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAY,CAAC,CAAA;AACnD,CAAC;AAFD,8BAEC;AAED,SAAsB,aAAa,CAAC,GAAW;;QAC3C,IAAI;YACA,OAAO,IAAI,UAAU,CACjB,CAAC,MAAM,eAAM,CAAC,GAAG,CAAc,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CACjG,CAAA;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,uBAAe,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAA;SACvD;IACL,CAAC;CAAA;AARD,sCAQC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/js/captcha/util.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAC5C,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,8DAA8D;AAC9D,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,4CAAiD;AACjD,0DAA0B;AAE1B,SAAsB,aAAa,CAAC,GAAW;;QAC3C,IAAI;YACA,OAAO,IAAI,UAAU,CACjB,CAAC,MAAM,eAAM,CAAC,GAAG,CAAc,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,IAAI,CACjG,CAAA;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,IAAI,wBAAe,CAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAA;SACvD;IACL,CAAC;CAAA;AARD,sCAQC"}

package/dist/js/index.d.ts

@@ -1,3 +1,2 @@
 export * from './captcha/index';
-export * from './types/index';
 //# sourceMappingURL=index.d.ts.map

package/dist/js/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/js/index.ts"],"names":[],"mappings":"AAeA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/js/index.ts"],"names":[],"mappings":"AAeA,cAAc,iBAAiB,CAAA"}

package/dist/js/index.js

@@ -17,5 +17,4 @@ const tslib_1 = require("tslib");
 // You should have received a copy of the GNU General Public License
 // along with provider.  If not, see <http://www.gnu.org/licenses/>.
 tslib_1.__exportStar(require("./captcha/index"), exports);
-tslib_1.__exportStar(require("./types/index"), exports);
 //# sourceMappingURL=index.js.map

package/dist/js/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/js/index.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,8DAA8D;AAC9D,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,0DAA+B;AAC/B,wDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/js/index.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,uEAAuE;AACvE,EAAE;AACF,mEAAmE;AACnE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,8DAA8D;AAC9D,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,0DAA+B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prosopo/datasets",
-  "version": "0.1.10",
+  "version": "0.1.14",
   "author": "PROSOPO LIMITED <info@prosopo.io>",
   "license": "Apache-2.0",
   "private": false,
@@ -29,39 +29,30 @@
     }
   },
   "dependencies": {
-    "@polkadot/api": "^8.13.1",
-    "@polkadot/api-contract": "^8.13.1",
-    "@polkadot/keyring": "^10.0.2",
-    "@polkadot/rpc-provider": "^8.13.1",
-    "@polkadot/types": "^8.13.1",
-    "@polkadot/types-create": "^8.13.1",
-    "@polkadot/util": "^10.0.2",
-    "@polkadot/util-crypto": "^10.0.2",
-    "@prosopo/i18n": "^0.1.10",
-    "bn.js": "^5.2.1",
-    "consola": "^2.15.3",
-    "zod": "^3.17.9"
+    "@polkadot/util": "12.3.2",
+    "@prosopo/common": "^0.1.14",
+    "@prosopo/contract": "^0.1.14",
+    "@prosopo/types": "^0.1.14",
+    "axios": "^0.27.2"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.30.7",
-    "@typescript-eslint/parser": "^5.30.7",
-    "eslint": "^8.20.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.9.4"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/prosopo/datasets.git"
+    "url": "git+https://github.com/prosopo/captcha.git"
   },
   "bugs": {
-    "url": "https://github.com/prosopo/datasets/issues"
+    "url": "https://github.com/prosopo/captcha/issues"
   },
-  "homepage": "https://github.com/prosopo/datasets#readme",
+  "homepage": "https://github.com/prosopo/captcha#readme",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "description": "Datasets for use with providers",
   "directories": {
     "test": "tests"
-  }
+  },
+  "sideEffects": false
 }

package/.eslintignore

@@ -1,3 +0,0 @@
-**/artifacts/*
-**/dist/*
-**/.eslintrc.js

package/.eslintrc.js

@@ -1,36 +0,0 @@
-module.exports = {
-    env: {
-        browser: true,
-        es2021: true,
-    },
-    extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended'],
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-        ecmaVersion: 'latest',
-        sourceType: 'module',
-    },
-    plugins: ['unused-imports', '@typescript-eslint', 'prettier'],
-    rules: {
-        'no-unused-vars': 'off',
-        'unused-imports/no-unused-imports': 'error',
-        'unused-imports/no-unused-vars': [
-            'warn',
-            {
-                vars: 'all',
-                varsIgnorePattern: '^_',
-                args: 'after-used',
-                argsIgnorePattern: '^_',
-            },
-        ],
-        //"indent": ["error", 4],
-        //"indent": "off",
-        'sort-imports': [
-            'error',
-            {
-                ignoreDeclarationSort: true,
-                allowSeparatedGroups: false,
-            },
-        ],
-        'prettier/prettier': ['error'],
-    },
-}

package/.prettierrc.js

@@ -1,7 +0,0 @@
-module.exports = {
-    trailingComma: 'es5',
-    tabWidth: 4,
-    semi: false,
-    singleQuote: true,
-    printWidth: 120,
-}