Merge pull request #684 from hedgedoc/renovate/prettier-2.x

Update dependency prettier to v2

package.json

@@ -57,7 +57,7 @@
     "eslint-config-prettier": "7.1.0",
     "eslint-plugin-import": "2.22.1",
     "jest": "26.6.3",
-    "prettier": "1.19.1",
+    "prettier": "2.2.1",
     "supertest": "6.0.1",
     "ts-jest": "26.1.0",
     "ts-loader": "8.0.14",

src/media/media-upload.entity.ts

@@ -23,10 +23,10 @@ export class MediaUpload {
   @PrimaryColumn()
   id: string;
 
-  @ManyToOne(_ => Note, { nullable: false })
+  @ManyToOne((_) => Note, { nullable: false })
   note: Note;
 
-  @ManyToOne(_ => User, { nullable: false })
+  @ManyToOne((_) => User, { nullable: false })
   user: User;
 
   @Column({

src/monitoring/monitoring.service.ts

@@ -25,7 +25,7 @@ async function getServerVersionFromPackageJson() {
     const packageInfo: { version: string } = JSON.parse(rawFileContent);
     const versionParts: number[] = packageInfo.version
       .split('.')
-      .map(x => parseInt(x, 10));
+      .map((x) => parseInt(x, 10));
     versionCache = {
       major: versionParts[0],
       minor: versionParts[1],

src/notes/author-color.entity.ts

@@ -10,16 +10,12 @@ import { Note } from './note.entity';
 
 @Entity()
 export class AuthorColor {
-  @ManyToOne(
+  @ManyToOne((_) => Note, (note) => note.authorColors, {
-    _ => Note,
-    note => note.authorColors,
-    {
     primary: true,
-    },
+  })
-  )
   note: Note;
 
-  @ManyToOne(_ => User, {
+  @ManyToOne((_) => User, {
     primary: true,
   })
   user: User;

src/notes/note.entity.ts

@@ -36,36 +36,22 @@ export class Note {
   })
   alias?: string;
   @OneToMany(
-    _ => NoteGroupPermission,
+    (_) => NoteGroupPermission,
-    groupPermission => groupPermission.note,
+    (groupPermission) => groupPermission.note,
   )
   groupPermissions: NoteGroupPermission[];
-  @OneToMany(
+  @OneToMany((_) => NoteUserPermission, (userPermission) => userPermission.note)
-    _ => NoteUserPermission,
-    userPermission => userPermission.note,
-  )
   userPermissions: NoteUserPermission[];
   @Column({
     nullable: false,
     default: 0,
   })
   viewcount: number;
-  @ManyToOne(
+  @ManyToOne((_) => User, (user) => user.ownedNotes, { onDelete: 'CASCADE' })
-    _ => User,
-    user => user.ownedNotes,
-    { onDelete: 'CASCADE' },
-  )
   owner: User;
-  @OneToMany(
+  @OneToMany((_) => Revision, (revision) => revision.note, { cascade: true })
-    _ => Revision,
-    revision => revision.note,
-    { cascade: true },
-  )
   revisions: Promise<Revision[]>;
-  @OneToMany(
+  @OneToMany((_) => AuthorColor, (authorColor) => authorColor.note)
-    _ => AuthorColor,
-    authorColor => authorColor.note,
-  )
   authorColors: AuthorColor[];
 
   @Column({
@@ -77,11 +63,7 @@ export class Note {
   })
   title?: string;
 
-  @ManyToMany(
+  @ManyToMany((_) => Tag, (tag) => tag.notes, { eager: true, cascade: true })
-    _ => Tag,
-    tag => tag.notes,
-    { eager: true, cascade: true },
-  )
   @JoinTable()
   tags: Tag[];
 

src/notes/notes.service.ts

@@ -113,20 +113,22 @@ export class NotesService {
       // TODO: Get actual createTime
       createTime: new Date(),
       description: note.description,
-      editedBy: note.authorColors.map(authorColor => authorColor.user.userName),
+      editedBy: note.authorColors.map(
+        (authorColor) => authorColor.user.userName,
+      ),
       // TODO: Extract into method
       permissions: {
         owner: this.usersService.toUserDto(note.owner),
-        sharedToUsers: note.userPermissions.map(noteUserPermission => ({
+        sharedToUsers: note.userPermissions.map((noteUserPermission) => ({
           user: this.usersService.toUserDto(noteUserPermission.user),
           canEdit: noteUserPermission.canEdit,
         })),
-        sharedToGroups: note.groupPermissions.map(noteGroupPermission => ({
+        sharedToGroups: note.groupPermissions.map((noteGroupPermission) => ({
           group: noteGroupPermission.group,
           canEdit: noteGroupPermission.canEdit,
         })),
       },
-      tags: note.tags.map(tag => tag.name),
+      tags: note.tags.map((tag) => tag.name),
       updateTime: (await this.getLastRevision(note)).createdAt,
       // TODO: Get actual updateUser
       updateUser: {

src/notes/tag.entity.ts

@@ -17,9 +17,6 @@ export class Tag {
   })
   name: string;
 
-  @ManyToMany(
+  @ManyToMany((_) => Note, (note) => note.tags)
-    _ => Note,
-    note => note.tags,
-  )
   notes: Note[];
 }

src/permissions/note-group-permission.entity.ts

@@ -10,14 +10,10 @@ import { Note } from '../notes/note.entity';
 
 @Entity()
 export class NoteGroupPermission {
-  @ManyToOne(_ => Group, { primary: true })
+  @ManyToOne((_) => Group, { primary: true })
   group: Group;
 
-  @ManyToOne(
+  @ManyToOne((_) => Note, (note) => note.groupPermissions, { primary: true })
-    _ => Note,
-    note => note.groupPermissions,
-    { primary: true },
-  )
   note: Note;
 
   @Column()

src/permissions/note-user-permission.entity.ts

@@ -10,14 +10,10 @@ import { User } from '../users/user.entity';
 
 @Entity()
 export class NoteUserPermission {
-  @ManyToOne(_ => User, { primary: true })
+  @ManyToOne((_) => User, { primary: true })
   user: User;
 
-  @ManyToOne(
+  @ManyToOne((_) => Note, (note) => note.userPermissions, { primary: true })
-    _ => Note,
-    note => note.userPermissions,
-    { primary: true },
-  )
   note: Note;
 
   @Column()

src/revisions/authorship.entity.ts

@@ -27,16 +27,13 @@ export class Authorship {
   /**
    * Revisions this authorship appears in
    */
-  @ManyToMany(
+  @ManyToMany((_) => Revision, (revision) => revision.authorships)
-    _ => Revision,
-    revision => revision.authorships,
-  )
   revisions: Revision[];
 
   /**
    * User this authorship represents
    */
-  @ManyToOne(_ => User)
+  @ManyToOne((_) => User)
   user: User;
 
   @Column()

src/revisions/revision.entity.ts

@@ -56,19 +56,12 @@ export class Revision {
   /**
    * Note this revision belongs to.
    */
-  @ManyToOne(
+  @ManyToOne((_) => Note, (note) => note.revisions, { onDelete: 'CASCADE' })
-    _ => Note,
-    note => note.revisions,
-    { onDelete: 'CASCADE' },
-  )
   note: Note;
   /**
    * All authorship objects which are used in the revision.
    */
-  @ManyToMany(
+  @ManyToMany((_) => Authorship, (authorship) => authorship.revisions)
-    _ => Authorship,
-    authorship => authorship.revisions,
-  )
   @JoinTable()
   authorships: Authorship[];
 

src/revisions/revisions.service.ts

@@ -33,7 +33,7 @@ export class RevisionsService {
         note: note.id,
       },
     });
-    return revisions.map(revision => this.toMetadataDto(revision));
+    return revisions.map((revision) => this.toMetadataDto(revision));
   }
 
   async getNoteRevision(

src/users/auth-token.entity.ts

@@ -17,10 +17,7 @@ export class AuthToken {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ManyToOne(
+  @ManyToOne((_) => User, (user) => user.authToken)
-    _ => User,
-    user => user.authToken,
-  )
   user: User;
 
   @Column()

src/users/identity.entity.ts

@@ -19,10 +19,7 @@ export class Identity {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @ManyToOne(
+  @ManyToOne((_) => User, (user) => user.identities)
-    _ => User,
-    user => user.identities,
-  )
   user: User;
 
   @Column()

src/users/user.entity.ts

@@ -42,22 +42,13 @@ export class User {
   })
   email?: string;
 
-  @OneToMany(
+  @OneToMany((_) => Note, (note) => note.owner)
-    _ => Note,
-    note => note.owner,
-  )
   ownedNotes: Note[];
 
-  @OneToMany(
+  @OneToMany((_) => AuthToken, (authToken) => authToken.user)
-    _ => AuthToken,
-    authToken => authToken.user,
-  )
   authToken: AuthToken[];
 
-  @OneToMany(
+  @OneToMany((_) => Identity, (identity) => identity.user)
-    _ => Identity,
-    identity => identity.user,
-  )
   identities: Identity[];
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function

test/public-api/notes.e2e-spec.ts

@@ -84,9 +84,7 @@ describe('Notes', () => {
 
   it(`DELETE /notes/{note}`, async () => {
     await notesService.createNote('This is a test note.', 'test3');
-    await request(app.getHttpServer())
+    await request(app.getHttpServer()).delete('/notes/test3').expect(200);
-      .delete('/notes/test3')
-      .expect(200);
     return expect(notesService.getNoteByIdOrAlias('test3')).rejects.toEqual(
       new NotInDBError("Note with id/alias 'test3' not found."),
     );

yarn.lock

@@ -5530,10 +5530,10 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier@1.19.1:
+prettier@2.2.1:
-  version "1.19.1"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 pretty-format@^25.2.1, pretty-format@^25.5.0:
   version "25.5.0"