wasm-ast-types 0.2.5 → 0.3.1

package/module/wasm.js

@@ -1,123 +1,8 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression, getMessageProperties } from './utils';
-
-const getTypeFromRef = $ref => {
-  switch ($ref) {
-    case '#/definitions/Binary':
-      return t.tsTypeReference(t.identifier('Binary'));
-
-    default:
-      if ($ref.startsWith('#/definitions/')) {
-        return t.tsTypeReference(t.identifier($ref.replace('#/definitions/', '')));
-      }
-
-      throw new Error('what is $ref: ' + $ref);
-  }
-};
-
-const getArrayTypeFromRef = $ref => {
-  return t.tsArrayType(getTypeFromRef($ref));
-};
-
-const getArrayTypeFromType = type => {
-  return t.tsArrayType(getType(type));
-};
-
-export const identifier = (name, typeAnnotation, optional = false) => {
-  const type = t.identifier(name);
-  type.typeAnnotation = typeAnnotation;
-  type.optional = optional;
-  return type;
-};
-
-const getType = type => {
-  switch (type) {
-    case 'string':
-      return t.tsStringKeyword();
-
-    case 'boolean':
-      return t.tSBooleanKeyword();
-
-    case 'integer':
-      return t.tsNumberKeyword();
-
-    default:
-      throw new Error('what is type: ' + type);
-  }
-};
-
-export const getPropertyType = (schema, prop) => {
-  const props = schema.properties ?? {};
-  let info = props[prop];
-  let type = null;
-  let optional = schema.required?.includes(prop);
-
-  if (info.allOf && info.allOf.length === 1) {
-    info = info.allOf[0];
-  }
-
-  if (typeof info.$ref === 'string') {
-    type = getTypeFromRef(info.$ref);
-  }
-
-  if (Array.isArray(info.anyOf)) {
-    // assuming 2nd is null, but let's check to ensure
-    if (info.anyOf.length !== 2) {
-      throw new Error('case not handled by transpiler. contact maintainers.');
-    }
-
-    const [nullableType, nullType] = info.anyOf;
-
-    if (nullType?.type !== 'null') {
-      throw new Error('case not handled by transpiler. contact maintainers.');
-    }
-
-    type = getTypeFromRef(nullableType?.$ref);
-    optional = true;
-  }
-
-  if (typeof info.type === 'string') {
-    if (info.type === 'array') {
-      if (info.items.$ref) {
-        type = getArrayTypeFromRef(info.items.$ref);
-      } else {
-        type = getArrayTypeFromType(info.items.type);
-      }
-    } else {
-      type = getType(info.type);
-    }
-  }
-
-  if (Array.isArray(info.type)) {
-    // assuming 2nd is null, but let's check to ensure
-    if (info.type.length !== 2) {
-      throw new Error('case not handled by transpiler. contact maintainers.');
-    }
-
-    const [nullableType, nullType] = info.type;
-
-    if (nullType !== 'null') {
-      throw new Error('case not handled by transpiler. contact maintainers.');
-    }
-
-    type = getType(nullableType);
-    optional = true;
-  }
-
-  if (!type) {
-    throw new Error('cannot find type for ' + JSON.stringify(info));
-  }
-
-  if (schema.required?.includes(prop)) {
-    optional = false;
-  }
-
-  return {
-    type,
-    optional
-  };
-};
+import { getPropertyType, getType, createTypedObjectParams, forEmptyNameFix } from './utils/types';
+import { identifier, tsTypeOperator, propertySignature } from './utils/babel';
 export const createWasmQueryMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -142,13 +27,6 @@ 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))]));
 };
-
-const tsTypeOperator = (typeAnnotation, operator) => {
-  const obj = t.tsTypeOperator(typeAnnotation);
-  obj.operator = operator;
-  return obj;
-};
-
 export const createWasmExecMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -194,39 +72,6 @@ export const createExecuteInterface = (className, extendsClassName, execMsg) =>
   t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
