wasm-ast-types 0.19.0 → 0.21.0

package/main/client/client.js

@@ -34,10 +34,12 @@ var createWasmQueryMethod = function createWasmQueryMethod(context, jsonschema)
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
   var responseType = (0, _types2.getResponseType)(context, underscoreName);
-  var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
+  var param = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
   var args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  var actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
-  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [obj] : [], 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([actionArg])]))]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier(responseType))]))), true));
+  var msgAction = t.identifier(underscoreName); // If the param is an identifier, we can just use it as is
+
+  var msgActionValue = (param === null || param === void 0 ? void 0 : param.type) === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args);
+  return t.classProperty(t.identifier(methodName), (0, _utils.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));
 };
 
 exports.createWasmQueryMethod = createWasmQueryMethod;
@@ -68,12 +70,16 @@ var getWasmMethodArgs = function getWasmMethodArgs(context, jsonschema) {
   var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {}); // only 1 degree $ref-lookup
 
   if (!keys.length && jsonschema.$ref) {
-    var obj = context.refLookup(jsonschema.$ref);
+    var obj = context.refLookup(jsonschema.$ref); // properties
 
     if (obj) {
       var _obj$properties;
 
       keys = Object.keys((_obj$properties = obj.properties) !== null && _obj$properties !== void 0 ? _obj$properties : {});
+    } // tuple struct or otherwise, use the name of the reference
+
+
+    if (!keys.length && obj !== null && obj !== void 0 && obj.oneOf) {// TODO????? ADAIR
     }
   }
 
@@ -91,10 +97,13 @@ var createWasmExecMethod = function createWasmExecMethod(context, jsonschema) {
   context.addUtil('Coin');
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
-  var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
+  var param = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
   var args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [// props
-  obj].concat(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(t.identifier(underscoreName), t.objectExpression((0, _toConsumableArray2["default"])(args)))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  var msgAction = t.identifier(underscoreName); // If the param is an identifier, we can just use it as is
+
+  var msgActionValue = (param === null || param === void 0 ? void 0 : param.type) === 'Identifier' ? t.identifier(param.name) : t.objectExpression(args);
+  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(param ? [// props
+  param].concat(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));
 };
 

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

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _client = require("../client");
+
+var _testUtils = require("../../../test-utils");
+
+var _ownership = _interopRequireDefault(require("../../../../../__fixtures__/basic/ownership.json"));
+
+// it('query classes', () => {
+//     const ctx = makeContext(cosmos_msg_for__empty);
+//     expectCode(createQueryClass(
+//         ctx,
+//         'SG721QueryClient',
+//         'SG721ReadOnlyInstance',
+//         cosmos_msg_for__empty
+//     ))
+// });
+it('execute interfaces no extends', function () {
+  var ctx = (0, _testUtils.makeContext)(_ownership["default"]);
+  (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(ctx, 'OwnershipInstance', null, _ownership["default"]));
+});
+it('ownership client with tuple', function () {
+  var ctx = (0, _testUtils.makeContext)(_ownership["default"]);
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(ctx, 'OwnershipClient', 'OwnershipInstance', null, _ownership["default"]));
+});

package/main/client/test/ts-client.issue-103.test.js

