10.1.3: Remove wrong .module specifier in typegen (#5541)

jacogr · web-flow · commit 48d2dbd885d6 · 2023-03-15T12:30:50.000+02:00
* Remove wrong .module specifier in typegen * 10.1.3 * Reset * Revert "10.1.3" This reverts commit 1c6d8ff. * Rebump 10.1.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 10.1.3 Mar 15, 2023
+
+Changes:
+
+- Remove incorrect `.module.` specifiers in typegen code
+
+
 ## 10.1.2 Mar 11, 2023
 
 Changes:
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "versions": {
     "git": "10.1.3-3-x",
     "npm": "10.1.2"
@@ -37,9 +37,9 @@
     "test:one": "polkadot-dev-run-test --env node"
   },
   "devDependencies": {
-    "@polkadot/dev": "^0.71.6",
+    "@polkadot/dev": "^0.71.10",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/node": "^18.15.0"
+    "@types/node": "^18.15.3"
   },
   "resolutions": {
     "typescript": "^4.9.5"
diff --git a/packages/api-augment/package.json b/packages/api-augment/package.json
@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api-base": "10.1.3-3-x",
-    "@polkadot/rpc-augment": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-augment": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
+    "@polkadot/api-base": "10.1.3",
+    "@polkadot/rpc-augment": "10.1.3",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-augment": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "tslib": "^2.5.0"
   }
diff --git a/packages/api-base/package.json b/packages/api-base/package.json
@@ -20,11 +20,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-core": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
+    "@polkadot/rpc-core": "10.1.3",
+    "@polkadot/types": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
@@ -20,20 +20,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
-    "@polkadot/types-create": "10.1.3-3-x",
+    "@polkadot/api": "10.1.3",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
+    "@polkadot/types-create": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "@polkadot/util-crypto": "^11.0.2",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "10.1.3-3-x",
+    "@polkadot/api-augment": "10.1.3",
     "@polkadot/keyring": "^11.0.2"
   }
 }
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
@@ -20,25 +20,25 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api": "10.1.3-3-x",
-    "@polkadot/api-augment": "10.1.3-3-x",
-    "@polkadot/api-base": "10.1.3-3-x",
-    "@polkadot/rpc-core": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
+    "@polkadot/api": "10.1.3",
+    "@polkadot/api-augment": "10.1.3",
+    "@polkadot/api-base": "10.1.3",
+    "@polkadot/rpc-core": "10.1.3",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "@polkadot/util-crypto": "^11.0.2",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/api": "10.1.3-3-x",
-    "@polkadot/api-augment": "10.1.3-3-x",
-    "@polkadot/rpc-augment": "10.1.3-3-x",
-    "@polkadot/rpc-provider": "10.1.3-3-x",
-    "@polkadot/types-support": "10.1.3-3-x"
+    "@polkadot/api": "10.1.3",
+    "@polkadot/api-augment": "10.1.3",
+    "@polkadot/rpc-augment": "10.1.3",
+    "@polkadot/rpc-provider": "10.1.3",
+    "@polkadot/types-support": "10.1.3"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -20,29 +20,29 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api-augment": "10.1.3-3-x",
-    "@polkadot/api-base": "10.1.3-3-x",
-    "@polkadot/api-derive": "10.1.3-3-x",
+    "@polkadot/api-augment": "10.1.3",
+    "@polkadot/api-base": "10.1.3",
+    "@polkadot/api-derive": "10.1.3",
     "@polkadot/keyring": "^11.0.2",
-    "@polkadot/rpc-augment": "10.1.3-3-x",
-    "@polkadot/rpc-core": "10.1.3-3-x",
-    "@polkadot/rpc-provider": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-augment": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
-    "@polkadot/types-create": "10.1.3-3-x",
-    "@polkadot/types-known": "10.1.3-3-x",
+    "@polkadot/rpc-augment": "10.1.3",
+    "@polkadot/rpc-core": "10.1.3",
+    "@polkadot/rpc-provider": "10.1.3",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-augment": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
+    "@polkadot/types-create": "10.1.3",
+    "@polkadot/types-known": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "@polkadot/util-crypto": "^11.0.2",
     "eventemitter3": "^5.0.0",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "10.1.3-3-x",
-    "@polkadot/types-support": "10.1.3-3-x"
+    "@polkadot/api-augment": "10.1.3",
+    "@polkadot/types-support": "10.1.3"
   }
 }
diff --git a/packages/rpc-augment/package.json b/packages/rpc-augment/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-core": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
+    "@polkadot/rpc-core": "10.1.3",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "tslib": "^2.5.0"
   }
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
@@ -20,18 +20,18 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-augment": "10.1.3-3-x",
-    "@polkadot/rpc-provider": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
+    "@polkadot/rpc-augment": "10.1.3",
+    "@polkadot/rpc-provider": "10.1.3",
+    "@polkadot/types": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
     "@polkadot/keyring": "^11.0.2",
