wasm-ast-types 0.5.1 → 0.6.0

package/main/{recoil.js → recoil/recoil.js}

@@ -5,51 +5,32 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createWasmRecoilMethod = exports.createRecoilSelectors = exports.createRecoilSelector = exports.createRecoilQueryClientType = exports.createRecoilQueryClient = void 0;
+exports.createRecoilSelectors = exports.createRecoilSelector = exports.createRecoilQueryClientType = exports.createRecoilQueryClient = void 0;
 
 var t = _interopRequireWildcard(require("@babel/types"));
 
 var _case = require("case");
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 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 || _typeof(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; }
 
-var createWasmRecoilMethod = function createWasmRecoilMethod(jsonschema) {
-  var _jsonschema$propertie;
-
-  var underscoreName = Object.keys(jsonschema.properties)[0];
-  var methodName = (0, _case.camel)(underscoreName);
-  var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
-  var properties = (_jsonschema$propertie = jsonschema.properties[underscoreName].properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {};
-
-  if (Object.keys(properties).length > 0) {} else {}
-};
-
-exports.createWasmRecoilMethod = createWasmRecoilMethod;
-
-var createRecoilSelector = function createRecoilSelector(keyPrefix, QueryClient, methodName) {
-  // const propertyNames = getMessageProperties(queryMsg)
-  //   .map(method => Object.keys(method.properties)?.[0])
-  //   .filter(Boolean);
-  // const methods = getMessageProperties(queryMsg)
-  //   .map(schema => createWasmRecoilMethod(schema))
+var createRecoilSelector = function createRecoilSelector(context, keyPrefix, QueryClient, methodName) {
   var selectorName = (0, _case.camel)("".concat(methodName, "Selector"));
   var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
   var getterKey = (0, _case.camel)("".concat(keyPrefix).concat((0, _case.pascal)(methodName)));
-  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(selectorName), (0, _utils.callExpression)(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('params'), t.identifier('params'), false, true), t.restElement(t.identifier('queryClientParams'))])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.callExpression(t.identifier('queryClient'), [t.identifier('queryClientParams')])]))]), t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), [// t.identifier('params')
-  t.spreadElement(t.identifier('params'))])))]), true)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsIntersectionType([t.tsTypeReference(t.identifier('QueryClientParams')), t.tsTypeLiteral([t.tsPropertySignature(t.identifier('params'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Parameters'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier(QueryClient)), t.tsLiteralType(t.stringLiteral(methodName)))]))))])])])))]));
+  return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier(selectorName), (0, _utils.callExpression)(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('params'), t.identifier('params'), false, true), t.restElement(t.identifier('queryClientParams'))])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.callExpression(t.identifier('queryClient'), [t.identifier('queryClientParams')])]))]), t.returnStatement(t.awaitExpression(t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), [t.spreadElement(t.identifier('params'))])))]), true)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsIntersectionType([t.tsTypeReference(t.identifier('QueryClientParams')), t.tsTypeLiteral([t.tsPropertySignature(t.identifier('params'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Parameters'), t.tsTypeParameterInstantiation([t.tsIndexedAccessType(t.tsTypeReference(t.identifier(QueryClient)), t.tsLiteralType(t.stringLiteral(methodName)))]))))])])])))]));
 };
 
 exports.createRecoilSelector = createRecoilSelector;
 
-var createRecoilSelectors = function createRecoilSelectors(keyPrefix, QueryClient, queryMsg) {
+var createRecoilSelectors = function createRecoilSelectors(context, keyPrefix, QueryClient, queryMsg) {
   return (0, _utils.getMessageProperties)(queryMsg).map(function (schema) {
     var underscoreName = Object.keys(schema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
-    return createRecoilSelector(keyPrefix, QueryClient, methodName);
+    return createRecoilSelector(context, keyPrefix, QueryClient, methodName);
   });
 };
 
@@ -84,7 +65,7 @@ var createRecoilQueryClientType = function createRecoilQueryClientType() {
 
 exports.createRecoilQueryClientType = createRecoilQueryClientType;
 
-var createRecoilQueryClient = function createRecoilQueryClient(keyPrefix, QueryClient) {
+var createRecoilQueryClient = function createRecoilQueryClient(context, keyPrefix, QueryClient) {
   var getterKey = (0, _case.camel)("".concat(keyPrefix, 'QueryClient'));
   return t.exportNamedDeclaration(t.variableDeclaration('const', [t.variableDeclarator(t.identifier('queryClient'), (0, _utils.callExpression)(t.identifier('selectorFamily'), [t.objectExpression([t.objectProperty(t.identifier('key'), t.stringLiteral(getterKey)), t.objectProperty(t.identifier('get'), t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('contractAddress'), t.identifier('contractAddress'), false, true)])], t.arrowFunctionExpression([t.objectPattern([t.objectProperty(t.identifier('get'), t.identifier('get'), false, true)])], t.blockStatement([t.variableDeclaration('const', [t.variableDeclarator(t.identifier('client'), t.callExpression(t.identifier('get'), [t.identifier('cosmWasmClient')]))]), t.returnStatement(t.newExpression(t.identifier(QueryClient), [t.identifier('client'), t.identifier('contractAddress')]))]), false)))])], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(QueryClient)), t.tsTypeReference(t.identifier('QueryClientParams'))])))]));
 };

package/main/{recoil.spec.js → recoil/recoil.spec.js}

@@ -4,32 +4,27 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _typeof = require("@babel/runtime/helpers/typeof");
 
-var _generator = _interopRequireDefault(require("@babel/generator"));
-
 var t = _interopRequireWildcard(require("@babel/types"));
 
-var _query_msg = _interopRequireDefault(require("./../../../__fixtures__/basic/query_msg.json"));
+var _query_msg = _interopRequireDefault(require("../../../../__fixtures__/basic/query_msg.json"));
 
 var _recoil = require("./recoil");
 
-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); }
+var _context = require("../context");
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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; }
+var _testUtils = require("../../test-utils");
 
