redundant cleared + style fixed

src/controllers/transport.ts

@@ -2,11 +2,10 @@ import fileType from 'file-type';
 import fetch from 'node-fetch';
 import fs from 'fs';
 import nodePath from 'path';
-
+import config from 'config';
 import Model, { FileData } from '../models/file';
 import crypto from '../utils/crypto';
 import deepMerge from '../utils/objects';
-import config from 'config';
 
 const random16 = crypto.random16;
 
@@ -107,7 +106,7 @@ class Transport {
       const fields: string[] = path.split(':');
 
       if (fields.length > 1) {
-        let object = {} as Dict;
+        let object: Dict = {};
         const result = object;
 
         fields.forEach((field, i) => {

src/exceptions/httpException.ts

@@ -1,5 +1,7 @@
 /**
- *
+ * HttpException class for middleware
+ * @property {number} status - exception status code
+ * @property {string} message - detail about the exception
  */
 class HttpException extends Error {
     public status: number;

src/models/alias.ts

@@ -32,11 +32,11 @@ interface AliasData {
  * @property {string} id - entity title
  */
 class Alias {
-  public _id: string | undefined;
-  public hash: string | undefined;
-  public type: string | undefined;
-  public deprecated: boolean | undefined;
-  public id: string | undefined;
+  public _id?: string;
+  public hash?: string;
+  public type?: string;
+  public deprecated?: boolean;
+  public id?: string;
 
   /**
    * @class
@@ -84,10 +84,6 @@ class Alias {
       data = await aliasesDb.findOne({ hash: hash });
     }
 
-    if (data instanceof Error) {
-      return new Alias();
-    }
-
     return new Alias(data);
   }
 

src/models/file.ts

@@ -34,12 +34,12 @@ export interface FileData {
  * @property {number} size - size of the file in
  */
 class File {
-  public _id: string | undefined;
-  public name: string | undefined;
-  public filename: string | undefined;
-  public path: string | undefined;
-  public mimetype: string | undefined;
-  public size: number | undefined;
+  public _id?: string;
+  public name?: string;
+  public filename?: string;
+  public path?: string;
+  public mimetype?: string;
+  public size?: number;
 
   /**
    * @class
@@ -90,10 +90,6 @@ class File {
   public static async getAll(query: object = {}): Promise<File[]> {
     const docs = await filesDb.find(query);
 
-    if (docs instanceof Error) {
-      return [];
-    }
-
     return Promise.all(docs.map(doc => new File(doc)));
   }
 

src/models/page.ts

@@ -17,7 +17,6 @@ export interface PageData {
   uri?: string;
   body?: any;
   parent?: string;
-  [key: string]: any;
 }
 
 /**
@@ -63,10 +62,6 @@ class Page {
   public static async get(_id: string): Promise<Page> {
     const data = await pagesDb.findOne({ _id });
 
-    if (data instanceof Error) {
-      return new Page();
-    }
-
     return new Page(data);
   }
 
@@ -79,10 +74,6 @@ class Page {
   public static async getByUri(uri: string): Promise<Page> {
     const data = await pagesDb.findOne({ uri });
 
-    if (data instanceof Error) {
-      return new Page();
-    }
-
     return new Page(data);
   }
 
@@ -95,10 +86,6 @@ class Page {
   public static async getAll(query: object = {}): Promise<Page[]> {
     const docs = await pagesDb.find(query);
 
-    if (docs instanceof Error) {
-      return [];
-    }
-
     return Promise.all(docs.map(doc => new Page(doc)));
   }
 
@@ -148,10 +135,6 @@ class Page {
   public async getParent(): Promise<Page|null> {
     const data = await pagesDb.findOne({ _id: this._parent });
 
-    if (data instanceof Error) {
-      return null;
-    }
-
     return new Page(data);
   }
 
@@ -163,10 +146,6 @@ class Page {
   public get children(): Promise<Page[]> {
     return pagesDb.find({ parent: this._id })
       .then(data => {
-        if (data instanceof Error) {
-          return [];
-        }
-
         return data.map(page => new Page(page));
       });
   }

src/models/pageOrder.ts

@@ -52,9 +52,9 @@ class PageOrder {
   public static async get(pageId: string): Promise<PageOrder> {
     const order = await db.findOne({ page: pageId });
 
-    let data = {} as PageOrderData;
+    let data: PageOrderData = {};
 
-    if (order instanceof Error || order === null) {
+    if (order === null) {
       data.page = pageId;
     } else {
       data = order;
@@ -72,10 +72,6 @@ class PageOrder {
   public static async getAll(query: object = {}): Promise<PageOrder[]> {
     const docs = await db.find(query);
 
-    if (docs === null || docs instanceof Error) {
-      return [];
-    }
-
     return Promise.all(docs.map(doc => new PageOrder(doc)));
   }
 
@@ -228,9 +224,7 @@ class PageOrder {
     if (!this._id) {
       const insertedRow = await db.insert(this.data) as { _id: string};
 
-      if (!(insertedRow instanceof Error)) {
-        this._id = insertedRow._id;
-      }
+      this._id = insertedRow._id;
     } else {
       await db.update({ _id: this._id }, this.data);
     }
@@ -247,8 +241,6 @@ class PageOrder {
     await db.remove({ _id: this._id });
 
     delete this._id;
-
-    // return this;
   }
 }
 

src/routes/api/index.ts

@@ -1,8 +1,8 @@
 import express from 'express';
-
 import pagesAPI from './pages';
 import transportAPI from './transport';
 import linksAPI from './links';
+
 const router = express.Router();
 
 router.use('/', pagesAPI);

src/routes/api/pages.ts

@@ -1,7 +1,7 @@
 import express, { Request, Response } from 'express';
+import multerFunc from 'multer';
 import Pages from '../../controllers/pages';
 import PagesOrder from '../../controllers/pagesOrder';
-import multerFunc from 'multer';
 
 const router = express.Router();
 const multer = multerFunc();

src/routes/api/transport.ts

@@ -2,9 +2,9 @@ import { Request, Response, Router } from 'express';
 import multer, { StorageEngine } from 'multer';
 import mime from 'mime';
 import mkdirp from 'mkdirp';
+import config from 'config';
 import Transport from '../../controllers/transport';
 import { random16 } from '../../utils/crypto';
-import config from 'config';
 
 const router = Router();
 

src/routes/auth.ts

@@ -1,11 +1,11 @@
 import express, { Request, Response } from 'express';
 import jwt from 'jsonwebtoken';
-import Users from '../controllers/users';
 import config from 'config';
 import bcrypt from 'bcrypt';
 import csrf from 'csurf';
-
 import * as dotenv from 'dotenv';
+import Users from '../controllers/users';
+
 dotenv.config();
 
 const router = express.Router();

src/routes/index.ts

@@ -1,12 +1,11 @@
 import express from 'express';
-
 import home from './home';
 import pages from './pages';
 import auth from './auth';
 import aliases from './aliases';
 import api from './api';
-
 import pagesMiddleware from './middlewares/pages';
+
 const router = express.Router();
 
 router.use('/', pagesMiddleware, home);

src/routes/middlewares/pages.ts

@@ -24,7 +24,7 @@ function createMenuTree(parentPageId: string, pages: Page[], pagesOrder: PageOrd
    * if we got some children order on parents tree, then we push found pages in order sequence
    * otherwise just find all pages includes parent tree
    */
-  let ordered: any = [];
+  let ordered: any[] = [];
 
   if (childrenOrder) {
     ordered = childrenOrder.order.map((pageId: string) => {

src/utils/database/index.ts

@@ -1,8 +1,3 @@
-// import pages from './pages';
-// import files from './files';
-// import password from './password';
-// import aliases from './aliases';
-// import pagesOrder from './pagesOrder';
 import Datastore from 'nedb';
 import initDb from './initDb';
 
@@ -19,7 +14,6 @@ interface Options {
   returnUpdatedDocs?: boolean;
 }
 
-
 /**
  * @class Database
  * @classdesc Simple decorator class to work with nedb datastore

src/utils/database/initDb.ts

@@ -3,6 +3,7 @@ import config from 'config';
 import path from 'path';
 
 /**
+ * Init function for nedb instance
  *
  * @param {string} name - name of the data file
  * @returns {Datastore} db - nedb instance

test/database.ts

@@ -1,8 +1,8 @@
 import fs from "fs";
 import config from "config";
 import { expect } from "chai";
-
 import Datastore from "nedb";
+
 import { Database } from "../src/utils/database";
 
 interface Document {
@@ -166,8 +166,7 @@ describe('Database', () => {
     }
 
     try {
-      // await db.update({field: {$undefinedComparator: 1}});
-      throw new Error('Unknown comparison function $undefinedComparator');
+      await db.update({field: {$undefinedComparator: 1}});
     } catch (err) {
       expect(err.message).to.equal('Unknown comparison function $undefinedComparator');
     }

test/express.ts

@@ -1,7 +1,8 @@
-import server from "../bin/server";
 import chaiHTTP from "chai-http";
 import chai, { expect } from "chai";
 
+import server from "../bin/server";
+
 const app = server.app;
 
 chai.use(chaiHTTP);

test/models/file.ts

@@ -53,8 +53,6 @@ describe('File model', () => {
 
     file = new File(initialData);
 
-    // const json = file.toJSON();
-
     data = file.data;
 
     expect(data._id).to.equal(initialData._id);

test/models/page.ts

@@ -224,17 +224,21 @@ describe('Page model', () => {
 
     const savedPage = await page.save();
 
-    if (savedPage._id !== undefined) {
-      const foundPage = await Page.get(savedPage._id);
+    if (savedPage._id == undefined) {
+      await page.destroy();
 
-      const {data} = foundPage;
-  
-      expect(data._id).to.equal(savedPage._id);
-      expect(data.title).to.equal(initialData.body.blocks[0].data.text);
-      expect(data.uri).to.equal(transformToUri(initialData.body.blocks[0].data.text));
-      expect(data.body).to.deep.equal(initialData.body);
+      return;
     }
 
+    const foundPage = await Page.get(savedPage._id);
+
+    const {data} = foundPage;
+
+    expect(data._id).to.equal(savedPage._id);
+    expect(data.title).to.equal(initialData.body.blocks[0].data.text);
+    expect(data.uri).to.equal(transformToUri(initialData.body.blocks[0].data.text));
+    expect(data.body).to.deep.equal(initialData.body);
+
     await page.destroy();
   });
 
@@ -311,8 +315,6 @@ describe('Page model', () => {
       }
     );
 
-    // child.parent = parent;
-
     const {_id: childId} = await child.save();
 
     const testedParent = await child.getParent();
@@ -329,7 +331,8 @@ describe('Page model', () => {
 
     expect(children.length).to.equal(1);
 
-    const testedChild = children.pop() as Page;
+    const temp: Page|undefined = children.pop();
+    const testedChild: Page = !temp ? new Page({}) : temp;
 
     expect(testedChild._id).to.equal(childId);
     expect(testedChild.title).to.equal(child.body.blocks[0].data.text);
@@ -380,7 +383,6 @@ describe('Page model', () => {
       }
 
       order.forEach(id => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         deleteRecursively(id);
       });
 

test/models/pageOrder.ts

@@ -110,10 +110,9 @@ describe('PageOrder model', () => {
     pageOrder.remove('2');
     expect(pageOrder.data.order).to.deep.equals(['1', '3']);
 
-    // Not allowed by TypeScript
-    // expect(() => {
-    //   pageOrder.push(3);
-    // }).to.throw('given id is not string');
+    expect(() => {
+      pageOrder.push(3);
+    }).to.throw('given id is not string');
 
     pageOrder.push('4');
     pageOrder.push('5');

test/rcparser.ts

@@ -1,18 +1,14 @@
 import { expect } from "chai";
-
 import fs from "fs";
 import path from "path";
 import config from "config";
-import rcParser from "../src/utils/rcparser";
 import sinon = require('sinon');
 
+import rcParser from "../src/utils/rcparser";
+
 const rcPath = path.resolve(process.cwd(), config.get('rcFile'));
 
 describe('RC file parser test', () => {
-  beforeEach(function () {
-    // spy = sinon.stub(console, 'log');
-  });
-
   afterEach(() => {
     if (fs.existsSync(rcPath)) {
       fs.unlinkSync(rcPath);

test/rest/aliases.ts

@@ -1,12 +1,12 @@
-import server from '../../bin/server';
-const app = server.app;
-
 import fs from 'fs';
 import path from 'path';
 import config from 'config';
 import chai from 'chai';
 import chaiHTTP from 'chai-http';
+import server from '../../bin/server';
+
 const {expect} = chai;
+const app = server.app;
 
 chai.use(chaiHTTP);
 

test/rest/pages.ts

@@ -1,17 +1,16 @@
-import server from '../../bin/server';
-const app = server.app;
-
-import model from '../../src/models/page';
-import Page from '../../src/models/page';
-import PageOrder from '../../src/models/pageOrder';
-import translateString from '../../src/utils/translation';
-
 import fs from 'fs';
 import path from 'path';
 import config from 'config';
 import chai from 'chai';
 import chaiHTTP from 'chai-http';
+import server from '../../bin/server';
+import model from '../../src/models/page';
+import Page from '../../src/models/page';
+import PageOrder from '../../src/models/pageOrder';
+import translateString from '../../src/utils/translation';
+
 const {expect} = chai;
+const app = server.app;
 
 chai.use(chaiHTTP);
 

test/rest/transport.ts

@@ -4,14 +4,12 @@ import fileType from 'file-type';
 import chai from 'chai';
 import chaiHTTP from 'chai-http';
 import rimraf from 'rimraf';
-const {expect} = chai;
-
+import config from 'config';
 import server from '../../bin/server';
-const app = server.app;
-
 import model from '../../src/models/file';
 
-import config from 'config';
+const {expect} = chai;
+const app = server.app;
 
 chai.use(chaiHTTP);