antelopeql 3.0.0-alpha.4 → 3.0.0-alpha.6

package/antelopeql.d.ts

@@ -0,0 +1,52 @@
+// antelopeql.d.ts
+
+export function AntelopeQL(
+  params: AntelopeQLParams
+): Promise<{ data: any; errors: any[] }>;
+
+export interface AntelopeQLParams {
+  query: string;
+  variableValues?: Record<string, any>;
+  operationName?: string;
+  signTransaction?: boolean;
+  contracts?: string[];
+  ABIs?: ABI[];
+  rpc_url?: URL | string;
+  headers?: HeadersInit;
+  signal?: AbortSignal;
+}
+
+export interface Types {
+  new_type_name: string;
+  type: string;
+}
+
+export interface Field {
+  name: string;
+  type: string;
+}
+
+export interface Struct {
+  name: string;
+  base: string;
+  fields: Field[];
+}
+
+export interface Action {
+  name: string;
+  type: string;
+  ricardian_contract?: string;
+}
+
+export interface Table {
+  name: string;
+  index_type: string;
+  type: string;
+}
+
+export interface ABI {
+  types: Types[];
+  structs: Struct[];
+  actions: Action[];
+  tables: Table[];
+}

package/eosio_abi_to_graphql_ast.mjs

@@ -31,7 +31,7 @@ function handleBaseFields(base, structs) {
  * @param {Object} structs ABI structs
  * @returns {Object} Struct AST that will be consumed by [eosio_abi_to_graphql_ast](./eosio_abi_to_graphql_ast.mjs).
  */
-function handleStructs(structs) {
+function handleStructs(structs, type_alias) {
   let graphql_ast_structs = {};
 
   for (const struct of structs) {
@@ -47,6 +47,8 @@ function handleStructs(structs) {
       const variant = !!field.type.match(/@/gmu);
       const list = !!field.type.match(/\[\]/gmu);
       let type = field.type.replace(/[[\]?$@]/gmu, "");
+      type = type_alias[type] ?? type;
+
       const object = !eosio_types[type];
       ast_fields[i] = {
         name: field.name,
@@ -67,6 +69,7 @@ function handleStructs(structs) {
  */
 export function eosio_abi_to_graphql_ast(abi) {
   const { types, variants, structs } = abi;
+  const type_alias = {};
   const new_structs = structs;
 
   if (variants?.length)
@@ -78,14 +81,35 @@ export function eosio_abi_to_graphql_ast(abi) {
       });
 
   if (types?.length) {
-    for (const { type: real_type, new_type_name } of types)
+    for (const { type: real_type, new_type_name } of types) {
+      if (eosio_types[real_type]) {
+        type_alias[new_type_name] = real_type;
+        continue;
+      }
+
+      if (real_type.endsWith("[]")) {
+        new_structs.push({
+          name: new_type_name,
+          base: "",
+          fields: [
+            {
+              name: real_type.replace("[]", ""),
+              type: real_type
+            }
+          ]
+        });
+
+        continue;
+      }
+
       new_structs.push({
         ...new_structs.find((x) => x.name == real_type),
         name: new_type_name
       });
+    }
   }
 
-  const structs_ast = handleStructs(new_structs);
+  const structs_ast = handleStructs(new_structs, type_alias);
 
   return Object.freeze(structs_ast);
 }

package/graphql_input_types/query_argument_fields.mjs

@@ -1,18 +1,11 @@
 import {
+  GraphQLBoolean,
   GraphQLEnumType,
   GraphQLInputObjectType,
   GraphQLInt,
   GraphQLString
 } from "graphql";
 
-const index_position_enum_type = new GraphQLEnumType({
-  name: "index_position_enum_type",
-  values: {
-    primary: { value: "primary" },
-    secondary: { value: "secondary" }
-  }
-});
-
 const key_type_enum_type = new GraphQLEnumType({
   name: "key_type_enum",
   description: `Primary only supports i64. All others support i64, i128, i256, float64, float128, ripemd160, sha256.`,
@@ -48,9 +41,9 @@ const query_arg_fields = new GraphQLInputObjectType({
       defaultValue: ""
     },
     index_position: {
-      type: index_position_enum_type,
-      description: "Position of the index used.",
-      defaultValue: "primary"
+      type: GraphQLInt,
+      description: "Position of the multiindex table used.",
+      defaultValue: 1
     },
     key_type: {
       type: key_type_enum_type,
@@ -75,6 +68,9 @@ const query_arg_fields = new GraphQLInputObjectType({
     limit: {
       type: GraphQLInt,
       description: "The maximum number of items to return"
+    },
+    reverse: {
+      type: GraphQLBoolean
     }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antelopeql",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.6",
   "description": "A GraphQL implementation for interacting with Antelope based blockchains.",
   "repository": {
     "type": "git",
@@ -32,6 +32,7 @@
     "graphql_input_types/*.mjs",
     "graphql_object_types/*.mjs",
     "antelopeql.mjs",
+    "antelopeql.d.ts",
     "blockchain_query_field.mjs",
     "build_graphql_fields_from_abis.mjs",
     "eosio_abi_to_graphql_ast.mjs",
@@ -48,11 +49,14 @@
   ],
   "sideEffects": false,
   "exports": {
+    "./antelopeql.mjs": {
+      "import": "./antelopeql.mjs",
+      "types": "./antelopeql.d.ts"
+    },
     "./blockchain/*.mjs": "./blockchain/*.mjs",
     "./eosio_types/*.mjs": "./eosio_types/*.mjs",
     "./graphql_input_types/*.mjs": "./graphql_input_types/*.mjs",
     "./graphql_object_types/*.mjs": "./graphql_object_types/*.mjs",
-    "./antelopeql.mjs": "./antelopeql.mjs",
     "./blockchain_query_field.mjs": "./blockchain_query_field.mjs",
     "./build_graphql_fields_from_abis.mjs": "./build_graphql_fields_from_abis.mjs",
     "./eosio_abi_to_graphql_ast.mjs": "./eosio_abi_to_graphql_ast.mjs",
@@ -86,6 +90,7 @@
     "coverage-node": "^8.0.0",
     "eslint": "^8.34.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
+    "graphql": "^16.11.0",
     "nodemon": "^3.0.1",
     "prettier": "^2.8.4",
     "snapshot-assertion": "^5.0.0",