@ts-awesome/orm 1.9.0-rc.0 → 1.9.0-rc.1

package/dist/interfaces.d.ts

@@ -86,7 +86,7 @@ export type HavingBuilder<T> = (model: Queryable<T>) => IOperandable<boolean> |
 export type ValuesBuilder<T> = (model: Queryable<T>) => Values<T>;
 export type JoinBuilder<T, X> = (root: Queryable<T>, other: Queryable<X>) => IOperandable<boolean> | boolean;
 export type OrderBuilder<T> = (x: Columns<T>) => (Column<T> | Order | IOperandable<any>)[];
-export type GroupByBuilder<T> = (x: Columns<T>) => (Column<T> | number)[];
+export type GroupByBuilder<T> = (x: Columns<T>) => (Column<T> | number | IOperandable<any>)[];
 export type ColumnsBuilder<T> = (x: Queryable<T>) => (Column<T> | IOperandable<any>)[];
 export type Column<T> = keyof T;
 export type Columns<T> = {

package/jest.config.js

@@ -5,4 +5,4 @@ module.exports = {
     transform: {
         "^.+\\.(ts|tsx)$": "ts-jest"
     },
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-awesome/orm",
-  "version": "1.9.0-rc.0",
+  "version": "1.9.0-rc.1",
   "description": "TypeScript friendly minimalistic ORM",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,7 +12,7 @@
     "build:dev": "tsc --project tsconfig.json",
     "build": "npm run build:dev ; cp src/wrappers* dist/",
     "lint": "eslint \"src/**/*.ts\"",
-    "test": "jest"
+    "test": "mkdir dist-tests; mkdir dist-tests/dist; cp dist/* dist-tests/dist/; jest"
   },
   "devDependencies": {
     "@types/jest": "^29.5.1",

package/tests/builder.spec.ts

@@ -331,6 +331,21 @@ describe('Select', () => {
     expect(queryThroughBuilder._groupBy).toStrictEqual(expectation);
   });
 
+  it('Group by function', () => {
+    function test(x: IOperandable<string> | string) : IOperandable<string> {
+      return new FunctionCall('test', [x]);
+    }
+    const queryThroughBuilder = Select(Person).groupBy(x => [test(x.name)]);
+    const expectation = [{
+      _args: [
+        {_column: {name: "name", "table": "Person"}}
+      ],
+      _func: "test"
+    }];
+
+    expect(queryThroughBuilder._groupBy).toStrictEqual(expectation);
+  });
+
   it('Order By', () => {
     const orderByThroughList = Select(Person).orderBy(['city']);
     const defaultOrder = Select(Person).orderBy(({city}) => [city]);