fix: individual exported database and resource

Author: JonaszJestem

.eslintrc.js

@@ -1,14 +1,12 @@
 module.exports = {
   env: {
-    browser: true,
     es2020: true,
   },
   extends: [
     'airbnb',
     'plugin:react/recommended',
     'plugin:@typescript-eslint/recommended',
   ],
-  ignorePatterns: ['*/build/**/*', '*.json', '*.txt', 'yarn.lock', '*.yaml'],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     ecmaFeatures: {

src/index.ts renamed to index.ts

@@ -78,7 +78,7 @@
  * @type {typeof BaseDatabase}
  * @static
  */
-import Database from './database';
+import Database from './src/database';
 
 /**
  * Implementation of {@link BaseResource} for Sequelize Adapter
@@ -87,7 +87,10 @@ import Database from './database';
  * @type {typeof BaseResource}
  * @static
  */
-import Resource from './resource';
+import Resource from './src/resource';
+
+export { default as Resource } from './src/resource';
+export { default as Database } from './src/database';
 
 module.exports = { Database, Resource };
 

package.json

@@ -35,6 +35,7 @@
     "@semantic-release/git": "^9.0.0",
     "@types/chai": "^4.2.12",
     "@types/mocha": "^8.0.3",
+    "@types/node": "^14.14.37",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
     "@typescript-eslint/eslint-plugin": "^3.7.0",

src/property.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
-import { BaseProperty, PropertyType } from 'admin-bro'
-import { ModelAttributeColumnOptions } from 'sequelize/types'
+import { BaseProperty, PropertyType } from 'admin-bro';
+import { ModelAttributeColumnOptions } from 'sequelize/types';
 
 const TYPES_MAPPING = [
   ['STRING', 'string'],
@@ -25,99 +25,98 @@ const TYPES_MAPPING = [
   ['RANGE', 'string'],
   ['GEOMETRY', 'string'],
   ['BOOLEAN', 'boolean'],
-]
+];
 
 class Property extends BaseProperty {
   private sequelizePath: ModelAttributeColumnOptions
 
   private fieldName: string
 
   constructor(sequelizePath: ModelAttributeColumnOptions) {
-    const { fieldName } = sequelizePath as any
-    super({ path: fieldName })
-    this.fieldName = fieldName
-    this.sequelizePath = sequelizePath
+    const { fieldName } = sequelizePath as any;
+    super({ path: fieldName });
+    this.fieldName = fieldName;
+    this.sequelizePath = sequelizePath;
   }
 
   name(): string {
-    return this.fieldName
+    return this.fieldName;
   }
 
   isEditable(): boolean {
     if ((this.sequelizePath as any)._autoGenerated) {
-      return false
+      return false;
     }
     if (this.sequelizePath.autoIncrement) {
-      return false
+      return false;
     }
     if (this.isId()) {
-      return false
+      return false;
     }
-    return true
+    return true;
   }
 
   isVisible(): boolean {
     // fields containing password are hidden by default
-    return !this.name().match('password')
+    return !this.name().match('password');
   }
 
   isId(): boolean {
-    return !!this.sequelizePath.primaryKey
+    return !!this.sequelizePath.primaryKey;
   }
 
   reference(): string | null {
     if (this.isArray()) {
-      return null
+      return null;
     }
 
     if (this.sequelizePath.references === 'string') {
-      return this.sequelizePath.references as string
+      return this.sequelizePath.references as string;
     } if (this.sequelizePath.references && typeof this.sequelizePath.references !== 'string') {
-      return this.sequelizePath.references?.model as string
+      return this.sequelizePath.references?.model as string;
     }
-    return null
+    return null;
   }
 
   availableValues(): Array<string> | null {
     return this.sequelizePath.values && this.sequelizePath.values.length
       ? this.sequelizePath.values as Array<string>
-      : null
+      : null;
   }
 
   isArray(): boolean {
-    return this.sequelizePath.type.constructor.name === 'ARRAY'
+    return this.sequelizePath.type.constructor.name === 'ARRAY';
   }
 
   /**
    * @returns {PropertyType}
    */
   type(): PropertyType {
-    let sequelizeType = this.sequelizePath.type
+    let sequelizeType = this.sequelizePath.type;
 
     if (this.isArray()) {
-      sequelizeType = (sequelizeType as any).type
+      sequelizeType = (sequelizeType as any).type;
     }
 
     const key = TYPES_MAPPING.find((element) => (
       sequelizeType.constructor.name === element[0]
-    ))
+    ));
 
     if (this.reference()) {
-      return 'reference' as PropertyType
+      return 'reference' as PropertyType;
     }
 
-    const type = key && key[1]
-    return (type || 'string') as PropertyType
+    const type = key && key[1];
+    return (type || 'string') as PropertyType;
   }
 
   isSortable(): boolean {
-    return this.type() !== 'mixed' && !this.isArray()
+    return this.type() !== 'mixed' && !this.isArray();
   }
 
   isRequired(): boolean {
-    return !(typeof this.sequelizePath.allowNull === 'undefined'
-      || this.sequelizePath.allowNull === true)
+    return !(typeof this.sequelizePath.allowNull === 'undefined' || this.sequelizePath.allowNull);
   }
 }
 
-export default Property
+export default Property;