express-ext 0.4.10 → 0.4.12

package/lib/edit.js

@@ -47,7 +47,10 @@ function create(res, obj, insert, log, returnNumber) {
       } else if (Array.isArray(result)) {
         res.status(422).json(result).end()
       } else {
-        res.status(201).json(result).end()
+        res
+          .status(201)
+          .json(returnNumber ? result : obj)
+          .end()
       }
     })
     .catch(function (err) {
@@ -72,7 +75,10 @@ function update(res, obj, save, log, returnNumber) {
       } else if (Array.isArray(result)) {
         res.status(422).json(result).end()
       } else {
-        res.status(200).json(result).end()
+        res
+          .status(200)
+          .json(returnNumber ? result : obj)
+          .end()
       }
     })
     .catch(function (err) {

package/lib/index.js

@@ -347,6 +347,45 @@ function toMap(errors) {
   return errorMap
 }
 exports.toMap = toMap
+function save(isEdit, res, obj, service, log, returnNumber) {
+  if (!isEdit) {
+    service
+      .create(obj)
+      .then(function (result) {
+        if (Array.isArray(result)) {
+          res.status(422).json(result).end()
+        } else if (typeof result === "number" && result <= 0) {
+          res.status(409).json(result).end()
+        } else {
+          res.status(201).json(obj).end()
+        }
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, log)
+      })
+  } else {
+    service
+      .update(obj)
+      .then(function (result) {
+        if (result === 0) {
+          res.status(410).end()
+        } else if (Array.isArray(result)) {
+          res.status(422).json(result).end()
+        } else if (typeof result === "number" && result < 0) {
+          res.status(409).json(result).end()
+        } else {
+          res
+            .status(200)
+            .json(returnNumber ? result : obj)
+            .end()
+        }
+      })
+      .catch(function (err) {
+        return http_1.handleError(err, res, log)
+      })
+  }
+}
+exports.save = save
 var map = {
   "&": "&amp;",
   "<": "&lt;",
@@ -361,12 +400,20 @@ function escapeHTML(input) {
   })
 }
 exports.escapeHTML = escapeHTML
-function generateChip(v) {
-  return '<div class="chip">' + escapeHTML(v) + '<span class="close" onclick="removeChip(event)"></span></div>'
+function generateChip(v, noClose) {
+  var s = noClose ? "" : '<span class="close" onclick="removeChip(event)"></span>'
+  return '<div class="chip">' + escapeHTML(v) + s + "</div>"
 }
 exports.generateChip = generateChip
-function generateChips(v) {
-  return !v ? "" : "" + v.map(generateChip).join("")
+function generateChips(v, noClose) {
+  return !v
+    ? ""
+    : "" +
+        v
+          .map(function (s) {
+            return generateChip(s, noClose)
+          })
+          .join("")
 }
 exports.generateChips = generateChips
 var s = "string"

package/package.json

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

package/src/edit.ts

@@ -83,7 +83,10 @@ export function create<T>(
       } else if (Array.isArray(result)) {
         res.status(422).json(result).end()
       } else {
-        res.status(201).json(result).end()
+        res
+          .status(201)
+          .json(returnNumber ? result : obj)
+          .end()
       }
     })
     .catch((err) => handleError(err, res, log))
@@ -111,7 +114,10 @@ export function update<T>(
       } else if (Array.isArray(result)) {
         res.status(422).json(result).end()
       } else {
-        res.status(200).json(result).end()
+        res
+          .status(200)
+          .json(returnNumber ? result : obj)
+          .end()
       }
     })
     .catch((err) => handleError(err, res, log))

package/src/index.ts

@@ -332,6 +332,45 @@ export function toMap(errors: ErrorMessage[]): ErrorMap {
   }
   return errorMap
 }
+
+interface SaveService<T> {
+  create(obj: T, ctx?: any): Promise<number | T | ErrorMessage[]>
+  update(obj: T, ctx?: any): Promise<number | T | ErrorMessage[]>
+}
+export function save<T>(isEdit: boolean, res: Response, obj: T, service: SaveService<T>, log: (msg: string, ctx?: any) => void, returnNumber?: boolean) {
+  if (!isEdit) {
+    service
+      .create(obj)
+      .then((result) => {
+        if (Array.isArray(result)) {
+          res.status(422).json(result).end()
+        } else if (typeof result === "number" && result <= 0) {
+          res.status(409).json(result).end()
+        } else {
+          res.status(201).json(obj).end()
+        }
+      })
+      .catch((err) => handleError(err, res, log))
+  } else {
+    service
+      .update(obj)
+      .then((result) => {
+        if (result === 0) {
+          res.status(410).end()
+        } else if (Array.isArray(result)) {
+          res.status(422).json(result).end()
+        } else if (typeof result === "number" && result < 0) {
+          res.status(409).json(result).end()
+        } else {
+          res
+            .status(200)
+            .json(returnNumber ? result : obj)
+            .end()
+        }
+      })
+      .catch((err) => handleError(err, res, log))
+  }
+}
 const map: StringMap = {
   "&": "&amp;",
   "<": "&lt;",
@@ -345,11 +384,12 @@ export function escapeHTML(input: string): string {
     return map[char]
   })
 }
-export function generateChip(v: string): string {
-  return `<div class="chip">${escapeHTML(v)}<span class="close" onclick="removeChip(event)"></span></div>`
+export function generateChip(v: string, noClose?: boolean): string {
+  const s = noClose ? "" : `<span class="close" onclick="removeChip(event)"></span>`
+  return `<div class="chip">${escapeHTML(v)}${s}</div>`
 }
-export function generateChips(v?: string[] | null): string {
-  return !v ? "" : `${v.map(generateChip).join("")}`
+export function generateChips(v?: string[] | null, noClose?: boolean): string {
+  return !v ? "" : `${v.map((s) => generateChip(s, noClose)).join("")}`
 }
 
 const s = "string"