wasm-ast-types 0.3.0 → 0.3.3

package/main/utils/types.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getType = exports.getPropertyType = exports.forEmptyNameFix = exports.createTypedObjectParams = void 0;
+exports.getType = exports.getPropertyType = exports.createTypedObjectParams = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
@@ -23,16 +23,6 @@ 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 forEmptyNameFix = function forEmptyNameFix(name) {
-  if (name.endsWith('For_Empty')) {
-    return name.replace(/For_Empty$/, '_for_Empty');
-  }
-
-  return name;
-};
-
-exports.forEmptyNameFix = forEmptyNameFix;
-
 var getTypeFromRef = function getTypeFromRef($ref) {
   switch ($ref) {
     case '#/definitions/Binary':
@@ -182,7 +172,7 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
   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(forEmptyNameFix(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');
       }
@@ -191,7 +181,6 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
     if (Array.isArray(jsonschema.properties[prop].allOf)) {
       var _jsonschema$required;
 
-      var allOf = JSON.stringify(jsonschema.properties[prop].allOf, null, 2);
       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;
@@ -200,12 +189,31 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
       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(forEmptyNameFix(uniqUnionTypes[0])))), isOptional);
+        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(forEmptyNameFix(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;
+        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 {

package/main/wasm.js

@@ -163,7 +163,7 @@ var createTypeOrInterface = function createTypeOrInterface(Type, jsonschema) {
 
   if (jsonschema.type !== 'object') {
     if (!jsonschema.type) {
-      return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier((0, _types2.forEmptyNameFix)(jsonschema.title)))));
+      return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(jsonschema.title))));
     }
 
     return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, (0, _types2.getType)(jsonschema.type)));

package/main/wasm.vectis.spec.js

@@ -4,9 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _cosmos_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/vectis/cosmos_msg_for__empty.json"));
+var _cosmos_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/vectis/govec/cosmos_msg_for__empty.json"));
 
-var _execute_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/vectis/execute_msg_for__empty.json"));
+var _execute_msg_for__empty = _interopRequireDefault(require("./../../../__fixtures__/vectis/govec/execute_msg_for__empty.json"));
+
+var _can_execute_relay_response = _interopRequireDefault(require("./../../../__fixtures__/vectis/govec/can_execute_relay_response.json"));
+
+var _info_response = _interopRequireDefault(require("./../../../__fixtures__/vectis/govec/info_response.json"));
+
+var _relay_transaction = _interopRequireDefault(require("./../../../__fixtures__/vectis/govec/relay_transaction.json"));
 
 var _wasm = require("./wasm");
 
@@ -24,6 +30,15 @@ it('cosmos_msg_for__empty', function () {
 it('execute_msg_for__empty', function () {
   expectCode((0, _wasm.createTypeInterface)(_execute_msg_for__empty["default"]));
 });
+it('can_execute_relay_response', function () {
+  expectCode((0, _wasm.createTypeInterface)(_can_execute_relay_response["default"]));
+});
+it('info_response', function () {
+  expectCode((0, _wasm.createTypeInterface)(_info_response["default"]));
+});
+it('relay_transaction', function () {
+  expectCode((0, _wasm.createTypeInterface)(_relay_transaction["default"]));
+});
 it('query classes', function () {
   expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _cosmos_msg_for__empty["default"]));
 });

package/module/utils/types.js

@@ -1,13 +1,6 @@
 import * as t from '@babel/types';
 import { camel } from 'case';
 import { propertySignature } from './babel';
-export const forEmptyNameFix = name => {
-  if (name.endsWith('For_Empty')) {
-    return name.replace(/For_Empty$/, '_for_Empty');
-  }
-
-  return name;
-};
 
 const getTypeFromRef = $ref => {
   switch ($ref) {
@@ -143,14 +136,13 @@ export const createTypedObjectParams = (jsonschema, camelize = true) => {
   const typedParams = keys.map(prop => {
     if (jsonschema.properties[prop].type === 'object') {
       if (jsonschema.properties[prop].title) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(forEmptyNameFix(jsonschema.properties[prop].title)))));
+        return propertySignature(camelize ? 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)) {
-      const allOf = JSON.stringify(jsonschema.properties[prop].allOf, null, 2);
       const isOptional = !jsonschema.required?.includes(prop);
       const unionTypes = jsonschema.properties[prop].allOf.map(el => {
         if (el.title) return el.title;
@@ -159,9 +151,22 @@ export const createTypedObjectParams = (jsonschema, camelize = true) => {
       const uniqUnionTypes = [...new Set(unionTypes)];
 
       if (uniqUnionTypes.length === 1) {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(forEmptyNameFix(uniqUnionTypes[0])))), isOptional);
+        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
+      } else {
+        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
+      }
+    } else if (Array.isArray(jsonschema.properties[prop].oneOf)) {
+      const isOptional = !jsonschema.required?.includes(prop);
+      const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
+        if (el.title) return el.title;
+        return el.type;
+      });
+      const uniqUnionTypes = [...new Set(unionTypes)];
+
+      if (uniqUnionTypes.length === 1) {
+        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsTypeReference(t.identifier(uniqUnionTypes[0]))), isOptional);
       } else {
-        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(forEmptyNameFix(typ)))))), isOptional);
+        return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(t.tsUnionType(uniqUnionTypes.map(typ => t.tsTypeReference(t.identifier(typ))))), isOptional);
       }
     }
 

