@constructive-io/graphql-codegen 2.22.1 → 2.23.1

package/cli/watch/poller.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaPoller = void 0;
 exports.computeSchemaHash = computeSchemaHash;
 const node_events_1 = require("node:events");
-const fetch_meta_1 = require("../introspect/fetch-meta");
 const fetch_schema_1 = require("../introspect/fetch-schema");
 const cache_1 = require("./cache");
 const hash_1 = require("./hash");
@@ -60,39 +59,31 @@ class SchemaPoller extends node_events_1.EventEmitter {
     async poll() {
         // Prevent concurrent polls
         if (this.isPolling) {
-            return { success: false, changed: false, error: 'Poll already in progress' };
+            return {
+                success: false,
+                changed: false,
+                error: 'Poll already in progress',
+            };
         }
         this.isPolling = true;
         const startTime = Date.now();
         this.emit('poll-start', this.createEvent('poll-start'));
         try {
-            // Fetch both _meta and __schema
-            const [metaResult, schemaResult] = await Promise.all([
-                (0, fetch_meta_1.fetchMeta)({
-                    endpoint: this.options.endpoint,
-                    authorization: this.options.authorization,
-                    headers: this.options.headers,
-                    timeout: 30000,
-                }),
-                (0, fetch_schema_1.fetchSchema)({
-                    endpoint: this.options.endpoint,
-                    authorization: this.options.authorization,
-                    headers: this.options.headers,
-                    timeout: 30000,
-                }),
-            ]);
+            // Fetch __schema via standard introspection
+            const schemaResult = await (0, fetch_schema_1.fetchSchema)({
+                endpoint: this.options.endpoint,
+                authorization: this.options.authorization,
+                headers: this.options.headers,
+                timeout: 30000,
+            });
             const duration = Date.now() - startTime;
             // Check for errors
-            if (!metaResult.success) {
-                return this.handleError(`_meta fetch failed: ${metaResult.error}`, duration);
-            }
             if (!schemaResult.success) {
                 return this.handleError(`__schema fetch failed: ${schemaResult.error}`, duration);
             }
-            const meta = metaResult.data;
             const schema = schemaResult.data;
             // Check if schema changed
-            const { changed, newHash } = await this.cache.hasChanged(meta, schema);
+            const { changed, newHash } = await this.cache.hasChanged(schema);
             // Reset error counter on success
             this.consecutiveErrors = 0;
             if (changed) {
@@ -103,11 +94,11 @@ class SchemaPoller extends node_events_1.EventEmitter {
                     (0, cache_1.touchFile)(this.options.touchFile);
                 }
                 this.emit('schema-changed', this.createEvent('schema-changed', { hash: newHash, duration }));
-                return { success: true, changed: true, hash: newHash, meta, schema };
+                return { success: true, changed: true, hash: newHash, schema };
             }
             this.emit('schema-unchanged', this.createEvent('schema-unchanged', { duration }));
             this.emit('poll-success', this.createEvent('poll-success', { duration }));
-            return { success: true, changed: false, hash: newHash, meta, schema };
+            return { success: true, changed: false, hash: newHash, schema };
         }
         catch (err) {
             const duration = Date.now() - startTime;
@@ -130,22 +121,14 @@ class SchemaPoller extends node_events_1.EventEmitter {
      */
     async seedCache() {
         try {
-            const [metaResult, schemaResult] = await Promise.all([
-                (0, fetch_meta_1.fetchMeta)({
-                    endpoint: this.options.endpoint,
-                    authorization: this.options.authorization,
-                    headers: this.options.headers,
-                    timeout: 30000,
-                }),
-                (0, fetch_schema_1.fetchSchema)({
-                    endpoint: this.options.endpoint,
-                    authorization: this.options.authorization,
-                    headers: this.options.headers,
-                    timeout: 30000,
-                }),
-            ]);
-            if (metaResult.success && schemaResult.success) {
-                const { newHash } = await this.cache.hasChanged(metaResult.data, schemaResult.data);
+            const schemaResult = await (0, fetch_schema_1.fetchSchema)({
+                endpoint: this.options.endpoint,
+                authorization: this.options.authorization,
+                headers: this.options.headers,
+                timeout: 30000,
+            });
+            if (schemaResult.success) {
+                const { newHash } = await this.cache.hasChanged(schemaResult.data);
                 this.cache.updateHash(newHash);
             }
         }
@@ -175,7 +158,8 @@ class SchemaPoller extends node_events_1.EventEmitter {
         this.consecutiveErrors++;
         this.emit('poll-error', this.createEvent('poll-error', { error, duration }));
         // Slow down polling after multiple consecutive errors
-        if (this.consecutiveErrors >= this.MAX_CONSECUTIVE_ERRORS && this.pollTimer) {
+        if (this.consecutiveErrors >= this.MAX_CONSECUTIVE_ERRORS &&
+            this.pollTimer) {
             this.stop();
             const newInterval = this.options.pollInterval * 2;
             this.pollTimer = setInterval(() => {
@@ -196,8 +180,6 @@ exports.SchemaPoller = SchemaPoller;
 /**
  * Utility to compute schema hash without full poll
  */
-async function computeSchemaHash(meta, schema) {
-    const metaHash = await (0, hash_1.hashObject)(meta);
-    const schemaHash = await (0, hash_1.hashObject)(schema);
-    return (0, hash_1.combineHashes)(metaHash, schemaHash);
+async function computeSchemaHash(schema) {
+    return (0, hash_1.hashObject)(schema);
 }

package/cli/watch/types.d.ts

@@ -1,7 +1,6 @@
 /**
  * Watch mode types
  */
-import type { MetaQueryResponse } from '../introspect/meta-query';
 import type { IntrospectionQueryResponse } from '../../types/introspection';
 /**
  * Result of a schema poll operation
@@ -14,8 +13,6 @@ export interface PollResult {
     error?: string;
     /** The new hash if successful */
     hash?: string;
-    /** Meta response if successful */
-    meta?: MetaQueryResponse;
     /** Schema response if successful */
     schema?: IntrospectionQueryResponse;
 }

package/core/ast.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOne = exports.patchOne = exports.createOne = exports.getOne = exports.getMany = exports.getCount = exports.getAll = void 0;
 exports.getSelections = getSelections;
 const t = __importStar(require("gql-ast"));
-const inflection = __importStar(require("inflection"));
+const inflekt_1 = require("inflekt");
 const custom_ast_1 = require("./custom-ast");
 const NON_MUTABLE_PROPS = ['createdAt', 'createdBy', 'updatedAt', 'updatedBy'];
 const objectToArray = (obj) => Object.keys(obj).map((k) => ({
@@ -320,7 +320,7 @@ const createOne = ({ mutationName, operationName, mutation, selection, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = inflection.camelize([inflection.singularize(mutation.model)].join('_'), true);
+    const modelName = (0, inflekt_1.camelize)([(0, inflekt_1.singularize)(mutation.model)].join('_'), true);
     const inputProperties = mutation.properties.input
         .properties;
     const modelProperties = inputProperties[modelName];
@@ -366,7 +366,7 @@ const patchOne = ({ mutationName, operationName, mutation, selection, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = inflection.camelize([inflection.singularize(mutation.model)].join('_'), true);
+    const modelName = (0, inflekt_1.camelize)([(0, inflekt_1.singularize)(mutation.model)].join('_'), true);
     const inputProperties = mutation.properties.input
         .properties;
     const patchProperties = inputProperties['patch'];
@@ -419,7 +419,7 @@ const deleteOne = ({ mutationName, operationName, mutation, }) => {
     if (!mutation.properties?.input?.properties) {
         throw new Error(`No input field for mutation: ${mutationName}`);
     }
-    const modelName = inflection.camelize([inflection.singularize(mutation.model)].join('_'), true);
+    const modelName = (0, inflekt_1.camelize)([(0, inflekt_1.singularize)(mutation.model)].join('_'), true);
     const inputProperties = mutation.properties.input
         .properties;
     const deleteAttrs = objectToArray(inputProperties);

package/core/query-builder.js

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBuilder = exports.MetaObject = void 0;
 const graphql_1 = require("graphql");
-const inflection = __importStar(require("inflection"));
+const inflekt_1 = require("inflekt");
 const ast_1 = require("./ast");
 const meta_object_1 = require("./meta-object");
 exports.MetaObject = __importStar(require("./meta-object"));
@@ -124,13 +124,13 @@ class QueryBuilder {
         const getInputName = (mutationType) => {
             switch (mutationType) {
                 case 'delete': {
-                    return `Delete${inflection.camelize(this._model)}Input`;
+                    return `Delete${(0, inflekt_1.camelize)(this._model)}Input`;
                 }
                 case 'create': {
-                    return `Create${inflection.camelize(this._model)}Input`;
+                    return `Create${(0, inflekt_1.camelize)(this._model)}Input`;
                 }
                 case 'patch': {
-                    return `Update${inflection.camelize(this._model)}Input`;
+                    return `Update${(0, inflekt_1.camelize)(this._model)}Input`;
                 }
                 default:
                     throw new Error('Unhandled mutation type' + mutationType);
@@ -159,7 +159,7 @@ class QueryBuilder {
     getMany({ select } = {}) {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName(inflection.camelize(['get', inflection.underscore(this._key), 'query'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'query'].join('_'), true));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.getMany)({
@@ -174,7 +174,7 @@ class QueryBuilder {
     all({ select } = {}) {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName(inflection.camelize(['get', inflection.underscore(this._key), 'query', 'all'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'query', 'all'].join('_'), true));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.getAll)({
@@ -188,7 +188,7 @@ class QueryBuilder {
     count() {
         this._op = 'getMany';
         this._key = this._findQuery();
-        this.queryName(inflection.camelize(['get', inflection.underscore(this._key), 'count', 'query'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'count', 'query'].join('_'), true));
         const defn = this._introspection[this._key];
         this._ast = (0, ast_1.getCount)({
             queryName: this._queryName,
@@ -200,7 +200,7 @@ class QueryBuilder {
     getOne({ select } = {}) {
         this._op = 'getOne';
         this._key = this._findQuery();
-        this.queryName(inflection.camelize(['get', inflection.underscore(this._key), 'query'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)(['get', (0, inflekt_1.underscore)(this._key), 'query'].join('_'), true));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.getOne)({
@@ -216,7 +216,7 @@ class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'create';
         this._key = this._findMutation();
-        this.queryName(inflection.camelize([inflection.underscore(this._key), 'mutation'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_'), true));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.createOne)({
@@ -231,7 +231,7 @@ class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'delete';
         this._key = this._findMutation();
-        this.queryName(inflection.camelize([inflection.underscore(this._key), 'mutation'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_'), true));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.deleteOne)({
@@ -245,7 +245,7 @@ class QueryBuilder {
         this._op = 'mutation';
         this._mutation = 'patch';
         this._key = this._findMutation();
-        this.queryName(inflection.camelize([inflection.underscore(this._key), 'mutation'].join('_'), true));
+        this.queryName((0, inflekt_1.camelize)([(0, inflekt_1.underscore)(this._key), 'mutation'].join('_'), true));
         const defn = this._introspection[this._key];
         this.select(select);
         this._ast = (0, ast_1.patchOne)({
@@ -408,5 +408,5 @@ function isRelationalField(fieldName, modelMeta) {
 // Get getMany op name from model
 // ie. UserSetting => userSettings
 function modelNameToGetMany(model) {
-    return inflection.camelize(inflection.pluralize(inflection.underscore(model)), true);
+    return (0, inflekt_1.camelize)((0, inflekt_1.pluralize)((0, inflekt_1.underscore)(model)), true);
 }

package/esm/cli/codegen/barrel.d.ts

@@ -19,7 +19,11 @@ export declare function generateMutationsBarrel(tables: CleanTable[]): string;
  * @param tables - The tables to include in the SDK
  * @param hasSchemaTypes - Whether schema-types.ts was generated
  */
-export declare function generateMainBarrel(tables: CleanTable[], hasSchemaTypes?: boolean): string;
+export interface MainBarrelOptions {
+    hasSchemaTypes?: boolean;
+    hasMutations?: boolean;
+}
+export declare function generateMainBarrel(tables: CleanTable[], options?: MainBarrelOptions | boolean): string;
 /**
  * Generate queries barrel including custom query operations
  */

package/esm/cli/codegen/barrel.js

@@ -39,18 +39,23 @@ export function generateMutationsBarrel(tables) {
     }
     return lines.join('\n') + '\n';
 }
-/**
- * Generate the main index.ts barrel file
- *
- * @param tables - The tables to include in the SDK
- * @param hasSchemaTypes - Whether schema-types.ts was generated
- */
-export function generateMainBarrel(tables, hasSchemaTypes = false) {
+export function generateMainBarrel(tables, options = {}) {
+    // Support legacy signature where second arg was just hasSchemaTypes boolean
+    const opts = typeof options === 'boolean'
+        ? { hasSchemaTypes: options, hasMutations: true }
+        : options;
+    const { hasSchemaTypes = false, hasMutations = true } = opts;
     const tableNames = tables.map((t) => t.name).join(', ');
     const schemaTypesExport = hasSchemaTypes
         ? `
 // Schema types (input, payload, enum types)
 export * from './schema-types';
+`
+        : '';
+    const mutationsExport = hasMutations
+        ? `
+// Mutation hooks
+export * from './mutations';
 `
         : '';
     return `/**
@@ -91,10 +96,7 @@ export * from './types';
 ${schemaTypesExport}
 // Query hooks
 export * from './queries';
-
-// Mutation hooks
-export * from './mutations';
-`;
+${mutationsExport}`;
 }
 // ============================================================================
 // Custom operation barrels (includes both table and custom hooks)

package/esm/cli/codegen/index.d.ts

@@ -64,8 +64,8 @@ export declare function generateAllFiles(tables: CleanTable[], config: ResolvedC
 export declare function generate(options: GenerateOptions): GenerateResult;
 export { generateClientFile } from './client';
 export { generateTypesFile } from './types';
-export { generateAllQueryHooks, generateListQueryHook, generateSingleQueryHook } from './queries';
+export { generateAllQueryHooks, generateListQueryHook, generateSingleQueryHook, } from './queries';
 export { generateAllMutationHooks, generateCreateMutationHook, generateUpdateMutationHook, generateDeleteMutationHook, } from './mutations';
-export { generateAllCustomQueryHooks, generateCustomQueryHook } from './custom-queries';
-export { generateAllCustomMutationHooks, generateCustomMutationHook } from './custom-mutations';
+export { generateAllCustomQueryHooks, generateCustomQueryHook, } from './custom-queries';
+export { generateAllCustomMutationHooks, generateCustomMutationHook, } from './custom-mutations';
 export { generateQueriesBarrel, generateMutationsBarrel, generateMainBarrel, generateCustomQueriesBarrel, generateCustomMutationsBarrel, } from './barrel';

package/esm/cli/codegen/index.js

@@ -55,7 +55,9 @@ export function generate(options) {
     // 3. Generate types.ts (can now import enums from schema-types)
     files.push({
         path: 'types.ts',
-        content: generateTypesFile(tables, { enumsFromSchemaTypes: generatedEnumNames }),
+        content: generateTypesFile(tables, {
+            enumsFromSchemaTypes: generatedEnumNames,
+        }),
     });
     // 4. Generate table-based query hooks (queries/*.ts)
     const queryHooks = generateAllQueryHooks(tables, { reactQueryEnabled });
@@ -119,17 +121,21 @@ export function generate(options) {
             });
         }
     }
-    // 8. Generate mutations/index.ts barrel (includes both table and custom mutations)
-    files.push({
-        path: 'mutations/index.ts',
-        content: customMutationHooks.length > 0
-            ? generateCustomMutationsBarrel(tables, customMutationHooks.map((h) => h.operationName))
-            : generateMutationsBarrel(tables),
-    });
+    // 8. Generate mutations/index.ts barrel (only if React Query is enabled)
+    // When reactQuery is disabled, no mutation hooks are generated, so skip the barrel
+    const hasMutations = mutationHooks.length > 0 || customMutationHooks.length > 0;
+    if (hasMutations) {
+        files.push({
+            path: 'mutations/index.ts',
+            content: customMutationHooks.length > 0
+                ? generateCustomMutationsBarrel(tables, customMutationHooks.map((h) => h.operationName))
+                : generateMutationsBarrel(tables),
+        });
+    }
     // 9. Generate main index.ts barrel (with schema-types if present)
     files.push({
         path: 'index.ts',
-        content: generateMainBarrel(tables, hasSchemaTypes),
+        content: generateMainBarrel(tables, { hasSchemaTypes, hasMutations }),
     });
     return {
         files,
@@ -148,8 +154,8 @@ export function generate(options) {
 // ============================================================================
 export { generateClientFile } from './client';
 export { generateTypesFile } from './types';
-export { generateAllQueryHooks, generateListQueryHook, generateSingleQueryHook } from './queries';
+export { generateAllQueryHooks, generateListQueryHook, generateSingleQueryHook, } from './queries';
 export { generateAllMutationHooks, generateCreateMutationHook, generateUpdateMutationHook, generateDeleteMutationHook, } from './mutations';
-export { generateAllCustomQueryHooks, generateCustomQueryHook } from './custom-queries';
-export { generateAllCustomMutationHooks, generateCustomMutationHook } from './custom-mutations';
+export { generateAllCustomQueryHooks, generateCustomQueryHook, } from './custom-queries';
+export { generateAllCustomMutationHooks, generateCustomMutationHook, } from './custom-mutations';
 export { generateQueriesBarrel, generateMutationsBarrel, generateMainBarrel, generateCustomQueriesBarrel, generateCustomMutationsBarrel, } from './barrel';

package/esm/cli/codegen/orm/client-generator.js

@@ -276,7 +276,8 @@ export function buildFindManyDocument<TSelect, TWhere>(
     before?: string;
     offset?: number;
   },
-  filterTypeName: string
+  filterTypeName: string,
+  orderByTypeName: string
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select ? buildSelections(select) : 'id';
 
@@ -290,7 +291,7 @@ export function buildFindManyDocument<TSelect, TWhere>(
     variables.where = args.where;
   }
   if (args.orderBy?.length) {
-    varDefs.push(\`$orderBy: [\${operationName}sOrderBy!]\`);
+    varDefs.push(\`$orderBy: [\${orderByTypeName}!]\`);
     queryArgs.push('orderBy: $orderBy');
     variables.orderBy = args.orderBy;
   }

package/esm/cli/codegen/orm/custom-ops-generator.js

@@ -1,16 +1,21 @@
 import { createProject, createSourceFile, getFormattedOutput, createFileHeader, createImport, } from '../ts-ast';
 import { ucFirst } from '../utils';
-import { typeRefToTsType, isTypeRequired, getTypeBaseName } from '../type-resolver';
+import { typeRefToTsType, isTypeRequired, getTypeBaseName, } from '../type-resolver';
 import { SCALAR_NAMES } from '../scalars';
 /**
  * Collect all input type names used by operations
+ * Includes Input, Filter, OrderBy, and Condition types
  */
 function collectInputTypeNamesFromOps(operations) {
     const inputTypes = new Set();
     for (const op of operations) {
         for (const arg of op.args) {
             const baseName = getTypeBaseName(arg.type);
-            if (baseName && (baseName.endsWith('Input') || baseName.endsWith('Filter'))) {
+            if (baseName &&
+                (baseName.endsWith('Input') ||
+                    baseName.endsWith('Filter') ||
+                    baseName.endsWith('OrderBy') ||
+                    baseName.endsWith('Condition'))) {
                 inputTypes.add(baseName);
             }
         }
@@ -18,7 +23,11 @@ function collectInputTypeNamesFromOps(operations) {
     return Array.from(inputTypes);
 }
 // Types that don't need Select types
-const NON_SELECT_TYPES = new Set([...SCALAR_NAMES, 'Query', 'Mutation']);
+const NON_SELECT_TYPES = new Set([
+    ...SCALAR_NAMES,
+    'Query',
+    'Mutation',
+]);
 /**
  * Collect all payload/return type names from operations (for Select types)
  * Filters out scalar types
@@ -64,7 +73,9 @@ export function generateCustomQueryOpsFile(operations) {
     // Generate Select type names for payloads
     const selectTypeNames = payloadTypeNames.map((p) => `${p}Select`);
     // Combine all type imports
-    const allTypeImports = [...new Set([...inputTypeNames, ...payloadTypeNames, ...selectTypeNames])];
+    const allTypeImports = [
+        ...new Set([...inputTypeNames, ...payloadTypeNames, ...selectTypeNames]),
+    ];
     // Add file header
     sourceFile.insertText(0, createFileHeader('Custom query operations') + '\n\n');
     // Add imports
@@ -197,7 +208,9 @@ export function generateCustomMutationOpsFile(operations) {
     // Generate Select type names for payloads
     const selectTypeNames = payloadTypeNames.map((p) => `${p}Select`);
     // Combine all type imports
-    const allTypeImports = [...new Set([...inputTypeNames, ...payloadTypeNames, ...selectTypeNames])];
+    const allTypeImports = [
+        ...new Set([...inputTypeNames, ...payloadTypeNames, ...selectTypeNames]),
+    ];
     // Add file header
     sourceFile.insertText(0, createFileHeader('Custom mutation operations') + '\n\n');
     // Add imports