@dedot/codegen 0.0.1-alpha.23 → 0.0.1-alpha.25

package/cjs/generator/RuntimeApisGen.js

@@ -30,18 +30,20 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             });
         }
         else {
-            const specsByModule = this.#runtimeApisSpecsByModule();
-            Object.values(specsByModule).forEach((specs) => {
-                specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
-                    runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                    runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
+            const specs = this.#targetRuntimeApiSpecs();
+            specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
+                runtimeCallsOut += (0, utils_1.commentBlock)(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
+                runtimeCallsOut += `${(0, util_1.stringCamelCase)(runtimeApiName)}: {
             ${Object.keys(methods)
-                        .map((methodName) => this.#generateMethodDefFromSpec({ ...methods[methodName], runtimeApiName, methodName }))
-                        .join('\n')} 
+                    .map((methodName) => this.#generateMethodDefFromSpec({
+                    ...methods[methodName],
+                    runtimeApiName,
+                    methodName,
+                }))
+                    .join('\n')} 
               
             ${(0, utils_1.commentBlock)('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
           }`;
-                });
             });
         }
         const importTypes = this.typesGen.typeImports.toImports();
@@ -92,7 +94,7 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             .join(', ');
         return `${(0, utils_1.commentBlock)(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${(0, util_1.stringCamelCase)(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
-    #runtimeApisSpecsByModule() {
+    #targetRuntimeApiSpecs() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
             const runtimeApiSpec = (0, specs_1.findRuntimeApiSpec)(runtimeApiHash, version);
             if (!runtimeApiSpec)
@@ -106,15 +108,8 @@ class RuntimeApisGen extends RpcGen_1.RpcGen {
             if (!spec) {
                 return o;
             }
-            const { moduleName } = spec;
-            if (!moduleName) {
-                return o;
-            }
-            return {
-                ...o,
-                [moduleName]: o[moduleName] ? [...o[moduleName], spec] : [spec],
-            };
-        }, {});
+            return [...o, spec];
+        }, []);
     }
 }
 exports.RuntimeApisGen = RuntimeApisGen;

package/cjs/generator/dirname.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.currentDirname = () => {
+    return __dirname;
+};

package/cjs/generator/utils.js

@@ -26,12 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.resolveFilePath = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
+exports.isReservedWord = exports.compileTemplate = exports.beautifySourceCode = exports.commentBlock = exports.TUPLE_TYPE_REGEX = exports.WRAPPER_TYPE_REGEX = void 0;
 const fs = __importStar(require("fs"));
 const handlebars_1 = __importDefault(require("handlebars"));
 const path = __importStar(require("path"));
-const process = __importStar(require("process"));
 const prettier = __importStar(require("prettier"));
+const dirname_1 = require("./dirname");
 exports.WRAPPER_TYPE_REGEX = /^(\w+)<(.*)>$/;
 exports.TUPLE_TYPE_REGEX = /^\[(.*)]$/;
 const commentBlock = (...docs) => {
@@ -48,18 +48,13 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
     }
 };
 exports.commentBlock = commentBlock;
-const resolveFilePath = (relativePath) => {
-    relativePath = Array.isArray(relativePath) ? relativePath : [relativePath];
-    return path.resolve(process.cwd(), ...relativePath);
-};
-exports.resolveFilePath = resolveFilePath;
 const beautifySourceCode = async (source) => {
-    const prettierOptions = await prettier.resolveConfig((0, exports.resolveFilePath)('./.prettierrc.js'));
+    const prettierOptions = await prettier.resolveConfig(path.resolve((0, dirname_1.currentDirname)(), '../../../../.prettierrc.js'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 exports.beautifySourceCode = beautifySourceCode;
 const compileTemplate = (templateFileName) => {
-    const templateFilePath = (0, exports.resolveFilePath)(`packages/codegen/src/templates/${templateFileName}`);
+    const templateFilePath = path.resolve((0, dirname_1.currentDirname)(), `../templates/${templateFileName}`);
     return handlebars_1.default.compile(fs.readFileSync(templateFilePath, 'utf8'));
 };
 exports.compileTemplate = compileTemplate;

package/cjs/index.js

@@ -27,29 +27,32 @@ exports.generateTypes = exports.generateTypesFromChain = void 0;
 const dedot_1 = require("dedot");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const process = __importStar(require("process"));
 const generator_1 = require("./generator");
+const util_1 = require("@polkadot/util");
 async function generateTypesFromChain(network, endpoint, outDir) {
     const api = await dedot_1.Dedot.create(endpoint);
     const { methods } = await api.rpc.rpc.methods();
     const apis = api.runtimeVersion?.apis || [];
+    if (!network.chain) {
+        network.chain = (0, util_1.stringCamelCase)(api.runtimeVersion?.specName || api.runtimeChain || 'local');
+    }
     await generateTypes(network, api.metadataLatest, methods, apis, outDir);
     await api.disconnect();
 }
 exports.generateTypesFromChain = generateTypesFromChain;
 async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir = '.') {
-    const dirPath = path.resolve(process.cwd(), outDir, network.chain);
-    const defTypesFileName = path.join(dirPath, `types.ts`);
-    const constsTypesFileName = path.join(dirPath, `consts.ts`);
-    const queryTypesFileName = path.join(dirPath, `query.ts`);
-    const rpcCallsFileName = path.join(dirPath, `rpc.ts`);
-    const indexFileName = path.join(dirPath, `index.ts`);
-    const errorsFileName = path.join(dirPath, `errors.ts`);
-    const eventsFileName = path.join(dirPath, `events.ts`);
-    const runtimeApisFileName = path.join(dirPath, `runtime.ts`);
-    const txFileName = path.join(dirPath, `tx.ts`);
+    const dirPath = path.resolve(outDir, network.chain);
+    const defTypesFileName = path.join(dirPath, `types.d.ts`);
+    const constsTypesFileName = path.join(dirPath, `consts.d.ts`);
+    const queryTypesFileName = path.join(dirPath, `query.d.ts`);
+    const rpcCallsFileName = path.join(dirPath, `rpc.d.ts`);
+    const indexFileName = path.join(dirPath, `index.d.ts`);
+    const errorsFileName = path.join(dirPath, `errors.d.ts`);
+    const eventsFileName = path.join(dirPath, `events.d.ts`);
+    const runtimeApisFileName = path.join(dirPath, `runtime.d.ts`);
+    const txFileName = path.join(dirPath, `tx.d.ts`);
     if (!fs.existsSync(dirPath)) {
-        fs.mkdirSync(dirPath);
+        fs.mkdirSync(dirPath, { recursive: true });
     }
     const typesGen = new generator_1.TypesGen(metadata);
     const constsGen = new generator_1.ConstsGen(typesGen);

package/cjs/packageInfo.js

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

package/cjs/templates/consts.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainConsts extends GenericChainConsts {
+  {{{ defTypeOut }}}
+}

package/cjs/templates/errors.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainErrors extends GenericChainErrors {
+  {{{ defTypeOut }}}
+}

package/cjs/templates/events.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainEvents extends GenericChainEvents {
+  {{{ defTypeOut }}}
+}

package/cjs/templates/index.hbs

@@ -0,0 +1,22 @@
+// Generated by @dedot/codegen
+
+import { GenericSubstrateApi } from '@dedot/types';
+import { ChainConsts } from './consts';
+import { ChainStorage } from './query';
+import { RpcCalls } from './rpc';
+import { ChainErrors } from './errors';
+import { ChainEvents } from './events';
+import { RuntimeApis } from './runtime';
+import { ChainTx } from './tx';
+
+export * from './types';
+
+export interface {{{interfaceName}}}Api extends GenericSubstrateApi {
+  rpc: RpcCalls;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  tx: ChainTx;
+}

package/cjs/templates/query.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainStorage extends GenericChainStorage {
+  {{{ defTypeOut }}}
+}

package/cjs/templates/rpc.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface RpcCalls extends GenericRpcCalls {
+  {{{rpcCallsOut}}}
+}

package/cjs/templates/runtime.hbs

@@ -0,0 +1,8 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface RuntimeApis extends GenericRuntimeApis {
+{{{ runtimeCallsOut }}}
+}
+

package/cjs/templates/tx.hbs

@@ -0,0 +1,9 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+{{{ defTypes }}}
+
+export interface ChainTx extends GenericChainTx<TxCall> {
+  {{{ txDefsOut }}}
+}

package/cjs/templates/types.hbs

@@ -0,0 +1,5 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+{{{ defTypeOut }}}

package/generator/RuntimeApisGen.js

@@ -27,18 +27,20 @@ export class RuntimeApisGen extends RpcGen {
             });
         }
         else {
-            const specsByModule = this.#runtimeApisSpecsByModule();
-            Object.values(specsByModule).forEach((specs) => {
-                specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
-                    runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
-                    runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
+            const specs = this.#targetRuntimeApiSpecs();
+            specs.forEach(({ methods, runtimeApiName, runtimeApiHash, version }) => {
+                runtimeCallsOut += commentBlock(`@runtimeapi: ${runtimeApiName} - ${runtimeApiHash}`, `@version: ${version}`);
+                runtimeCallsOut += `${stringCamelCase(runtimeApiName)}: {
             ${Object.keys(methods)
-                        .map((methodName) => this.#generateMethodDefFromSpec({ ...methods[methodName], runtimeApiName, methodName }))
-                        .join('\n')} 
+                    .map((methodName) => this.#generateMethodDefFromSpec({
+                    ...methods[methodName],
+                    runtimeApiName,
+                    methodName,
+                }))
+                    .join('\n')} 
               
             ${commentBlock('Generic runtime api call')}[method: string]: GenericRuntimeApiMethod
           }`;
-                });
             });
         }
         const importTypes = this.typesGen.typeImports.toImports();
@@ -89,7 +91,7 @@ export class RuntimeApisGen extends RpcGen {
             .join(', ');
         return `${commentBlock(docs, '\n', defaultDocs, typedInputs.map(({ type, name }) => `@param {${type}} ${name}`))}${stringCamelCase(methodName)}: GenericRuntimeApiMethod<(${paramsOut}) => Promise<${typeOut}>>`;
     }
-    #runtimeApisSpecsByModule() {
+    #targetRuntimeApiSpecs() {
         const specs = this.runtimeApis.map(([runtimeApiHash, version]) => {
             const runtimeApiSpec = findRuntimeApiSpec(runtimeApiHash, version);
             if (!runtimeApiSpec)
@@ -103,14 +105,7 @@ export class RuntimeApisGen extends RpcGen {
             if (!spec) {
                 return o;
             }
-            const { moduleName } = spec;
-            if (!moduleName) {
-                return o;
-            }
-            return {
-                ...o,
-                [moduleName]: o[moduleName] ? [...o[moduleName], spec] : [spec],
-            };
-        }, {});
+            return [...o, spec];
+        }, []);
     }
 }

package/generator/dirname.d.ts

@@ -0,0 +1 @@
+export function currentDirname(): string;

package/generator/dirname.js

@@ -0,0 +1,6 @@
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+export const currentDirname = () => {
+    const __filename = fileURLToPath(import.meta.url);
+    return dirname(__filename);
+};

package/generator/utils.d.ts

@@ -1,7 +1,6 @@
 export declare const WRAPPER_TYPE_REGEX: RegExp;
 export declare const TUPLE_TYPE_REGEX: RegExp;
 export declare const commentBlock: (...docs: (string | string[])[]) => string;
-export declare const resolveFilePath: (relativePath: string | string[]) => string;
 export declare const beautifySourceCode: (source: string) => Promise<string>;
 export declare const compileTemplate: (templateFileName: string) => HandlebarsTemplateDelegate<any>;
 /**

package/generator/utils.js

@@ -1,8 +1,8 @@
 import * as fs from 'fs';
 import handlebars from 'handlebars';
 import * as path from 'path';
-import * as process from 'process';
 import * as prettier from 'prettier';
+import { currentDirname } from './dirname';
 export const WRAPPER_TYPE_REGEX = /^(\w+)<(.*)>$/;
 export const TUPLE_TYPE_REGEX = /^\[(.*)]$/;
 export const commentBlock = (...docs) => {
@@ -18,16 +18,12 @@ ${flatLines.map((line) => `* ${line.replaceAll(/\s+/g, ' ').trim()}`).join('\n')
       `;
     }
 };