-    "@polkadot/rpc-augment": "10.1.3-3-x"
+    "@polkadot/rpc-augment": "10.1.3"
   }
 }
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
@@ -20,12 +20,12 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
     "@polkadot/keyring": "^11.0.2",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-support": "10.1.3-3-x",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-support": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "@polkadot/util-crypto": "^11.0.2",
     "@polkadot/x-fetch": "^11.0.2",
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
@@ -20,7 +20,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "bin": {
     "polkadot-types-chain-info": "./scripts/polkadot-types-chain-info.mjs",
@@ -30,15 +30,15 @@
     "polkadot-types-internal-metadata": "./scripts/polkadot-types-internal-metadata.mjs"
   },
   "dependencies": {
-    "@polkadot/api": "10.1.3-3-x",
-    "@polkadot/api-augment": "10.1.3-3-x",
-    "@polkadot/rpc-augment": "10.1.3-3-x",
-    "@polkadot/rpc-provider": "10.1.3-3-x",
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-augment": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
-    "@polkadot/types-create": "10.1.3-3-x",
-    "@polkadot/types-support": "10.1.3-3-x",
+    "@polkadot/api": "10.1.3",
+    "@polkadot/api-augment": "10.1.3",
+    "@polkadot/rpc-augment": "10.1.3",
+    "@polkadot/rpc-provider": "10.1.3",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-augment": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
+    "@polkadot/types-create": "10.1.3",
+    "@polkadot/types-support": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "@polkadot/util-crypto": "^11.0.2",
     "@polkadot/x-ws": "^11.0.2",
diff --git a/packages/typegen/src/fromChain.ts b/packages/typegen/src/fromChain.ts
@@ -23,25 +23,26 @@ async function generate (metaHex: HexString, pkg: string | undefined, output: st
 
   if (pkg) {
     try {
-      const defPath = assertFile(path.join(outputPath, 'definitions.ts'));
-      const defCont = await import(defPath) as { module: any };
+      const defCont = await import(
+        assertFile(path.join(outputPath, 'definitions.ts'))
+      ) as Record<string, any>;
 
       extraTypes = {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        [pkg]: defCont.module
+        [pkg]: defCont
       };
     } catch (error) {
       console.error('ERROR: No custom definitions found:', (error as Error).message);
     }
   }
 
   try {
-    const lookPath = assertFile(path.join(outputPath, 'lookup.ts'));
-    const lookCont = await import(lookPath) as { module: { default: DefinitionsTypes } };
+    const lookCont = await import(
+      assertFile(path.join(outputPath, 'lookup.ts'))
+    ) as { default: DefinitionsTypes };
 
     customLookupDefinitions = {
       rpc: {},
-      types: lookCont.module.default
+      types: lookCont.default
     };
   } catch (error) {
     console.error('ERROR: No lookup definitions found:', (error as Error).message);
@@ -113,5 +114,10 @@ async function mainPromise (): Promise<void> {
 }
 
 export function main (): void {
-  mainPromise().catch(() => process.exit(1));
+  mainPromise().catch((error) => {
+    console.error();
+    console.error(error);
+    console.error();
+    process.exit(1);
+  });
 }
diff --git a/packages/typegen/src/fromDefs.ts b/packages/typegen/src/fromDefs.ts
@@ -40,9 +40,11 @@ async function mainPromise (): Promise<void> {
   let userDefs: Record<string, any> = {};
 
   try {
-    userDefs = await import(
+    const defCont = await import(
       assertFile(path.join(inputPath, 'definitions.ts'))
     ) as Record<string, any>;
+
+    userDefs = defCont;
   } catch (error) {
     console.error('ERROR: Unable to load user definitions:', (error as Error).message);
   }
@@ -95,5 +97,10 @@ async function mainPromise (): Promise<void> {
 }
 
 export function main (): void {
-  mainPromise().catch(() => process.exit(1));
+  mainPromise().catch((error) => {
+    console.error();
+    console.error(error);
+    console.error();
+    process.exit(1);
+  });
 }
diff --git a/packages/types-augment/package.json b/packages/types-augment/package.json
@@ -20,11 +20,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-codec": "10.1.3-3-x",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-codec": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "tslib": "^2.5.0"
   }
diff --git a/packages/types-codec/package.json b/packages/types-codec/package.json
@@ -20,17 +20,17 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
     "@polkadot/util": "^11.0.2",
     "@polkadot/x-bigint": "^11.0.2",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/types": "10.1.3-3-x",
-    "@polkadot/types-augment": "10.1.3-3-x",
-    "@polkadot/types-support": "10.1.3-3-x",
+    "@polkadot/types": "10.1.3",
+    "@polkadot/types-augment": "10.1.3",
+    "@polkadot/types-support": "10.1.3",
     "@polkadot/util-crypto": "^11.0.2"
   }
 }
diff --git a/packages/types-create/package.json b/packages/types-create/package.json
@@ -20,14 +20,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.1.3-3-x",
+  "version": "10.1.3",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/types-codec": "10.1.3-3-x",
+    "@polkadot/types-codec": "10.1.3",
     "@polkadot/util": "^11.0.2",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/types": "10.1.3-3-x"
+    "@polkadot/types": "10.1.3"
   }
 }
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
diff --git a/packages/types-support/package.json b/packages/types-support/package.json
diff --git a/packages/types/package.json b/packages/types/package.json
diff --git a/yarn.lock b/yarn.lock