-var expectCode = function expectCode(ast) {
-  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
-};
+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); }
 
-var printCode = function printCode(ast) {
-  console.log((0, _generator["default"])(ast).code);
-};
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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; }
 
+var ctx = new _context.RenderContext(_query_msg["default"]);
 it('selector', function () {
-  expectCode((0, _recoil.createRecoilSelector)('SG721', 'SG721QueryClient', 'governanceModules'));
+  (0, _testUtils.expectCode)((0, _recoil.createRecoilSelector)(ctx, 'SG721', 'SG721QueryClient', 'governanceModules'));
 });
 it('selectors', function () {
-  expectCode(t.program((0, _recoil.createRecoilSelectors)('SG721', 'SG721QueryClient', _query_msg["default"])));
+  (0, _testUtils.expectCode)(t.program((0, _recoil.createRecoilSelectors)(ctx, 'SG721', 'SG721QueryClient', _query_msg["default"])));
 });
 it('client', function () {
-  expectCode((0, _recoil.createRecoilQueryClient)('SG721', 'SG721QueryClient'));
+  (0, _testUtils.expectCode)((0, _recoil.createRecoilQueryClient)(ctx, 'SG721', 'SG721QueryClient'));
 });

package/main/utils/babel.spec.js

@@ -10,28 +10,20 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _babel = require("./babel");
 
-var _generator = _interopRequireDefault(require("@babel/generator"));
-
 var t = _interopRequireWildcard(require("@babel/types"));
 
+var _testUtils = require("../../test-utils");
+
 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 || _typeof(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; }
 