@@ -0,0 +1,48 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _schema = _interopRequireDefault(require("../../../../../__fixtures__/issues/103/schema.json"));
+
+var _client = require("../client");
+
+var _testUtils = require("../../../test-utils");
+
+var queryMessage = _schema["default"].query;
+var executeMessage = _schema["default"].execute;
+var queryCtx = (0, _testUtils.makeContext)(queryMessage);
+var executeCtx = (0, _testUtils.makeContext)(executeMessage);
+describe('query', function () {
+  it('execute_msg_for__empty', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(queryCtx, queryMessage));
+  });
+  it('query classes', function () {
+    (0, _testUtils.expectCode)((0, _client.createQueryClass)(queryCtx, 'QueryClient', 'ReadOnlyInstance', queryMessage));
+  });
+  it('query classes response', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(queryCtx, _schema["default"].query));
+  });
+  it('execute classes array types', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteClass)(queryCtx, 'Client', 'Instance', null, queryMessage));
+  });
+  it('execute interfaces no extends', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(queryCtx, 'SG721Instance', null, queryMessage));
+  });
+});
+describe('execute', function () {
+  it('execute_msg_for__empty', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(executeCtx, executeMessage));
+  });
+  it('query classes', function () {
+    (0, _testUtils.expectCode)((0, _client.createQueryClass)(executeCtx, 'QueryClient', 'ReadOnlyInstance', executeMessage));
+  });
+  it('query classes response', function () {
+    (0, _testUtils.expectCode)((0, _client.createTypeInterface)(executeCtx, _schema["default"].query));
+  });
+  it('execute classes array types', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteClass)(executeCtx, 'Client', 'Instance', null, executeMessage));
+  });
+  it('execute interfaces no extends', function () {
+    (0, _testUtils.expectCode)((0, _client.createExecuteInterface)(executeCtx, 'SG721Instance', null, executeMessage));
+  });
+});

package/main/message-composer/message-composer.js

@@ -34,11 +34,20 @@ var createWasmExecMethodMessageComposer = function createWasmExecMethodMessageCo
   context.addUtil('toUtf8');
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
-  var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
-  var args = (0, _client.getWasmMethodArgs)(context, jsonschema.properties[underscoreName]);
+  var param = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
+  var args = (0, _client.getWasmMethodArgs)(context, jsonschema.properties[underscoreName]); // what the underscore named property in the message is assigned to
+
+  var actionValue;
+
+  if ((param === null || param === void 0 ? void 0 : param.type) === 'Identifier') {
+    actionValue = t.identifier(param.name);
+  } else {
+    actionValue = t.objectExpression(args);
+  }
+
   var constantParams = [(0, _babel.identifier)('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
-  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(obj ? [// props
-  obj].concat(constantParams) : constantParams, t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier('typeUrl'), t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')), t.objectProperty(t.identifier('value'), t.callExpression(t.memberExpression(t.identifier('MsgExecuteContract'), t.identifier('fromPartial')), [t.objectExpression([t.objectProperty(t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('sender'))), t.objectProperty(t.identifier('contract'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress'))), t.objectProperty(t.identifier('msg'), t.callExpression(t.identifier('toUtf8'), [t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression(args))])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
+  return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)(param ? [// props
+  param].concat(constantParams) : constantParams, t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier('typeUrl'), t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')), t.objectProperty(t.identifier('value'), t.callExpression(t.memberExpression(t.identifier('MsgExecuteContract'), t.identifier('fromPartial')), [t.objectExpression([t.objectProperty(t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('sender'))), t.objectProperty(t.identifier('contract'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress'))), t.objectProperty(t.identifier('msg'), t.callExpression(t.identifier('toUtf8'), [t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.objectExpression([t.objectProperty(t.identifier(underscoreName), actionValue)])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 

package/main/message-composer/message-composer.spec.js

@@ -4,15 +4,25 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixtures__/basic/execute_msg_for__empty.json"));
 
+var _ownership = _interopRequireDefault(require("../../../../__fixtures__/basic/ownership.json"));
+
 var _messageComposer = require("./message-composer");
 
 var _testUtils = require("../../test-utils");
 
-it('execute classes', function () {
+it("execute classes", function () {
   var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
-  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerClass)(ctx, 'SG721MessageComposer', 'SG721Message', _execute_msg_for__empty["default"]));
+  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerClass)(ctx, "SG721MessageComposer", "SG721Message", _execute_msg_for__empty["default"]));
 });
-it('createMessageComposerInterface', function () {
+it("createMessageComposerInterface", function () {
   var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
-  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerInterface)(ctx, 'SG721Message', _execute_msg_for__empty["default"]));
+  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerInterface)(ctx, "SG721Message", _execute_msg_for__empty["default"]));
+});
+it("ownershipClass", function () {
+  var ctx = (0, _testUtils.makeContext)(_ownership["default"]);
+  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerClass)(ctx, "OwnershipMessageComposer", "OwnershipMessage", _ownership["default"]));
+});
+it("ownershipInterface", function () {
+  var ownershipCtx = (0, _testUtils.makeContext)(_ownership["default"]);
+  (0, _testUtils.expectCode)((0, _messageComposer.createMessageComposerInterface)(ownershipCtx, "OwnershipMessage", _ownership["default"]));
 });

