refactor: merge with main

packages/_example/CHANGELOG.md

@@ -1,3 +1,14 @@
+## example [1.13.3](https://github.com/ForestAdmin/agent-nodejs/compare/example@1.13.2...example@1.13.3) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/agent:** upgraded to 1.58.2
+* **@forestadmin/datasource-dummy:** upgraded to 1.1.48
+
 ## example [1.13.2](https://github.com/ForestAdmin/agent-nodejs/compare/example@1.13.1...example@1.13.2) (2025-01-23)
 
 

packages/_example/package.json

@@ -1,12 +1,12 @@
 {
   "name": "example",
-  "version": "1.13.2",
+  "version": "1.13.3",
   "license": "GPL-V3",
   "private": true,
   "dependencies": {
     "@faker-js/faker": "^7.6.0",
-    "@forestadmin/agent": "1.58.1",
-    "@forestadmin/datasource-dummy": "1.1.47",
+    "@forestadmin/agent": "1.58.2",
+    "@forestadmin/datasource-dummy": "1.1.48",
     "@forestadmin/datasource-mongo": "1.4.1",
     "@forestadmin/datasource-mongoose": "1.9.0",
     "@forestadmin/datasource-sequelize": "1.11.5",

packages/agent/CHANGELOG.md

@@ -1,3 +1,18 @@
+## @forestadmin/agent [1.58.2](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.58.1...@forestadmin/agent@1.58.2) (2025-01-24)
+
+
+### Bug Fixes
+
+* do not override view default sorting ordrer ([#1245](https://github.com/ForestAdmin/agent-nodejs/issues/1245)) ([8e27769](https://github.com/ForestAdmin/agent-nodejs/commit/8e2776925b6999c967c050c23cc7d63d76c87228))
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/agent [1.58.1](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.58.0...@forestadmin/agent@1.58.1) (2025-01-23)
 
 

packages/agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/agent",
-  "version": "1.58.1",
+  "version": "1.58.2",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@fast-csv/format": "^4.3.5",
     "@fastify/express": "^1.1.0",
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@forestadmin/datasource-toolkit": "1.47.0",
     "@forestadmin/forestadmin-client": "1.36.4",
     "@koa/cors": "^5.0.0",

packages/datasource-customizer/CHANGELOG.md

@@ -1,3 +1,10 @@
+## @forestadmin/datasource-customizer [1.61.1](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-customizer@1.61.0...@forestadmin/datasource-customizer@1.61.1) (2025-01-24)
+
+
+### Bug Fixes
+
+* **lazy join:** do not remove foreignkey when they are asking ([#1246](https://github.com/ForestAdmin/agent-nodejs/issues/1246)) ([621b243](https://github.com/ForestAdmin/agent-nodejs/commit/621b2434900f565e37fbd982dae6e82664797c37))
+
 # @forestadmin/datasource-customizer [1.61.0](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-customizer@1.60.0...@forestadmin/datasource-customizer@1.61.0) (2025-01-23)
 
 

packages/datasource-customizer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-customizer",
-  "version": "1.61.0",
+  "version": "1.61.1",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {

packages/datasource-customizer/src/decorators/lazy-join/collection.ts

@@ -28,7 +28,7 @@ export default class LazyJoinDecorator extends CollectionDecorator {
           record[relationName] = { [foreignKeyTarget]: record[foreignKey] };
         }
 
-        delete record[foreignKey];
+        if (!projection.includes(foreignKey)) delete record[foreignKey];
       });
     });
 

packages/datasource-customizer/test/decorators/lazy-join/collection.test.ts

@@ -44,10 +44,12 @@ describe('LazyJoinDecorator', () => {
           id: factories.columnSchema.uuidPrimaryKey().build(),
           description: factories.columnSchema.build(),
           amountInEur: factories.columnSchema.build(),
+          card_id: factories.columnSchema.uuidPrimaryKey().build(),
           card: factories.manyToOneSchema.build({
             foreignCollection: 'cards',
             foreignKey: 'card_id',
           }),
+          user_id: factories.columnSchema.uuidPrimaryKey().build(),
           user: factories.manyToOneSchema.build({
             foreignCollection: 'users',
             foreignKey: 'user_id',
@@ -207,6 +209,25 @@ describe('LazyJoinDecorator', () => {
       expect(spy).toHaveBeenCalledWith(caller, filter, new Projection('id', 'card_id'));
       expect(records).toStrictEqual([{ id: 1 }]);
     });
+
+    describe('when projection ask for foreign key and relation', () => {
+      test('it should not remove the key from the record', async () => {
+        const spy = jest.spyOn(transactions, 'list');
+        spy.mockResolvedValue([{ id: 1, card_id: 2 }]);
+
+        const caller = factories.caller.build();
+        const filter = factories.filter.build();
+
+        const records = await decoratedTransactions.list(
+          caller,
+          filter,
+          new Projection('id', 'card:id', 'card_id'),
+        );
+
+        expect(spy).toHaveBeenCalledWith(caller, filter, new Projection('id', 'card_id'));
+        expect(records).toStrictEqual([{ id: 1, card: { id: 2 }, card_id: 2 }]);
+      });
+    });
   });
 
   describe('aggregate', () => {

packages/datasource-dummy/CHANGELOG.md

@@ -1,3 +1,13 @@
+## @forestadmin/datasource-dummy [1.1.48](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-dummy@1.1.47...@forestadmin/datasource-dummy@1.1.48) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/datasource-dummy [1.1.47](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-dummy@1.1.46...@forestadmin/datasource-dummy@1.1.47) (2025-01-23)
 
 

packages/datasource-dummy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-dummy",
-  "version": "1.1.47",
+  "version": "1.1.48",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -12,7 +12,7 @@
     "directory": "packages/datasource-dummy"
   },
   "dependencies": {
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@forestadmin/datasource-toolkit": "1.47.0"
   },
   "files": [

packages/datasource-replica/CHANGELOG.md

@@ -1,3 +1,13 @@
+## @forestadmin/datasource-replica [1.5.13](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-replica@1.5.12...@forestadmin/datasource-replica@1.5.13) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/datasource-replica [1.5.12](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-replica@1.5.11...@forestadmin/datasource-replica@1.5.12) (2025-01-23)
 
 

packages/datasource-replica/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-replica",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -23,7 +23,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@forestadmin/datasource-sequelize": "1.11.5",
     "@forestadmin/datasource-sql": "1.16.5",
     "@forestadmin/datasource-toolkit": "1.47.0",

packages/forest-cloud/CHANGELOG.md

@@ -1,3 +1,14 @@
+## @forestadmin/forest-cloud [1.12.21](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/forest-cloud@1.12.20...@forestadmin/forest-cloud@1.12.21) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/agent:** upgraded to 1.58.2
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/forest-cloud [1.12.20](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/forest-cloud@1.12.19...@forestadmin/forest-cloud@1.12.20) (2025-01-23)
 
 

packages/forest-cloud/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@forestadmin/forest-cloud",
-  "version": "1.12.20",
+  "version": "1.12.21",
   "description": "Utility to bootstrap and publish forest admin cloud projects customization",
   "dependencies": {
-    "@forestadmin/agent": "1.58.1",
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/agent": "1.58.2",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@forestadmin/datasource-mongo": "1.4.1",
     "@forestadmin/datasource-mongoose": "1.9.0",
     "@forestadmin/datasource-sequelize": "1.11.5",

packages/plugin-aws-s3/CHANGELOG.md

@@ -1,3 +1,13 @@
+## @forestadmin/plugin-aws-s3 [1.4.16](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/plugin-aws-s3@1.4.15...@forestadmin/plugin-aws-s3@1.4.16) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/plugin-aws-s3 [1.4.15](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/plugin-aws-s3@1.4.14...@forestadmin/plugin-aws-s3@1.4.15) (2025-01-23)
 
 

packages/plugin-aws-s3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/plugin-aws-s3",
-  "version": "1.4.15",
+  "version": "1.4.16",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -17,7 +17,7 @@
     "@forestadmin/datasource-toolkit": "1.47.0"
   },
   "devDependencies": {
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@forestadmin/datasource-toolkit": "1.47.0"
   },
   "files": [

packages/plugin-export-advanced/CHANGELOG.md

@@ -1,3 +1,13 @@
+## @forestadmin/plugin-export-advanced [1.1.22](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/plugin-export-advanced@1.1.21...@forestadmin/plugin-export-advanced@1.1.22) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/plugin-export-advanced [1.1.21](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/plugin-export-advanced@1.1.20...@forestadmin/plugin-export-advanced@1.1.21) (2025-01-23)
 
 

packages/plugin-export-advanced/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/plugin-export-advanced",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -15,7 +15,7 @@
     "excel4node": "^1.8.0"
   },
   "devDependencies": {
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@forestadmin/datasource-toolkit": "1.47.0"
   },
   "files": [

packages/plugin-flattener/CHANGELOG.md

@@ -1,3 +1,13 @@
+## @forestadmin/plugin-flattener [1.4.6](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/plugin-flattener@1.4.5...@forestadmin/plugin-flattener@1.4.6) (2025-01-24)
+
+
+
+
+
+### Dependencies
+
+* **@forestadmin/datasource-customizer:** upgraded to 1.61.1
+
 ## @forestadmin/plugin-flattener [1.4.5](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/plugin-flattener@1.4.4...@forestadmin/plugin-flattener@1.4.5) (2025-01-23)
 
 

packages/plugin-flattener/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/plugin-flattener",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "A plugin that allows to flatten columns and relations in Forest Admin",
   "main": "dist/index.js",
   "license": "GPL-3.0",
@@ -24,7 +24,7 @@
     "test": "jest"
   },
   "devDependencies": {
-    "@forestadmin/datasource-customizer": "1.61.0",
+    "@forestadmin/datasource-customizer": "1.61.1",
     "@types/object-hash": "^3.0.2"
   },
   "dependencies": {