-export const propertySignature = (name, typeAnnotation, optional = false) => {
-  // prop.leadingComments = [{
-  //   type: 'Comment',
-  //   value: ' Data on the token itself'
-  // }];
-  // prop.leadingComments = [{
-  //   type: 'CommentBlock',
-  //   value: '* Data on the token itself'
-  // }];
-  return {
-    type: 'TSPropertySignature',
-    key: t.identifier(name),
-    typeAnnotation,
-    optional
-  };
-};
-export const createTypedObjectParams = (jsonschema, camelize = true) => {
-  const keys = Object.keys(jsonschema.properties ?? {});
-  if (!keys.length) return;
-  const typedParams = keys.map(prop => {
-    const {
-      type,
-      optional
-    } = getPropertyType(jsonschema, prop);
-    return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
-  });
-  const params = keys.map(prop => {
-    return t.objectProperty(camelize ? t.identifier(camel(prop)) : t.identifier(prop), camelize ? t.identifier(camel(prop)) : t.identifier(prop), false, true);
-  });
-  const obj = t.objectPattern([...params]);
-  obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
-  return obj;
-};
 export const createPropertyFunctionWithObjectParams = (methodName, responseType, jsonschema) => {
   const obj = createTypedObjectParams(jsonschema);
   const func = {
@@ -257,6 +102,10 @@ 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, getType(jsonschema.type)));
   }
 

package/module/wasm.sg721.spec.js

@@ -0,0 +1,24 @@
+import generate from '@babel/generator';
+import execute_msg_for__empty from './../../../__fixtures__/sg721/execute_msg_for__empty.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('execute_msg_for__empty', () => {
+  expectCode(createTypeInterface(execute_msg_for__empty));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, execute_msg_for__empty));
+});

package/module/wasm.spec.js

@@ -1,17 +1,18 @@
 import generate from '@babel/generator';
-import query_msg from './__fixtures__/schema/query_msg.json';
-import execute_msg from './__fixtures__/schema/execute_msg_for__empty.json';
-import approval_response from './__fixtures__/schema/approval_response.json';
-import all_nft_info_response from './__fixtures__/schema/all_nft_info_response.json';
-import approvals_response from './__fixtures__/schema/approvals_response.json';
-import collection_info_response from './__fixtures__/schema/collection_info_response.json';
-import contract_info_response from './__fixtures__/schema/contract_info_response.json';
-import instantiate_msg from './__fixtures__/schema/instantiate_msg.json';
-import nft_info_response from './__fixtures__/schema/nft_info_response.json';
-import num_tokens_response from './__fixtures__/schema/num_tokens_response.json';
-import operators_response from './__fixtures__/schema/operators_response.json';
-import owner_of_response from './__fixtures__/schema/owner_of_response.json';
-import tokens_response from './__fixtures__/schema/tokens_response.json';
+import execute_msg_named_groups from './../../../__fixtures__/cw-named-groups/execute_msg.json';
+import query_msg from './../../../__fixtures__/basic/query_msg.json';
+import execute_msg from './../../../__fixtures__/basic/execute_msg_for__empty.json';
+import approval_response from './../../../__fixtures__/basic/approval_response.json';
+import all_nft_info_response from './../../../__fixtures__/basic/all_nft_info_response.json';
+import approvals_response from './../../../__fixtures__/basic/approvals_response.json';
+import collection_info_response from './../../../__fixtures__/basic/collection_info_response.json';
+import contract_info_response from './../../../__fixtures__/basic/contract_info_response.json';
+import instantiate_msg from './../../../__fixtures__/basic/instantiate_msg.json';
+import nft_info_response from './../../../__fixtures__/basic/nft_info_response.json';
+import num_tokens_response from './../../../__fixtures__/basic/num_tokens_response.json';
+import operators_response from './../../../__fixtures__/basic/operators_response.json';
+import owner_of_response from './../../../__fixtures__/basic/owner_of_response.json';
+import tokens_response from './../../../__fixtures__/basic/tokens_response.json';
 import { createQueryClass, createQueryInterface, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
 
 const expectCode = ast => {
@@ -64,6 +65,9 @@ it('execute classes', () => {
 it('execute classes no extends', () => {
   expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg));
 });
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg_named_groups));
+});
 it('execute interfaces no extends', () => {
   expectCode(createExecuteInterface('SG721Instance', null, execute_msg));
 });

package/module/wasm.vectis.spec.js

@@ -0,0 +1,43 @@
+import generate from '@babel/generator';
+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 => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('cosmos_msg_for__empty', () => {
+  expectCode(createTypeInterface(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));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg_for__empty));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg_for__empty));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, execute_msg_for__empty));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "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": "4e067214d530188822eca31ddbeb6eb9ec3ba462"
+  "gitHead": "aade6ffc08df51adc9922d4cd813fe8ef5bebfa1"
 }