@postxl/generators 1.0.14 → 1.1.1

package/dist/backend-core/template/apps/api/src/e2e.ts

@@ -72,6 +72,7 @@
 import { INestApplication } from '@nestjs/common'
 
 import { getMemoryUsage } from 'apps/api/src/console.logger'
+import { Mutex } from 'async-mutex'
 import express, { Express, Request, Response } from 'express'
 import http, { Server } from 'node:http'
 import { format } from 'node:util'
@@ -159,13 +160,21 @@ const defaultBackendId = zSpecId.parse('default-backend')
 const backends = new Map<SpecId, Backend>()
 const usedPorts = new Set<Port>()
 
+// Mutex to prevent race conditions when allocating ports
+const portAllocationMutex = new Mutex()
+
 async function getNextAvailablePort(): Promise<Port> {
+  const release = await portAllocationMutex.acquire()
   let port: Port = 4000 as Port
-  while (usedPorts.has(port) || !(await checkPortAvailability(port))) {
-    port = (port + 1) as Port
+  try {
+    while (usedPorts.has(port) || !(await checkPortAvailability(port))) {
+      port = (port + 1) as Port
+    }
+    usedPorts.add(port)
+    return port
+  } finally {
+    release()
   }
-  usedPorts.add(port)
-  return port
 }
 
 async function startBackend(spec: SpecId, isDefault: boolean): Promise<Backend_Running> {

package/dist/backend-router-trpc/generators/model-routes.generator.js

@@ -41,6 +41,8 @@ const Generator = __importStar(require("@postxl/generator"));
 function generateModelRoutes({ model, context }) {
     const imports = Generator.ImportGenerator.from(model.trpcRoute._filePath)
         .add(model.types.id.decoder)
+        .add(model.types.filter.decoder)
+        .add(model.types.filter.field)
         .add({ name: context.trpcRouter._middleware.auth.name, location: context.trpcRouter._middleware._filePath })
         .add({ name: context.trpcRouter._shared.procedure.name, location: context.trpcRouter._shared._filePath })
         .add({ name: context.trpcRouter._shared.router.name, location: context.trpcRouter._shared._filePath });
@@ -60,8 +62,10 @@ function generateModelRoutes({ model, context }) {
         }
     }
     const defaultValueMethod = `getDefault: ${context.trpcRouter._shared.procedure.name}.query(({ ctx }) => ctx.view.${model.view.service.variableName}.data.defaultValue),`;
+    const variableName = model.view.service.variableName;
     return /* ts */ `
 
+import { z } from 'zod'
   ${imports.generate()}
 
   export const ${model.trpcRoute.name} = router({
@@ -70,15 +74,32 @@ function generateModelRoutes({ model, context }) {
     ${model.trpcRoute.get.name}: procedure
       .use(authMiddleware)
       .input(${model.types.id.decoder.name})
-      .query(({ input, ctx }) => ctx.view.${model.view.service.variableName}.get({ id: input, user: ctx.user})),
+      .query(({ input, ctx }) => ctx.view.${variableName}.get({ id: input, user: ctx.user})),
     
     ${model.trpcRoute.getMap.name}: procedure
       .use(authMiddleware)
-      .query(({ ctx }) => ctx.view.${model.view.service.variableName}.getAll(ctx.user)),
+      .query(({ ctx }) => ctx.view.${variableName}.getAll(ctx.user)),
     
     ${model.trpcRoute.getList.name}: procedure
       .use(authMiddleware)
-      .query(({ ctx }) => ctx.view.${model.view.service.variableName}.getList(ctx.user)),
+      .query(({ ctx }) => ctx.view.${variableName}.getList(ctx.user)),
+
+    ${model.trpcRoute.getFiltered.name}: procedure
+      .use(authMiddleware)
+      .input(${model.types.filter.decoder.name})
+      .query(({ input, ctx }) => ctx.view.${variableName}.getFiltered({ filters: input, user: ctx.user })),
+
+    ${model.trpcRoute.getFilterOptions.name}: procedure
+      .use(authMiddleware)
+      .input(
+        z.object({
+          field: z.enum(${model.types.filter.field.name}),
+          filters: ${model.types.filter.decoder.name},
+        }),
+      )
+      .query(({ input, ctx }) =>
+        ctx.view.${variableName}.getFilterOptions({ field: input.field, filters: input.filters, user: ctx.user }),
+      ),
 
     ${mutations.join('\n')}
 

package/dist/backend-router-trpc/generators/model-routes.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-routes.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/model-routes.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDAkDC;AAzDD,6DAA8C;AAI9C;;GAEG;AACH,SAAgB,mBAAmB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAyD;IAC3G,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC;SACtE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC;SAC3B,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;SAC3G,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SACxG,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IAExG,MAAM,SAAS,GAAa,EAAE,CAAA;IAE9B,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACpC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACxE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACnC,SAAS,CAAC,IAAI,CAAC;UACX,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;iBAClD,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;mBACtC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;gEACkB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,aAAa,MAAM,CAAC,IAAI;OAC1G,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,eAAe,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,gCAAgC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,sBAAsB,CAAA;IAExK,OAAO,QAAQ,CAAC;;IAEd,OAAO,CAAC,QAAQ,EAAE;;iBAEL,KAAK,CAAC,SAAS,CAAC,IAAI;MAC/B,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB;;MAE1D,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI;;eAEf,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI;4CACE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;;MAErE,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI;;qCAEI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;;MAE9D,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI;;qCAEG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;;MAE9D,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;;GAGvB,CAAA;AACH,CAAC"}
+{"version":3,"file":"model-routes.generator.js","sourceRoot":"","sources":["../../../src/backend-router-trpc/generators/model-routes.generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDAsEC;AA7ED,6DAA8C;AAI9C;;GAEG;AACH,SAAgB,mBAAmB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAyD;IAC3G,MAAM,OAAO,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC;SACtE,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;SAC/B,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;SAC7B,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;SAC3G,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;SACxG,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IAExG,MAAM,SAAS,GAAa,EAAE,CAAA;IAE9B,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACpC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACxE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACnC,SAAS,CAAC,IAAI,CAAC;UACX,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI;iBAClD,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI;mBACtC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;gEACkB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,aAAa,MAAM,CAAC,IAAI;OAC1G,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,eAAe,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,gCAAgC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,sBAAsB,CAAA;IACxK,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;IACpD,OAAO,QAAQ,CAAC;;;IAGd,OAAO,CAAC,QAAQ,EAAE;;iBAEL,KAAK,CAAC,SAAS,CAAC,IAAI;MAC/B,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB;;MAE1D,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI;;eAEf,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI;4CACE,YAAY;;MAElD,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI;;qCAEI,YAAY;;MAE3C,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI;;qCAEG,YAAY;;MAE3C,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI;;eAEvB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;4CACF,YAAY;;MAElD,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI;;;;0BAIjB,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI;qBAClC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;;;;mBAIjC,YAAY;;;MAGzB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;;GAGvB,CAAA;AACH,CAAC"}

package/dist/backend-router-trpc/router-trpc.generator.d.ts

@@ -101,6 +101,8 @@ export type TrpcRouterModelContext = Generator.ImportableFunction & {
     get: Generator.ImportableFunction;
     getMap: Generator.ImportableFunction;
     getList: Generator.ImportableFunction;
+    getFiltered: Generator.ImportableFunction;
+    getFilterOptions: Generator.ImportableFunction;
 };
 export type RouterEnumContext = Generator.ImportableFunction;
 export declare const generatorId: string & import("zod").BRAND<"PXL.GeneratorInterfaceId">;

package/dist/backend-router-trpc/router-trpc.generator.js

@@ -183,6 +183,8 @@ function registerModelRouter(model) {
         get: { name: Generator.toFunctionName(`get`), location },
         getMap: { name: Generator.toFunctionName(`getMap`), location },
         getList: { name: Generator.toFunctionName(`getList`), location },
+        getFiltered: { name: Generator.toFunctionName(`getFiltered`), location },
+        getFilterOptions: { name: Generator.toFunctionName(`getFilterOptions`), location },
     };
     return { ...model, trpcRoute: router };
 }

package/dist/backend-router-trpc/router-trpc.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-trpc.generator.js","sourceRoot":"","sources":["../../src/backend-router-trpc/router-trpc.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router-trpc.generator.js","sourceRoot":"","sources":["../../src/backend-router-trpc/router-trpc.generator.ts"],"names":[],"mappings":"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"}

package/dist/backend-view/model-view-service.generator.js

@@ -36,12 +36,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModelViewService = generateModelViewService;
 exports.generateModelViewService_NoRepository = generateModelViewService_NoRepository;
 const Generator = __importStar(require("@postxl/generator"));
+const model_type_generator_1 = require("../types/generators/model-type.generator");
 function generateModelViewService({ model, context }) {
     const imports = Generator.ImportGenerator.from(model.view.service.location);
     imports.addType(model.types);
     imports.addType({ name: Generator.toTypeName('User'), location: context.types.location });
     imports.addType(model.types.id);
+    imports.addType(model.types.filter.type);
+    imports.addType(model.types.filter.fieldType);
+    imports.add(model.types.filter.config);
     imports.add(context.view.service);
+    imports.addImport({
+        items: [
+            Generator.toFunctionName('applyRangeFilters'),
+            Generator.toFunctionName('getMatches'),
+            Generator.toFunctionName('getOptions'),
+            Generator.toFunctionName('formatAndSortOptions'),
+        ],
+        from: Generator.toBackendModuleLocation('@view/filter.utils'),
+    });
+    imports.addImport({
+        items: [Generator.toFunctionName('omit')],
+        from: Generator.toBackendModuleLocation('@postxl/utils'),
+    });
     if (model.repository.kind === 'NoRepository') {
         return generateModelViewService_NoRepository({ model, context, imports });
     }
@@ -54,6 +71,7 @@ function generateModelViewService_HasRepository({ model, context, imports, }) {
         return '';
     }
     imports.add(model.repository);
+    const filteringMethods = generateFilteringMethods({ model, imports });
     return `
 import { Inject, Injectable, forwardRef } from '@nestjs/common'
 
@@ -118,6 +136,9 @@ export class ${model.view.service.name} {
     
         return result
   }
+
+  ${filteringMethods}
+
   ${generateAuthorizeMethod({ model, context })}
 }
 `;
@@ -181,6 +202,22 @@ export class ${model.view.service.name} {
         return result
   }
 
+  /**
+   * Returns a filtered list of ${model.userFriendlyNamePlural}.
+   */
+  public async getFiltered({ filters, user }: { filters: ${model.types.filter.type.name}, user: User }): Promise<${model.types.name}[]> {
+    // TODO: Implement this method.
+    return this.getList(user)
+  }
+
+  /**
+   * Returns the filter options for a given field.
+   */
+  public async getFilterOptions({ field, filters, user }: { field: ${model.types.filter.field.name}, filters: ${model.types.filter.type.name}, user: User }): Promise<any> {
+    // TODO: Implement this method.
+    return []
+  }
+
   ${generateAuthorizeMethod({ model, context })}
 }`;
 }
