@polkadot/types-create 7.4.2-5 → 7.4.2-9

package/bundle.cjs

@@ -10,7 +10,7 @@ var _exportNames = {
 Object.defineProperty(exports, "TypeDefInfo", {
   enumerable: true,
   get: function () {
-    return _types.TypeDefInfo;
+    return _index.TypeDefInfo;
   }
 });
 Object.defineProperty(exports, "packageInfo", {
@@ -22,32 +22,32 @@ Object.defineProperty(exports, "packageInfo", {
 
 var _packageInfo = require("./packageInfo.cjs");
 
-var _types = require("./types.cjs");
+var _index = require("./types/index.cjs");
 
-var _index = require("./create/index.cjs");
+var _index2 = require("./create/index.cjs");
 
-Object.keys(_index).forEach(function (key) {
+Object.keys(_index2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index[key]) return;
+  if (key in exports && exports[key] === _index2[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _index[key];
+      return _index2[key];
     }
   });
 });
 
-var _index2 = require("./util/index.cjs");
+var _index3 = require("./util/index.cjs");
 
-Object.keys(_index2).forEach(function (key) {
+Object.keys(_index3).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index2[key]) return;
+  if (key in exports && exports[key] === _index3[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _index2[key];
+      return _index3[key];
     }
   });
 });

package/bundle.js

@@ -1,6 +1,6 @@
 // Copyright 2017-2022 @polkadot/types-codec authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 export { packageInfo } from "./packageInfo.js";
-export { TypeDefInfo } from "./types.js";
+export { TypeDefInfo } from "./types/index.js";
 export * from "./create/index.js";
 export * from "./util/index.js";

package/create/class.cjs

@@ -11,7 +11,7 @@ var _typesCodec = require("@polkadot/types-codec");
 
 var _util = require("@polkadot/util");
 
-var _types = require("../types.cjs");
+var _index = require("../types/index.cjs");
 
 var _getTypeDef = require("../util/getTypeDef.cjs");
 
@@ -75,11 +75,11 @@ function createWithSub(Clazz, value) {
 }
 
 const infoMapping = {
-  [_types.TypeDefInfo.BTreeMap]: (registry, value) => createHashMap(_typesCodec.BTreeMap, value),
-  [_types.TypeDefInfo.BTreeSet]: (registry, value) => createWithSub(_typesCodec.BTreeSet, value),
-  [_types.TypeDefInfo.Compact]: (registry, value) => createWithSub(_typesCodec.Compact, value),
-  [_types.TypeDefInfo.DoNotConstruct]: (registry, value) => _typesCodec.DoNotConstruct.with(value.displayName || value.type),
-  [_types.TypeDefInfo.Enum]: (registry, value) => {
+  [_index.TypeDefInfo.BTreeMap]: (registry, value) => createHashMap(_typesCodec.BTreeMap, value),
+  [_index.TypeDefInfo.BTreeSet]: (registry, value) => createWithSub(_typesCodec.BTreeSet, value),
+  [_index.TypeDefInfo.Compact]: (registry, value) => createWithSub(_typesCodec.Compact, value),
+  [_index.TypeDefInfo.DoNotConstruct]: (registry, value) => _typesCodec.DoNotConstruct.with(value.displayName || value.type),
+  [_index.TypeDefInfo.Enum]: (registry, value) => {
     const subs = getSubDefArray(value);
     return _typesCodec.Enum.with(subs.every(_ref3 => {
       let {
@@ -95,10 +95,10 @@ const infoMapping = {
       return out;
     }, {}) : getTypeClassMap(value));
   },
-  [_types.TypeDefInfo.HashMap]: (registry, value) => createHashMap(_typesCodec.HashMap, value),
-  [_types.TypeDefInfo.Int]: (registry, value) => createInt(_typesCodec.Int, value),
+  [_index.TypeDefInfo.HashMap]: (registry, value) => createHashMap(_typesCodec.HashMap, value),
+  [_index.TypeDefInfo.Int]: (registry, value) => createInt(_typesCodec.Int, value),
   // We have circular deps between Linkage & Struct
-  [_types.TypeDefInfo.Linkage]: (registry, value) => {
+  [_index.TypeDefInfo.Linkage]: (registry, value) => {
     const type = `Option<${getSubType(value)}>`; // eslint-disable-next-line sort-keys
 
     const Clazz = _typesCodec.Struct.with({
@@ -115,11 +115,11 @@ const infoMapping = {
     return Clazz;
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Null]: (registry, _) => _typesCodec.Null,
-  [_types.TypeDefInfo.Option]: (registry, value) => createWithSub(_typesCodec.Option, value),
-  [_types.TypeDefInfo.Plain]: (registry, value) => registry.getOrUnknown(value.type),
-  [_types.TypeDefInfo.Range]: (registry, value) => (value.type.includes('RangeInclusive') ? _typesCodec.RangeInclusive : _typesCodec.Range).with(getSubType(value)),
-  [_types.TypeDefInfo.Result]: (registry, value) => {
+  [_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.Result]: (registry, value) => {
     const [Ok, Err] = getTypeClassArray(value); // eslint-disable-next-line @typescript-eslint/no-use-before-define
 
     return _typesCodec.Result.with({
@@ -127,7 +127,7 @@ const infoMapping = {
       Ok
     });
   },
-  [_types.TypeDefInfo.Set]: (registry, value) => _typesCodec.CodecSet.with(getSubDefArray(value).reduce((result, _ref5) => {
+  [_index.TypeDefInfo.Set]: (registry, value) => _typesCodec.CodecSet.with(getSubDefArray(value).reduce((result, _ref5) => {
     let {
       index,
       name
@@ -135,18 +135,18 @@ const infoMapping = {
     result[name] = index;
     return result;
   }, {}), value.length),
-  [_types.TypeDefInfo.Si]: (registry, value) => getTypeClass(registry, registry.lookup.getTypeDef(value.type)),
-  [_types.TypeDefInfo.Struct]: (registry, value) => _typesCodec.Struct.with(getTypeClassMap(value), value.alias),
-  [_types.TypeDefInfo.Tuple]: (registry, value) => _typesCodec.Tuple.with(getTypeClassArray(value)),
-  [_types.TypeDefInfo.UInt]: (registry, value) => createInt(_typesCodec.UInt, value),
-  [_types.TypeDefInfo.Vec]: (registry, _ref6) => {
+  [_index.TypeDefInfo.Si]: (registry, value) => getTypeClass(registry, registry.lookup.getTypeDef(value.type)),
+  [_index.TypeDefInfo.Struct]: (registry, value) => _typesCodec.Struct.with(getTypeClassMap(value), value.alias),
+  [_index.TypeDefInfo.Tuple]: (registry, value) => _typesCodec.Tuple.with(getTypeClassArray(value)),
+  [_index.TypeDefInfo.UInt]: (registry, value) => createInt(_typesCodec.UInt, value),
+  [_index.TypeDefInfo.Vec]: (registry, _ref6) => {
     let {
       sub
     } = _ref6;
     (0, _util.assert)(sub && !Array.isArray(sub), 'Expected type information for vector');
     return sub.type === 'u8' ? _typesCodec.Bytes : _typesCodec.Vec.with(getTypeDefType(sub));
   },
-  [_types.TypeDefInfo.VecFixed]: (registry, _ref7) => {
+  [_index.TypeDefInfo.VecFixed]: (registry, _ref7) => {
     let {
       displayName,
       length,
@@ -155,8 +155,8 @@ const infoMapping = {
     (0, _util.assert)(sub && (0, _util.isNumber)(length) && !Array.isArray(sub), 'Expected length & type information for fixed vector');
     return sub.type === 'u8' ? _typesCodec.U8aFixed.with(length * 8, displayName) : _typesCodec.VecFixed.with(getTypeDefType(sub), length);
   },
-  [_types.TypeDefInfo.WrapperKeepOpaque]: (registry, value) => createWithSub(_typesCodec.WrapperKeepOpaque, value),
-  [_types.TypeDefInfo.WrapperOpaque]: (registry, value) => createWithSub(_typesCodec.WrapperOpaque, value)
+  [_index.TypeDefInfo.WrapperKeepOpaque]: (registry, value) => createWithSub(_typesCodec.WrapperKeepOpaque, value),
+  [_index.TypeDefInfo.WrapperOpaque]: (registry, value) => createWithSub(_typesCodec.WrapperOpaque, value)
 };
 
 function constructTypeClass(registry, typeDef) {

package/create/class.d.ts

@@ -1,5 +1,5 @@
-import type { Codec, CodecClass, CodecRegistry } from '@polkadot/types-codec/types';
+import type { Codec, CodecClass, Registry } from '@polkadot/types-codec/types';
 import type { TypeDef } from '../types';
-export declare function constructTypeClass<T extends Codec = Codec>(registry: CodecRegistry, typeDef: TypeDef): CodecClass<T>;
-export declare function getTypeClass<T extends Codec = Codec>(registry: CodecRegistry, typeDef: TypeDef): CodecClass<T>;
-export declare function createClassUnsafe<T extends Codec = Codec, K extends string = string>(registry: CodecRegistry, type: K): CodecClass<T>;
+export declare function constructTypeClass<T extends Codec = Codec>(registry: Registry, typeDef: TypeDef): CodecClass<T>;
+export declare function getTypeClass<T extends Codec = Codec>(registry: Registry, typeDef: TypeDef): CodecClass<T>;
+export declare function createClassUnsafe<T extends Codec = Codec, K extends string = string>(registry: Registry, type: K): CodecClass<T>;

package/create/class.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { BTreeMap, BTreeSet, Bytes, CodecSet, Compact, DoNotConstruct, Enum, HashMap, Int, Null, Option, Range, RangeInclusive, Result, Struct, Tuple, U8aFixed, UInt, Vec, VecFixed, WrapperKeepOpaque, WrapperOpaque } from '@polkadot/types-codec';
 import { assert, isNumber, stringify } from '@polkadot/util';
-import { TypeDefInfo } from "../types.js";
+import { TypeDefInfo } from "../types/index.js";
 import { getTypeDef } from "../util/getTypeDef.js";
 
 function getTypeDefType({

package/create/type.d.ts

@@ -1,3 +1,3 @@
-import type { Codec, CodecRegistry } from '@polkadot/types-codec/types';
+import type { Codec, Registry } from '@polkadot/types-codec/types';
 import type { CreateOptions } from '../types';
-export declare function createTypeUnsafe<T extends Codec = Codec, K extends string = string>(registry: CodecRegistry, type: K, params?: unknown[], options?: CreateOptions): T;
+export declare function createTypeUnsafe<T extends Codec = Codec, K extends string = string>(registry: Registry, type: K, params?: unknown[], options?: CreateOptions): T;

package/package.json

@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "7.4.2-5",
+  "version": "7.4.2-9",
   "main": "index.cjs",
   "module": "index.js",
   "types": "index.d.ts",
@@ -69,9 +69,24 @@
       "default": "./packageInfo.js"
     },
     "./types": {
-      "types": "./types.d.ts",
-      "require": "./types.cjs",
-      "default": "./types.js"
+      "types": "./types/index.d.ts",
+      "require": "./types/index.cjs",
+      "default": "./types/index.js"
+    },
+    "./types/augmentRegistry": {
+      "types": "./types/augmentRegistry.d.ts",
+      "require": "./types/augmentRegistry.cjs",
+      "default": "./types/augmentRegistry.js"
+    },
+    "./types/lookup": {
+      "types": "./types/lookup.d.ts",
+      "require": "./types/lookup.cjs",
+      "default": "./types/lookup.js"
+    },
+    "./types/types": {
+      "types": "./types/types.d.ts",
+      "require": "./types/types.cjs",
+      "default": "./types/types.js"
     },
     "./util": {
       "types": "./util/index.d.ts",
@@ -101,7 +116,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@polkadot/types-codec": "7.4.2-5",
+    "@polkadot/types-codec": "7.4.2-9",
     "@polkadot/util": "^8.3.2"
   }
 }

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-5'
+  version: '7.4.2-9'
 };
 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-5'
+  version: '7.4.2-9'
 };

package/types/augmentRegistry.cjs

@@ -0,0 +1 @@
+"use strict";

package/types/augmentRegistry.d.ts

@@ -0,0 +1,10 @@
+import type { Codec, CodecClass, ICompact, INumber } from '@polkadot/types-codec/types';
+import type { ILookup, TypeDef } from '@polkadot/types-create/types';
+declare module '@polkadot/types-codec/types/registry' {
+    interface Registry {
+        readonly lookup: ILookup;
+        createLookupType(lookupId: ICompact<INumber> | number): string;
+        setLookup(lookup: ILookup): void;
+        getUnsafe<T extends Codec = Codec, K extends string = string>(name: K, withUnknown?: boolean, knownTypeDef?: TypeDef): CodecClass<T> | undefined;
+    }
+}

package/types/augmentRegistry.js

@@ -0,0 +1 @@
+export {};

package/types/index.cjs

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+require("./augmentRegistry.cjs");
+
+var _lookup = require("./lookup.cjs");
+
+Object.keys(_lookup).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _lookup[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _lookup[key];
+    }
+  });
+});
+
+var _types = require("./types.cjs");
+
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _types[key];
+    }
+  });
+});

package/types/index.d.ts

@@ -0,0 +1,4 @@
+import './augmentRegistry';
+export type { CodecCreateOptions as CreateOptions } from '@polkadot/types-codec/types';
+export * from './lookup';
+export * from './types';

package/types/index.js

@@ -0,0 +1,5 @@
+// Copyright 2017-2022 @polkadot/types-create authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+import "./augmentRegistry.js";
+export * from "./lookup.js";
+export * from "./types.js";

package/types/lookup.cjs

@@ -0,0 +1 @@
+"use strict";

package/types/lookup.d.ts

@@ -0,0 +1,10 @@
+import type { ICompact, INumber } from '@polkadot/types-codec/types';
+import type { TypeDef } from './types';
+export interface ILookup {
+    getSiType(lookupId: ICompact<INumber> | string | number): {
+        def: {
+            asTuple: ICompact<INumber>[];
+        };
+    };
+    getTypeDef(lookupId: ICompact<INumber> | string | number): TypeDef;
+}

package/types/lookup.js

@@ -0,0 +1 @@
+export {};

package/{types.d.ts → types/types.d.ts}

@@ -1,5 +1,3 @@
-import type { Codec, CodecClass, CodecRegistry, ICompact, INumber } from '@polkadot/types-codec/types';
-export type { CodecCreateOptions as CreateOptions } from '@polkadot/types-codec/types';
 export declare enum TypeDefInfo {
     BTreeMap = 0,
     BTreeSet = 1,
@@ -42,17 +40,3 @@ export interface TypeDef {
     type: string;
     typeName?: string;
 }
-export interface ILookup {
-    getSiType(lookupId: ICompact<INumber> | string | number): {
-        def: {
-            asTuple: ICompact<INumber>[];
-        };
-    };
-    getTypeDef(lookupId: ICompact<INumber> | string | number): TypeDef;
-}
-export interface CreateRegistry extends CodecRegistry {
-    lookup: ILookup;
-    createLookupType(lookupId: ICompact<INumber> | number): string;
-    setLookup(lookup: ILookup): void;
-    getUnsafe<T extends Codec = Codec, K extends string = string>(name: K, withUnknown?: boolean, knownTypeDef?: TypeDef): CodecClass<T> | undefined;
-}

package/util/encodeTypes.cjs

@@ -9,7 +9,7 @@ exports.withTypeString = withTypeString;
 
 var _util = require("@polkadot/util");
 
-var _types = require("../types.cjs");
+var _index = require("../types/index.cjs");
 
 // Copyright 2017-2022 @polkadot/types-create authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -29,17 +29,17 @@ function encodeWithParams(registry, typeDef, outer) {
   } = typeDef;
 
   switch (info) {
-    case _types.TypeDefInfo.BTreeMap:
-    case _types.TypeDefInfo.BTreeSet:
-    case _types.TypeDefInfo.Compact:
-    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:
+    case _index.TypeDefInfo.BTreeMap:
+    case _index.TypeDefInfo.BTreeSet:
+    case _index.TypeDefInfo.Compact:
+    case _index.TypeDefInfo.HashMap:
+    case _index.TypeDefInfo.Linkage:
+    case _index.TypeDefInfo.Option:
+    case _index.TypeDefInfo.Range:
+    case _index.TypeDefInfo.Result:
+    case _index.TypeDefInfo.Vec:
+    case _index.TypeDefInfo.WrapperKeepOpaque:
+    case _index.TypeDefInfo.WrapperOpaque:
       return paramsNotation(outer, sub, p => encodeTypeDef(registry, p));
   }
 
@@ -69,10 +69,10 @@ function encodeSubTypes(registry, sub, asEnum, extra) {
 
 
 const encoders = {
-  [_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) => {
+  [_index.TypeDefInfo.BTreeMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'BTreeMap'),
+  [_index.TypeDefInfo.BTreeSet]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'BTreeSet'),
+  [_index.TypeDefInfo.Compact]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Compact'),
+  [_index.TypeDefInfo.DoNotConstruct]: (registry, _ref2) => {
     let {
       displayName,
       lookupIndex,
@@ -80,7 +80,7 @@ const encoders = {
     } = _ref2;
     return `DoNotConstruct<${lookupName || displayName || ((0, _util.isUndefined)(lookupIndex) ? 'Unknown' : registry.createLookupType(lookupIndex))}>`;
   },
-  [_types.TypeDefInfo.Enum]: (registry, _ref3) => {
+  [_index.TypeDefInfo.Enum]: (registry, _ref3) => {
     let {
       sub
     } = _ref3;
@@ -101,29 +101,29 @@ const encoders = {
       })
     }) : encodeSubTypes(registry, sub, true);
   },
-  [_types.TypeDefInfo.HashMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'HashMap'),
-  [_types.TypeDefInfo.Int]: (registry, _ref6) => {
+  [_index.TypeDefInfo.HashMap]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'HashMap'),
+  [_index.TypeDefInfo.Int]: (registry, _ref6) => {
     let {
       length = 32
     } = _ref6;
     return `Int<${length}>`;
   },
-  [_types.TypeDefInfo.Linkage]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Linkage'),
+  [_index.TypeDefInfo.Linkage]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Linkage'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Null]: (registry, typeDef) => 'Null',
-  [_types.TypeDefInfo.Option]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Option'),
+  [_index.TypeDefInfo.Null]: (registry, typeDef) => 'Null',
+  [_index.TypeDefInfo.Option]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Option'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Plain]: (registry, _ref7) => {
+  [_index.TypeDefInfo.Plain]: (registry, _ref7) => {
     let {
       displayName,
       type
     } = _ref7;
     return displayName || type;
   },
-  [_types.TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
-  [_types.TypeDefInfo.Result]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Result'),
+  [_index.TypeDefInfo.Range]: (registry, typeDef) => encodeWithParams(registry, typeDef, typeDef.type.includes('RangeInclusive') ? 'RangeInclusive' : 'Range'),
+  [_index.TypeDefInfo.Result]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Result'),
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Set]: (registry, _ref8) => {
+  [_index.TypeDefInfo.Set]: (registry, _ref8) => {
     let {
       length = 8,
       sub
@@ -144,14 +144,14 @@ const encoders = {
     });
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [_types.TypeDefInfo.Si]: (registry, _ref10) => {
+  [_index.TypeDefInfo.Si]: (registry, _ref10) => {
     let {
       lookupName,
       type
     } = _ref10;
     return lookupName || type;
   },
-  [_types.TypeDefInfo.Struct]: (registry, _ref11) => {
+  [_index.TypeDefInfo.Struct]: (registry, _ref11) => {
     let {
       alias,
       sub
@@ -166,21 +166,21 @@ const encoders = {
       }, {})
     } : {});
   },
-  [_types.TypeDefInfo.Tuple]: (registry, _ref13) => {
+  [_index.TypeDefInfo.Tuple]: (registry, _ref13) => {
     let {
       sub
     } = _ref13;
     (0, _util.assert)(sub && Array.isArray(sub), 'Unable to encode Tuple type');
     return `(${sub.map(type => encodeTypeDef(registry, type)).join(',')})`;
   },
-  [_types.TypeDefInfo.UInt]: (registry, _ref14) => {
+  [_index.TypeDefInfo.UInt]: (registry, _ref14) => {
     let {
       length = 32
     } = _ref14;
     return `UInt<${length}>`;
   },
-  [_types.TypeDefInfo.Vec]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Vec'),
-  [_types.TypeDefInfo.VecFixed]: (registry, _ref15) => {
+  [_index.TypeDefInfo.Vec]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'Vec'),
+  [_index.TypeDefInfo.VecFixed]: (registry, _ref15) => {
     let {
       length,
       sub
@@ -188,8 +188,8 @@ 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]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperKeepOpaque'),
-  [_types.TypeDefInfo.WrapperOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperOpaque')
+  [_index.TypeDefInfo.WrapperKeepOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperKeepOpaque'),
+  [_index.TypeDefInfo.WrapperOpaque]: (registry, typeDef) => encodeWithParams(registry, typeDef, 'WrapperOpaque')
 };
 
 function encodeType(registry, typeDef) {

package/util/encodeTypes.d.ts

@@ -1,7 +1,7 @@
-import type { CodecRegistry } from '@polkadot/types-codec/types';
+import type { Registry } 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(registry: CodecRegistry, typeDef: TypeDef): string;
-export declare function withTypeString(registry: CodecRegistry, typeDef: Omit<TypeDef, 'type'> & {
+export declare function encodeTypeDef(registry: Registry, typeDef: TypeDef): string;
+export declare function withTypeString(registry: Registry, typeDef: Omit<TypeDef, 'type'> & {
     type?: string;
 }): TypeDef;

package/util/encodeTypes.js

@@ -1,7 +1,7 @@
 // Copyright 2017-2022 @polkadot/types-create authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { assert, isNumber, isUndefined, objectSpread, stringify } from '@polkadot/util';
-import { TypeDefInfo } from "../types.js";
+import { TypeDefInfo } from "../types/index.js";
 
 const stringIdentity = value => value.toString();
 

package/util/getTypeDef.cjs

@@ -9,7 +9,7 @@ var _typesCodec = require("@polkadot/types-codec");
 
 var _util = require("@polkadot/util");
 
-var _types = require("../types.cjs");
+var _index = require("../types/index.cjs");
 
 var _typeSplit = require("./typeSplit.cjs");
 
@@ -38,12 +38,12 @@ function isRustEnum(details) {
 
 
 function _decodeEnum(value, details, count) {
-  value.info = _types.TypeDefInfo.Enum; // not as pretty, but remain compatible with oo7 for both struct and Array types
+  value.info = _index.TypeDefInfo.Enum; // not as pretty, but remain compatible with oo7 for both struct and Array types
 
   if (Array.isArray(details)) {
     value.sub = details.map((name, index) => ({
       index,
-      info: _types.TypeDefInfo.Plain,
+      info: _index.TypeDefInfo.Plain,
       name,
       type: 'Null'
     }));
@@ -61,7 +61,7 @@ function _decodeEnum(value, details, count) {
       let [name, index] = _ref2;
       return {
         index,
-        info: _types.TypeDefInfo.Plain,
+        info: _index.TypeDefInfo.Plain,
         name,
         type: 'Null'
       };
@@ -74,7 +74,7 @@ function _decodeEnum(value, details, count) {
 
 
 function _decodeSet(value, details) {
-  value.info = _types.TypeDefInfo.Set;
+  value.info = _index.TypeDefInfo.Set;
   value.length = details._bitLength;
   value.sub = Object.entries(details).filter(_ref3 => {
     let [name] = _ref3;
@@ -83,7 +83,7 @@ function _decodeSet(value, details) {
     let [name, index] = _ref4;
     return {
       index,
-      info: _types.TypeDefInfo.Plain,
+      info: _index.TypeDefInfo.Plain,
       name,
       type: 'Null'
     };
@@ -184,10 +184,10 @@ function hasWrapper(type, _ref5) {
   return type.substr(0, start.length) === start && type.substr(-1 * end.length) === end;
 }
 
-const nestedExtraction = [['[', ']', _types.TypeDefInfo.VecFixed, _decodeFixedVec], ['{', '}', _types.TypeDefInfo.Struct, _decodeStruct], ['(', ')', _types.TypeDefInfo.Tuple, _decodeTuple], // the inner for these are the same as tuple, multiple values
-['BTreeMap<', '>', _types.TypeDefInfo.BTreeMap, _decodeTuple], ['HashMap<', '>', _types.TypeDefInfo.HashMap, _decodeTuple], ['Int<', '>', _types.TypeDefInfo.Int, _decodeInt], // Not sure about these, have a specific implementation?
-['Range<', '>', _types.TypeDefInfo.Tuple, _decodeRange], ['RangeInclusive<', '>', _types.TypeDefInfo.Tuple, _decodeRange], ['Result<', '>', _types.TypeDefInfo.Result, _decodeTuple], ['UInt<', '>', _types.TypeDefInfo.UInt, _decodeUInt], ['DoNotConstruct<', '>', _types.TypeDefInfo.DoNotConstruct, _decodeDoNotConstruct]];
-const wrappedExtraction = [['BTreeSet<', '>', _types.TypeDefInfo.BTreeSet], ['Compact<', '>', _types.TypeDefInfo.Compact], ['Linkage<', '>', _types.TypeDefInfo.Linkage], ['Option<', '>', _types.TypeDefInfo.Option], ['Vec<', '>', _types.TypeDefInfo.Vec], ['WrapperKeepOpaque<', '>', _types.TypeDefInfo.WrapperKeepOpaque], ['WrapperOpaque<', '>', _types.TypeDefInfo.WrapperOpaque]];
+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]];
 
 function extractSubType(type, _ref6) {
   let [start, end] = _ref6;
@@ -205,7 +205,7 @@ function getTypeDef(_type) {
   const type = (0, _typesCodec.sanitize)(_type);
   const value = {
     displayName,
-    info: _types.TypeDefInfo.Plain,
+    info: _index.TypeDefInfo.Plain,
     name,
     type
   };

package/util/getTypeDef.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { sanitize } from '@polkadot/types-codec';
 import { assert, isNumber, isString, objectSpread } from '@polkadot/util';
-import { TypeDefInfo } from "../types.js";
+import { TypeDefInfo } from "../types/index.js";
 import { typeSplit } from "./typeSplit.js";
 const MAX_NESTED = 64;
 const KNOWN_INTERNALS = ['_alias', '_fallback'];