@forestadmin/agent 1.0.0-beta.24 → 1.0.0-beta.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,3 +1,32 @@
1
+ # @forestadmin/agent [1.0.0-beta.27](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.26...@forestadmin/agent@1.0.0-beta.27) (2022-05-17)
2
+
3
+
4
+ ### Features
5
+
6
+ * add support for standalone mode ([#304](https://github.com/ForestAdmin/agent-nodejs/issues/304)) ([c2bca75](https://github.com/ForestAdmin/agent-nodejs/commit/c2bca75a882c1591ad7560583ba0c56fb8020e12))
7
+
8
+ # @forestadmin/agent [1.0.0-beta.26](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.25...@forestadmin/agent@1.0.0-beta.26) (2022-05-16)
9
+
10
+
11
+ ### Features
12
+
13
+ * autocomplete on field names ([#263](https://github.com/ForestAdmin/agent-nodejs/issues/263)) ([e2025d5](https://github.com/ForestAdmin/agent-nodejs/commit/e2025d57d930edf6d326bd0c6d7fffcd4aad728d))
14
+
15
+
16
+
17
+
18
+
19
+ ### Dependencies
20
+
21
+ * **@forestadmin/datasource-toolkit:** upgraded to 1.0.0-beta.16
22
+
23
+ # @forestadmin/agent [1.0.0-beta.25](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.24...@forestadmin/agent@1.0.0-beta.25) (2022-05-16)
24
+
25
+
26
+ ### Features
27
+
28
+ * **builder:** create one method per relation type in the collection customizer ([#302](https://github.com/ForestAdmin/agent-nodejs/issues/302)) ([df5438d](https://github.com/ForestAdmin/agent-nodejs/commit/df5438d641bd8c4f8ad7c114120189d9dda26c44))
29
+
1
30
  # @forestadmin/agent [1.0.0-beta.24](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.23...@forestadmin/agent@1.0.0-beta.24) (2022-05-16)
2
31
 
3
32
 
@@ -1,34 +1,12 @@
1
- /// <reference types="node" />
1
+ /// <reference types="koa__router" />
2
2
  import { DataSource } from '@forestadmin/datasource-toolkit';
3
- import { IncomingMessage, ServerResponse } from 'http';
4
- import { AgentOptions } from '../types';
3
+ import Router from '@koa/router';
5
4
  import { AgentOptionsWithDefaults } from './types';
6
- import BaseRoute from './routes/base-route';
7
- import { ForestAdminHttpDriverServices } from './services';
8
- /** Native Node.js callback that can be passed to an HTTP Server */
9
- export declare type HttpCallback = (req: IncomingMessage, res: ServerResponse) => void;
10
5
  export default class ForestAdminHttpDriver {
11
6
  readonly dataSource: DataSource;
12
7
  readonly options: AgentOptionsWithDefaults;
13
- readonly services: ForestAdminHttpDriverServices;
14
- routes: BaseRoute[];
15
- private readonly app;
16
- private status;
17
- /**
18
- * Native request handler.
19
- * Can be used directly with express.js or the Node.js http module.
20
- * Other frameworks will require adapters.
21
- */
22
- get handler(): HttpCallback;
23
- constructor(dataSource: DataSource, options: AgentOptions);
24
- /**
25
- * Builds the underlying application from the datasource.
26
- * This method can only be called once.
27
- */
28
- start(): Promise<void>;
29
- /**
30
- * Tear down all routes (close open sockets, ...)
31
- */
32
- stop(): Promise<void>;
8
+ constructor(dataSource: DataSource, options: AgentOptionsWithDefaults);
9
+ getRouter(): Promise<Router>;
10
+ sendSchema(): Promise<void>;
33
11
  }
34
12
  //# sourceMappingURL=forestadmin-http-driver.d.ts.map
@@ -3,81 +3,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const koa_1 = __importDefault(require("koa"));
7
6
  const router_1 = __importDefault(require("@koa/router"));
8
7
  const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
9
8
  const cors_1 = __importDefault(require("@koa/cors"));
10
- const path_1 = __importDefault(require("path"));
11
9
  const forest_http_api_1 = __importDefault(require("./utils/forest-http-api"));
12
- const http_driver_options_1 = __importDefault(require("./utils/http-driver-options"));
13
10
  const emitter_1 = __importDefault(require("./utils/forest-schema/emitter"));
14
11
  const routes_1 = __importDefault(require("./routes"));
15
12
  const services_1 = __importDefault(require("./services"));
16
13
  class ForestAdminHttpDriver {
17
14
  constructor(dataSource, options) {
18
- this.routes = [];
19
- this.app = new koa_1.default();
20
- this.status = 'waiting';
21
15
  this.dataSource = dataSource;
22
- this.options = http_driver_options_1.default.withDefaults(options);
23
- this.services = (0, services_1.default)(this.options);
24
- http_driver_options_1.default.validate(this.options);
16
+ this.options = options;
25
17
  }
26
- /**
27
- * Native request handler.
28
- * Can be used directly with express.js or the Node.js http module.
29
- * Other frameworks will require adapters.
30
- */
31
- get handler() {
32
- return this.app.callback();
18
+ async getRouter() {
19
+ // Bootstrap app
20
+ const services = (0, services_1.default)(this.options);
21
+ const routes = (0, routes_1.default)(this.dataSource, this.options, services);
22
+ await Promise.all(routes.map(route => route.bootstrap()));
23
+ // Build router
24
+ const router = new router_1.default();
25
+ router.all('(.*)', (0, cors_1.default)({ credentials: true, maxAge: 24 * 3600, privateNetworkAccess: true }));
26
+ router.use((0, koa_bodyparser_1.default)({ jsonLimit: '50mb' }));
27
+ routes.forEach(route => route.setupRoutes(router));
28
+ return router;
33
29
  }
34
- /**
35
- * Builds the underlying application from the datasource.
36
- * This method can only be called once.
37
- */
38
- async start() {
39
- if (this.status !== 'waiting') {
40
- throw new Error('Agent cannot be restarted.');
30
+ async sendSchema() {
31
+ const schema = await emitter_1.default.getSerializedSchema(this.options, this.dataSource);
32
+ const schemaIsKnown = await forest_http_api_1.default.hasSchema(this.options, schema.meta.schemaFileHash);
33
+ if (!schemaIsKnown) {
34
+ this.options.logger('Info', 'Schema was updated, sending new version');
35
+ await forest_http_api_1.default.uploadSchema(this.options, schema);
41
36
  }
42
- try {
43
- this.status = 'running';
44
- // Build http application
45
- const router = new router_1.default({ prefix: path_1.default.join('/', this.options.prefix) });
46
- this.routes = (0, routes_1.default)(this.dataSource, this.options, this.services);
47
- this.routes.forEach(route => route.setupRoutes(router));
48
- await Promise.all(this.routes.map(route => route.bootstrap()));
49
- this.app
50
- .use((0, cors_1.default)({ credentials: true, maxAge: 24 * 3600, privateNetworkAccess: true }))
51
- .use((0, koa_bodyparser_1.default)({ jsonLimit: '50mb' }))
52
- .use(router.routes());
53
- // Send schema to forestadmin-server (if relevant).
54
- const schema = await emitter_1.default.getSerializedSchema(this.options, this.dataSource);
55
- const schemaIsKnown = await forest_http_api_1.default.hasSchema(this.options, schema.meta.schemaFileHash);
56
- if (!schemaIsKnown) {
57
- this.options.logger('Info', 'Schema was updated, sending new version');
58
- await forest_http_api_1.default.uploadSchema(this.options, schema);
59
- }
60
- else {
61
- this.options.logger('Info', 'Schema was not updated since last run');
62
- }
63
- this.options.logger('Info', 'Started');
37
+ else {
38
+ this.options.logger('Info', 'Schema was not updated since last run');
64
39
  }
65
- catch (e) {
66
- this.options.logger('Error', e.message);
67
- this.status = 'done';
68
- throw e;
69
- }
70
- }
71
- /**
72
- * Tear down all routes (close open sockets, ...)
73
- */
74
- async stop() {
75
- if (this.status !== 'running') {
76
- throw new Error('Agent is not running.');
77
- }
78
- this.status = 'done';
79
- await Promise.all(this.routes.map(route => route.tearDown()));
80
40
  }
81
41
  }
82
42
  exports.default = ForestAdminHttpDriver;
83
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWdlbnQvZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSw4Q0FBc0I7QUFDdEIseURBQWlDO0FBQ2pDLG9FQUF3QztBQUN4QyxxREFBNkI7QUFDN0IsZ0RBQXdCO0FBS3hCLDhFQUFvRDtBQUNwRCxzRkFBdUQ7QUFDdkQsNEVBQTBEO0FBQzFELHNEQUFrQztBQUNsQywwREFBeUU7QUFLekUsTUFBcUIscUJBQXFCO0lBa0J4QyxZQUFZLFVBQXNCLEVBQUUsT0FBcUI7UUFkbEQsV0FBTSxHQUFnQixFQUFFLENBQUM7UUFFZixRQUFHLEdBQUcsSUFBSSxhQUFHLEVBQUUsQ0FBQztRQUN6QixXQUFNLEdBQW1DLFNBQVMsQ0FBQztRQVl6RCxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsT0FBTyxHQUFHLDZCQUFZLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBQSxrQkFBWSxFQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUUzQyw2QkFBWSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQWZEOzs7O09BSUc7SUFDSCxJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDN0IsQ0FBQztJQVVEOzs7T0FHRztJQUNILEtBQUssQ0FBQyxLQUFLO1FBQ1QsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLFNBQVMsRUFBRTtZQUM3QixNQUFNLElBQUksS0FBSyxDQUFDLDRCQUE0QixDQUFDLENBQUM7U0FDL0M7UUFFRCxJQUFJO1lBQ0YsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUM7WUFFeEIs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
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWdlbnQvZm9yZXN0YWRtaW4taHR0cC1kcml2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFDQSx5REFBaUM7QUFDakMsb0VBQXdDO0FBQ3hDLHFEQUE2QjtBQUc3Qiw4RUFBb0Q7QUFDcEQsNEVBQTBEO0FBQzFELHNEQUFrQztBQUNsQywwREFBc0M7QUFFdEMsTUFBcUIscUJBQXFCO0lBSXhDLFlBQVksVUFBc0IsRUFBRSxPQUFpQztRQUNuRSxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztJQUN6QixDQUFDO0lBRUQsS0FBSyxDQUFDLFNBQVM7UUFDYixnQkFBZ0I7UUFDaEIsTUFBTSxRQUFRLEdBQUcsSUFBQSxrQkFBWSxFQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1QyxNQUFNLE1BQU0sR0FBRyxJQUFBLGdCQUFVLEVBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ25FLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUUxRCxlQUFlO1FBQ2YsTUFBTSxNQUFNLEdBQUcsSUFBSSxnQkFBTSxFQUFFLENBQUM7UUFDNUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsSUFBQSxjQUFJLEVBQUMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxFQUFFLEdBQUcsSUFBSSxFQUFFLG9CQUFvQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUMvRixNQUFNLENBQUMsR0FBRyxDQUFDLElBQUEsd0JBQVUsRUFBQyxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDOUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUVuRCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0lBRUQsS0FBSyxDQUFDLFVBQVU7UUFDZCxNQUFNLE1BQU0sR0FBRyxNQUFNLGlCQUFhLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDdEYsTUFBTSxhQUFhLEdBQUcsTUFBTSx5QkFBYSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7UUFFOUYsSUFBSSxDQUFDLGFBQWEsRUFBRTtZQUNsQixJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUseUNBQXlDLENBQUMsQ0FBQztZQUN2RSxNQUFNLHlCQUFhLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7U0FDeEQ7YUFBTTtZQUNMLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSx1Q0FBdUMsQ0FBQyxDQUFDO1NBQ3RFO0lBQ0gsQ0FBQztDQUNGO0FBbkNELHdDQW1DQyJ9
@@ -8,7 +8,6 @@ export default abstract class BaseRoute {
8
8
  abstract get type(): RouteType;
9
9
  constructor(services: ForestAdminHttpDriverServices, options: AgentOptionsWithDefaults);
10
10
  bootstrap(): Promise<void>;
11
- tearDown(): Promise<void>;
12
11
  abstract setupRoutes(router: Router): void;
13
12
  }
14
13
  //# sourceMappingURL=base-route.d.ts.map
@@ -8,9 +8,6 @@ class BaseRoute {
8
8
  async bootstrap() {
9
9
  // Do nothing by default
10
10
  }
11
- async tearDown() {
12
- // Do nothing by default
13
- }
14
11
  }
15
12
  exports.default = BaseRoute;
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1yb3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hZ2VudC9yb3V0ZXMvYmFzZS1yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLE1BQThCLFNBQVM7SUFNckMsWUFBWSxRQUF1QyxFQUFFLE9BQWlDO1FBQ3BGLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUztRQUNiLHdCQUF3QjtJQUMxQixDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVE7UUFDWix3QkFBd0I7SUFDMUIsQ0FBQztDQUdGO0FBcEJELDRCQW9CQyJ9
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1yb3V0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hZ2VudC9yb3V0ZXMvYmFzZS1yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUtBLE1BQThCLFNBQVM7SUFNckMsWUFBWSxRQUF1QyxFQUFFLE9BQWlDO1FBQ3BGLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUztRQUNiLHdCQUF3QjtJQUMxQixDQUFDO0NBR0Y7QUFoQkQsNEJBZ0JDIn0=
@@ -1,7 +1,6 @@
1
- import { ChartDefinition, DataSourceFactory } from '@forestadmin/datasource-toolkit';
1
+ import { ChartDefinition, DataSourceFactory, TCollectionName, TSchema } from '@forestadmin/datasource-toolkit';
2
2
  import { AgentOptions } from '../types';
3
3
  import CollectionBuilder from './collection';
4
- import { HttpCallback } from '../agent/forestadmin-http-driver';
5
4
  /**
6
5
  * Allow to create a new Forest Admin agent from scratch.
7
6
  * Builds the application by composing and configuring all the collection decorators.
@@ -12,19 +11,13 @@ import { HttpCallback } from '../agent/forestadmin-http-driver';
12
11
  * .addDataSource(new SomeDataSource())
13
12
  * .start();
14
13
  */
15
- export default class AgentBuilder {
16
- private readonly forestAdminHttpDriver;
14
+ export default class AgentBuilder<S extends TSchema = TSchema> {
17
15
  private readonly compositeDataSource;
18
16
  private readonly stack;
19
- private tasks;
20
- /**
21
- * Native nodejs HttpCallback object
22
- * @example
23
- * import http from 'http';
24
- * ...
25
- * const server = http.createServer(agent.httpCallback);
26
- */
27
- get httpCallback(): HttpCallback;
17
+ private readonly options;
18
+ private customizations;
19
+ private mounts;
20
+ private termination;
28
21
  /**
29
22
  * Create a new Agent Builder.
30
23
  * If any options are missing, the default will be applied:
@@ -60,7 +53,7 @@ export default class AgentBuilder {
60
53
  * }
61
54
  * })
62
55
  */
63
- addChart(name: string, definition: ChartDefinition): this;
56
+ addChart(name: string, definition: ChartDefinition<S>): this;
64
57
  /**
65
58
  * Allow to interact with a decorated collection
66
59
  * @param name the name of the collection to manipulate
@@ -69,14 +62,17 @@ export default class AgentBuilder {
69
62
  * @example
70
63
  * .customizeCollection('books', books => books.renameField('xx', 'yy'))
71
64
  */
72
- customizeCollection(name: string, handle: (collection: CollectionBuilder) => unknown): this;
65
+ customizeCollection<N extends TCollectionName<S>>(name: N, handle: (collection: CollectionBuilder<S, N>) => unknown): this;
73
66
  /**
74
- * Start the agent.
67
+ * Expose the agent on a given port and host
68
+ * @param port port that should be used.
69
+ * @param host host that should be used.
75
70
  */
76
- start(): Promise<void>;
71
+ mountStandalone(port?: number, host?: string): this;
77
72
  /**
78
- * Stop the agent gracefully.
73
+ * Start the agent.
79
74
  */
75
+ start(): Promise<void>;
80
76
  stop(): Promise<void>;
81
77
  }
82
78
  //# sourceMappingURL=agent.d.ts.map
@@ -4,9 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
7
+ const promises_1 = require("fs/promises");
8
+ const koa_1 = __importDefault(require("koa"));
9
+ const router_1 = __importDefault(require("@koa/router"));
10
+ const http_1 = __importDefault(require("http"));
7
11
  const collection_1 = __importDefault(require("./collection"));
8
12
  const decorators_stack_1 = __importDefault(require("./decorators-stack"));
9
13
  const forestadmin_http_driver_1 = __importDefault(require("../agent/forestadmin-http-driver"));
14
+ const options_validator_1 = __importDefault(require("./utils/options-validator"));
15
+ const typing_generator_1 = __importDefault(require("./utils/typing-generator"));
10
16
  /**
11
17
  * Allow to create a new Forest Admin agent from scratch.
12
18
  * Builds the application by composing and configuring all the collection decorators.
@@ -36,28 +42,20 @@ class AgentBuilder {
36
42
  * .start();
37
43
  */
38
44
  constructor(options) {
39
- this.tasks = [];
45
+ this.customizations = [];
46
+ this.mounts = [];
47
+ this.termination = [];
48
+ this.options = options_validator_1.default.withDefaults(options);
40
49
  this.compositeDataSource = new datasource_toolkit_1.BaseDataSource();
41
50
  this.stack = new decorators_stack_1.default(this.compositeDataSource);
42
- this.forestAdminHttpDriver = new forestadmin_http_driver_1.default(this.stack.dataSource, options);
43
- }
44
- /**
45
- * Native nodejs HttpCallback object
46
- * @example
47
- * import http from 'http';
48
- * ...
49
- * const server = http.createServer(agent.httpCallback);
50
- */
51
- get httpCallback() {
52
- return this.forestAdminHttpDriver.handler;
53
51
  }
54
52
  /**
55
53
  * Add a datasource
56
54
  * @param factory the datasource to add
57
55
  */
58
56
  addDataSource(factory) {
59
- this.tasks.push(async () => {
60
- const datasource = await factory(this.forestAdminHttpDriver.options.logger);
57
+ this.customizations.push(async () => {
58
+ const datasource = await factory(this.options.logger);
61
59
  datasource.collections.forEach(collection => {
62
60
  this.compositeDataSource.addCollection(collection);
63
61
  });
@@ -77,7 +75,7 @@ class AgentBuilder {
77
75
  * })
78
76
  */
79
77
  addChart(name, definition) {
80
- this.tasks.push(async () => {
78
+ this.customizations.push(async () => {
81
79
  this.stack.chart.addChart(name, definition);
82
80
  });
83
81
  return this;
@@ -91,29 +89,58 @@ class AgentBuilder {
91
89
  * .customizeCollection('books', books => books.renameField('xx', 'yy'))
92
90
  */
93
91
  customizeCollection(name, handle) {
94
- this.tasks.push(async () => {
92
+ this.customizations.push(async () => {
95
93
  if (this.stack.dataSource.getCollection(name)) {
96
94
  handle(new collection_1.default(this.stack, name));
97
95
  }
98
96
  });
99
97
  return this;
100
98
  }
99
+ /**
100
+ * Expose the agent on a given port and host
101
+ * @param port port that should be used.
102
+ * @param host host that should be used.
103
+ */
104
+ mountStandalone(port = 3351, host = 'localhost') {
105
+ let server;
106
+ this.mounts.push(async (router) => {
107
+ const koa = new koa_1.default();
108
+ const parentRouter = new router_1.default({ prefix: '/forest' });
109
+ parentRouter.use(router.routes());
110
+ koa.use(parentRouter.routes());
111
+ server = http_1.default.createServer(koa.callback());
112
+ server.listen(port, host);
113
+ this.options.logger('Info', `Agent mounted at http://${host}:${port} (Standalone)`);
114
+ });
115
+ this.termination.push(async () => {
116
+ server.close();
117
+ });
118
+ return this;
119
+ }
101
120
  /**
102
121
  * Start the agent.
103
122
  */
104
123
  async start() {
105
- for (const task of this.tasks) {
106
- // eslint-disable-next-line no-await-in-loop
107
- await task();
124
+ // Customize agent
125
+ for (const task of this.customizations)
126
+ await task(); // eslint-disable-line no-await-in-loop
127
+ // Check that options are valid
128
+ const options = options_validator_1.default.validate(this.options);
129
+ // Write typings file
130
+ if (!options.isProduction && options.typingsPath) {
131
+ const types = typing_generator_1.default.generateTypes(this.stack.action, options.typingsMaxDepth);
132
+ await (0, promises_1.writeFile)(options.typingsPath, types, { encoding: 'utf-8' });
108
133
  }
109
- await this.forestAdminHttpDriver.start();
134
+ const httpDriver = new forestadmin_http_driver_1.default(this.stack.dataSource, options);
135
+ await httpDriver.sendSchema();
136
+ const router = await httpDriver.getRouter();
137
+ for (const task of this.mounts)
138
+ await task(router); // eslint-disable-line no-await-in-loop
110
139
  }
111
- /**
112
- * Stop the agent gracefully.
113
- */
114
140
  async stop() {
115
- return this.forestAdminHttpDriver.stop();
141
+ for (const task of this.termination)
142
+ await task(); // eslint-disable-line no-await-in-loop
116
143
  }
117
144
  }
118
145
  exports.default = AgentBuilder;
119
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVpbGRlci9hZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQUt5QztBQUd6Qyw4REFBNkM7QUFDN0MsMEVBQWlEO0FBQ2pELCtGQUF1RjtBQUV2Rjs7Ozs7Ozs7O0dBU0c7QUFDSCxNQUFxQixZQUFZO0lBaUIvQjs7Ozs7Ozs7Ozs7Ozs7OztPQWdCRztJQUNILFlBQVksT0FBcUI7UUE5QnpCLFVBQUssR0FBNEIsRUFBRSxDQUFDO1FBK0IxQyxJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxtQ0FBYyxFQUFjLENBQUM7UUFDNUQsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLDBCQUFlLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFFM0QsSUFBSSxDQUFDLHFCQUFxQixHQUFHLElBQUksaUNBQXFCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDekYsQ0FBQztJQWpDRDs7Ozs7O09BTUc7SUFDSCxJQUFJLFlBQVk7UUFDZCxPQUFPLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxPQUFPLENBQUM7SUFDNUMsQ0FBQztJQTBCRDs7O09BR0c7SUFDSCxhQUFhLENBQUMsT0FBMEI7UUFDdEMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDekIsTUFBTSxVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUM1RSxVQUFVLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtnQkFDMUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNyRCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO1FBRUgsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxRQUFRLENBQUMsSUFBWSxFQUFFLFVBQTJCO1FBQ2hELElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFO1lBQ3pCLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDOUMsQ0FBQyxDQUFDLENBQUM7UUFFSCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsbUJBQW1CLENBQUMsSUFBWSxFQUFFLE1BQWtEO1FBQ2xGLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFO1lBQ3pCLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUM3QyxNQUFNLENBQUMsSUFBSSxvQkFBaUIsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7YUFDakQ7UUFDSCxDQUFDLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFDLEtBQUs7UUFDVCxLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDN0IsNENBQTRDO1lBQzVDLE1BQU0sSUFBSSxFQUFFLENBQUM7U0FDZDtRQUVELE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxJQUFJO1FBQ1IsT0FBTyxJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDM0MsQ0FBQztDQUNGO0FBaEhELCtCQWdIQyJ9
146
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVpbGRlci9hZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQU95QztBQUN6QywwQ0FBd0M7QUFDeEMsOENBQXNCO0FBQ3RCLHlEQUFpQztBQUNqQyxnREFBd0I7QUFHeEIsOERBQTZDO0FBQzdDLDBFQUFpRDtBQUNqRCwrRkFBcUU7QUFDckUsa0ZBQXlEO0FBQ3pELGdGQUF1RDtBQUV2RDs7Ozs7Ozs7O0dBU0c7QUFDSCxNQUFxQixZQUFZO0lBUS9COzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ0gsWUFBWSxPQUFxQjtRQXJCekIsbUJBQWMsR0FBNEIsRUFBRSxDQUFDO1FBQzdDLFdBQU0sR0FBMEMsRUFBRSxDQUFDO1FBQ25ELGdCQUFXLEdBQTRCLEVBQUUsQ0FBQztRQW9CaEQsSUFBSSxDQUFDLE9BQU8sR0FBRywyQkFBZ0IsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLG1CQUFtQixHQUFHLElBQUksbUNBQWMsRUFBYyxDQUFDO1FBQzVELElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSwwQkFBZSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRDs7O09BR0c7SUFDSCxhQUFhLENBQUMsT0FBMEI7UUFDdEMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUU7WUFDbEMsTUFBTSxVQUFVLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUN0RCxVQUFVLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtnQkFDMUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLGFBQWEsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNyRCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFD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
@@ -1,7 +1,7 @@
1
- import { ActionDefinition, Operator, OperatorDefinition, PlainSortClause, RelationDefinition, SegmentDefinition, WriteDefinition } from '@forestadmin/datasource-toolkit';
1
+ import { ActionDefinition, Operator, OperatorDefinition, PlainSortClause, SegmentDefinition, TCollectionName, TColumnName, TFieldName, TSchema, WriteDefinition } from '@forestadmin/datasource-toolkit';
2
2
  import { FieldDefinition } from './types';
3
3
  import DecoratorsStack from './decorators-stack';
4
- export default class CollectionBuilder {
4
+ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TCollectionName<S> = TCollectionName<S>> {
5
5
  private readonly name;
6
6
  private readonly stack;
7
7
  constructor(stack: DecoratorsStack, name: string);
@@ -14,7 +14,7 @@ export default class CollectionBuilder {
14
14
  * .importField('authorName', { path: 'author:fullName' })
15
15
  */
16
16
  importField(name: string, options: {
17
- path: string;
17
+ path: TFieldName<S, N>;
18
18
  beforeRelations?: boolean;
19
19
  }): this;
20
20
  /**
@@ -24,14 +24,14 @@ export default class CollectionBuilder {
24
24
  * @example
25
25
  * .renameField('theCurrentNameOfTheField', 'theNewNameOfTheField');
26
26
  */
27
- renameField(oldName: string, newName: string): this;
27
+ renameField(oldName: TColumnName<S, N>, newName: string): this;
28
28
  /**
29
29
  * Remove field by setting its visibility to false.
30
30
  * @param names the fields to remove
31
31
  * @example
32
32
  * .removeField('aFieldToRemove', 'anOtherFieldToRemove');
33
33
  */
34
- removeField(...names: string[]): this;
34
+ removeField(...names: TColumnName<S, N>[]): this;
35
35
  /**
36
36
  * Add a new action on the collection.
37
37
  * @param name the name of the action
@@ -44,7 +44,7 @@ export default class CollectionBuilder {
44
44
  * },
45
45
  * })
46
46
  */
47
- addAction(name: string, definition: ActionDefinition): this;
47
+ addAction(name: string, definition: ActionDefinition<S, N>): this;
48
48
  /**
49
49
  * Add a new field on the collection.
50
50
  * @param name the name of the field
@@ -56,19 +56,61 @@ export default class CollectionBuilder {
56
56
  * getValues: (records) => records.map(record => `${record.lastName} ${record.firstName}`),
57
57
  * });
58
58
  */
59
- addField(name: string, definition: FieldDefinition): this;
59
+ addField(name: string, definition: FieldDefinition<S, N>): this;
60
60
  /**
61
- * Add a relation between two collections.
61
+ * Add a many to one relation to the collection
62
62
  * @param name name of the new relation
63
- * @param definition definition of the new relation
63
+ * @param foreignCollection name of the targeted collection
64
+ * @param options extra information about the relation
64
65
  * @example
65
- * .addRelation('author', {
66
- * type: 'ManyToOne',
67
- * foreignCollection: 'persons',
68
- * foreignKey: 'authorId'
69
- * });
66
+ * books.addManyToOne('myAuthor', 'persons', { foreignKey: 'author_id' })
67
+ */
68
+ addManyToOne<T extends TCollectionName<S>>(name: string, foreignCollection: T, options: {
69
+ foreignKey: TColumnName<S, N>;
70
+ foreignKeyTarget?: TColumnName<S, T>;
71
+ }): this;
72
+ /**
73
+ * Add a one to many relation to the collection
74
+ * @param name name of the new relation
75
+ * @param foreignCollection name of the targeted collection
76
+ * @param options extra information about the relation
77
+ * @example
78
+ * persons.addOneToMany('writtenBooks', 'books', { originKey: 'author_id' })
79
+ */
80
+ addOneToMany<T extends TCollectionName<S>>(name: string, foreignCollection: T, options: {
81
+ originKey: TColumnName<S, T>;
82
+ originKeyTarget?: TColumnName<S, N>;
83
+ }): this;
84
+ /**
85
+ * Add a one to one relation to the collection
86
+ * @param name name of the new relation
87
+ * @param foreignCollection name of the targeted collection
88
+ * @param options extra information about the relation
89
+ * @example
90
+ * persons.addOneToOne('bestFriend', 'persons', { originKey: 'best_friend_id' })
70
91
  */
71
- addRelation(name: string, definition: RelationDefinition): this;
92
+ addOneToOne<T extends TCollectionName<S>>(name: string, foreignCollection: T, options: {
93
+ originKey: TColumnName<S, T>;
94
+ originKeyTarget?: TColumnName<S, N>;
95
+ }): this;
96
+ /**
97
+ * Add a many to many relation to the collection
98
+ * @param name name of the new relation
99
+ * @param foreignCollection name of the targeted collection
100
+ * @param throughCollection name of the intermediary collection
101
+ * @param options extra information about the relation
102
+ * @example
103
+ * dvds.addManyToMany('rentalsOfThisDvd', 'rentals', 'dvd_rentals', {
104
+ * originKey: 'dvd_id',
105
+ * foreignKey: 'rental_id'
106
+ * })
107
+ */
108
+ addManyToMany<Foreign extends TCollectionName<S>, Through extends TCollectionName<S>>(name: string, foreignCollection: Foreign, throughCollection: Through, options: {
109
+ originKey: TColumnName<S, Through>;
110
+ foreignKey: TColumnName<S, Through>;
111
+ originKeyTarget?: TColumnName<S, N>;
112
+ foreignKeyTarget?: TColumnName<S, Foreign>;
113
+ }): this;
72
114
  /**
73
115
  * Add a new segment on the collection.
74
116
  * @param name the name of the segment
@@ -77,10 +119,10 @@ export default class CollectionBuilder {
77
119
  * @example
78
120
  * .addSegment(
79
121
  * 'Wrote more than 2 books',
80
- * new ConditionTreeLeaf('booksCount', 'GreaterThan', 2),
122
+ * {field: 'booksCount', operator: 'GreaterThan', value: 2}
81
123
  * );
82
124
  */
83
- addSegment(name: string, definition: SegmentDefinition): this;
125
+ addSegment(name: string, definition: SegmentDefinition<S, N>): this;
84
126
  /**
85
127
  * Enable sorting on a specific field using emulation.
86
128
  * As for all the emulation method, the field sorting will be done in-memory.
@@ -88,7 +130,7 @@ export default class CollectionBuilder {
88
130
  * @example
89
131
  * .emulateFieldSorting('fullName');
90
132
  */
91
- emulateFieldSorting(name: string): this;
133
+ emulateFieldSorting(name: TColumnName<S, N>): this;
92
134
  /**
93
135
  * Replace an implementation for the sorting.
94
136
  * The field sorting will be done by the datasource.
@@ -103,7 +145,7 @@ export default class CollectionBuilder {
103
145
  * ]
104
146
  * )
105
147
  */
106
- replaceFieldSorting(name: string, equivalentSort: PlainSortClause[]): this;
148
+ replaceFieldSorting(name: TColumnName<S, N>, equivalentSort: PlainSortClause<S, N>[]): this;
107
149
  /**
108
150
  * Enable filtering on a specific field using emulation.
109
151
  * As for all the emulation method, the field filtering will be done in-memory.
@@ -111,7 +153,7 @@ export default class CollectionBuilder {
111
153
  * @example
112
154
  * .emulateFieldFiltering('aField');
113
155
  */
114
- emulateFieldFiltering(name: string): this;
156
+ emulateFieldFiltering(name: TColumnName<S, N>): this;
115
157
  /**
116
158
  * Enable filtering on a specific field with a specific operator using emulation.
117
159
  * As for all the emulation method, the field filtering will be done in-memory.
@@ -120,7 +162,7 @@ export default class CollectionBuilder {
120
162
  * @example
121
163
  * .emulateFieldOperator('aField', 'In');
122
164
  */
123
- emulateFieldOperator(name: string, operator: Operator): this;
165
+ emulateFieldOperator(name: TColumnName<S, N>, operator: Operator): this;
124
166
  /**
125
167
  * Replace an implementation for a specific operator on a specific field.
126
168
  * The operator replacement will be done by the datasource.
@@ -132,7 +174,7 @@ export default class CollectionBuilder {
132
174
  * new ConditionTreeLeaf('booksCount', 'Equal', value),
133
175
  * ));
134
176
  */
135
- replaceFieldOperator(name: string, operator: Operator, replacer: OperatorDefinition): this;
177
+ replaceFieldOperator<C extends TColumnName<S, N>>(name: C, operator: Operator, replacer: OperatorDefinition<S, N, C>): this;
136
178
  /**
137
179
  * Replace the write behavior of a field.
138
180
  * @param name the name of the field
@@ -143,6 +185,18 @@ export default class CollectionBuilder {
143
185
  * return { firstName, lastName };
144
186
  * });
145
187
  */
146
- replaceFieldWriting(name: string, definition: WriteDefinition): this;
188
+ replaceFieldWriting<C extends TColumnName<S, N>>(name: C, definition: WriteDefinition<S, N, C>): this;
189
+ /**
190
+ * Add a relation between two collections.
191
+ * @param name name of the new relation
192
+ * @param definition definition of the new relation
193
+ * @example
194
+ * .addRelation('author', {
195
+ * type: 'ManyToOne',
196
+ * foreignCollection: 'persons',
197
+ * foreignKey: 'authorId'
198
+ * });
199
+ */
200
+ private addRelation;
147
201
  }
148
202
  //# sourceMappingURL=collection.d.ts.map
@@ -30,11 +30,13 @@ class CollectionBuilder {
30
30
  enumValues: schema.enumValues,
31
31
  });
32
32
  for (const operator of schema.filterOperators) {
33
- const handler = (value) => ({ field: options.path, operator, value });
33
+ const handler = value => ({ field: options.path, operator, value });
34
34
  this.replaceFieldOperator(name, operator, handler);
35
35
  }
36
36
  if (schema.isSortable) {
37
- this.replaceFieldSorting(name, [{ field: options.path, ascending: true }]);
37
+ this.replaceFieldSorting(name, [
38
+ { field: options.path, ascending: true },
39
+ ]);
38
40
  }
39
41
  return this;
40
42
  }
@@ -74,7 +76,10 @@ class CollectionBuilder {
74
76
  * })
75
77
  */
76
78
  addAction(name, definition) {
77
- this.stack.action.getCollection(this.name).addAction(name, definition);
79
+ this.stack.action
80
+ .getCollection(this.name)
81
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
82
+ .addAction(name, definition);
78
83
  return this;
79
84
  }
80
85
  /**
@@ -97,18 +102,78 @@ class CollectionBuilder {
97
102
  return this;
98
103
  }
99
104
  /**
100
- * Add a relation between two collections.
105
+ * Add a many to one relation to the collection
101
106
  * @param name name of the new relation
102
- * @param definition definition of the new relation
107
+ * @param foreignCollection name of the targeted collection
108
+ * @param options extra information about the relation
103
109
  * @example
104
- * .addRelation('author', {
105
- * type: 'ManyToOne',
106
- * foreignCollection: 'persons',
107
- * foreignKey: 'authorId'
108
- * });
110
+ * books.addManyToOne('myAuthor', 'persons', { foreignKey: 'author_id' })
109
111
  */
110
- addRelation(name, definition) {
111
- this.stack.relation.getCollection(this.name).addRelation(name, definition);
112
+ addManyToOne(name, foreignCollection, options) {
113
+ this.addRelation(name, {
114
+ type: 'ManyToOne',
115
+ foreignCollection,
116
+ foreignKey: options.foreignKey,
117
+ foreignKeyTarget: options.foreignKeyTarget,
118
+ });
119
+ return this;
120
+ }
121
+ /**
122
+ * Add a one to many relation to the collection
123
+ * @param name name of the new relation
124
+ * @param foreignCollection name of the targeted collection
125
+ * @param options extra information about the relation
126
+ * @example
127
+ * persons.addOneToMany('writtenBooks', 'books', { originKey: 'author_id' })
128
+ */
129
+ addOneToMany(name, foreignCollection, options) {
130
+ this.addRelation(name, {
131
+ type: 'OneToMany',
132
+ foreignCollection,
133
+ originKey: options.originKey,
134
+ originKeyTarget: options.originKeyTarget,
135
+ });
136
+ return this;
137
+ }
138
+ /**
139
+ * Add a one to one relation to the collection
140
+ * @param name name of the new relation
141
+ * @param foreignCollection name of the targeted collection
142
+ * @param options extra information about the relation
143
+ * @example
144
+ * persons.addOneToOne('bestFriend', 'persons', { originKey: 'best_friend_id' })
145
+ */
146
+ addOneToOne(name, foreignCollection, options) {
147
+ this.addRelation(name, {
148
+ type: 'OneToOne',
149
+ foreignCollection,
150
+ originKey: options.originKey,
151
+ originKeyTarget: options.originKeyTarget,
152
+ });
153
+ return this;
154
+ }
155
+ /**
156
+ * Add a many to many relation to the collection
157
+ * @param name name of the new relation
158
+ * @param foreignCollection name of the targeted collection
159
+ * @param throughCollection name of the intermediary collection
160
+ * @param options extra information about the relation
161
+ * @example
162
+ * dvds.addManyToMany('rentalsOfThisDvd', 'rentals', 'dvd_rentals', {
163
+ * originKey: 'dvd_id',
164
+ * foreignKey: 'rental_id'
165
+ * })
166
+ */
167
+ addManyToMany(name, foreignCollection, throughCollection, options) {
168
+ this.addRelation(name, {
169
+ type: 'ManyToMany',
170
+ foreignCollection,
171
+ throughCollection,
172
+ originKey: options.originKey,
173
+ originKeyTarget: options.originKeyTarget,
174
+ foreignKey: options.foreignKey,
175
+ foreignKeyTarget: options.foreignKeyTarget,
176
+ });
112
177
  return this;
113
178
  }
114
179
  /**
@@ -119,7 +184,7 @@ class CollectionBuilder {
119
184
  * @example
120
185
  * .addSegment(
121
186
  * 'Wrote more than 2 books',
122
- * new ConditionTreeLeaf('booksCount', 'GreaterThan', 2),
187
+ * {field: 'booksCount', operator: 'GreaterThan', value: 2}
123
188
  * );
124
189
  */
125
190
  addSegment(name, definition) {
@@ -152,7 +217,9 @@ class CollectionBuilder {
152
217
  * )
153
218
  */
154
219
  replaceFieldSorting(name, equivalentSort) {
155
- this.stack.sortEmulate.getCollection(this.name).replaceFieldSorting(name, equivalentSort);
220
+ this.stack.sortEmulate
221
+ .getCollection(this.name)
222
+ .replaceFieldSorting(name, equivalentSort);
156
223
  return this;
157
224
  }
158
225
  /**
@@ -219,6 +286,21 @@ class CollectionBuilder {
219
286
  this.stack.write.getCollection(this.name).replaceFieldWriting(name, definition);
220
287
  return this;
221
288
  }
289
+ /**
290
+ * Add a relation between two collections.
291
+ * @param name name of the new relation
292
+ * @param definition definition of the new relation
293
+ * @example
294
+ * .addRelation('author', {
295
+ * type: 'ManyToOne',
296
+ * foreignCollection: 'persons',
297
+ * foreignKey: 'authorId'
298
+ * });
299
+ */
300
+ addRelation(name, definition) {
301
+ this.stack.relation.getCollection(this.name).addRelation(name, definition);
302
+ return this;
303
+ }
222
304
  }
223
305
  exports.default = CollectionBuilder;
224
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZGVyL2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFXeUM7QUFHekMseUZBQThFO0FBRTlFLE1BQXFCLGlCQUFpQjtJQUlwQyxZQUFZLEtBQXNCLEVBQUUsSUFBWTtRQUM5QyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUNyQixDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILFdBQVcsQ0FBQyxJQUFZLEVBQUUsT0FBb0Q7UUFDNUUsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwRSxNQUFNLE1BQU0sR0FBRyxvQ0FBZSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBaUIsQ0FBQztRQUV4RixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRTtZQUNsQixlQUFlLEVBQUUsT0FBTyxDQUFDLGVBQWU7WUFDeEMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxVQUFVO1lBQzdCLFlBQVksRUFBRSxNQUFNLENBQUMsWUFBWTtZQUNqQyxZQUFZLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQzVCLFNBQVMsRUFBRSxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxnQ0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xGLFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVTtTQUM5QixDQUFDLENBQUM7UUFFSCxLQUFLLE1BQU0sUUFBUSxJQUFJLE1BQU0sQ0FBQyxlQUFlLEVBQUU7WUFDN0MsTUFBTSxPQUFPLEdBQUcsQ0FBQyxLQUFjLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQztZQUMvRSxJQUFJLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztTQUNwRDtRQUVELElBQUksTUFBTSxDQUFDLFVBQVUsRUFBRTtZQUNyQixJQUFJLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1NBQzVFO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsV0FBVyxDQUFDLE9BQWUsRUFBRSxPQUFlO1FBQzFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsV0FBVyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztRQUV6RSxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILFdBQVcsQ0FBQyxHQUFHLEtBQWU7UUFDNUIsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRSxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUs7WUFBRSxVQUFVLENBQUMscUJBQXFCLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRXhFLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVEOzs7Ozs7Ozs7OztPQVdHO0lBQ0gsU0FBUyxDQUFDLElBQVksRUFBRSxVQUE0QjtRQUNsRCxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFFdkUsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNILFFBQVEsQ0FBQyxJQUFZLEVBQUUsVUFBMkI7UUFDaEQsTUFBTSxFQUFFLGVBQWUsRUFBRSxHQUFHLGtCQUFrQixFQUFFLEdBQUcsVUFBVSxDQUFDO1FBQzlELE1BQU0sVUFBVSxHQUFHLFVBQVUsQ0FBQyxlQUFlO1lBQzNDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUNuRCxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVyRCxVQUFVLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLGtCQUFrQixDQUFDLENBQUM7UUFFdEQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNILFdBQVcsQ0FBQyxJQUFZLEVBQUUsVUFBOEI7UUFDdEQsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRTNFLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSCxVQUFVLENBQUMsSUFBWSxFQUFFLFVBQTZCO1FBQ3BELElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztRQUV6RSxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxtQkFBbUIsQ0FBQyxJQUFZO1FBQzlCLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFMUUsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7T0FhRztJQUNILG1CQUFtQixDQUFDLElBQVksRUFBRSxjQUFpQztRQUNqRSxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRSxjQUFjLENBQUMsQ0FBQztRQUUxRixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxxQkFBcUIsQ0FBQyxJQUFZO1FBQ2hDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckUsTUFBTSxLQUFLLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFpQixDQUFDO1FBRTdELEtBQUssTUFBTSxRQUFRLElBQUksb0JBQXVCLENBQUMsb0JBQW9CLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxFQUFFO1lBQ3JGLElBQUksQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBRTtnQkFDekMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQzthQUMzQztTQUNGO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILG9CQUFvQixDQUFDLElBQVksRUFBRSxRQUFrQjtRQUNuRCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQ3ZGLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUNwRCxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUV0RCxVQUFVLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBRWhELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSCxvQkFBb0IsQ0FBQyxJQUFZLEVBQUUsUUFBa0IsRUFBRSxRQUE0QjtRQUNqRixNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQ3ZGLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztZQUNwRCxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUV0RCxVQUFVLENBQUMsb0JBQW9CLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUUxRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDSCxtQkFBbUIsQ0FBQyxJQUFZLEVBQUUsVUFBMkI7UUFDM0QsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFFaEYsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBQ0Y7QUF6UEQsb0NBeVBDIn0=
306
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZGVyL2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFleUM7QUFHekMseUZBQThFO0FBRTlFLE1BQXFCLGlCQUFpQjtJQU9wQyxZQUFZLEtBQXNCLEVBQUUsSUFBWTtRQUM5QyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUNyQixDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILFdBQVcsQ0FBQyxJQUFZLEVBQUUsT0FBOEQ7UUFDdEYsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNwRSxNQUFNLE1BQU0sR0FBRyxvQ0FBZSxDQUFDLGNBQWMsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBaUIsQ0FBQztRQUV4RixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRTtZQUNsQixlQUFlLEVBQUUsT0FBTyxDQUFDLGVBQWU7WUFDeEMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxVQUFVO1lBQzdCLFlBQVksRUFBRSxNQUFNLENBQUMsWUFBWTtZQUNqQyxZQUFZLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO1lBQzVCLFNBQVMsRUFBRSxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxnQ0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2xGLFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVTtTQUM5QixDQUFDLENBQUM7UUFFSCxLQUFLLE1BQU0sUUFBUSxJQUFJLE1BQU0sQ0FBQyxlQUFlLEVBQUU7WUFDN0MsTUFBTSxPQUFP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
@@ -1,5 +1,5 @@
1
- import { ComputedDefinition } from '@forestadmin/datasource-toolkit';
2
- export declare type FieldDefinition = ComputedDefinition & {
1
+ import { ComputedDefinition, TCollectionName, TSchema } from '@forestadmin/datasource-toolkit';
2
+ export declare type FieldDefinition<S extends TSchema = TSchema, N extends TCollectionName<S> = TCollectionName<S>> = ComputedDefinition<S, N> & {
3
3
  beforeRelations?: boolean;
4
4
  };
5
5
  //# sourceMappingURL=types.d.ts.map
@@ -0,0 +1,13 @@
1
+ import { AgentOptions } from '../../types';
2
+ import { AgentOptionsWithDefaults } from '../../agent/types';
3
+ export default class OptionsValidator {
4
+ private static loggerPrefix;
5
+ static withDefaults(options: AgentOptions): AgentOptions;
6
+ static validate(options: AgentOptions): AgentOptionsWithDefaults;
7
+ private static checkForestServerOptions;
8
+ private static checkAuthOptions;
9
+ private static checkOtherOptions;
10
+ private static isExistingPath;
11
+ private static isUrl;
12
+ }
13
+ //# sourceMappingURL=options-validator.d.ts.map
@@ -0,0 +1,103 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const fs_1 = require("fs");
4
+ const path_1 = require("path");
5
+ class OptionsValidator {
6
+ static withDefaults(options) {
7
+ const copyOptions = { ...options };
8
+ const defaultLogger = (level, data) => {
9
+ const loggerLevel = options.loggerLevel ?? 'Info';
10
+ const levels = Object.keys(this.loggerPrefix);
11
+ if (levels.indexOf(level) >= levels.indexOf(loggerLevel)) {
12
+ console.error(OptionsValidator.loggerPrefix[level], data);
13
+ }
14
+ };
15
+ copyOptions.logger = copyOptions.logger || defaultLogger;
16
+ copyOptions.schemaPath = copyOptions.schemaPath || '.forestadmin-schema.json';
17
+ copyOptions.forestServerUrl = copyOptions.forestServerUrl || 'https://api.forestadmin.com';
18
+ copyOptions.typingsMaxDepth = copyOptions.typingsMaxDepth ?? 5;
19
+ const parsed = new URL(options.agentUrl);
20
+ copyOptions.prefix ?? (copyOptions.prefix = (0, path_1.join)('/', parsed.pathname, 'forest'));
21
+ return {
22
+ clientId: null,
23
+ loggerLevel: 'Info',
24
+ prefix: '/forest',
25
+ permissionsCacheDurationInSeconds: 15 * 60,
26
+ ...copyOptions,
27
+ };
28
+ }
29
+ static validate(options) {
30
+ OptionsValidator.checkForestServerOptions(options);
31
+ OptionsValidator.checkAuthOptions(options);
32
+ OptionsValidator.checkOtherOptions(options);
33
+ return options;
34
+ }
35
+ static checkForestServerOptions(options) {
36
+ if (typeof options.envSecret !== 'string' || !/^[0-9a-f]{64}$/.test(options.envSecret)) {
37
+ throw new Error('options.envSecret is invalid. You can retrieve its value from ' +
38
+ 'https://www.forestadmin.com');
39
+ }
40
+ if (!OptionsValidator.isUrl(options.forestServerUrl)) {
41
+ throw new Error('options.forestServerUrl is invalid. It should contain an URL ' +
42
+ '(i.e. "https://api.forestadmin.com")');
43
+ }
44
+ if (!OptionsValidator.isExistingPath(options.schemaPath)) {
45
+ throw new Error('options.schemaPath is invalid. It should contain a relative filepath ' +
46
+ 'where the schema should be loaded/updated (i.e. "./.forestadmin-schema.json")');
47
+ }
48
+ if (options.typingsPath && !OptionsValidator.isExistingPath(options.typingsPath)) {
49
+ throw new Error('options.typingsPath is invalid. It should contain a relative filepath ' +
50
+ 'where the schema should be loaded/updated (i.e. "./src/typings.ts")');
51
+ }
52
+ }
53
+ static checkAuthOptions(options) {
54
+ if (!OptionsValidator.isUrl(options.agentUrl)) {
55
+ throw new Error('options.agentUrl is invalid. It should contain an url where your agent is reachable ' +
56
+ '(i.e. "https://api-forestadmin.mycompany.com")');
57
+ }
58
+ if (typeof options.authSecret !== 'string') {
59
+ throw new Error('options.authSecret is invalid. Any long random string should work ' +
60
+ '(i.e. "OfpssLrbgF3P4vHJTTpb"');
61
+ }
62
+ if (options.clientId === null) {
63
+ options.logger?.('Warn', 'options.clientId was not provided. Using Node.js cluster mode, ' +
64
+ 'or multiple instances of the agent will break authentication');
65
+ }
66
+ else if (typeof options.clientId !== 'string') {
67
+ throw new Error('options.clientId is invalid.');
68
+ }
69
+ }
70
+ static checkOtherOptions(options) {
71
+ if (typeof options.prefix !== 'string' || !/[-/a-z+]/.test(options.prefix)) {
72
+ throw new Error('options.prefix is invalid. It should contain the prefix on which ' +
73
+ 'forest admin routes should be mounted (i.e. "/forest")');
74
+ }
75
+ }
76
+ static isExistingPath(string) {
77
+ if (typeof string !== 'string') {
78
+ return false;
79
+ }
80
+ const parsed = (0, path_1.parse)(string);
81
+ return parsed.dir.length ? (0, fs_1.existsSync)(parsed.dir) : true;
82
+ }
83
+ static isUrl(string) {
84
+ if (typeof string !== 'string') {
85
+ return false;
86
+ }
87
+ try {
88
+ const url = new URL(string);
89
+ return url.protocol === 'http:' || url.protocol === 'https:';
90
+ }
91
+ catch (_) {
92
+ return false;
93
+ }
94
+ }
95
+ }
96
+ exports.default = OptionsValidator;
97
+ OptionsValidator.loggerPrefix = {
98
+ Debug: '\x1b[34mdebug:\x1b[0m',
99
+ Info: '\x1b[32minfo:\x1b[0m',
100
+ Warn: '\x1b[33mwarning:\x1b[0m',
101
+ Error: '\x1b[31merror:\x1b[0m',
102
+ };
103
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy12YWxpZGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYnVpbGRlci91dGlscy9vcHRpb25zLXZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJCQUFnQztBQUNoQywrQkFBNEQ7QUFLNUQsTUFBcUIsZ0JBQWdCO0lBUW5DLE1BQU0sQ0FBQyxZQUFZLENBQUMsT0FBcUI7UUFDdkMsTUFBTSxXQUFXLEdBQUcsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDO1FBRW5DLE1BQU0sYUFBYSxHQUFHLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxFQUFFO1lBQ3BDLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksTUFBTSxDQUFDO1lBQ2xELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBRTlDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUN4RCxPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQzthQUMzRDtRQUNILENBQUMsQ0FBQztRQUVGLFdBQVcsQ0FBQyxNQUFNLEdBQUcsV0FBVyxDQUFDLE1BQU0sSUFBSSxhQUFhLENBQUM7UUFDekQsV0FBVyxDQUFDLFVBQVUsR0FBRyxXQUFXLENBQUMsVUFBVSxJQUFJLDBCQUEwQixDQUFDO1FBQzlFLFdBQVcsQ0FBQyxlQUFlLEdBQUcsV0FBVyxDQUFDLGVBQWUsSUFBSSw2QkFBNkIsQ0FBQztRQUMzRixXQUFXLENBQUMsZUFBZSxHQUFHLFdBQVcsQ0FBQyxlQUFlLElBQUksQ0FBQyxDQUFDO1FBRS9ELE1BQU0sTUFBTSxHQUFHLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMs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
@@ -0,0 +1,10 @@
1
+ import { DataSource } from '@forestadmin/datasource-toolkit';
2
+ export default class TypingGenerator {
3
+ static generateTypes(dataSource: DataSource, maxDepth: number): string;
4
+ private static getRow;
5
+ private static getRelations;
6
+ private static getFlatRelations;
7
+ private static getFieldsRec;
8
+ private static getType;
9
+ }
10
+ //# sourceMappingURL=typing-generator.d.ts.map
@@ -0,0 +1,98 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
4
+ class TypingGenerator {
5
+ static generateTypes(dataSource, maxDepth) {
6
+ const collections = [...dataSource.collections].sort((a, b) => a.name.localeCompare(b.name));
7
+ return [
8
+ `/* eslint-disable */`,
9
+ 'export type Schema = {',
10
+ ...collections.map(collection => [
11
+ ` ${collection.name}: {`,
12
+ this.getRow(collection),
13
+ this.getRelations(collection),
14
+ this.getFlatRelations(collection, maxDepth),
15
+ ' };',
16
+ ].join(`\n`)),
17
+ '};\n',
18
+ ].join('\n');
19
+ }
20
+ static getRow(collection) {
21
+ const content = Object.entries(collection.schema.fields).reduce((memo, [name, field]) => {
22
+ return field.type === 'Column' ? [...memo, ` ${name}: ${this.getType(field)};`] : memo;
23
+ }, []);
24
+ return ` plain: {\n${content.join('\n')}\n };`;
25
+ }
26
+ static getRelations(collection) {
27
+ const content = Object.entries(collection.schema.fields).reduce((memo, [name, field]) => {
28
+ if (field.type === 'ManyToOne' || field.type === 'OneToOne') {
29
+ const relation = field.foreignCollection;
30
+ return [
31
+ ...memo,
32
+ ` ${name}: Schema['${relation}']['plain'] & Schema['${relation}']['nested'];`,
33
+ ];
34
+ }
35
+ return memo;
36
+ }, []);
37
+ return content.length ? ` nested: {\n${content.join('\n')}\n };` : ` nested: {};`;
38
+ }
39
+ static getFlatRelations(collection, maxDepth) {
40
+ const fields = this.getFieldsRec(collection, maxDepth, []);
41
+ return fields.length
42
+ ? ` flat: {\n ${fields.join('\n ')}\n };`
43
+ : ` flat: {};`;
44
+ }
45
+ static getFieldsRec(collection, maxDepth, traversed) {
46
+ const columns = traversed.length > 0
47
+ ? Object.entries(collection.schema.fields)
48
+ .filter(([, schema]) => schema.type === 'Column')
49
+ .map(([name, schema]) => `'${name}': ${this.getType(schema)};`)
50
+ : [];
51
+ const relations = Object.entries(collection.schema.fields).reduce((memo, [name, schema]) => {
52
+ if (schema.type !== 'ManyToOne' && schema.type !== 'OneToOne')
53
+ return memo;
54
+ const subCollection = collection.dataSource.getCollection(schema.foreignCollection);
55
+ const inverse = datasource_toolkit_1.CollectionUtils.getInverseRelation(collection, name);
56
+ // Do not expand inverse relations, as those create useless cycles
57
+ const expand = traversed.length < maxDepth &&
58
+ !traversed.find(({ c, r }) => c === subCollection && r === inverse);
59
+ if (!expand)
60
+ return memo;
61
+ // Manually expand the field type (cycles are not allowed in template literal types)
62
+ return [
63
+ ...memo,
64
+ ...this.getFieldsRec(subCollection, maxDepth, [
65
+ ...traversed,
66
+ { c: collection, r: name },
67
+ ]).map(f => `'${name}:${f.slice(1)}`),
68
+ ];
69
+ }, []);
70
+ return [...columns, ...relations];
71
+ }
72
+ static getType(field) {
73
+ if (Array.isArray(field.columnType)) {
74
+ return `Array<${this.getType({ columnType: field.columnType[0] })}>`;
75
+ }
76
+ if (field.columnType === 'Enum') {
77
+ return field.enumValues.map(v => `'${v.replace(/'/g, "\\'")}'`).join(' | ');
78
+ }
79
+ if (typeof field.columnType === 'string') {
80
+ return {
81
+ Boolean: 'boolean',
82
+ Date: 'string',
83
+ Dateonly: 'string',
84
+ Json: 'any',
85
+ Number: 'number',
86
+ Point: '[number, number]',
87
+ String: 'string',
88
+ Timeonly: 'string',
89
+ Uuid: 'string',
90
+ }[field.columnType];
91
+ }
92
+ return `{${Object.entries(field.columnType)
93
+ .map(([key, subType]) => `${key}: ${this.getType({ columnType: subType })}`)
94
+ .join('; ')}}`;
95
+ }
96
+ }
97
+ exports.default = TypingGenerator;
98
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwaW5nLWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9idWlsZGVyL3V0aWxzL3R5cGluZy1nZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFNeUM7QUFFekMsTUFBcUIsZUFBZTtJQUNsQyxNQUFNLENBQUMsYUFBYSxDQUFDLFVBQXNCLEVBQUUsUUFBZ0I7UUFDM0QsTUFBTSxXQUFXLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUU3RixPQUFPO1lBQ0wsc0JBQXNCO1lBQ3RCLHdCQUF3QjtZQUN4QixHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FDOUI7Z0JBQ0UsS0FBSyxVQUFVLENBQUMsSUFBSSxLQUFLO2dCQUN6QixJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztnQkFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUM7Z0JBQzdCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDO2dCQUMzQyxNQUFNO2FBQ1AsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ2I7WUFDRCxNQUFNO1NBQ1AsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDZixDQUFDO0lBRU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFzQjtRQUMxQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDdEYsT0FBTyxL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
package/dist/index.d.ts CHANGED
@@ -1,7 +1,8 @@
1
+ import { TSchema } from '@forestadmin/datasource-toolkit';
1
2
  import { AgentOptions } from './types';
2
3
  import Agent from './builder/agent';
3
4
  export { default as Collection } from './builder/collection';
4
5
  export { Agent };
5
6
  export * from './types';
6
- export declare function createAgent(agentoptions: AgentOptions): Agent;
7
+ export declare function createAgent<S extends TSchema = TSchema>(options: AgentOptions): Agent<S>;
7
8
  //# sourceMappingURL=index.d.ts.map
package/dist/index.js CHANGED
@@ -23,8 +23,8 @@ exports.Agent = agent_1.default;
23
23
  var collection_1 = require("./builder/collection");
24
24
  Object.defineProperty(exports, "Collection", { enumerable: true, get: function () { return __importDefault(collection_1).default; } });
25
25
  __exportStar(require("./types"), exports);
26
- function createAgent(agentoptions) {
27
- return new agent_1.default(agentoptions);
26
+ function createAgent(options) {
27
+ return new agent_1.default(options);
28
28
  }
29
29
  exports.createAgent = createAgent;
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDQSw0REFBb0M7QUFHM0IsZ0JBSEYsZUFBSyxDQUdFO0FBRGQsbURBQTZEO0FBQXBELHlIQUFBLE9BQU8sT0FBYztBQUU5QiwwQ0FBd0I7QUFFeEIsU0FBZ0IsV0FBVyxDQUFDLFlBQTBCO0lBQ3BELE9BQU8sSUFBSSxlQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDakMsQ0FBQztBQUZELGtDQUVDIn0=
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFHQSw0REFBb0M7QUFHM0IsZ0JBSEYsZUFBSyxDQUdFO0FBRGQsbURBQTZEO0FBQXBELHlIQUFBLE9BQU8sT0FBYztBQUU5QiwwQ0FBd0I7QUFFeEIsU0FBZ0IsV0FBVyxDQUE4QixPQUFxQjtJQUM1RSxPQUFPLElBQUksZUFBSyxDQUFJLE9BQU8sQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFGRCxrQ0FFQyJ9
package/dist/types.d.ts CHANGED
@@ -11,6 +11,8 @@ export declare type AgentOptions = {
11
11
  prefix?: string;
12
12
  isProduction: boolean;
13
13
  schemaPath?: string;
14
+ typingsPath?: string;
15
+ typingsMaxDepth?: number;
14
16
  permissionsCacheDurationInSeconds?: number;
15
17
  };
16
18
  //# sourceMappingURL=types.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forestadmin/agent",
3
- "version": "1.0.0-beta.24",
3
+ "version": "1.0.0-beta.27",
4
4
  "main": "dist/index.js",
5
5
  "license": "GPL-3.0",
6
6
  "publishConfig": {
@@ -13,7 +13,7 @@
13
13
  },
14
14
  "dependencies": {
15
15
  "@fast-csv/format": "^4.3.5",
16
- "@forestadmin/datasource-toolkit": "1.0.0-beta.15",
16
+ "@forestadmin/datasource-toolkit": "1.0.0-beta.16",
17
17
  "@koa/cors": "^3.3.0",
18
18
  "@koa/router": "^10.1.1",
19
19
  "forest-ip-utils": "^1.0.1",
@@ -1,13 +0,0 @@
1
- import { AgentOptions } from '../../types';
2
- import { AgentOptionsWithDefaults } from '../types';
3
- export default class OptionsUtils {
4
- private static loggerPrefix;
5
- static withDefaults(options: AgentOptions): AgentOptionsWithDefaults;
6
- static validate(options: AgentOptionsWithDefaults): void;
7
- private static checkForestServerOptions;
8
- private static checkAuthOptions;
9
- private static checkOtherOptions;
10
- private static isExistingPath;
11
- private static isUrl;
12
- }
13
- //# sourceMappingURL=http-driver-options.d.ts.map
@@ -1,95 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const fs_1 = require("fs");
4
- const path_1 = require("path");
5
- class OptionsUtils {
6
- static withDefaults(options) {
7
- const copyOptions = { ...options };
8
- const defaultLogger = (level, data) => {
9
- const loggerLevel = options.loggerLevel ?? 'Info';
10
- const levels = Object.keys(this.loggerPrefix);
11
- if (levels.indexOf(level) >= levels.indexOf(loggerLevel)) {
12
- console.error(OptionsUtils.loggerPrefix[level], data);
13
- }
14
- };
15
- copyOptions.logger = copyOptions.logger || defaultLogger;
16
- copyOptions.schemaPath = copyOptions.schemaPath || '.forestadmin-schema.json';
17
- copyOptions.forestServerUrl = copyOptions.forestServerUrl || 'https://api.forestadmin.com';
18
- return Object.freeze({
19
- clientId: null,
20
- loggerLevel: 'Info',
21
- prefix: '/forest',
22
- permissionsCacheDurationInSeconds: 15 * 60,
23
- ...copyOptions,
24
- });
25
- }
26
- static validate(options) {
27
- OptionsUtils.checkForestServerOptions(options);
28
- OptionsUtils.checkAuthOptions(options);
29
- OptionsUtils.checkOtherOptions(options);
30
- }
31
- static checkForestServerOptions(options) {
32
- if (typeof options.envSecret !== 'string' || !/^[0-9a-f]{64}$/.test(options.envSecret)) {
33
- throw new Error('options.envSecret is invalid. You can retrieve its value from ' +
34
- 'https://www.forestadmin.com');
35
- }
36
- if (!OptionsUtils.isUrl(options.forestServerUrl)) {
37
- throw new Error('options.forestServerUrl is invalid. It should contain an URL ' +
38
- '(i.e. "https://api.forestadmin.com")');
39
- }
40
- if (!OptionsUtils.isExistingPath(options.schemaPath)) {
41
- throw new Error('options.schemaPath is invalid. It should contain a relative filepath ' +
42
- 'where the schema should be loaded/updated (i.e. "./.forestadmin-schema.json")');
43
- }
44
- }
45
- static checkAuthOptions(options) {
46
- if (!OptionsUtils.isUrl(options.agentUrl)) {
47
- throw new Error('options.agentUrl is invalid. It should contain an url where your agent is reachable ' +
48
- '(i.e. "https://api-forestadmin.mycompany.com")');
49
- }
50
- if (typeof options.authSecret !== 'string') {
51
- throw new Error('options.authSecret is invalid. Any long random string should work ' +
52
- '(i.e. "OfpssLrbgF3P4vHJTTpb"');
53
- }
54
- if (options.clientId === null) {
55
- options.logger?.('Warn', 'options.clientId was not provided. Using Node.js cluster mode, ' +
56
- 'or multiple instances of the agent will break authentication');
57
- }
58
- else if (typeof options.clientId !== 'string') {
59
- throw new Error('options.clientId is invalid.');
60
- }
61
- }
62
- static checkOtherOptions(options) {
63
- if (typeof options.prefix !== 'string' || !/[-/a-z+]/.test(options.prefix)) {
64
- throw new Error('options.prefix is invalid. It should contain the prefix on which ' +
65
- 'forest admin routes should be mounted (i.e. "/forest")');
66
- }
67
- }
68
- static isExistingPath(string) {
69
- if (typeof string !== 'string') {
70
- return false;
71
- }
72
- const parsed = (0, path_1.parse)(string);
73
- return parsed.dir.length ? (0, fs_1.existsSync)(parsed.dir) : true;
74
- }
75
- static isUrl(string) {
76
- if (typeof string !== 'string') {
77
- return false;
78
- }
79
- try {
80
- const url = new URL(string);
81
- return url.protocol === 'http:' || url.protocol === 'https:';
82
- }
83
- catch (_) {
84
- return false;
85
- }
86
- }
87
- }
88
- exports.default = OptionsUtils;
89
- OptionsUtils.loggerPrefix = {
90
- Debug: '\x1b[34mdebug:\x1b[0m',
91
- Info: '\x1b[32minfo:\x1b[0m',
92
- Warn: '\x1b[33mwarning:\x1b[0m',
93
- Error: '\x1b[31merror:\x1b[0m',
94
- };
95
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1kcml2ZXItb3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hZ2VudC91dGlscy9odHRwLWRyaXZlci1vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkJBQWdDO0FBQ2hDLCtCQUEwQztBQUsxQyxNQUFxQixZQUFZO0lBUS9CLE1BQU0sQ0FBQyxZQUFZLENBQUMsT0FBcUI7UUFDdkMsTUFBTSxXQUFXLEdBQUcsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDO1FBRW5DLE1BQU0sYUFBYSxHQUFHLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxFQUFFO1lBQ3BDLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksTUFBTSxDQUFDO1lBQ2xELE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBRTlDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUN4RCxPQUFPLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7YUFDdkQ7UUFDSCxDQUFDLENBQUM7UUFFRixXQUFXLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQyxNQUFNLElBQUksYUFBYSxDQUFDO1FBQ3pELFdBQVcsQ0FBQyxVQUFVLEdBQUcsV0FBVyxDQUFDLFVBQVUsSUFBSSwwQkFBMEIsQ0FBQztRQUM5RSxXQUFXLENBQUMsZUFBZSxHQUFHLFdBQVcsQ0FBQyxlQUFlLElBQUksNkJBQTZCLENBQUM7UUFFM0YsT0FBaUMsTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUM3QyxRQUFRLEVBQUUsSUFBSTtZQUNkLFdBQVcsRUFBRSxNQUFNO1lBQ25CLE1BQU0sRUFBRSxTQUFTO1lBQ2pCLGlDQUFpQyxFQUFFLEVB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