package/main/msg-builder/msg-builder.js

@@ -36,19 +36,33 @@ var createMsgBuilderClass = function createMsgBuilderClass(context, className, m
 exports.createMsgBuilderClass = createMsgBuilderClass;
 
 function createExtractTypeAnnotation(underscoreName, msgTitle) {
-  return t.tsTypeAnnotation(t.tsTypeReference(t.identifier("CamelCasedProperties"), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier("Extract"), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(msgTitle)), t.tsTypeLiteral([t.tsPropertySignature(t.identifier(underscoreName), t.tsTypeAnnotation(t.tsUnknownKeyword()))])])), t.tsLiteralType(t.stringLiteral(underscoreName)))])));
+  return t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CamelCasedProperties'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier('Extract'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(msgTitle)), t.tsTypeLiteral([t.tsPropertySignature(t.identifier(underscoreName), t.tsTypeAnnotation(t.tsUnknownKeyword()))])])), t.tsLiteralType(t.stringLiteral(underscoreName)))])));
 }
 
 var createStaticExecMethodMsgBuilder = function createStaticExecMethodMsgBuilder(context, jsonschema, msgTitle) {
   var underscoreName = Object.keys(jsonschema.properties)[0];
   var methodName = (0, _case.camel)(underscoreName);
-  var obj = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
-  var args = (0, _client.getWasmMethodArgs)(context, jsonschema.properties[underscoreName]);
-  if (obj) obj.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+  var param = (0, _types2.createTypedObjectParams)(context, jsonschema.properties[underscoreName]);
+  var args = (0, _client.getWasmMethodArgs)(context, jsonschema.properties[underscoreName]); // what the underscore named property in the message is assigned to
+
+  var actionValue;
+
+  if ((param === null || param === void 0 ? void 0 : param.type) === 'Identifier') {
+    actionValue = t.identifier(param.name);
+  } else {
+    actionValue = t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const')));
+  } // TODO: this is a hack to get the type annotation to work
+  // all type annotations in the future should be the extracted and camelized type
+
+
+  if (param && param.typeAnnotation.type === 'TSTypeAnnotation' && param.typeAnnotation.typeAnnotation.type === 'TSTypeLiteral') {
+    param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+  }
+
   return t.classProperty(t.identifier(methodName), (0, _utils.arrowFunctionExpression)( // params
-  obj ? [// props
-  obj] : [], // body
-  t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const'))))]))]), // return type
+  param ? [// props
+  param] : [], // body
+  t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier(underscoreName), actionValue)]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))), false), null, null, false, // static
   true);
 };

package/main/msg-builder/msg-builder.spec.js

@@ -6,6 +6,8 @@ var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixt
 
 var _query_msg = _interopRequireDefault(require("../../../../__fixtures__/basic/query_msg.json"));
 
+var _ownership = _interopRequireDefault(require("../../../../__fixtures__/basic/ownership.json"));
+
 var _msgBuilder = require("./msg-builder");
 
 var _testUtils = require("../../test-utils");
@@ -15,6 +17,10 @@ it('execute class', function () {
   (0, _testUtils.expectCode)((0, _msgBuilder.createMsgBuilderClass)(ctx, 'SG721MsgBuilder', _execute_msg_for__empty["default"]));
 });
 it('query class', function () {
-  var ctx = (0, _testUtils.makeContext)(_execute_msg_for__empty["default"]);
+  var ctx = (0, _testUtils.makeContext)(_query_msg["default"]);
   (0, _testUtils.expectCode)((0, _msgBuilder.createMsgBuilderClass)(ctx, 'SG721MsgBuilder', _query_msg["default"]));
+});
+it('ownership', function () {
+  var ctx = (0, _testUtils.makeContext)(_ownership["default"]);
+  (0, _testUtils.expectCode)((0, _msgBuilder.createMsgBuilderClass)(ctx, 'Ownership', _ownership["default"]));
 });

