@lenne.tech/nest-server 11.1.11 → 11.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "11.1.11",
+  "version": "11.1.13",
   "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",
@@ -85,7 +85,7 @@
     "bcrypt": "5.1.1",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.2",
-    "compression": "1.8.0",
+    "compression": "1.8.1",
     "cookie-parser": "1.4.7",
     "dotenv": "16.5.0",
     "ejs": "3.1.10",
@@ -135,7 +135,7 @@
     "@typescript-eslint/eslint-plugin": "8.32.0",
     "@typescript-eslint/parser": "8.32.0",
     "coffeescript": "2.7.0",
-    "eslint": "9.26.0",
+    "eslint": "9.32.0",
     "eslint-config-prettier": "10.1.5",
     "eslint-plugin-unused-imports": "4.1.4",
     "find-file-up": "2.0.1",
@@ -147,7 +147,7 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "npm-watch": "0.13.0",
-    "pm2": "6.0.8",
+    "pm2": "6.0.10",
     "prettier": "3.5.3",
     "pretty-quick": "4.1.1",
     "supertest": "7.1.0",

package/src/core/common/decorators/translatable.decorator.ts

@@ -30,16 +30,29 @@ export function updateLanguage<T extends Record<string, any>, K extends readonly
   translatableFields: string[],
 ): T {
   const changedFields: Partial<Pick<T, K[number]>> = {};
-
   for (const key of translatableFields) {
-    const k = key as keyof T;
+    const k = key;
+
+    // For languages other than 'de', compare with existing translation value instead of main value
+    let compareValue;
+    if (language !== 'de' && oldValue._translations?.[language]?.[k] !== undefined) {
+      compareValue = oldValue._translations[language][k];
+    } else {
+      compareValue = oldValue[k];
+    }
 
-    if (input[k] !== oldValue[k] && input[k] !== undefined) {
+    if (input[k] !== compareValue && input[k] !== undefined) {
       changedFields[k] = input[k];
-      input[k] = oldValue[k] as T[typeof k];
+      // Only reset if the current field isn't in german
+      if (language !== 'de') {
+        input[k] = oldValue[k];
+      }
+    } else if (language !== 'de' && input[k] !== undefined) {
+      // If no change detected but we have input for this field, reset to original value
+      // to prevent overwriting the default with translation values
+      input[k] = oldValue[k];
     }
   }
-
   input._translations = input._translations ?? {};
   input._translations[language] = {
     ...(input._translations[language] ?? {}),

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

@@ -0,0 +1,254 @@
+import type { Comparator } from '../types/scim-comparator.type';
+import type { LogicalOperator } from '../types/scim-logical-operator.type';
+
+import { ScimNode } from '../types/scim-node.type';
+
+
+export function scimToMongo(scim: string): any {
+  if (!scim) {
+    return {};
+  }
+  const tokens = tokenize(scim);
+  const ast = parseTokens(tokens);
+  return transformAstToMongo(ast);
+}
+
+/** Escapes Regex Chars */
+function escapeRegex(input: string): string {
+  return input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/** Flattens consecutive logical operators of the same type to avoid nested structures */
+function flattenLogicalOperator(node: ScimNode, targetOperator: LogicalOperator): ScimNode[] {
+  if (!('operator' in node)) {
+    return [node];
+  }
+
+  if (node.operator !== targetOperator) {
+    return [node];
+  }
+
+  const leftConditions = flattenLogicalOperator(node.left, targetOperator);
+  const rightConditions = flattenLogicalOperator(node.right, targetOperator);
+
+  return [...leftConditions, ...rightConditions];
+}
+
+/** Parses tokenized SCIM filter into an Abstract Syntax Tree (AST) */
+function parseTokens(tokens: string[]): ScimNode {
+  let pos = 0;
+
+  /** Parses a full logical expression (e.g., A and B or C) */
+  function parseExpression(): ScimNode {
+    let left = parseTerm();
+    while (tokens[pos] && /^(and|or)$/i.test(tokens[pos])) {
+      const op: LogicalOperator = tokens[pos++].toLowerCase() as LogicalOperator;
+      const right = parseTerm();
+      left = { left, operator: op, right };
+    }
+    return left;
+  }
+
+  /** Parses a single term: either a nested expression, array filter, or condition */
+  function parseTerm(): ScimNode {
+    if (tokens[pos] === '(') { // Start of a nested filter
+      pos++; // skip '('
+      const expr = parseExpression();
+      if (tokens[pos] !== ')') {
+        throw new Error(`Expected ')' at position ${pos}`);
+      }
+      pos++; // skip ')'
+      return expr;
+    }
+    if (tokens[pos + 1] === '[') { // Start of an array Filter
+      const path = tokens[pos++];
+      pos++; // skip '['
+      const expr = parseExpression();
+      if (tokens[pos] !== ']') {
+        throw new Error(`Expected ']' at position ${pos}`);
+      }
+      pos++; // skip ']'
+      return { expr, path, type: 'array' };
+    }
+    return parseCondition(); // If its neither a nested nor array filter its a simple "propertyKey eq Value"
+  }
+
+  /** Parses a basic SCIM condition (e.g., userName eq "Joe") */
+  function parseCondition(): ScimNode {
+    const attr = tokens[pos++]; // First token is the attribute
+    const op: Comparator = tokens[pos++].toLowerCase() as Comparator; // Second token is the operator
+    if (!['aco', 'co', 'eq', 'ew', 'ge', 'gt', 'le', 'lt', 'pr', 'sw'].includes(op)) {
+      throw new Error(`Unsupported comparator: ${op}`);
+    }
+
+    let value: any = null;
+
+    if (op !== 'pr') { // "Is Present" doesnt require a value
+      let rawValue = tokens[pos++]; // Third token is the value
+      if (!attr || !op || rawValue === undefined) {
+        throw new Error(`Invalid condition syntax at token ${pos}`);
+      }
+
+      // Handle quoted strings
+      if (rawValue?.startsWith('"')) {
+        rawValue = rawValue.slice(1, -1);
+        // For quoted strings, keep as string (don't parse to number/boolean)
+        value = rawValue;
+      } else {
+        // For unquoted values, parse to appropriate type (number, boolean, or string)
+        value = parseValue(rawValue);
+      }
+    }
+
+    return { attributePath: attr, comparator: op, type: 'condition', value };
+  }
+
+  return parseExpression();
+}
+
+
+  /** Converts string values to appropriate types (number, boolean, or string) */
+function parseValue(value: string): any {
+  if (value === null || value === undefined) {
+    return value;
+  }
+
+  // Check if it's a number (integer or float)
+  if (/^-?\d+(\.\d+)?$/.test(value)) {
+    const numValue = Number(value);
+    return isNaN(numValue) ? value : numValue;
+  }
+
+  // Check if it's a boolean
+  if (value.toLowerCase() === 'true') {
+    return true;
+  }
+  if (value.toLowerCase() === 'false') {
+    return false;
+  }
+
+  // Return as string for everything else
+  return value;
+}
+
+/**
+   * Tokenizes a SCIM filter string into meaningful parts.
+   * e.g., 'userName eq "john"' → ['userName', 'eq', '"john"']
+   */
+function tokenize(input: string): string[] {
+  // Space out brackets, but not inside quoted strings
+  let result = '';
+  let insideQuotes = false;
+
+  for (let i = 0; i < input.length; i++) {
+    const char = input[i];
+
+    if (char === '"' && (i === 0 || input[i - 1] !== '\\')) {
+      insideQuotes = !insideQuotes;
+      result += char;
+    } else if (!insideQuotes && /[()[\]]/.test(char)) {
+      result += ` ${char} `;
+    } else {
+      result += char;
+    }
+  }
+
+  return result
+    .replace(/\s+/g, ' ') // Normalise whitespaces
+    .trim()
+    .match(/\[|]|\(|\)|[a-zA-Z0-9_.]+|"(?:[^"\\]|\\.)*"/g) || []; // Match tokens: brackets, identifiers, quoted strings
+}
+
+/** Converts the parsed SCIM AST to an equivalent MongoDB query object */
+function transformAstToMongo(node: ScimNode): any {
+  if (!node) {
+    return {};
+  }
+
+  if ('operator' in node) {
+    const operator = node.operator;
+    const conditions = flattenLogicalOperator(node, operator);
+
+    return {
+      [`$${operator}`]: conditions.map(transformAstToMongo),
+    };
+  }
+
+  if (node.type === 'array') {
+    return {
+      [node.path]: {
+        $elemMatch: transformAstToMongo(node.expr),
+      },
+    };
+  }
+
+  const { attributePath, comparator, value } = node;
+  switch (comparator) {
+    case 'aco': // ARRAY-CONTAINS (Not case sensitive)
+      return { [attributePath]: value };
+    case 'co': // CONTAINS
+      return { [attributePath]: { $options: 'i', $regex: escapeRegex(value) } };
+    case 'eq': // EQUALS
+      return { [attributePath]: { $eq: value } };
+    case 'ew': // ENDSWITH
+      return { [attributePath]: { $options: 'i', $regex: `${escapeRegex(value)}$` } };
+    case 'ge': // GREATER THAN OR EQUAL
+      return { [attributePath]: { $gte: value } };
+    case 'gt': // GREATER THAN
+      return { [attributePath]: { $gt: value } };
+    case 'le': // LESS THAN OR EQUAL
+      return { [attributePath]: { $lte: value } };
+    case 'lt': // LESS THAN
+      return { [attributePath]: { $lt: value } };
+    case 'pr': // PRESENT (exists)
+      return { [attributePath]: { $exists: true } };
+    case 'sw': // STARTSWITH
+      return { [attributePath]: { $options: 'i', $regex: `^${escapeRegex(value)}` } };
+    default:
+      throw new Error(`Unsupported comparator: ${comparator}`);
+  }
+}
+
+/*
+================ EXAMPLES ================
+
+Simple condition:
+  SCIM: 'userName eq "Joe"'
+  → Tokens: ['userName', 'eq', '"Joe"']
+  → AST: { attributePath: 'userName', comparator: 'eq', value: 'Joe' }
+  → Mongo: { userName: { $eq: 'Joe' } }
+
+Logical combination:
+  SCIM: 'userName eq "Joe" and drinksCoffee eq true'
+  → Tokens: ['userName', 'eq', '"Joe"', 'and', 'drinksCoffee', 'eq', 'true']
+  → AST:
+    {
+      operator: 'and',
+      left: { attributePath: 'userName', comparator: 'eq', value: 'Joe' },
+      right: { attributePath: 'drinksCoffee', comparator: 'eq', value: 'true' }
+    }
+  → Mongo:
+    {
+      $and: [
+        { userName: { $eq: 'Joe' } },
+        { drinksCoffee: { $eq: 'true' } }
+      ]
+    }
+
+Array filter:
+  SCIM: 'emails[type eq "work"]'
+  → Tokens: ['emails', '[', 'type', 'eq', '"work"', ']']
+  → AST:
+    {
+      type: 'array',
+      path: 'emails',
+      expr: { attributePath: 'type', comparator: 'eq', value: 'work' }
+    }
+  → Mongo:
+    {
+      emails: {
+        $elemMatch: { type: { $eq: 'work' } }
+      }
+    }
+
+*/

package/src/core/common/interfaces/scim-array-filter-node.interface.ts

@@ -0,0 +1,8 @@
+import { ScimNode } from '../types/scim-node.type';
+
+/** Represents a SCIM array filter node, e.g. emails[type eq "work"] */
+export interface ArrayFilterNode {
+  expr: ScimNode;
+  path: string;
+  type: 'array';
+}

package/src/core/common/interfaces/scim-condition-node.interface.ts

@@ -0,0 +1,9 @@
+import { Comparator } from '../types/scim-comparator.type';
+
+/** Represents a single SCIM condition such as userName eq "Joe" */
+export interface ConditionNode {
+  attributePath: string;
+  comparator: Comparator;
+  type: 'condition';
+  value?: string;
+}

package/src/core/common/interfaces/scim-logical-node.interface.ts

@@ -0,0 +1,9 @@
+import { LogicalOperator } from '../types/scim-logical-operator.type';
+import { ScimNode } from '../types/scim-node.type';
+
+/** Represents a logical operator node (e.g., X and Y, A or B) */
+export interface LogicalNode {
+  left: ScimNode;
+  operator: LogicalOperator;
+  right: ScimNode;
+}

package/src/core/common/types/scim-comparator.type.ts

@@ -0,0 +1,2 @@
+/** Supported SCIM comparison operators */
+export type Comparator = 'aco' | 'co' | 'eq' | 'ew' | 'ge' | 'gt' | 'le' | 'lt' | 'pr' | 'sw';

package/src/core/common/types/scim-logical-operator.type.ts

@@ -0,0 +1 @@
+export type LogicalOperator = 'and' | 'or';

package/src/core/common/types/scim-node.type.ts

@@ -0,0 +1,6 @@
+import { ArrayFilterNode } from '../interfaces/scim-array-filter-node.interface';
+import { ConditionNode } from '../interfaces/scim-condition-node.interface';
+import { LogicalNode } from '../interfaces/scim-logical-node.interface';
+
+/** Union type representing any valid SCIM node */
+export type ScimNode = ArrayFilterNode | ConditionNode | LogicalNode;

package/src/index.ts

@@ -36,6 +36,7 @@ export * from './core/common/helpers/filter.helper';
 export * from './core/common/helpers/graphql.helper';
 export * from './core/common/helpers/input.helper';
 export * from './core/common/helpers/model.helper';
+export * from './core/common/helpers/scim.helper';
 export * from './core/common/helpers/service.helper';
 export * from './core/common/helpers/table.helper';
 export * from './core/common/inputs/combined-filter.input';