@dedot/cli 0.0.1-alpha.400 → 0.0.1-alpha.41

package/cjs/commands/chaintypes.d.ts

@@ -3,6 +3,8 @@ type Args = {
     wsUrl?: string;
     output?: string;
     chain?: string;
+    dts?: boolean;
+    subpath?: boolean;
 };
 export declare const chaintypes: CommandModule<Args, Args>;
 export {};

package/cjs/commands/chaintypes.js

@@ -22,30 +22,51 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chaintypes = void 0;
-const path = __importStar(require("path"));
+const static_substrate_1 = require("@polkadot/types-support/metadata/static-substrate");
+const substrate_hex_1 = __importDefault(require("@polkadot/types-support/metadata/v15/substrate-hex"));
+const api_1 = require("@dedot/api");
+const codecs_1 = require("@dedot/codecs");
 const codegen_1 = require("@dedot/codegen");
+const path = __importStar(require("path"));
 exports.chaintypes = {
     command: 'chaintypes',
     describe: 'Generate chain types & APIs for a Substrate-based blockchain',
     handler: async (yargs) => {
-        const { wsUrl, output = '', chain = '' } = yargs;
-        const outputDir = path.resolve(output, './codegen');
-        await (0, codegen_1.generateTypesFromChain)({ chain }, wsUrl, outputDir);
+        const { wsUrl, output = '', chain = '', dts = true, subpath = true } = yargs;
+        const outDir = path.resolve(output);
+        const extension = dts ? 'd.ts' : 'ts';
+        if (wsUrl === 'substrate') {
+            console.log(`- Generating generic chaintypes`);
+            const metadataHex = substrate_hex_1.default;
+            const rpcMethods = static_substrate_1.rpc.methods;
+            const metadata = codecs_1.$Metadata.tryDecode(metadataHex);
+            const runtimeVersion = getRuntimeVersion(metadata);
+            const runtimeApis = runtimeVersion.apis.reduce((acc, [name, version]) => {
+                acc[name] = version;
+                return acc;
+            }, {});
+            await (0, codegen_1.generateTypes)('substrate', metadata.latest, rpcMethods, runtimeApis, outDir, extension, subpath);
+        }
+        else {
+            console.log(`- Generating chaintypes via endpoint ${wsUrl}`);
+            await (0, codegen_1.generateTypesFromEndpoint)(chain, wsUrl, outDir, extension, subpath);
+        }
+        console.log(`- DONE! Output: ${outDir}`);
     },
     builder: (yargs) => {
-        return yargs
+        return (yargs
             .option('wsUrl', {
             type: 'string',
             describe: 'Websocket Url to fetch metadata',
             alias: 'w',
+            default: 'ws://127.0.0.1:9944',
         })
-            .option('file', {
-            type: 'string',
-            describe: 'Path to metadata file',
-            alias: 'f',
-        })
+            // TODO add file input
             .option('output', {
             type: 'string',
             describe: 'Output folder to put generated files',
@@ -55,6 +76,26 @@ exports.chaintypes = {
             type: 'string',
             describe: 'Chain name',
             alias: 'c',
-        }); // TODO check to verify inputs
+        })
+            .option('dts', {
+            type: 'boolean',
+            describe: 'Generate d.ts files',
+            alias: 'd',
+            default: true,
+        })
+            .option('subpath', {
+            type: 'boolean',
+            describe: 'Using subpath for shared packages',
+            alias: 's',
+            default: true,
+        })); // TODO check to verify inputs
     },
 };
+const getRuntimeVersion = (metadata) => {
+    const registry = new codecs_1.PortableRegistry(metadata.latest);
+    const executor = new api_1.ConstantExecutor({
+        registry,
+        metadata,
+    });
+    return executor.execute('system', 'version');
+};

package/cjs/commands/index.d.ts

@@ -1 +1,2 @@
-export * from './chaintypes';
+export * from './chaintypes.js';
+export * from './typink.js';

package/cjs/commands/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./chaintypes"), exports);
+__exportStar(require("./chaintypes.js"), exports);
+__exportStar(require("./typink.js"), exports);

package/cjs/commands/typink.d.ts

@@ -0,0 +1,10 @@
+import { CommandModule } from 'yargs';
+type Args = {
+    contract?: string;
+    output?: string;
+    metadata?: string;
+    dts?: boolean;
+    subpath?: boolean;
+};
+export declare const typink: CommandModule<Args, Args>;
+export {};

package/cjs/commands/typink.js