package/main/react-query/react-query.spec.js

@@ -10,6 +10,8 @@ var _query_msg = _interopRequireDefault(require("../../../../__fixtures__/basic/
 
 var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixtures__/basic/execute_msg_for__empty.json"));
 
+var _ownership = _interopRequireDefault(require("../../../../__fixtures__/basic/ownership.json"));
+
 var _reactQuery = require("./react-query");
 
 var _testUtils = require("../../test-utils");
@@ -77,4 +79,13 @@ it('createReactQueryHooks', function () {
     contractName: 'Sg721',
     ExecuteClient: 'Sg721Client'
   })));
+});
+it('ownership', function () {
+  var ownershipCtx = (0, _testUtils.makeContext)(_ownership["default"]);
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryMutationHooks)({
+    context: ownershipCtx,
+    execMsg: _ownership["default"],
+    contractName: 'Ownership',
+    ExecuteClient: 'OwnershipClient'
+  })));
 });

package/main/utils/types.js

@@ -400,9 +400,17 @@ var createTypedObjectParams = function createTypedObjectParams(context, jsonsche
   if (!keys.length) {
     // is there a ref?
     if (jsonschema.$ref) {
-      var _obj = context.refLookup(jsonschema.$ref);
+      var _obj = context.refLookup(jsonschema.$ref); // If there is a oneOf, then we need to create a type for it
 
-      if (_obj) {
+
+      if (_obj !== null && _obj !== void 0 && _obj.oneOf) {
+        // the actual type of the ref
+        var refType = jsonschema.$ref.split('/').pop();
+        var refName = (0, _case.camel)(refType);
+        var id = t.identifier(refName);
+        id.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(refType)));
+        return id;
+      } else if (_obj) {
         return createTypedObjectParams(context, _obj, camelize);
       }
     } // no results...

package/module/client/client.js

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
-import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from '../utils';
-import { getPropertyType, getType, createTypedObjectParams, getResponseType } from '../utils/types';
+import { arrowFunctionExpression, bindMethod, classDeclaration, classProperty, getMessageProperties, promiseTypeAnnotation, typedIdentifier } from '../utils';
+import { createTypedObjectParams, getPropertyType, getResponseType, getType } from '../utils/types';
 import { identifier, propertySignature } from '../utils/babel';
 export const CONSTANT_EXEC_PARAMS = [t.assignmentPattern(identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tSNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), false), t.stringLiteral('auto')), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
 export const FIXED_EXECUTE_PARAMS = [identifier('fee', t.tsTypeAnnotation(t.tsUnionType([t.tsNumberKeyword(), t.tsTypeReference(t.identifier('StdFee')), t.tsLiteralType(t.stringLiteral('auto'))])), true), identifier('memo', t.tsTypeAnnotation(t.tsStringKeyword()), true), identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
@@ -9,10 +9,12 @@ export const createWasmQueryMethod = (context, jsonschema) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const responseType = getResponseType(context, underscoreName);
-  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
   const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  const actionArg = t.objectProperty(t.identifier(underscoreName), t.objectExpression(args));
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [obj] : [], 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([actionArg])]))]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier(responseType))]))), true));
+  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));
 };
 export const createQueryClass = (context, className, implementsClassName, queryMsg) => {
   context.addUtil('CosmWasmClient');
@@ -31,10 +33,14 @@ export const getWasmMethodArgs = (context, jsonschema) => {
   let keys = Object.keys(jsonschema.properties ?? {}); // only 1 degree $ref-lookup
 
   if (!keys.length && jsonschema.$ref) {
-    const obj = context.refLookup(jsonschema.$ref);
+    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
     }
   }
 
@@ -49,10 +55,13 @@ export const createWasmExecMethod = (context, jsonschema) => {
   context.addUtil('Coin');
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
   const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
-  obj, ...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(t.identifier(underscoreName), t.objectExpression([...args]))]), t.identifier('fee'), t.identifier('memo'), t.identifier('funds')])))]), // return type
+  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
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (context, className, implementsClassName, extendsClassName, execMsg) => {

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

@@ -0,0 +1,20 @@
+import { createExecuteClass, createExecuteInterface } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+import ownership from '../../../../../__fixtures__/basic/ownership.json'; // it('query classes', () => {
+//     const ctx = makeContext(cosmos_msg_for__empty);
+//     expectCode(createQueryClass(
+//         ctx,
+//         'SG721QueryClient',
+//         'SG721ReadOnlyInstance',
+//         cosmos_msg_for__empty
+//     ))
+// });
+
+it('execute interfaces no extends', () => {
+  const ctx = makeContext(ownership);
+  expectCode(createExecuteInterface(ctx, 'OwnershipInstance', null, ownership));
+});
+it('ownership client with tuple', () => {
+  const ctx = makeContext(ownership);
+  expectCode(createExecuteClass(ctx, 'OwnershipClient', 'OwnershipInstance', null, ownership));
+});

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

@@ -0,0 +1,41 @@
+import contract from '../../../../../__fixtures__/issues/103/schema.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+const queryMessage = contract.query;
+const executeMessage = contract.execute;
+const queryCtx = makeContext(queryMessage);
+const executeCtx = makeContext(executeMessage);
+describe('query', () => {
+  it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(queryCtx, queryMessage));
+  });
+  it('query classes', () => {
+    expectCode(createQueryClass(queryCtx, 'QueryClient', 'ReadOnlyInstance', queryMessage));
+  });
+  it('query classes response', () => {
+    expectCode(createTypeInterface(queryCtx, contract.query));
+  });
+  it('execute classes array types', () => {
+    expectCode(createExecuteClass(queryCtx, 'Client', 'Instance', null, queryMessage));
+  });
+  it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(queryCtx, 'SG721Instance', null, queryMessage));
+  });
+});
+describe('execute', () => {
+  it('execute_msg_for__empty', () => {
+    expectCode(createTypeInterface(executeCtx, executeMessage));
+  });
+  it('query classes', () => {
+    expectCode(createQueryClass(executeCtx, 'QueryClient', 'ReadOnlyInstance', executeMessage));
+  });
+  it('query classes response', () => {
+    expectCode(createTypeInterface(executeCtx, contract.query));
+  });
+  it('execute classes array types', () => {
+    expectCode(createExecuteClass(executeCtx, 'Client', 'Instance', null, executeMessage));
+  });
+  it('execute interfaces no extends', () => {
+    expectCode(createExecuteInterface(executeCtx, 'SG721Instance', null, executeMessage));
+  });
+});

