wasm-ast-types 0.24.0 → 0.26.0

package/module/utils/types.js

@@ -3,52 +3,43 @@ import { camel, pascal } from 'case';
 import { propertySignature } from './babel';
 export function getResponseType(context, underscoreName) {
   const methodName = camel(underscoreName);
-  return pascal(context.contract?.responses?.[underscoreName]?.title ?? // after v1.1 is adopted, we can deprecate this and require the above response
+  return pascal(context.contract?.responses?.[underscoreName]?.title ??
+  // after v1.1 is adopted, we can deprecate this and require the above response
   `${methodName}Response`);
 }
 ;
-
 const getTypeStrFromRef = $ref => {
   if ($ref?.startsWith('#/definitions/')) {
     return $ref.replace('#/definitions/', '');
   }
-
   throw new Error('what is $ref: ' + $ref);
 };
-
 export const getTypeFromRef = $ref => {
   return t.tsTypeReference(t.identifier(getTypeStrFromRef($ref)));
 };
-
 const getArrayTypeFromRef = $ref => {
   return t.tsArrayType(getTypeFromRef($ref));
 };
-
 const getTypeOrRef = obj => {
   if (obj.type) {
     return getType(obj.type);
   }
-
   if (obj.$ref) {
     return getTypeFromRef(obj.$ref);
   }
-
   throw new Error('contact maintainers cannot find type for ' + obj);
 };
-
 const getArrayTypeFromItems = items => {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
     if (items[0]?.type === 'array') {
       return getArrayTypeFromItems(items[0]);
     }
-
     return t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])));
-  } // passing in {"items": [{"type":"string"}]}
-
+  }
 
+  // passing in {"items": [{"type":"string"}]}
   const detect = detectType(items.type);
-
   if (detect.type === 'array') {
     if (Array.isArray(items.items)) {
       return t.tsArrayType(t.tsArrayType(getTypeOrRef(items.items[0])));
@@ -56,31 +47,24 @@ const getArrayTypeFromItems = items => {
       return t.tsArrayType(getArrayTypeFromItems(items.items));
     }
   }
-
   return t.tsArrayType(getType(detect.type));
 };
