wasm-ast-types 0.24.0 → 0.26.0

package/main/utils/types.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,78 +10,55 @@ exports.getPropertySignatureFromProp = getPropertySignatureFromProp;
 exports.getPropertyType = void 0;
 exports.getResponseType = getResponseType;
 exports.getTypeInfo = exports.getTypeFromRef = exports.getType = void 0;
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var t = _interopRequireWildcard(require("@babel/types"));
-
 var _case = require("case");
-
 var _babel = require("./babel");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function getResponseType(context, underscoreName) {
   var _context$contract$res, _context$contract, _context$contract$res2, _context$contract$res3;
-
   var methodName = (0, _case.camel)(underscoreName);
   return (0, _case.pascal)((_context$contract$res = (_context$contract = context.contract) === null || _context$contract === void 0 ? void 0 : (_context$contract$res2 = _context$contract.responses) === null || _context$contract$res2 === void 0 ? void 0 : (_context$contract$res3 = _context$contract$res2[underscoreName]) === null || _context$contract$res3 === void 0 ? void 0 : _context$contract$res3.title) !== null && _context$contract$res !== void 0 ? _context$contract$res : // after v1.1 is adopted, we can deprecate this and require the above response
   "".concat(methodName, "Response"));
 }
-
 ;
-
 var getTypeStrFromRef = function getTypeStrFromRef($ref) {
   if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
     return $ref.replace('#/definitions/', '');
   }
-
   throw new Error('what is $ref: ' + $ref);
 };
-
 var getTypeFromRef = function getTypeFromRef($ref) {
   return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)));
 };
-
 exports.getTypeFromRef = getTypeFromRef;
-
 var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
   return t.tsArrayType(getTypeFromRef($ref));
 };
-
 var getTypeOrRef = function getTypeOrRef(obj) {
   if (obj.type) {
     return getType(obj.type);
   }
-
   if (obj.$ref) {
     return getTypeFromRef(obj.$ref);
   }
-
   throw new Error('contact maintainers cannot find type for ' + obj);
 };
-
 var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
     var _items$;
-
     if (((_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.type) === 'array') {
       return getArrayTypeFromItems(items[0]);
     }
-
     return t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])));
-  } // passing in {"items": [{"type":"string"}]}
-
+  }
 
+  // passing in {"items": [{"type":"string"}]}
   var detect = detectType(items.type);
-
   if (detect.type === 'array') {
     if (Array.isArray(items.items)) {
       return t.tsArrayType(t.tsArrayType(getTypeOrRef(items.items[0])));
@@ -91,59 +66,46 @@ var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
       return t.tsArrayType(getArrayTypeFromItems(items.items));
     }
   }
-
   return t.tsArrayType(getType(detect.type));
 };
-
 var detectType = function detectType(type) {
   var optional = false;
   var theType = '';
-
   if (Array.isArray(type)) {
     if (type.length !== 2) {
       throw new Error('[getType(array length)] case not handled by transpiler. contact maintainers.');
     }
-
     var _type = (0, _slicedToArray2["default"])(type, 2),
-        nullableType = _type[0],
-        nullType = _type[1];
-
+      nullableType = _type[0],
+      nullType = _type[1];
     if (nullType !== 'null') {
       throw new Error('[getType(null)] case not handled by transpiler. contact maintainers.');
     }
-
     theType = nullableType;
     optional = true;
   } else {
     theType = type;
   }
-
   return {
     type: theType,
     optional: optional
   };
 };
-
 exports.detectType = detectType;
