@nocobase/database 0.9.0-alpha.2 → 0.9.1-alpha.2

package/lib/fields/field.js

@@ -15,6 +15,8 @@ function _lodash() {
   return data;
 }
 
+var _utils = require("../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -46,8 +48,8 @@ class Field {
     this.database = void 0;
     this.collection = void 0;
     this.context = context;
-    this.database = context.database;
-    this.collection = context.collection;
+    this.database = this.context.database;
+    this.collection = this.context.collection;
     this.options = options || {};
     this.init();
   }
@@ -95,6 +97,18 @@ class Field {
     return this.collection.removeField(this.name);
   }
 
+  columnName() {
+    if (this.options.field) {
+      return this.options.field;
+    }
+
+    if (this.database.options.underscored) {
+      return (0, _utils.snakeCase)(this.name);
+    }
+
+    return this.name;
+  }
+
   removeFromDb(options) {
     var _this2 = this;
 
@@ -126,7 +140,15 @@ class Field {
 
       if (_this2.collection.model.options.timestamps !== false) {
         // timestamps 相关字段不删除
-        if (['createdAt', 'updatedAt', 'deletedAt'].includes(_this2.name)) {
+        let timestampsFields = ['createdAt', 'updatedAt', 'deletedAt'];
+
+        if (_this2.database.options.underscored) {
+          timestampsFields = timestampsFields.map(field => (0, _utils.snakeCase)(field));
+        }
+
+        if (timestampsFields.includes(_this2.columnName())) {
+          _this2.collection.fields.delete(_this2.name);
+
           return;
         }
       } // 排序字段通过 sortable 控制
@@ -148,21 +170,21 @@ class Field {
         if (_this2.name === sortField) {
           return;
         }
-      }
+      } // if (this.options.field && this.name !== this.options.field) {
+      //   // field 指向的是真实的字段名，如果与 name 不一样，说明字段只是引用
+      //   this.remove();
+      //   return;
+      // }
 
-      if (_this2.options.field && _this2.name !== _this2.options.field) {
-        // field 指向的是真实的字段名，如果与 name 不一样，说明字段只是引用
-        _this2.remove();
 
-        return;
-      }
+      const columnReferencesCount = _lodash().default.filter(_this2.collection.model.rawAttributes, attr => attr.field == _this2.columnName()).length;
 
-      if (yield _this2.existsInDb({
+      if ((yield _this2.existsInDb({
         transaction: options === null || options === void 0 ? void 0 : options.transaction
-      })) {
+      })) && columnReferencesCount == 1) {
         const queryInterface = _this2.database.sequelize.getQueryInterface();
 
-        yield queryInterface.removeColumn(_this2.collection.model.tableName, _this2.name, options);
+        yield queryInterface.removeColumn(_this2.collection.addSchemaTableName(), _this2.columnName(), options);
       }
 
       _this2.remove();
@@ -179,18 +201,18 @@ class Field {
       let sql;
 
       if (_this3.database.sequelize.getDialect() === 'sqlite') {
-        sql = `SELECT * from pragma_table_info('${_this3.collection.model.tableName}') WHERE name = '${_this3.name}'`;
+        sql = `SELECT * from pragma_table_info('${_this3.collection.model.tableName}') WHERE name = '${_this3.columnName()}'`;
       } else if (_this3.database.inDialect('mysql')) {
         sql = `
         select column_name
         from INFORMATION_SCHEMA.COLUMNS
-        where TABLE_SCHEMA='${_this3.database.options.database}' AND TABLE_NAME='${_this3.collection.model.tableName}' AND column_name='${_this3.name}'
+        where TABLE_SCHEMA='${_this3.database.options.database}' AND TABLE_NAME='${_this3.collection.model.tableName}' AND column_name='${_this3.columnName()}'
       `;
       } else {
         sql = `
         select column_name
         from INFORMATION_SCHEMA.COLUMNS
-        where TABLE_NAME='${_this3.collection.model.tableName}' AND column_name='${_this3.name}'
+        where TABLE_NAME='${_this3.collection.model.tableName}' AND column_name='${_this3.columnName()}' AND table_schema='${_this3.collection.collectionSchema() || 'public'}'
       `;
       }
 

package/lib/fields/has-one-field.d.ts

@@ -1,6 +1,6 @@
 import { AssociationScope, DataType, ForeignKeyOptions, HasOneOptions, HasOneOptions as SequelizeHasOneOptions } from 'sequelize';
-import { BaseRelationFieldOptions, RelationField } from './relation-field';
 import { Reference } from '../features/ReferencesMap';
+import { BaseRelationFieldOptions, RelationField } from './relation-field';
 export interface HasOneFieldOptions extends HasOneOptions {
     /**
      * The name of the field to use as the key for the association in the source table. Defaults to the primary

package/lib/fields/has-one-field.js

@@ -48,12 +48,16 @@ class HasOneField extends _relationField.RelationField {
   }
 
   get foreignKey() {
-    if (this.options.foreignKey) {
-      return this.options.foreignKey;
-    }
+    const foreignKey = (() => {
+      if (this.options.foreignKey) {
+        return this.options.foreignKey;
+      }
+
+      const model = this.context.collection.model;
+      return _sequelize().Utils.camelize([model.options.name.singular, model.primaryKeyAttribute].join('_'));
+    })();
 
-    const model = this.context.collection.model;
-    return _sequelize().Utils.camelize([model.options.name.singular, model.primaryKeyAttribute].join('_'));
+    return foreignKey;
   }
 
   reference(association) {

package/lib/fields/number-field.d.ts

@@ -1,38 +1,41 @@
 import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
-export declare class IntegerField extends Field {
+declare abstract class NumberField extends Field {
+}
+export declare class IntegerField extends NumberField {
     get dataType(): DataTypes.IntegerDataTypeConstructor;
 }
 export interface IntegerFieldOptions extends BaseColumnFieldOptions {
     type: 'integer';
 }
-export declare class BigIntField extends Field {
+export declare class BigIntField extends NumberField {
     get dataType(): DataTypes.BigIntDataTypeConstructor;
 }
 export interface BigIntFieldOptions extends BaseColumnFieldOptions {
     type: 'bigInt';
 }
-export declare class FloatField extends Field {
+export declare class FloatField extends NumberField {
     get dataType(): DataTypes.FloatDataTypeConstructor;
 }
 export interface FloatFieldOptions extends BaseColumnFieldOptions {
     type: 'float';
 }
-export declare class DoubleField extends Field {
+export declare class DoubleField extends NumberField {
     get dataType(): DataTypes.DoubleDataTypeConstructor;
 }
 export interface DoubleFieldOptions extends BaseColumnFieldOptions {
     type: 'double';
 }
-export declare class RealField extends Field {
+export declare class RealField extends NumberField {
     get dataType(): DataTypes.RealDataTypeConstructor;
 }
 export interface RealFieldOptions extends BaseColumnFieldOptions {
     type: 'real';
 }
-export declare class DecimalField extends Field {
+export declare class DecimalField extends NumberField {
     get dataType(): DataTypes.DecimalDataTypeConstructor;
 }
 export interface DecimalFieldOptions extends BaseColumnFieldOptions {
     type: 'decimal';
 }
+export {};

package/lib/fields/number-field.js

@@ -17,7 +17,9 @@ function _sequelize() {
 
 var _field = require("./field");
 
-class IntegerField extends _field.Field {
+class NumberField extends _field.Field {}
+
+class IntegerField extends NumberField {
   get dataType() {
     return _sequelize().DataTypes.INTEGER;
   }
@@ -26,7 +28,7 @@ class IntegerField extends _field.Field {
 
 exports.IntegerField = IntegerField;
 
-class BigIntField extends _field.Field {
+class BigIntField extends NumberField {
   get dataType() {
     return _sequelize().DataTypes.BIGINT;
   }
@@ -35,7 +37,7 @@ class BigIntField extends _field.Field {
 
 exports.BigIntField = BigIntField;
 
-class FloatField extends _field.Field {
+class FloatField extends NumberField {
   get dataType() {
     return _sequelize().DataTypes.FLOAT;
   }
@@ -44,7 +46,7 @@ class FloatField extends _field.Field {
 
 exports.FloatField = FloatField;
 
-class DoubleField extends _field.Field {
+class DoubleField extends NumberField {
   get dataType() {
     return _sequelize().DataTypes.DOUBLE;
   }
@@ -53,7 +55,7 @@ class DoubleField extends _field.Field {
 
 exports.DoubleField = DoubleField;
 
-class RealField extends _field.Field {
+class RealField extends NumberField {
   get dataType() {
     return _sequelize().DataTypes.REAL;
   }
@@ -62,7 +64,7 @@ class RealField extends _field.Field {
 
 exports.RealField = RealField;
 
-class DecimalField extends _field.Field {
+class DecimalField extends NumberField {
   get dataType() {
     return _sequelize().DataTypes.DECIMAL;
   }

package/lib/fields/sort-field.js

@@ -125,9 +125,23 @@ class SortField extends _field.Field {
           transaction
         });
 
+        const orderKey = (() => {
+          const model = _this.collection.model;
+
+          if (model.primaryKeyAttribute) {
+            return model.primaryKeyAttribute;
+          }
+
+          if (model.rawAttributes['createdAt']) {
+            return 'createdAt';
+          }
+
+          throw new Error(`can not find order key for collection ${_this.collection.name}`);
+        })();
+
         if (emptyCount === totalCount && emptyCount > 0) {
           const records = yield _this.collection.repository.find({
-            order: [_this.collection.model.primaryKeyAttribute],
+            order: [orderKey],
             transaction
           });
           let start = 1;

package/lib/filter-parser.js

@@ -215,7 +215,7 @@ class FilterParser {
           origins.push(attr); // if it is target model attribute
 
           if (target.rawAttributes[attr]) {
-            associationKeys.push(attr);
+            associationKeys.push(target.rawAttributes[attr].field || attr);
             target = null;
           } else if (target.associations[attr]) {
             // if it is target model association (nested association filter)

package/lib/index.d.ts

@@ -1,9 +1,12 @@
 export { DataTypes, ModelStatic, Op, SyncOptions } from 'sequelize';
 export * from './collection';
-export * from './inherited-collection';
+export * from './collection-importer';
 export * from './database';
 export { Database as default } from './database';
+export * from './field-repository/array-field-repository';
 export * from './fields';
+export * from './filter-match';
+export * from './inherited-collection';
 export * from './magic-attribute-model';
 export * from './migration';
 export * from './mock-database';
@@ -15,6 +18,5 @@ export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
 export * from './repository';
 export * from './update-associations';
-export * from './collection-importer';
-export * from './filter-match';
-export * from './field-repository/array-field-repository';
+export { snakeCase } from './utils';
+export * from './value-parsers';

package/lib/index.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   DataTypes: true,
-  Op: true
+  Op: true,
+  snakeCase: true
 };
 Object.defineProperty(exports, "DataTypes", {
   enumerable: true,
@@ -25,6 +26,12 @@ Object.defineProperty(exports, "default", {
     return _database.Database;
   }
 });
+Object.defineProperty(exports, "snakeCase", {
+  enumerable: true,
+  get: function get() {
+    return _utils.snakeCase;
+  }
+});
 
 function _sequelize() {
   const data = require("sequelize");
@@ -50,16 +57,16 @@ Object.keys(_collection).forEach(function (key) {
   });
 });
 
-var _inheritedCollection = require("./inherited-collection");
+var _collectionImporter = require("./collection-importer");
 
-Object.keys(_inheritedCollection).forEach(function (key) {
+Object.keys(_collectionImporter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _inheritedCollection[key]) return;
+  if (key in exports && exports[key] === _collectionImporter[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _inheritedCollection[key];
+      return _collectionImporter[key];
     }
   });
 });
@@ -78,6 +85,20 @@ Object.keys(_database).forEach(function (key) {
   });
 });
 
+var _arrayFieldRepository = require("./field-repository/array-field-repository");
+
+Object.keys(_arrayFieldRepository).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _arrayFieldRepository[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _arrayFieldRepository[key];
+    }
+  });
+});
+
 var _fields = require("./fields");
 
 Object.keys(_fields).forEach(function (key) {
@@ -92,6 +113,34 @@ Object.keys(_fields).forEach(function (key) {
   });
 });
 
+var _filterMatch = require("./filter-match");
+
+Object.keys(_filterMatch).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _filterMatch[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _filterMatch[key];
+    }
+  });
+});
+
+var _inheritedCollection = require("./inherited-collection");
+
+Object.keys(_inheritedCollection).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _inheritedCollection[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _inheritedCollection[key];
+    }
+  });
+});
+
 var _magicAttributeModel = require("./magic-attribute-model");
 
 Object.keys(_magicAttributeModel).forEach(function (key) {
@@ -246,44 +295,18 @@ Object.keys(_updateAssociations).forEach(function (key) {
   });
 });
 
-var _collectionImporter = require("./collection-importer");
-
-Object.keys(_collectionImporter).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _collectionImporter[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _collectionImporter[key];
-    }
-  });
-});
-
-var _filterMatch = require("./filter-match");
+var _utils = require("./utils");
 
-Object.keys(_filterMatch).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _filterMatch[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _filterMatch[key];
-    }
-  });
-});
+var _valueParsers = require("./value-parsers");
 
-var _arrayFieldRepository = require("./field-repository/array-field-repository");
-
-Object.keys(_arrayFieldRepository).forEach(function (key) {
+Object.keys(_valueParsers).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _arrayFieldRepository[key]) return;
+  if (key in exports && exports[key] === _valueParsers[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _arrayFieldRepository[key];
+      return _valueParsers[key];
     }
   });
 });

package/lib/mock-database.d.ts

@@ -19,5 +19,7 @@ export declare function getConfigByEnv(): {
         collate: string;
     };
     timezone: string;
+    underscored: boolean;
+    schema: string;
 };
 export declare function mockDatabase(options?: IDatabaseOptions): MockDatabase;

package/lib/mock-database.js

@@ -62,7 +62,9 @@ function getConfigByEnv() {
       charset: 'utf8mb4',
       collate: 'utf8mb4_unicode_ci'
     },
-    timezone: process.env.DB_TIMEZONE
+    timezone: process.env.DB_TIMEZONE,
+    underscored: process.env.DB_UNDERSCORED === 'true',
+    schema: process.env.DB_SCHEMA !== 'public' ? process.env.DB_SCHEMA : undefined
   };
 }
 

package/lib/model.js

@@ -169,7 +169,16 @@ class Model extends _sequelize().Model {
     var _this = this;
 
     return _asyncToGenerator(function* () {
-      const model = _this; // fix sequelize sync with model that not have any column
+      const model = _this;
+      const _schema = model._schema;
+
+      if (_schema && _schema != 'public') {
+        yield _this.sequelize.query(`CREATE SCHEMA IF NOT EXISTS "${_schema}";`, {
+          raw: true,
+          transaction: options === null || options === void 0 ? void 0 : options.transaction
+        });
+      } // fix sequelize sync with model that not have any column
+
 
       if (Object.keys(model.tableAttributes).length === 0) {
         if (_this.database.inDialect('sqlite', 'mysql')) {

package/lib/options-parser.js

@@ -118,6 +118,9 @@ class OptionsParser {
             sortField[i] = associationModel.associations[associationKey].target;
             associationModel = sortField[i];
           }
+        } else {
+          const rawField = this.model.rawAttributes[sortField[0]];
+          sortField[0] = (rawField === null || rawField === void 0 ? void 0 : rawField.field) || sortField[0];
         }
 
         sortField.push(direction);

package/lib/query-interface/mysql-query-interface.d.ts

@@ -0,0 +1,7 @@
+import QueryInterface from './query-interface';
+import { Collection } from '../collection';
+import { Transactionable } from 'sequelize';
+export default class MysqlQueryInterface extends QueryInterface {
+    constructor(db: any);
+    collectionTableExists(collection: Collection, options?: Transactionable): Promise<boolean>;
+}

package/lib/query-interface/mysql-query-interface.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _queryInterface = _interopRequireDefault(require("./query-interface"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+class MysqlQueryInterface extends _queryInterface.default {
+  constructor(db) {
+    super(db);
+  }
+
+  collectionTableExists(collection, options) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const transaction = options === null || options === void 0 ? void 0 : options.transaction;
+      const tableName = collection.model.tableName;
+      const databaseName = _this.db.options.database;
+      const sql = `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '${databaseName}' AND TABLE_NAME = '${tableName}'`;
+      const results = yield _this.db.sequelize.query(sql, {
+        type: 'SELECT',
+        transaction
+      });
+      return results.length > 0;
+    })();
+  }
+
+}
+
+exports.default = MysqlQueryInterface;

package/lib/query-interface/postgres-query-interface.d.ts

@@ -0,0 +1,6 @@
+import QueryInterface from './query-interface';
+import { Collection } from '../collection';
+export default class PostgresQueryInterface extends QueryInterface {
+    constructor(db: any);
+    collectionTableExists(collection: Collection, options?: any): Promise<any>;
+}

package/lib/query-interface/postgres-query-interface.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _queryInterface = _interopRequireDefault(require("./query-interface"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+class PostgresQueryInterface extends _queryInterface.default {
+  constructor(db) {
+    super(db);
+  }
+
+  collectionTableExists(collection, options) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const transaction = options === null || options === void 0 ? void 0 : options.transaction;
+      const tableName = collection.model.tableName;
+      const schema = collection.collectionSchema() || 'public';
+      const sql = `SELECT EXISTS(SELECT 1 FROM information_schema.tables
+                 WHERE  table_schema = '${schema}'
+                 AND    table_name   = '${tableName}')`;
+      const results = yield _this.db.sequelize.query(sql, {
+        type: 'SELECT',
+        transaction
+      });
+      return results[0]['exists'];
+    })();
+  }
+
+}
+
+exports.default = PostgresQueryInterface;

package/lib/query-interface/query-interface-builder.d.ts

@@ -0,0 +1,2 @@
+import Database from '../database';
+export default function buildQueryInterface(db: Database): any;

package/lib/query-interface/query-interface-builder.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = buildQueryInterface;
+
+var _mysqlQueryInterface = _interopRequireDefault(require("./mysql-query-interface"));
+
+var _postgresQueryInterface = _interopRequireDefault(require("./postgres-query-interface"));
+
+var _sqliteQueryInterface = _interopRequireDefault(require("./sqlite-query-interface"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function buildQueryInterface(db) {
+  const map = {
+    mysql: _mysqlQueryInterface.default,
+    postgres: _postgresQueryInterface.default,
+    sqlite: _sqliteQueryInterface.default
+  };
+  return new map[db.options.dialect](db);
+}

package/lib/query-interface/query-interface.d.ts

@@ -0,0 +1,9 @@
+import Database from '../database';
+import { Collection } from '../collection';
+import { QueryInterface as SequelizeQueryInterface, Transactionable } from 'sequelize';
+export default abstract class QueryInterface {
+    db: Database;
+    sequelizeQueryInterface: SequelizeQueryInterface;
+    protected constructor(db: Database);
+    abstract collectionTableExists(collection: Collection, options?: Transactionable): Promise<boolean>;
+}

package/lib/query-interface/query-interface.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class QueryInterface {
+  constructor(db) {
+    this.db = void 0;
+    this.sequelizeQueryInterface = void 0;
+    this.db = db;
+    this.sequelizeQueryInterface = db.sequelize.getQueryInterface();
+  }
+
+}
+
+exports.default = QueryInterface;

package/lib/query-interface/sqlite-query-interface.d.ts

@@ -0,0 +1,6 @@
+import QueryInterface from './query-interface';
+import { Collection } from '../collection';
+export default class SqliteQueryInterface extends QueryInterface {
+    constructor(db: any);
+    collectionTableExists(collection: Collection, options?: any): Promise<boolean>;
+}