eddev 2.0.0-beta.99 → 2.1.1

package/dist/node/compiler/vinxi-codegen.js

@@ -1,6 +1,8 @@
+import { camelCase, pascalCase } from "change-case-all";
 import { code, imp } from "ts-poet";
+import { ProjectEnvUtils } from "../project/env.js";
 import { FSCodegen } from "../utils/fs-codegen.js";
-import { camelCase } from "change-case-all";
+import { getCacheConfig } from "./cache-config.js";
 export function getVinxiFolder(opts) {
     return (opts.mode === "development" ? "dev" : "prod") + (opts.serverless ? "" : "-spa");
 }
@@ -26,16 +28,18 @@ export function createVinxiCodegen(opts) {
                         from: project.origin,
                         to: opts.endpoint ?? "",
                         prefixes: [
-                            { prefix: "/wp-content/uploads", replace: project.config?.serverless.uploads === "proxy" },
-                            { prefix: "/wp-content/plugins", replace: project.config?.serverless.plugins === "proxy" },
+                            { prefix: "/wp-content/uploads", replace: project.config?.serverless.uploads === "remote" },
+                            { prefix: "/wp-content/plugins", replace: project.config?.serverless.plugins === "remote" },
                         ],
                     },
                     rpcBases: (await project.serverRoutes.get()).bases ?? [],
                     config: project.config,
+                    cacheConfig: getCacheConfig(project.origin, project.config),
                 };
                 return code /* tsx */ `
           import { ServerContext } from "eddev/server"
           import { getManifest } from "vinxi/manifest"
+          import { apiConfig } from 'eddev/hooks'
 
           ServerContext.setRuntime({
             getManifest
@@ -45,6 +49,8 @@ export function createVinxiCodegen(opts) {
                     .map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
                     .join(",\n")}
           })
+
+          apiConfig.apiKey = ${JSON.stringify(ProjectEnvUtils.getSafe("SITE_API_KEY") ?? "")}
         `.toString();
             },
         });
@@ -84,7 +90,7 @@ export function createVinxiCodegen(opts) {
             return code /* tsx */ `
         ${opts.serverless ? `import "./react-shim.js"` : ""}
         ${opts.serverless ? `import "vinxi/client"` : ""}
-        import "../../views/index.css"
+        import "../../${project.cssEntryFile}"
         import "./manifest/admin"
         import "./manifest/blocks"
         import "./manifest/styles"
@@ -109,7 +115,7 @@ export function createVinxiCodegen(opts) {
            * Also ensures that the assets used during SSR are loaded.
            */
           import "vinxi/client"
-          import "../../views/index.css"
+          import "../../${project.cssEntryFile}"
           import "./manifest/blocks"
           import "./manifest/views"
           
@@ -120,6 +126,16 @@ export function createVinxiCodegen(opts) {
           import { createAssets } from "@vinxi/react"
           import { devToolsStore } from 'eddev/devtools'
 
+          ${process.env.VERCEL_SKEW_PROTECTION_ENABLED &&
+                    code /* tsx*/ `
+              // Skew protection
+              const updateSkewCookie = () => {
+                document.cookie = "__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; expires=" + new Date(Date.now() + 24 * 60 * 60 * 1000).toUTCString() + "; path=/"
+              }
+              window.onfocus = updateSkewCookie
+              updateSkewCookie()
+          `}
+
           // Set up a dynamic entry which will load the configured tailwind manifest
           devToolsStore.loadTailwindConfig = () => import('./manifest/tailwind-config.js')
 
@@ -132,14 +148,17 @@ export function createVinxiCodegen(opts) {
           window.$reactRoot =
             window.$reactRoot ||
             hydrateRoot(
-              document.getElementById('_root')!,
-              <SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA.meta.head} />,
+              document.getElementById('root')!,
+              <React.Suspense><SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA?.meta?.head} /></React.Suspense>,
+              {
+                identifierPrefix: "ed",
+              }
             )
 
           if (import.meta.hot) {
             import.meta.hot.accept((mod) => {
               if (mod) {
-                const app = <SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA.meta.head} />
+                const app = <React.Suspense><SSRClientRoot assets={getAssets()} metaTags={window._PAGE_DATA?.meta?.head} /></React.Suspense>
                 window.$reactRoot?.render(app)
               }
             })
@@ -162,7 +181,7 @@ export function createVinxiCodegen(opts) {
            */
           import "./manifest/blocks"
           import "./manifest/views"
-          import "../../views/index.css"
+          import "../../${project.cssEntryFile}"
           import { devToolsStore } from 'eddev/devtools'
           import { createRoot } from "react-dom/client"
           import { SPARoot } from "eddev/_internal/spa-root.js"
@@ -170,7 +189,7 @@ export function createVinxiCodegen(opts) {
 
           devToolsStore.loadTailwindConfig = () => import('./manifest/tailwind-config')
 
-          createRoot(document.getElementById("root")!).render(<SPARoot />)
+          createRoot(document.getElementById("root")!).render(<React.Suspense><SPARoot /></React.Suspense>)
         `;
             }
         },