@@ -0,0 +1,76 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typink = void 0;
+const codegen_1 = require("@dedot/codegen");
+const utils_1 = require("@dedot/utils");
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("path"));
+exports.typink = {
+    command: 'typink',
+    describe: 'Generate types & APIs for a ink! smart contracts',
+    handler: async (yargs) => {
+        const { contract, output = '', metadata, dts = true, subpath = true } = yargs;
+        (0, utils_1.assert)(metadata, 'Metadata file is required, -h or --help to known more about the command');
+        const outDir = path.resolve(output);
+        const metadataFile = path.resolve(metadata);
+        const extension = dts ? 'd.ts' : 'ts';
+        const rawMetadata = fs.readFileSync(metadataFile, 'utf-8');
+        console.log(`- Generating contract types via metadata ${metadata}`);
+        await (0, codegen_1.generateContractTypes)(rawMetadata, contract, outDir, extension, subpath);
+        console.log(`- DONE! Output: ${outDir}`);
+    },
+    builder: (yargs) => {
+        return yargs
+            .option('metadata', {
+            type: 'string',
+            describe: 'Path to contract metadata file (.json, .contract)',
+            alias: 'm',
+            demandOption: true,
+        })
+            .option('output', {
+            type: 'string',
+            describe: 'Output folder to put generated files',
+            alias: 'o',
+        })
+            .option('contract', {
+            type: 'string',
+            describe: 'Contract name',
+            alias: 'c',
+        })
+            .option('dts', {
+            type: 'boolean',
+            describe: 'Generate d.ts files',
+            alias: 'd',
+            default: true,
+        })
+            .option('subpath', {
+            type: 'boolean',
+            describe: 'Using subpath for shared packages',
+            alias: 's',
+            default: true,
+        });
+    },
+};

package/cjs/dedot.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dedot = void 0;
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
-const commands_1 = require("./commands");
+const index_js_1 = require("./commands/index.js");
 const dedot = () => {
     (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
         .scriptName('dedot')
         .showHelpOnFail(true)
-        .command(commands_1.chaintypes)
+        .command(index_js_1.chaintypes)
+        .command(index_js_1.typink)
         .help('help', 'Show help instructions')
         .alias('h', 'help')
         .alias('v', 'version')

package/cjs/index.d.ts

@@ -1,2 +1,2 @@
-import { dedot } from './dedot';
+import { dedot } from './dedot.js';
 export { dedot };

package/cjs/index.js

@@ -1,5 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dedot = void 0;
-const dedot_1 = require("./dedot");
-Object.defineProperty(exports, "dedot", { enumerable: true, get: function () { return dedot_1.dedot; } });
+const dedot_js_1 = require("./dedot.js");
+Object.defineProperty(exports, "dedot", { enumerable: true, get: function () { return dedot_js_1.dedot; } });
+// We run this directly for development purpose via ts-node
+// @ts-ignore
+if (process[Symbol.for('ts-node.register.instance')]) {
+    (0, dedot_js_1.dedot)();
+}

package/package.json

@@ -1,19 +1,29 @@
 {
   "name": "@dedot/cli",
-  "version": "0.0.1-alpha.400+a951731",
+  "version": "0.0.1-alpha.41",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
+  "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/cli",
+  "repository": {
+    "directory": "packages/cli",
+    "type": "git",
+    "url": "https://github.com/dedotdev/dedot.git"
+  },
   "bin": {
     "dedot": "./bin/dedot",
     "djs": "./bin/dedot"
   },
   "main": "./cjs/index.js",
+  "sideEffects": false,
   "scripts": {
     "build": "tsc --project tsconfig.build.cjs.json && cp -R ./bin ./dist",
     "clean": "rm -rf ./dist && rm -rf ./tsconfig.tsbuildinfo ./tsconfig.build.cjs.tsbuildinfo && rm -rf ./src/codegen",
-    "test": "vitest --watch=false"
+    "start": "ts-node src/index.ts"
   },
   "dependencies": {
-    "@dedot/codegen": "0.0.1-alpha.8+a951731",
+    "@dedot/api": "0.0.1-alpha.41",
+    "@dedot/codecs": "0.0.1-alpha.41",
+    "@dedot/codegen": "0.0.1-alpha.41",
+    "@polkadot/types-support": "^12.2.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -24,5 +34,5 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "a951731c63fd9a09b3e9e90cb424ec152fb3abdd"
+  "gitHead": "4c699c73281cf4525be2d8e31c416f4dd7dc2fdd"
 }

package/cjs/packageInfo.d.ts

@@ -1,4 +0,0 @@
-export declare const packageInfo: {
-    name: string;
-    version: string;
-};

package/cjs/packageInfo.js

@@ -1,5 +0,0 @@
-"use strict";
-// THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageInfo = void 0;
-exports.packageInfo = { name: '@dedot/cli', version: '0.0.1-alpha.24' };