revdev 0.50.0 → 0.52.0

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

@@ -3,12 +3,13 @@ import { FeLanguage } from "../language";
 import { FeList } from "../list";
 import { FeTable } from "../table";
 import { FeWord } from "../word";
-export interface FeWordKnowing {
+export interface FeWordKnowledge {
     total: number;
     learn: number;
     known: number;
     unknown: number;
 }
+export declare type FeWordKnowing = [number, number];
 export interface FeWordDirect {
     id: string;
     text: string;

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

@@ -1,5 +1,5 @@
 import { Knowing } from "../../general";
-import { FeWordKnowing } from "../common";
+import { FeWordKnowledge } from "../common";
 import { FeWord } from "../word";
 export interface FeDiscoverProveData {
     word: FeWord;
@@ -8,16 +8,16 @@ export interface FeDiscoverProveData {
 }
 export interface FeDiscoverKnowingOld {
     words?: [string, Knowing][];
-    tags?: [string, string, FeWordKnowing][];
-    lists?: [string, FeWordKnowing][];
-    tables?: [string, FeWordKnowing][];
-    languages?: [string, FeWordKnowing][];
+    tags?: [string, string, FeWordKnowledge][];
+    lists?: [string, FeWordKnowledge][];
+    tables?: [string, FeWordKnowledge][];
+    languages?: [string, FeWordKnowledge][];
 }
-export interface FeEntityKnowing extends FeWordKnowing {
+export interface FeEntityKnowing extends FeWordKnowledge {
     id: string;
     text: string;
 }
-export interface FeDiscoverMeta extends FeWordKnowing {
+export interface FeDiscoverMeta extends FeWordKnowledge {
     columns: FeEntityKnowing[];
 }
 export interface ProveWordMeta extends FeWord {

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

@@ -1,4 +1,3 @@
-import { FeWordKnowing } from "..";
 import { Feed } from "../../feed";
 import { FeList } from "../list";
 import { FeTable } from "../table";
@@ -6,7 +5,8 @@ import { FeTag } from "../tag";
 import { FeUserRelationMeta } from "../user";
 export interface FeLanguage {
     code: string;
-    knowing: FeWordKnowing;
+    wordCount: number;
+    knownWordCount: number;
     listCount: number;
     tableCount: number;
     tagCount: number;

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

@@ -1,4 +1,4 @@
-import { FeEntityAccess, FeEntityContribution, FeWordKnowing, EntryWord } from "../common";
+import { FeEntityAccess, FeEntityContribution, EntryWord } from "../common";
 export interface FeList {
     id: string;
     slug: string;
@@ -24,7 +24,8 @@ export interface FeListEntity {
     metaKeywords?: string;
     contribution: FeEntityContribution;
     access: FeEntityAccess;
-    knowing: FeWordKnowing;
+    wordCount: number;
+    knownWordCount: number;
 }
 export interface FeCreateListRequest {
     name: string;

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

@@ -1,4 +1,4 @@
-import { FeEntityAccess, FeEntityContribution, FeWordKnowing, RealWord } from "../common";
+import { FeEntityAccess, FeEntityContribution, RealWord } from "../common";
 import { FeWord } from "../word";
 export interface BasicCellStruct<TWords> {
     columnIndex: number;
@@ -30,7 +30,8 @@ export interface FeTableEntity {
     metaKeywords: string;
     access: FeEntityAccess;
     contribution: FeEntityContribution;
-    knowing: FeWordKnowing;
+    wordCount: number;
+    knownWordCount: number;
     columns: string[];
 }
 export interface FeCellInfo extends BasicCellStruct<RealWord[]> {

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

@@ -1,4 +1,4 @@
-import { FeEntityContribution, FeWordKnowing, EntryWord } from "../common";
+import { FeEntityContribution, EntryWord } from "../common";
 export interface FeCreateTagRequest {
     code: string;
 }
@@ -17,5 +17,6 @@ export interface FeTagEntity {
     code: string;
     languageCode: string;
     contribution: FeEntityContribution;
-    knowing: FeWordKnowing;
+    wordCount: number;
+    knownWordCount: number;
 }

package/lib/utils/feed.d.ts

@@ -1,8 +1,7 @@
-import { EntityWithCount, Feed } from "../feed";
+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 extends EntityWithCount>(data: TItem[], oldSkip?: number): Feed<Omit<TItem, "count">>;
-declare function newFeed<TItem = any>(data: TItem[], oldSkip: number, all: number): Feed<TItem>;
+declare function newFeed<TItem = any>(data: TItem[], skip: number, total: number): Feed<TItem>;
 export declare const FeedUtil: {
     combine: (prevFeed?: Feed<any> | undefined, newFeed?: Feed<any> | undefined) => Feed;
     empty: typeof empty;

package/lib/utils/feed.js

@@ -1,15 +1,4 @@
 "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];
@@ -34,25 +23,10 @@ function pageSkip(skip, page, take) {
         return skip;
     }
 }
-function newFeed(data, p1, p2) {
-    var _a;
-    var oldSkip = 0;
-    var total = data.length ? ((_a = data[0]) === null || _a === void 0 ? void 0 : _a.count) || 0 : 0;
-    if (typeof p1 === "number") {
-        if (p2) {
-            // all
-            total = 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;
+function newFeed(data, skip, total) {
     return {
-        data: newData,
-        skip: oldSkip + data.length,
+        data: data,
+        skip: skip + data.length,
         total: total,
     };
 }

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

@@ -1,15 +1,4 @@
 "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;
@@ -23,12 +12,6 @@ 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(), {
@@ -42,48 +25,17 @@ describe("feed", function () {
         expect(feed_1.FeedUtil.pageSkip(0, 1, 10)).toEqual(0);
         expect(feed_1.FeedUtil.pageSkip(0, 2, 10)).toEqual(10);
     });
-    test("newFeed: 1 param", function () {
-        testFeed(feed_1.FeedUtil.new(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: cleanCount(data),
-            skip: 10 + ITEM_COUNT,
-            total: ITEM_COUNT,
-        });
-    });
     test("newFeed: 3 params", function () {
         var total = 100;
         testFeed(feed_1.FeedUtil.new(data, 0, total), {
-            data: cleanCount(data),
+            data: data,
             skip: ITEM_COUNT,
             total: total,
         });
         testFeed(feed_1.FeedUtil.new(data, 10, total), {
-            data: cleanCount(data),
+            data: 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.50.0",
+  "version": "0.52.0",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",