@stephenchenorg/astro 1.4.0 → 1.5.0

package/dist/api/fetch.d.ts

@@ -2,7 +2,7 @@ import type { TypedDocumentNode } from '@graphql-typed-document-node/core';
 export interface CreateGraphQLAPIOptions {
     endpoint: string;
     defaultVariables?: Record<string, any> | (() => Record<string, any>);
-    headers?: Record<string, string> | (() => Record<string, string>);
+    fetchOptions?: RequestInit | (() => RequestInit);
 }
-export declare function createGraphQLAPI(options: CreateGraphQLAPIOptions): <TData extends Record<string, any>, TVariables extends Record<string, any> = Record<string, any>>(query: TypedDocumentNode<TData, TVariables>, variables?: TVariables) => Promise<TData>;
+export declare function createGraphQLAPI(options: CreateGraphQLAPIOptions): <TData extends Record<string, any>, TVariables extends Record<string, any> = Record<string, any>>(query: TypedDocumentNode<TData, TVariables>, variables?: TVariables, fetchOptions?: RequestInit) => Promise<TData>;
 export { gql } from 'graphql-tag';

package/dist/api/fetch.js

@@ -2,20 +2,25 @@ import { AwesomeGraphQLClient, GraphQLRequestError as AwesomeGraphQLRequestError
 import { print } from "graphql/language/printer";
 import { GraphQLNotFoundError, GraphQLRequestError, GraphQLValidationError } from "./error.js";
 export function createGraphQLAPI(options) {
-  return function graphQLAPI(query, variables = {}) {
-    const client = new AwesomeGraphQLClient({
-      endpoint: options.endpoint,
-      formatQuery: (query2) => print(query2)
-    });
-    const defaultVariables = typeof options.defaultVariables === "function" ? options.defaultVariables() : options.defaultVariables ?? {};
-    const fetchOptions = {
-      headers: typeof options.headers === "function" ? options.headers() : options.headers
-    };
+  const client = new AwesomeGraphQLClient({
+    endpoint: options.endpoint,
+    formatQuery: (query) => print(query)
+  });
+  return function graphQLAPI(query, variables, fetchOptions) {
+    const defaultVariables = typeof options.defaultVariables === "function" ? options.defaultVariables() : options.defaultVariables;
+    const defaultFetchOptions = typeof options.fetchOptions === "function" ? options.fetchOptions() : options.fetchOptions;
     return new Promise((resolve, reject) => {
       client.request(query, {
         ...defaultVariables,
         ...variables
-      }, fetchOptions).then((data) => resolve(data)).catch((error) => {
+      }, {
+        ...defaultFetchOptions,
+        ...fetchOptions,
+        headers: {
+          ...defaultFetchOptions?.headers,
+          ...fetchOptions?.headers
+        }
+      }).then((data) => resolve(data)).catch((error) => {
         if (error instanceof AwesomeGraphQLRequestError) {
           const fieldError = error.fieldErrors?.[0];
           const code = fieldError?.code;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stephenchenorg/astro",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Stephenchenorg Astro 前端通用套件",
   "license": "MIT",
   "homepage": "https://stephenchenorg-astro.netlify.app",
@@ -56,7 +56,7 @@
   },
   "scripts": {
     "build": "mkdist --declaration --ext=js",
-    "lint": "eslint .",
+    "lint": "eslint \"*.{js,ts,json}\" \"src/**/*.ts\"",
     "code-check": "astro check && npm run lint",
     "prepack": "npm run build",
     "release": "bumpp --commit \"Release v%s\" && npm publish"