dequanto 0.2.20 → 0.2.21
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.
|
@@ -117,8 +117,11 @@ var $abiType;
|
|
|
117
117
|
}).join(', ');
|
|
118
118
|
tsType = `{ ${fields} }`;
|
|
119
119
|
}
|
|
120
|
+
if (tsType == null && $abi?.internalType?.startsWith('contract')) {
|
|
121
|
+
tsType = AbiTsTypes['address'];
|
|
122
|
+
}
|
|
120
123
|
if (tsType == null) {
|
|
121
|
-
throw new Error(`Unknown abi type in return: "${abiType}"`);
|
|
124
|
+
throw new Error(`Unknown abi type in return: "${abiType}" ${$abi?.name ?? ''}`);
|
|
122
125
|
}
|
|
123
126
|
return tsType;
|
|
124
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$abiType.js","sourceRoot":"","sources":["../../../src/utils/$abiType.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAyD;AACzD,gDAAwB;AAExB,yCAAsC;AACtC,IAAiB,QAAQ,
|
|
1
|
+
{"version":3,"file":"$abiType.js","sourceRoot":"","sources":["../../../src/utils/$abiType.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$abiType.js","sourceRoot":"","sources":["../../../src/utils/$abiType.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAyD;AACzD,gDAAwB;AAExB,yCAAsC;AACtC,IAAiB,QAAQ,
|
|
1
|
+
{"version":3,"file":"$abiType.js","sourceRoot":"","sources":["../../../src/utils/$abiType.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,8 +111,11 @@ export var $abiType;
|
|
|
111
111
|
}).join(', ');
|
|
112
112
|
tsType = `{ ${fields} }`;
|
|
113
113
|
}
|
|
114
|
+
if (tsType == null && $abi?.internalType?.startsWith('contract')) {
|
|
115
|
+
tsType = AbiTsTypes['address'];
|
|
116
|
+
}
|
|
114
117
|
if (tsType == null) {
|
|
115
|
-
throw new Error(`Unknown abi type in return: "${abiType}"`);
|
|
118
|
+
throw new Error(`Unknown abi type in return: "${abiType}" ${$abi?.name ?? ''}`);
|
|
116
119
|
}
|
|
117
120
|
return tsType;
|
|
118
121
|
}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { type TAbiInput } from '../types/TAbi';
|
|
2
2
|
export declare namespace $abiType {
|
|
3
3
|
function getTsTypeFromDefinition(type: string): any;
|
|
4
|
-
function getTsType($abiType: TAbiInput['type'], $abi?:
|
|
5
|
-
name?: any;
|
|
6
|
-
components?: any;
|
|
7
|
-
}): any;
|
|
4
|
+
function getTsType($abiType: TAbiInput['type'], $abi?: Partial<TAbiInput>): any;
|
|
8
5
|
namespace array {
|
|
9
6
|
function getBaseType(arrayType: string): string;
|
|
10
7
|
function getLength(arrayType: string): number;
|
package/package.json
CHANGED
package/src/utils/$abiType.ts
CHANGED
|
@@ -90,7 +90,7 @@ export namespace $abiType {
|
|
|
90
90
|
}
|
|
91
91
|
return getTsType(type);
|
|
92
92
|
}
|
|
93
|
-
export function getTsType ($abiType: TAbiInput['type'], $abi?:
|
|
93
|
+
export function getTsType ($abiType: TAbiInput['type'], $abi?: Partial<TAbiInput>) {
|
|
94
94
|
let rgxArray = /\[(?<size>\d+)?\]$/
|
|
95
95
|
let isArray = rgxArray.test($abiType);
|
|
96
96
|
if (isArray) {
|
|
@@ -123,9 +123,12 @@ export namespace $abiType {
|
|
|
123
123
|
}).join(', ');
|
|
124
124
|
tsType = `{ ${fields} }`;
|
|
125
125
|
}
|
|
126
|
+
if (tsType == null && $abi?.internalType?.startsWith('contract')) {
|
|
127
|
+
tsType = AbiTsTypes['address'];
|
|
128
|
+
}
|
|
126
129
|
|
|
127
130
|
if (tsType == null) {
|
|
128
|
-
throw new Error(`Unknown abi type in return: "${abiType}"`);
|
|
131
|
+
throw new Error(`Unknown abi type in return: "${abiType}" ${$abi?.name ?? ''}`);
|
|
129
132
|
}
|
|
130
133
|
|
|
131
134
|
return tsType;
|