@@ -221,75 +240,18 @@ export function createVinxiCodegen(opts) {
         export default router.handler
       `,
         });
-        // codegen.registerFile({
-        //   name: "handler.data-api.ts",
-        //   generate: code/* tsx */ `
-        //     /// <reference types="vinxi/types/server" />
-        //     import { createRouter, eventHandler, getRouterParam, getQuery, getWebRequest, getRequestHeaders, getRequestURL } from "vinxi/http"
-        //     import { serverContext } from "./context.js"
-        //     const router = createRouter()
-        //       .get(
-        //         "/route/",
-        //         eventHandler(async (event) => {
-        //           const id = "/"
-        //           const url = getRequestURL(event);
-        //           return await serverContext.fetchRouteData({
-        //             pathname: id,
-        //             newOrigin: url.origin,
-        //           })
-        //         }),
-        //       )
-        //       .get(
-        //         "/route/**:name",
-        //         eventHandler(async (event) => {
-        //           const id = "/" + getRouterParam(event, "name")
-        //           const url = getRequestURL(event);
-        //           return await serverContext.fetchRouteData({
-        //             pathname: id,
-        //             newOrigin: url.origin,
-        //           })
-        //         }),
-        //       )
-        //       .get(
-        //         "/query/**:name",
-        //         eventHandler(async (event) => {
-        //           const id = "/" + getRouterParam(event, "name")
-        //           const paramString = getQuery(event).params
-        //           const params = typeof paramString === "string" && paramString.length ? JSON.parse(paramString) : {}
-        //           return await serverContext.fetchNamedQuery({
-        //             name: id,
-        //             params: params,
-        //             headers: getRequestHeaders(event),
-        //           })
-        //         }),
-        //       )
-        //       .post(
-        //         "/mutation/**:name",
-        //         eventHandler(async (event) => {
-        //           const id = "/" + getRouterParam(event, "name")
-        //           const body = await getWebRequest(event).json()
-        //           return await serverContext.fetchMutation({
-        //             name: id,
-        //             body,
-        //             headers: getRequestHeaders(event),
-        //           })
-        //         }),
-        //       )
-        //     export default router.handler
-        //   `,
-        // })
     }
     if (opts.serverless) {
         codegen.registerFile({
             name: "handler.ssr-page.ts",
             generate: code /* tsx */ `
         /// <reference types="vinxi/types/server" />
-        import "../../views/index.css"
+        import "../../${project.cssEntryFile}"
         import "./manifest/blocks.js"
         import "./manifest/styles.js"
         import "./manifest/views.js"
         import "./context.js"
-        import { proxyWpAdmin, renderPage, ServerContext } from "eddev/server"
+        import { proxyWpAdmin, renderPage, renderPageForIndexing, ServerContext } from "eddev/server"
         import {
           createRouter,
           eventHandler,
@@ -298,11 +260,15 @@ export function createVinxiCodegen(opts) {
           getRequestURL,
           getRouterParam,
           getWebRequest,
+          getCookie,
+          setCookie
         } from "vinxi/http"
         import { handleRPC } from "./rpc.js"
         import { serverContext } from "./context.js"
         import { getManifest } from "vinxi/manifest"
         import { inspect } from "node:util"
+        import { withTrailingSlash } from 'ufo'
+        import { viewManifestReader, blockManifestReader } from 'eddev/_internal'
 
         const router = createRouter()
           .get(
@@ -311,7 +277,7 @@ export function createVinxiCodegen(opts) {
               const id = "/"
               const url = getRequestURL(event)
 
-              return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin })
+              return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin, bypass: serverContext.shouldBypass(event) })
             }),
           )
           .get(
@@ -320,18 +286,27 @@ export function createVinxiCodegen(opts) {
               const id = "/" + getRouterParam(event, "name")
               const url = getRequestURL(event)
 
-              return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin })
+              return await serverContext.fetchRouteData({ pathname: id, newOrigin: url.origin, bypass: serverContext.shouldBypass(event) })
             }),
           )
           .get(
             "/_data/query/**:name",
             eventHandler(async (event) => {
-              const id = "/" + getRouterParam(event, "name")
-              const paramString = getQuery(event).params
+              const url = getRequestURL(event)
+
+              const [id, paramString] = event.path.replace("/_data/query", "").split("=", 2)
 
-              const params = typeof paramString === "string" && paramString.length ? JSON.parse(paramString) : {}
+              let params = {}
+              try {
+                params =
+                  typeof paramString === "string" && paramString.length
+                    ? JSON.parse(decodeURIComponent(paramString.replace(/\\/$/, "")))
+                    : {}
+              } catch (e) {
+                throw new Error("Invalid query parameters")
+              }
 
-              return await serverContext.fetchNamedQuery({ name: id, params: params, headers: getRequestHeaders(event) })
+              return await serverContext.fetchNamedQuery({ name: id, newOrigin: url.origin, params: params, headers: getRequestHeaders(event), bypass: serverContext.shouldBypass(event) })
             }),
           )
           .get(
@@ -342,6 +317,7 @@ export function createVinxiCodegen(opts) {
               const input = manifest.inputs[id === 'handler' ? manifest.handler : id]
               const result = {
                 ...input,
+                id,
                 assets: await input.assets(),
               }
               const code = inspect(result, { depth: 10 })
@@ -356,12 +332,61 @@ export function createVinxiCodegen(opts) {
               return await serverContext.fetchMutation({ name: id, body, headers: getRequestHeaders(event) })
             }),
           )
+          .post(
+            "/_data/submit-gf",
+            eventHandler(async (event) => {
+              const req = getWebRequest(event)
+              const headers = new Headers(req.headers)
+              headers.delete("content-length")
+              headers.delete("host")
+              headers.delete("connection")
+              headers.delete("pragma")
+              return await serverContext.fetchOrigin("/wp-json/ed/v1/gf/submit/", {
+                method: "POST",
+                headers: headers,
+                body: await req.blob(),
+              })
+            }),
+          )
+        
+        const aiRouter = createRouter()
+          .get(
+            "/_ai/page",
+            eventHandler(async (event) => {
+              const id = "/"
+              const url = getRequestURL(event)
+              const page = await renderPageForIndexing({ pathname: id, newOrigin: url.origin, hostname: url.hostname })
+              return new Response(page.contents, {
+                headers: {
+                  "Content-Type": "text/html; charset=utf-8",
+                  "Cache-Control": "no-store",
+                },
+              })
+            }),
+          )
+          .get(
+            "/_ai/page/**:name",
+            eventHandler(async (event) => {
+              const id = "/" + getRouterParam(event, "name")
+              const url = getRequestURL(event)
+
+              const page = await renderPageForIndexing({ pathname: id, newOrigin: url.origin, hostname: url.hostname })
+              return new Response(page.contents, {
+                headers: {
+                  "Content-Type": "text/html; charset=utf-8",
+                  "Cache-Control": "no-store",
+                },
+              })
+            }),
+          )
 
         export default eventHandler({
           handler: async (event) => {
             const serverContext = ServerContext.main
             const url = getRequestURL(event)
 
+            await Promise.allSettled([viewManifestReader.preloadAll(), blockManifestReader.preloadAll()])
+
             // RPC
             const isRPC = serverContext.rpcBases.some((base) => url.pathname.startsWith(base))
             if (isRPC) {
@@ -373,13 +398,38 @@ export function createVinxiCodegen(opts) {
               return router.handler(event)
             }
 
+            // LLM indexing route
+            if (url.pathname.startsWith("/_ai/")) {
+              return aiRouter.handler(event)
+            }
+
+            // Outdated build assets
+            if (url.pathname.match(/^\\/(_build|_admin)/)) {
+              return new Response("", { status: 404 })
+            }
+
             // Proxy WordPress
             if (url.pathname.includes(".") || url.pathname.startsWith("/graphql") || url.pathname.startsWith("/wp-")) {
               return proxyWpAdmin(event)
             }
 
+            // Enforce trailing slashes
+            if (!url.pathname.endsWith("/")) {
+              url.pathname = withTrailingSlash(url.pathname)
+              return Response.redirect(url, 301)
+            }
+
+            ${process.env.VERCEL_SKEW_PROTECTION_ENABLED &&
+                code /* tsx*/ `
+                // Skew protection
+                setCookie(event, "__vdpl", ${JSON.stringify(process.env.VERCEL_DEPLOYMENT_ID ?? "")}, {
+                  httpOnly: false,
+                  path: "/",
+                })
+              `}
+
             // SSR
-            return renderPage({ pathname: url.pathname, newOrigin: url.origin })
+            return renderPage({ pathname: url.pathname, newOrigin: url.origin, hostname: url.hostname, bypass: serverContext.shouldBypass(event) })
           },
         })
     `,
@@ -403,19 +453,30 @@ export function createVinxiCodegen(opts) {
         name: "manifest/blocks.ts",
         generate: async () => {
             const blockManifest = await project.blocks.get();
+            let blockImports = [];
+            let blockEntries = [];
+            for (const [name, block] of Object.entries(blockManifest.blocks)) {
+                if (name.match(/^_[a-z]+$/i))
+                    continue;
+                const importSource = JSON.stringify("../../../" + block.fileName);
+                const jsName = pascalCase(name);
+                if (block.dynamic) {
+                    const importStatement = `dynamic(() => import(${importSource}), ${JSON.stringify(block.fileName)})`;
+                    blockEntries.push(JSON.stringify(block.acfName) + ": " + importStatement);
+                }
+                else {
+                    blockImports.push(`import ${jsName} from ${importSource}`);
+                    blockEntries.push(JSON.stringify(block.acfName) + ": " + jsName);
+                }
+            }
             return code /* ts */ `
         import { blockManifestReader } from 'eddev/_internal'
         import { dynamic } from 'eddev/dynamic'
         import core from '../../../blocks/_core'
+        ${blockImports.join("\n")}
 
         const manifest = {
-          ${Object.entries(blockManifest.blocks)
-                .filter(([name]) => !name.match(/^_[a-z]+$/i))
-                .map(([name, block]) => {
-                const importStatement = `dynamic(() => import(${JSON.stringify("../../../" + block.fileName)}), ${JSON.stringify(block.fileName)})`;
-                return JSON.stringify(block.acfName) + ": " + importStatement;
-            })
-                .join(",\n")},
+          ${blockEntries.join(",\n")},
           ...core
         }
 
@@ -508,7 +569,7 @@ export function createVinxiCodegen(opts) {
                 return code `${JSON.stringify(view.slug)}: ${importStatement},\n`;
             })}}
 
-        viewManifestReader.value = manifest
+        viewManifestReader.set(manifest)
         
         export default manifest
 
@@ -612,7 +673,13 @@ export function createVinxiCodegen(opts) {
               endpoint: "/",
               req: req,
               router: router,
-              createContext,
+              createContext: async (opts) => {
+                return {
+                  ...(await createContext(opts)),
+                  searchParams: opts.info.url?.searchParams,
+                  server: serverContext,
+                }
+              },
               onError: (err) => console.error(err),
               batching: { enabled: false },
               // If a Response object is returned by a route, it will be sent as the response

package/dist/node/graphql/graphql-codegen.d.ts

@@ -38,3 +38,4 @@ export declare class GraphQLGenerator {
     private writeSchemaFile;
 }
 export {};
+//# sourceMappingURL=graphql-codegen.d.ts.map

package/dist/node/graphql/graphql-codegen.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-codegen.d.ts","sourceRoot":"","sources":["../../../src/node/graphql/graphql-codegen.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAkB/C,eAAO,MAAM,UAAU,kEAAgE,CAAA;AA4CvF,KAAK,uBAAuB,GAAG;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,gBAAgB;IAiBlB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,uBAAuB;IAjBtC,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAO;IAC1B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,UAAU,CAAgC;IAElD,OAAO,CAAC,cAAc,CAAW;IAEjC,OAAO,CAAC,SAAS,CAAC,CAAgB;IAElC,OAAO,CAAC,UAAU,CAAC,CAAgB;gBAG1B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,uBAAuB;IA8DhC,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBvE,KAAK;YA8BG,MAAM;IA+CpB,aAAa;IAOP,QAAQ;IAsOd,OAAO,CAAC,mBAAmB;IAuE3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;YA2Ed,UAAU;IAqDlB,iBAAiB;IAkFjB,gBAAgB;IAyCtB;;OAEG;YACW,eAAe;CAQ9B"}

package/dist/node/graphql/graphql-codegen.js

@@ -17,7 +17,7 @@ import pluginFiles from "./plugins/gql-plugin-files.js";
 import pluginNoDuplicates from "./plugins/gql-plugin-no-duplicates.js";
 import pluginQueries from "./plugins/gql-plugin-queries.js";
 import { FSCodegen } from "../utils/fs-codegen.js";
-import { camelCase } from "change-case-all";
+import { camelCase, pascalCase } from "change-case-all";
 export const graphqlLog = createConsole("GraphQL Codegen", "graphql");
 const console = graphqlLog;
 class GraphQLValidationError {
@@ -103,7 +103,7 @@ export class GraphQLGenerator {
                             ast.trailingComments ? "\n" + ast.trailingComments : "",
                         ].join("");
                         return {
-                            name,
+                            name: name.replace(/\.graphql$/, ".txt"),
                             content,
                         };
                     });
@@ -247,6 +247,19 @@ export class GraphQLGenerator {
         this.writeSchemaFile(schemaResult.schema);
         // Get GraphQL files
         const graphQLFiles = await this.fileLoader.get();
+        // Fill in any missing operation names
+        for (let [key, entry] of Object.entries(graphQLFiles.blocks)) {
+            if (entry.ast) {
+                const main = entry.ast.definitions[0];
+                if (main?.kind === Kind.OPERATION_DEFINITION && !main.name) {
+                    // @ts-ignore
+                    main.name = {
+                        kind: Kind.NAME,
+                        value: pascalCase(key.replace(".graphql", "").split(/\//).join("-")),
+                    };
+                }
+            }
+        }
         // Validate them against the schema
         const validationErrors = this.validateGraphQLFiles(graphQLFiles, schemaResult.rawSchema);
         if (validationErrors.length > 0) {
@@ -288,7 +301,7 @@ export class GraphQLGenerator {
             this.generateTS("types.graphql.ts", schemaResult.rawSchema, {
                 documents: getDocuments(["queries", "views", "blocks", "fragments"]),
                 hasDocuments: true,
-                banner: `import { ContentBlock } from "eddev/blocks"`,
+                banner: [`import { ContentBlock } from "eddev/blocks"`, ...(wp.scalarTypeImports ?? [])].join("\n"),
                 footer: Object.keys(wp.scalarTypes)
                     .map((name) => `export type ${name.endsWith("Option") ? name : name + "Scalar"} = Scalars["${name}"]["output"]`)
                     .join("\n"),
@@ -334,7 +347,12 @@ export class GraphQLGenerator {
                     rootDir: this.project.rootDir,
                     folderName: "views",
                     globalName: "ViewProps",
-                    additionalTypes: {},
+                    additionalTypes: {
+                        _error: "ErrorRouteProps",
+                    },
+                    banner: `
+              import { ErrorRouteProps } from "eddev/routing"
+            `,
                 },
             }),
             this.generateTS("types.blocks.ts", schemaResult.rawSchema, {
@@ -352,7 +370,7 @@ export class GraphQLGenerator {
                     rootDir: this.project.rootDir,
                     globalName: "BlockProps",
                     folderName: "blocks",
-                    getType: (importedName, def) => {
+                    getType: (importedName, def, name) => {
                         // const queryKeyVals: any[] = []
                         let blockSelection = "";
                         let hasOthers = false;
@@ -374,6 +392,13 @@ export class GraphQLGenerator {
                             return {};
                         return type.join(" & ");
                     },
+                    additionalTypes: Object.fromEntries(Object.entries(blockManifest.blocks).map(([key, block]) => {
+                        const styleNames = new Set(block.blockStyles
+                            ?.map((s) => s.name)
+                            .filter(Boolean)
+                            .map((name) => JSON.stringify(name)) ?? []);
+                        return [key, styleNames.size > 0 ? `{ "blockStyle": ${[...styleNames].join("|")} }` : null];
+                    })),
                 },
             }),
             this.generateTS("hooks/queries.ts", schemaResult.rawSchema, {
@@ -416,7 +441,6 @@ export class GraphQLGenerator {
             allFragments[node.name.value] = node;
         });
         function findFragments(defs, map = new Map()) {
-            // console.log("findFragments", defs.length)
             for (let def of defs) {
                 if (def.kind === Kind.FRAGMENT_DEFINITION) {
                     map.set(def.name.value, def);
@@ -473,15 +497,34 @@ export class GraphQLGenerator {
         /**
          * Get the optimized files — queries with all fragments included
          */
-        const { queries } = this.getOptimizedQueries(graphQLFiles);
+        const { queries, fragments } = this.getOptimizedQueries(graphQLFiles);
         /**
          * Only report the same error once (mostly for preventing repeats of the same fragment errors)
          */
         const errorsShown = new Map();
+        function validateAST(validationAST, path) {
+            const errors = validate(schema, validationAST, validationRules);
+            if (errors.length > 0) {
+                for (let error of errors) {
+                    if (error.nodes && error.nodes[0]) {
+                        const node = error.nodes[0];
+                        if (errorsShown.has(node) && errorsShown.get(node)?.includes(error.message)) {
+                            continue;
+                        }
+                        else {
+                            errorsShown.set(node, [...(errorsShown.get(node) ?? []), error.message]);
+                        }
+                    }
+                    report.push(new GraphQLValidationError(error.message, path, error.locations?.[0].line || 1, error.locations?.[0].column || 1, error.source?.body || ""));
+                }
+            }
+        }
         /**
          * Validate everything
          */
         const report = [];
+        // Validate fragments
+        // Validate operations
         for (let [groupName, fileMap] of Object.entries(graphQLFiles)) {
             const group = queries[groupName];
             for (let [path, file] of Object.entries(fileMap)) {
@@ -494,22 +537,7 @@ export class GraphQLGenerator {
                     if (!validationAST) {
                         continue;
                     }
-                    const errors = validate(schema, validationAST, validationRules);
-                    if (errors.length > 0) {
-                        for (let error of errors) {
-                            if (error.nodes && error.nodes[0]) {
-                                const node = error.nodes[0];
-                                if (errorsShown.has(node) && errorsShown.get(node)?.includes(error.message)) {
-                                    continue;
-                                }
-                                else {
-                                    errorsShown.set(node, [...(errorsShown.get(node) ?? []), error.message]);
-                                }
-                            }
-                            // console.log(error.nodes?.map((n) => n.kind))
-                            report.push(new GraphQLValidationError(error.message, path, error.locations?.[0].line || 1, error.locations?.[0].column || 1, error.source?.body || ""));
-                        }
-                    }
+                    validateAST(validationAST, path);
                 }
             }
         }
@@ -538,7 +566,7 @@ export class GraphQLGenerator {
             output = await codegen(config);
         }
         catch (err) {
-            errors.push(String(err));
+            errors.push(err);
         }
         if (args.banner) {
             output = args.banner + "\n\n" + output + "\n" + (args.footer ?? "");

package/dist/node/graphql/graphql-schema-loader.d.ts

@@ -16,3 +16,4 @@ export declare class GraphQLSchemaLoader {
     private processSchema;
 }
 export {};
+//# sourceMappingURL=graphql-schema-loader.d.ts.map

package/dist/node/graphql/graphql-schema-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-schema-loader.d.ts","sourceRoot":"","sources":["../../../src/node/graphql/graphql-schema-loader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAA2B,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAOpF,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,aAAa,CAAA;IACxB,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,qBAAa,mBAAmB;IAGrB,GAAG,EAAE,MAAM;IACX,MAAM,CAAC,EAAE,MAAM;IAHxB,QAAQ,SAAK;gBAEJ,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,YAAA;IAGxB,OAAO,CAAC,YAAY,CAA0B;IAExC,GAAG,CAAC,WAAW,UAAQ;IAOvB,IAAI;IAgCV,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,aAAa;CA4BtB"}

package/dist/node/graphql/plugins/gql-plugin-files.d.ts

@@ -3,12 +3,14 @@ type PluginConfig = {
     rootDir: string;
     fallbackType: string;
     globalName: string;
-    getType?: (importedName: string, definition: any) => string;
+    getType?: (importedName: string, definition: any, name: string) => string;
     additionalTypes: {
         [key: string]: string;
     };
+    banner: string;
 };
 declare const _default: {
     plugin: (schema: any, documents: any, config: PluginConfig, info: any) => string;
 };
 export default _default;
+//# sourceMappingURL=gql-plugin-files.d.ts.map

package/dist/node/graphql/plugins/gql-plugin-files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql-plugin-files.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-files.ts"],"names":[],"mappings":"AAIA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IACzE,eAAe,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KACtB,CAAA;IACD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;;qBAGkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBAkEC"}

package/dist/node/graphql/plugins/gql-plugin-files.js

@@ -31,9 +31,9 @@ export default {
             filesFound[relative.replace(/\.graphql/, "")] = true;
             if (relative && doc.document.definitions.length) {
                 let importedName = doc.document.definitions[0].name.value + "Query";
-                let typeName = config.getType?.(importedName, doc.document.definitions[0]) || importedName;
-                imports.push(importedName);
                 const key = relative.replace(/\.graphql/, "");
+                let typeName = config.getType?.(importedName, doc.document.definitions[0], key) || importedName;
+                imports.push(importedName);
                 items.push(`${JSON.stringify(key)}: ${typeForFile(key, typeName)}`);
             }
         });
@@ -51,6 +51,7 @@ export default {
        */
       import 'eddev/types.app.public'
       ${imports.length > 0 ? code `import { ${imports.sort().join(", ")} } from "./types.graphql"` : ""}
+      ${config.banner || ""}
 
       declare global {
         interface ${config.globalName} {

package/dist/node/graphql/plugins/gql-plugin-no-duplicates.d.ts

@@ -6,3 +6,4 @@ declare const _default: {
     validate: (schema: any, documents: any, config: PluginConfig, info: any) => void;
 };
 export default _default;
+//# sourceMappingURL=gql-plugin-no-duplicates.d.ts.map

package/dist/node/graphql/plugins/gql-plugin-no-duplicates.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql-plugin-no-duplicates.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-no-duplicates.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;;;uBAIoB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AAFzE,wBASC"}

package/dist/node/graphql/plugins/gql-plugin-queries.d.ts

@@ -6,3 +6,4 @@ declare const _default: {
     plugin: (schema: any, documents: any, config: PluginConfig, info: any) => string;
 };
 export default _default;
+//# sourceMappingURL=gql-plugin-queries.d.ts.map

package/dist/node/graphql/plugins/gql-plugin-queries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql-plugin-queries.d.ts","sourceRoot":"","sources":["../../../../src/node/graphql/plugins/gql-plugin-queries.ts"],"names":[],"mappings":"AAWA,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;;qBAKkB,GAAG,aAAa,GAAG,UAAU,YAAY,QAAQ,GAAG;;AADvE,wBA2TC"}