Merge pull request #442 from polywrap/prealpha-dev

Prep 0.0.1-prealpha.34
polywrap · Aug 20, 2021 · ee061ba · ee061ba
2 parents 8dc9e5e + 47025c9
commit ee061ba
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Web3API 0.0.1-prealpha.34
+## Bugs
+* `@web3api/schema-bind`: Fix TypeScript enum bindings.
+* `@web3api/graph-node-plugin-js`: Fix mismatched schema.
+
 # Web3API 0.0.1-prealpha.33
 ## Bugs
 * `@web3api/schema-bind`: Fixed plugin code generation oversight. Should be using `null` instead of `undefined`.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.1-prealpha.33
+0.0.1-prealpha.34
diff --git a/packages/js/plugins/graph-node/schema.graphql b/packages/js/plugins/graph-node/schema.graphql
@@ -1,8 +1,7 @@
 type Query {
   querySubgraph(
-    subgraphId: String!
+    subgraphAuthor: String!
+    subgraphName: String!
     query: String!
-  ): String! """JSON!"""
-  """TODO: support JSON type as base type?"""
-  """I think this would be helpful for dynamic data"""
+  ): String!
 }
diff --git a/packages/js/plugins/graph-node/src/manifest.ts b/packages/js/plugins/graph-node/src/manifest.ts
@@ -6,9 +6,11 @@ export const manifest: PluginPackageManifest = {
   schema: `
 type Query {
   querySubgraph(
-    subgraphId: String!
+    subgraphAuthor: String!
+    subgraphName: String!
     query: String!
   ): String!
-}`,
+}
+`,
   implements: [],
 };
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,12 +28,19 @@ export interface {{type}} {
 
 {{/objectTypes}}
 {{#enumTypes}}
-export enum {{type}} {
+enum {{type}}Enum {
   {{#constants}}
   {{.}},
   {{/constants}}
 }
 
+type {{type}}String =
+  {{#constants}}
+  | "{{.}}"
+  {{/constants}}
+
+export type {{type}} = {{type}}Enum | {{type}}String;
+
 {{/enumTypes}}
 /// Imported Objects START ///
 

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,11 +60,17 @@ export interface AnotherType {
   circular?: Types.CustomType | null;
 }
 
-export enum CustomEnum {
+enum CustomEnumEnum {
   STRING,
   BYTES,
 }
 
+type CustomEnumString =
+  | "STRING"
+  | "BYTES"
+
+export type CustomEnum = CustomEnumEnum | CustomEnumString;
+
 /// Imported Objects START ///
 
 /* URI: "testimport.uri.eth" */