refactor(govinfo-sdk): simplify build process and update OpenAPI spec references

Author: beshkenadze

packages/govinfo-sdk/build.ts

@@ -10,7 +10,7 @@ await $`rm -rf dist`;
 // Build ESM format
 console.log('Building ESM...');
 await Bun.build({
-  entrypoints: ['./src/index.ts', './src/mcp/index.ts'],
+  entrypoints: ['./src/index.ts'],
   outdir: './dist',
   format: 'esm',
   target: 'node',
@@ -26,7 +26,7 @@ await Bun.build({
 // Build CJS format
 console.log('Building CommonJS...');
 await Bun.build({
-  entrypoints: ['./src/index.ts', './src/mcp/index.ts'],
+  entrypoints: ['./src/index.ts'],
   outdir: './dist',
   format: 'cjs',
   target: 'node',

packages/govinfo-sdk/openapi.json

@@ -57,7 +57,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/SearchRequest"
+                "$ref": "#/components/schemas/SearchBody"
               },
               "example": {
                 "query": "Federal documents",
@@ -1416,7 +1416,7 @@
   },
   "components": {
     "schemas": {
-      "SearchRequest": {
+      "SearchBody": {
         "type": "object",
         "properties": {
           "query": {

packages/govinfo-sdk/orval.config.ts

@@ -1,72 +1,46 @@
-import { defineConfig } from 'orval';
+import { defineConfig } from "orval";
 
 export default defineConfig({
-  // SDK configuration
-  'govinfo-api': {
-    input: './openapi.json',
+  sdk: {
+    input: "./openapi.json",
     output: {
-      mode: 'split',
-      target: './src/api/generated/endpoints.ts',
-      schemas: './src/api/generated/model',
-      client: 'axios-functions',
-      httpClient: 'axios',
-      mock: false,
+      mode: "split",
+      target: "./src/api/generated/endpoints.ts",
+      schemas: "./src/api/generated/model",
+      client: "axios-functions",
+      httpClient: "axios",
+      mock: true,
       clean: true,
+      docs: {
+        out: "./docs",
+        disableSources: true,
+      },
       prettier: false,
       override: {
         operations: {
           Document: {
             mutator: {
-              path: './src/api/client.ts',
-              name: 'customInstance',
+              path: "./src/api/client.ts",
+              name: "customInstance",
             },
           },
         },
         mutator: {
-          path: './src/api/client.ts',
-          name: 'customInstance',
+          path: "./src/api/client.ts",
+          name: "customInstance",
         },
-        header: () => [
-          '/* eslint-disable */',
-          '/* tslint:disable */',
-          '// @ts-nocheck',
-          '/**',
-          ' * Generated by orval 🍺',
-          ' * Do not edit manually.',
-          ' * GovInfo API Documentation',
-          ' * OpenAPI spec version: 3.0.0',
-          ' */',
-          '',
-        ],
       },
     },
   },
-  // MCP server configuration
-  'govinfo-mcp': {
-    input: './openapi.json',
+  mcp: {
+    input: "./openapi.json",
     output: {
-      mode: 'single',
-      client: 'mcp',
-      baseUrl: 'https://api.govinfo.gov',
-      target: './src/mcp/handlers.ts',
-      schemas: './src/mcp/http-schemas',
-      override: {
-        header: () => [
-          '/* eslint-disable */',
-          '/* tslint:disable */',
-          '// @ts-nocheck',
-          '/**',
-          ' * Generated by orval 🍺',
-          ' * Do not edit manually.',
-          ' * GovInfo API Documentation',
-          ' * OpenAPI spec version: 3.0.0',
-          ' */',
-          '',
-        ],
-      },
-    },
-    hooks: {
-      afterAllFilesWrite: 'bun run scripts/fix-mcp-types.ts',
+      mode: "single",
+      client: "mcp",
+      baseUrl: "https://api.govinfo.gov",
+      target: "./src/mcp/handlers.ts",
+      schemas: "./src/mcp/http-schemas",
+      clean: true,
     },
   },
 });

packages/govinfo-sdk/package.json

@@ -62,10 +62,10 @@
     "test:e2e:mcp": "bun test tests/e2e/mcp-server.e2e.test.ts",
     "test:all": "bun test",
     "mcp:server": "bun run src/mcp/server.ts",
-    "docs:generate": "bunx orval --config orval.config.ts --project docs"
+    "docs:generate": "bunx typedoc"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.1.2",
+    "@biomejs/biome": "2.1.3",
     "@types/bun": "latest",
     "@types/node": "^24.1.0",
     "@us-legal-tools/tsconfig": "workspace:*",
@@ -88,4 +88,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

packages/govinfo-sdk/scripts/download-openapi.ts

@@ -12,7 +12,7 @@ async function downloadOpenAPISpec() {
       throw new Error(`HTTP ${response.status}: ${response.statusText}`);
     }
 
-    const spec = await response.json();
+    const spec = await response.json() as any;
 
     // Fix apostrophes in descriptions to prevent syntax errors in generated code
     const fixApostrophes = (obj: any): any => {
@@ -34,8 +34,14 @@ async function downloadOpenAPISpec() {
 
     const fixedSpec = fixApostrophes(spec);
 
+    // Rename SearchRequest to SearchBody to match MCP generator expectations
+    const specString = JSON.stringify(fixedSpec, null, 2);
+    const renamedSpec = specString
+      .replace(/"SearchRequest"/g, '"SearchBody"')
+      .replace(/#\/components\/schemas\/SearchRequest/g, '#/components/schemas/SearchBody');
+    
     // Write the spec to a file
-    await writeFile('./openapi.json', JSON.stringify(fixedSpec, null, 2));
+    await writeFile('./openapi.json', renamedSpec);
 
     console.log('✅ OpenAPI specification downloaded successfully');
     console.log(`📄 Spec title: ${spec.info?.title}`);

packages/govinfo-sdk/scripts/fix-mcp-types.ts

@@ -1,24 +1,12 @@
 // GovInfo SDK
+import * as packageJson from '../package.json';
+
+// Export the configured API client
 export * from './api/client';
-// Re-export generated functions and types
-export * from './api/generated/endpoints';
-// Re-export additional types from model (SearchResult will come from endpoints)
-export type {
-  CollectionContainer,
-  CollectionSummary,
-  GranuleContainer,
-  GranuleMetadata,
-  PackageInfo,
-  SearchRequest,
-  SearchResponse,
-  SearchResultDownload,
-  Sort,
-  SortSortOrder,
-  SummaryItem
-} from './api/generated/model';
 
-export default {
-  name: 'GovInfo SDK',
-  version: '0.1.0',
-  description: 'TypeScript SDK and MCP server for the GovInfo API',
-};
+// Export package version
+export const VERSION = packageJson.version;
+
+// Users can import generated types and functions directly:
+// import { search } from '@us-legal-tools/govinfo-sdk/api/generated/endpoints';
+// import type { SearchBody } from '@us-legal-tools/govinfo-sdk/api/generated/model';

packages/govinfo-sdk/src/index.ts

@@ -2,8 +2,18 @@
   "extends": "@us-legal-tools/tsconfig/tsconfig.build.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "resolveJsonModule": true
   },
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.ts", "src/**/*.spec.ts", "src/test-*.ts", "tests/**/*", "scripts/**/*"]
+  "include": ["src/index.ts", "src/api/client.ts"],
+  "exclude": [
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/test-*.ts",
+    "tests/**/*",
+    "scripts/**/*",
+    "src/api/generated/**/*",
+    "src/api/endpoints/**/*",
+    "src/mcp/**/*"
+  ]
 }

packages/govinfo-sdk/src/mcp/index.ts

@@ -1,8 +1,18 @@
 {
   "extends": "@us-legal-tools/tsconfig/tsconfig.json",
   "compilerOptions": {
-    "types": ["bun-types"]
+    "types": ["bun-types"],
+    "resolveJsonModule": true,
+    "skipLibCheck": true
   },
-  "include": ["src/**/*", "scripts/**/*", "tests/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "include": ["src/**/*", "tests/**/*"],
+  "exclude": [
+    "node_modules",
+    "dist",
+    "src/api/generated/model/**/*",
+    "src/api/generated/endpoints.ts",
+    "src/api/endpoints/docs.ts",
+    "src/mcp/**/*",
+    "scripts/**/*"
+  ]
 }