revdev 0.49.0 → 0.51.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/utils/feed.d.ts +2 -3
- package/lib/utils/feed.js +2 -13
- package/lib/utils/tests/feed.test.js +0 -14
- package/package.json +1 -1
package/lib/utils/feed.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Feed } from "../feed";
|
|
2
2
|
declare function empty<TItem = any>(): Feed<TItem>;
|
|
3
3
|
declare function pageSkip(skip: number, page: number | undefined, take: number): number;
|
|
4
|
-
declare function newFeed<TItem = any>(data:
|
|
5
|
-
declare function newFeed<TItem = any>(data: TItem[], oldSkip: number, all: number): Feed<TItem>;
|
|
4
|
+
declare function newFeed<TItem = any>(data: TItem[], skip: number, total: number): Feed<TItem>;
|
|
6
5
|
export declare const FeedUtil: {
|
|
7
6
|
combine: (prevFeed?: Feed<any> | undefined, newFeed?: Feed<any> | undefined) => Feed;
|
|
8
7
|
empty: typeof empty;
|
package/lib/utils/feed.js
CHANGED
|
@@ -23,21 +23,10 @@ function pageSkip(skip, page, take) {
|
|
|
23
23
|
return skip;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
function newFeed(data,
|
|
27
|
-
var _a;
|
|
28
|
-
var oldSkip = 0;
|
|
29
|
-
var total = data.length ? ((_a = data[0]) === null || _a === void 0 ? void 0 : _a.count) || 0 : 0;
|
|
30
|
-
if (typeof p1 === "number") {
|
|
31
|
-
if (p2) {
|
|
32
|
-
// all
|
|
33
|
-
total = p2;
|
|
34
|
-
}
|
|
35
|
-
// oldSkip
|
|
36
|
-
oldSkip = p1;
|
|
37
|
-
}
|
|
26
|
+
function newFeed(data, skip, total) {
|
|
38
27
|
return {
|
|
39
28
|
data: data,
|
|
40
|
-
skip:
|
|
29
|
+
skip: skip + data.length,
|
|
41
30
|
total: total,
|
|
42
31
|
};
|
|
43
32
|
}
|
|
@@ -25,20 +25,6 @@ describe("feed", function () {
|
|
|
25
25
|
expect(feed_1.FeedUtil.pageSkip(0, 1, 10)).toEqual(0);
|
|
26
26
|
expect(feed_1.FeedUtil.pageSkip(0, 2, 10)).toEqual(10);
|
|
27
27
|
});
|
|
28
|
-
test("newFeed: 1 param", function () {
|
|
29
|
-
testFeed(feed_1.FeedUtil.new(data), {
|
|
30
|
-
data: data,
|
|
31
|
-
skip: ITEM_COUNT,
|
|
32
|
-
total: ITEM_COUNT,
|
|
33
|
-
});
|
|
34
|
-
});
|
|
35
|
-
test("newFeed: 2 params", function () {
|
|
36
|
-
testFeed(feed_1.FeedUtil.new(data, 10), {
|
|
37
|
-
data: data,
|
|
38
|
-
skip: 10 + ITEM_COUNT,
|
|
39
|
-
total: ITEM_COUNT,
|
|
40
|
-
});
|
|
41
|
-
});
|
|
42
28
|
test("newFeed: 3 params", function () {
|
|
43
29
|
var total = 100;
|
|
44
30
|
testFeed(feed_1.FeedUtil.new(data, 0, total), {
|