@polkadot/types-create 7.4.2-8 → 7.5.2-1

package/create/class.cjs

@@ -118,7 +118,8 @@ const infoMapping = {
   [_index.TypeDefInfo.Null]: (registry, _) => _typesCodec.Null,
   [_index.TypeDefInfo.Option]: (registry, value) => createWithSub(_typesCodec.Option, value),
   [_index.TypeDefInfo.Plain]: (registry, value) => registry.getOrUnknown(value.type),
-  [_index.TypeDefInfo.Range]: (registry, value) => (value.type.includes('RangeInclusive') ? _typesCodec.RangeInclusive : _typesCodec.Range).with(getSubType(value)),
+  [_index.TypeDefInfo.Range]: (registry, value) => createWithSub(_typesCodec.Range, value),
+  [_index.TypeDefInfo.RangeInclusive]: (registry, value) => createWithSub(_typesCodec.RangeInclusive, value),
   [_index.TypeDefInfo.Result]: (registry, value) => {
     const [Ok, Err] = getTypeClassArray(value); // eslint-disable-next-line @typescript-eslint/no-use-before-define
 

package/create/class.js

@@ -99,7 +99,8 @@ const infoMapping = {
   [TypeDefInfo.Null]: (registry, _) => Null,
   [TypeDefInfo.Option]: (registry, value) => createWithSub(Option, value),
   [TypeDefInfo.Plain]: (registry, value) => registry.getOrUnknown(value.type),
-  [TypeDefInfo.Range]: (registry, value) => (value.type.includes('RangeInclusive') ? RangeInclusive : Range).with(getSubType(value)),
+  [TypeDefInfo.Range]: (registry, value) => createWithSub(Range, value),
+  [TypeDefInfo.RangeInclusive]: (registry, value) => createWithSub(RangeInclusive, value),
   [TypeDefInfo.Result]: (registry, value) => {
     const [Ok, Err] = getTypeClassArray(value); // eslint-disable-next-line @typescript-eslint/no-use-before-define
 

package/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.4.2-8",
+  "version": "7.5.2-1",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",
@@ -116,7 +116,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@polkadot/types-codec": "7.4.2-8",
-    "@polkadot/util": "^8.3.2"
+    "@polkadot/types-codec": "7.5.2-1",
+    "@polkadot/util": "^8.3.3"
   }
 }

package/packageInfo.cjs

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@polkadot/types-create',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '7.4.2-8'
+  version: '7.5.2-1'
 };
 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.4.2-8'
+  version: '7.5.2-1'
 };

package/types/types.cjs

@@ -22,14 +22,15 @@ exports.TypeDefInfo = TypeDefInfo;
   TypeDefInfo[TypeDefInfo["Option"] = 9] = "Option";
   TypeDefInfo[TypeDefInfo["Plain"] = 10] = "Plain";
   TypeDefInfo[TypeDefInfo["Range"] = 11] = "Range";
-  TypeDefInfo[TypeDefInfo["Result"] = 12] = "Result";
-  TypeDefInfo[TypeDefInfo["Set"] = 13] = "Set";
-  TypeDefInfo[TypeDefInfo["Si"] = 14] = "Si";
-  TypeDefInfo[TypeDefInfo["Struct"] = 15] = "Struct";
-  TypeDefInfo[TypeDefInfo["Tuple"] = 16] = "Tuple";
-  TypeDefInfo[TypeDefInfo["UInt"] = 17] = "UInt";
-  TypeDefInfo[TypeDefInfo["Vec"] = 18] = "Vec";
-  TypeDefInfo[TypeDefInfo["VecFixed"] = 19] = "VecFixed";
-  TypeDefInfo[TypeDefInfo["WrapperKeepOpaque"] = 20] = "WrapperKeepOpaque";
-  TypeDefInfo[TypeDefInfo["WrapperOpaque"] = 21] = "WrapperOpaque";
+  TypeDefInfo[TypeDefInfo["RangeInclusive"] = 12] = "RangeInclusive";
+  TypeDefInfo[TypeDefInfo["Result"] = 13] = "Result";
+  TypeDefInfo[TypeDefInfo["Set"] = 14] = "Set";
+  TypeDefInfo[TypeDefInfo["Si"] = 15] = "Si";
+  TypeDefInfo[TypeDefInfo["Struct"] = 16] = "Struct";
+  TypeDefInfo[TypeDefInfo["Tuple"] = 17] = "Tuple";
+  TypeDefInfo[TypeDefInfo["UInt"] = 18] = "UInt";
+  TypeDefInfo[TypeDefInfo["Vec"] = 19] = "Vec";
+  TypeDefInfo[TypeDefInfo["VecFixed"] = 20] = "VecFixed";
+  TypeDefInfo[TypeDefInfo["WrapperKeepOpaque"] = 21] = "WrapperKeepOpaque";
+  TypeDefInfo[TypeDefInfo["WrapperOpaque"] = 22] = "WrapperOpaque";
 })(TypeDefInfo || (exports.TypeDefInfo = TypeDefInfo = {}));

