Merge pull request #444 from polywrap/prealpha-dev

Prep 0.0.1-prealpha.35
polywrap · Aug 20, 2021 · 7ad54f4 · 7ad54f4
2 parents 76eadb4 + c102c0a
commit 7ad54f4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Web3API 0.0.1-prealpha.35
+## Bugs
+* `@web3api/schema-bind`: Fix TypeScript plugin enum bindings.
+
 # Web3API 0.0.1-prealpha.34
 ## Bugs
 * `@web3api/schema-bind`: Fix TypeScript enum bindings.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.1-prealpha.34
+0.0.1-prealpha.35
diff --git a/packages/schema/bind/src/bindings/plugin-ts/templates/types-ts.mustache b/packages/schema/bind/src/bindings/plugin-ts/templates/types-ts.mustache
@@ -28,13 +28,13 @@ export interface {{type}} {
 
 {{/objectTypes}}
 {{#enumTypes}}
-enum {{type}}Enum {
+export enum {{type}}Enum {
   {{#constants}}
   {{.}},
   {{/constants}}
 }
 
-type {{type}}String =
+export type {{type}}String =
   {{#constants}}
   | "{{.}}"
   {{/constants}}
@@ -55,12 +55,19 @@ export interface {{type}} {
 {{/importedObjectTypes}}
 {{#importedEnumTypes}}
 /* URI: "{{uri}}" */
-export enum {{type}} {
+export enum {{type}}Enum {
   {{#constants}}
   {{.}},
   {{/constants}}
 }
 
+export type {{type}}String =
+  {{#constants}}
+  | "{{.}}"
+  {{/constants}}
+
+export type {{type}} = {{type}}Enum | {{type}}String;
+
 {{/importedEnumTypes}}
 /// Imported Objects END ///
 

diff --git a/packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts b/packages/test-cases/cases/bind/sanity/output/plugin-ts/types.ts
@@ -60,12 +60,12 @@ export interface AnotherType {
   circular?: Types.CustomType | null;
 }
 
-enum CustomEnumEnum {
+export enum CustomEnumEnum {
   STRING,
   BYTES,
 }
 
-type CustomEnumString =
+export type CustomEnumString =
   | "STRING"
   | "BYTES"
 
@@ -91,11 +91,17 @@ export interface TestImport_AnotherObject {
 }
 
 /* URI: "testimport.uri.eth" */
-export enum TestImport_Enum {
+export enum TestImport_EnumEnum {
   STRING,
   BYTES,
 }
 
+export type TestImport_EnumString =
+  | "STRING"
+  | "BYTES"
+
+export type TestImport_Enum = TestImport_EnumEnum | TestImport_EnumString;
+
 /// Imported Objects END ///
 
 /// Imported Queries START ///