express-ext 0.4.0 → 0.4.1

package/src/LoadSearchController.ts

@@ -1,25 +1,26 @@
-import { Request, Response } from 'express';
-import { handleError, Log } from './http';
-import { LoadController, ViewService } from './LoadController';
-import { Attribute, Attributes } from './metadata';
-import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
+import { Request, Response } from "express"
+import { resources } from "resources"
+import { handleError, Log } from "./http"
+import { LoadController, ViewService } from "./LoadController"
+import { Attribute, Attributes } from "./metadata"
+import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from "./search"
 
 export interface Search {
-  search(req: Request, res: Response): void;
-  load(req: Request, res: Response): void;
+  search(req: Request, res: Response): void
+  load(req: Request, res: Response): void
 }
 export interface Query<T, ID, S> extends ViewService<T, ID> {
-  search: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
-  metadata?(): Attributes | undefined;
-  load(id: ID, ctx?: any): Promise<T | null>;
+  search: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>
+  metadata?(): Attributes | undefined
+  load(id: ID, ctx?: any): Promise<T | null>
 }
 export interface SearchManager {
-  search(req: Request, res: Response): void;
-  load(req: Request, res: Response): void;
+  search(req: Request, res: Response): void
+  load(req: Request, res: Response): void
 }
 export function useSearchController<T, ID, S extends Filter>(
   log: Log,
-  find: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
+  find: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
   viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
   array?: string[],
   dates?: string[],
@@ -27,103 +28,93 @@ export function useSearchController<T, ID, S extends Filter>(
   keys?: Attributes | Attribute[] | string[],
   config?: SearchConfig | boolean,
 ): Search {
-  const c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers);
-  c.array = array;
-  return c;
+  const c = new LoadSearchController(log, find, viewService, keys, config, dates, numbers)
+  c.array = array
+  return c
 }
-export const useSearchHandler = useSearchController;
-export const createSearchController = useSearchController;
-export const createSearchHandler = useSearchController;
+export const useSearchHandler = useSearchController
+export const createSearchController = useSearchController
+export const createSearchHandler = useSearchController
 export class LoadSearchController<T, ID, S extends Filter> extends LoadController<T, ID> {
-  config?: SearchConfig;
-  csv?: boolean;
-  dates?: string[];
-  numbers?: string[];
-  fields?: string;
-  excluding?: string;
-  array?: string[];
+  config?: SearchConfig
+  csv?: boolean
+  dates?: string[]
+  numbers?: string[]
+  excluding?: string
+  array?: string[]
   constructor(
     log: Log,
-    public find: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
+    public find: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
     viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T>),
     keys?: Attributes | Attribute[] | string[],
     config?: SearchConfig | boolean,
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, viewService, keys);
-    this.search = this.search.bind(this);
+    super(log, viewService, keys)
+    this.search = this.search.bind(this)
     if (config) {
-      if (typeof config === 'boolean') {
-        this.csv = config;
+      if (typeof config === "boolean") {
+        this.csv = config
       } else {
-        this.config = initializeConfig(config);
+        this.config = initializeConfig(config)
         if (this.config) {
-          this.csv = this.config.csv;
-          this.fields = this.config.fields;
-          this.excluding = this.config.excluding;
+          this.csv = this.config.csv
+          this.excluding = this.config.excluding
         }
       }
     }
-    if (!this.fields || this.fields.length === 0) {
-      this.fields = 'fields';
-    }
-    const m = getMetadataFunc(viewService, dates, numbers, keys);
+    const m = getMetadataFunc(viewService, dates, numbers, keys)
     if (m) {
-      this.dates = m.dates;
-      this.numbers = m.numbers;
+      this.dates = m.dates
+      this.numbers = m.numbers
     }
   }
   search(req: Request, res: Response): void {
-    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
-    const l = getParameters(s, this.config);
-    const s2 = format(s, this.dates, this.numbers);
+    const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
+    const l = getParameters(s, this.config)
+    const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log));
+      .catch((err) => handleError(err, res, this.log))
   }
 }
 export class QueryController<T, ID, S extends Filter> extends LoadController<T, ID> {
-  config?: SearchConfig;
-  csv?: boolean;
-  dates?: string[];
-  numbers?: string[];
-  fields?: string;
-  excluding?: string;
-  array?: string[];
+  config?: SearchConfig
+  csv?: boolean
+  dates?: string[]
+  numbers?: string[]
+  excluding?: string
+  array?: string[]
   constructor(log: Log, protected query: Query<T, ID, S>, config?: SearchConfig | boolean, dates?: string[], numbers?: string[], array?: string[]) {
-    super(log, query);
-    this.search = this.search.bind(this);
-    this.array = array;
+    super(log, query)
+    this.search = this.search.bind(this)
+    this.array = array
     if (config) {
-      if (typeof config === 'boolean') {
-        this.csv = config;
+      if (typeof config === "boolean") {
+        this.csv = config
       } else {
-        this.config = initializeConfig(config);
+        this.config = initializeConfig(config)
         if (this.config) {
-          this.csv = this.config.csv;
-          this.fields = this.config.fields;
-          this.excluding = this.config.excluding;
+          this.csv = this.config.csv
+          this.excluding = this.config.excluding
         }
       }
     }
-    if (!this.fields || this.fields.length === 0) {
-      this.fields = 'fields';
-    }
-    const m = getMetadataFunc(query, dates, numbers);
+    const m = getMetadataFunc(query, dates, numbers)
     if (m) {
-      this.dates = m.dates;
-      this.numbers = m.numbers;
+      this.dates = m.dates
+      this.numbers = m.numbers
     }
   }
   search(req: Request, res: Response): void {
-    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
-    const l = getParameters(s, this.config);
-    const s2 = format(s, this.dates, this.numbers);
+    const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
+    const l = getParameters(s, this.config)
+    const s2 = format(s, this.dates, this.numbers)
     this.query
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log));
+      .catch((err) => handleError(err, res, this.log))
   }
 }