package/types/types.d.ts

@@ -11,16 +11,17 @@ export declare enum TypeDefInfo {
     Option = 9,
     Plain = 10,
     Range = 11,
-    Result = 12,
-    Set = 13,
-    Si = 14,
-    Struct = 15,
-    Tuple = 16,
-    UInt = 17,
-    Vec = 18,
-    VecFixed = 19,
-    WrapperKeepOpaque = 20,
-    WrapperOpaque = 21
+    RangeInclusive = 12,
+    Result = 13,
+    Set = 14,
+    Si = 15,
+    Struct = 16,
+    Tuple = 17,
+    UInt = 18,
+    Vec = 19,
+    VecFixed = 20,
+    WrapperKeepOpaque = 21,
+    WrapperOpaque = 22
 }
 export interface TypeDef {
     alias?: Map<string, string>;

package/types/types.js

@@ -15,14 +15,15 @@ export let TypeDefInfo;
   TypeDefInfo[TypeDefInfo["Option"] = 9] = "Option";
   TypeDefInfo[TypeDefInfo["Plain"] = 10] = "Plain";
   TypeDefInfo[TypeDefInfo["Range"] = 11] = "Range";
-  TypeDefInfo[TypeDefInfo["Result"] = 12] = "Result";
-  TypeDefInfo[TypeDefInfo["Set"] = 13] = "Set";
-  TypeDefInfo[TypeDefInfo["Si"] = 14] = "Si";
-  TypeDefInfo[TypeDefInfo["Struct"] = 15] = "Struct";
-  TypeDefInfo[TypeDefInfo["Tuple"] = 16] = "Tuple";
-  TypeDefInfo[TypeDefInfo["UInt"] = 17] = "UInt";
-  TypeDefInfo[TypeDefInfo["Vec"] = 18] = "Vec";
-  TypeDefInfo[TypeDefInfo["VecFixed"] = 19] = "VecFixed";
-  TypeDefInfo[TypeDefInfo["WrapperKeepOpaque"] = 20] = "WrapperKeepOpaque";
-  TypeDefInfo[TypeDefInfo["WrapperOpaque"] = 21] = "WrapperOpaque";
+  TypeDefInfo[TypeDefInfo["RangeInclusive"] = 12] = "RangeInclusive";
+  TypeDefInfo[TypeDefInfo["Result"] = 13] = "Result";
+  TypeDefInfo[TypeDefInfo["Set"] = 14] = "Set";
+  TypeDefInfo[TypeDefInfo["Si"] = 15] = "Si";
+  TypeDefInfo[TypeDefInfo["Struct"] = 16] = "Struct";
+  TypeDefInfo[TypeDefInfo["Tuple"] = 17] = "Tuple";
+  TypeDefInfo[TypeDefInfo["UInt"] = 18] = "UInt";
+  TypeDefInfo[TypeDefInfo["Vec"] = 19] = "Vec";
+  TypeDefInfo[TypeDefInfo["VecFixed"] = 20] = "VecFixed";
+  TypeDefInfo[TypeDefInfo["WrapperKeepOpaque"] = 21] = "WrapperKeepOpaque";
+  TypeDefInfo[TypeDefInfo["WrapperOpaque"] = 22] = "WrapperOpaque";
 })(TypeDefInfo || (TypeDefInfo = {}));

package/util/encodeTypes.cjs

