@forestadmin/datasource-sql 1.0.1-alpha.1 → 1.1.0

package/dist/index.d.ts

@@ -1,9 +1,11 @@
-import { DataSourceFactory, Logger } from '@forestadmin/datasource-toolkit';
 import { Sequelize } from 'sequelize';
-import { Table } from './introspection/types';
-export declare function introspect(connectionUri: string, logger?: Logger): Promise<Table[]>;
-export declare function buildSequelizeInstance(connectionUri: string, logger: Logger, introspection?: Table[]): Promise<Sequelize>;
-export declare function createSqlDataSource(connectionUri: string, options?: {
+import type { DataSourceFactory, Logger } from '@forestadmin/datasource-toolkit';
+import type { ConnectionOptions } from './types';
+import type { Table } from './introspection/types';
+export declare function introspect(uriOrOptions: ConnectionOptions, logger?: Logger): Promise<Table[]>;
+export declare function buildSequelizeInstance(uriOrOptions: ConnectionOptions, logger: Logger, introspection?: Table[]): Promise<Sequelize>;
+export declare function createSqlDataSource(uriOrOptions: ConnectionOptions, options?: {
     introspection: Table[];
 }): DataSourceFactory;
+export type { ConnectionOptions, Table };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -9,33 +9,35 @@ const datasource_sequelize_1 = require("@forestadmin/datasource-sequelize");
 const introspector_1 = __importDefault(require("./introspection/introspector"));
 const model_1 = __importDefault(require("./orm-builder/model"));
 const relations_1 = __importDefault(require("./orm-builder/relations"));
-function createEmptySequelize(connectionUri, logger) {
-    if (!/.*:\/\//g.test(connectionUri))
-        throw new Error(`Connection Uri "${connectionUri}" provided to SQL data source is not valid.` +
-            ' Should be <dialect>://<connection>.');
+function createEmptySequelize(uriOrOptions, logger) {
     const logging = (sql) => logger?.('Debug', sql.substring(sql.indexOf(':') + 2));
-    return new sequelize_1.Sequelize(connectionUri, { logging });
+    if (typeof uriOrOptions === 'string' && !/.*:\/\//g.test(uriOrOptions))
+        throw new Error(`Connection Uri "${uriOrOptions}" provided to SQL data source is not valid.` +
+            ' Should be <dialect>://<connection>.');
+    return typeof uriOrOptions === 'string'
+        ? new sequelize_1.Sequelize(uriOrOptions, { logging })
+        : new sequelize_1.Sequelize({ ...uriOrOptions, logging });
 }
-async function introspect(connectionUri, logger) {
-    const sequelize = createEmptySequelize(connectionUri, logger);
+async function introspect(uriOrOptions, logger) {
+    const sequelize = createEmptySequelize(uriOrOptions, logger);
     const tables = await introspector_1.default.introspect(sequelize, logger);
     sequelize.close();
     return tables;
 }
 exports.introspect = introspect;
-async function buildSequelizeInstance(connectionUri, logger, introspection) {
-    const sequelize = createEmptySequelize(connectionUri, logger);
+async function buildSequelizeInstance(uriOrOptions, logger, introspection) {
+    const sequelize = createEmptySequelize(uriOrOptions, logger);
     const tables = introspection ?? (await introspector_1.default.introspect(sequelize, logger));
     model_1.default.defineModels(sequelize, logger, tables);
     relations_1.default.defineRelations(sequelize, logger, tables);
     return sequelize;
 }
 exports.buildSequelizeInstance = buildSequelizeInstance;
-function createSqlDataSource(connectionUri, options) {
+function createSqlDataSource(uriOrOptions, options) {
     return async (logger) => {
-        const sequelize = await buildSequelizeInstance(connectionUri, logger, options?.introspection);
+        const sequelize = await buildSequelizeInstance(uriOrOptions, logger, options?.introspection);
         return new datasource_sequelize_1.SequelizeDataSource(sequelize, logger);
     };
 }
 exports.createSqlDataSource = createSqlDataSource;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EseUNBQXNDO0FBQ3RDLDRFQUF3RTtBQUd4RSxnRkFBd0Q7QUFDeEQsZ0VBQStDO0FBQy9DLHdFQUFzRDtBQUV0RCxTQUFTLG9CQUFvQixDQUFDLGFBQXFCLEVBQUUsTUFBYztJQUNqRSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUM7UUFDakMsTUFBTSxJQUFJLEtBQUssQ0FDYixtQkFBbUIsYUFBYSw2Q0FBNkM7WUFDM0Usc0NBQXNDLENBQ3pDLENBQUM7SUFFSixNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXhGLE9BQU8sSUFBSSxxQkFBUyxDQUFDLGFBQWEsRUFBRSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7QUFDbkQsQ0FBQztBQUVNLEtBQUssVUFBVSxVQUFVLENBQUMsYUFBcUIsRUFBRSxNQUFlO0lBQ3JFLE1BQU0sU0FBUyxHQUFHLG9CQUFvQixDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM5RCxNQUFNLE1BQU0sR0FBRyxNQUFNLHNCQUFZLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNoRSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7SUFFbEIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQU5ELGdDQU1DO0FBRU0sS0FBSyxVQUFVLHNCQUFzQixDQUMxQyxhQUFxQixFQUNyQixNQUFjLEVBQ2QsYUFBdUI7SUFFdkIsTUFBTSxTQUFTLEdBQUcsb0JBQW9CLENBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzlELE1BQU0sTUFBTSxHQUFHLGFBQWEsSUFBSSxDQUFDLE1BQU0sc0JBQVksQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFFbkYsZUFBWSxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3JELG1CQUFlLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFM0QsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQztBQVpELHdEQVlDO0FBRUQsU0FBZ0IsbUJBQW1CLENBQ2pDLGFBQXFCLEVBQ3JCLE9BQW9DO0lBRXBDLE9BQU8sS0FBSyxFQUFFLE1BQWMsRUFBRSxFQUFFO1FBQzlCLE1BQU0sU0FBUyxHQUFHLE1BQU0sc0JBQXNCLENBQUMsYUFBYSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFFOUYsT0FBTyxJQUFJLDBDQUFtQixDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNwRCxDQUFDLENBQUM7QUFDSixDQUFDO0FBVEQsa0RBU0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEseUNBQXNDO0FBQ3RDLDRFQUF3RTtBQUd4RSxnRkFBd0Q7QUFDeEQsZ0VBQStDO0FBQy9DLHdFQUFzRDtBQUl0RCxTQUFTLG9CQUFvQixDQUFDLFlBQStCLEVBQUUsTUFBYztJQUMzRSxNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXhGLElBQUksT0FBTyxZQUFZLEtBQUssUUFBUSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUM7UUFDcEUsTUFBTSxJQUFJLEtBQUssQ0FDYixtQkFBbUIsWUFBWSw2Q0FBNkM7WUFDMUUsc0NBQXNDLENBQ3pDLENBQUM7SUFFSixPQUFPLE9BQU8sWUFBWSxLQUFLLFFBQVE7UUFDckMsQ0FBQyxDQUFDLElBQUkscUJBQVMsQ0FBQyxZQUFZLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQztRQUMxQyxDQUFDLENBQUMsSUFBSSxxQkFBUyxDQUFDLEVBQUUsR0FBRyxZQUFZLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztBQUNsRCxDQUFDO0FBRU0sS0FBSyxVQUFVLFVBQVUsQ0FDOUIsWUFBK0IsRUFDL0IsTUFBZTtJQUVmLE1BQU0sU0FBUyxHQUFHLG9CQUFvQixDQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM3RCxNQUFNLE1BQU0sR0FBRyxNQUFNLHNCQUFZLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNoRSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7SUFFbEIsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQVRELGdDQVNDO0FBRU0sS0FBSyxVQUFVLHNCQUFzQixDQUMxQyxZQUErQixFQUMvQixNQUFjLEVBQ2QsYUFBdUI7SUFFdkIsTUFBTSxTQUFTLEdBQUcsb0JBQW9CLENBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQzdELE1BQU0sTUFBTSxHQUFHLGFBQWEsSUFBSSxDQUFDLE1BQU0sc0JBQVksQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFFbkYsZUFBWSxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3JELG1CQUFlLENBQUMsZUFBZSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFFM0QsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQztBQVpELHdEQVlDO0FBRUQsU0FBZ0IsbUJBQW1CLENBQ2pDLFlBQStCLEVBQy9CLE9BQW9DO0lBRXBDLE9BQU8sS0FBSyxFQUFFLE1BQWMsRUFBRSxFQUFFO1FBQzlCLE1BQU0sU0FBUyxHQUFHLE1BQU0sc0JBQXNCLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsYUFBYSxDQUFDLENBQUM7UUFFN0YsT0FBTyxJQUFJLDBDQUFtQixDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNwRCxDQUFDLENBQUM7QUFDSixDQUFDO0FBVEQsa0RBU0MifQ==

package/dist/types.d.ts

@@ -0,0 +1,3 @@
+import { Options } from 'sequelize/types';
+export declare type ConnectionOptions = string | Pick<Options, 'database' | 'dialect' | 'dialectModule' | 'dialectModulePath' | 'dialectOptions' | 'host' | 'minifyAliases' | 'native' | 'password' | 'pool' | 'port' | 'protocol' | 'replication' | 'schema' | 'ssl' | 'storage' | 'username'>;
+//# sourceMappingURL=types.d.ts.map

package/dist/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-sql",
-  "version": "1.0.1-alpha.1",
+  "version": "1.1.0",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {
@@ -12,8 +12,8 @@
     "directory": "packages/datasource-sql"
   },
   "dependencies": {
-    "@forestadmin/datasource-sequelize": "1.0.1-alpha.1",
-    "@forestadmin/datasource-toolkit": "1.0.1-alpha.1",
+    "@forestadmin/datasource-sequelize": "1.0.0",
+    "@forestadmin/datasource-toolkit": "1.0.0",
     "pluralize": "^8.0.0",
     "sequelize": "6.21.3"
   },