Fix invalid schema and typos in graphql-config

packages/graphql-config/package.json

@@ -6,12 +6,12 @@
   "description": "GraphQL configuration for fabrix",
   "exports": {
     ".": {
-      "types": "./dist/index.d.mts",
-      "default": "./dist/index.mjs"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./schema": {
-      "types": "./dist/schema.d.mts",
-      "default": "./dist/schema.mjs"
+      "types": "./dist/schema.d.ts",
+      "default": "./dist/schema.js"
     }
   },
   "files": [
@@ -25,6 +25,7 @@
     "test": "vitest run"
   },
   "dependencies": {
+    "@graphql-tools/merge": "^9.0.8",
     "graphql": "^16.9.0"
   },
   "devDependencies": {
@@ -36,7 +37,7 @@
     "prettier": "^3.3.3",
     "tsup": "^8.1.0",
     "typescript": "^5.5.3",
-    "vite-plugin-graphql-loader": "^4.0.4",
+    "vite-plugin-string": "^1.2.3",
     "vitest": "^2.0.3"
   },
   "prettier": "@fabrix-framework/prettier-config"

packages/graphql-config/src/graphql.d.ts

@@ -1,4 +1,4 @@
 declare module "*.graphql" {
-  const Document: import("graphql").DocumentNode;
+  const Document: string;
   export default Document;
 }

packages/graphql-config/src/schema.test.ts

@@ -0,0 +1,9 @@
+import { describe, it, expect } from "vitest";
+import { buildASTSchema } from "graphql";
+import { schemaDefinition } from "./schema";
+
+describe.skip("schemaDefinition", () => {
+  it("should be buildable", () => {
+    expect(buildASTSchema(schemaDefinition)).not.toThrow();
+  });
+});

packages/graphql-config/src/schema.ts

@@ -1,17 +1,18 @@
-import { DocumentNode, Kind } from "graphql";
+import { parse } from "graphql";
+import { mergeTypeDefs } from "@graphql-tools/merge";
 import CommonSchema from "./schema/common.graphql";
 import ViewDirectiveSchema from "./schema/view.graphql";
 import FormDirectiveSchema from "./schema/form.graphql";
 import ConstraintSchema from "./schema/constraint.graphql";
 
-const mergeDocumentNodes = (docs: DocumentNode[]) => ({
-  kind: Kind.DOCUMENT,
-  definitions: docs.flatMap((doc) => doc.definitions),
-});
+const parseStringSchemas = (rawDefinition: string[]) =>
+  rawDefinition.map((def) => parse(def));
 
-export const schemaDefinition = mergeDocumentNodes([
-  CommonSchema,
-  ViewDirectiveSchema,
-  FormDirectiveSchema,
-  ConstraintSchema,
-]);
+export const schemaDefinition = mergeTypeDefs(
+  parseStringSchemas([
+    CommonSchema,
+    ViewDirectiveSchema,
+    FormDirectiveSchema,
+    ConstraintSchema,
+  ]),
+);

packages/graphql-config/vitest.config.ts

@@ -1,8 +1,14 @@
 import { defineConfig } from "vitest/config";
-import graphqlLoader from "vite-plugin-graphql-loader";
+import stringPlugin from "vite-plugin-string";
 
 export default defineConfig({
-  plugins: [graphqlLoader()],
+  plugins: [
+    // Load .graphql files as strings as production build with tsup also does
+    stringPlugin({
+      include: "**/*.graphql",
+      compress: false,
+    }),
+  ],
   test: {
     include: ["src/**/*.test.ts"],
   },