@stephenchenorg/astro 1.3.0 → 1.5.0

package/dist/api/error.d.ts

@@ -1,4 +1,15 @@
-interface GraphQLRequestExtensions {
+export interface GraphQLFieldError {
+    code?: number;
+    message: string;
+    locations?: {
+        line: number;
+        column: number;
+    }[];
+    path?: (string | number)[];
+    extensions?: GraphQLRequestExtensions;
+    data?: Record<string, any>;
+}
+export interface GraphQLRequestExtensions {
     debugMessage?: string;
     file?: string;
     line?: number;
@@ -7,25 +18,37 @@ interface GraphQLRequestExtensions {
         line: number;
         call: number;
     }[];
-    validation?: Record<string, string[]>;
-    category?: string;
+}
+export interface GraphQLRequestErrorOptions {
+    code?: number;
+    message: string;
+    query: string;
+    variables?: Record<string, any>;
+    extensions?: GraphQLRequestExtensions;
+    fieldErrors?: GraphQLFieldError[];
 }
 export declare class GraphQLRequestError extends Error {
     type: string;
     name: string;
     title: string;
+    code: number | undefined;
     originalMessage: string;
     query: string;
     variables: Record<string, any> | undefined;
     extensions: GraphQLRequestExtensions | undefined;
-    constructor(props: {
-        message: string;
-        query: string;
-        variables?: Record<string, any>;
-        extensions?: GraphQLRequestExtensions;
-    }, options?: ErrorOptions);
+    fieldErrors: GraphQLFieldError[] | undefined;
+    constructor(props: GraphQLRequestErrorOptions, options?: ErrorOptions);
     isNotFound(): boolean;
     private buildMessage;
     static is(err: unknown): err is GraphQLRequestError;
 }
-export {};
+export declare class GraphQLNotFoundError extends GraphQLRequestError {
+    type: string;
+    name: string;
+}
+export declare class GraphQLValidationError extends GraphQLRequestError {
+    type: string;
+    name: string;
+    errors: Record<string, string[]>;
+    constructor(props: GraphQLRequestErrorOptions, options?: ErrorOptions);
+}

package/dist/api/error.js

@@ -2,19 +2,23 @@ export class GraphQLRequestError extends Error {
   type = "GraphQLRequestError";
   name = "GraphQLRequestError";
   title = "GraphQL request error.";
+  code;
   originalMessage;
   query;
   variables;
   extensions;
+  fieldErrors;
   constructor(props, options) {
-    const { message, query, variables, extensions } = props;
+    const { code, message, query, variables, extensions, fieldErrors } = props;
     super("GraphQL request error.", options);
     const originalStack = this.stack;
     this.title = "GraphQL request error.";
+    this.code = code;
     this.originalMessage = message;
     this.query = query;
     this.variables = variables;
     this.extensions = extensions;
+    this.fieldErrors = fieldErrors;
     this.message = this.buildMessage();
     this.stack = originalStack;
   }
@@ -24,6 +28,12 @@ export class GraphQLRequestError extends Error {
   buildMessage() {
     let message = `${this.originalMessage}
 `;
+    if (this.code) {
+      message += "\n";
+      message += `[code]
+${this.code}
+`;
+    }
     if (this.extensions) {
       if (this.extensions.debugMessage) {
         message += "\n";
@@ -72,3 +82,16 @@ ${JSON.stringify(this.variables, null, 2)}
     return err.type === "GraphQLRequestError";
   }
 }
+export class GraphQLNotFoundError extends GraphQLRequestError {
+  type = "GraphQLNotFoundError";
+  name = "GraphQLNotFoundError";
+}
+export class GraphQLValidationError extends GraphQLRequestError {
+  type = "GraphQLValidationError";
+  name = "GraphQLValidationError";
+  errors;
+  constructor(props, options) {
+    super(props, options);
+    this.errors = this.fieldErrors?.[0]?.data?.validation || {};
+  }
+}

package/dist/api/errorResponse.d.ts

@@ -0,0 +1 @@
+export declare function handleErrorResponse(e: unknown): Response | undefined;

package/dist/api/errorResponse.js

@@ -0,0 +1,9 @@
+import { GraphQLNotFoundError } from "./error.js";
+export function handleErrorResponse(e) {
+  if (e instanceof GraphQLNotFoundError) {
+    return new Response(null, {
+      status: 404,
+      statusText: "Not found"
+    });
+  }
+}

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

@@ -1,28 +1,43 @@
 import { AwesomeGraphQLClient, GraphQLRequestError as AwesomeGraphQLRequestError } from "awesome-graphql-client";
 import { print } from "graphql/language/printer";
-import { GraphQLRequestError } from "./error.js";
+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) {
-          reject(new GraphQLRequestError({
+          const fieldError = error.fieldErrors?.[0];
+          const code = fieldError?.code;
+          const errorProps = {
+            code,
             message: error.message,
             query: error.query,
             variables: error.variables,
-            extensions: error.extensions
-          }));
+            extensions: error.extensions,
+            fieldErrors: error.fieldErrors
+          };
+          if (code === 404) {
+            reject(new GraphQLNotFoundError(errorProps));
+          } else if (code === 422) {
+            reject(new GraphQLValidationError(errorProps));
+          }
+          reject(new GraphQLRequestError(errorProps));
         } else {
           reject(error);
         }

package/dist/api/index.d.ts

@@ -1,2 +1,3 @@
 export * from './fetch';
 export * from './error';
+export * from './errorResponse';

package/dist/api/index.js

@@ -1,2 +1,3 @@
 export * from "./fetch.js";
 export * from "./error.js";
+export * from "./errorResponse.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stephenchenorg/astro",
   "type": "module",
-  "version": "1.3.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"