revdev 0.176.0 → 0.183.0

package/lib/feed/index.d.ts

@@ -20,6 +20,7 @@ export interface EntityWithCount {
 export interface Feed<TItem = any> {
     data: TItem[];
     skip: number;
+    page?: number;
     total: number;
 }
 export interface WordFeedExtension {

package/lib/shared/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./word";
 export * from "./list";
 export * from "./tag";
+export * from "./tran";
 export * from "./general";

package/lib/shared/index.js

@@ -13,4 +13,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./word"), exports);
 __exportStar(require("./list"), exports);
 __exportStar(require("./tag"), exports);
+__exportStar(require("./tran"), exports);
 __exportStar(require("./general"), exports);

package/lib/shared/tran/index.d.ts

@@ -0,0 +1 @@
+export * from "./request";

package/lib/shared/tran/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./request"), exports);

package/lib/shared/tran/request.d.ts

@@ -0,0 +1,13 @@
+import { EntryWord, RealWord } from "../word";
+interface BaseCreateTranRequest<TWord> {
+    sourceWord: EntryWord;
+    speechPartCode?: string;
+    destWord: TWord;
+}
+export interface CreateTranTextRequest extends BaseCreateTranRequest<EntryWord> {
+    destLangCode: string;
+}
+export interface CreateTranWordRequest extends BaseCreateTranRequest<RealWord | RealWord[]> {
+}
+export declare type CreateTranRequest = CreateTranTextRequest | CreateTranWordRequest;
+export {};

package/lib/shared/tran/request.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/shared/word/entity.d.ts

@@ -9,7 +9,7 @@ export interface UserWordGen extends WordGen {
 }
 export interface RealWord {
     id: string;
-    text: string;
+    text?: string;
 }
 export interface PotentialWord {
     id?: string;

package/lib/utils/feed.d.ts

@@ -1,9 +1,11 @@
 import { Feed } from "../feed";
 declare function empty<TItem = any>(): Feed<TItem>;
 declare function pageSkip(skip: number, page: number | undefined, take: number): number;
-declare function newFeed<TItem = any>(data: TItem[], skip: number, total: number): Feed<TItem>;
+declare function newFeed<TItem = any>(data: TItem[], total: number): Feed<TItem>;
+declare function newFeed<TItem = any>(data: TItem[], total: number, skip: number): Feed<TItem>;
+declare function newFeed<TItem = any>(data: TItem[], total: number, skip: number, page?: number): Feed<TItem>;
 export declare const FeedUtil: {
-    combine: (prevFeed?: Feed<any> | undefined, newFeed?: Feed<any> | undefined) => Feed;
+    combine: <TItem = any>(prevFeed?: Feed<TItem> | undefined, newFeed?: Feed<TItem> | undefined) => Feed<TItem>;
     empty: typeof empty;
     new: typeof newFeed;
     pageSkip: typeof pageSkip;

package/lib/utils/feed.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
         to[j] = from[i];
@@ -23,22 +34,30 @@ function pageSkip(skip, page, take) {
         return skip;
     }
 }
-function newFeed(data, skip, total) {
+function newFeed(data, total, skip, page) {
+    if (skip === void 0) { skip = 0; }
     return {
         data: data,
         skip: skip + data.length,
         total: total,
+        page: page,
     };
 }
 exports.FeedUtil = {
     combine: function (prevFeed, newFeed) {
         var prev = prevFeed ? prevFeed : empty();
         var next = newFeed ? newFeed : empty();
-        var result = {
-            skip: next.skip,
-            total: next.total,
-            data: __spreadArray(__spreadArray([], (prev.skip < next.skip && next.data.length !== next.total ? prev.data : [])), next.data),
-        };
+        var result;
+        if (prev.page === next.page) {
+            result = {
+                skip: next.skip,
+                total: next.total,
+                data: __spreadArray(__spreadArray([], (prev.skip < next.skip && next.data.length !== next.total ? prev.data : [])), next.data),
+            };
+        }
+        else {
+            result = __assign(__assign({}, next), { data: __spreadArray([], next.data) });
+        }
         return result;
     },
     empty: empty,

package/lib/utils/tests/feed.combine.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/tests/feed.combine.test.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var feed_1 = require("../feed");
+function testFeed(newFeed, matchFeed) {
+    expect(newFeed).toMatchObject(matchFeed);
+}
+describe("feed combine", function () {
+    test("simple", function () {
+        var feed1 = { data: [1, 2, 3], skip: 3, total: 9 };
+        var feed2 = { data: [4, 5, 6], skip: 6, total: 9 };
+        var feed3 = { data: [7, 8, 9], skip: 9, total: 9 };
+        var result = feed_1.FeedUtil.combine(feed_1.FeedUtil.empty(), feed1);
+        testFeed(result, feed1);
+        result = feed_1.FeedUtil.combine(feed1, feed2);
+        testFeed(result, {
+            data: [1, 2, 3, 4, 5, 6],
+            skip: 6,
+            total: 9,
+        });
+        result = feed_1.FeedUtil.combine(result, feed3);
+        testFeed(result, {
+            data: [1, 2, 3, 4, 5, 6, 7, 8, 9],
+            skip: 9,
+            total: 9,
+        });
+    });
+    test("with page", function () {
+        var feed1 = { data: [1, 2, 3], skip: 3, total: 9, page: 1 };
+        var feed2 = { data: [4, 5, 6], skip: 3, total: 9, page: 2 };
+        var feed3 = { data: [7, 8, 9], skip: 3, total: 9, page: 3 };
+        var result = feed_1.FeedUtil.combine(undefined, feed1);
+        testFeed(result, feed1);
+        result = feed_1.FeedUtil.combine(feed1, feed2);
+        testFeed(result, {
+            data: [4, 5, 6],
+            skip: 3,
+            total: 9,
+            page: 2,
+        });
+        result = feed_1.FeedUtil.combine(result, feed3);
+        testFeed(result, {
+            data: [7, 8, 9],
+            skip: 3,
+            total: 9,
+            page: 3,
+        });
+    });
+});

package/lib/utils/tests/feed.test.js

@@ -27,12 +27,12 @@ describe("feed", function () {
     });
     test("newFeed: 3 params", function () {
         var total = 100;
-        testFeed(feed_1.FeedUtil.new(data, 0, total), {
+        testFeed(feed_1.FeedUtil.new(data, total, 0), {
             data: data,
             skip: ITEM_COUNT,
             total: total,
         });
-        testFeed(feed_1.FeedUtil.new(data, 10, total), {
+        testFeed(feed_1.FeedUtil.new(data, total, 10), {
             data: data,
             skip: 10 + ITEM_COUNT,
             total: total,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revdev",
-  "version": "0.176.0",
+  "version": "0.183.0",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",