@dav3/gql-of-power 1.1.0 → 1.2.0

package/README.md

@@ -60,8 +60,8 @@ import { ID, Int } from 'type-graphql';
 
 // --- Author ---
 const authorFields = defineFields(Author, {
-  id:   { type: () => ID,     generateFilter: true },
-  name: { type: () => String, generateFilter: true },
+	id: { type: () => ID, generateFilter: true },
+	name: { type: () => String, generateFilter: true },
 });
 
 @GQLEntityClass(Author, authorFields)
@@ -69,10 +69,10 @@ export class AuthorGQL extends GQLEntityBase {}
 
 // --- Book ---
 const bookFields = defineFields(Book, {
-  id:              { type: () => ID,     generateFilter: true },
-  title:           { type: () => String, generateFilter: true },
-  publishedYear:   { type: () => Int,    generateFilter: true },
-  author:          { type: () => AuthorGQL, options: { nullable: true } },
+	id: { type: () => ID, generateFilter: true },
+	title: { type: () => String, generateFilter: true },
+	publishedYear: { type: () => Int, generateFilter: true },
+	author: { type: () => AuthorGQL, options: { nullable: true } },
 });
 
 @GQLEntityClass(Book, bookFields)
@@ -81,14 +81,14 @@ export class BookGQL extends GQLEntityBase {}
 
 The decorator attaches generated statics to the class:
 
-| Static | Purpose |
-|--------|---------|
-| `BookGQL.FilterInput` | Generated filter input type |
-| `BookGQL.PaginationInput` | Generated pagination input type |
-| `BookGQL.OrderBy` | Generated order-by input type |
-| `BookGQL.FieldsResolver` | Auto-generated field resolver class |
-| `BookGQL.gqlEntityName` | GQL type name (with suffix if configured) |
-| `BookGQL.relatedEntityName` | ORM entity class name (`'Book'`) |
+| Static                      | Purpose                                   |
+| --------------------------- | ----------------------------------------- |
+| `BookGQL.FilterInput`       | Generated filter input type               |
+| `BookGQL.PaginationInput`   | Generated pagination input type           |
+| `BookGQL.OrderBy`           | Generated order-by input type             |
+| `BookGQL.FieldsResolver`    | Auto-generated field resolver class       |
+| `BookGQL.gqlEntityName`     | GQL type name (with suffix if configured) |
+| `BookGQL.relatedEntityName` | ORM entity class name (`'Book'`)          |
 
 ### 2. Write Resolvers
 
@@ -99,14 +99,14 @@ import { GraphQLResolveInfo } from 'graphql';
 
 @GQLResolver(BookGQL)
 export class BookResolver {
-  @Query(() => [BookGQL])
-  async books(
-    @Arg('filter',     () => BookGQL.FilterInput,     { nullable: true }) filter: any,
-    @Arg('pagination', () => BookGQL.PaginationInput, { nullable: true }) pagination: any,
-    @Info() info: GraphQLResolveInfo,
-  ) {
-    return queryManager.getQueryResultsForInfo(metadataProvider, BookGQL, info, filter, pagination);
-  }
+	@Query(() => [BookGQL])
+	async books(
+		@Arg('filter', () => BookGQL.FilterInput, { nullable: true }) filter: any,
+		@Arg('pagination', () => BookGQL.PaginationInput, { nullable: true }) pagination: any,
+		@Info() info: GraphQLResolveInfo
+	) {
+		return queryManager.getQueryResultsForInfo(metadataProvider, BookGQL, info, filter, pagination);
+	}
 }
 ```
 
@@ -118,10 +118,10 @@ import { getAutoResolvers } from '@dav3/gql-of-power';
 import '../entities'; // trigger @GQLEntityClass decoration
 
 const schema = buildSchemaSync({
-  resolvers: [
-    BookResolver,
-    ...getAutoResolvers(), // FieldsResolver for every @GQLEntityClass entity
-  ],
+	resolvers: [
+		BookResolver,
+		...getAutoResolvers(), // FieldsResolver for every @GQLEntityClass entity
+	],
 });
 ```
 
@@ -141,23 +141,23 @@ Typed wrapper that constrains config keys to `keyof T`. Identity function at run
 
 ```typescript
 const fields = defineFields(Book, {
-  id:    { type: () => ID,     generateFilter: true },
-  title: { type: () => String, generateFilter: true },
-  typo:  { type: () => String }, // TS error — 'typo' is not keyof Book ✗
+	id: { type: () => ID, generateFilter: true },
+	title: { type: () => String, generateFilter: true },
+	typo: { type: () => String }, // TS error — 'typo' is not keyof Book ✗
 });
 ```
 
 #### Field options
 
-| Option | Type | Purpose |
-|--------|------|---------|
-| `type` | `() => GraphQLType` | GraphQL return type (required) |
-| `generateFilter` | `boolean` | Generate filter input fields for this property |
-| `options` | `FieldOptions` | type-graphql field options (nullable, description, etc.) |
-| `alias` | `string` | Override the GQL field name |
-| `array` | `true` | Mark as array return type |
-| `relatedEntityName` | `() => string` | ORM entity name for array relation fields (auto-derived when using `@GQLEntityClass`) |
-| `enum` | `EnumData` | Register an enum type |
+| Option              | Type                | Purpose                                                                               |
+| ------------------- | ------------------- | ------------------------------------------------------------------------------------- |
+| `type`              | `() => GraphQLType` | GraphQL return type (required)                                                        |
+| `generateFilter`    | `boolean`           | Generate filter input fields for this property                                        |
+| `options`           | `FieldOptions`      | type-graphql field options (nullable, description, etc.)                              |
+| `alias`             | `string`            | Override the GQL field name                                                           |
+| `array`             | `true`              | Mark as array return type                                                             |
+| `relatedEntityName` | `() => string`      | ORM entity name for array relation fields (auto-derived when using `@GQLEntityClass`) |
+| `enum`              | `EnumData`          | Register an enum type                                                                 |
 
 ### `@GQLEntityClass(OrmClass, fields, extra?)`
 