-
 var getTypeInfo = function getTypeInfo(info) {
   var type = undefined;
   var optional = undefined;
-
   if (Array.isArray(info.anyOf)) {
     // assuming 2nd is null, but let's check to ensure
     if (info.anyOf.length !== 2) {
       throw new Error('case not handled by transpiler. contact maintainers.');
     }
-
     var _info$anyOf = (0, _slicedToArray2["default"])(info.anyOf, 2),
-        nullableType = _info$anyOf[0],
-        nullType = _info$anyOf[1];
-
+      nullableType = _info$anyOf[0],
+      nullType = _info$anyOf[1];
     if ((nullType === null || nullType === void 0 ? void 0 : nullType.type) !== 'null') {
       throw new Error('[nullableType.type]: case not handled by transpiler. contact maintainers.');
     }
-
     if (!(nullableType !== null && nullableType !== void 0 && nullableType.$ref)) {
       if (nullableType.title) {
         type = t.tsTypeReference(t.identifier(nullableType.title));
@@ -153,10 +115,8 @@ var getTypeInfo = function getTypeInfo(info) {
     } else {
       type = getTypeFromRef(nullableType === null || nullableType === void 0 ? void 0 : nullableType.$ref);
     }
-
     optional = true;
   }
-
   if (typeof info.type === 'string') {
     if (info.type === 'array') {
       if ((0, _typeof2["default"])(info.items) === 'object' && !Array.isArray(info.items)) {
@@ -171,7 +131,8 @@ var getTypeInfo = function getTypeInfo(info) {
         }
       } else {
         if (Array.isArray(info.items)) {
-          type = getArrayTypeFromItems(info.items); // console.log(typeof info.items === 'object');
+          type = getArrayTypeFromItems(info.items);
+          // console.log(typeof info.items === 'object');
           // console.log(Array.isArray(info.items));
           // console.log(info);
         } else {
@@ -184,35 +145,30 @@ var getTypeInfo = function getTypeInfo(info) {
       optional = detect.optional;
     }
   }
-
   if (Array.isArray(info.type)) {
     // assuming 2nd is null, but let's check to ensure
     if (info.type.length !== 2) {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
-
     var _info$type = (0, _slicedToArray2["default"])(info.type, 2),
-        _nullableType = _info$type[0],
-        _nullType = _info$type[1];
-
+      _nullableType = _info$type[0],
+      _nullType = _info$type[1];
     if (_nullType !== 'null') {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
-
     if (_nullableType === 'array' && (0, _typeof2["default"])(info.items) === 'object' && !Array.isArray(info.items)) {
       if (info.items.type) {
         var _detect = detectType(info.items.type);
-
         if (_detect.type === 'array') {
           // wen recursion?
           type = t.tsArrayType(getArrayTypeFromItems(info.items));
         } else {
           type = t.tsArrayType(getType(_detect.type));
         }
-
         optional = _detect.optional;
       } else if (info.items.$ref) {
-        type = getArrayTypeFromRef(info.items.$ref); // } else if (info.items.title) {
+        type = getArrayTypeFromRef(info.items.$ref);
+        // } else if (info.items.title) {
         //   type = t.tsArrayType(
         //     t.tsTypeReference(
         //       t.identifier(info.items.title)
@@ -225,87 +181,65 @@ var getTypeInfo = function getTypeInfo(info) {
       }
     } else {
       var _detect2 = detectType(_nullableType);
-
       optional = _detect2.optional;
-
       if (_detect2.type === 'array') {
         type = getArrayTypeFromItems(info.items);
       } else {
         type = getType(_detect2.type);
       }
     }
-
     optional = true;
   }
-
   return {
     type: type,
     optional: optional
   };
 };
-
 exports.getTypeInfo = getTypeInfo;
-
 var getType = function getType(type) {
   switch (type) {
     case 'string':
       return t.tsStringKeyword();
-
     case 'boolean':
       return t.tSBooleanKeyword();
-
     case 'integer':
       return t.tsNumberKeyword();
-
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
   }
 };
-
 exports.getType = getType;
-
 var getPropertyType = function getPropertyType(context, schema, prop) {
   var _schema$properties, _schema$required, _schema$required2;
-
   var props = (_schema$properties = schema.properties) !== null && _schema$properties !== void 0 ? _schema$properties : {};
   var info = props[prop];
   var type = null;
   var optional = !((_schema$required = schema.required) !== null && _schema$required !== void 0 && _schema$required.includes(prop));
-
   if (info.allOf && info.allOf.length === 1) {
     info = info.allOf[0];
   }
-
   if (typeof info.$ref === 'string') {
     type = getTypeFromRef(info.$ref);
   }
-
   var typeInfo = getTypeInfo(info);
-
   if (typeof typeInfo.optional !== 'undefined') {
     optional = typeInfo.optional;
   }
-
   if (typeof typeInfo.type !== 'undefined') {
     type = typeInfo.type;
   }
-
   if (!type) {
     throw new Error('cannot find type for ' + JSON.stringify(info));
   }
-
   if ((_schema$required2 = schema.required) !== null && _schema$required2 !== void 0 && _schema$required2.includes(prop)) {
     optional = false;
   }
-
   return {
     type: type,
     optional: optional
   };
 };
-
 exports.getPropertyType = getPropertyType;
-
 function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
   if (jsonschema.properties[prop].type === 'object') {
     if (jsonschema.properties[prop].title) {
@@ -314,19 +248,16 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
       throw new Error('getPropertySignatureFromProp() contact maintainer');
     }
   }
-
   if (Array.isArray(jsonschema.properties[prop].allOf)) {
     var _jsonschema$required;
-
     var isOptional = !((_jsonschema$required = jsonschema.required) !== null && _jsonschema$required !== void 0 && _jsonschema$required.includes(prop));
     var unionTypes = jsonschema.properties[prop].allOf.map(function (el) {
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    }); // @ts-ignore:next-line
-
+    });
+    // @ts-ignore:next-line
     var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
-
     if (uniqUnionTypes.length === 1) {
       return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
     } else {
@@ -336,18 +267,14 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
     }
   } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
     var _jsonschema$required2;
-
     var _isOptional = !((_jsonschema$required2 = jsonschema.required) !== null && _jsonschema$required2 !== void 0 && _jsonschema$required2.includes(prop));
-
     var _unionTypes = jsonschema.properties[prop].oneOf.map(function (el) {
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    }); // @ts-ignore:next-line
-
-
+    });
+    // @ts-ignore:next-line
     var _uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(_unionTypes));
-
     if (_uniqUnionTypes.length === 1) {
       return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(_uniqUnionTypes[0]))), _isOptional);
     } else {
@@ -356,31 +283,24 @@ function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
       }))), _isOptional);
     }
   }
