wasm-ast-types 0.3.1 → 0.3.2

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');
       }
@@ -199,17 +189,15 @@ 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 oneOf = JSON.stringify(jsonschema.properties[prop].oneOf, null, 2);
-
       var _isOptional = !((_jsonschema$required2 = jsonschema.required) !== null && _jsonschema$required2 !== void 0 && _jsonschema$required2.includes(prop));
 
       var _unionTypes = jsonschema.properties[prop].oneOf.map(function (el) {
@@ -220,10 +208,10 @@ 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);
       }
     }

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/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,7 +136,7 @@ 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');
       }
@@ -158,12 +151,11 @@ 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(forEmptyNameFix(typ)))))), isOptional);
+        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 oneOf = JSON.stringify(jsonschema.properties[prop].oneOf, null, 2);
       const isOptional = !jsonschema.required?.includes(prop);
       const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
         if (el.title) return el.title;
@@ -172,9 +164,9 @@ 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(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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "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",
@@ -85,5 +85,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "aade6ffc08df51adc9922d4cd813fe8ef5bebfa1"
+  "gitHead": "bf8f96d8f70a2bdfff2f210dc07c26c14575478b"
 }