Merge pull request #1023 from constructive-io/devin/1776760093-codegen-test-helper-and-runtime

pyramation · web-flow · commit 88698ea01700 · 2026-04-26T18:42:51.000-07:00
feat: consolidate codegen test helper + runtime deep path
diff --git a/graphql/codegen/src/__tests__/codegen/__snapshots__/client-generator.test.ts.snap b/graphql/codegen/src/__tests__/codegen/__snapshots__/client-generator.test.ts.snap
@@ -108,13 +108,13 @@ import type {
   GraphQLAdapter,
   GraphQLError,
   QueryResult,
-} from '@constructive-io/graphql-types';
+} from '@constructive-io/graphql-query/runtime';
 
 export type {
   GraphQLAdapter,
   GraphQLError,
   QueryResult,
-} from '@constructive-io/graphql-types';
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/graphql/codegen/src/core/codegen/templates/orm-client.ts b/graphql/codegen/src/core/codegen/templates/orm-client.ts
@@ -12,13 +12,13 @@ import type {
   GraphQLAdapter,
   GraphQLError,
   QueryResult,
-} from '@constructive-io/graphql-types';
+} from '@constructive-io/graphql-query/runtime';
 
 export type {
   GraphQLAdapter,
   GraphQLError,
   QueryResult,
-} from '@constructive-io/graphql-types';
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/graphql/codegen/src/core/codegen/templates/query-builder.ts b/graphql/codegen/src/core/codegen/templates/query-builder.ts
@@ -8,7 +8,7 @@
  * Any changes here will affect all generated ORM clients.
  */
 
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type {
   ArgumentNode,
diff --git a/graphql/orm-test/__tests__/helpers/codegen-helper.ts b/graphql/orm-test/__tests__/helpers/codegen-helper.ts
diff --git a/graphql/orm-test/__tests__/mega-query.test.ts b/graphql/orm-test/__tests__/mega-query.test.ts
@@ -20,7 +20,7 @@ import { join } from 'path';
 import { getConnectionsObject, seed } from 'graphile-test';
 import type { GraphQLQueryFnObj, GraphQLResponse } from 'graphile-test';
 import { ConstructivePreset } from 'graphile-settings';
-import { runCodegenAndLoad } from './helpers/codegen-helper';
+import { runCodegenAndLoad } from '@constructive-io/graphql-test';
 import { GraphileTestAdapter } from './helpers/graphile-adapter';
 
 jest.setTimeout(120000);
diff --git a/graphql/orm-test/__tests__/orm-m2n.test.ts b/graphql/orm-test/__tests__/orm-m2n.test.ts
@@ -16,7 +16,7 @@ import { getConnectionsObject, seed } from 'graphile-test';
 import type { GraphQLQueryFnObj } from 'graphile-test';
 import type { PgTestClient } from 'pgsql-test';
 import { ConstructivePreset } from 'graphile-settings';
-import { runCodegenAndLoad } from './helpers/codegen-helper';
+import { runCodegenAndLoad } from '@constructive-io/graphql-test';
 import { GraphileTestAdapter } from './helpers/graphile-adapter';
 
 jest.setTimeout(120000);
diff --git a/graphql/orm-test/__tests__/postgis-spatial-relations.test.ts b/graphql/orm-test/__tests__/postgis-spatial-relations.test.ts
@@ -17,7 +17,7 @@ import { join } from 'path';
 import { getConnectionsObject, seed } from 'graphile-test';
 import type { GraphQLQueryFnObj } from 'graphile-test';
 import { ConstructivePreset } from 'graphile-settings';
-import { runCodegenAndLoad } from './helpers/codegen-helper';
+import { runCodegenAndLoad } from '@constructive-io/graphql-test';
 import { GraphileTestAdapter } from './helpers/graphile-adapter';
 
 jest.setTimeout(120000);
diff --git a/graphql/orm-test/__tests__/postgis-spatial.test.ts b/graphql/orm-test/__tests__/postgis-spatial.test.ts
@@ -24,7 +24,7 @@ import { join } from 'path';
 import { getConnectionsObject, seed } from 'graphile-test';
 import type { GraphQLQueryFnObj } from 'graphile-test';
 import { ConstructivePreset } from 'graphile-settings';
-import { runCodegenAndLoad } from './helpers/codegen-helper';
+import { runCodegenAndLoad } from '@constructive-io/graphql-test';
 import { GraphileTestAdapter } from './helpers/graphile-adapter';
 
 jest.setTimeout(120000);
diff --git a/graphql/orm-test/package.json b/graphql/orm-test/package.json
@@ -12,6 +12,7 @@
     "@0no-co/graphql.web": "^1.1.2",
     "@constructive-io/graphql-codegen": "workspace:^",
     "@constructive-io/graphql-query": "workspace:^",
+    "@constructive-io/graphql-test": "workspace:^",
     "@constructive-io/graphql-types": "workspace:^",
     "@types/pg": "^8.18.0",
     "gql-ast": "workspace:^",
diff --git a/graphql/query/package.json b/graphql/query/package.json
@@ -29,6 +29,8 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@0no-co/graphql.web": "^1.1.2",
+    "@constructive-io/graphql-types": "workspace:^",
     "ajv": "^8.18.0",
     "gql-ast": "workspace:^",
     "grafast": "1.0.0",
diff --git a/graphql/query/src/runtime/index.ts b/graphql/query/src/runtime/index.ts
@@ -0,0 +1,23 @@
+/**
+ * Runtime sub-export for generated ORM code.
+ *
+ * Generated ORM clients need runtime dependencies at execution time.
+ * This module re-exports two of the three so generated code can consolidate imports:
+ *   - @0no-co/graphql.web  — parseType, print
+ *   - @constructive-io/graphql-types — GraphQLAdapter, GraphQLError, QueryResult
+ *
+ * gql-ast is intentionally NOT re-exported here because the templates
+ * use `import * as t from 'gql-ast'` — mixing it into this namespace
+ * would pollute `t` with unrelated symbols like parseType and print.
+ *
+ * Usage in generated templates:
+ *   import { parseType, print } from '@constructive-io/graphql-query/runtime';
+ *   import * as t from 'gql-ast';
+ *   import type { GraphQLAdapter } from '@constructive-io/graphql-query/runtime';
+ */
+
+// From @0no-co/graphql.web — GraphQL parsing/printing
+export { parseType, print } from '@0no-co/graphql.web';
+
+// From @constructive-io/graphql-types — adapter interface + result types
+export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
diff --git a/graphql/server-test/__tests__/cli-e2e.test.ts b/graphql/server-test/__tests__/cli-e2e.test.ts
@@ -53,6 +53,7 @@ function resolveNodePaths(): string[] {
     'nested-obj',
     'graphql',
     '@constructive-io/graphql-types',
+    '@constructive-io/graphql-query',
     '@agentic-kit/ollama',
   ];
   const dirs = new Set<string>();
diff --git a/graphql/server-test/package.json b/graphql/server-test/package.json
@@ -32,6 +32,7 @@
     "@0no-co/graphql.web": "^1.2.0",
     "@agentic-kit/ollama": "^1.0.3",
     "@constructive-io/graphql-codegen": "workspace:^",
+    "@constructive-io/graphql-query": "workspace:^",
     "@types/express": "^5.0.6",
     "@types/pg": "^8.18.0",
     "@types/supertest": "^7.2.0",
diff --git a/graphql/test/package.json b/graphql/test/package.json
@@ -34,7 +34,9 @@
     "makage": "^0.3.0"
   },
   "dependencies": {
+    "@constructive-io/graphql-codegen": "workspace:^",
     "@constructive-io/graphql-env": "workspace:^",
+    "@constructive-io/graphql-query": "workspace:^",
     "@constructive-io/graphql-types": "workspace:^",
     "@pgpmjs/types": "workspace:^",
     "grafast": "1.0.0",
@@ -47,7 +49,8 @@
     "mock-req": "^0.2.0",
     "pg": "^8.20.0",
     "pgsql-test": "workspace:^",
-    "postgraphile": "5.0.0"
+    "postgraphile": "5.0.0",
+    "typescript": "^5.0.0"
   },
   "keywords": [
     "testing",
diff --git a/graphql/test/src/codegen-helper.ts b/graphql/test/src/codegen-helper.ts
diff --git a/graphql/test/src/index.ts b/graphql/test/src/index.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