@@ -195,29 +195,29 @@ Provide a GraphQL `@FieldResolver` function. The library fetches field(s) listed
 
 ```typescript
 @GQLEntityClass(Fellowship, fields, {
-  customFields: {
-    firstMember: {
-      type: () => GraphQLJSON,
-      options: { nullable: true },
-      requires: 'id', // ensure 'id' is fetched even if client didn't request it
-      resolveDecorators: [Root(), Ctx()],
-      resolve: (root: Fellowship, ctx: any) => {
-        return memberDataLoader.load(root.id);
-      },
-    },
-  },
+	customFields: {
+		firstMember: {
+			type: () => GraphQLJSON,
+			options: { nullable: true },
+			requires: 'id', // ensure 'id' is fetched even if client didn't request it
+			resolveDecorators: [Root(), Ctx()],
+			resolve: (root: Fellowship, ctx: any) => {
+				return memberDataLoader.load(root.id);
+			},
+		},
+	},
 })
 export class FellowshipGQL extends GQLEntityBase {}
 ```
 
 #### `resolve` field options
 
-| Option | Purpose |
-|--------|---------|
-| `type` | GraphQL return type |
-| `options` | type-graphql field options |
-| `requires` | Field name(s) to ensure are fetched from DB |
-| `resolve` | The resolver function (required) |
+| Option              | Purpose                                                                |
+| ------------------- | ---------------------------------------------------------------------- |
+| `type`              | GraphQL return type                                                    |
+| `options`           | type-graphql field options                                             |
+| `requires`          | Field name(s) to ensure are fetched from DB                            |
+| `resolve`           | The resolver function (required)                                       |
 | `resolveDecorators` | type-graphql parameter decorators in order (`[Root(), Ctx(), Info()]`) |
 
 ### Strategy 2: `mapping` — automatic SQL JOIN
@@ -227,63 +227,63 @@ Provide a `FieldMappingConfig`. The library generates a SQL `LEFT JOIN LATERAL`
 Use this when the foreign key exists as a plain column on the entity (not declared as an ORM relation).
 
 ```typescript
-import { CrmAccount } from './orm-entities';
-
-@GQLEntityClass(Job, fields, {
-  customFields: {
-    account: {
-      type: () => CrmAccountGQL,
-      options: { nullable: true },
-      mapping: {
-        refEntity: CrmAccount,    // ORM entity class to JOIN to
-        refFields: 'id',          // column(s) on CrmAccount — keyof CrmAccount ✓
-        fields: 'crmAccountId',   // column(s) on Job — keyof Job ✓
-      },
-    },
-  },
+import { Kingdom } from './orm-entities';
+
+@GQLEntityClass(Hobbit, fields, {
+	customFields: {
+		kingdom: {
+			type: () => KingdomGQL,
+			options: { nullable: true },
+			mapping: {
+				refEntity: Kingdom, // ORM entity class to JOIN to
+				refFields: 'id', // column(s) on Kingdom — keyof Kingdom ✓
+				fields: 'kingdomId', // column(s) on Hobbit — keyof Hobbit ✓
+			},
+		},
+	},
 })
-export class JobGQL extends GQLEntityBase {}
+export class HobbitGQL extends GQLEntityBase {}
 ```
 
 Composite FK — use arrays (must have the same length):
 
 ```typescript
 mapping: {
-  refEntity: OrderLine,
-  refFields: ['tenantId', 'externalId'],
-  fields:    ['tenantId', 'lineExternalId'],
+  refEntity: Weapon,
+  refFields: ['realmId', 'weaponCode'],
+  fields:    ['realmId', 'weaponExternalId'],
 }
 ```
 
 #### `mapping` field options
 
-| Option | Type | Purpose |
-|--------|------|---------|
-| `type` | `() => GraphQLType` | GraphQL return type |
-| `options` | `FieldOptions` | type-graphql field options (nullable, etc.) |
-| `mapping.refEntity` | `new () => TRef` | ORM entity class to JOIN to (must be in the metadata provider) |
-| `mapping.refFields` | `keyof TRef \| Array<keyof TRef>` | Column(s) on the ref entity to match against |
-| `mapping.fields` | `keyof T \| Array<keyof T>` | Column(s) on the owner entity to match from |
+| Option              | Type                              | Purpose                                                        |
+| ------------------- | --------------------------------- | -------------------------------------------------------------- |
+| `type`              | `() => GraphQLType`               | GraphQL return type                                            |
+| `options`           | `FieldOptions`                    | type-graphql field options (nullable, etc.)                    |
+| `mapping.refEntity` | `new () => TRef`                  | ORM entity class to JOIN to (must be in the metadata provider) |
+| `mapping.refFields` | `keyof TRef \| Array<keyof TRef>` | Column(s) on the ref entity to match against                   |
+| `mapping.fields`    | `keyof T \| Array<keyof T>`       | Column(s) on the owner entity to match from                    |
 
 > **Note**: `resolve` and `mapping` are mutually exclusive — TypeScript enforces this via a discriminated union. `resolveDecorators` and `requires` are only valid on the `resolve` branch.
 
 #### Generated SQL
 
-For `account: { mapping: { refEntity: CrmAccount, refFields: 'id', fields: 'crmAccountId' } }`:
+For `kingdom: { mapping: { refEntity: Kingdom, refFields: 'id', fields: 'kingdomId' } }`:
 
 ```sql
-select e_a1.id, e_a1.crm_account_id, f_j1.value as "account"
+select e_a1.id, e_a1.kingdom_id, f_j1.value as "kingdom"
 from (
-  select e_a1.id, e_a1.crm_account_id
-  from job as e_a1
+  select e_a1.id, e_a1.kingdom_id
+  from hobbit as e_a1
   where true
 ) as e_a1
 left outer join lateral (
   select row_to_json(f_j1)::jsonb as value
   from (
-    select f_j1.id, f_j1.account_name
-    from "crm_account" as f_j1
-    where e_a1.crm_account_id = f_j1.id
+    select f_j1.id, f_j1.name
+    from kingdom as f_j1
+    where e_a1.kingdom_id = f_j1.id
   ) as f_j1
 ) as f_j1 on true
 ```