-
 export const detectType = type => {
   let optional = false;
   let theType = '';
-
   if (Array.isArray(type)) {
     if (type.length !== 2) {
       throw new Error('[getType(array length)] case not handled by transpiler. contact maintainers.');
     }
-
     const [nullableType, nullType] = type;
-
     if (nullType !== 'null') {
       throw new Error('[getType(null)] case not handled by transpiler. contact maintainers.');
     }
-
     theType = nullableType;
     optional = true;
   } else {
     theType = type;
   }
-
   return {
     type: theType,
     optional
@@ -89,19 +73,15 @@ export const detectType = type => {
 export const getTypeInfo = info => {
   let type = undefined;
   let optional = undefined;
-
   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('[nullableType.type]: case not handled by transpiler. contact maintainers.');
     }
-
     if (!nullableType?.$ref) {
       if (nullableType.title) {
         type = t.tsTypeReference(t.identifier(nullableType.title));
@@ -111,10 +91,8 @@ export const getTypeInfo = info => {
     } else {
       type = getTypeFromRef(nullableType?.$ref);
     }
-
     optional = true;
   }
-
   if (typeof info.type === 'string') {
     if (info.type === 'array') {
       if (typeof info.items === 'object' && !Array.isArray(info.items)) {
@@ -129,7 +107,8 @@ export const getTypeInfo = info => {
         }
       } else {
         if (Array.isArray(info.items)) {
-          type = getArrayTypeFromItems(info.items); // console.log(typeof info.items === 'object');
+          type = getArrayTypeFromItems(info.items);
+          // console.log(typeof info.items === 'object');
           // console.log(Array.isArray(info.items));
           // console.log(info);
         } else {
@@ -142,33 +121,28 @@ export const getTypeInfo = info => {
       optional = detect.optional;
     }
   }
-
   if (Array.isArray(info.type)) {
     // assuming 2nd is null, but let's check to ensure
     if (info.type.length !== 2) {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
-
     const [nullableType, nullType] = info.type;
-
     if (nullType !== 'null') {
       throw new Error('please report this to maintainers (field type): ' + JSON.stringify(info, null, 2));
     }
-
     if (nullableType === 'array' && typeof info.items === 'object' && !Array.isArray(info.items)) {
       if (info.items.type) {
         const detect = detectType(info.items.type);
-
         if (detect.type === 'array') {
           // wen recursion?
           type = t.tsArrayType(getArrayTypeFromItems(info.items));
         } else {
           type = t.tsArrayType(getType(detect.type));
         }
-
         optional = detect.optional;
       } else if (info.items.$ref) {
-        type = getArrayTypeFromRef(info.items.$ref); // } else if (info.items.title) {
+        type = getArrayTypeFromRef(info.items.$ref);
+        // } else if (info.items.title) {
         //   type = t.tsArrayType(
         //     t.tsTypeReference(
         //       t.identifier(info.items.title)
@@ -182,17 +156,14 @@ export const getTypeInfo = info => {
     } else {
       const detect = detectType(nullableType);
       optional = detect.optional;
-
       if (detect.type === 'array') {
         type = getArrayTypeFromItems(info.items);
       } else {
         type = getType(detect.type);
       }
     }
-
     optional = true;
   }
-
   return {
     type,
     optional
@@ -202,13 +173,10 @@ export const getType = type => {
   switch (type) {
     case 'string':
       return t.tsStringKeyword();
-
     case 'boolean':
       return t.tSBooleanKeyword();
-
     case 'integer':
       return t.tsNumberKeyword();
-
     default:
       throw new Error('contact maintainers [unknown type]: ' + type);
   }
@@ -218,33 +186,25 @@ export const getPropertyType = (context, schema, prop) => {
   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);
   }
-
   const typeInfo = getTypeInfo(info);
-
   if (typeof typeInfo.optional !== 'undefined') {
     optional = typeInfo.optional;
   }
-
   if (typeof typeInfo.type !== 'undefined') {
     type = typeInfo.type;
   }
-
   if (!type) {
     throw new Error('cannot find type for ' + JSON.stringify(info));
   }
-
   if (schema.required?.includes(prop)) {
     optional = false;
   }
-
   return {
     type,
     optional
@@ -258,17 +218,15 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
       throw new Error('getPropertySignatureFromProp() contact maintainer');
     }
   }
-
   if (Array.isArray(jsonschema.properties[prop].allOf)) {
     const isOptional = !jsonschema.required?.includes(prop);
     const unionTypes = jsonschema.properties[prop].allOf.map(el => {
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    }); // @ts-ignore:next-line
-
+    });
+    // @ts-ignore:next-line
     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 {
@@ -280,24 +238,21 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
       if (el.title) return el.title;
       if (el.$ref) return getTypeStrFromRef(el.$ref);
       return el.type;
-    }); // @ts-ignore:next-line
-
+    });
+    // @ts-ignore:next-line
     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(typ))))), isOptional);
     }
   }
-
   try {
     getPropertyType(context, jsonschema, prop);
   } catch (e) {
     console.log(e);
     console.log(JSON.stringify(jsonschema, null, 2), prop);
   }
-
   const {
     type,
     optional
@@ -306,24 +261,22 @@ export function getPropertySignatureFromProp(context, jsonschema, prop, camelize
 }
 export const getParamsTypeAnnotation = (context, jsonschema, camelize = true) => {
   const keys = Object.keys(jsonschema.properties ?? {});
-
   if (!keys.length && jsonschema.$ref) {
     return t.tsTypeAnnotation(getTypeFromRef(jsonschema.$ref));
   }
-
   if (!keys.length) return undefined;
   const typedParams = keys.map(prop => getPropertySignatureFromProp(context, jsonschema, prop, camelize));
-  return t.tsTypeAnnotation(t.tsTypeLiteral( // @ts-ignore:next-line
+  return t.tsTypeAnnotation(t.tsTypeLiteral(
+  // @ts-ignore:next-line
   [...typedParams]));
 };
 export const createTypedObjectParams = (context, jsonschema, camelize = true) => {
   const keys = Object.keys(jsonschema.properties ?? {});
-
   if (!keys.length) {
     // is there a ref?
     if (jsonschema.$ref) {
-      const obj = context.refLookup(jsonschema.$ref); // If there is a oneOf, then we need to create a type for it
-
+      const obj = context.refLookup(jsonschema.$ref);
+      // If there is a oneOf, then we need to create a type for it
       if (obj?.oneOf) {
         // the actual type of the ref
         const refType = jsonschema.$ref.split('/').pop();
@@ -334,12 +287,11 @@ export const createTypedObjectParams = (context, jsonschema, camelize = true) =>
       } else if (obj) {
         return createTypedObjectParams(context, obj, camelize);
       }
-    } // no results...
-
+    }
 
+    // no results...
     return;
   }
-
   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);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "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",
@@ -88,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "4553eb80cd89969583df6164d1c764ab5b289c63"
+  "gitHead": "fa5aea0a8de61f713a8dad85c5f7965e82c3b5c0"
 }