@lenne.tech/nest-server 8.6.11 → 8.6.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.11",
+  "version": "8.6.12",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/core/common/helpers/db.helper.ts

@@ -543,7 +543,7 @@ export function removeIds(source: any[], ids: StringOrObjectId | StringOrObjectI
  */
 export async function setPopulates<T = Query<any, any> | Document>(
   queryOrDocument: T,
-  populateOptions: PopulateOptions[],
+  populateOptions: string[] | PopulateOptions[] | (string | PopulateOptions)[],
   modelSchemaPaths?: { [key: string]: SchemaType }
 ): Promise<T> {
   // Check parameters
@@ -553,8 +553,12 @@ export async function setPopulates<T = Query<any, any> | Document>(
 
   // Filter populate options via model schema paths
   if (modelSchemaPaths) {
-    populateOptions = populateOptions.filter((options) => {
-      return Object.keys(modelSchemaPaths).includes(options.path);
+    populateOptions = populateOptions.filter((option: string | PopulateOptions) => {
+      let key: string = option as string;
+      if ((option as PopulateOptions)?.path) {
+        key = (option as PopulateOptions)?.path;
+      }
+      return Object.keys(modelSchemaPaths).includes(key);
     });
   }
 

package/src/core/common/interfaces/service-options.interface.ts

@@ -35,7 +35,7 @@ export interface ServiceOptions {
   outputType?: new (...params: any[]) => any;
 
   // Alias for fieldSelection (if both are set fieldSelection is overwritten by populate)
-  populate?: PopulateOptions | (PopulateOptions | string)[];
+  populate?: string | PopulateOptions | (PopulateOptions | string)[];
 
   // Process field selection
   // If {} or not set, then the field selection runs with defaults

package/src/core/common/types/field-selection.type.ts

@@ -5,4 +5,9 @@ import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 /**
  * Field selection to set fields of (populated) result
  */
-export type FieldSelection = PopulateOptions | (PopulateOptions | string)[] | SelectionNode[] | ResolveSelector;
+export type FieldSelection =
+  | string
+  | PopulateOptions
+  | (PopulateOptions | string)[]
+  | SelectionNode[]
+  | ResolveSelector;

package/src/core/modules/auth/core-auth.model.ts

@@ -34,7 +34,8 @@ export class CoreAuthModel extends CoreModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
     return this;
   }
 }

package/src/core/modules/user/core-user.model.ts

@@ -128,7 +128,8 @@ export abstract class CoreUserModel extends CorePersistenceModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
     return this;
   }
 }

package/src/server/common/models/persistence.model.ts

@@ -61,7 +61,8 @@ export abstract class PersistenceModel extends CorePersistenceModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
+    // There is nothing to map yet. Non-primitive variables should always be mapped.
+    // If something comes up, you can use `mapClasses` / `mapClassesAsync` from ModelHelper.
     return this;
   }
 }

package/src/server/modules/auth/auth.model.ts

@@ -1,4 +1,5 @@
 import { Field, ObjectType } from '@nestjs/graphql';
+import { mapClasses } from '../../../core/common/helpers/model.helper';
 import { CoreAuthModel } from '../../../core/modules/auth/core-auth.model';
 import { User } from '../user/user.model';
 
@@ -35,7 +36,6 @@ export class Auth extends CoreAuthModel {
    */
   map(input) {
     super.map(input);
-    // There is nothing to map yet, if something comes up you can use `mapClass` / `mapClassAsync` from ModelHelper
-    return this;
+    return mapClasses(input, { user: User }, this);
   }
 }