wasm-ast-types 0.4.3 → 0.6.0

package/main/{react-query.spec.js → react-query/react-query.spec.js}

@@ -4,69 +4,66 @@ 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 _reactQuery = require("./react-query");
+var _execute_msg_for__empty = _interopRequireDefault(require("../../../../__fixtures__/basic/execute_msg_for__empty.json"));
 
-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 _reactQuery = require("./react-query");
 
-var expectCode = function expectCode(ast) {
-  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
-};
+var _testUtils = require("../../test-utils");
 
-var printCode = function printCode(ast) {
-  console.log((0, _generator["default"])(ast).code);
-}; // it('createReactQueryHook', () => {
-//   printCode(createReactQueryHook({
-//     methodName: 'allNftInfo',
-//     hookName: 'useSg721AllNftInfoQuery',
-//     hookParamsTypeName: 'Sg721CollectionInfoQuery',
-//     responseType: 'AllNftInfoResponse',
-//     hookKeyName: 'Sg721AllNftInfo'
-//   }))
-// });
+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 execCtx = new _context.RenderContext(_execute_msg_for__empty["default"]);
+var queryCtx = new _context.RenderContext(_query_msg["default"]);
 it('createReactQueryHooks', function () {
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
+    context: queryCtx,
     queryMsg: _query_msg["default"],
     contractName: 'Sg721',
     QueryClient: 'Sg721QueryClient'
   })));
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
+    context: new _context.RenderContext(_query_msg["default"], {
+      reactQuery: {
+        optionalClient: true
+      }
+    }),
     queryMsg: _query_msg["default"],
     contractName: 'Sg721',
     QueryClient: 'Sg721QueryClient'
   })));
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
+    context: new _context.RenderContext(_query_msg["default"], {
+      reactQuery: {
+        v4: true
+      }
+    }),
     queryMsg: _query_msg["default"],
     contractName: 'Sg721',
-    QueryClient: 'Sg721QueryClient',
-    options: {
-      optionalClient: true
-    }
+    QueryClient: 'Sg721QueryClient'
   })));
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryHooks)({
+    context: new _context.RenderContext(_query_msg["default"], {
+      reactQuery: {
+        optionalClient: true,
+        v4: true
+      }
+    }),
     queryMsg: _query_msg["default"],
     contractName: 'Sg721',
-    QueryClient: 'Sg721QueryClient',
-    options: {
-      v4: true
-    }
+    QueryClient: 'Sg721QueryClient'
   })));
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
-    queryMsg: _query_msg["default"],
+  (0, _testUtils.expectCode)(t.program((0, _reactQuery.createReactQueryMutationHooks)({
+    context: execCtx,
+    execMsg: _execute_msg_for__empty["default"],
     contractName: 'Sg721',
-    QueryClient: 'Sg721QueryClient',
-    options: {
-      optionalClient: true,
-      v4: true
-    }
+    ExecuteClient: 'Sg721Client'
   })));
 });

package/main/recoil/index.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _recoil = require("./recoil");
+
+Object.keys(_recoil).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _recoil[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _recoil[key];
+    }
+  });
+});

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.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.optionalConditionalExpression = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
+exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.pickTypeReference = exports.parameterizedTypeReference = exports.optionalConditionalExpression = exports.omitTypeReference = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
 
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 
@@ -21,6 +21,7 @@ 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; }
 