@@ -317,17 +317,17 @@ filter: {
 
 ### Filter operations
 
-| Operation | Meaning |
-|-----------|---------|
-| `_eq` | Equal |
-| `_ne` | Not equal |
-| `_in` | In array |
-| `_nin` | Not in array |
-| `_like` | ILIKE (case-insensitive contains) |
+| Operation      | Meaning                              |
+| -------------- | ------------------------------------ |
+| `_eq`          | Equal                                |
+| `_ne`          | Not equal                            |
+| `_in`          | In array                             |
+| `_nin`         | Not in array                         |
+| `_like`        | ILIKE (case-insensitive contains)    |
 | `_gt` / `_gte` | Greater than / greater than or equal |
-| `_lt` / `_lte` | Less than / less than or equal |
-| `_and` | Logical AND |
-| `_or` | Logical OR (generates UNION ALL) |
+| `_lt` / `_lte` | Less than / less than or equal       |
+| `_and`         | Logical AND                          |
+| `_or`          | Logical OR (generates UNION ALL)     |
 
 ---
 
@@ -345,13 +345,13 @@ pagination: {
 
 ## Relationship Handling
 
-| Relationship | SQL Strategy |
-|--------------|-------------|
-| **m:1** (many-to-one) | `LEFT JOIN LATERAL` + `row_to_json` |
-| **1:1** (one-to-one) | `LEFT JOIN LATERAL` + `row_to_json` |
-| **1:m** (one-to-many) | `LEFT JOIN LATERAL` + `json_agg` |
-| **m:m** (many-to-many) | Pivot table subquery + `json_agg` |
-| **custom `mapping`** | `LEFT JOIN LATERAL` + `row_to_json` (same as m:1) |
+| Relationship           | SQL Strategy                                      |
+| ---------------------- | ------------------------------------------------- |
+| **m:1** (many-to-one)  | `LEFT JOIN LATERAL` + `row_to_json`               |
+| **1:1** (one-to-one)   | `LEFT JOIN LATERAL` + `row_to_json`               |
+| **1:m** (one-to-many)  | `LEFT JOIN LATERAL` + `json_agg`                  |
+| **m:m** (many-to-many) | Pivot table subquery + `json_agg`                 |
+| **custom `mapping`**   | `LEFT JOIN LATERAL` + `row_to_json` (same as m:1) |
 
 ---
 
@@ -359,15 +359,15 @@ pagination: {
 
 ### Environment Variables
 
-| Variable | Purpose |
-|----------|---------|
-| `D3GOP_SORT_SUFFIX` | Suffix appended to all generated GQL type names and the Sort enum (e.g. `'V2'` → `BookV2`, `SortV2`) |
-| `D3GOP_TYPES_SUFFIX` | Fallback suffix if `D3GOP_SORT_SUFFIX` is not set |
-| `D3GOP_LOG_TYPE` | Logging level: `debug` or `disabled` |
-| `D3GOP_DEFAULT_QUERY_LIMIT` | Default query limit when pagination is not specified (default: `3000`) |
-| `D3GOP_USE_STRING_FOR_JSONB` | Toggle between JSONB and string concatenation for JSON aggregation |
+| Variable                     | Purpose                                                                                     |
+| ---------------------------- | ------------------------------------------------------------------------------------------- |
+| `D3GOP_TYPES_SUFFIX`         | Suffix appended to all generated GQL entity type names (e.g. `'V2'` → `BookV2`, `AuthorV2`) |
+| `D3GOP_SORT_SUFFIX`          | Suffix appended to sort/pagination types only (e.g. `'V2'` → `SortV2`, `BookV2OrderBy`)     |
+| `D3GOP_LOG_TYPE`             | Logging level: `debug` or `disabled`                                                        |
+| `D3GOP_DEFAULT_QUERY_LIMIT`  | Default query limit when pagination is not specified (default: `3000`)                      |
+| `D3GOP_USE_STRING_FOR_JSONB` | Toggle between JSONB and string concatenation for JSON aggregation                          |
 
-> **Type name collision**: If you have both v1 (`createGQLTypes`) and v2 (`@GQLEntityClass`) entities in the same schema, set `D3GOP_SORT_SUFFIX` / `D3GOP_TYPES_SUFFIX` so v2 entity names are distinct (e.g. `Job` → `JobV2`). No `setGlobalConfig()` call is required — the env var is read automatically.
+> **Type name collision**: If you have both v1 (`createGQLTypes`) and v2 (`@GQLEntityClass`) entities in the same schema, set `D3GOP_TYPES_SUFFIX` so v2 entity names are distinct (e.g. `Hobbit` → `HobbitV2`). Use `D3GOP_SORT_SUFFIX` separately if sort/pagination types also need a suffix. No `setGlobalConfig()` call is required — the env vars are read automatically.
 
 ### Programmatic config
 
@@ -376,6 +376,9 @@ import { setGlobalConfig } from '@dav3/gql-of-power';
 
 // Call before any @GQLEntityClass decorators run (i.e. before importing entity files)
 setGlobalConfig({ gqlTypesSuffix: 'V2' });
+
+// Optionally set a separate suffix for sort/pagination types
+setGlobalConfig({ gqlTypesSuffix: 'V2', gqlSortSuffix: 'V2' });
 ```
 
 ---
@@ -387,20 +390,20 @@ const queryManager = new GQLQueryManager();
 
 // From a GraphQL resolver — fields are parsed from resolve info automatically
 const results = await queryManager.getQueryResultsForInfo(
-  metadataProvider,
-  BookGQL,         // @GQLEntityClass-decorated class or plain ORM class
-  info,            // GraphQLResolveInfo
-  filter,
-  pagination
+	metadataProvider,
+	BookGQL, // @GQLEntityClass-decorated class or plain ORM class
+	info, // GraphQLResolveInfo
+	filter,
+	pagination
 );
 
 // With explicit field selection (useful for testing or non-resolver contexts)
 const results = await queryManager.getQueryResultsForFields(
-  metadataProvider,
-  BookGQL,
-  { id: {}, title: {} },
-  filter,
-  pagination
+	metadataProvider,
+	BookGQL,
+	{ id: {}, title: {} },
+	filter,
+	pagination
 );
 ```
 
@@ -412,14 +415,14 @@ const results = await queryManager.getQueryResultsForFields(
 
 ### Core Components
 
-| Component | Purpose |
-|-----------|---------|
-| `GQLtoSQLMapper` | Transforms GraphQL field selections into SQL with proper joins |
-| `GQLQueryManager` | Orchestrates query building and execution |
-| `FilterProcessor` | Translates GQL filter inputs to SQL WHERE clauses |
-| `RelationshipHandler` | Generates JOIN SQL for ORM-declared relations |
-| `SQLBuilder` | Assembles final SQL strings and JSON aggregations |
-| `AliasManager` | Manages incremental SQL aliases to prevent naming conflicts |
+| Component             | Purpose                                                        |
+| --------------------- | -------------------------------------------------------------- |
+| `GQLtoSQLMapper`      | Transforms GraphQL field selections into SQL with proper joins |
+| `GQLQueryManager`     | Orchestrates query building and execution                      |
+| `FilterProcessor`     | Translates GQL filter inputs to SQL WHERE clauses              |
+| `RelationshipHandler` | Generates JOIN SQL for ORM-declared relations                  |
+| `SQLBuilder`          | Assembles final SQL strings and JSON aggregations              |
+| `AliasManager`        | Manages incremental SQL aliases to prevent naming conflicts    |
 
 ### Query Flow
 

package/dist/entities/gql-entity.d.ts

@@ -2,7 +2,8 @@ import { getMetadataStorage } from 'type-graphql';
 import { CustomFieldsSettings, FieldSettings, FieldsSettings, GQLEntityFilterInputFieldType, GQLEntityPaginationInputType, RelatedFieldSettings } from '../types';
 import { AccessControlEntry } from '../types/access-control';
 export declare const setGlobalConfig: (config: {
-    gqlTypesSuffix: string;
+    gqlTypesSuffix?: string;
+    gqlSortSuffix?: string;
 }) => void;
 export declare const getFieldsOptionsFor: (name: string) => Record<string, string>;
 export declare const getFieldByAlias: (entityName: string | undefined, alias: string) => string;

package/dist/entities/gql-entity.js

@@ -27,9 +27,13 @@ const aclMap = {};
 const autoResolverRegistry = new Map();
 // ─── Global config ───────────────────────────────────────────────────────────
 let gqlTypesSuffix = '';
+let gqlSortSuffix = '';
 let sortEnumRegistered = false;
 const setGlobalConfig = (config) => {
-    gqlTypesSuffix = config.gqlTypesSuffix;
+    if (config.gqlTypesSuffix !== undefined)
+        gqlTypesSuffix = config.gqlTypesSuffix;
+    if (config.gqlSortSuffix !== undefined)
+        gqlSortSuffix = config.gqlSortSuffix;
 };
 exports.setGlobalConfig = setGlobalConfig;
 // ─── Public accessors ────────────────────────────────────────────────────────
@@ -41,7 +45,7 @@ const getCustomFieldsFor = (name) => CustomFieldsMap[name] ?? {};
 exports.getCustomFieldsFor = getCustomFieldsFor;
 const getACLFor = (name) => aclMap[name] ?? {};
 exports.getACLFor = getACLFor;
-const getGQLEntityNameFor = (name) => `${name}${gqlTypesSuffix || process.env['D3GOP_SORT_SUFFIX'] || process.env['D3GOP_TYPES_SUFFIX'] || ''}`;
+const getGQLEntityNameFor = (name) => `${name}${gqlTypesSuffix || process.env['D3GOP_TYPES_SUFFIX'] || ''}`;
 exports.getGQLEntityNameFor = getGQLEntityNameFor;
 const getGQLEntityNameForClass = (classType) => (0, exports.getGQLEntityNameFor)(classType.name);
 exports.getGQLEntityNameForClass = getGQLEntityNameForClass;
@@ -67,18 +71,15 @@ function getAutoResolvers() {
 }
 // ─── Sort enum deferred registration ────────────────────────────────────────
 /**
- * Registers the Sort enum with type-graphql using the current suffix.
+ * Registers the Sort enum with type-graphql using the current sort suffix.
  * Deferred from module load so that setGlobalConfig() can be called first,
- * or falls back to the D3GOP_SORT_SUFFIX / D3GOP_TYPES_SUFFIX env variable.
+ * or falls back to the D3GOP_SORT_SUFFIX env variable.
  * Safe to call multiple times — only registers once.
  */
 function ensureSortRegistered() {
     if (sortEnumRegistered)
         return;
-    const suffix = gqlTypesSuffix ||
-        process.env['D3GOP_SORT_SUFFIX'] ||
-        process.env['D3GOP_TYPES_SUFFIX'] ||
-        '';
+    const suffix = gqlSortSuffix || process.env['D3GOP_SORT_SUFFIX'] || '';
     (0, type_graphql_1.registerEnumType)(types_1.Sort, { name: `Sort${suffix}` });
     sortEnumRegistered = true;
 }

package/dist/queries/gql-to-sql-mapper.js

@@ -127,7 +127,7 @@ class GQLtoSQLMapper {
             const decoratorAlias = (0, entities_1.getFieldByAlias)(entityMetadata.name, gqlFieldNameKey);
             const fieldName = decoratorAlias !== gqlFieldNameKey
                 ? decoratorAlias
-                : name ?? gqlFieldNameKey;
+                : (name ?? gqlFieldNameKey);
             variables_1.logger.log(logPrefix, '- mapFilter for', gqlFieldNameKey, 'alias for', fieldName
             // 'keys:',
             // ...mappings.keys()
@@ -180,7 +180,7 @@ class GQLtoSQLMapper {
     mapCustomField(customFieldProps, mapping, latestAlias, gqlFieldName, mappings, fieldsByTypeName, ownerMetadata) {
         // mapping strategy: generate a SQL JOIN to the reference entity
         if (customFieldProps && 'mapping' in customFieldProps && customFieldProps.mapping) {
-            const { refEntity, refFields: rawRefFields, fields: rawLocalFields } = customFieldProps.mapping;
+            const { refEntity, refFields: rawRefFields, fields: rawLocalFields, } = customFieldProps.mapping;
             // Normalise single string → array for uniform handling
             const refFields = Array.isArray(rawRefFields) ? rawRefFields : [rawRefFields];
             const localFields = Array.isArray(rawLocalFields) ? rawLocalFields : [rawLocalFields];
@@ -222,9 +222,7 @@ class GQLtoSQLMapper {
             // JSON aggregate — single object (not array), same pattern as RelationshipHandler.mapManyToOne
             mapping.json.push(`${joinAlias.toColumnName('value')} as "${gqlFieldName}"`);
             const selectFields = [
-                ...new Set(refSqlCols
-                    .map((sqlCol) => joinAlias.toColumnName(sqlCol))
-                    .concat(Array.from(refSelect))),
+                ...new Set(refSqlCols.map((sqlCol) => joinAlias.toColumnName(sqlCol)).concat(Array.from(refSelect))),
             ];
             const jsonSQL = sql_builder_1.SQLBuilder.generateJsonSelectStatement(joinAlias.toString()); // single object
             const subFromSQL = `(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dav3/gql-of-power",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/entities/gql-entity.ts

@@ -38,10 +38,12 @@ const autoResolverRegistry = new Map<string, new () => any>();
 // ─── Global config ───────────────────────────────────────────────────────────
 
 let gqlTypesSuffix = '';
+let gqlSortSuffix = '';
 let sortEnumRegistered = false;
 
-export const setGlobalConfig = (config: { gqlTypesSuffix: string }) => {
-	gqlTypesSuffix = config.gqlTypesSuffix;
+export const setGlobalConfig = (config: { gqlTypesSuffix?: string; gqlSortSuffix?: string }) => {
+	if (config.gqlTypesSuffix !== undefined) gqlTypesSuffix = config.gqlTypesSuffix;
+	if (config.gqlSortSuffix !== undefined) gqlSortSuffix = config.gqlSortSuffix;
 };
 
 // ─── Public accessors ────────────────────────────────────────────────────────
@@ -55,7 +57,7 @@ export const getCustomFieldsFor = (name: string) => CustomFieldsMap[name] ?? {};
 export const getACLFor = (name: string) => aclMap[name] ?? {};
 
 export const getGQLEntityNameFor = (name: string) =>
-	`${name}${gqlTypesSuffix || process.env['D3GOP_SORT_SUFFIX'] || process.env['D3GOP_TYPES_SUFFIX'] || ''}`;
+	`${name}${gqlTypesSuffix || process.env['D3GOP_TYPES_SUFFIX'] || ''}`;
 export const getGQLEntityNameForClass = <T>(classType: new () => T) =>
 	getGQLEntityNameFor(classType.name);
 export const getGQLEntityFieldResolverName = (gqlEntityName: string) =>
@@ -83,18 +85,14 @@ export function getAutoResolvers(): Array<new () => any> {
 // ─── Sort enum deferred registration ────────────────────────────────────────
 
 /**
- * Registers the Sort enum with type-graphql using the current suffix.
+ * Registers the Sort enum with type-graphql using the current sort suffix.
  * Deferred from module load so that setGlobalConfig() can be called first,
- * or falls back to the D3GOP_SORT_SUFFIX / D3GOP_TYPES_SUFFIX env variable.
+ * or falls back to the D3GOP_SORT_SUFFIX env variable.
  * Safe to call multiple times — only registers once.
  */
 function ensureSortRegistered() {
 	if (sortEnumRegistered) return;
-	const suffix =
-		gqlTypesSuffix ||
-		process.env['D3GOP_SORT_SUFFIX'] ||
-		process.env['D3GOP_TYPES_SUFFIX'] ||
-		'';
+	const suffix = gqlSortSuffix || process.env['D3GOP_SORT_SUFFIX'] || '';
 	registerEnumType(Sort, { name: `Sort${suffix}` });
 	sortEnumRegistered = true;
 }
@@ -268,7 +266,9 @@ export function GQLEntityClass<T extends Object, K>(
  * attempt to derive it from the decorated type class's `.relatedEntityName` static.
  * This allows `defineFields` consumers to skip the redundant `relatedEntityName` boilerplate.
  */
-function _resolveRelatedEntityNames<T>(fields: Partial<FieldsSettings<T>>): Partial<FieldsSettings<T>> {
+function _resolveRelatedEntityNames<T>(
+	fields: Partial<FieldsSettings<T>>
+): Partial<FieldsSettings<T>> {
 	const resolved: Partial<FieldsSettings<T>> = {};
 	for (const [fieldName, fieldOptions] of Object.entries(fields)) {
 		if (!fieldOptions) {
@@ -386,14 +386,7 @@ export function createGQLEntity<T extends Object, K>(
 	ObjectType(gqlEntityName)(GQLEntity);
 
 	function buildResolvers() {
-		return _buildResolversForEntity(
-			GQLEntity,
-			gqlEntityName,
-			fields,
-			opts,
-			metadata,
-			customFields
-		);
+		return _buildResolversForEntity(GQLEntity, gqlEntityName, fields, opts, metadata, customFields);
 	}
 
 	return {
@@ -671,7 +664,7 @@ export function createGQLEntityFilters<T, K>(
 			? options.filter(
 					({ appliesToArray }) =>
 						(!appliesToArray && includeNotArrays) || (appliesToArray && getFilterType)
-			  )
+				)
 			: [];
 
 		if (canFilterForField && applicableOptions.length > 0) {
@@ -744,7 +737,7 @@ export function createGQLEntityFilters<T, K>(
 								TypeMap[getGQLEntityNameFor(fieldOptions.relatedEntityName()) + 'FilterInput'] ??
 								GQLEntityFilterInputField
 							);
-					  }
+						}
 					: () => GQLEntityFilterInputField,
 			options: { ...fieldOptions.options, nullable: true },
 			typeOptions: { nullable: true },

package/src/entities/index.ts

@@ -1 +1 @@
-export * from './gql-entity';
+export * from './gql-entity';

package/src/queries/alias.ts

@@ -6,7 +6,11 @@ export enum AliasType {
 	value = 'value',
 }
 export class Alias {
-	constructor(private type: AliasType, private index: number, private prefix: string) {}
+	constructor(
+		private type: AliasType,
+		private index: number,
+		private prefix: string
+	) {}
 
 	public toString() {
 		return `${this.type[0]}_${this.prefix}${this.index}`;

package/src/queries/filter-processor.ts

@@ -97,16 +97,19 @@ export class FilterProcessor extends ClassOperations {
 		// Handle nested field operations like { id: { _in }, id: { _eq }, ... }
 		const fieldOperations =
 			typeof filterValue === 'object'
-				? keys(filterValue ?? ({} as Partial<typeof filterValue>)).reduce((acc, key) => {
-						const k = keys(FieldOperations).find((k) => k.toString() === key.toString());
-						if (k) {
-							acc.push({
-								fieldOperation: k,
-								value: (filterValue as any)[key],
-							});
-						}
-						return acc;
-				  }, [] as Array<{ fieldOperation: keyof FieldOperationsType; value: any }>)
+				? keys(filterValue ?? ({} as Partial<typeof filterValue>)).reduce(
+						(acc, key) => {
+							const k = keys(FieldOperations).find((k) => k.toString() === key.toString());
+							if (k) {
+								acc.push({
+									fieldOperation: k,
+									value: (filterValue as any)[key],
+								});
+							}
+							return acc;
+						},
+						[] as Array<{ fieldOperation: keyof FieldOperationsType; value: any }>
+					)
 				: ([] as Array<{ fieldOperation: keyof FieldOperationsType; value: any }>);
 
 		if (fieldOperation) {
@@ -434,8 +437,8 @@ export class FilterProcessor extends ClassOperations {
 			? properties[gqlFieldNameKey as keyof EntityMetadata<T>['properties']]
 				? gqlFieldNameKey
 				: properties[lowercasedFirstFieldNameKey as keyof EntityMetadata<T>['properties']]
-				? lowercasedFirstFieldNameKey
-				: null
+					? lowercasedFirstFieldNameKey
+					: null
 			: null;
 
 		const gqlFieldName = (customFieldProps?.requires as string) ?? fieldNameKey;
@@ -636,9 +639,9 @@ export class FilterProcessor extends ClassOperations {
 		const fieldNameBeforeOperation =
 			gqlFieldNameKey.indexOf(fieldOperation) > 0
 				? // id_eq
-				  gqlFieldNameKey.slice(0, -fieldOperation.length)
+					gqlFieldNameKey.slice(0, -fieldOperation.length)
 				: // Id: { _eq }
-				  gqlFieldNameKey.charAt(0).toLowerCase() + gqlFieldNameKey.slice(1);
+					gqlFieldNameKey.charAt(0).toLowerCase() + gqlFieldNameKey.slice(1);
 
 		if (fieldNameBeforeOperation) {
 			const fieldProps = properties[fieldNameBeforeOperation as keyof typeof properties];
@@ -902,7 +905,7 @@ export class FilterProcessor extends ClassOperations {
 							outerJoin,
 							whereSQL,
 							whereWithValues
-					  );
+						);
 
 			const existsSQL = `exists (${subquery})`.replaceAll(/[ \n\t]+/gi, ' ');
 
@@ -971,10 +974,10 @@ export class FilterProcessor extends ClassOperations {
 
 				logger.log('FilterProcessor - mapFilterManyToOne: whereSQL', alias.toString(), unionAll);
 
-		const subquery =
-				unionAll.length > 0
-					? unionAll.map((q) => `(${q})`).join(' union all ')
-					: this.buildManyToOneJoin(
+				const subquery =
+					unionAll.length > 0
+						? unionAll.map((q) => `(${q})`).join(' union all ')
+						: this.buildManyToOneJoin(
 								[],
 								alias,
 								referenceField.tableName,
@@ -982,7 +985,7 @@ export class FilterProcessor extends ClassOperations {
 								outerJoin,
 								whereSQL,
 								whereWithValues
-						  );
+							);
 
 				const existsSQL = `exists (${subquery})`.replaceAll(/[ \n\t]+/gi, ' ');
 
@@ -1075,7 +1078,7 @@ export class FilterProcessor extends ClassOperations {
 							outerJoin,
 							whereSQL,
 							whereWithValues
-					  );
+						);
 
 			const existsSQL = `exists (${subquery})`.replaceAll(/[ \n\t]+/gi, ' ');
 

package/src/queries/gql-to-sql-mapper.ts

@@ -225,7 +225,7 @@ export class GQLtoSQLMapper {
 									name: pk,
 									alias: pk,
 								},
-						  },
+							},
 				definedFields
 			) ?? definedFields;
 
@@ -253,7 +253,7 @@ export class GQLtoSQLMapper {
 				const fieldName =
 					decoratorAlias !== gqlFieldNameKey
 						? decoratorAlias
-						: (name as string | undefined) ?? gqlFieldNameKey;
+						: ((name as string | undefined) ?? gqlFieldNameKey);
 				logger.log(
 					logPrefix,
 					'- mapFilter for',
@@ -295,7 +295,15 @@ export class GQLtoSQLMapper {
 				);
 
 				if (!fieldProps) {
-					return this.mapCustomField<T>(customFieldProps, mapping, alias, gqlFieldName, mappings, fieldsByTypeName, entityMetadata);
+					return this.mapCustomField<T>(
+						customFieldProps,
+						mapping,
+						alias,
+						gqlFieldName,
+						mappings,
+						fieldsByTypeName,
+						entityMetadata
+					);
 				} else {
 					this.mapField<T>(
 						fieldName,
@@ -359,7 +367,11 @@ export class GQLtoSQLMapper {
 	) {
 		// mapping strategy: generate a SQL JOIN to the reference entity
 		if (customFieldProps && 'mapping' in customFieldProps && customFieldProps.mapping) {
-			const { refEntity, refFields: rawRefFields, fields: rawLocalFields } = customFieldProps.mapping;
+			const {
+				refEntity,
+				refFields: rawRefFields,
+				fields: rawLocalFields,
+			} = customFieldProps.mapping;
 
 			// Normalise single string → array for uniform handling
 			const refFields = Array.isArray(rawRefFields) ? rawRefFields : [rawRefFields];
@@ -397,7 +409,8 @@ export class GQLtoSQLMapper {
 
 			// fieldsByTypeName is keyed by the GQL type name which may have a suffix (e.g. 'AuthorV2').
 			// Resolve via getGQLEntityNameFor so the suffix is applied consistently.
-			const subFields = fieldsByTypeName?.[getGQLEntityNameFor(refEntityName)] ?? fieldsByTypeName?.[refEntityName];
+			const subFields =
+				fieldsByTypeName?.[getGQLEntityNameFor(refEntityName)] ?? fieldsByTypeName?.[refEntityName];
 			const newMappings = this.recursiveMap({
 				entityMetadata: refMetadata,
 				fields: subFields,
@@ -424,9 +437,7 @@ export class GQLtoSQLMapper {
 
 			const selectFields = [
 				...new Set(
-					refSqlCols
-						.map((sqlCol) => joinAlias.toColumnName(sqlCol))
-						.concat(Array.from(refSelect))
+					refSqlCols.map((sqlCol) => joinAlias.toColumnName(sqlCol)).concat(Array.from(refSelect))
 				),
 			];
 

package/src/queries/relationship-handler.ts

@@ -289,7 +289,11 @@ export class RelationshipHandler {
 				outerJoin.length > 0 && json.length > 0
 					? `( select ${refAlias}.*, ${json.join(', ')} from ${innerSubquery} ${outerJoin.join(' \n')} ) as ${refAlias}`
 					: `${innerSubquery} ${outerJoin.join(' \n')}`;
-			const leftOuterJoin = `left outer join lateral ( select ${jsonSQL} as value from ${fromBody} ) as ${refAlias} on true`.replaceAll(/[ \n\t]+/gi, ' ');
+			const leftOuterJoin =
+				`left outer join lateral ( select ${jsonSQL} as value from ${fromBody} ) as ${refAlias} on true`.replaceAll(
+					/[ \n\t]+/gi,
+					' '
+				);
 
 			mapping.json.push(`${alias.toColumnName('value')} as "${gqlFieldName}"`);
 			mapping.outerJoin.push(leftOuterJoin);

package/src/queries/sql-builder.ts

@@ -182,7 +182,10 @@ export class SQLBuilder {
 	): string {
 		if (joins.length > 0 && jsonColumns.length > 0) {
 			const innerBody = `( select ${alias}.*, ${jsonColumns.join(', ')} from ${fromSQL} ${joins.join(' \n')} ) as ${alias}`;
-			return `left outer join lateral ( select ${jsonSelect} as value from ${innerBody} ) as ${alias} on true`.replaceAll(/[ \n\t]+/gi, ' ');
+			return `left outer join lateral ( select ${jsonSelect} as value from ${innerBody} ) as ${alias} on true`.replaceAll(
+				/[ \n\t]+/gi,
+				' '
+			);
 		}
 		return `left outer join lateral (
 			select ${jsonSelect} as value

package/src/query-manager.ts

@@ -5,7 +5,11 @@ import {
 	simplifyParsedResolveInfoFragmentWithType,
 } from 'graphql-parse-resolve-info';
 import knex from 'knex';
-import { getCustomFieldsFor, getGQLEntityNameFor, getGQLEntityNameForClass } from './entities/gql-entity';
+import {
+	getCustomFieldsFor,
+	getGQLEntityNameFor,
+	getGQLEntityNameForClass,
+} from './entities/gql-entity';
 import { GQLtoSQLMapper } from './queries/gql-to-sql-mapper';
 import {
 	DatabaseDriver,
@@ -60,7 +64,14 @@ export class GQLQueryManager {
 			throw new Error(`Entity ${entityName} not found in metadata`);
 		}
 		const fields = getGQLFields(info) as FieldSelection<T>;
-		return this.getQueryResultsForFields<K, T>(provider, entity, fields, filter, pagination, entityName);
+		return this.getQueryResultsForFields<K, T>(
+			provider,
+			entity,
+			fields,
+			filter,
+			pagination,
+			entityName
+		);
 	}
 
 	async getQueryResultsForFields<K extends { _____name: string }, T>(

package/src/types/gql-types.ts

@@ -30,36 +30,38 @@ export type FieldOperationsType<T> = Partial<
  *  - \[_in\]: typeof T\[field\]\[\]
  *  - etc...
  */
-export type FieldValuesObjectOperationsType<T> = DefinedType<T> extends Array<infer K>
-	? {
-			[k in string &
-				keyof Pick<
-					FieldOperationsClass<DefinedType<K>>,
-					'_in' | '_nin' | '_contains' | '_eq' | '_overlap'
-				>]?: FieldOperationsClass<DefinedType<K>>[k] | null;
-	  }
-	: {
-			[k in string & keyof FieldOperationsClass<DefinedType<T>>]?:
-				| FieldOperationsClass<DefinedType<T>>[k]
-				| null;
-	  };
+export type FieldValuesObjectOperationsType<T> =
+	DefinedType<T> extends Array<infer K>
+		? {
+				[k in string &
+					keyof Pick<
+						FieldOperationsClass<DefinedType<K>>,
+						'_in' | '_nin' | '_contains' | '_eq' | '_overlap'
+					>]?: FieldOperationsClass<DefinedType<K>>[k] | null;
+			}
+		: {
+				[k in string & keyof FieldOperationsClass<DefinedType<T>>]?:
+					| FieldOperationsClass<DefinedType<T>>[k]
+					| null;
+			};
 
 /**
  * { \[field\]: { _eq: typeof T\[field\], ... } }
  */
-export type FieldValuesObjectType<T> = DefinedType<DefinedType<T>> extends Array<infer K>
-	? Partial<FieldValuesObjectType<DefinedType<K>>>
-	: DefinedType<T> extends Primitives
-	? Partial<FieldValuesObjectOperationsType<DefinedType<T>>>
-	: {
-			[key in string & keyof DefinedType<T>]?: DefinedType<DefinedType<T>[key]> extends Array<
-				infer K
-			>
-				? K extends Primitives
-					? Partial<FieldValuesObjectOperationsType<ExtractArrayType<DefinedType<K>>>>
-					: Partial<GQLEntityFilterInputFieldType<DefinedType<K>>>
-				: Partial<GQLEntityFilterInputFieldType<DefinedType<DefinedType<T>[key]>>>;
-	  };
+export type FieldValuesObjectType<T> =
+	DefinedType<DefinedType<T>> extends Array<infer K>
+		? Partial<FieldValuesObjectType<DefinedType<K>>>
+		: DefinedType<T> extends Primitives
+			? Partial<FieldValuesObjectOperationsType<DefinedType<T>>>
+			: {
+					[key in string & keyof DefinedType<T>]?: DefinedType<DefinedType<T>[key]> extends Array<
+						infer K
+					>
+						? K extends Primitives
+							? Partial<FieldValuesObjectOperationsType<ExtractArrayType<DefinedType<K>>>>
+							: Partial<GQLEntityFilterInputFieldType<DefinedType<K>>>
+						: Partial<GQLEntityFilterInputFieldType<DefinedType<DefinedType<T>[key]>>>;
+				};
 
 /**
  *  - \[_field\]: T\[field\]

package/src/types/sql-types.ts

@@ -236,9 +236,8 @@ export type GQLArgumentsFilterAndPagination<T> =
 	  };
 
 export type ActualValueType<T> = Exclude<T, undefined | null>;
-export type ExtractType<T> = ActualValueType<T> extends Array<infer K>
-	? ActualValueType<K>
-	: ActualValueType<T>;
+export type ExtractType<T> =
+	ActualValueType<T> extends Array<infer K> ? ActualValueType<K> : ActualValueType<T>;
 
 export type FieldsDetailsMap<T> = {
 	[key in keyof ExtractArrayType<T>]?: FieldDetails<ExtractArrayType<T>, key>;
@@ -263,19 +262,19 @@ export type Fields<
 	 *
 	 */
 	ArrayIdentifierFieldName extends string = 'getItems',
-	SingleRecordIdentifierFieldName extends string = 'getEntity'
+	SingleRecordIdentifierFieldName extends string = 'getEntity',
 > = Partial<{
 	[key in string & keyof NonNullable<T>]: NonNullable<NonNullable<T>[key]> extends Array<infer E>
 		?
 				| Fields<NonNullable<E>, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName>
 				| GQLArgumentsFilterAndPagination<NonNullable<E>>
 		: NonNullable<NonNullable<T>[key]> extends infer K
-		? K extends infer E
-			? ArrayIdentifierFieldName extends keyof NonNullable<E>
-				? NonNullable<E>[ArrayIdentifierFieldName] extends () => infer F
-					? F extends Array<infer G>
-						? Partial<
-								| Fields<G, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName> &
+			? K extends infer E
+				? ArrayIdentifierFieldName extends keyof NonNullable<E>
+					? NonNullable<E>[ArrayIdentifierFieldName] extends () => infer F
+						? F extends Array<infer G>
+							? Partial<
+									Fields<G, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName> &
 										(
 											| {
 													[key in string & keyof typeof FieldOperations]?: Fields<
@@ -286,13 +285,12 @@ export type Fields<
 											  }
 											| GQLArgumentsFilterAndPagination<G>
 										)
-						  >
+								>
+							: {}
 						: {}
-					: {}
-				: SingleRecordIdentifierFieldName extends keyof NonNullable<K>
-				? NonNullable<K>[SingleRecordIdentifierFieldName] extends () => infer F
-					?
-							| Fields<NonNullable<F>, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName> &
+					: SingleRecordIdentifierFieldName extends keyof NonNullable<K>
+						? NonNullable<K>[SingleRecordIdentifierFieldName] extends () => infer F
+							? Fields<NonNullable<F>, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName> &
 									(
 										| Partial<{
 												[Key in string & keyof F as `${Capitalize<Key>}`]: {
@@ -305,12 +303,12 @@ export type Fields<
 										  }>
 										| GQLArgumentsFilterAndPagination<F>
 									)
-					: Fields<NonNullable<K>, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName>
-				: NonNullable<T>[key] | GQLArgumentsFilterAndPagination<NonNullable<T>[key]>
-			: Fields<
-					NonNullable<NonNullable<T>[key]>,
-					ArrayIdentifierFieldName,
-					SingleRecordIdentifierFieldName
-			  >
-		: {};
+							: Fields<NonNullable<K>, ArrayIdentifierFieldName, SingleRecordIdentifierFieldName>
+						: NonNullable<T>[key] | GQLArgumentsFilterAndPagination<NonNullable<T>[key]>
+				: Fields<
+						NonNullable<NonNullable<T>[key]>,
+						ArrayIdentifierFieldName,
+						SingleRecordIdentifierFieldName
+					>
+			: {};
 }>;

package/src/types/utils.ts

@@ -1,7 +1,6 @@
 export type DefinedType<T> = Exclude<T, undefined | null | never>;
-export type ExtractArrayType<T> = DefinedType<T> extends Array<infer K>
-	? ExtractArrayType<DefinedType<K>>
-	: DefinedType<T>;
+export type ExtractArrayType<T> =
+	DefinedType<T> extends Array<infer K> ? ExtractArrayType<DefinedType<K>> : DefinedType<T>;
 
 export type OmitArrays<T> = {
 	[K in keyof DefinedType<T> as DefinedType<DefinedType<T>[K]> extends Array<infer L>