express-ext 0.4.14 → 0.5.0

package/lib/access.js

@@ -0,0 +1,34 @@
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+function allow(access) {
+  var ao = access.origin
+  if (typeof ao === "string") {
+    return function (req, res, next) {
+      res.header("Access-Control-Allow-Origin", access.origin)
+      res.header("Access-Control-Allow-Credentials", access.credentials)
+      res.header("Access-Control-Allow-Methods", access.methods)
+      res.setHeader("Access-Control-Allow-Headers", access.headers)
+      next()
+    }
+  } else if (Array.isArray(ao) && ao.length > 0) {
+    return function (req, res, next) {
+      var origin = req.headers.origin
+      if (origin) {
+        if (ao.includes(origin)) {
+          res.setHeader("Access-Control-Allow-Origin", origin)
+        }
+      }
+      res.header("Access-Control-Allow-Credentials", access.credentials)
+      res.header("Access-Control-Allow-Methods", access.methods)
+      res.setHeader("Access-Control-Allow-Headers", access.headers)
+      next()
+    }
+  }
+  return function (req, res, next) {
+    res.header("Access-Control-Allow-Credentials", access.credentials)
+    res.header("Access-Control-Allow-Methods", access.methods)
+    res.setHeader("Access-Control-Allow-Headers", access.headers)
+    next()
+  }
+}
+exports.allow = allow

package/lib/index.js

@@ -22,6 +22,7 @@ exports.Handler = LowCodeController_1.Controller
 var resources_1 = require("./resources")
 var SearchController_1 = require("./SearchController")
 exports.SearchHandler = SearchController_1.SearchController
+__export(require("./access"))
 __export(require("./client"))
 __export(require("./edit"))
 __export(require("./GenericController"))
@@ -38,64 +39,30 @@ __export(require("./resources"))
 __export(require("./search"))
 __export(require("./SearchController"))
 __export(require("./view"))