@@ -193,4 +230,243 @@ function generateAuthorizeMethod({ model }) {
     return Promise.resolve() // NOSONAR - adhere to the same interface
   }`;
 }
+function generateFilteringMethods({ model, imports, }) {
+    const filterFields = [];
+    const usedMatchMethods = new Set();
+    // Generate filter conditions for all fields, including nested DU fields
+    for (const field of model.fields.values()) {
+        const conditions = getFilterConditionsForField({
+            field,
+            usedMatchMethods,
+        });
+        filterFields.push(...conditions);
+    }
+    if (usedMatchMethods.size > 0) {
+        imports.addImport({
+            items: Array.from(usedMatchMethods).map((m) => Generator.toFunctionName(m)),
+            from: Generator.toBackendModuleLocation('@view/filter.utils'),
+        });
+    }
+    return `
+  /**
+   * Returns a filtered list of ${model.userFriendlyNamePlural}.
+   * For really large datasets, consider implementing server-side filtering in the repository instead.
+   */
+  public async getFiltered({ filters, user }: { filters: ${model.types.filter.type.name}, user: User }): Promise<${model.types.name}[]> {
+    const allItems = await this.getList(user)
+    return this.filter${model._conjugated.PascalCasePlural}(allItems, filters)
+  }
+
+  /**
+   * Returns the filter options for a given field.
+   * For really large datasets, consider implementing server-side filtering in the repository instead.
+   */
+  public async getFilterOptions({
+    field,
+    filters,
+    user,
+  }: {
+    field: ${model.types.filter.fieldType.name}
+    filters: ${model.types.filter.type.name}
+    user: User
+  }): Promise<{ value: string; label: string; hasMatches: boolean }[]> {
+    const allItems = await this.getList(user)
+    const reducedFilters = omit(filters, field)
+    const filteredItems = this.filter${model._conjugated.PascalCasePlural}(allItems, reducedFilters)
+
+    const config = ${model.types.filter.config.name}[field]
+    const accessor = this.getFieldAccessor(field)
+
+    // If we are getting options for a number/date field, we want to respect the range filter (so options outside the range are grayed out), but still ignore the values filter (so we can see all options).
+    const itemsWithRange = applyRangeFilters(filteredItems, accessor, config, filters)
+
+    let referencedItems: Map<string, any> | undefined
+    if (config.kind === 'relation') {
+      referencedItems = await (this.viewService as any)[config.referencedModelViewServiceVariableName]?.getAll(user)
+    }
+
+    const { matches, options } = {
+      matches: getMatches(itemsWithRange, accessor),
+      options: getOptions(allItems, accessor, config, referencedItems),
+    }
+
+    return formatAndSortOptions(options, matches)
+  }
+
+  /**
+   * Helper method to filter ${model.userFriendlyNamePlural} based on provided filters.
+   */
+  private filter${model._conjugated.PascalCasePlural}(
+    ${model._conjugated.camelCasePlural}: ${model.types.name}[],
+    filters: ${model.types.filter.type.name},
+  ): ${model.types.name}[] {
+    return ${model._conjugated.camelCasePlural}.filter((item) => {
+    ${filterFields.join('')}
+      return true
+    })
+  }
+
+  ${generateGetFieldAccessorMethod({ model })}
+`;
+}
+function generateGetFieldAccessorMethod({ model }) {
+    const accessors = [];
+    // Generate accessor cases for all fields, including nested DU fields
+    for (const field of model.fields.values()) {
+        const cases = generateFieldAccessorCases({
+            field,
+            model,
+        });
+        accessors.push(...cases);
+    }
+    const defaultAccessor = `return (item: ${model.types.name}) => (item as any)[field]`;
+    // Add default case
+    accessors.push(`      default:
+        ${defaultAccessor}`);
+    return `/**
+   * Returns an accessor function for the given filter field.
+   */
+  private getFieldAccessor(field: ${model.types.filter.fieldType.name}): (item: ${model.types.name}) => any {
+  ${accessors.length > 1
+        ? `switch (field) {
+    ${accessors.join('\n')}
+    }`
+        : defaultAccessor}
+  }`;
+}
+function generateFieldAccessorCases(params) {
+    const { field, model, duParentFieldName, duMemberType } = params;
+    const result = [];
+    // Handle discriminated union: add the discriminant field plus all nested fields
+    if (field.kind === 'discriminatedUnion') {
+        // Add the discriminant field itself
+        const caseString = generateFieldAccessorCase({ field, model, duParentFieldName, duMemberType });
+        if (caseString) {
+            result.push(caseString);
+        }
+        // Add common fields
+        for (const commonField of field.commonFields.values()) {
+            result.push(...generateFieldAccessorCases({
+                field: commonField,
+                model,
+                duParentFieldName: field.name,
+            }));
+        }
+        // Add member-specific fields
+        for (const member of field.members.values()) {
+            for (const memberField of member.fields.values()) {
+                result.push(...generateFieldAccessorCases({
+                    field: memberField,
+                    model,
+                    duParentFieldName: field.name,
+                    duMemberType: member.type,
+                }));
+            }
+        }
+    }
+    else {
+        // Regular field
+        const caseString = generateFieldAccessorCase({ field, model, duParentFieldName, duMemberType });
+        if (caseString) {
+            result.push(caseString);
+        }
+    }
+    return result;
+}
+function generateFieldAccessorCase({ field, model, duParentFieldName, duMemberType, }) {
+    // For discriminated union fields at top level, we need to return the discriminant (type) value
+    if (field.kind === 'discriminatedUnion' && !duParentFieldName) {
+        return `      case '${field.name}':
+        return (item: ${model.types.name}) => item.${field.name}?.type`;
+    }
+    // Skip generating a case for simple top-level fields - the default case handles them
+    if (!duParentFieldName) {
+        return null;
+    }
+    const caseKey = `'${(0, model_type_generator_1.getFilterFieldName)(field.name, duParentFieldName)}'`;
+    let accessorExpression;
+    if (duMemberType) {
+        // Member-specific field: only return value if the member type matches
+        accessorExpression = `item.${duParentFieldName}?.type === '${duMemberType}' ? item.${duParentFieldName}?.${field.name} : undefined`;
+    }
+    else {
+        // Common field in DU
+        accessorExpression = `item.${duParentFieldName}?.${field.name}`;
+    }
+    return `      case ${caseKey}:
+        return (item: ${model.types.name}) => ${accessorExpression}`;
+}
+/**
+ * Returns all filter conditions for a field, including nested DU fields.
+ */
+function getFilterConditionsForField(params) {
+    const { field, usedMatchMethods, duParentFieldName, duMemberType } = params;
+    const result = [];
+    // Handle discriminated union: add the discriminant field plus all nested fields
+    if (field.kind === 'discriminatedUnion') {
+        // Add the discriminant field itself
+        result.push(generateFilterCondition({ field, usedMatchMethods, duParentFieldName, duMemberType }));
+        // Add common fields
+        for (const commonField of field.commonFields.values()) {
+            result.push(...getFilterConditionsForField({
+                field: commonField,
+                usedMatchMethods,
+                duParentFieldName: field.name,
+            }));
+        }
+        // Add member-specific fields
+        for (const member of field.members.values()) {
+            for (const memberField of member.fields.values()) {
+                result.push(...getFilterConditionsForField({
+                    field: memberField,
+                    usedMatchMethods,
+                    duParentFieldName: field.name,
+                    duMemberType: member.type,
+                }));
+            }
+        }
+    }
+    else {
+        // Regular field
+        result.push(generateFilterCondition(params));
+    }
+    return result;
+}
+/**
+ * Generates a single filter condition for a field.
+ */
+function generateFilterCondition({ field, usedMatchMethods, duParentFieldName, duMemberType, }) {
+    const valueType = (0, model_type_generator_1.getFilterValueType)(field);
+    let matchMethod = 'matchFilter';
+    if (valueType === 'number') {
+        matchMethod = 'matchNumberFilter';
+    }
+    else if (valueType === 'date') {
+        matchMethod = 'matchDateFilter';
+    }
+    usedMatchMethods.add(matchMethod);
+    // Build the accessor path for the field value
+    let accessor;
+    if (duParentFieldName) {
+        if (duMemberType) {
+            // Member-specific field: only check if the member type matches
+            accessor = `item.${duParentFieldName}?.type === '${duMemberType}' ? item.${duParentFieldName}?.${field.name} : undefined`;
+        }
+        else {
+            // Common field in DU
+            accessor = `item.${duParentFieldName}?.${field.name}`;
+        }
+    }
+    else if (field.kind === 'discriminatedUnion') {
+        // DU field at top level: filter by the discriminant (type) value
+        accessor = `item.${field.name}?.type`;
+    }
+    else {
+        accessor = `item.${field.name}`;
+    }
+    return `
+      if (!${matchMethod}(${accessor}, filters.${(0, model_type_generator_1.getFilterFieldName)(field.name, duParentFieldName)})) {
+        return false
+      }`;
+}
 //# sourceMappingURL=model-view-service.generator.js.map

package/dist/backend-view/model-view-service.generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-view-service.generator.js","sourceRoot":"","sources":["../../src/backend-view/model-view-service.generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-view-service.generator.js","sourceRoot":"","sources":["../../src/backend-view/model-view-service.generator.ts"],"names":[],"mappings":"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"}