Merge pull request #267 from Web3-API/prealpha-dev

Prep 0.0.1-prealpha.12

Author: dOrgJelli

CHANGELOG.md

@@ -1,3 +1,9 @@
+# Web3API 0.0.1-prealpha.12
+## Bug Fixes
+* Added schemas to plugin manifest modules, removing the need for `import_redirects`.
+* Fixed the IpfsPlugin's `addFile` method.
+* Improved the api/assemblyscript template project.
+
 # Web3API 0.0.1-prealpha.11
 ## Bug Fixes
 * `@web3api/cli`: Include the internationalization JSON files in the published package.

VERSION

@@ -1 +1 @@
-0.0.1-prealpha.11
+0.0.1-prealpha.12

package.json

@@ -18,7 +18,7 @@
     "build": "lerna run build --no-private --ignore @web3api/cli* --ignore @web3api/react && lerna run build --scope @web3api/client-js --scope @web3api/react && lerna run build --scope @web3api/cli",
     "lint": "lerna run lint",
     "lint:fix": "lerna run lint -- --fix",
-    "lint:ci": "lerna run lint --parallel",
+    "lint:ci": "lerna run lint",
     "test": "lerna run test --no-private --ignore @web3api/client-js && lerna run test --scope @web3api/client-js",
     "test:ci": "lerna run test:ci --no-private --ignore @web3api/client-js && lerna run test:ci --scope @web3api/client-js",
     "version:apply": "npx lerna version $(cat VERSION) --exact --no-git-tag-version --yes",

packages/js/plugins/ens/src/manifest.ts

@@ -3,7 +3,27 @@ import { PluginManifest, Uri } from "@web3api/core-js";
 export const manifest: PluginManifest = {
   // TODO: use the schema.graphql
   // https://github.com/web3-api/monorepo/issues/101
-  schema: "type Query { dummy: String }",
+  schema: `
+# TODO: should import and "implements" the api-resolver core-api schema
+# https://github.com/Web3-API/monorepo/issues/75
+
+type Query {
+  tryResolveUri(
+    authority: String!
+    path: String!
+  ): ApiResolver_MaybeUriOrManifest
+
+  getFile(
+    path: String!
+  ): Bytes
+}
+
+# TODO: should get replaced with an import
+# https://github.com/Web3-API/monorepo/issues/75
+type ApiResolver_MaybeUriOrManifest {
+  uri: String
+  manifest: String
+}`,
   implemented: [new Uri("w3/api-resolver")],
   imported: [new Uri("ens/ethereum.web3api.eth")],
 };

packages/js/plugins/ethereum/src/manifest.ts

@@ -3,7 +3,27 @@ import { PluginManifest } from "@web3api/core-js";
 export const manifest: PluginManifest = {
   // TODO: use the schema.graphql
   // https://github.com/web3-api/monorepo/issues/101
-  schema: "type Query { dummy: String }",
+  schema: `
+type Query {
+  callView(
+    address: String!
+    method: String!
+    args: [String!]!
+  ): String!
+}
+
+type Mutation {
+  sendTransaction(
+    address: String!
+    method: String!
+    args: [String!]!
+  ): String!
+
+  deployContract(
+    abi: String!
+    bytecode: String!
+  ): String!
+}`,
   implemented: [],
   imported: [],
 };

packages/js/plugins/graph-node/src/manifest.ts

@@ -3,7 +3,15 @@ import { PluginManifest } from "@web3api/core-js";
 export const manifest: PluginManifest = {
   // TODO: use the schema.graphql
   // https://github.com/web3-api/monorepo/issues/101
-  schema: "type Query { dummy: String }",
+  schema: `
+type Query {
+  querySubgraph(
+    subgraphId: String!
+    query: String!
+  ): String! """JSON!"""
+  """TODO: support JSON type as base type?"""
+  """I think this would be helpful for dynamic data"""
+}`,
   implemented: [],
   imported: [],
 };

packages/js/plugins/http/src/manifest.ts

@@ -3,7 +3,46 @@ import { PluginManifest } from "@web3api/core-js";
 export const manifest: PluginManifest = {
   // TODO: use the schema.graphql
   // https://github.com/web3-api/monorepo/issues/101
-  schema: "type Query { dummy: String }",
+  schema: `
+type Header {
+  key: String!
+  value: String!
+}
+
+type UrlParam {
+  key: String!
+  value: String!
+}
+
+type Response {
+  status: Int!
+  statusText: String!
+  headers: [Header!]
+  body: String
+}
+
+type Request {
+  headers: [Header!]
+  urlParams: [UrlParam!]
+  responseType: String! # "TEXT" || "BINARY"
+  body: String
+}
+
+# Enum types curently not supported 
+#
+# enum ResponseType {
+#   TEXT
+#   BINARY
+# }
+
+type Query {
+  get(url: String!, request: Request): Response
+}
+
+type Mutation {
+  post(url: String!, request: Request): Response
+}
+`,
   implemented: [],
   imported: [],
 };

packages/js/plugins/ipfs/schema.graphql

@@ -17,12 +17,7 @@ type Query {
 type Mutation {
   # TODO: Allow for custom type CID
   # https://github.com/web3-api/monorepo/issues/103
-  addFile(data: Bytes!): AddResult!
-}
-
-type AddResult {
-  path: String!
-  cid: String!
+  addFile(data: Bytes!): String!
 }
 
 # TODO: should get replaced with an import

packages/js/plugins/ipfs/src/index.ts

@@ -54,10 +54,18 @@ export class IpfsPlugin extends Plugin {
   public async add(
     data: Uint8Array
   ): Promise<{
-    path: string;
-    cid: CID;
+    name: string;
+    hash: CID;
   }> {
-    return await this._ipfs.add(data);
+    const result = await this._ipfs.add(data);
+
+    if (result.length === 0) {
+      throw Error(
+        `IpfsPlugin:add failed to add contents. Result of length 0 returned.`
+      );
+    }
+
+    return result[0];
   }
 
   public async cat(cid: string): Promise<Buffer> {

packages/js/plugins/ipfs/src/manifest.ts

@@ -3,7 +3,35 @@ import { PluginManifest, Uri } from "@web3api/core-js";
 export const manifest: PluginManifest = {
   // TODO: use the schema.graphql
   // https://github.com/web3-api/monorepo/issues/101
-  schema: "type Query { dummy: String }",
+  schema: `
+# TODO: should import and "implements" the api-resolver core-api schema
+# https://github.com/Web3-API/monorepo/issues/75
+
+type Query {
+  catFile(cid: String!): Bytes!
+
+  tryResolveUri(
+    authority: String!
+    path: String!
+  ): ApiResolver_MaybeUriOrManifest
+
+  getFile(
+    path: String!
+  ): Bytes
+}
+
+type Mutation {
+  # TODO: Allow for custom type CID
+  # https://github.com/web3-api/monorepo/issues/103
+  addFile(data: Bytes!): String!
+}
+
+# TODO: should get replaced with an import
+# https://github.com/Web3-API/monorepo/issues/75
+type ApiResolver_MaybeUriOrManifest {
+  uri: String
+  manifest: String
+}`,
   implemented: [new Uri("w3/api-resolver")],
   imported: [],
 };