package/module/message-composer/message-composer.js

@@ -12,11 +12,20 @@ const createWasmExecMethodMessageComposer = (context, jsonschema) => {
   context.addUtil('toUtf8');
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
-  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
+  const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]); // what the underscore named property in the message is assigned to
+
+  let actionValue;
+
+  if (param?.type === 'Identifier') {
+    actionValue = t.identifier(param.name);
+  } else {
+    actionValue = t.objectExpression(args);
+  }
+
   const constantParams = [identifier('funds', t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('Coin')))), true)];
-  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [// props
-  obj, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier('typeUrl'), t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')), t.objectProperty(t.identifier('value'), t.callExpression(t.memberExpression(t.identifier('MsgExecuteContract'), t.identifier('fromPartial')), [t.objectExpression([t.objectProperty(t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('sender'))), t.objectProperty(t.identifier('contract'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress'))), t.objectProperty(t.identifier('msg'), t.callExpression(t.identifier('toUtf8'), [t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.objectExpression(args))])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
+  return t.classProperty(t.identifier(methodName), arrowFunctionExpression(param ? [// props
+  param, ...constantParams] : constantParams, t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier('typeUrl'), t.stringLiteral('/cosmwasm.wasm.v1.MsgExecuteContract')), t.objectProperty(t.identifier('value'), t.callExpression(t.memberExpression(t.identifier('MsgExecuteContract'), t.identifier('fromPartial')), [t.objectExpression([t.objectProperty(t.identifier('sender'), t.memberExpression(t.thisExpression(), t.identifier('sender'))), t.objectProperty(t.identifier('contract'), t.memberExpression(t.thisExpression(), t.identifier('contractAddress'))), t.objectProperty(t.identifier('msg'), t.callExpression(t.identifier('toUtf8'), [t.callExpression(t.memberExpression(t.identifier('JSON'), t.identifier('stringify')), [t.objectExpression([t.objectProperty(t.identifier(underscoreName), actionValue)])])])), t.objectProperty(t.identifier('funds'), t.identifier('funds'), false, true)])]))]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('MsgExecuteContractEncodeObject'))), false));
 };
 

