revdev 0.48.0 → 0.50.0

package/lib/units/list/entity.d.ts

@@ -5,10 +5,10 @@ export interface FeList {
     languageCode: string;
     name: string;
     wordCount: number;
+    knownWordCount: number;
     userCount: number;
     contribution: FeEntityContribution;
     access: FeEntityAccess;
-    knowing: FeWordKnowing;
 }
 export interface FeListLinkWordRequest {
     listId: string;

package/lib/units/table/entity.d.ts

@@ -10,10 +10,10 @@ export interface FeTable {
     languageCode: string;
     name: string;
     wordCount: number;
+    knownWordCount: number;
     userCount: number;
     contribution: FeEntityContribution;
     access: FeEntityAccess;
-    knowing: FeWordKnowing;
 }
 export interface FeCell extends BasicCellStruct<FeWord[]> {
 }

package/lib/units/tag/entity.d.ts

@@ -5,7 +5,7 @@ export interface FeCreateTagRequest {
 export interface FeTag {
     code: string;
     wordCount: number;
-    knowing: FeWordKnowing;
+    knownWordCount: number;
 }
 export interface FeTagLinkWordRequest {
     tagCode: string;

package/lib/utils/feed.d.ts

@@ -1,7 +1,7 @@
 import { EntityWithCount, 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 & EntityWithCount)[], oldSkip?: number): Feed<TItem>;
+declare function newFeed<TItem extends EntityWithCount>(data: TItem[], oldSkip?: number): Feed<Omit<TItem, "count">>;
 declare function newFeed<TItem = any>(data: TItem[], oldSkip: number, all: number): Feed<TItem>;
 export declare const FeedUtil: {
     combine: (prevFeed?: Feed<any> | undefined, newFeed?: Feed<any> | undefined) => Feed;

package/lib/utils/feed.js

@@ -1,4 +1,15 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 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];
@@ -35,8 +46,12 @@ function newFeed(data, p1, p2) {
         // oldSkip
         oldSkip = p1;
     }
+    var newData = data.every(function (x) { return x.count === total; }) ? data.map(function (_a) {
+        var _c = _a.count, x = __rest(_a, ["count"]);
+        return x;
+    }) : data;
     return {
-        data: data,
+        data: newData,
         skip: oldSkip + data.length,
         total: total,
     };

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

@@ -1,4 +1,15 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var feed_1 = require("../feed");
 var ITEM_COUNT = 5;
@@ -12,6 +23,12 @@ for (var i = 0; i < ITEM_COUNT; i++) {
 function testFeed(newFeed, matchFeed) {
     expect(newFeed).toMatchObject(matchFeed);
 }
+function cleanCount(data) {
+    return data.map(function (_a) {
+        var _c = _a.count, x = __rest(_a, ["count"]);
+        return x;
+    });
+}
 describe("feed", function () {
     test("empty", function () {
         testFeed(feed_1.FeedUtil.empty(), {
@@ -27,14 +44,22 @@ describe("feed", function () {
     });
     test("newFeed: 1 param", function () {
         testFeed(feed_1.FeedUtil.new(data), {
-            data: data,
+            data: cleanCount(data),
+            skip: ITEM_COUNT,
+            total: ITEM_COUNT,
+        });
+    });
+    test("newFeed: 1 param: no count", function () {
+        var feed = feed_1.FeedUtil.new(data);
+        testFeed(feed, {
+            data: cleanCount(data),
             skip: ITEM_COUNT,
             total: ITEM_COUNT,
         });
     });
     test("newFeed: 2 params", function () {
         testFeed(feed_1.FeedUtil.new(data, 10), {
-            data: data,
+            data: cleanCount(data),
             skip: 10 + ITEM_COUNT,
             total: ITEM_COUNT,
         });
@@ -42,14 +67,23 @@ describe("feed", function () {
     test("newFeed: 3 params", function () {
         var total = 100;
         testFeed(feed_1.FeedUtil.new(data, 0, total), {
-            data: data,
+            data: cleanCount(data),
             skip: ITEM_COUNT,
             total: total,
         });
         testFeed(feed_1.FeedUtil.new(data, 10, total), {
-            data: data,
+            data: cleanCount(data),
             skip: 10 + ITEM_COUNT,
             total: total,
         });
     });
+    test("newFeed: 3 params; no count", function () {
+        var total = 100;
+        var feedData = cleanCount(data);
+        testFeed(feed_1.FeedUtil.new(feedData, 0, total), {
+            data: feedData,
+            skip: ITEM_COUNT,
+            total: total,
+        });
+    });
 });

package/package.json

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