+// t.TSPropertySignature - kind?
 var propertySignature = function propertySignature(name, typeAnnotation) {
   var optional = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return {
@@ -279,4 +280,29 @@ var typeRefOrOptionalUnion = function typeRefOrOptionalUnion(identifier) {
   return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
 };
 
-exports.typeRefOrOptionalUnion = typeRefOrOptionalUnion;
+exports.typeRefOrOptionalUnion = typeRefOrOptionalUnion;
+
+var parameterizedTypeReference = function parameterizedTypeReference(identifier, from, omit) {
+  return t.tsTypeReference(t.identifier(identifier), t.tsTypeParameterInstantiation([from, typeof omit === 'string' ? t.tsLiteralType(t.stringLiteral(omit)) : t.tsUnionType(omit.map(function (o) {
+    return t.tsLiteralType(t.stringLiteral(o));
+  }))]));
+};
+/**
+ * omitTypeReference(t.tsTypeReference(t.identifier('Cw4UpdateMembersMutation'),),'args').....
+ * Omit<Cw4UpdateMembersMutation, 'args'>
+ */
+
+
+exports.parameterizedTypeReference = parameterizedTypeReference;
+
+var omitTypeReference = function omitTypeReference(from, omit) {
+  return parameterizedTypeReference('Omit', from, omit);
+};
+
+exports.omitTypeReference = omitTypeReference;
+
+var pickTypeReference = function pickTypeReference(from, pick) {
+  return parameterizedTypeReference('Pick', from, pick);
+};
+
+exports.pickTypeReference = pickTypeReference;

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

@@ -7,7 +7,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getType = exports.getPropertyType = exports.createTypedObjectParams = void 0;
+exports.getParamsTypeAnnotation = exports.createTypedObjectParams = void 0;
+exports.getPropertySignatureFromProp = getPropertySignatureFromProp;
+exports.getTypeFromRef = exports.getType = exports.getPropertyType = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -24,33 +26,19 @@ 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;
+
 var getArrayTypeFromRef = function getArrayTypeFromRef($ref) {
   return t.tsArrayType(getTypeFromRef($ref));
 };
@@ -85,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 : {};
@@ -183,79 +171,113 @@ var getPropertyType = function getPropertyType(schema, prop) {
 
 exports.getPropertyType = getPropertyType;
 
-var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
+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))));
+    } else {
+      throw new Error('createTypedObjectParams() 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;
+    });
+    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 {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(function (typ) {
+        return t.tsTypeReference(t.identifier(typ));
+      }))), isOptional);
+    }
+  } 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;
+    });
+
+    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 {
+      return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(_uniqUnionTypes.map(function (typ) {
+        return t.tsTypeReference(t.identifier(typ));
+      }))), _isOptional);
+    }
+  }
+
+  try {
+    getPropertyType(context, jsonschema, prop);
+  } catch (e) {
+    console.log(e);
+    console.log(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(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) return;
-  var typedParams = keys.map(function (prop) {
-    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))));
-      } else {
-        throw new Error('createTypedObjectParams() contact maintainer');
-      }
-    }
 
-    if (Array.isArray(jsonschema.properties[prop].allOf)) {
-      var _jsonschema$required;
+  if (!keys.length && jsonschema.$ref) {
+    return t.tsTypeAnnotation(getTypeFromRef(jsonschema.$ref));
+  }
 
-      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;
-      });
-      var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
+  if (!keys.length) return undefined;
+  var typedParams = keys.map(function (prop) {
+    return getPropertySignatureFromProp(context, jsonschema, prop, camelize);
+  });
+  return t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
+};
 
-      if (uniqUnionTypes.length === 1) {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
-      } else {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(function (typ) {
-          return t.tsTypeReference(t.identifier(typ));
-        }))), isOptional);
-      }
-    } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
-      var _jsonschema$required2;
+exports.getParamsTypeAnnotation = getParamsTypeAnnotation;
 
-      var _isOptional = !((_jsonschema$required2 = jsonschema.required) !== null && _jsonschema$required2 !== void 0 && _jsonschema$required2.includes(prop));
+var createTypedObjectParams = function createTypedObjectParams(context, jsonschema) {
+  var _jsonschema$propertie2;
 
-      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;
-      });
+  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 : {});
 
-      var _uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(_unionTypes));
+  if (!keys.length) {
+    // is there a ref?
+    if (jsonschema.$ref) {
+      var _obj = context.refLookup(jsonschema.$ref);
 
-      if (_uniqUnionTypes.length === 1) {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(_uniqUnionTypes[0]))), _isOptional);
-      } else {
-        return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(_uniqUnionTypes.map(function (typ) {
-          return t.tsTypeReference(t.identifier(typ));
-        }))), _isOptional);
+      if (_obj) {
+        return createTypedObjectParams(context, _obj, camelize);
       }
-    }
+    } // no results...
 
-    try {
-      getPropertyType(jsonschema, prop);
-    } catch (e) {
-      console.log(e);
-      console.log(jsonschema, prop);
-    }
 
-    var _getPropertyType = getPropertyType(jsonschema, prop),
-        type = _getPropertyType.type,
-        optional = _getPropertyType.optional;
+    return;
+  }
 
-    return (0, _babel.propertySignature)(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
-  });
   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 = t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
+  obj.typeAnnotation = getParamsTypeAnnotation(context, jsonschema, camelize);
   return obj;
 };