package/module/message-composer/message-composer.spec.js

@@ -1,11 +1,20 @@
-import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
-import { createMessageComposerClass, createMessageComposerInterface } from './message-composer';
-import { expectCode, makeContext } from '../../test-utils';
-it('execute classes', () => {
+import execute_msg from "../../../../__fixtures__/basic/execute_msg_for__empty.json";
+import ownership from "../../../../__fixtures__/basic/ownership.json";
+import { createMessageComposerClass, createMessageComposerInterface } from "./message-composer";
+import { expectCode, makeContext } from "../../test-utils";
+it("execute classes", () => {
   const ctx = makeContext(execute_msg);
-  expectCode(createMessageComposerClass(ctx, 'SG721MessageComposer', 'SG721Message', execute_msg));
+  expectCode(createMessageComposerClass(ctx, "SG721MessageComposer", "SG721Message", execute_msg));
 });
-it('createMessageComposerInterface', () => {
+it("createMessageComposerInterface", () => {
   const ctx = makeContext(execute_msg);
-  expectCode(createMessageComposerInterface(ctx, 'SG721Message', execute_msg));
+  expectCode(createMessageComposerInterface(ctx, "SG721Message", execute_msg));
+});
+it("ownershipClass", () => {
+  const ctx = makeContext(ownership);
+  expectCode(createMessageComposerClass(ctx, "OwnershipMessageComposer", "OwnershipMessage", ownership));
+});
+it("ownershipInterface", () => {
+  const ownershipCtx = makeContext(ownership);
+  expectCode(createMessageComposerInterface(ownershipCtx, "OwnershipMessage", ownership));
 });

package/module/msg-builder/msg-builder.js

@@ -1,8 +1,8 @@
-import * as t from "@babel/types";
-import { camel } from "case";
-import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from "../utils";
-import { createTypedObjectParams } from "../utils/types";
-import { getWasmMethodArgs } from "../client/client";
+import * as t from '@babel/types';
+import { camel } from 'case';
+import { abstractClassDeclaration, arrowFunctionExpression, getMessageProperties } from '../utils';
+import { createTypedObjectParams } from '../utils/types';
+import { getWasmMethodArgs } from '../client/client';
 export const createMsgBuilderClass = (context, className, msg) => {
   const staticMethods = getMessageProperties(msg).map(schema => {
     return createStaticExecMethodMsgBuilder(context, schema, msg.title);
@@ -15,19 +15,33 @@ export const createMsgBuilderClass = (context, className, msg) => {
  */
 
 function createExtractTypeAnnotation(underscoreName, msgTitle) {
-  return t.tsTypeAnnotation(t.tsTypeReference(t.identifier("CamelCasedProperties"), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier("Extract"), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(msgTitle)), t.tsTypeLiteral([t.tsPropertySignature(t.identifier(underscoreName), t.tsTypeAnnotation(t.tsUnknownKeyword()))])])), t.tsLiteralType(t.stringLiteral(underscoreName)))])));
+  return t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CamelCasedProperties'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier('Extract'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(msgTitle)), t.tsTypeLiteral([t.tsPropertySignature(t.identifier(underscoreName), t.tsTypeAnnotation(t.tsUnknownKeyword()))])])), t.tsLiteralType(t.stringLiteral(underscoreName)))])));
 }
 
 const createStaticExecMethodMsgBuilder = (context, jsonschema, msgTitle) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
-  const obj = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
-  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]);
-  if (obj) obj.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+  const param = createTypedObjectParams(context, jsonschema.properties[underscoreName]);
+  const args = getWasmMethodArgs(context, jsonschema.properties[underscoreName]); // what the underscore named property in the message is assigned to
+
+  let actionValue;
+
+  if (param?.type === 'Identifier') {
+    actionValue = t.identifier(param.name);
+  } else {
+    actionValue = t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const')));
+  } // TODO: this is a hack to get the type annotation to work
+  // all type annotations in the future should be the extracted and camelized type
+
+
+  if (param && param.typeAnnotation.type === 'TSTypeAnnotation' && param.typeAnnotation.typeAnnotation.type === 'TSTypeLiteral') {
+    param.typeAnnotation = createExtractTypeAnnotation(underscoreName, msgTitle);
+  }
+
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression( // params
-  obj ? [// props
-  obj] : [], // body
-  t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier(underscoreName), t.tsAsExpression(t.objectExpression(args), t.tsTypeReference(t.identifier('const'))))]))]), // return type
+  param ? [// props
+  param] : [], // body
+  t.blockStatement([t.returnStatement(t.objectExpression([t.objectProperty(t.identifier(underscoreName), actionValue)]))]), // return type
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier(msgTitle))), false), null, null, false, // static
   true);
 };

