@dedot/cli 0.17.0 → 0.17.1-next.6d398d60.0

package/commands/typink.js

@@ -1,6 +1,6 @@
-import { generateContractTypes } from '@dedot/codegen';
-import { ensureSupportedContractMetadataVersion } from '@dedot/contracts';
-import { assert } from '@dedot/utils';
+import { generateContractTypes, generateSolContractTypes } from '@dedot/codegen';
+import { ensureSupportedContractMetadataVersion, isInkAbi, isSolAbi } from '@dedot/contracts';
+import { assert, DedotError } from '@dedot/utils';
 import * as fs from 'node:fs';
 import ora from 'ora';
 import * as path from 'path';
@@ -17,13 +17,32 @@ export const typink = {
         try {
             spinner.text = `Parsing contract metadata file: ${metadata}`;
             const contractMetadata = JSON.parse(fs.readFileSync(metadataFile, 'utf-8'));
-            ensureSupportedContractMetadataVersion(contractMetadata);
+            const isInkContract = isInkAbi(contractMetadata);
+            const isSolidityContract = isSolAbi(contractMetadata);
+            if (isInkContract) {
+                ensureSupportedContractMetadataVersion(contractMetadata);
+                spinner.info(`Detected ink! contract metadata version: ${contractMetadata.version}`);
+            }
+            else if (isSolidityContract) {
+                spinner.info(`Detected Solidity ABI metadata`);
+            }
+            else {
+                throw new DedotError('Unknown metadata format (neither ink! nor Solidity ABI)');
+            }
             spinner.succeed(`Parsed contract metadata file: ${metadata}`);
             spinner.text = 'Generating contract Types & APIs';
-            const { interfaceName, outputFolder } = await generateContractTypes(contractMetadata, contract, outDir, extension, subpath);
+            let result;
+            if (isInkContract) {
+                result = await generateContractTypes(contractMetadata, contract, outDir, extension, subpath);
+            }
+            else {
+                // For Solidity contract, we use the file name (without extension) as the contract name if not provided
+                const contractName = contract || path.basename(metadataFile).split('.')[0];
+                result = await generateSolContractTypes(contractMetadata, contractName, outDir, extension, subpath);
+            }
             spinner.succeed('Generated contract Types & APIs');
-            console.log(`  ➡ Output directory: file://${outputFolder}`);
-            console.log(`  ➡ ContractApi interface: ${interfaceName}`);
+            console.log(`  ➡ Output directory: file://${result.outputFolder}`);
+            console.log(`  ➡ ContractApi interface: ${result.interfaceName}`);
             console.log('🌈 Done!');
             spinner.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/cli",
-  "version": "0.17.0",
+  "version": "0.17.1-next.6d398d60.0+6d398d60",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
   "repository": {
@@ -22,9 +22,9 @@
     "test": "npx vitest --watch=false"
   },
   "dependencies": {
-    "@dedot/api": "0.17.0",
-    "@dedot/codecs": "0.17.0",
-    "@dedot/codegen": "0.17.0",
+    "@dedot/api": "0.17.1-next.6d398d60.0+6d398d60",
+    "@dedot/codecs": "0.17.1-next.6d398d60.0+6d398d60",
+    "@dedot/codegen": "0.17.1-next.6d398d60.0+6d398d60",
     "@polkadot-api/wasm-executor": "^0.1.2",
     "@polkadot/types-support": "^16.4.6",
     "ora": "^8.2.0",
@@ -41,7 +41,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "77e751248ad7bca0cb374e17e65afef791fb3e4d",
+  "gitHead": "6d398d6002387fa7e78ca6df194e5f30595a6be8",
   "module": "./index.js",
   "types": "./index.d.ts"
 }