-function allow(access) {
-  var ao = access.origin
-  if (typeof ao === "string") {
-    return function (req, res, next) {
-      res.header("Access-Control-Allow-Origin", access.origin)
-      res.header("Access-Control-Allow-Credentials", access.credentials)
-      res.header("Access-Control-Allow-Methods", access.methods)
-      res.setHeader("Access-Control-Allow-Headers", access.headers)
-      next()
-    }
-  } else if (Array.isArray(ao) && ao.length > 0) {
-    return function (req, res, next) {
-      var origin = req.headers.origin
-      if (origin) {
-        if (ao.includes(origin)) {
-          res.setHeader("Access-Control-Allow-Origin", origin)
-        }
-      }
-      res.header("Access-Control-Allow-Credentials", access.credentials)
-      res.header("Access-Control-Allow-Methods", access.methods)
-      res.setHeader("Access-Control-Allow-Headers", access.headers)
-      next()
-    }
-  }
-  return function (req, res, next) {
-    res.header("Access-Control-Allow-Credentials", access.credentials)
-    res.header("Access-Control-Allow-Methods", access.methods)
-    res.setHeader("Access-Control-Allow-Headers", access.headers)
-    next()
-  }
-}
-exports.allow = allow
 var SavedController = (function () {
-  function SavedController(log, service, item, id) {
+  function SavedController(savedService, log, id, userId) {
+    this.savedService = savedService
     this.log = log
-    this.service = service
-    this.item = item
+    this.userId = userId && userId.length > 0 ? userId : "userId"
     this.id = id && id.length > 0 ? id : "id"
     this.save = this.save.bind(this)
     this.remove = this.remove.bind(this)
-    this.load = this.load.bind(this)
   }
   SavedController.prototype.save = function (req, res) {
     var _this = this
+    var userId = res.locals[this.userId]
     var id = req.params[this.id]
-    var itemId = req.params[this.item]
     if (!id || id.length === 0) {
-      res.status(400).end("'" + this.id + "' cannot be empty")
-      return
+      return res.status(400).end("'" + this.id + "' cannot be empty")
     }
-    if (!itemId || itemId.length === 0) {
-      res.status(400).end("'" + this.item + "' cannot be empty")
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end("'" + this.userId + "' cannot be empty")
     }
-    this.service
-      .save(id, itemId)
-      .then(function (data) {
-        res.status(200).json(data).end()
+    this.savedService
+      .save(userId, id)
+      .then(function (result) {
+        var status = result > 0 ? 200 : result === 0 ? 409 : 422
+        res.status(status).json(result).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)
@@ -103,36 +70,19 @@ var SavedController = (function () {
   }
   SavedController.prototype.remove = function (req, res) {
     var _this = this
+    var userId = res.locals[this.userId]
     var id = req.params[this.id]
-    var itemId = req.params[this.item]
     if (!id || id.length === 0) {
-      res.status(400).end("'" + this.id + "' cannot be empty")
-      return
+      return res.status(400).end("'" + this.id + "' cannot be empty")
     }
-    if (!itemId || itemId.length === 0) {
-      res.status(400).end("'" + this.item + "' cannot be empty")
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end("'" + this.userId + "' cannot be empty")
     }
-    this.service
-      .remove(id, itemId)
-      .then(function (data) {
-        res.status(200).json(data).end()
-      })
-      .catch(function (err) {
-        return http_1.handleError(err, res, _this.log)
-      })
-  }
-  SavedController.prototype.load = function (req, res) {
-    var _this = this
-    var id = req.params[this.id]
-    if (!id || id.length === 0) {
-      res.status(400).end("'" + this.id + "' cannot be empty")
-      return
-    }
-    this.service
-      .load(id)
-      .then(function (data) {
-        res.status(200).json(data).end()
+    this.savedService
+      .remove(userId, id)
+      .then(function (result) {
+        var status = result > 0 ? 200 : 410
+        res.status(status).json(result).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)
@@ -142,10 +92,10 @@ var SavedController = (function () {
 })()
 exports.SavedController = SavedController
 var FollowController = (function () {
-  function FollowController(log, service, target, id) {
-    this.log = log
+  function FollowController(service, log, id, userId) {
     this.service = service
-    this.target = target
+    this.log = log
+    this.userId = userId && userId.length > 0 ? userId : "userId"
     this.id = id && id.length > 0 ? id : "id"
     this.follow = this.follow.bind(this)
     this.unfollow = this.unfollow.bind(this)
@@ -153,20 +103,19 @@ var FollowController = (function () {
   }
   FollowController.prototype.follow = function (req, res) {
     var _this = this
-    var id = req.params.id
-    var target = req.params.target
+    var userId = res.locals[this.userId]
+    var id = req.params[this.id]
     if (!id || id.length === 0) {
-      res.status(400).end("'" + this.id + "' cannot be empty")
-      return
+      return res.status(400).end("'" + this.id + "' cannot be empty")
     }
-    if (!target || target.length === 0) {
-      res.status(400).end("'" + this.target + "' cannot be empty")
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end("'" + this.userId + "' cannot be empty")
     }
     this.service
-      .follow(id, target)
-      .then(function (count) {
-        return res.status(200).json(count).end()
+      .follow(userId, id)
+      .then(function (result) {
+        var status = result > 0 ? 200 : 409
+        res.status(status).json(result).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)
@@ -174,20 +123,19 @@ var FollowController = (function () {
   }
   FollowController.prototype.unfollow = function (req, res) {
     var _this = this
-    var id = req.params.id
-    var target = req.params.target
+    var userId = res.locals[this.userId]
+    var id = req.params[this.id]
     if (!id || id.length === 0) {
-      res.status(400).end("'" + this.id + "' cannot be empty")
-      return
+      return res.status(400).end("'" + this.id + "' cannot be empty")
     }
-    if (!target || target.length === 0) {
-      res.status(400).end("'" + this.target + "' cannot be empty")
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end("'" + this.userId + "' cannot be empty")
     }
     this.service
-      .unfollow(id, target)
-      .then(function (count) {
-        return res.status(200).json(count).end()
+      .unfollow(userId, id)
+      .then(function (result) {
+        var status = result > 0 ? 200 : 410
+        res.status(status).json(result).end()
       })
       .catch(function (err) {
         return http_1.handleError(err, res, _this.log)
@@ -195,18 +143,16 @@ var FollowController = (function () {
   }
   FollowController.prototype.checkFollow = function (req, res) {
     var _this = this
-    var id = req.params.id
-    var target = req.params.target
+    var userId = res.locals[this.userId]
+    var id = req.params[this.id]
     if (!id || id.length === 0) {
-      res.status(400).end("'" + this.id + "' cannot be empty")
-      return
+      return res.status(400).end("'" + this.id + "' cannot be empty")
     }
-    if (!target || target.length === 0) {
-      res.status(400).end("'" + this.target + "' cannot be empty")
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end("'" + this.userId + "' cannot be empty")
     }
     this.service
-      .checkFollow(id, target)
+      .checkFollow(userId, id)
       .then(function (count) {
         return res.status(200).json(count).end()
       })
@@ -400,9 +346,10 @@ function escapeHTML(input) {
   })
 }
 exports.escapeHTML = escapeHTML
-function generateChip(value, text, noClose) {
+function generateChip(value, text, noClose, hasStar) {
   var s = noClose ? "" : '<span class="close" onclick="removeChip(event)"></span>'
-  return '<div class="chip" data-value="' + escapeHTML(value) + '">' + escapeHTML(text) + s + "</div>"
+  var t = hasStar ? '<i className="star highlight"></i>' : ""
+  return '<div class="chip" data-value="' + escapeHTML(value) + '">' + escapeHTML(text) + t + s + "</div>"
 }
 exports.generateChip = generateChip
 function generateTags(v, noClose) {
@@ -427,6 +374,17 @@ function generateChips(v, noClose) {
           .join("")
 }
 exports.generateChips = generateChips
+function generateStarChips(v, value, text, star, noClose) {
+  return !v
+    ? ""
+    : "" +
+        v
+          .map(function (s) {
+            return generateChip(s[value], s[text], noClose, s[star] === true)
+          })
+          .join("")
+}
+exports.generateStarChips = generateStarChips
 var s = "string"
 var o = "object"
 function escape(obj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.4.14",
+  "version": "0.5.0",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/access.ts

@@ -0,0 +1,44 @@
+import { NextFunction } from "express"
+import { ParamsDictionary, Request, Response } from "express-serve-static-core"
+import { ParsedQs } from "qs"
+
+export interface AccessConfig {
+  origin?: string | string[]
+  credentials?: string | string[]
+  methods?: string | string[]
+  headers: number | string | ReadonlyArray<string>
+}
+export type AccessControlAllowConfig = AccessConfig
+export function allow(
+  access: AccessConfig,
+): (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => void {
+  const ao = access.origin
+  if (typeof ao === "string") {
+    return (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => {
+      res.header("Access-Control-Allow-Origin", access.origin)
+      res.header("Access-Control-Allow-Credentials", access.credentials)
+      res.header("Access-Control-Allow-Methods", access.methods)
+      res.setHeader("Access-Control-Allow-Headers", access.headers)
+      next()
+    }
+  } else if (Array.isArray(ao) && ao.length > 0) {
+    return (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => {
+      const origin = req.headers.origin
+      if (origin) {
+        if (ao.includes(origin)) {
+          res.setHeader("Access-Control-Allow-Origin", origin)
+        }
+      }
+      res.header("Access-Control-Allow-Credentials", access.credentials)
+      res.header("Access-Control-Allow-Methods", access.methods)
+      res.setHeader("Access-Control-Allow-Headers", access.headers)
+      next()
+    }
+  }
+  return (req: Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>, res: Response<any, Record<string, any>, number>, next: NextFunction) => {
+    res.header("Access-Control-Allow-Credentials", access.credentials)
+    res.header("Access-Control-Allow-Methods", access.methods)
+    res.setHeader("Access-Control-Allow-Headers", access.headers)
+    next()
+  }
+}

package/src/index.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from "express"
+import { Request, Response } from "express"
 import { GenericController } from "./GenericController"
 import { GenericSearchController } from "./GenericSearchController"
 import { HealthController } from "./HealthController"
@@ -23,6 +23,7 @@ export {
   SearchController as SearchHandler,
 }
 
+export * from "./access"
 export * from "./client"
 export * from "./edit"
 export * from "./GenericController"
@@ -41,170 +42,115 @@ export * from "./search"
 export * from "./SearchController"
 export * from "./view"
 
-export interface AccessConfig {
-  origin?: string | string[]
-  credentials?: string | string[]
-  methods?: string | string[]
-  headers: number | string | ReadonlyArray<string>
+export interface SavedService {
+  save(userId: string, id: string): Promise<number>
+  remove(userId: string, id: string): Promise<number>
 }
-export type AccessControlAllowConfig = AccessConfig
-export function allow(access: AccessConfig): (req: Request, res: Response, next: NextFunction) => void {
-  const ao = access.origin
-  if (typeof ao === "string") {
-    return (req: Request, res: Response, next: NextFunction) => {
-      res.header("Access-Control-Allow-Origin", access.origin)
-      res.header("Access-Control-Allow-Credentials", access.credentials)
-      res.header("Access-Control-Allow-Methods", access.methods)
-      res.setHeader("Access-Control-Allow-Headers", access.headers)
-      next()
-    }
-  } else if (Array.isArray(ao) && ao.length > 0) {
-    return (req: Request, res: Response, next: NextFunction) => {
-      const origin = req.headers.origin
-      if (origin) {
-        if (ao.includes(origin)) {
-          res.setHeader("Access-Control-Allow-Origin", origin)
-        }
-      }
-      res.header("Access-Control-Allow-Credentials", access.credentials)
-      res.header("Access-Control-Allow-Methods", access.methods)
-      res.setHeader("Access-Control-Allow-Headers", access.headers)
-      next()
-    }
-  }
-  return (req: Request, res: Response, next: NextFunction) => {
-    res.header("Access-Control-Allow-Credentials", access.credentials)
-    res.header("Access-Control-Allow-Methods", access.methods)
-    res.setHeader("Access-Control-Allow-Headers", access.headers)
-    next()
-  }
-}
-export interface SavedService<T> {
-  load(id: string): Promise<T[]>
-  save(id: string, itemId: string): Promise<number>
-  remove(id: string, itemId: string): Promise<number>
-}
-export class SavedController<T> {
-  constructor(public log: (msg: string) => void, public service: SavedService<T>, public item: string, id?: string) {
+export class SavedController {
+  constructor(protected savedService: SavedService, protected log: (msg: string) => void, id?: string, userId?: string) {
+    this.userId = userId && userId.length > 0 ? userId : "userId"
     this.id = id && id.length > 0 ? id : "id"
     this.save = this.save.bind(this)
     this.remove = this.remove.bind(this)
-    this.load = this.load.bind(this)
   }
-  id: string
+  protected userId: string
+  protected id: string
   save(req: Request, res: Response) {
+    const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
-    const itemId = req.params[this.item]
     if (!id || id.length === 0) {
-      res.status(400).end(`'${this.id}' cannot be empty`)
-      return
+      return res.status(400).end(`'${this.id}' cannot be empty`)
     }
-    if (!itemId || itemId.length === 0) {
-      res.status(400).end(`'${this.item}' cannot be empty`)
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end(`'${this.userId}' cannot be empty`)
     }
-    this.service
-      .save(id, itemId)
-      .then((data) => {
-        res.status(200).json(data).end()
+    this.savedService
+      .save(userId, id)
+      .then((result) => {
+        const status = result > 0 ? 200 : result === 0 ? 409 : 422
+        res.status(status).json(result).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }
   remove(req: Request, res: Response) {
+    const userId: string = res.locals[this.userId]
     const id = req.params[this.id]
-    const itemId = req.params[this.item]
     if (!id || id.length === 0) {
-      res.status(400).end(`'${this.id}' cannot be empty`)
-      return
+      return res.status(400).end(`'${this.id}' cannot be empty`)
     }
-    if (!itemId || itemId.length === 0) {
-      res.status(400).end(`'${this.item}' cannot be empty`)
-      return
-    }
-    this.service
-      .remove(id, itemId)
-      .then((data) => {
-        res.status(200).json(data).end()
-      })
-      .catch((err) => handleError(err, res, this.log))
-  }
-  load(req: Request, res: Response) {
-    const id = req.params[this.id]
-    if (!id || id.length === 0) {
-      res.status(400).end(`'${this.id}' cannot be empty`)
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end(`'${this.userId}' cannot be empty`)
     }
-    this.service
-      .load(id)
-      .then((data) => {
-        res.status(200).json(data).end()
+    this.savedService
+      .remove(userId, id)
+      .then((result) => {
+        const status = result > 0 ? 200 : 410
+        res.status(status).json(result).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }
 }
 export interface FollowService {
-  follow(id: string, target: string): Promise<number | undefined>
+  follow(id: string, target: string): Promise<number>
   unfollow(id: string, target: string): Promise<number>
   checkFollow(id: string, target: string): Promise<number>
 }
 // tslint:disable-next-line:max-classes-per-file
 export class FollowController {
-  constructor(public log: Log, public service: FollowService, public target: string, id: string) {
+  constructor(protected service: FollowService, protected log: Log, id?: string, userId?: string) {
+    this.userId = userId && userId.length > 0 ? userId : "userId"
     this.id = id && id.length > 0 ? id : "id"
     this.follow = this.follow.bind(this)
     this.unfollow = this.unfollow.bind(this)
     this.checkFollow = this.checkFollow.bind(this)
   }
-  id: string
+  protected userId: string
+  protected id: string
   follow(req: Request, res: Response): void {
-    const id = req.params.id
-    const target = req.params.target
+    const userId: string = res.locals[this.userId]
+    const id = req.params[this.id]
     if (!id || id.length === 0) {
-      res.status(400).end(`'${this.id}' cannot be empty`)
-      return
+      return res.status(400).end(`'${this.id}' cannot be empty`)
     }
-    if (!target || target.length === 0) {
-      res.status(400).end(`'${this.target}' cannot be empty`)
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end(`'${this.userId}' cannot be empty`)
     }
     this.service
-      .follow(id, target)
-      .then((count) => {
-        return res.status(200).json(count).end()
+      .follow(userId, id)
+      .then((result) => {
+        const status = result > 0 ? 200 : 409
+        res.status(status).json(result).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }
   unfollow(req: Request, res: Response): void {
-    const id = req.params.id
-    const target = req.params.target
+    const userId: string = res.locals[this.userId]
+    const id = req.params[this.id]
     if (!id || id.length === 0) {
-      res.status(400).end(`'${this.id}' cannot be empty`)
-      return
+      return res.status(400).end(`'${this.id}' cannot be empty`)
     }
-    if (!target || target.length === 0) {
-      res.status(400).end(`'${this.target}' cannot be empty`)
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end(`'${this.userId}' cannot be empty`)
     }
     this.service
-      .unfollow(id, target)
-      .then((count) => {
-        return res.status(200).json(count).end()
+      .unfollow(userId, id)
+      .then((result) => {
+        const status = result > 0 ? 200 : 410
+        res.status(status).json(result).end()
       })
       .catch((err) => handleError(err, res, this.log))
   }
   checkFollow(req: Request, res: Response): void {
-    const id = req.params.id
-    const target = req.params.target
+    const userId: string = res.locals[this.userId]
+    const id = req.params[this.id]
     if (!id || id.length === 0) {
-      res.status(400).end(`'${this.id}' cannot be empty`)
-      return
+      return res.status(400).end(`'${this.id}' cannot be empty`)
     }
-    if (!target || target.length === 0) {
-      res.status(400).end(`'${this.target}' cannot be empty`)
-      return
+    if (!userId || userId.length === 0) {
+      return res.status(400).end(`'${this.userId}' cannot be empty`)
     }
     this.service
-      .checkFollow(id, target)
+      .checkFollow(userId, id)
       .then((count) => {
         return res.status(200).json(count).end()
       })
@@ -384,9 +330,10 @@ export function escapeHTML(input: string): string {
     return map[char]
   })
 }
-export function generateChip(value: string, text: string, noClose?: boolean): string {
+export function generateChip(value: string, text: string, noClose?: boolean, hasStar?: boolean): string {
   const s = noClose ? "" : `<span class="close" onclick="removeChip(event)"></span>`
-  return `<div class="chip" data-value="${escapeHTML(value)}">${escapeHTML(text)}${s}</div>`
+  const t = hasStar ? `<i className="star highlight"></i>` : ""
+  return `<div class="chip" data-value="${escapeHTML(value)}">${escapeHTML(text)}${t}${s}</div>`
 }
 export function generateTags(v?: string[] | null, noClose?: boolean): string {
   return !v ? "" : `${v.map((s) => generateChip(s, s, noClose)).join("")}`
@@ -398,6 +345,9 @@ export interface Item {
 export function generateChips(v?: Item[] | null, noClose?: boolean): string {
   return !v ? "" : `${v.map((s) => generateChip(s.value, s.text, noClose)).join("")}`
 }
+export function generateStarChips(v: any[] | null | undefined, value: string, text: string, star: string, noClose?: boolean): string {
+  return !v ? "" : `${v.map((s) => generateChip(s[value], s[text], noClose, s[star] === true)).join("")}`
+}
 
 const s = "string"
 const o = "object"