fix(codegen): align runtime exports and generated clients

Author: yyyyaaa

graphql/codegen/src/__tests__/codegen/__snapshots__/react-query-hooks.test.ts.snap

@@ -1843,7 +1843,7 @@ export async function fetchUserQuery<S extends UserSelect>(params: {
 export async function fetchUserQuery(params: {
   id: string;
   selection: SelectionConfig<UserSelect>;
-}) {
+}): Promise<any> {
   const args = buildSelectionArgs<UserSelect>(params.selection);
   return getClient().user.findOne({
     id: params.id,
@@ -1975,7 +1975,7 @@ export async function fetchPostQuery<S extends PostSelect>(params: {
 export async function fetchPostQuery(params: {
   id: string;
   selection: SelectionConfig<PostSelect>;
-}) {
+}): Promise<any> {
   const args = buildSelectionArgs<PostSelect>(params.selection);
   return getClient().post.findOne({
     id: params.id,
@@ -2094,7 +2094,7 @@ export async function fetchUserQuery<S extends UserSelect>(params: {
 export async function fetchUserQuery(params: {
   id: string;
   selection: SelectionConfig<UserSelect>;
-}) {
+}): Promise<any> {
   const args = buildSelectionArgs<UserSelect>(params.selection);
   return getClient().user.findOne({
     id: params.id,

graphql/codegen/src/core/codegen/orm/client-generator.ts

@@ -216,22 +216,6 @@ export function generateCreateClientFile(
   // Re-export all models
   statements.push(t.exportAllDeclaration(t.stringLiteral('./models')));
 
-  // Re-export NodeHttpAdapter when enabled (for use in any Node.js application)
-  if (options?.nodeHttpAdapter) {
-    statements.push(
-      t.exportNamedDeclaration(
-        null,
-        [
-          t.exportSpecifier(
-            t.identifier('NodeHttpAdapter'),
-            t.identifier('NodeHttpAdapter'),
-          ),
-        ],
-        t.stringLiteral('./node-fetch'),
-      ),
-    );
-  }
-
   // Re-export custom operations
   if (hasCustomQueries) {
     statements.push(

graphql/codegen/src/core/codegen/queries.ts

@@ -890,6 +890,7 @@ export function generateSingleQueryHook(
         null,
         [createFunctionParam('params', t.tsTypeLiteral(fImplProps))],
         fBody,
+        typeRef('Promise', [t.tsAnyKeyword()]),
       ),
     );
   }

graphql/query/package.json

@@ -6,6 +6,18 @@
   "main": "index.js",
   "module": "esm/index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./esm/index.js",
+      "require": "./index.js"
+    },
+    "./runtime": {
+      "types": "./runtime/index.d.ts",
+      "import": "./esm/runtime/index.js",
+      "require": "./runtime/index.js"
+    }
+  },
   "homepage": "https://github.com/constructive-io/constructive",
   "license": "MIT",
   "publishConfig": {

graphql/query/src/runtime/index.ts

@@ -24,5 +24,5 @@ export { parseType, print } from '@0no-co/graphql.web';
 export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
 
 // Isomorphic fetch with *.localhost DNS + Host header fix for Node.js
-export { createFetch } from './localhost-fetch';
-export type { FetchFunction } from './localhost-fetch';
+export { createFetch } from './localhost-fetch.js';
+export type { FetchFunction } from './localhost-fetch.js';

graphql/query/src/runtime/localhost-fetch.ts

@@ -13,6 +13,7 @@
  */
 
 export type FetchFunction = typeof globalThis.fetch;
+type NodeModuleLoader = (id: string) => unknown;
 
 export function isLocalhostSubdomain(hostname: string): boolean {
   return hostname.endsWith('.localhost') && hostname !== 'localhost';
@@ -106,6 +107,17 @@ function buildNodeFetch(
 
 let _fetch: FetchFunction | undefined;
 
+function getNodeModuleLoader(): NodeModuleLoader | undefined {
+  try {
+    // Keep node:http / node:https out of browser bundle static analysis.
+    return Function(
+      'return typeof require !== "undefined" ? require : undefined',
+    )() as NodeModuleLoader | undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Create an isomorphic fetch function.
  *
@@ -122,12 +134,13 @@ export function createFetch(): FetchFunction {
 
   if (typeof process !== 'undefined' && process.versions?.node) {
     try {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const http = require('node:http');
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const https = require('node:https');
-      _fetch = buildNodeFetch(http, https);
-      return _fetch;
+      const nodeRequire = getNodeModuleLoader();
+      if (nodeRequire) {
+        const http = nodeRequire('node:' + 'http') as typeof import('node:http');
+        const https = nodeRequire('node:' + 'https') as typeof import('node:https');
+        _fetch = buildNodeFetch(http, https);
+        return _fetch;
+      }
     } catch {
       // node:http unavailable — fall through
     }

sdk/constructive-cli/src/admin/cli/commands/app-limit-event.ts

@@ -27,7 +27,7 @@ const fieldSchema: FieldSchema = {
   reason: 'string',
 };
 const usage =
-  '\napp-limit-event <command>\n\nCommands:\n  list                  List appLimitEvent records\n  find-first            Find first matching appLimitEvent record\n  create                Create a new appLimitEvent\n\nList Options:\n  --limit <n>           Max number of records to return (forward pagination)\n  --last <n>            Number of records from the end (backward pagination)\n  --after <cursor>      Cursor for forward pagination\n  --before <cursor>     Cursor for backward pagination\n  --offset <n>          Number of records to skip\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.name.equalTo foo)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\nFind-First Options:\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.status.equalTo active)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n\n  --help, -h            Show this help message\n';
+  '\napp-limit-event <command>\n\nCommands:\n  list                  List appLimitEvent records\n  find-first            Find first matching appLimitEvent record\n  create                Create a new appLimitEvent\n\nList Options:\n  --limit <n>           Max number of records to return (forward pagination)\n  --last <n>            Number of records from the end (backward pagination)\n  --after <cursor>      Cursor for forward pagination\n  --before <cursor>     Cursor for backward pagination\n  --offset <n>          Number of records to skip\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.name.equalTo foo)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\nFind-First Options:\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.status.equalTo active)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\n  --help, -h            Show this help message\n';
 export default async (
   argv: Partial<Record<string, unknown>>,
   prompter: Inquirerer,
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       reason: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<AppLimitEventSelect, AppLimitEventFilter> & {
+      FindFirstArgs<AppLimitEventSelect, AppLimitEventFilter, AppLimitEventOrderBy> & {
         select: AppLimitEventSelect;
       }
     >(argv, defaultSelect);

sdk/constructive-cli/src/admin/cli/commands/org-limit-aggregate.ts

@@ -26,7 +26,7 @@ const fieldSchema: FieldSchema = {
   windowDuration: 'string',
 };
 const usage =
-  '\norg-limit-aggregate <command>\n\nCommands:\n  list                  List orgLimitAggregate records\n  find-first            Find first matching orgLimitAggregate record\n  get                   Get a orgLimitAggregate by ID\n  create                Create a new orgLimitAggregate\n  update                Update an existing orgLimitAggregate\n  delete                Delete a orgLimitAggregate\n\nList Options:\n  --limit <n>           Max number of records to return (forward pagination)\n  --last <n>            Number of records from the end (backward pagination)\n  --after <cursor>      Cursor for forward pagination\n  --before <cursor>     Cursor for backward pagination\n  --offset <n>          Number of records to skip\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.name.equalTo foo)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\nFind-First Options:\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.status.equalTo active)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n\n  --help, -h            Show this help message\n';
+  '\norg-limit-aggregate <command>\n\nCommands:\n  list                  List orgLimitAggregate records\n  find-first            Find first matching orgLimitAggregate record\n  get                   Get a orgLimitAggregate by ID\n  create                Create a new orgLimitAggregate\n  update                Update an existing orgLimitAggregate\n  delete                Delete a orgLimitAggregate\n\nList Options:\n  --limit <n>           Max number of records to return (forward pagination)\n  --last <n>            Number of records from the end (backward pagination)\n  --after <cursor>      Cursor for forward pagination\n  --before <cursor>     Cursor for backward pagination\n  --offset <n>          Number of records to skip\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.name.equalTo foo)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\nFind-First Options:\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.status.equalTo active)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\n  --help, -h            Show this help message\n';
 export default async (
   argv: Partial<Record<string, unknown>>,
   prompter: Inquirerer,
@@ -114,7 +114,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       windowDuration: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgLimitAggregateSelect, OrgLimitAggregateFilter> & {
+      FindFirstArgs<OrgLimitAggregateSelect, OrgLimitAggregateFilter, OrgLimitAggregateOrderBy> & {
         select: OrgLimitAggregateSelect;
       }
     >(argv, defaultSelect);

sdk/constructive-cli/src/admin/cli/commands/org-limit-event.ts

@@ -27,7 +27,7 @@ const fieldSchema: FieldSchema = {
   reason: 'string',
 };
 const usage =
-  '\norg-limit-event <command>\n\nCommands:\n  list                  List orgLimitEvent records\n  find-first            Find first matching orgLimitEvent record\n  create                Create a new orgLimitEvent\n\nList Options:\n  --limit <n>           Max number of records to return (forward pagination)\n  --last <n>            Number of records from the end (backward pagination)\n  --after <cursor>      Cursor for forward pagination\n  --before <cursor>     Cursor for backward pagination\n  --offset <n>          Number of records to skip\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.name.equalTo foo)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\nFind-First Options:\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.status.equalTo active)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n\n  --help, -h            Show this help message\n';
+  '\norg-limit-event <command>\n\nCommands:\n  list                  List orgLimitEvent records\n  find-first            Find first matching orgLimitEvent record\n  create                Create a new orgLimitEvent\n\nList Options:\n  --limit <n>           Max number of records to return (forward pagination)\n  --last <n>            Number of records from the end (backward pagination)\n  --after <cursor>      Cursor for forward pagination\n  --before <cursor>     Cursor for backward pagination\n  --offset <n>          Number of records to skip\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.name.equalTo foo)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\nFind-First Options:\n  --select <fields>     Comma-separated list of fields to return\n  --where.<field>.<op>  Filter (dot-notation, e.g. --where.status.equalTo active)\n  --condition.<f>.<op>  Condition filter (dot-notation)\n  --orderBy <values>    Comma-separated ordering values (e.g. NAME_ASC,CREATED_AT_DESC)\n\n  --help, -h            Show this help message\n';
 export default async (
   argv: Partial<Record<string, unknown>>,
   prompter: Inquirerer,
@@ -111,7 +111,7 @@ async function handleFindFirst(argv: Partial<Record<string, unknown>>, _prompter
       reason: true,
     };
     const findFirstArgs = parseFindFirstArgs<
-      FindFirstArgs<OrgLimitEventSelect, OrgLimitEventFilter> & {
+      FindFirstArgs<OrgLimitEventSelect, OrgLimitEventFilter, OrgLimitEventOrderBy> & {
         select: OrgLimitEventSelect;
       }
     >(argv, defaultSelect);

sdk/constructive-cli/src/admin/orm/models/appLimitEvent.ts

@@ -70,31 +70,38 @@ export class AppLimitEventModel {
     });
   }
   findFirst<S extends AppLimitEventSelect>(
-    args: FindFirstArgs<S, AppLimitEventFilter> & {
+    args: FindFirstArgs<S, AppLimitEventFilter, AppLimitEventOrderBy> & {
       select: S;
     } & StrictSelect<S, AppLimitEventSelect>
   ): QueryBuilder<{
-    appLimitEvents: {
-      nodes: InferSelectResult<AppLimitEventWithRelations, S>[];
-    };
+    appLimitEvent: InferSelectResult<AppLimitEventWithRelations, S> | null;
   }> {
     const { document, variables } = buildFindFirstDocument(
       'AppLimitEvent',
       'appLimitEvents',
       args.select,
       {
         where: args?.where,
+        orderBy: args?.orderBy as string[] | undefined,
       },
       'AppLimitEventFilter',
+      'AppLimitEventOrderBy',
       connectionFieldsMap
     );
     return new QueryBuilder({
       client: this.client,
       operation: 'query',
       operationName: 'AppLimitEvent',
-      fieldName: 'appLimitEvents',
+      fieldName: 'appLimitEvent',
       document,
       variables,
+      transform: (data: {
+        appLimitEvents?: {
+          nodes?: InferSelectResult<AppLimitEventWithRelations, S>[];
+        };
+      }) => ({
+        appLimitEvent: data.appLimitEvents?.nodes?.[0] ?? null,
+      }),
     });
   }
   create<S extends AppLimitEventSelect>(