-
   try {
     getPropertyType(context, jsonschema, prop);
   } catch (e) {
     console.log(e);
     console.log(JSON.stringify(jsonschema, null, 2), prop);
   }
-
   var _getPropertyType = getPropertyType(context, jsonschema, prop),
-      type = _getPropertyType.type,
-      optional = _getPropertyType.optional;
-
+    type = _getPropertyType.type,
+    optional = _getPropertyType.optional;
   return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
 }
-
 var getParamsTypeAnnotation = function getParamsTypeAnnotation(context, jsonschema) {
   var _jsonschema$propertie;
-
   var camelize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
-
   if (!keys.length && jsonschema.$ref) {
     return t.tsTypeAnnotation(getTypeFromRef(jsonschema.$ref));
   }
-
   if (!keys.length) return undefined;
   var typedParams = keys.map(function (prop) {
     return getPropertySignatureFromProp(context, jsonschema, prop, camelize);
@@ -388,21 +308,16 @@ var getParamsTypeAnnotation = function getParamsTypeAnnotation(context, jsonsche
   return t.tsTypeAnnotation(t.tsTypeLiteral( // @ts-ignore:next-line
   (0, _toConsumableArray2["default"])(typedParams)));
 };
-
 exports.getParamsTypeAnnotation = getParamsTypeAnnotation;
-
 var createTypedObjectParams = function createTypedObjectParams(context, jsonschema) {
   var _jsonschema$propertie2;
-
   var camelize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var keys = Object.keys((_jsonschema$propertie2 = jsonschema.properties) !== null && _jsonschema$propertie2 !== void 0 ? _jsonschema$propertie2 : {});
-
   if (!keys.length) {
     // is there a ref?
     if (jsonschema.$ref) {
-      var _obj = context.refLookup(jsonschema.$ref); // If there is a oneOf, then we need to create a type for it
-
-
+      var _obj = context.refLookup(jsonschema.$ref);
+      // If there is a oneOf, then we need to create a type for it
       if (_obj !== null && _obj !== void 0 && _obj.oneOf) {
         // the actual type of the ref
         var refType = jsonschema.$ref.split('/').pop();
@@ -413,12 +328,11 @@ var createTypedObjectParams = function createTypedObjectParams(context, jsonsche
       } else if (_obj) {
         return createTypedObjectParams(context, _obj, camelize);
       }
-    } // no results...
-
+    }
 
+    // no results...
     return;
   }
-
   var params = keys.map(function (prop) {
     return t.objectProperty(camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), false, true);
   });
@@ -426,5 +340,4 @@ var createTypedObjectParams = function createTypedObjectParams(context, jsonsche
   obj.typeAnnotation = getParamsTypeAnnotation(context, jsonschema, camelize);
   return obj;
 };
-
 exports.createTypedObjectParams = createTypedObjectParams;

package/module/client/client.js

@@ -10,8 +10,8 @@ export const createWasmQueryMethod = (context, jsonschema) => {
   const responseType = getResponseType(context, underscoreName);
   const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
   const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  const msgAction = t.identifier(underscoreName); // If the param is an identifier, we can just use it as is
-
+  const msgAction = t.identifier(underscoreName);
+  // If the param is an identifier, we can just use it as is
   const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args);
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(param ? [param] : [], t.blockStatement([t.returnStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('queryContractSmart')), [t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(msgAction, msgActionValue)])]))]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier(responseType))]))), true));
 };