-export const resolveFilePath = (relativePath) => {
-    relativePath = Array.isArray(relativePath) ? relativePath : [relativePath];
-    return path.resolve(process.cwd(), ...relativePath);
-};
 export const beautifySourceCode = async (source) => {
-    const prettierOptions = await prettier.resolveConfig(resolveFilePath('./.prettierrc.js'));
+    const prettierOptions = await prettier.resolveConfig(path.resolve(currentDirname(), '../../../../.prettierrc.js'));
     return prettier.format(source, { parser: 'babel-ts', ...prettierOptions });
 };
 export const compileTemplate = (templateFileName) => {
-    const templateFilePath = resolveFilePath(`packages/codegen/src/templates/${templateFileName}`);
+    const templateFilePath = path.resolve(currentDirname(), `../templates/${templateFileName}`);
     return handlebars.compile(fs.readFileSync(templateFilePath, 'utf8'));
 };
 // TODO add more reserved words

package/index.js

@@ -1,28 +1,31 @@
 import { Dedot } from 'dedot';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as process from 'process';
-import { ConstsGen, ErrorsGen, EventsGen, IndexGen, QueryGen, RpcGen, TypesGen, RuntimeApisGen, TxGen, } from './generator';
+import { ConstsGen, ErrorsGen, EventsGen, IndexGen, QueryGen, RpcGen, RuntimeApisGen, TxGen, TypesGen, } from './generator';
+import { stringCamelCase } from '@polkadot/util';
 export async function generateTypesFromChain(network, endpoint, outDir) {
     const api = await Dedot.create(endpoint);
     const { methods } = await api.rpc.rpc.methods();
     const apis = api.runtimeVersion?.apis || [];
+    if (!network.chain) {
+        network.chain = stringCamelCase(api.runtimeVersion?.specName || api.runtimeChain || 'local');
+    }
     await generateTypes(network, api.metadataLatest, methods, apis, outDir);
     await api.disconnect();
 }
 export async function generateTypes(network, metadata, rpcMethods, runtimeApis, outDir = '.') {
-    const dirPath = path.resolve(process.cwd(), outDir, network.chain);
-    const defTypesFileName = path.join(dirPath, `types.ts`);
-    const constsTypesFileName = path.join(dirPath, `consts.ts`);
-    const queryTypesFileName = path.join(dirPath, `query.ts`);
-    const rpcCallsFileName = path.join(dirPath, `rpc.ts`);
-    const indexFileName = path.join(dirPath, `index.ts`);
-    const errorsFileName = path.join(dirPath, `errors.ts`);
-    const eventsFileName = path.join(dirPath, `events.ts`);
-    const runtimeApisFileName = path.join(dirPath, `runtime.ts`);
-    const txFileName = path.join(dirPath, `tx.ts`);
+    const dirPath = path.resolve(outDir, network.chain);
+    const defTypesFileName = path.join(dirPath, `types.d.ts`);
+    const constsTypesFileName = path.join(dirPath, `consts.d.ts`);
+    const queryTypesFileName = path.join(dirPath, `query.d.ts`);
+    const rpcCallsFileName = path.join(dirPath, `rpc.d.ts`);
+    const indexFileName = path.join(dirPath, `index.d.ts`);
+    const errorsFileName = path.join(dirPath, `errors.d.ts`);
+    const eventsFileName = path.join(dirPath, `events.d.ts`);
+    const runtimeApisFileName = path.join(dirPath, `runtime.d.ts`);
+    const txFileName = path.join(dirPath, `tx.d.ts`);
     if (!fs.existsSync(dirPath)) {
-        fs.mkdirSync(dirPath);
+        fs.mkdirSync(dirPath, { recursive: true });
     }
     const typesGen = new TypesGen(metadata);
     const constsGen = new ConstsGen(typesGen);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/codegen",
-  "version": "0.0.1-alpha.23",
+  "version": "0.0.1-alpha.25",
   "description": "Generate types",
   "author": "Thang X. Vu <thang@coongcrafts.io>",
   "homepage": "https://github.com/dedotdev/dedot/tree/main/packages/codegen",
@@ -12,16 +12,17 @@
   "main": "./cjs/index.js",
   "type": "module",
   "scripts": {
-    "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
-    "clean": "rm -rf ./dist && rm -rf ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo"
+    "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json && yarn copy",
+    "clean": "rm -rf ./dist && rm -rf ./tsconfig.tsbuildinfo ./tsconfig.build.tsbuildinfo",
+    "copy": "cp -R ./src/templates ./dist && cp -R ./src/templates ./dist/cjs"
   },
   "dependencies": {
-    "@dedot/codecs": "0.0.1-alpha.23",
-    "@dedot/shape": "0.0.1-alpha.23",
-    "@dedot/specs": "0.0.1-alpha.23",
-    "@dedot/utils": "0.0.1-alpha.23",
+    "@dedot/codecs": "0.0.1-alpha.25",
+    "@dedot/shape": "0.0.1-alpha.25",
+    "@dedot/specs": "0.0.1-alpha.25",
+    "@dedot/utils": "0.0.1-alpha.25",
     "@polkadot/util": "^12.6.2",
-    "dedot": "0.0.1-alpha.23",
+    "dedot": "0.0.1-alpha.25",
     "handlebars": "^4.7.8",
     "prettier": "^3.0.3"
   },
@@ -30,7 +31,7 @@
     "directory": "dist"
   },
   "license": "Apache-2.0",