package/module/wasm.js

@@ -1,7 +1,7 @@
 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, forEmptyNameFix } from './utils/types';
+import { getPropertyType, getType, createTypedObjectParams } from './utils/types';
 import { identifier, tsTypeOperator, propertySignature } from './utils/babel';
 export const createWasmQueryMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
@@ -103,7 +103,7 @@ export const createQueryInterface = (className, queryMsg) => {
 export const createTypeOrInterface = (Type, jsonschema) => {
   if (jsonschema.type !== 'object') {
     if (!jsonschema.type) {
-      return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(forEmptyNameFix(jsonschema.title)))));
+      return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, t.tsTypeReference(t.identifier(jsonschema.title))));
     }
 
     return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, getType(jsonschema.type)));

package/module/wasm.vectis.spec.js

@@ -1,6 +1,9 @@
 import generate from '@babel/generator';
-import cosmos_msg_for__empty from './../../../__fixtures__/vectis/cosmos_msg_for__empty.json';
-import execute_msg_for__empty from './../../../__fixtures__/vectis/execute_msg_for__empty.json';
+import cosmos_msg_for__empty from './../../../__fixtures__/vectis/govec/cosmos_msg_for__empty.json';
+import execute_msg_for__empty from './../../../__fixtures__/vectis/govec/execute_msg_for__empty.json';
+import can_execute_relay_response from './../../../__fixtures__/vectis/govec/can_execute_relay_response.json';
+import info_response from './../../../__fixtures__/vectis/govec/info_response.json';
+import relay_transaction from './../../../__fixtures__/vectis/govec/relay_transaction.json';
 import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
 
 const expectCode = ast => {
@@ -17,6 +20,15 @@ it('cosmos_msg_for__empty', () => {
 it('execute_msg_for__empty', () => {
   expectCode(createTypeInterface(execute_msg_for__empty));
 });
+it('can_execute_relay_response', () => {
+  expectCode(createTypeInterface(can_execute_relay_response));
+});
+it('info_response', () => {
+  expectCode(createTypeInterface(info_response));
+});
+it('relay_transaction', () => {
+  expectCode(createTypeInterface(relay_transaction));
+});
 it('query classes', () => {
   expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', cosmos_msg_for__empty));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.3.0",
+  "version": "0.3.3",
   "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",
@@ -42,48 +42,48 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types"
+    "url": "https://github.com/pyramation/cosmwasm-typescript-gen"
   },
   "keywords": [],
   "bugs": {
-    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types/issues"
+    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/issues"
   },
   "devDependencies": {
-    "@babel/cli": "7.17.6",
-    "@babel/core": "7.17.8",
-    "@babel/eslint-parser": "^7.5.4",
-    "@babel/generator": "7.17.7",
-    "@babel/node": "^7.10.5",
-    "@babel/parser": "^7.17.8",
-    "@babel/plugin-proposal-class-properties": "7.16.7",
-    "@babel/plugin-proposal-export-default-from": "7.16.7",
-    "@babel/plugin-proposal-object-rest-spread": "7.17.3",
-    "@babel/plugin-transform-runtime": "7.17.0",
-    "@babel/preset-env": "7.16.11",
-    "@babel/preset-typescript": "^7.16.7",
-    "@babel/traverse": "7.17.3",
-    "@types/jest": "^27.4.1",
+    "@babel/cli": "7.17.10",
+    "@babel/core": "7.18.5",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/generator": "7.18.2",
+    "@babel/node": "^7.18.5",
+    "@babel/parser": "^7.18.5",
+    "@babel/plugin-proposal-class-properties": "7.17.12",
+    "@babel/plugin-proposal-export-default-from": "7.17.12",
+    "@babel/plugin-proposal-object-rest-spread": "7.18.0",
+    "@babel/plugin-transform-runtime": "7.18.5",
+    "@babel/preset-env": "7.18.2",
+    "@babel/preset-typescript": "^7.17.12",
+    "@babel/traverse": "7.18.5",
+    "@types/jest": "^28.1.2",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "27.5.1",
+    "babel-jest": "28.1.1",
     "babel-watch": "^7.0.0",
     "cross-env": "^7.0.2",
-    "eslint": "8.12.0",
+    "eslint": "8.17.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "glob": "7.2.0",
-    "jest": "^27.5.1",
+    "glob": "8.0.3",
+    "jest": "^28.1.1",
     "jest-in-case": "^1.0.2",
     "mkdirp": "1.0.4",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "regenerator-runtime": "^0.13.7",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.6.2"
+    "ts-jest": "^28.0.5",
+    "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@babel/runtime": "^7.11.2",
-    "@babel/types": "7.17.0",
+    "@babel/runtime": "^7.18.3",
+    "@babel/types": "7.18.4",
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "0e1c21c1c495002883f9511bb1dd693c468af0a6"
+  "gitHead": "9d21c3edc37a05d3c4329ee286b92e59f9383b28"
 }