@polkadot/types-create 7.3.2-3 → 7.3.2-4

package/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.3.2-3",
+  "version": "7.3.2-4",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",
@@ -101,7 +101,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@polkadot/types-codec": "7.3.2-3",
+    "@polkadot/types-codec": "7.3.2-4",
     "@polkadot/util": "^8.3.1"
   }
 }

package/packageInfo.cjs

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/types-create',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '7.3.2-3'
+  version: '7.3.2-4'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -5,5 +5,5 @@ export const packageInfo = {
   name: '@polkadot/types-create',
   path: new URL('.', import.meta.url).pathname,
   type: 'esm',
-  version: '7.3.2-3'
+  version: '7.3.2-4'
 };

package/util/encodeTypes.cjs

@@ -22,7 +22,7 @@ function paramsNotation(outer, inner) {
   return `${outer}${inner ? `<${(Array.isArray(inner) ? inner : [inner]).map(transform).join(', ')}>` : ''}`;
 }
 
-function encodeWithParams(CodecRegistry, typeDef, outer) {
+function encodeWithParams(registry, typeDef, outer) {
   const {
     info,
     sub
@@ -35,17 +35,18 @@ function encodeWithParams(CodecRegistry, typeDef, outer) {
     case _types.TypeDefInfo.HashMap:
     case _types.TypeDefInfo.Linkage:
     case _types.TypeDefInfo.Option:
+    case _types.TypeDefInfo.Range:
     case _types.TypeDefInfo.Result:
     case _types.TypeDefInfo.Vec:
     case _types.TypeDefInfo.WrapperKeepOpaque:
     case _types.TypeDefInfo.WrapperOpaque:
-      return paramsNotation(outer, sub, p => encodeTypeDef(CodecRegistry, p));
+      return paramsNotation(outer, sub, p => encodeTypeDef(registry, p));
   }
 
   throw new Error(`Unable to encode ${(0, _util.stringify)(typeDef)} with params`);
 }
 
-function encodeSubTypes(CodecRegistry, sub, asEnum, extra) {
+function encodeSubTypes(registry, sub, asEnum, extra) {
   const names = sub.map(_ref => {
     let {
       name
@@ -57,7 +58,7 @@ function encodeSubTypes(CodecRegistry, sub, asEnum, extra) {
 
   for (let i = 0; i < sub.length; i++) {
     const def = sub[i];
-    inner[def.name] = encodeTypeDef(CodecRegistry, def);
+    inner[def.name] = encodeTypeDef(registry, def);
   }
 
   return (0, _util.stringify)(asEnum ? {
@@ -68,18 +69,18 @@ function encodeSubTypes(CodecRegistry, sub, asEnum, extra) {
 
 
 const encoders = {
-  [_types.TypeDefInfo.BTreeMap]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'BTreeMap'),
-  [_types.TypeDefInfo.BTreeSet]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'BTreeSet'),
-  [_types.TypeDefInfo.Compact]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Compact'),
-  [_types.TypeDefInfo.DoNotConstruct]: (CodecRegistry, _ref2) => {
+  [_types.TypeDefInfo.BTreeMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'BTreeMap'),
+  [_types.TypeDefInfo.BTreeSet]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'BTreeSet'),
+  [_types.TypeDefInfo.Compact]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Compact'),
+  [_types.TypeDefInfo.DoNotConstruct]: (registry, _ref2) => {
     let {
       displayName,
       lookupIndex,
       lookupName
     } = _ref2;
-    return `DoNotConstruct<${lookupName || displayName || ((0, _util.isUndefined)(lookupIndex) ? 'Unknown' : CodecRegistry.createLookupType(lookupIndex))}>`;
+    return `DoNotConstruct<${lookupName || displayName || ((0, _util.isUndefined)(lookupIndex) ? 'Unknown' : registry.createLookupType(lookupIndex))}>`;
   },
-  [_types.TypeDefInfo.Enum]: (CodecRegistry, _ref3) => {
+  [_types.TypeDefInfo.Enum]: (registry, _ref3) => {
     let {
       sub
     } = _ref3;
@@ -98,31 +99,31 @@ const encoders = {
         } = _ref5;
         return `${name || `Empty${index}`}`;
       })
-    }) : encodeSubTypes(CodecRegistry, sub, true);
+    }) : encodeSubTypes(registry, sub, true);
   },
-  [_types.TypeDefInfo.HashMap]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'HashMap'),
-  [_types.TypeDefInfo.Int]: (CodecRegistry, _ref6) => {
+  [_types.TypeDefInfo.HashMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'HashMap'),
+  [_types.TypeDefInfo.Int]: (registry, _ref6) => {
     let {
       length = 32
     } = _ref6;
     return `Int<${length}>`;
   },
-  [_types.TypeDefInfo.Linkage]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Linkage'),
+  [_types.TypeDefInfo.Linkage]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Linkage'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Null]: (CodecRegistry, typeDef) => 'Null',
-  [_types.TypeDefInfo.Option]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Option'),
+  [_types.TypeDefInfo.Null]: (registry, typeDef) => 'Null',
+  [_types.TypeDefInfo.Option]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Option'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Plain]: (CodecRegistry, _ref7) => {
+  [_types.TypeDefInfo.Plain]: (registry, _ref7) => {
     let {
       displayName,
       type
     } = _ref7;
     return displayName || type;
   },
-  [_types.TypeDefInfo.Range]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
-  [_types.TypeDefInfo.Result]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Result'),
+  [_types.TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
+  [_types.TypeDefInfo.Result]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Result'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Set]: (CodecRegistry, _ref8) => {
+  [_types.TypeDefInfo.Set]: (registry, _ref8) => {
     let {
       length = 8,
       sub
@@ -143,20 +144,20 @@ const encoders = {
     });
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Si]: (CodecRegistry, _ref10) => {
+  [_types.TypeDefInfo.Si]: (registry, _ref10) => {
     let {
       lookupName,
       type
     } = _ref10;
     return lookupName || type;
   },
-  [_types.TypeDefInfo.Struct]: (CodecRegistry, _ref11) => {
+  [_types.TypeDefInfo.Struct]: (registry, _ref11) => {
     let {
       alias,
       sub
     } = _ref11;
     (0, _util.assert)(sub && Array.isArray(sub), 'Unable to encode Struct type');
-    return encodeSubTypes(CodecRegistry, sub, false, alias ? {
+    return encodeSubTypes(registry, sub, false, alias ? {
       _alias: [...alias.entries()].reduce((all, _ref12) => {
         let [k, v] = _ref12;
         return (0, _util.objectSpread)(all, {
@@ -165,21 +166,21 @@ const encoders = {
       }, {})
     } : {});
   },
-  [_types.TypeDefInfo.Tuple]: (CodecRegistry, _ref13) => {
+  [_types.TypeDefInfo.Tuple]: (registry, _ref13) => {
     let {
       sub
     } = _ref13;
     (0, _util.assert)(sub && Array.isArray(sub), 'Unable to encode Tuple type');
-    return `(${sub.map(type => encodeTypeDef(CodecRegistry, type)).join(',')})`;
+    return `(${sub.map(type => encodeTypeDef(registry, type)).join(',')})`;
   },
-  [_types.TypeDefInfo.UInt]: (CodecRegistry, _ref14) => {
+  [_types.TypeDefInfo.UInt]: (registry, _ref14) => {
     let {
       length = 32
     } = _ref14;
     return `UInt<${length}>`;
   },
-  [_types.TypeDefInfo.Vec]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Vec'),
-  [_types.TypeDefInfo.VecFixed]: (CodecRegistry, _ref15) => {
+  [_types.TypeDefInfo.Vec]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Vec'),
+  [_types.TypeDefInfo.VecFixed]: (registry, _ref15) => {
     let {
       length,
       sub
@@ -187,24 +188,24 @@ const encoders = {
     (0, _util.assert)((0, _util.isNumber)(length) && !(0, _util.isUndefined)(sub) && !Array.isArray(sub), 'Unable to encode VecFixed type');
     return `[${sub.type};${length}]`;
   },
-  [_types.TypeDefInfo.WrapperKeepOpaque]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'WrapperKeepOpaque'),
-  [_types.TypeDefInfo.WrapperOpaque]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'WrapperOpaque')
+  [_types.TypeDefInfo.WrapperKeepOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperKeepOpaque'),
+  [_types.TypeDefInfo.WrapperOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperOpaque')
 };
 
-function encodeType(CodecRegistry, typeDef) {
+function encodeType(registry, typeDef) {
   let withLookup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return withLookup && typeDef.lookupName ? typeDef.lookupName : encoders[typeDef.info](CodecRegistry, typeDef);
+  return withLookup && typeDef.lookupName ? typeDef.lookupName : encoders[typeDef.info](registry, typeDef);
 }
 
-function encodeTypeDef(CodecRegistry, typeDef) {
+function encodeTypeDef(registry, typeDef) {
   // In the case of contracts we do have the unfortunate situation where the displayName would
   // refer to "Option" when it is an option. For these, string it out, only using when actually
   // not a top-level element to be used
-  return typeDef.displayName && !INFO_WRAP.some(i => typeDef.displayName === i) ? typeDef.displayName : encodeType(CodecRegistry, typeDef);
+  return typeDef.displayName && !INFO_WRAP.some(i => typeDef.displayName === i) ? typeDef.displayName : encodeType(registry, typeDef);
 }
 
-function withTypeString(CodecRegistry, typeDef) {
+function withTypeString(registry, typeDef) {
   return (0, _util.objectSpread)({}, typeDef, {
-    type: encodeType(CodecRegistry, typeDef, false)
+    type: encodeType(registry, typeDef, false)
   });
 }

package/util/encodeTypes.d.ts

@@ -1,7 +1,7 @@
 import type { CodecRegistry } from '@polkadot/types-codec/types';
 import type { TypeDef } from '@polkadot/types-create/types';
 export declare function paramsNotation<T>(outer: string, inner?: T | T[], transform?: (_: T) => string): string;
-export declare function encodeTypeDef(CodecRegistry: CodecRegistry, typeDef: TypeDef): string;
-export declare function withTypeString(CodecRegistry: CodecRegistry, typeDef: Omit<TypeDef, 'type'> & {
+export declare function encodeTypeDef(registry: CodecRegistry, typeDef: TypeDef): string;
+export declare function withTypeString(registry: CodecRegistry, typeDef: Omit<TypeDef, 'type'> & {
     type?: string;
 }): TypeDef;

package/util/encodeTypes.js

@@ -10,7 +10,7 @@ export function paramsNotation(outer, inner, transform = stringIdentity) {
   return `${outer}${inner ? `<${(Array.isArray(inner) ? inner : [inner]).map(transform).join(', ')}>` : ''}`;
 }
 
-function encodeWithParams(CodecRegistry, typeDef, outer) {
+function encodeWithParams(registry, typeDef, outer) {
   const {
     info,
     sub
@@ -23,17 +23,18 @@ function encodeWithParams(CodecRegistry, typeDef, outer) {
     case TypeDefInfo.HashMap:
     case TypeDefInfo.Linkage:
     case TypeDefInfo.Option:
+    case TypeDefInfo.Range:
     case TypeDefInfo.Result:
     case TypeDefInfo.Vec:
     case TypeDefInfo.WrapperKeepOpaque:
     case TypeDefInfo.WrapperOpaque:
-      return paramsNotation(outer, sub, p => encodeTypeDef(CodecRegistry, p));
+      return paramsNotation(outer, sub, p => encodeTypeDef(registry, p));
   }
 
   throw new Error(`Unable to encode ${stringify(typeDef)} with params`);
 }
 
-function encodeSubTypes(CodecRegistry, sub, asEnum, extra) {
+function encodeSubTypes(registry, sub, asEnum, extra) {
   const names = sub.map(({
     name
   }) => name);
@@ -42,7 +43,7 @@ function encodeSubTypes(CodecRegistry, sub, asEnum, extra) {
 
   for (let i = 0; i < sub.length; i++) {
     const def = sub[i];
-    inner[def.name] = encodeTypeDef(CodecRegistry, def);
+    inner[def.name] = encodeTypeDef(registry, def);
   }
 
   return stringify(asEnum ? {
@@ -53,15 +54,15 @@ function encodeSubTypes(CodecRegistry, sub, asEnum, extra) {
 
 
 const encoders = {
-  [TypeDefInfo.BTreeMap]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'BTreeMap'),
-  [TypeDefInfo.BTreeSet]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'BTreeSet'),
-  [TypeDefInfo.Compact]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Compact'),
-  [TypeDefInfo.DoNotConstruct]: (CodecRegistry, {
+  [TypeDefInfo.BTreeMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'BTreeMap'),
+  [TypeDefInfo.BTreeSet]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'BTreeSet'),
+  [TypeDefInfo.Compact]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Compact'),
+  [TypeDefInfo.DoNotConstruct]: (registry, {
     displayName,
     lookupIndex,
     lookupName
-  }) => `DoNotConstruct<${lookupName || displayName || (isUndefined(lookupIndex) ? 'Unknown' : CodecRegistry.createLookupType(lookupIndex))}>`,
-  [TypeDefInfo.Enum]: (CodecRegistry, {
+  }) => `DoNotConstruct<${lookupName || displayName || (isUndefined(lookupIndex) ? 'Unknown' : registry.createLookupType(lookupIndex))}>`,
+  [TypeDefInfo.Enum]: (registry, {
     sub
   }) => {
     assert(sub && Array.isArray(sub), 'Unable to encode Enum type'); // c-like enums have all Null entries
@@ -73,25 +74,25 @@ const encoders = {
       _enum: sub.map(({
         name
       }, index) => `${name || `Empty${index}`}`)
-    }) : encodeSubTypes(CodecRegistry, sub, true);
+    }) : encodeSubTypes(registry, sub, true);
   },
-  [TypeDefInfo.HashMap]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'HashMap'),
-  [TypeDefInfo.Int]: (CodecRegistry, {
+  [TypeDefInfo.HashMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'HashMap'),
+  [TypeDefInfo.Int]: (registry, {
     length = 32
   }) => `Int<${length}>`,
-  [TypeDefInfo.Linkage]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Linkage'),
+  [TypeDefInfo.Linkage]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Linkage'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [TypeDefInfo.Null]: (CodecRegistry, typeDef) => 'Null',
-  [TypeDefInfo.Option]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Option'),
+  [TypeDefInfo.Null]: (registry, typeDef) => 'Null',
+  [TypeDefInfo.Option]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Option'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [TypeDefInfo.Plain]: (CodecRegistry, {
+  [TypeDefInfo.Plain]: (registry, {
     displayName,
     type
   }) => displayName || type,
-  [TypeDefInfo.Range]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
-  [TypeDefInfo.Result]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Result'),
+  [TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
+  [TypeDefInfo.Result]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Result'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [TypeDefInfo.Set]: (CodecRegistry, {
+  [TypeDefInfo.Set]: (registry, {
     length = 8,
     sub
   }) => {
@@ -108,54 +109,54 @@ const encoders = {
     });
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [TypeDefInfo.Si]: (CodecRegistry, {
+  [TypeDefInfo.Si]: (registry, {
     lookupName,
     type
   }) => lookupName || type,
-  [TypeDefInfo.Struct]: (CodecRegistry, {
+  [TypeDefInfo.Struct]: (registry, {
     alias,
     sub
   }) => {
     assert(sub && Array.isArray(sub), 'Unable to encode Struct type');
-    return encodeSubTypes(CodecRegistry, sub, false, alias ? {
+    return encodeSubTypes(registry, sub, false, alias ? {
       _alias: [...alias.entries()].reduce((all, [k, v]) => objectSpread(all, {
         [k]: v
       }), {})
     } : {});
   },
-  [TypeDefInfo.Tuple]: (CodecRegistry, {
+  [TypeDefInfo.Tuple]: (registry, {
     sub
   }) => {
     assert(sub && Array.isArray(sub), 'Unable to encode Tuple type');
-    return `(${sub.map(type => encodeTypeDef(CodecRegistry, type)).join(',')})`;
+    return `(${sub.map(type => encodeTypeDef(registry, type)).join(',')})`;
   },
-  [TypeDefInfo.UInt]: (CodecRegistry, {
+  [TypeDefInfo.UInt]: (registry, {
     length = 32
   }) => `UInt<${length}>`,
-  [TypeDefInfo.Vec]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'Vec'),
-  [TypeDefInfo.VecFixed]: (CodecRegistry, {
+  [TypeDefInfo.Vec]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Vec'),
+  [TypeDefInfo.VecFixed]: (registry, {
     length,
     sub
   }) => {
     assert(isNumber(length) && !isUndefined(sub) && !Array.isArray(sub), 'Unable to encode VecFixed type');
     return `[${sub.type};${length}]`;
   },
-  [TypeDefInfo.WrapperKeepOpaque]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'WrapperKeepOpaque'),
-  [TypeDefInfo.WrapperOpaque]: (CodecRegistry, typeDef) => encodeWithParams(CodecRegistry, typeDef, 'WrapperOpaque')
+  [TypeDefInfo.WrapperKeepOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperKeepOpaque'),
+  [TypeDefInfo.WrapperOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperOpaque')
 };
 
-function encodeType(CodecRegistry, typeDef, withLookup = true) {
-  return withLookup && typeDef.lookupName ? typeDef.lookupName : encoders[typeDef.info](CodecRegistry, typeDef);
+function encodeType(registry, typeDef, withLookup = true) {
+  return withLookup && typeDef.lookupName ? typeDef.lookupName : encoders[typeDef.info](registry, typeDef);
 }
 
-export function encodeTypeDef(CodecRegistry, typeDef) {
+export function encodeTypeDef(registry, typeDef) {
   // In the case of contracts we do have the unfortunate situation where the displayName would
   // refer to "Option" when it is an option. For these, string it out, only using when actually
   // not a top-level element to be used
-  return typeDef.displayName && !INFO_WRAP.some(i => typeDef.displayName === i) ? typeDef.displayName : encodeType(CodecRegistry, typeDef);
+  return typeDef.displayName && !INFO_WRAP.some(i => typeDef.displayName === i) ? typeDef.displayName : encodeType(registry, typeDef);
 }
-export function withTypeString(CodecRegistry, typeDef) {
+export function withTypeString(registry, typeDef) {
   return objectSpread({}, typeDef, {
-    type: encodeType(CodecRegistry, typeDef, false)
+    type: encodeType(registry, typeDef, false)
   });
 }