rate-core 0.5.2 → 0.5.3

package/README.md

@@ -1 +1 @@
-# rate
+# rate-core

package/lib/index.js

@@ -1,17 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-  var extendStatics = function (d, b) {
-    extendStatics = Object.setPrototypeOf ||
-      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-      function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-  };
-  return function (d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-  };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
   function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
   return new (P || (P = Promise))(function (resolve, reject) {
@@ -53,170 +40,11 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./rate"));
-var ReactionService = (function () {
-  function ReactionService(find, repository, infoRepository, commentRepository, reactionRepository, queryURL) {
-    this.find = find;
+var RateService = (function () {
+  function RateService(repository, infoRepository) {
     this.repository = repository;
     this.infoRepository = infoRepository;
-    this.commentRepository = commentRepository;
-    this.reactionRepository = reactionRepository;
-    this.queryURL = queryURL;
-    this.search = this.search.bind(this);
-    this.load = this.load.bind(this);
-    this.getRate = this.getRate.bind(this);
-    this.setUseful = this.setUseful.bind(this);
-    this.removeUseful = this.removeUseful.bind(this);
-    this.comment = this.comment.bind(this);
-    this.removeComment = this.removeComment.bind(this);
-    this.updateComment = this.updateComment.bind(this);
-    this.getComments = this.getComments.bind(this);
-    this.getComment = this.getComment.bind(this);
-  }
-  ReactionService.prototype.search = function (s, limit, offset, fields) {
-    var _this = this;
-    return this.find(s, limit, offset, fields).then(function (res) {
-      if (!_this.queryURL) {
-        return res;
-      }
-      else {
-        if (res.list && res.list.length > 0) {
-          var ids = [];
-          for (var _i = 0, _a = res.list; _i < _a.length; _i++) {
-            var rate = _a[_i];
-            ids.push(rate.author);
-          }
-          return _this.queryURL(ids).then(function (urls) {
-            for (var _i = 0, _a = res.list; _i < _a.length; _i++) {
-              var rate = _a[_i];
-              var i = binarySearch(urls, rate.author);
-              if (i >= 0) {
-                rate.authorURL = urls[i].url;
-              }
-            }
-            return res;
-          });
-        }
-        else {
-          return res;
-        }
-      }
-    });
-  };
-  ReactionService.prototype.load = function (id, author) {
-    return this.repository.load(id, author);
-  };
-  ReactionService.prototype.getRate = function (id, author) {
-    return this.repository.load(id, author);
-  };
-  ReactionService.prototype.setUseful = function (id, author, userId) {
-    return this.reactionRepository.save(id, author, userId, 1);
-  };
-  ReactionService.prototype.removeUseful = function (id, author, userId) {
-    return this.reactionRepository.remove(id, author, userId);
-  };
-  ReactionService.prototype.comment = function (comment) {
-    var _this = this;
-    return this.repository.load(comment.id, comment.author).then(function (checkRate) {
-      if (!checkRate) {
-        return -1;
-      }
-      else {
-        comment.time ? comment.time = comment.time : comment.time = new Date();
-        return _this.commentRepository.insert(comment);
-      }
-    });
-  };
-  ReactionService.prototype.removeComment = function (commentId, userId) {
-    var _this = this;
-    return this.commentRepository.load(commentId).then(function (comment) {
-      if (comment) {
-        if (userId === comment.author || userId === comment.userId) {
-          return _this.commentRepository.remove(commentId, comment.id, comment.author);
-        }
-        else {
-          return -2;
-        }
-      }
-      else {
-        return -1;
-      }
-    });
-  };
-  ReactionService.prototype.updateComment = function (comment) {
-    var _this = this;
-    return this.commentRepository.load(comment.commentId).then(function (exist) {
-      if (!exist) {
-        return -1;
-      }
-      else {
-        if (exist.userId !== comment.userId) {
-          return -2;
-        }
-        exist.updatedAt = new Date();
-        var c = { comment: exist.comment, time: exist.time };
-        if (exist.histories && exist.histories.length > 0) {
-          exist.histories.push(c);
-        }
-        else {
-          exist.histories = [c];
-        }
-        exist.comment = comment.comment;
-        var res = _this.commentRepository.update(exist);
-        return res;
-      }
-    });
-  };
-  ReactionService.prototype.getComments = function (id, author, limit) {
-    var _this = this;
-    return this.commentRepository.getComments(id, author, limit).then(function (comments) {
-      if (_this.queryURL) {
-        var ids = [];
-        for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-          var comment = comments_1[_i];
-          ids.push(comment.userId);
-        }
-        return _this.queryURL(ids).then(function (urls) {
-          for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
-            var comment = comments_2[_i];
-            var i = binarySearch(urls, comment.userId);
-            if (i >= 0) {
-              comment.userURL = urls[i].url;
-            }
-          }
-          return comments;
-        });
-      }
-      else {
-        return comments;
-      }
-    });
-  };
-  ReactionService.prototype.getComment = function (id) {
-    var _this = this;
-    return this.commentRepository.load(id).then(function (comment) {
-      if (comment && _this.queryURL) {
-        return _this.queryURL([id]).then(function (urls) {
-          var i = binarySearch(urls, comment.userId);
-          if (i >= 0) {
-            comment.userURL = urls[i].url;
-          }
-          return comment;
-        });
-      }
-      else {
-        return comment;
-      }
-    });
-  };
-  return ReactionService;
-}());
-exports.ReactionService = ReactionService;
-var RateService = (function (_super) {
-  __extends(RateService, _super);
-  function RateService(find, repository, infoRepository, commentRepository, reactionRepository, queryURL) {
-    var _this = _super.call(this, find, repository, infoRepository, commentRepository, reactionRepository, queryURL) || this;
-    _this.rate = _this.rate.bind(_this);
-    return _this;
+    this.rate = this.rate.bind(this);
   }
   RateService.prototype.rate = function (rate) {
     return __awaiter(this, void 0, void 0, function () {
@@ -260,7 +88,7 @@ var RateService = (function (_super) {
     });
   };
   return RateService;
-}(ReactionService));
+}());
 exports.RateService = RateService;
 function avg(n) {
   var sum = 0;
@@ -271,12 +99,11 @@ function avg(n) {
   return sum / n.length;
 }
 exports.avg = avg;
-var RatesService = (function (_super) {
-  __extends(RatesService, _super);
-  function RatesService(find, repository, infoRepository, commentRepository, reactionRepository, queryURL) {
-    var _this = _super.call(this, find, repository, infoRepository, commentRepository, reactionRepository, queryURL) || this;
-    _this.rate = _this.rate.bind(_this);
-    return _this;
+var RatesService = (function () {
+  function RatesService(repository, infoRepository) {
+    this.repository = repository;
+    this.infoRepository = infoRepository;
+    this.rate = this.rate.bind(this);
   }
   RatesService.prototype.rate = function (rate) {
     return __awaiter(this, void 0, void 0, function () {
@@ -322,42 +149,8 @@ var RatesService = (function (_super) {
     });
   };
   return RatesService;
-}(ReactionService));
-exports.RatesService = RatesService;
-function binarySearch(ar, el) {
-  var m = 0;
-  var n = ar.length - 1;
-  while (m <= n) {
-    var k = (n + m) >> 1;
-    var cmp = compare(el, ar[k].id);
-    if (cmp > 0) {
-      m = k + 1;
-    }
-    else if (cmp < 0) {
-      n = k - 1;
-    }
-    else {
-      return k;
-    }
-  }
-  return -m - 1;
-}
-function compare(s1, s2) {
-  return s1.localeCompare(s2);
-}
-var CommentValidator = (function () {
-  function CommentValidator(attributes, check) {
-    this.attributes = attributes;
-    this.check = check;
-    this.validate = this.validate.bind(this);
-  }
-  CommentValidator.prototype.validate = function (comment) {
-    var errs = this.check(comment, this.attributes);
-    return Promise.resolve(errs);
-  };
-  return CommentValidator;
 }());
-exports.CommentValidator = CommentValidator;
+exports.RatesService = RatesService;
 var RateValidator = (function () {
   function RateValidator(attributes, check, max) {
     this.attributes = attributes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rate-core",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "rate",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -17,11 +17,9 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com/core-ts/reaction"
+    "url": "git@github.com/core-ts/rate"
   },
   "keywords": [
-    "reaction",
-    "reaction core",
     "rate",
     "rate core"
   ]

package/src/core.ts

@@ -1,17 +1,3 @@
-export interface StringMap {
-  [key: string]: string;
-}
-export interface Statement {
-  query: string;
-  params?: any[];
-}
-export interface DB {
-  driver: string;
-  param(i: number): string;
-  exec(sql: string, args?: any[], ctx?: any): Promise<number>;
-  execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>;
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>;
-}
 export type DataType = 'ObjectId' | 'date' | 'datetime' | 'time'
   | 'boolean' | 'number' | 'integer' | 'string' | 'text'
   | 'object' | 'array' | 'binary'
@@ -73,63 +59,3 @@ export interface Filter {
   pageIndex?: number;
   pageSize?: number;
 }
-export interface ViewRepository<T, ID> {
-  metadata?(): Attributes|undefined;
-  keys?(): string[];
-  all?(ctx?: any): Promise<T[]>;
-  load(id: ID, ctx?: any): Promise<T|null>;
-  exist(id: ID, ctx?: any): Promise<boolean>;
-}
-export interface Repository<T, ID> extends ViewRepository<T, ID> {
-  insert(obj: T, ctx?: any): Promise<number>;
-  update(obj: T, ctx?: any): Promise<number>;
-  patch?(obj: T, ctx?: any): Promise<number>;
-  save?(obj: T, ctx?: any): Promise<number>;
-  delete(id: ID, ctx?: any): Promise<number>;
-}
-
-export interface ViewService<T, ID> {
-  metadata?(): Attributes|undefined;
-  keys?(): string[];
-  all?(ctx?: any): Promise<T[]>;
-  load(id: ID, ctx?: any): Promise<T|null>;
-  exist?(id: ID, ctx?: any): Promise<boolean>;
-}
-export interface GenericService<T, ID, R> extends ViewService<T, ID> {
-  insert(obj: T, ctx?: any): Promise<R>;
-  update(obj: T, ctx?: any): Promise<R>;
-  patch?(obj: T, ctx?: any): Promise<R>;
-  save?(obj: T, ctx?: any): Promise<R>;
-  delete?(id: ID, ctx?: any): Promise<number>;
-}
-export interface SearchResult<T> {
-  list: T[];
-  total?: number;
-  last?: boolean;
-  nextPageToken?: string;
-}
-
-export interface ErrorMessage {
-  field: string;
-  code: string;
-  param?: string|number|Date;
-  message?: string;
-}
-export interface ResultInfo<T> {
-  status: number|string;
-  errors?: ErrorMessage[];
-  value?: T;
-  message?: string;
-}
-export type Result<T> = number | ResultInfo<T>;
-export interface SearchService<T, F extends Filter> {
-  keys?(): string[];
-  search(s: F, limit?: number, offset?: number|string, fields?: string[], ctx?: any): Promise<SearchResult<T>>;
-}
-export interface GenericSearchService<T, ID, R, F extends Filter>
-  extends GenericService<T, ID, R>, SearchService<T, F> {
-}
-export interface Service<T, ID, F extends Filter> extends GenericSearchService<T, ID, Result<T>, F> {
-
-}
-export type Search<T, F> = (s: F, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>;

package/src/index.ts

@@ -1,164 +1,13 @@
-import { Attributes, Search, SearchResult } from './core';
-import {
-  BaseRate, BaseRepository, Comment, InfoRepository, Rate, RateCommentRepository, RateFilter, Rater, RateReactionRepository,
-  Rates, RatesFilter, ShortComment, ShortRate, ShortRates
-} from './rate';
+import { Attributes } from './core';
+import { BaseRepository, InfoRepository, Rate, Rater, Rates, ShortRate, ShortRates } from './rate';
 
 export * from './rate';
 
-export interface URL {
-  id: string;
-  url: string;
-}
-export class ReactionService<R extends BaseRate, F, O> {
-  constructor(protected find: Search<R, F>,
-    public repository: BaseRepository<R>,
-    protected infoRepository: InfoRepository<O>,
-    protected commentRepository: RateCommentRepository,
-    protected reactionRepository: RateReactionRepository,
-    protected queryURL?: (ids: string[]) => Promise<URL[]>) {
-    this.search = this.search.bind(this);
-    this.load = this.load.bind(this);
-    this.getRate = this.getRate.bind(this);
-    this.setUseful = this.setUseful.bind(this);
-    this.removeUseful = this.removeUseful.bind(this);
-    this.comment = this.comment.bind(this);
-    this.removeComment = this.removeComment.bind(this);
-    this.updateComment = this.updateComment.bind(this);
-    this.getComments = this.getComments.bind(this);
-    this.getComment = this.getComment.bind(this);
-  }
-  search(s: F, limit?: number, offset?: number | string, fields?: string[]): Promise<SearchResult<R>> {
-    return this.find(s, limit, offset, fields).then(res => {
-      if (!this.queryURL) {
-        return res;
-      } else {
-        if (res.list && res.list.length > 0) {
-          const ids: string[] = [];
-          for (const rate of res.list) {
-            ids.push(rate.author);
-          }
-          return this.queryURL(ids).then(urls => {
-            for (const rate of res.list) {
-              const i = binarySearch(urls, rate.author);
-              if (i >= 0) {
-                rate.authorURL = urls[i].url;
-              }
-            }
-            return res;
-          });
-        } else {
-          return res;
-        }
-      }
-    });
-  }
-  load(id: string, author: string): Promise<R | null> {
-    return this.repository.load(id, author);
-  }
-  getRate(id: string, author: string): Promise<R | null> {
-    return this.repository.load(id, author);
-  }
-  setUseful(id: string, author: string, userId: string): Promise<number> {
-    return this.reactionRepository.save(id, author, userId, 1);
-  }
-  removeUseful(id: string, author: string, userId: string): Promise<number> {
-    return this.reactionRepository.remove(id, author, userId);
-  }
-  comment(comment: Comment): Promise<number> {
-    return this.repository.load(comment.id, comment.author).then(checkRate => {
-      if (!checkRate) {
-        return -1;
-      } else {
-        comment.time ? comment.time = comment.time : comment.time = new Date();
-        return this.commentRepository.insert(comment);
-      }
-    });
-  }
-  removeComment(commentId: string, userId: string): Promise<number> {
-    return this.commentRepository.load(commentId).then(comment => {
-      if (comment) {
-        if (userId === comment.author || userId === comment.userId) {
-          return this.commentRepository.remove(commentId, comment.id, comment.author);
-        } else {
-          return -2;
-        }
-      } else {
-        return -1;
-      }
-    });
-  }
-  updateComment(comment: Comment): Promise<number> {
-    return this.commentRepository.load(comment.commentId).then(exist => {
-      if (!exist) {
-        return -1;
-      } else {
-        if (exist.userId !== comment.userId) {
-          return -2;
-        }
-        exist.updatedAt = new Date();
-        const c: ShortComment = { comment: exist.comment, time: exist.time };
-        if (exist.histories && exist.histories.length > 0) {
-          exist.histories.push(c);
-        } else {
-          exist.histories = [c];
-        }
-        exist.comment = comment.comment;
-        const res = this.commentRepository.update(exist);
-        return res;
-      }
-    });
-  }
-  getComments(id: string, author: string, limit?: number): Promise<Comment[]> {
-    return this.commentRepository.getComments(id, author, limit).then(comments => {
-      if (this.queryURL) {
-        const ids: string[] = [];
-        for (const comment of comments) {
-          ids.push(comment.userId);
-        }
-        return this.queryURL(ids).then(urls => {
-          for (const comment of comments) {
-            const i = binarySearch(urls, comment.userId);
-            if (i >= 0) {
-              comment.userURL = urls[i].url;
-            }
-          }
-          return comments;
-        });
-      } else {
-        return comments;
-      }
-    });
-  }
-  getComment(id: string): Promise<Comment | null> {
-    return this.commentRepository.load(id).then(comment => {
-      if (comment && this.queryURL) {
-        return this.queryURL([id]).then(urls => {
-          const i = binarySearch(urls, comment.userId);
-          if (i >= 0) {
-            comment.userURL = urls[i].url;
-          }
-          return comment;
-        });
-      } else {
-        return comment;
-      }
-    });
-  }
-}
-export interface CommentRepository {
-  load(commentId: string, ctx?: any): Promise<Comment | null>;
-  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
-}
 // tslint:disable-next-line:max-classes-per-file
-export class RateService<O> extends ReactionService<Rate, RateFilter, O> implements Rater<Rate, RateFilter> {
-  constructor(find: Search<Rate, RateFilter>,
-    repository: BaseRepository<Rate>,
-    infoRepository: InfoRepository<O>,
-    commentRepository: RateCommentRepository,
-    reactionRepository: RateReactionRepository,
-    queryURL?: (ids: string[]) => Promise<URL[]>) {
-    super(find, repository, infoRepository, commentRepository, reactionRepository, queryURL);
+export class RateService implements Rater<Rate> {
+  constructor(
+    public repository: BaseRepository<Rate>,
+    public infoRepository: InfoRepository) {
     this.rate = this.rate.bind(this);
   }
   async rate(rate: Rate): Promise<number> {
@@ -193,14 +42,10 @@ export function avg(n: number[]): number {
   return sum / n.length;
 }
 // tslint:disable-next-line:max-classes-per-file
-export class RatesService<O> extends ReactionService<Rates, RatesFilter, O> implements Rater<Rates, RatesFilter> {
-  constructor(find: Search<Rates, RatesFilter>,
-    repository: BaseRepository<Rates>,
-    infoRepository: InfoRepository<O>,
-    commentRepository: RateCommentRepository,
-    reactionRepository: RateReactionRepository,
-    queryURL?: (ids: string[]) => Promise<URL[]>) {
-    super(find, repository, infoRepository, commentRepository, reactionRepository, queryURL);
+export class RatesService implements Rater<Rates> {
+  constructor(
+    public repository: BaseRepository<Rates>,
+    public infoRepository: InfoRepository) {
     this.rate = this.rate.bind(this);
   }
   async rate(rate: Rates): Promise<number> {
@@ -230,26 +75,6 @@ export class RatesService<O> extends ReactionService<Rates, RatesFilter, O> impl
     return res;
   }
 }
-function binarySearch(ar: URL[], el: string): number {
-  let m = 0;
-  let n = ar.length - 1;
-  while (m <= n) {
-    // tslint:disable-next-line:no-bitwise
-    const k = (n + m) >> 1;
-    const cmp = compare(el, ar[k].id);
-    if (cmp > 0) {
-      m = k + 1;
-    } else if (cmp < 0) {
-      n = k - 1;
-    } else {
-      return k;
-    }
-  }
-  return -m - 1;
-}
-function compare(s1: string, s2: string): number {
-  return s1.localeCompare(s2);
-}
 interface ErrorMessage {
   field: string;
   code: string;
@@ -257,16 +82,6 @@ interface ErrorMessage {
   message?: string;
 }
 // tslint:disable-next-line:max-classes-per-file
-export class CommentValidator {
-  constructor(protected attributes: Attributes, protected check: (obj: any, attributes: Attributes) => ErrorMessage[]) {
-    this.validate = this.validate.bind(this);
-  }
-  validate(comment: Comment): Promise<ErrorMessage[]> {
-    const errs = this.check(comment, this.attributes);
-    return Promise.resolve(errs);
-  }
-}
-// tslint:disable-next-line:max-classes-per-file
 export class RateValidator {
   constructor(protected attributes: Attributes, protected check: (obj: any, attributes: Attributes) => ErrorMessage[], protected max: number) {
     this.validate = this.validate.bind(this);

package/src/rate.ts

@@ -1,4 +1,4 @@
-import { Attributes, Filter, Repository, SearchResult, ViewRepository } from './core';
+import { Attributes, Filter } from './core';
 
 export interface RateId {
   id: string;
@@ -65,40 +65,13 @@ export interface RatesFilter extends RateFilter {
   rate10: number;
 }
 export interface BaseRepository<R> {
-  // save(obj: Rate, info?: T, ctx?: any): Promise<number>;
   insert(rate: R, newInfo?: boolean): Promise<number>;
   update(rate: R, oldRate: number): Promise<number>;
   load(id: string, author: string): Promise<R | null>;
 }
-export interface Rater<R, F extends Filter> {
-  search(s: F, limit?: number, offset?: number | string, fields?: string[], ctx?: any): Promise<SearchResult<R>>;
-  load(id: string, author: string): Promise<R | null>;
-  rate(rate: R): Promise<number>;
-  setUseful(id: string, author: string, userId: string, ctx?: any): Promise<number>;
-  removeUseful(id: string, author: string, userId: string, ctx?: any): Promise<number>;
-  comment(comment: Comment): Promise<number>;
-  removeComment(id: string, author: string, ctx?: any): Promise<number>;
-  updateComment(comment: Comment): Promise<number>;
-  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
-  getComment(id: string): Promise<Comment | null>;
-}
-export interface RateReactionRepository {
-  remove(id: string, author: string, userId: string, ctx?: any): Promise<number>;
-  save(id: string, author: string, userId: string, type: number): Promise<number>;
-}
 
-export interface RateCommentRepository extends Repository<Comment, string> {
-  remove(commentId: string, id: string, author: string): Promise<number>;
-  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
-}
-
-export interface Query<T, ID, S> {
-  search: (s: S, limit?: number, skip?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
-  metadata?(): Attributes | undefined;
-  load(id: ID, ctx?: any): Promise<T | null>;
-}
-export interface RateCommentQuery extends Query<Comment, string, CommentFilter> {
-  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
+export interface Rater<R> {
+  rate(rate: R): Promise<number>;
 }
 export const rateHistoryModel: Attributes = {
   rate: {
@@ -245,40 +218,8 @@ export interface Info10 {
   count: number;
   score: number;
 }
-export interface InfoRepository<T> extends ViewRepository<T, string> {
-}
-
-export interface CommentId {
-  id: string;
-  author: string;
-  userId: string;
-}
-
-export interface Comment {
-  commentId: string;
-  id: string;
-  author: string;
-  userId: string;
-  comment: string;
-  time: Date;
-  updatedAt?: Date;
-  histories?: ShortComment[];
-  userURL?: string;
-  authorURL?: string;
-}
-export interface ShortComment {
-  comment: string;
-  time: Date;
-}
-
-export interface CommentFilter extends Filter {
-  commentId?: string;
-  id?: string;
-  author?: string;
-  userId?: string;
-  comment?: string;
-  time?: Date;
-  updatedAt?: Date;
+export interface InfoRepository {
+  exist(id: string, ctx?: any): Promise<boolean>;
 }
 
 export const rateInfoModel: Attributes = {
@@ -295,7 +236,6 @@ export const rateInfoModel: Attributes = {
     type: 'number',
   }
 };
-
 export const ratesModel: Attributes = {
   id: {
     key: true,