@forestadmin/datasource-sql 1.12.1 → 1.12.3

package/dist/index.d.ts

@@ -2,15 +2,15 @@ import type { PlainConnectionOptions, PlainConnectionOptionsOrUri, SslMode } fro
 import type { DataSourceFactory, Logger } from '@forestadmin/datasource-toolkit';
 import { Sequelize } from 'sequelize';
 import listCollectionsFromIntrospection from './introspection/list-collections-from-introspection';
-import { LatestIntrospection, LegacyIntrospection, Table } from './introspection/types';
-export declare function introspect(uriOrOptions: PlainConnectionOptionsOrUri, logger?: Logger): Promise<LatestIntrospection>;
-export declare function buildSequelizeInstance(uriOrOptions: PlainConnectionOptionsOrUri, logger: Logger, introspection?: LegacyIntrospection): Promise<Sequelize>;
+import { Introspection, SupportedIntrospection, Table } from './introspection/types';
+export declare function introspect(uriOrOptions: PlainConnectionOptionsOrUri, logger?: Logger): Promise<Introspection>;
+export declare function buildSequelizeInstance(uriOrOptions: PlainConnectionOptionsOrUri, logger: Logger, introspection?: SupportedIntrospection): Promise<Sequelize>;
 export declare function createSqlDataSource(uriOrOptions: PlainConnectionOptionsOrUri, options?: {
-    introspection?: LegacyIntrospection;
+    introspection?: SupportedIntrospection;
 }): DataSourceFactory;
 /** Preprocess the connection options so that they can be cached for faster connections */
 export declare function preprocessOptions(uriOrOptions: PlainConnectionOptionsOrUri): Promise<PlainConnectionOptions>;
 export * from './connection/errors';
