Merge remote-tracking branch 'origin/main'

* origin/main:
  Add compute to query builder

projects/angular-odata/src/lib/resources/query/builder.ts

@@ -117,6 +117,7 @@ export type QueryOptions<T> = ExpandOptions<T> & {
   search: string;
   apply: string;
   transform: { [name: string]: any } | { [name: string]: any }[];
+  compute: string; 
   skip: number;
   skiptoken: string;
   key: string | number | { [name: string]: any };
@@ -139,6 +140,7 @@ export default function <T>({
   skip,
   filter,
   transform,
+  compute,
   orderBy,
   key,
   count,
@@ -157,6 +159,7 @@ export default function <T>({
     skip,
     filter,
     transform,
+    compute,
     orderBy,
     key,
     count,
@@ -180,6 +183,7 @@ export function buildPathAndQuery<T>({
   filter,
   apply,
   transform,
+  compute,
   orderBy,
   key,
   count,
@@ -208,6 +212,15 @@ export function buildPathAndQuery<T>({
         : select;
   }
 
+  // Compute
+  if (compute) {
+    query.$compute = isRawType(compute) ? 
+      (compute as unknown as QueryCustomType).value
+      : Array.isArray(compute)
+        ? compute.join(',')
+        : compute;
+  }
+
   // Search
   if (search) {
     query.$search = search;

projects/angular-odata/src/lib/resources/query/expressions/compute.ts

@@ -75,7 +75,7 @@ export class ComputeExpression<T> extends Expression<T> {
     parser?: Parser<T>;
     options?: ParserOptions;
   } = {}): string {
-    let children = this._children.map((n) =>
+    const children = this._children.map((n) =>
       n.render({ aliases, escape, prefix, parser, options }),
     );
     return this.names

projects/angular-odata/src/lib/resources/query/expressions/expand.ts

@@ -2,6 +2,7 @@ import { Parser, ParserOptions, QueryOption } from '../../../types';
 import { Objects, Types } from '../../../utils';
 import { QueryCustomType, Unpacked } from '../builder';
 import { Expression } from './base';
+import { ComputeExpression, ComputeExpressionBuilder } from './compute';
 import { FilterExpression, FilterExpressionBuilder } from './filter';
 import { OrderByExpression, OrderByExpressionBuilder } from './orderby';
 import { SearchExpression, SearchExpressionBuilder } from './search';
@@ -50,6 +51,7 @@ export class ExpandField<T> implements Renderable {
       QueryOption.filter,
       QueryOption.search,
       QueryOption.orderBy,
+      QueryOption.compute,
       QueryOption.skip,
       QueryOption.top,
       QueryOption.count,
@@ -155,6 +157,18 @@ export class ExpandField<T> implements Renderable {
     );
   }
 
+  compute(
+    opts: (
+      builder: ComputeExpressionBuilder<T>,
+      current?: ComputeExpression<T>,
+    ) => ComputeExpression<T>,
+  ) {
+    return this.option(
+      QueryOption.compute,
+      ComputeExpression.factory<T>(opts, this.values[QueryOption.compute]),
+    );
+  }
+
   skip(n: number) {
     return this.option<number>(QueryOption.skip, n);
   }

projects/angular-odata/src/lib/resources/query/expressions/select.ts

@@ -60,7 +60,7 @@ export class SelectExpression<T> extends Expression<T> {
     options?: ParserOptions;
   } = {}): string {
     return this._children
-      .map((n) => n.render({ aliases, escape, prefix, parser, options }))
+      .map((n) => typeof n === 'string' ? n : n.render({ aliases, escape, prefix, parser, options }))
       .join(',');
   }