From db79a2cd1ea30d6363dfdb040bb7f6d11f3bb2fd Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Tue, 29 Dec 2020 13:03:20 -0800 Subject: [PATCH] ts: models --- server/models/{ApiKey.js => ApiKey.ts} | 1 - .../models/{Attachment.js => Attachment.ts} | 1 - .../{Authentication.js => Authentication.ts} | 1 - server/models/{Backlink.js => Backlink.ts} | 1 - ...{Collection.test.js => Collection.test.ts} | 0 .../models/{Collection.js => Collection.ts} | 1 - ...{CollectionGroup.js => CollectionGroup.ts} | 1 - .../{CollectionUser.js => CollectionUser.ts} | 1 - .../{Document.test.js => Document.test.ts} | 0 server/models/{Document.js => Document.ts} | 19 +++++-------------- server/models/{Event.js => Event.ts} | 1 - .../models/{Group.test.js => Group.test.ts} | 0 server/models/{Group.js => Group.ts} | 1 - server/models/{GroupUser.js => GroupUser.ts} | 1 - .../models/{Integration.js => Integration.ts} | 1 - .../{Notification.js => Notification.ts} | 1 - ...ationSetting.js => NotificationSetting.ts} | 1 - .../{Revision.test.js => Revision.test.ts} | 0 server/models/{Revision.js => Revision.ts} | 1 - .../models/{SearchQuery.js => SearchQuery.ts} | 1 - server/models/{Share.js => Share.ts} | 1 - server/models/{Star.js => Star.ts} | 1 - server/models/{Team.test.js => Team.test.ts} | 0 server/models/{Team.js => Team.ts} | 1 - server/models/{User.test.js => User.test.ts} | 0 server/models/{User.js => User.ts} | 1 - server/models/{View.js => View.ts} | 1 - server/models/{index.js => index.ts} | 1 - 28 files changed, 5 insertions(+), 35 deletions(-) rename server/models/{ApiKey.js => ApiKey.ts} (98%) rename server/models/{Attachment.js => Attachment.ts} (99%) rename server/models/{Authentication.js => Authentication.ts} (98%) rename server/models/{Backlink.js => Backlink.ts} (98%) rename server/models/{Collection.test.js => Collection.test.ts} (100%) rename server/models/{Collection.js => Collection.ts} (99%) rename server/models/{CollectionGroup.js => CollectionGroup.ts} (98%) rename server/models/{CollectionUser.js => CollectionUser.ts} (98%) rename server/models/{Document.test.js => Document.test.ts} (100%) rename server/models/{Document.js => Document.ts} (98%) rename server/models/{Event.js => Event.ts} (99%) rename server/models/{Group.test.js => Group.test.ts} (100%) rename server/models/{Group.js => Group.ts} (99%) rename server/models/{GroupUser.js => GroupUser.ts} (98%) rename server/models/{Integration.js => Integration.ts} (98%) rename server/models/{Notification.js => Notification.ts} (98%) rename server/models/{NotificationSetting.js => NotificationSetting.ts} (99%) rename server/models/{Revision.test.js => Revision.test.ts} (100%) rename server/models/{Revision.js => Revision.ts} (99%) rename server/models/{SearchQuery.js => SearchQuery.ts} (98%) rename server/models/{Share.js => Share.ts} (99%) rename server/models/{Star.js => Star.ts} (97%) rename server/models/{Team.test.js => Team.test.ts} (100%) rename server/models/{Team.js => Team.ts} (99%) rename server/models/{User.test.js => User.test.ts} (100%) rename server/models/{User.js => User.ts} (99%) rename server/models/{View.js => View.ts} (99%) rename server/models/{index.js => index.ts} (99%) diff --git a/server/models/ApiKey.js b/server/models/ApiKey.ts similarity index 98% rename from server/models/ApiKey.js rename to server/models/ApiKey.ts index bde19492ed..03c037ad63 100644 --- a/server/models/ApiKey.js +++ b/server/models/ApiKey.ts @@ -1,4 +1,3 @@ -// @flow import randomstring from "randomstring"; import { DataTypes, sequelize } from "../sequelize"; diff --git a/server/models/Attachment.js b/server/models/Attachment.ts similarity index 99% rename from server/models/Attachment.js rename to server/models/Attachment.ts index e5792ece32..4dc918ff17 100644 --- a/server/models/Attachment.js +++ b/server/models/Attachment.ts @@ -1,4 +1,3 @@ -// @flow import path from "path"; import { DataTypes, sequelize } from "../sequelize"; import { deleteFromS3 } from "../utils/s3"; diff --git a/server/models/Authentication.js b/server/models/Authentication.ts similarity index 98% rename from server/models/Authentication.js rename to server/models/Authentication.ts index 0b32d9767d..43f87e5679 100644 --- a/server/models/Authentication.js +++ b/server/models/Authentication.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize, encryptedFields } from "../sequelize"; const Authentication = sequelize.define("authentication", { diff --git a/server/models/Backlink.js b/server/models/Backlink.ts similarity index 98% rename from server/models/Backlink.js rename to server/models/Backlink.ts index bc0821f037..94644bc624 100644 --- a/server/models/Backlink.js +++ b/server/models/Backlink.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const Backlink = sequelize.define("backlink", { diff --git a/server/models/Collection.test.js b/server/models/Collection.test.ts similarity index 100% rename from server/models/Collection.test.js rename to server/models/Collection.test.ts diff --git a/server/models/Collection.js b/server/models/Collection.ts similarity index 99% rename from server/models/Collection.js rename to server/models/Collection.ts index bfd67ed436..ffbcc3a314 100644 --- a/server/models/Collection.js +++ b/server/models/Collection.ts @@ -1,4 +1,3 @@ -// @flow import { find, concat, remove, uniq } from "lodash"; import randomstring from "randomstring"; import slug from "slug"; diff --git a/server/models/CollectionGroup.js b/server/models/CollectionGroup.ts similarity index 98% rename from server/models/CollectionGroup.js rename to server/models/CollectionGroup.ts index 521dc10d09..7cca493698 100644 --- a/server/models/CollectionGroup.js +++ b/server/models/CollectionGroup.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const CollectionGroup = sequelize.define( diff --git a/server/models/CollectionUser.js b/server/models/CollectionUser.ts similarity index 98% rename from server/models/CollectionUser.js rename to server/models/CollectionUser.ts index 4b440edeb2..cfe1292f33 100644 --- a/server/models/CollectionUser.js +++ b/server/models/CollectionUser.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const CollectionUser = sequelize.define( diff --git a/server/models/Document.test.js b/server/models/Document.test.ts similarity index 100% rename from server/models/Document.test.js rename to server/models/Document.test.ts diff --git a/server/models/Document.js b/server/models/Document.ts similarity index 98% rename from server/models/Document.js rename to server/models/Document.ts index 71900e7692..3d683039bb 100644 --- a/server/models/Document.js +++ b/server/models/Document.ts @@ -1,4 +1,3 @@ -// @flow import removeMarkdown from "@tommoor/remove-markdown"; import { compact, find, map, uniq } from "lodash"; import randomstring from "randomstring"; @@ -228,9 +227,9 @@ type SearchResponse = { results: { ranking: number, context: string, - document: Document, + document: Document }[], - totalCount: number, + totalCount: number }; type SearchOptions = { @@ -240,7 +239,7 @@ type SearchOptions = { dateFilter?: "day" | "week" | "month" | "year", collaboratorIds?: string[], includeArchived?: boolean, - includeDrafts?: boolean, + includeDrafts?: boolean }; function escape(query: string): string { @@ -249,11 +248,7 @@ function escape(query: string): string { return sequelize.escape(query).replace("\\", "\\\\"); } -Document.searchForTeam = async ( - team, - query, - options: SearchOptions = {} -): Promise => { +Document.searchForTeam = async (team, query, options: SearchOptions = {}): Promise => { const limit = options.limit || 15; const offset = options.offset || 0; const wildcardQuery = `${escape(query)}:*`; @@ -339,11 +334,7 @@ Document.searchForTeam = async ( }; }; -Document.searchForUser = async ( - user, - query, - options: SearchOptions = {} -): Promise => { +Document.searchForUser = async (user, query, options: SearchOptions = {}): Promise => { const limit = options.limit || 15; const offset = options.offset || 0; const wildcardQuery = `${escape(query)}:*`; diff --git a/server/models/Event.js b/server/models/Event.ts similarity index 99% rename from server/models/Event.js rename to server/models/Event.ts index c0fa2374c4..de2aacb63d 100644 --- a/server/models/Event.js +++ b/server/models/Event.ts @@ -1,4 +1,3 @@ -// @flow import events from "../events"; import { DataTypes, sequelize } from "../sequelize"; diff --git a/server/models/Group.test.js b/server/models/Group.test.ts similarity index 100% rename from server/models/Group.test.js rename to server/models/Group.test.ts diff --git a/server/models/Group.js b/server/models/Group.ts similarity index 99% rename from server/models/Group.js rename to server/models/Group.ts index 9dae4b891c..7965c12e2d 100644 --- a/server/models/Group.js +++ b/server/models/Group.ts @@ -1,4 +1,3 @@ -// @flow import { CollectionGroup, GroupUser } from "../models"; import { Op, DataTypes, sequelize } from "../sequelize"; diff --git a/server/models/GroupUser.js b/server/models/GroupUser.ts similarity index 98% rename from server/models/GroupUser.js rename to server/models/GroupUser.ts index b978afe61c..92ef420ff4 100644 --- a/server/models/GroupUser.js +++ b/server/models/GroupUser.ts @@ -1,4 +1,3 @@ -// @flow import { sequelize } from "../sequelize"; const GroupUser = sequelize.define( diff --git a/server/models/Integration.js b/server/models/Integration.ts similarity index 98% rename from server/models/Integration.js rename to server/models/Integration.ts index a21365265b..85b5c830f7 100644 --- a/server/models/Integration.js +++ b/server/models/Integration.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const Integration = sequelize.define("integration", { diff --git a/server/models/Notification.js b/server/models/Notification.ts similarity index 98% rename from server/models/Notification.js rename to server/models/Notification.ts index bb1f00c105..34f36393c3 100644 --- a/server/models/Notification.js +++ b/server/models/Notification.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const Notification = sequelize.define( diff --git a/server/models/NotificationSetting.js b/server/models/NotificationSetting.ts similarity index 99% rename from server/models/NotificationSetting.js rename to server/models/NotificationSetting.ts index 490857f610..b80907cfe8 100644 --- a/server/models/NotificationSetting.js +++ b/server/models/NotificationSetting.ts @@ -1,4 +1,3 @@ -// @flow import crypto from "crypto"; import { DataTypes, sequelize } from "../sequelize"; diff --git a/server/models/Revision.test.js b/server/models/Revision.test.ts similarity index 100% rename from server/models/Revision.test.js rename to server/models/Revision.test.ts diff --git a/server/models/Revision.js b/server/models/Revision.ts similarity index 99% rename from server/models/Revision.js rename to server/models/Revision.ts index 707be02cd6..72e8c3f980 100644 --- a/server/models/Revision.js +++ b/server/models/Revision.ts @@ -1,4 +1,3 @@ -// @flow import MarkdownSerializer from "slate-md-serializer"; import { DataTypes, sequelize } from "../sequelize"; diff --git a/server/models/SearchQuery.js b/server/models/SearchQuery.ts similarity index 98% rename from server/models/SearchQuery.js rename to server/models/SearchQuery.ts index cd7258d356..d8d9e4f491 100644 --- a/server/models/SearchQuery.js +++ b/server/models/SearchQuery.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const SearchQuery = sequelize.define( diff --git a/server/models/Share.js b/server/models/Share.ts similarity index 99% rename from server/models/Share.js rename to server/models/Share.ts index b8ddec136c..9f33298d29 100644 --- a/server/models/Share.js +++ b/server/models/Share.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const Share = sequelize.define( diff --git a/server/models/Star.js b/server/models/Star.ts similarity index 97% rename from server/models/Star.js rename to server/models/Star.ts index 46355c1154..c3837c9376 100644 --- a/server/models/Star.js +++ b/server/models/Star.ts @@ -1,4 +1,3 @@ -// @flow import { DataTypes, sequelize } from "../sequelize"; const Star = sequelize.define("star", { diff --git a/server/models/Team.test.js b/server/models/Team.test.ts similarity index 100% rename from server/models/Team.test.js rename to server/models/Team.test.ts diff --git a/server/models/Team.js b/server/models/Team.ts similarity index 99% rename from server/models/Team.js rename to server/models/Team.ts index 9784019e60..3c42626262 100644 --- a/server/models/Team.js +++ b/server/models/Team.ts @@ -1,4 +1,3 @@ -// @flow import fs from "fs"; import path from "path"; import { URL } from "url"; diff --git a/server/models/User.test.js b/server/models/User.test.ts similarity index 100% rename from server/models/User.test.js rename to server/models/User.test.ts diff --git a/server/models/User.js b/server/models/User.ts similarity index 99% rename from server/models/User.js rename to server/models/User.ts index d11f949662..3261b64813 100644 --- a/server/models/User.js +++ b/server/models/User.ts @@ -1,4 +1,3 @@ -// @flow import crypto from "crypto"; import addMinutes from "date-fns/add_minutes"; import subMinutes from "date-fns/sub_minutes"; diff --git a/server/models/View.js b/server/models/View.ts similarity index 99% rename from server/models/View.js rename to server/models/View.ts index 7607aebc8f..0202a2f57f 100644 --- a/server/models/View.js +++ b/server/models/View.ts @@ -1,4 +1,3 @@ -// @flow import subMilliseconds from "date-fns/sub_milliseconds"; import { USER_PRESENCE_INTERVAL } from "../../shared/constants"; import { User } from "../models"; diff --git a/server/models/index.js b/server/models/index.ts similarity index 99% rename from server/models/index.js rename to server/models/index.ts index c5f2da6acd..9927ea9bd4 100644 --- a/server/models/index.js +++ b/server/models/index.ts @@ -1,4 +1,3 @@ -// @flow import ApiKey from "./ApiKey"; import Attachment from "./Attachment"; import Authentication from "./Authentication";