-export type { PlainConnectionOptionsOrUri as ConnectionOptions, Table, SslMode, LegacyIntrospection as Introspection, };
+export type { PlainConnectionOptionsOrUri as ConnectionOptions, Table, SslMode, Introspection };
 export { listCollectionsFromIntrospection };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -72,4 +72,4 @@ async function preprocessOptions(uriOrOptions) {
 }
 exports.preprocessOptions = preprocessOptions;
 __exportStar(require("./connection/errors"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFHQSw0RUFBd0U7QUFHeEUsOERBQW1DO0FBQ25DLHlGQUFnRTtBQUNoRSxpRkFBd0Q7QUFDeEQsZ0ZBQXdEO0FBQ3hELDhIQUFtRztBQW9GMUYsMkNBcEZGLDZDQUFnQyxDQW9GRTtBQWxGekMsZ0VBQStDO0FBQy9DLHdFQUFzRDtBQUUvQyxLQUFLLFVBQVUsVUFBVSxDQUM5QixZQUF5QyxFQUN6QyxNQUFlO0lBRWYsTUFBTSxPQUFPLEdBQUcsSUFBSSw0QkFBaUIsQ0FBQyxZQUFZLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDNUQsSUFBSSxTQUFvQixDQUFDO0lBRXpCLElBQUk7UUFDRixTQUFTLEdBQUcsTUFBTSxJQUFBLG9CQUFPLEVBQUMsT0FBTyxDQUFDLENBQUM7UUFFbkMsT0FBTyxNQUFNLHNCQUFZLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztLQUN6RDtZQUFTO1FBQ1IsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7S0FDMUI7QUFDSCxDQUFDO0FBZEQsZ0NBY0M7QUFFRCxLQUFLLFVBQVUsdUJBQXVCLENBQ3BDLFNBQW9CLEVBQ3BCLE1BQWMsRUFDZCxhQUFrQztJQUVsQyxJQUFJO1FBQ0YsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLHNCQUFZLENBQUMsbUJBQW1CLENBQ2hFLFNBQVMsRUFDVCxNQUFNLEVBQ04sYUFBYSxDQUNkLENBQUM7UUFDRixlQUFZLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztRQUNsRSxtQkFBZSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFFeEUsT0FBTyxtQkFBbUIsQ0FBQztLQUM1QjtJQUFDLE9BQU8sS0FBSyxFQUFFO1FBQ2QsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDekIsTUFBTSxLQUFLLENBQUM7S0FDYjtBQUNILENBQUM7QUFFTSxLQUFLLFVBQVUsc0JBQXNCLENBQzFDLFlBQXlDLEVBQ3pDLE1BQWMsRUFDZCxhQUFtQztJQUVuQyxNQUFNLE9BQU8sR0FBRyxJQUFJLDRCQUFpQixDQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM1RCxNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUEsb0JBQU8sRUFBQyxPQUFPLENBQUMsQ0FBQztJQUN6QyxNQUFNLHVCQUF1QixDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFFaEUsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQztBQVZELHdEQVVDO0FBRUQsU0FBZ0IsbUJBQW1CLENBQ2pDLFlBQXlDLEVBQ3pDLE9BQWlEO0lBRWpELE9BQU8sS0FBSyxFQUFFLE1BQWMsRUFBRSxFQUFFO1FBQzlCLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBQSxvQkFBTyxFQUFDLElBQUksNEJBQWlCLENBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDN0UsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLHVCQUF1QixDQUN2RCxTQUFTLEVBQ1QsTUFBTSxFQUNOLE9BQU8sRUFBRSxhQUFhLENBQ3ZCLENBQUM7UUFFRixPQUFPLElBQUksd0JBQWEsQ0FBQyxJQUFJLDBDQUFtQixDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsRUFBRSxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNsRyxDQUFDLENBQUM7QUFDSixDQUFDO0FBZEQsa0RBY0M7QUFFRCwwRkFBMEY7QUFDbkYsS0FBSyxVQUFVLGlCQUFpQixDQUNyQyxZQUF5QztJQUV6QyxPQUFPLElBQUksNEJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUMsd0JBQXdCLEVBQUUsQ0FBQztBQUN4RSxDQUFDO0FBSkQsOENBSUM7QUFFRCxzREFBb0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFHQSw0RUFBd0U7QUFHeEUsOERBQW1DO0FBQ25DLHlGQUFnRTtBQUNoRSxpRkFBd0Q7QUFDeEQsZ0ZBQXdEO0FBQ3hELDhIQUFtRztBQW9GMUYsMkNBcEZGLDZDQUFnQyxDQW9GRTtBQTdFekMsZ0VBQStDO0FBQy9DLHdFQUFzRDtBQUUvQyxLQUFLLFVBQVUsVUFBVSxDQUM5QixZQUF5QyxFQUN6QyxNQUFlO0lBRWYsTUFBTSxPQUFPLEdBQUcsSUFBSSw0QkFBaUIsQ0FBQyxZQUFZLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDNUQsSUFBSSxTQUFvQixDQUFDO0lBRXpCLElBQUk7UUFDRixTQUFTLEdBQUcsTUFBTSxJQUFBLG9CQUFPLEVBQUMsT0FBTyxDQUFDLENBQUM7UUFFbkMsT0FBTyxNQUFNLHNCQUFZLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztLQUN6RDtZQUFTO1FBQ1IsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7S0FDMUI7QUFDSCxDQUFDO0FBZEQsZ0NBY0M7QUFFRCxLQUFLLFVBQVUsdUJBQXVCLENBQ3BDLFNBQW9CLEVBQ3BCLE1BQWMsRUFDZCxhQUFxQztJQUVyQyxJQUFJO1FBQ0YsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLHNCQUFZLENBQUMsbUJBQW1CLENBQ2hFLFNBQVMsRUFDVCxNQUFNLEVBQ04sYUFBYSxDQUNkLENBQUM7UUFDRixlQUFZLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztRQUNsRSxtQkFBZSxDQUFDLGVBQWUsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFFeEUsT0FBTyxtQkFBbUIsQ0FBQztLQUM1QjtJQUFDLE9BQU8sS0FBSyxFQUFFO1FBQ2QsTUFBTSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUM7UUFDekIsTUFBTSxLQUFLLENBQUM7S0FDYjtBQUNILENBQUM7QUFFTSxLQUFLLFVBQVUsc0JBQXNCLENBQzFDLFlBQXlDLEVBQ3pDLE1BQWMsRUFDZCxhQUFzQztJQUV0QyxNQUFNLE9BQU8sR0FBRyxJQUFJLDRCQUFpQixDQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQztJQUM1RCxNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUEsb0JBQU8sRUFBQyxPQUFPLENBQUMsQ0FBQztJQUN6QyxNQUFNLHVCQUF1QixDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFFaEUsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQztBQVZELHdEQVVDO0FBRUQsU0FBZ0IsbUJBQW1CLENBQ2pDLFlBQXlDLEVBQ3pDLE9BQW9EO0lBRXBELE9BQU8sS0FBSyxFQUFFLE1BQWMsRUFBRSxFQUFFO1FBQzlCLE1BQU0sU0FBUyxHQUFHLE1BQU0sSUFBQSxvQkFBTyxFQUFDLElBQUksNEJBQWlCLENBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDN0UsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLHVCQUF1QixDQUN2RCxTQUFTLEVBQ1QsTUFBTSxFQUNOLE9BQU8sRUFBRSxhQUFhLENBQ3ZCLENBQUM7UUFFRixPQUFPLElBQUksd0JBQWEsQ0FBQyxJQUFJLDBDQUFtQixDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsRUFBRSxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNsRyxDQUFDLENBQUM7QUFDSixDQUFDO0FBZEQsa0RBY0M7QUFFRCwwRkFBMEY7QUFDbkYsS0FBSyxVQUFVLGlCQUFpQixDQUNyQyxZQUF5QztJQUV6QyxPQUFPLElBQUksNEJBQWlCLENBQUMsWUFBWSxDQUFDLENBQUMsd0JBQXdCLEVBQUUsQ0FBQztBQUN4RSxDQUFDO0FBSkQsOENBSUM7QUFFRCxzREFBb0MifQ==

package/dist/introspection/introspector.d.ts

@@ -1,12 +1,12 @@
 import { Logger } from '@forestadmin/datasource-toolkit';
 import { Sequelize } from 'sequelize';
-import { LatestIntrospection, LegacyIntrospection } from './types';
+import { LatestIntrospection, SupportedIntrospection } from './types';
 export default class Introspector {
-    static readonly FORMAT_VERSION = 1;
+    static readonly FORMAT_VERSION = 3;
     static readonly SOURCE = "@forestadmin/datasource-sql";
-    static migrateOrIntrospect(sequelize: Sequelize, logger?: Logger, introspection?: LegacyIntrospection): Promise<LatestIntrospection>;
+    static migrateOrIntrospect(sequelize: Sequelize, logger?: Logger, introspection?: SupportedIntrospection): Promise<LatestIntrospection>;
     static introspect(sequelize: Sequelize, logger?: Logger): Promise<LatestIntrospection>;
-    static getIntrospectionInLatestFormat(introspection?: LegacyIntrospection): LatestIntrospection | undefined;
+    static getIntrospectionInLatestFormat(introspection?: SupportedIntrospection): LatestIntrospection | undefined;
     private static migrateIntrospectionInLatestFormat;
     /** Get names of all tables in the public schema of the db */
     private static getTableNames;
@@ -22,5 +22,6 @@ export default class Introspector {
     private static sanitizeInPlace;
     private static logBrokenRelationship;
     private static getViews;
+    private static getProperty;
 }
 //# sourceMappingURL=introspector.d.ts.map

package/dist/introspection/introspector.js

@@ -22,13 +22,11 @@ class Introspector {
         return { tables, views, version: this.FORMAT_VERSION, source: this.SOURCE };
     }
     static getIntrospectionInLatestFormat(introspection) {
-        const formattedIntrospection = this.migrateIntrospectionInLatestFormat(introspection);
-        if (formattedIntrospection && formattedIntrospection.source !== this.SOURCE) {
-            throw new Error(
-            // eslint-disable-next-line max-len
-            `This introspection has not been generated by the package @forestadmin/datasource-sql, but with ${formattedIntrospection.source}.`);
-        }
-        if (formattedIntrospection && formattedIntrospection.version > this.FORMAT_VERSION) {
+        if (!introspection)
+            return undefined;
+        const version = this.getProperty(introspection, 'version');
+        const source = this.getProperty(introspection, 'source');
+        if (version && version > this.FORMAT_VERSION) {
             /* This can only occur in CLOUD version, either:
               - forest-cloud does not have the same version of datasource-sql
                 as cloud-agent-manager & forestadmin-server (We need to fix)
@@ -38,7 +36,12 @@ class Introspector {
             throw new Error('This version of introspection is newer than this package version. ' +
                 'Please update @forestadmin/datasource-sql');
         }
-        return formattedIntrospection;
+        if (source && source !== this.SOURCE) {
+            throw new Error(
+            // eslint-disable-next-line max-len
+            `This introspection has not been generated by the package @forestadmin/datasource-sql, but with ${source}.`);
+        }
+        return this.migrateIntrospectionInLatestFormat(introspection);
     }
     static migrateIntrospectionInLatestFormat(introspection) {
         if (!introspection)
@@ -54,8 +57,9 @@ class Introspector {
         }
         return {
             ...introspection,
-            source: introspection.source || this.SOURCE,
-            views: introspection.views || [],
+            views: this.getProperty(introspection, 'views') || [],
+            source: this.SOURCE,
+            version: this.FORMAT_VERSION,
         };
     }
     /** Get names of all tables in the public schema of the db */
@@ -204,8 +208,14 @@ class Introspector {
             };
         }));
     }
+    static getProperty(introspection, property) {
+        if (!Array.isArray(introspection) && property in introspection) {
+            return introspection[property];
+        }
+        return undefined;
+    }
 }
 exports.default = Introspector;
-Introspector.FORMAT_VERSION = 1;
+Introspector.FORMAT_VERSION = 3;
 Introspector.SOURCE = '@forestadmin/datasource-sql';
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"introspector.js","sourceRoot":"","sources":["../../src/introspection/introspector.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"introspector.js","sourceRoot":"","sources":["../../src/introspection/introspector.ts"],"names":[],"mappings":"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"}

package/dist/introspection/list-collections-from-introspection.d.ts

@@ -1,3 +1,3 @@
-import { LegacyIntrospection } from './types';
-export default function listCollectionsFromIntrospection(introspection: LegacyIntrospection): string[];
+import { SupportedIntrospection } from './types';
+export default function listCollectionsFromIntrospection(introspection: SupportedIntrospection): string[];
 //# sourceMappingURL=list-collections-from-introspection.d.ts.map

package/dist/introspection/list-collections-from-introspection.js

@@ -11,4 +11,4 @@ function listCollectionsFromIntrospection(introspection) {
     return introspector_1.default.getIntrospectionInLatestFormat(introspection).tables.map(table => table.name);
 }
 exports.default = listCollectionsFromIntrospection;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1jb2xsZWN0aW9ucy1mcm9tLWludHJvc3BlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50cm9zcGVjdGlvbi9saXN0LWNvbGxlY3Rpb25zLWZyb20taW50cm9zcGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGtFQUEwQztBQUcxQyxTQUF3QixnQ0FBZ0MsQ0FDdEQsYUFBa0M7SUFFbEMsSUFBSSxDQUFDLGFBQWEsRUFBRTtRQUNsQixPQUFPLEVBQUUsQ0FBQztLQUNYO0lBRUQsT0FBTyxzQkFBWSxDQUFDLDhCQUE4QixDQUFDLGFBQWEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDcEcsQ0FBQztBQVJELG1EQVFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1jb2xsZWN0aW9ucy1mcm9tLWludHJvc3BlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW50cm9zcGVjdGlvbi9saXN0LWNvbGxlY3Rpb25zLWZyb20taW50cm9zcGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGtFQUEwQztBQUcxQyxTQUF3QixnQ0FBZ0MsQ0FDdEQsYUFBcUM7SUFFckMsSUFBSSxDQUFDLGFBQWEsRUFBRTtRQUNsQixPQUFPLEVBQUUsQ0FBQztLQUNYO0lBRUQsT0FBTyxzQkFBWSxDQUFDLDhCQUE4QixDQUFDLGFBQWEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7QUFDcEcsQ0FBQztBQVJELG1EQVFDIn0=

package/dist/introspection/types.d.ts

@@ -38,12 +38,22 @@ export type Table = {
         }[];
     }[];
 };
-export type ObjectIntrospection = {
+export type Introspection1 = {
     tables: Table[];
-    version: number;
-    source?: '@forestadmin/datasource-sql';
-    views?: Table[];
+    version: 1;
 };
-export type LegacyIntrospection = ObjectIntrospection | Table[];
-export type LatestIntrospection = Required<ObjectIntrospection>;
+export type Introspection2 = {
+    tables: Table[];
+    source: '@forestadmin/datasource-sql';
+    version: 2;
+};
+export type Introspection3 = {
+    tables: Table[];
+    views: Table[];
+    source: '@forestadmin/datasource-sql';
+    version: 3;
+};
+export type LatestIntrospection = Introspection3;
+export type Introspection = Introspection1 | Introspection2 | Introspection3;
+export type SupportedIntrospection = Table[] | Introspection;
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestadmin/datasource-sql",
-  "version": "1.12.1",
+  "version": "1.12.3",
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "publishConfig": {