-export { QueryController as QueryHandler };
+export { QueryController as QueryHandler }

package/src/LogController.ts

@@ -1,54 +1,54 @@
-import { Request, Response } from 'express';
-import { SimpleMap } from './log';
+import { Request, Response } from "express"
+import { SimpleMap } from "./log"
 
 export interface NumberMap {
-  [key: string]: number;
+  [key: string]: number
 }
 export interface LogConfig {
-  level?: string;
-  map?: LogMapConfig;
-  constants?: SimpleMap;
-  name?: Name;
+  level?: string
+  map?: LogMapConfig
+  constants?: SimpleMap
+  name?: Name
 }
 export interface LogMapConfig {
-  time?: string;
-  level?: string;
-  msg?: string;
+  time?: string
+  level?: string
+  msg?: string
 }
 export interface LogMap {
-  time: string;
-  level: string;
-  msg: string;
+  time: string
+  level: string
+  msg: string
 }
 export interface Name {
-  trace: string;
-  debug: string;
-  info: string;
-  warn: string;
-  error: string;
-  panic: string;
-  fatal: string;
+  trace: string
+  debug: string
+  info: string
+  warn: string
+  error: string
+  panic: string
+  fatal: string
 }
 export interface Logger {
-  name: Name;
-  level: number;
-  map: LogMap;
-  constants?: SimpleMap;
-  trace(msg: string, m?: SimpleMap, ctx?: any): void;
-  debug(msg: string, m?: SimpleMap, ctx?: any): void;
-  info(msg: string, m?: SimpleMap, ctx?: any): void;
-  warn(msg: string, m?: SimpleMap, ctx?: any): void;
-  error(msg: string, m?: SimpleMap, ctx?: any): void;
-  panic(msg: string, m?: SimpleMap, ctx?: any): void;
-  fatal(msg: string, m?: SimpleMap, ctx?: any): void;
-  isLevelEnabled(level: number): boolean;
-  isTraceEnabled(): boolean;
-  isDebugEnabled(): boolean;
-  isInfoEnabled(): boolean;
-  isWarnEnabled(): boolean;
-  isErrorEnabled(): boolean;
-  isPanicEnabled(): boolean;
-  isFatalEnabled(): boolean;
+  name: Name
+  level: number
+  map: LogMap
+  constants?: SimpleMap
+  trace(msg: string, m?: SimpleMap, ctx?: any): void
+  debug(msg: string, m?: SimpleMap, ctx?: any): void
+  info(msg: string, m?: SimpleMap, ctx?: any): void
+  warn(msg: string, m?: SimpleMap, ctx?: any): void
+  error(msg: string, m?: SimpleMap, ctx?: any): void
+  panic(msg: string, m?: SimpleMap, ctx?: any): void
+  fatal(msg: string, m?: SimpleMap, ctx?: any): void
+  isLevelEnabled(level: number): boolean
+  isTraceEnabled(): boolean
+  isDebugEnabled(): boolean
+  isInfoEnabled(): boolean
+  isWarnEnabled(): boolean
+  isErrorEnabled(): boolean
+  isPanicEnabled(): boolean
+  isFatalEnabled(): boolean
 }
 export const map: NumberMap = {
   TRACE: -2,
@@ -57,80 +57,82 @@ export const map: NumberMap = {
   WARN: 1,
   ERROR: 2,
   PANIC: 3,
-  FATAL: 4
-};
+  FATAL: 4,
+}
 export class LogController {
-  map: NumberMap;
-  update: (logger: Logger, obj: LogConfig, mp: NumberMap) => boolean;
+  map: NumberMap
+  update: (logger: Logger, obj: LogConfig, mp: NumberMap) => boolean
   constructor(public logger: Logger, updateL?: (logger: Logger, obj: LogConfig, mp: NumberMap) => boolean, mp?: NumberMap) {
-    this.map = (mp ? mp : map);
-    this.update = updateL ? updateL : updateLog;
-    this.config = this.config.bind(this);
+    this.map = mp ? mp : map
+    this.update = updateL ? updateL : updateLog
+    this.config = this.config.bind(this)
   }
   config(req: Request, res: Response) {
-    const obj: LogConfig = req.body;
-    if (!obj || (obj as any) === '') {
-      return res.status(400).end('The request body cannot be empty');
+    const obj: LogConfig = req.body
+    if (!obj || (obj as any) === "") {
+      return res.status(400).end("The request body cannot be empty")
     }
     if (!this.logger) {
-      return res.status(503).end('Logger is not available');
+      return res.status(503).end("Logger is not available")
     }
-    if (typeof obj.level === 'string' && obj.level.length > 0) {
+    if (typeof obj.level === "string" && obj.level.length > 0) {
       if (!this.map) {
-        return res.status(503).end('Map is not available');
+        return res.status(503).end("Map is not available")
       }
     }
-    const changed = this.update(this.logger, obj, this.map);
+    const changed = this.update(this.logger, obj, this.map)
     if (changed) {
-      return res.status(200).json(true).end();
+      return res.status(200).json(true).end()
     } else {
-      return res.status(204).json(false).end();
+      return res.status(204).json(false).end()
     }
   }
 }
 export function updateLog(logger: Logger, obj: LogConfig, mp: NumberMap): boolean {
-  let changed = false;
-  if (typeof obj.level === 'string' && obj.level.length > 0) {
-    const lv = mp[obj.level.toUpperCase()];
+  let changed = false
+  if (typeof obj.level === "string" && obj.level.length > 0) {
+    const lv = mp[obj.level.toUpperCase()]
     if (lv !== undefined) {
-      logger.level = lv;
-      changed = true;
+      logger.level = lv
+      changed = true
     }
   }
   if (obj.map) {
-    if (typeof obj.map.level === 'string' && obj.map.level.length > 0) {
-      logger.map.level = obj.map.level;
-      changed = true;
+    if (typeof obj.map.level === "string" && obj.map.level.length > 0) {
+      logger.map.level = obj.map.level
+      changed = true
     }
-    if (typeof obj.map.time === 'string' && obj.map.time.length > 0) {
-      logger.map.time = obj.map.time;
-      changed = true;
+    if (typeof obj.map.time === "string" && obj.map.time.length > 0) {
+      logger.map.time = obj.map.time
+      changed = true
     }
-    if (typeof obj.map.msg === 'string' && obj.map.msg.length > 0) {
-      logger.map.msg = obj.map.msg;
-      changed = true;
+    if (typeof obj.map.msg === "string" && obj.map.msg.length > 0) {
+      logger.map.msg = obj.map.msg
+      changed = true
     }
   }
-  if (obj.constants !== undefined && typeof obj.constants === 'object') {
-    const ks = Object.keys(obj.constants);
+  if (obj.constants !== undefined && typeof obj.constants === "object") {
+    const ks = Object.keys(obj.constants)
     if (ks.length > 0) {
-      logger.constants = obj.constants;
+      logger.constants = obj.constants
     } else {
-      logger.constants = undefined;
+      logger.constants = undefined
     }
-    changed = true;
+    changed = true
   }
   if (obj.name) {
-    if (typeof obj.name.trace === 'string'
-      && typeof obj.name.debug === 'string'
-      && typeof obj.name.info === 'string'
-      && typeof obj.name.warn === 'string'
-      && typeof obj.name.error === 'string'
-      && typeof obj.name.panic === 'string'
-      && typeof obj.name.fatal === 'string') {
-      logger.name = obj.name;
-      changed = true;
+    if (
+      typeof obj.name.trace === "string" &&
+      typeof obj.name.debug === "string" &&
+      typeof obj.name.info === "string" &&
+      typeof obj.name.warn === "string" &&
+      typeof obj.name.error === "string" &&
+      typeof obj.name.panic === "string" &&
+      typeof obj.name.fatal === "string"
+    ) {
+      logger.name = obj.name
+      changed = true
     }
   }
-  return changed;
+  return changed
 }

package/src/LowCodeController.ts

@@ -1,21 +1,20 @@
-import { Request, Response } from 'express';
-import { Build, GenericController, GenericService } from './GenericController';
-import { handleError, Log } from './http';
-import { ErrorMessage } from './metadata';
-import { StringMap } from './resources';
-import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
+import { Request, Response } from "express"
+import { Build, GenericController, GenericService } from "./GenericController"
+import { handleError, Log } from "./http"
+import { ErrorMessage } from "./metadata"
+import { resources, StringMap } from "./resources"
+import { buildArray, Filter, format, fromRequest, getMetadataFunc, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from "./search"
 
 export interface Service<T, ID, R, S extends Filter> extends GenericService<T, ID, R> {
-  search: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
+  search: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>
 }
 export class LowcodeController<T, ID, S extends Filter> extends GenericController<T, ID> {
-  config?: SearchConfig;
-  csv?: boolean;
-  dates?: string[];
-  numbers?: string[];
-  fields?: string;
-  excluding?: string;
-  array?: string[];
+  config?: SearchConfig
+  csv?: boolean
+  dates?: string[]
+  numbers?: string[]
+  excluding?: string
+  array?: string[]
   constructor(
     log: Log,
     public lowCodeService: Service<T, ID, number | ErrorMessage[], S>,
@@ -25,42 +24,37 @@ export class LowcodeController<T, ID, S extends Filter> extends GenericControlle
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, lowCodeService, build, validate);
-    this.search = this.search.bind(this);
-    this.config = initializeConfig(config);
+    super(log, lowCodeService, build, validate)
+    this.search = this.search.bind(this)
+    this.config = initializeConfig(config)
     if (this.config) {
-      this.csv = this.config.csv;
-      this.fields = this.config.fields;
-      this.excluding = this.config.excluding;
+      this.csv = this.config.csv
+      this.excluding = this.config.excluding
     }
-    if (!this.fields || this.fields.length === 0) {
-      this.fields = 'fields';
-    }
-    const m = getMetadataFunc(lowCodeService, dates, numbers);
+    const m = getMetadataFunc(lowCodeService, dates, numbers)
     if (m) {
-      this.dates = m.dates;
-      this.numbers = m.numbers;
+      this.dates = m.dates
+      this.numbers = m.numbers
     }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
-    const l = getParameters(s, this.config);
-    const s2 = format(s, this.dates, this.numbers);
+    const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
+    const l = getParameters(s, this.config)
+    const s2 = format(s, this.dates, this.numbers)
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log));
+      .catch((err) => handleError(err, res, this.log))
   }
 }
-export { LowcodeController as LowcodeHandler };
+export { LowcodeController as LowcodeHandler }
 export class Controller<T, ID, S extends Filter> extends GenericController<T, ID> {
-  config?: SearchConfig;
-  csv?: boolean;
-  dates?: string[];
-  numbers?: string[];
-  fields?: string;
-  excluding?: string;
-  array?: string[];
+  config?: SearchConfig
+  csv?: boolean
+  dates?: string[]
+  numbers?: string[]
+  excluding?: string
+  array?: string[]
   constructor(
     log: Log,
     public lowCodeService: Service<T, ID, number | T | ErrorMessage[], S>,
@@ -70,30 +64,26 @@ export class Controller<T, ID, S extends Filter> extends GenericController<T, ID
     dates?: string[],
     numbers?: string[],
   ) {
-    super(log, lowCodeService, build, validate);
-    this.search = this.search.bind(this);
-    this.config = initializeConfig(config);
+    super(log, lowCodeService, build, validate)
+    this.search = this.search.bind(this)
+    this.config = initializeConfig(config)
     if (this.config) {
-      this.csv = this.config.csv;
-      this.fields = this.config.fields;
-      this.excluding = this.config.excluding;
-    }
-    if (!this.fields || this.fields.length === 0) {
-      this.fields = 'fields';
+      this.csv = this.config.csv
+      this.excluding = this.config.excluding
     }
-    const m = getMetadataFunc(lowCodeService, dates, numbers);
+    const m = getMetadataFunc(lowCodeService, dates, numbers)
     if (m) {
-      this.dates = m.dates;
-      this.numbers = m.numbers;
+      this.dates = m.dates
+      this.numbers = m.numbers
     }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
-    const l = getParameters(s, this.config);
-    const s2 = format(s, this.dates, this.numbers);
+    const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
+    const l = getParameters(s, this.config)
+    const s2 = format(s, this.dates, this.numbers)
     this.lowCodeService
       .search(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log));
+      .catch((err) => handleError(err, res, this.log))
   }
 }

package/src/SearchController.ts

@@ -1,43 +1,39 @@
-import { Request, Response } from 'express';
-import { handleError, Log } from './http';
-import { buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from './search';
+import { Request, Response } from "express"
+import { resources } from "resources"
+import { handleError, Log } from "./http"
+import { buildArray, Filter, format, fromRequest, getParameters, initializeConfig, jsonResult, SearchConfig, SearchResult } from "./search"
 
 export class SearchController<T, S extends Filter> {
-  config?: SearchConfig;
-  csv?: boolean;
-  fields?: string;
-  excluding?: string;
-  array?: string[];
+  config?: SearchConfig
+  csv?: boolean
+  excluding?: string
+  array?: string[]
   constructor(
     protected log: Log,
-    public find: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
+    public find: (s: S, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>,
     config?: SearchConfig | boolean,
     public dates?: string[],
     public numbers?: string[],
   ) {
-    this.search = this.search.bind(this);
+    this.search = this.search.bind(this)
     if (config) {
-      if (typeof config === 'boolean') {
-        this.csv = config;
+      if (typeof config === "boolean") {
+        this.csv = config
       } else {
-        this.config = initializeConfig(config);
+        this.config = initializeConfig(config)
         if (this.config) {
-          this.csv = this.config.csv;
-          this.fields = this.config.fields;
-          this.excluding = this.config.excluding;
+          this.csv = this.config.csv
+          this.excluding = this.config.excluding
         }
       }
     }
-    if (!this.fields || this.fields.length === 0) {
-      this.fields = 'fields';
-    }
   }
   search(req: Request, res: Response) {
-    const s = fromRequest<S>(req, buildArray(this.array, this.fields, this.excluding));
-    const l = getParameters(s, this.config);
-    const s2 = format(s, this.dates, this.numbers);
+    const s = fromRequest<S>(req, buildArray(this.array, resources.fields, this.excluding))
+    const l = getParameters(s, this.config)
+    const s2 = format(s, this.dates, this.numbers)
     this.find(s2, l.limit, l.pageOrNextPageToken, l.fields)
       .then((result) => jsonResult(res, result, this.csv, l.fields, this.config))
-      .catch((err) => handleError(err, res, this.log));
+      .catch((err) => handleError(err, res, this.log))
   }
 }