@@ -22,27 +22,32 @@ export const createQueryClass = (context, className, implementsClassName, queryM
   const methods = getMessageProperties(queryMsg).map(schema => {
     return createWasmQueryMethod(context, schema);
   });
-  return t.exportNamedDeclaration(classDeclaration(className, [// client
-  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), // contractAddress
-  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
-  t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// client/contract set
+  return t.exportNamedDeclaration(classDeclaration(className, [
+  // client
+  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))),
+  // contractAddress
+  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())),
+  // constructor
+  t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([
+  // client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings])), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))]));
 };
 export const getWasmMethodArgs = (context, jsonschema) => {
-  let keys = Object.keys(jsonschema.properties ?? {}); // only 1 degree $ref-lookup
+  let keys = Object.keys(jsonschema.properties ?? {});
 
+  // only 1 degree $ref-lookup
   if (!keys.length && jsonschema.$ref) {
-    const obj = context.refLookup(jsonschema.$ref); // properties
-
+    const obj = context.refLookup(jsonschema.$ref);
+    // properties
     if (obj) {
       keys = Object.keys(obj.properties ?? {});
-    } // tuple struct or otherwise, use the name of the reference
-
+    }
 
-    if (!keys.length && obj?.oneOf) {// TODO????? ADAIR
+    // tuple struct or otherwise, use the name of the reference
+    if (!keys.length && obj?.oneOf) {
+      // TODO????? ADAIR
     }
   }
-
   const args = keys.map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
@@ -56,11 +61,13 @@ export const createWasmExecMethod = (context, jsonschema) => {
   const methodName = camel(underscoreName);
   const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
   const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  const msgAction = t.identifier(underscoreName); // If the param is an identifier, we can just use it as is
-
+  const msgAction = t.identifier(underscoreName);
+  // If the param is an identifier, we can just use it as is
   const msgActionValue = param?.type === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args);
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(param ? [// props
-  param, ...CONSTANT_EXEC_PARAMS] : CONSTANT_EXEC_PARAMS, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(msgAction, msgActionValue)]), t.identifier('fee'), t.identifier('memo'), t.identifier('_funds')])))]), // return type
+  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(param ? [
+  // props
+  param, ...CONSTANT_EXEC_PARAMS] : CONSTANT_EXEC_PARAMS, t.blockStatement([t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('execute')), [t.memberExpression(t.thisExpression(), t.identifier('sender')), t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([t.objectProperty(msgAction, msgActionValue)]), t.identifier('fee'), t.identifier('memo'), t.identifier('_funds')])))]),
+  // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (context, className, implementsClassName, extendsClassName, execMsg) => {
@@ -71,19 +78,23 @@ export const createExecuteClass = (context, className, implementsClassName, exte
     return createWasmExecMethod(context, schema);
   });
   const blockStmt = [];
-
   if (extendsClassName) {
-    blockStmt.push( // super()
+    blockStmt.push(
+    // super()
     t.expressionStatement(t.callExpression(t.super(), [t.identifier('client'), t.identifier('contractAddress')])));
   }
-
-  [].push.apply(blockStmt, [// client/contract set
+  [].push.apply(blockStmt, [
+  // client/contract set
   t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('client'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('sender')), t.identifier('sender'))), t.expressionStatement(t.assignmentExpression('=', t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.identifier('contractAddress'))), ...bindings]);
   const noImplicitOverride = context.options.client.noImplicitOverride && extendsClassName && context.options.client.execExtendsQuery;
-  return t.exportNamedDeclaration(classDeclaration(className, [// client
-  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient'))), false, false, noImplicitOverride), // sender
-  classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())), // contractAddress
-  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()), false, false, noImplicitOverride), // constructor
+  return t.exportNamedDeclaration(classDeclaration(className, [
+  // client
+  classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient'))), false, false, noImplicitOverride),
+  // sender
+  classProperty('sender', t.tsTypeAnnotation(t.tsStringKeyword())),
+  // contractAddress
+  classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()), false, false, noImplicitOverride),
+  // constructor
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt)), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], extendsClassName ? t.identifier(extendsClassName) : null));
 };
 export const createExecuteInterface = (context, className, extendsClassName, execMsg) => {
@@ -93,8 +104,10 @@ export const createExecuteInterface = (context, className, extendsClassName, exe
     return createPropertyFunctionWithObjectParamsForExec(context, methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
   });
   const extendsAst = extendsClassName ? [t.tSExpressionWithTypeArguments(t.identifier(extendsClassName))] : [];
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([// contract address
-  t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, extendsAst, t.tSInterfaceBody([
+  // contract address
+  t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())),
+  // contract address
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
 export const createPropertyFunctionWithObjectParams = (context, methodName, responseType, jsonschema) => {
@@ -104,7 +117,8 @@ export const createPropertyFunctionWithObjectParams = (context, methodName, resp
     typeAnnotation: promiseTypeAnnotation(responseType),
     parameters: obj ? [obj] : []
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(
+  // @ts-ignore:next-line
   func));
 };
 export const createPropertyFunctionWithObjectParamsForExec = (context, methodName, responseType, jsonschema) => {
@@ -115,7 +129,8 @@ export const createPropertyFunctionWithObjectParamsForExec = (context, methodNam
     typeAnnotation: promiseTypeAnnotation(responseType),
     parameters: obj ? [obj, ...FIXED_EXECUTE_PARAMS] : FIXED_EXECUTE_PARAMS
   };
-  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation( // @ts-ignore:next-line
+  return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(
+  // @ts-ignore:next-line
   func));
 };
 export const createQueryInterface = (context, className, queryMsg) => {
@@ -132,10 +147,8 @@ export const createTypeOrInterface = (context, Type, jsonschema) => {
     if (!jsonschema.type) {
       return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(jsonschema.title))));
     }
-
     return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, getType(jsonschema.type)));
   }
