@arcblock/did 1.17.2 → 1.17.3

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { types } from '@ocap/mcrypto';
 import { toAddress, toDid, BytesType } from '@ocap/util';
-import { DidType, DIDType, DIDTypeStr, DIDTypeArg, DID_TYPE_ARCBLOCK, DID_TYPE_ETHEREUM, fromTypeInfo, isEthereumDid, isEthereumType, toTypeInfo, toTypeInfoStr } from './type';
+import { DidType, DIDType, DIDTypeShortcut, DIDTypeStr, DIDTypeArg, DID_TYPE_ARCBLOCK, DID_TYPE_ETHEREUM, fromTypeInfo, isEthereumDid, isEthereumType, toTypeInfo, toTypeInfoStr } from './type';
 import { toStrictHex } from './util';
 /**
  * Gen DID from private key and type config
@@ -54,4 +54,4 @@ declare const isFromPublicKey: (did: string, pk: BytesType) => boolean;
  * @returns {boolean}
  */
 declare const isValid: (did: string) => boolean;
-export { DIDType, DIDTypeStr, DIDTypeArg, types, toStrictHex, fromSecretKey, fromPublicKey, fromPublicKeyHash, fromHash, toAddress, toDid, isFromPublicKey, isValid, isEthereumDid, isEthereumType, toTypeInfo, toTypeInfoStr, fromTypeInfo, DidType, DID_TYPE_ARCBLOCK, DID_TYPE_ETHEREUM, };
+export { DIDType, DIDTypeStr, DIDTypeArg, DIDTypeShortcut, types, toStrictHex, fromSecretKey, fromPublicKey, fromPublicKeyHash, fromHash, toAddress, toDid, isFromPublicKey, isValid, isEthereumDid, isEthereumType, toTypeInfo, toTypeInfoStr, fromTypeInfo, DidType, DID_TYPE_ARCBLOCK, DID_TYPE_ETHEREUM, };

package/lib/type.d.ts

@@ -1,21 +1,16 @@
+import { LiteralUnion } from 'type-fest';
+export declare type DIDTypeKey = LiteralUnion<'role' | 'pk' | 'hash' | 'address', string>;
+export declare type DIDTypeShortcut = LiteralUnion<'default' | 'arcblock' | 'eth' | 'ethereum', string>;
 export declare type DIDType = {
-    role?: number;
-    pk?: number;
-    hash?: number;
-    address?: number;
-    [key: string]: number;
+    [key in DIDTypeKey]?: number;
 };
 export declare type DIDTypeStr = {
-    role?: string;
-    pk?: string;
-    hash?: string;
-    address?: string;
-    [key: string]: string;
+    [key in DIDTypeKey]?: string;
 };
-export declare type DIDTypeArg = 'default' | 'eth' | 'forge' | DIDType;
+export declare type DIDTypeArg = DIDTypeShortcut | DIDType;
 declare const DID_TYPE_ARCBLOCK: DIDType;
 declare const DID_TYPE_ETHEREUM: DIDType;
-declare const isEthereumType: (type: DIDType) => boolean;
+declare const isEthereumType: (type: DIDType) => any;
 /**
  * Checks if the given string is an address
  *

package/lib/type.js

@@ -109,8 +109,8 @@ exports.toChecksumAddress = toChecksumAddress;
  * Create an wallet type object that be used as param to create a new wallet
  */
 function DidType(type = {}) {
-    let input = null;
-    if (['default', 'forge'].includes(type)) {
+    let input = {};
+    if (['default', 'arcblock'].includes(type)) {
         input = DID_TYPE_ARCBLOCK;
     }
     else if (['eth', 'ethereum'].includes(type)) {
@@ -121,11 +121,9 @@ function DidType(type = {}) {
     }
     const { role, pk, hash, address } = input;
     Object.keys(input).forEach((x) => {
-        // @ts-ignore
         const key = (0, upperFirst_1.default)(`${mapping[x] || x}Type`);
         // @ts-ignore
         if (Object.values(mcrypto_1.types[key]).includes(input[x]) === false) {
-            // @ts-ignore
             throw new Error(`Unsupported ${x} type: ${input[x]}`);
         }
     });
@@ -146,7 +144,6 @@ function DidType(type = {}) {
 }
 exports.DidType = DidType;
 DidType.toJSON = (type) => Object.keys(type).reduce((acc, x) => {
-    // @ts-ignore
     const key = (0, upperFirst_1.default)(`${mapping[x] || x}Type`);
     // @ts-ignore
     const typeStr = Object.keys(mcrypto_1.types[key]);
@@ -157,7 +154,6 @@ DidType.toJSON = (type) => Object.keys(type).reduce((acc, x) => {
     return acc;
 }, {});
 DidType.fromJSON = (json) => Object.keys(json).reduce((acc, x) => {
-    // @ts-ignore
     const key = (0, upperFirst_1.default)(`${mapping[x] || x}Type`);
     // @ts-ignore
     const typeStr = Object.keys(mcrypto_1.types[key]);

package/lib/util.d.ts

@@ -19,5 +19,5 @@ declare const toBits: (number: string | number | BN, length: number) => string;
  * @param {number} length
  * @returns {string} hex
  */
-declare const toStrictHex: (hex: string, length?: number) => string;
+declare const toStrictHex: (hex: string, length?: number) => any;
 export { DID_PREFIX, toBits, toBytes, toStrictHex };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "Javascript lib to work with ArcBlock DID",
   "keywords": [
     "arcblock",
@@ -53,11 +53,12 @@
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
   "dependencies": {
-    "@ocap/mcrypto": "1.17.2",
-    "@ocap/util": "1.17.2",
+    "@ocap/mcrypto": "1.17.3",
+    "@ocap/util": "1.17.3",
     "bn.js": "^5.2.1",
     "debug": "^4.3.4",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "type-fest": "^2.13.1"
   },
-  "gitHead": "ddb64b9727c9d07bd3df4665444545e43b24a071"
+  "gitHead": "7a74e4e2b362a6e6ea8d14617f0480966c3363d5"
 }