-var expectCode = function expectCode(ast) {
-  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
-};
-
-var printCode = function printCode(ast) {
-  console.log((0, _generator["default"])(ast).code);
-};
-
 it('top import', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
   return _regenerator["default"].wrap(function _callee$(_context) {
     while (1) {
       switch (_context.prev = _context.next) {
         case 0:
-          expectCode((0, _babel.importStmt)(['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'], '@cosmjs/cosmwasm-stargate'));
+          (0, _testUtils.expectCode)((0, _babel.importStmt)(['CosmWasmClient', 'ExecuteResult', 'SigningCosmWasmClient'], '@cosmjs/cosmwasm-stargate'));
 
         case 1:
         case "end":
@@ -45,7 +37,7 @@ it('interfaces', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_
     while (1) {
       switch (_context2.prev = _context2.next) {
         case 0:
-          expectCode(t.program([t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721ReadOnlyInstance'), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // methods
+          (0, _testUtils.expectCode)(t.program([t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721ReadOnlyInstance'), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // methods
           t.tSPropertySignature(t.identifier('tokens'), t.tsTypeAnnotation(t.tsFunctionType(null, [(0, _babel.typedIdentifier)('owner', t.tsTypeAnnotation(t.tsStringKeyword())), (0, _babel.typedIdentifier)('startAfter', t.tsTypeAnnotation(t.tsStringKeyword()), true), (0, _babel.typedIdentifier)('limit', t.tsTypeAnnotation(t.tsStringKeyword()), true)], (0, _babel.promiseTypeAnnotation)('TokensResponse'))))]))), // extends 
           t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier('SG721Instance'), null, [t.tSExpressionWithTypeArguments(t.identifier('SG721ReadOnlyInstance'))], t.tSInterfaceBody([// contract address
           t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // METHOD
@@ -63,7 +55,7 @@ it('readonly classes', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PUR
     while (1) {
       switch (_context3.prev = _context3.next) {
         case 0:
-          expectCode(t.program([t.exportNamedDeclaration((0, _babel.classDeclaration)('SG721QueryClient', [// client
+          (0, _testUtils.expectCode)(t.program([t.exportNamedDeclaration((0, _babel.classDeclaration)('SG721QueryClient', [// client
           (0, _babel.classProperty)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), // contractAddress
           (0, _babel.classProperty)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
           t.classMethod('constructor', t.identifier('constructor'), [(0, _babel.typedIdentifier)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), (0, _babel.typedIdentifier)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// client/contract set
@@ -86,7 +78,7 @@ it('mutation classes', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PUR
     while (1) {
       switch (_context4.prev = _context4.next) {
         case 0:
-          expectCode(t.program([t.exportNamedDeclaration((0, _babel.classDeclaration)('SG721Client', [// client
+          (0, _testUtils.expectCode)(t.program([t.exportNamedDeclaration((0, _babel.classDeclaration)('SG721Client', [// client
           (0, _babel.classProperty)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), // contractAddress
           (0, _babel.classProperty)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // constructor
           t.classMethod('constructor', t.identifier('constructor'), [(0, _babel.typedIdentifier)('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), (0, _babel.typedIdentifier)('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement([// super()
@@ -107,6 +99,6 @@ it('mutation classes', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PUR
 it('object parms', function () {
   var obj = t.objectPattern([t.objectProperty(t.identifier('includeExpired'), t.identifier('includeExpired'), false, true), t.objectProperty(t.identifier('tokenId'), t.identifier('tokenId'), false, true)]);
   obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([t.tsPropertySignature(t.identifier('includeExpired'), t.tsTypeAnnotation(t.tsBooleanKeyword())), t.tsPropertySignature(t.identifier('tokenId'), t.tsTypeAnnotation(t.tsStringKeyword()))]));
-  expectCode(t.program([t.expressionStatement(t.assignmentExpression('=', t.identifier('ownerOf'), (0, _babel.arrowFunctionExpression)([obj], t.blockStatement([// body
+  (0, _testUtils.expectCode)(t.program([t.expressionStatement(t.assignmentExpression('=', t.identifier('ownerOf'), (0, _babel.arrowFunctionExpression)([obj], t.blockStatement([// body
   ], []), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier('OwnerOfResponse'))]))))))]));
 });

package/main/utils/index.js

@@ -15,4 +15,17 @@ Object.keys(_babel).forEach(function (key) {
       return _babel[key];
     }
   });
+});
+
+var _types = require("./types");
+
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _types[key];
+    }
+  });
 });

package/main/utils/types.js

@@ -26,31 +26,15 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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; }
 
 var getTypeStrFromRef = function getTypeStrFromRef($ref) {
-  switch ($ref) {
-    case '#/definitions/Binary':
-      return 'Binary';
-
-    default:
-      if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
-        return $ref.replace('#/definitions/', '');
-      }
-
-      throw new Error('what is $ref: ' + $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) {
-  switch ($ref) {
-    case '#/definitions/Binary':
-      return t.tsTypeReference(t.identifier('Binary'));
-
-    default:
-      if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
-        return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
-      }
-
-      throw new Error('what is $ref: ' + $ref);
-  }
+  return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)));
 };
 
 exports.getTypeFromRef = getTypeFromRef;
@@ -89,7 +73,7 @@ var getType = function getType(type) {
 
 exports.getType = getType;
 
-var getPropertyType = function getPropertyType(schema, prop) {
+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 : {};
@@ -187,7 +171,7 @@ var getPropertyType = function getPropertyType(schema, prop) {
 
 exports.getPropertyType = getPropertyType;
 
-function getPropertySignatureFromProp(jsonschema, prop, camelize) {
+function getPropertySignatureFromProp(context, jsonschema, prop, camelize) {
   if (jsonschema.properties[prop].type === 'object') {
     if (jsonschema.properties[prop].title) {
       return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(jsonschema.properties[prop].title))));
@@ -237,45 +221,63 @@ function getPropertySignatureFromProp(jsonschema, prop, camelize) {
   }
 
   try {
-    getPropertyType(jsonschema, prop);
+    getPropertyType(context, jsonschema, prop);
   } catch (e) {
     console.log(e);
     console.log(jsonschema, prop);
   }
 
-  var _getPropertyType = getPropertyType(jsonschema, prop),
+  var _getPropertyType = getPropertyType(context, jsonschema, prop),
       type = _getPropertyType.type,
       optional = _getPropertyType.optional;
 
   return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
 }
 
-var getParamsTypeAnnotation = function getParamsTypeAnnotation(jsonschema) {
+var getParamsTypeAnnotation = function getParamsTypeAnnotation(context, jsonschema) {
   var _jsonschema$propertie;
 
-  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  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(jsonschema, prop, camelize);
+    return getPropertySignatureFromProp(context, jsonschema, prop, camelize);
   });
   return t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
 };
 
 exports.getParamsTypeAnnotation = getParamsTypeAnnotation;
 
-var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
+var createTypedObjectParams = function createTypedObjectParams(context, jsonschema) {
   var _jsonschema$propertie2;
 
-  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  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) return; // const typedParams = keys.map(prop => getPropertySignatureFromProp(jsonschema, prop, camelize));
+
+  if (!keys.length) {
+    // is there a ref?
+    if (jsonschema.$ref) {
+      var _obj = context.refLookup(jsonschema.$ref);
+
+      if (_obj) {
+        return createTypedObjectParams(context, _obj, camelize);
+      }
+    } // 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);
   });
   var obj = t.objectPattern((0, _toConsumableArray2["default"])(params));
-  obj.typeAnnotation = getParamsTypeAnnotation(jsonschema, camelize);
+  obj.typeAnnotation = getParamsTypeAnnotation(context, jsonschema, camelize);
   return obj;
 };
 

package/module/{wasm.js → client/client.js}

@@ -1,25 +1,24 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
-import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
-import { getPropertyType, getType, createTypedObjectParams } from './utils/types';
-import { identifier, tsTypeOperator, propertySignature } from './utils/babel';
-export const createWasmQueryMethod = jsonschema => {
+import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from '../utils';
+import { getPropertyType, getType, createTypedObjectParams } 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)];
+export const createWasmQueryMethod = (context, jsonschema) => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
   const responseType = pascal(`${methodName}Response`);
-  const properties = jsonschema.properties[underscoreName].properties ?? {};
-  const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
-  const args = Object.keys(properties).map(prop => {
-    return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, true);
-  });
+  const obj = 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));
 };
-export const createQueryClass = (className, implementsClassName, queryMsg) => {
+export const createQueryClass = (context, className, implementsClassName, queryMsg) => {
   const propertyNames = getMessageProperties(queryMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
   const methods = getMessageProperties(queryMsg).map(schema => {
-    return createWasmQueryMethod(schema);
+    return createWasmQueryMethod(context, schema);
   });
   return t.exportNamedDeclaration(classDeclaration(className, [// client
   classProperty('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('CosmWasmClient')))), // contractAddress
@@ -27,24 +26,36 @@ export const createQueryClass = (className, implementsClassName, queryMsg) => {
   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 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(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
-export const createWasmExecMethod = jsonschema => {
-  const underscoreName = Object.keys(jsonschema.properties)[0];
-  const methodName = camel(underscoreName);
-  const properties = jsonschema.properties[underscoreName].properties ?? {};
-  const obj = createTypedObjectParams(jsonschema.properties[underscoreName]);
-  const args = Object.keys(properties).map(prop => {
+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);
+
+    if (obj) {
+      keys = Object.keys(obj.properties ?? {});
+    }
+  }
+
+  const args = keys.map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(camel(prop)), false, prop === camel(prop));
   });
+  return args;
+};
+export const createWasmExecMethod = (context, jsonschema) => {
+  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]);
   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
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
-export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
+export const createExecuteClass = (context, className, implementsClassName, extendsClassName, execMsg) => {
   const propertyNames = getMessageProperties(execMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
   const methods = getMessageProperties(execMsg).map(schema => {
-    return createWasmExecMethod(schema);
+    return createWasmExecMethod(context, schema);
   });
   const blockStmt = [];
 
@@ -61,19 +72,19 @@ export const createExecuteClass = (className, implementsClassName, extendsClassN
   classProperty('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword())), // 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 = (className, extendsClassName, execMsg) => {
+export const createExecuteInterface = (context, className, extendsClassName, execMsg) => {
   const methods = getMessageProperties(execMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
-    return createPropertyFunctionWithObjectParamsForExec(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
+    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
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
-export const createPropertyFunctionWithObjectParams = (methodName, responseType, jsonschema) => {
-  const obj = createTypedObjectParams(jsonschema);
+export const createPropertyFunctionWithObjectParams = (context, methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(context, jsonschema);
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
@@ -81,9 +92,8 @@ export const createPropertyFunctionWithObjectParams = (methodName, responseType,
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
-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(tsTypeOperator(t.tsArrayType(t.tsTypeReference(t.identifier('Coin'))), 'readonly')), true)];
-export const createPropertyFunctionWithObjectParamsForExec = (methodName, responseType, jsonschema) => {
-  const obj = createTypedObjectParams(jsonschema);
+export const createPropertyFunctionWithObjectParamsForExec = (context, methodName, responseType, jsonschema) => {
+  const obj = createTypedObjectParams(context, jsonschema);
   const func = {
     type: 'TSFunctionType',
     typeAnnotation: promiseTypeAnnotation(responseType),
@@ -91,16 +101,16 @@ export const createPropertyFunctionWithObjectParamsForExec = (methodName, respon
   };
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
-export const createQueryInterface = (className, queryMsg) => {
+export const createQueryInterface = (context, className, queryMsg) => {
   const methods = getMessageProperties(queryMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
     const responseType = pascal(`${methodName}Response`);
-    return createPropertyFunctionWithObjectParams(methodName, responseType, jsonschema.properties[underscoreName]);
+    return createPropertyFunctionWithObjectParams(context, methodName, responseType, jsonschema.properties[underscoreName]);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
-export const createTypeOrInterface = (Type, jsonschema) => {
+export const createTypeOrInterface = (context, Type, jsonschema) => {
   if (jsonschema.type !== 'object') {
     if (!jsonschema.type) {
       return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(jsonschema.title))));
@@ -113,12 +123,12 @@ export const createTypeOrInterface = (Type, jsonschema) => {
     const {
       type,
       optional
-    } = getPropertyType(jsonschema, prop);
+    } = getPropertyType(context, jsonschema, prop);
     return propertySignature(camel(prop), t.tsTypeAnnotation(type), optional);
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(Type), null, [], t.tsInterfaceBody([...props])));
 };
-export const createTypeInterface = jsonschema => {
+export const createTypeInterface = (context, jsonschema) => {
   const Type = jsonschema.title;
-  return createTypeOrInterface(Type, jsonschema);
+  return createTypeOrInterface(context, Type, jsonschema);
 };

package/module/client/index.js

@@ -0,0 +1 @@
+export * from './client';

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

@@ -0,0 +1,17 @@
+import message from '../../../../../__fixtures__/misc/schema/arrays.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(message);
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(ctx, message));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', message));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, message));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, message));
+});

package/module/client/test/ts-client.cw-named-groups.test.js

@@ -0,0 +1,17 @@
+import execute_msg from '../../../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(execute_msg);
+it('execute_msg', () => {
+  expectCode(createTypeInterface(ctx, execute_msg));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
+});

package/module/client/test/ts-client.cw-proposal-single.test.js

@@ -0,0 +1,21 @@
+import execute_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/execute_msg.json';
+import query_msg from '../../../../../__fixtures__/daodao/cw-proposal-single/query_msg.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+it('execute_msg_for', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createTypeInterface(ctx, execute_msg));
+});
+it('query classes', () => {
+  const ctx = new RenderContext(query_msg);
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('execute classes array types', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute interfaces no extends', () => {
+  const ctx = new RenderContext(execute_msg);
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg));
+});

package/module/client/test/ts-client.empty-enums.spec.js

@@ -0,0 +1,11 @@
+import query_msg from '../../../../../__fixtures__/daodao/cw-admin-factory/query_msg.json';
+import { createQueryClass, createQueryInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(query_msg);
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('query interface', () => {
+  expectCode(createQueryInterface(ctx, 'ReadOnlyInstance', query_msg));
+});

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

@@ -0,0 +1,17 @@
+import execute_msg_for__empty from '../../../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from '../client';
+import { RenderContext } from '../../context';
+import { expectCode } from '../../../test-utils';
+const ctx = new RenderContext(execute_msg_for__empty);
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(ctx, execute_msg_for__empty));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(ctx, 'SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass(ctx, 'SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface(ctx, 'SG721Instance', null, execute_msg_for__empty));
+});