-
   const props = Object.keys(jsonschema.properties ?? {}).map(prop => {
     const {
       type,
@@ -143,7 +156,8 @@ export const createTypeOrInterface = (context, Type, jsonschema) => {
     } = getPropertyType(context, jsonschema, prop);
     return propertySignature(camel(prop), t.tsTypeAnnotation(type), optional);
   });
-  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody( // @ts-ignore:next-line
+  return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody(
+  // @ts-ignore:next-line
   [...props])));
 };
 export const createTypeInterface = (context, jsonschema) => {

package/module/client/test/ts-client.account-nfts.spec.js

@@ -8,7 +8,9 @@ it('execute_msg_for__empty', () => {
 });
 it('query classes', () => {
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message));
-}); // it('query classes response', () => {
+});
+
+// it('query classes response', () => {
 //     expectCode(createTypeInterface(
 //         ctx,
 //         contract.responses.all_debt_shares

package/module/client/test/ts-client.arrays.spec.js

@@ -5,8 +5,10 @@ import { getPropertyType } from '../../utils';
 const ctx = makeContext(message);
 it('getPropertyType', () => {
   const ast = getPropertyType(ctx, message.oneOf[0].properties.update_edges, 'edges3');
-  expectCode(ast.type); // printCode(ast.type)
+  expectCode(ast.type);
+  // printCode(ast.type)
 });
+
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(ctx, message));
 });

package/module/client/test/ts-client.issue-101.spec.js

@@ -1,6 +1,8 @@
 import { createExecuteClass, createExecuteInterface } from '../client';
 import { expectCode, makeContext } from '../../../test-utils';
-import ownership from '../../../../../__fixtures__/basic/ownership.json'; // it('query classes', () => {
+import ownership from '../../../../../__fixtures__/basic/ownership.json';
+
+// it('query classes', () => {
 //     const ctx = makeContext(cosmos_msg_for__empty);
 //     expectCode(createQueryClass(
 //         ctx,

package/module/client/test/ts-client.issue-98.test.js

@@ -8,7 +8,9 @@ it('execute_msg_for__empty', () => {
 });
 it('query classes', () => {
   expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message));
-}); // it('query classes response', () => {
+});
+
+// it('query classes response', () => {
 //     expectCode(createTypeInterface(
 //         ctx,
 //         contract.responses.all_debt_shares

package/module/client/test/ts-client.wager.spec.js

@@ -14,7 +14,9 @@ it('query classes', () => {
 });
 it('execute classes', () => {
   expectCode(createExecuteClass(executeCtx, 'WagerClient', 'WagerInstance', null, wagerJson.execute));
-}); // it('execute classes array types', () => {
+});
+
+// it('execute classes array types', () => {
 //     expectCode(createExecuteClass(
 //         ctx,
 //         'SG721Client',
@@ -23,6 +25,7 @@ it('execute classes', () => {
 //         wagerJson
 //     ))
 // });
+
 // it('execute interfaces no extends', () => {
 //     expectCode(createExecuteInterface(
 //         ctx,