@@ -36,6 +36,7 @@ function encodeWithParams(registry, typeDef, outer) {
     case _index.TypeDefInfo.Linkage:
     case _index.TypeDefInfo.Option:
     case _index.TypeDefInfo.Range:
+    case _index.TypeDefInfo.RangeInclusive:
     case _index.TypeDefInfo.Result:
     case _index.TypeDefInfo.Vec:
     case _index.TypeDefInfo.WrapperKeepOpaque:
@@ -120,7 +121,8 @@ const encoders = {
     } = _ref7;
     return displayName || type;
   },
-  [_index.TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
+  [_index.TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Range'),
+  [_index.TypeDefInfo.RangeInclusive]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'RangeInclusive'),
   [_index.TypeDefInfo.Result]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Result'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   [_index.TypeDefInfo.Set]: (registry, _ref8) => {

package/util/encodeTypes.js

@@ -24,6 +24,7 @@ function encodeWithParams(registry, typeDef, outer) {
     case TypeDefInfo.Linkage:
     case TypeDefInfo.Option:
     case TypeDefInfo.Range:
+    case TypeDefInfo.RangeInclusive:
     case TypeDefInfo.Result:
     case TypeDefInfo.Vec:
     case TypeDefInfo.WrapperKeepOpaque:
@@ -89,7 +90,8 @@ const encoders = {
     displayName,
     type
   }) => displayName || type,
-  [TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
+  [TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Range'),
+  [TypeDefInfo.RangeInclusive]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'RangeInclusive'),
   [TypeDefInfo.Result]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Result'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   [TypeDefInfo.Set]: (registry, {

package/util/getTypeDef.cjs

@@ -138,12 +138,6 @@ function _decodeFixedVec(value, type, _, count) {
   value.length = length;
   value.sub = getTypeDef(vecType, {}, count);
   return value;
-}
-
-function _decodeRange(value, _, subType) {
-  const Type = getTypeDef(subType);
-  value.sub = [Type, Type];
-  return value;
 } // decode a tuple
 
 
@@ -185,9 +179,8 @@ function hasWrapper(type, _ref5) {
 }
 
 const nestedExtraction = [['[', ']', _index.TypeDefInfo.VecFixed, _decodeFixedVec], ['{', '}', _index.TypeDefInfo.Struct, _decodeStruct], ['(', ')', _index.TypeDefInfo.Tuple, _decodeTuple], // the inner for these are the same as tuple, multiple values
-['BTreeMap<', '>', _index.TypeDefInfo.BTreeMap, _decodeTuple], ['HashMap<', '>', _index.TypeDefInfo.HashMap, _decodeTuple], ['Int<', '>', _index.TypeDefInfo.Int, _decodeInt], // Not sure about these, have a specific implementation?
-['Range<', '>', _index.TypeDefInfo.Tuple, _decodeRange], ['RangeInclusive<', '>', _index.TypeDefInfo.Tuple, _decodeRange], ['Result<', '>', _index.TypeDefInfo.Result, _decodeTuple], ['UInt<', '>', _index.TypeDefInfo.UInt, _decodeUInt], ['DoNotConstruct<', '>', _index.TypeDefInfo.DoNotConstruct, _decodeDoNotConstruct]];
-const wrappedExtraction = [['BTreeSet<', '>', _index.TypeDefInfo.BTreeSet], ['Compact<', '>', _index.TypeDefInfo.Compact], ['Linkage<', '>', _index.TypeDefInfo.Linkage], ['Option<', '>', _index.TypeDefInfo.Option], ['Vec<', '>', _index.TypeDefInfo.Vec], ['WrapperKeepOpaque<', '>', _index.TypeDefInfo.WrapperKeepOpaque], ['WrapperOpaque<', '>', _index.TypeDefInfo.WrapperOpaque]];
+['BTreeMap<', '>', _index.TypeDefInfo.BTreeMap, _decodeTuple], ['HashMap<', '>', _index.TypeDefInfo.HashMap, _decodeTuple], ['Int<', '>', _index.TypeDefInfo.Int, _decodeInt], ['Result<', '>', _index.TypeDefInfo.Result, _decodeTuple], ['UInt<', '>', _index.TypeDefInfo.UInt, _decodeUInt], ['DoNotConstruct<', '>', _index.TypeDefInfo.DoNotConstruct, _decodeDoNotConstruct]];
+const wrappedExtraction = [['BTreeSet<', '>', _index.TypeDefInfo.BTreeSet], ['Compact<', '>', _index.TypeDefInfo.Compact], ['Linkage<', '>', _index.TypeDefInfo.Linkage], ['Option<', '>', _index.TypeDefInfo.Option], ['Range<', '>', _index.TypeDefInfo.Range], ['RangeInclusive<', '>', _index.TypeDefInfo.RangeInclusive], ['Vec<', '>', _index.TypeDefInfo.Vec], ['WrapperKeepOpaque<', '>', _index.TypeDefInfo.WrapperKeepOpaque], ['WrapperOpaque<', '>', _index.TypeDefInfo.WrapperOpaque]];
 
 function extractSubType(type, _ref6) {
   let [start, end] = _ref6;

package/util/getTypeDef.js

@@ -115,12 +115,6 @@ function _decodeFixedVec(value, type, _, count) {
   value.length = length;
   value.sub = getTypeDef(vecType, {}, count);
   return value;
-}
-
-function _decodeRange(value, _, subType) {
-  const Type = getTypeDef(subType);
-  value.sub = [Type, Type];
-  return value;
 } // decode a tuple
 
 
@@ -161,9 +155,8 @@ function hasWrapper(type, [start, end]) {
 }
 
 const nestedExtraction = [['[', ']', TypeDefInfo.VecFixed, _decodeFixedVec], ['{', '}', TypeDefInfo.Struct, _decodeStruct], ['(', ')', TypeDefInfo.Tuple, _decodeTuple], // the inner for these are the same as tuple, multiple values
-['BTreeMap<', '>', TypeDefInfo.BTreeMap, _decodeTuple], ['HashMap<', '>', TypeDefInfo.HashMap, _decodeTuple], ['Int<', '>', TypeDefInfo.Int, _decodeInt], // Not sure about these, have a specific implementation?
-['Range<', '>', TypeDefInfo.Tuple, _decodeRange], ['RangeInclusive<', '>', TypeDefInfo.Tuple, _decodeRange], ['Result<', '>', TypeDefInfo.Result, _decodeTuple], ['UInt<', '>', TypeDefInfo.UInt, _decodeUInt], ['DoNotConstruct<', '>', TypeDefInfo.DoNotConstruct, _decodeDoNotConstruct]];
-const wrappedExtraction = [['BTreeSet<', '>', TypeDefInfo.BTreeSet], ['Compact<', '>', TypeDefInfo.Compact], ['Linkage<', '>', TypeDefInfo.Linkage], ['Option<', '>', TypeDefInfo.Option], ['Vec<', '>', TypeDefInfo.Vec], ['WrapperKeepOpaque<', '>', TypeDefInfo.WrapperKeepOpaque], ['WrapperOpaque<', '>', TypeDefInfo.WrapperOpaque]];
+['BTreeMap<', '>', TypeDefInfo.BTreeMap, _decodeTuple], ['HashMap<', '>', TypeDefInfo.HashMap, _decodeTuple], ['Int<', '>', TypeDefInfo.Int, _decodeInt], ['Result<', '>', TypeDefInfo.Result, _decodeTuple], ['UInt<', '>', TypeDefInfo.UInt, _decodeUInt], ['DoNotConstruct<', '>', TypeDefInfo.DoNotConstruct, _decodeDoNotConstruct]];
+const wrappedExtraction = [['BTreeSet<', '>', TypeDefInfo.BTreeSet], ['Compact<', '>', TypeDefInfo.Compact], ['Linkage<', '>', TypeDefInfo.Linkage], ['Option<', '>', TypeDefInfo.Option], ['Range<', '>', TypeDefInfo.Range], ['RangeInclusive<', '>', TypeDefInfo.RangeInclusive], ['Vec<', '>', TypeDefInfo.Vec], ['WrapperKeepOpaque<', '>', TypeDefInfo.WrapperKeepOpaque], ['WrapperOpaque<', '>', TypeDefInfo.WrapperOpaque]];
 
 function extractSubType(type, [start, end]) {
   return type.substr(start.length, type.length - start.length - end.length);