package/module/msg-builder/msg-builder.spec.js

@@ -1,5 +1,6 @@
 import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
+import ownership from '../../../../__fixtures__/basic/ownership.json';
 import { createMsgBuilderClass } from './msg-builder';
 import { expectCode, makeContext } from '../../test-utils';
 it('execute class', () => {
@@ -7,6 +8,10 @@ it('execute class', () => {
   expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', execute_msg));
 });
 it('query class', () => {
-  const ctx = makeContext(execute_msg);
+  const ctx = makeContext(query_msg);
   expectCode(createMsgBuilderClass(ctx, 'SG721MsgBuilder', query_msg));
+});
+it('ownership', () => {
+  const ctx = makeContext(ownership);
+  expectCode(createMsgBuilderClass(ctx, 'Ownership', ownership));
 });

package/module/react-query/react-query.spec.js

@@ -1,6 +1,7 @@
 import * as t from '@babel/types';
 import query_msg from '../../../../__fixtures__/basic/query_msg.json';
 import execute_msg from '../../../../__fixtures__/basic/execute_msg_for__empty.json';
+import ownership from '../../../../__fixtures__/basic/ownership.json';
 import { createReactQueryHooks, createReactQueryMutationHooks } from './react-query';
 import { expectCode, makeContext } from '../../test-utils';
 const execCtx = makeContext(execute_msg);
@@ -62,4 +63,13 @@ it('createReactQueryHooks', () => {
     contractName: 'Sg721',
     ExecuteClient: 'Sg721Client'
   })));
+});
+it('ownership', () => {
+  const ownershipCtx = makeContext(ownership);
+  expectCode(t.program(createReactQueryMutationHooks({
+    context: ownershipCtx,
+    execMsg: ownership,
+    contractName: 'Ownership',
+    ExecuteClient: 'OwnershipClient'
+  })));
 });

package/module/utils/types.js

@@ -322,9 +322,16 @@ export const createTypedObjectParams = (context, jsonschema, camelize = true) =>
   if (!keys.length) {
     // is there a ref?
     if (jsonschema.$ref) {
-      const obj = context.refLookup(jsonschema.$ref);
-
-      if (obj) {
+      const obj = context.refLookup(jsonschema.$ref); // If there is a oneOf, then we need to create a type for it
+
+      if (obj?.oneOf) {
+        // the actual type of the ref
+        const refType = jsonschema.$ref.split('/').pop();
+        const refName = camel(refType);
+        const id = t.identifier(refName);
+        id.typeAnnotation = t.tsTypeAnnotation(t.tsTypeReference(t.identifier(refType)));
+        return id;
+      } else if (obj) {
         return createTypedObjectParams(context, obj, camelize);
       }
     } // no results...

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -88,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "dccd0edd182dc4d5e58b30e7f46732e0be483bc1"
+  "gitHead": "90fb688d19f477d246f9021ac91d824c96b8f3fc"
 }