-  "gitHead": "d0aaaf353a6596d5dcd9277b241799bd544a2bd2",
+  "gitHead": "44b180e85a3126e45dcf408fcb3d32adc4bedeca",
   "module": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/packageInfo.js

@@ -1,3 +1,3 @@
 // THIS FILE IS AUTO-GENERATED, DO NOT EDIT!
 
-export const packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.23' };
+export const packageInfo = { name: '@dedot/codegen', version: '0.0.1-alpha.25' };

package/templates/consts.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainConsts extends GenericChainConsts {
+  {{{ defTypeOut }}}
+}

package/templates/errors.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainErrors extends GenericChainErrors {
+  {{{ defTypeOut }}}
+}

package/templates/events.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainEvents extends GenericChainEvents {
+  {{{ defTypeOut }}}
+}

package/templates/index.hbs

@@ -0,0 +1,22 @@
+// Generated by @dedot/codegen
+
+import { GenericSubstrateApi } from '@dedot/types';
+import { ChainConsts } from './consts';
+import { ChainStorage } from './query';
+import { RpcCalls } from './rpc';
+import { ChainErrors } from './errors';
+import { ChainEvents } from './events';
+import { RuntimeApis } from './runtime';
+import { ChainTx } from './tx';
+
+export * from './types';
+
+export interface {{{interfaceName}}}Api extends GenericSubstrateApi {
+  rpc: RpcCalls;
+  consts: ChainConsts;
+  query: ChainStorage;
+  errors: ChainErrors;
+  events: ChainEvents;
+  call: RuntimeApis;
+  tx: ChainTx;
+}

package/templates/query.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface ChainStorage extends GenericChainStorage {
+  {{{ defTypeOut }}}
+}

package/templates/rpc.hbs

@@ -0,0 +1,7 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface RpcCalls extends GenericRpcCalls {
+  {{{rpcCallsOut}}}
+}

package/templates/runtime.hbs

@@ -0,0 +1,8 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+export interface RuntimeApis extends GenericRuntimeApis {
+{{{ runtimeCallsOut }}}
+}
+

package/templates/tx.hbs

@@ -0,0 +1,9 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+{{{ defTypes }}}
+
+export interface ChainTx extends GenericChainTx<TxCall> {
+  {{{ txDefsOut }}}
+}

package/templates/types.hbs

@@ -0,0 +1,5 @@
+// Generated by @dedot/codegen
+
+{{{ importTypes }}}
+
+{{{ defTypeOut }}}