Skip to content

Commit 8561aee

Browse files
Merge pull request #70 from basics/beta
Beta
2 parents 9d4f909 + 2ebafdc commit 8561aee

20 files changed

+168
-216
lines changed

.github/workflows/main.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -141,29 +141,29 @@ jobs:
141141
github_token: ${{ secrets.GITHUB_TOKEN }}
142142
publish_dir: coverage
143143

144-
merge-back-to-beta:
145-
name: Update beta branch
146-
needs: semantic-version
147-
strategy:
148-
matrix:
149-
os: [ubuntu-latest]
150-
node: [20]
151-
152-
runs-on: ${{ matrix.os }}
153-
154-
steps:
155-
- name: checkout repo
156-
uses: actions/checkout@v4
157-
158-
- name: set git config
159-
run: |
160-
git config --local user.email "[email protected]"
161-
git config --local user.name "Github Actions"
162-
163-
- name: merge main back to beta
164-
run: |
165-
git fetch --unshallow
166-
git checkout beta
167-
git pull
168-
git merge --no-ff main -m "Auto-merge main back to beta"
169-
git push
144+
# merge-back-to-beta:
145+
# name: Update beta branch
146+
# needs: semantic-version
147+
# strategy:
148+
# matrix:
149+
# os: [ubuntu-latest]
150+
# node: [20]
151+
152+
# runs-on: ${{ matrix.os }}
153+
154+
# steps:
155+
# - name: checkout repo
156+
# uses: actions/checkout@v4
157+
158+
# - name: set git config
159+
# run: |
160+
# git config --local user.email "[email protected]"
161+
# git config --local user.name "Github Actions"
162+
163+
# - name: merge main back to beta
164+
# run: |
165+
# git fetch --unshallow
166+
# git checkout beta
167+
# git pull
168+
# git merge --no-ff main -m "Auto-merge main back to beta"
169+
# git push

packages/operators/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Project Changelog
22

3+
# [@rxjs-collection/operators-v1.0.4-beta.1](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.3...@rxjs-collection/operators-v1.0.4-beta.1) (2024-10-25)
4+
5+
6+
### Bug Fixes
7+
8+
* **fetch:** missed optimized code segmentation ([36d7543](https://github.com/basics/rxjs-collection/commit/36d7543e17508c27d4925f3854391e3f65eb6b47))
9+
* **fetch:** optimized code segmentation ([9bcd2f3](https://github.com/basics/rxjs-collection/commit/9bcd2f317b8ee540f0a01e1b21733095a3c836e1))
10+
311
# [@rxjs-collection/operators-v1.0.3](https://github.com/basics/rxjs-collection/compare/@rxjs-collection/operators-v1.0.2...@rxjs-collection/operators-v1.0.3) (2024-10-24)
412

513

packages/operators/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rxjs-collection/operators",
3-
"version": "1.0.3",
3+
"version": "1.0.4-beta.1",
44
"description": "rxjs operators",
55
"license": "MIT",
66
"contributors": [

packages/operators/src/fetch/autoPagination.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { concatMap, expand, filter, from, map } from 'rxjs';
22

3-
import { download } from './download';
3+
import { request } from './request';
44

55
export const autoPagination = ({ resolveRoute }) => {
66
return source =>
77
source.pipe(
88
concatMap(({ url }) => {
99
return from(resolveRoute(url)).pipe(
10-
download(),
10+
request(),
1111
expand(resp =>
1212
from(resolveRoute(url, resp)).pipe(
1313
filter(url => !!url),
14-
download()
14+
request()
1515
)
1616
)
1717
);

packages/operators/src/fetch/autoPagination.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
33

44
import { log } from '../log';
55
import { autoPagination } from './autoPagination';
6-
import { resolveJSON } from './resolve';
6+
import { resolveJSON } from './response';
77

88
describe('auto pagination', function () {
99
beforeEach(function () {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { mergeMap, of } from 'rxjs';
22

3-
import { download } from './download';
3+
import { request } from './request';
44

55
export const concurrentDownload = (concurrent = 1) => {
6-
return source => source.pipe(mergeMap(url => of(url).pipe(download()), concurrent));
6+
return source => source.pipe(mergeMap(url => of(url).pipe(request()), concurrent));
77
};

packages/operators/src/fetch/concurrentDownload.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
33

44
import { log } from '../log';
55
import { concurrentDownload } from './concurrentDownload';
6-
import { resolveJSON } from './resolve';
6+
import { resolveJSON } from './response';
77

88
describe('multi fetch', function () {
99
beforeEach(function () {

packages/operators/src/fetch/download.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/operators/src/fetch/download.test.js

Lines changed: 0 additions & 46 deletions
This file was deleted.

packages/operators/src/fetch/lazyPagination.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
33

44
import { log } from '../log';
55
import { lazyPagination } from './lazyPagination';
6-
import { resolveJSON } from './resolve';
6+
import { resolveJSON } from './response';
77

88
describe('lazy pagination operator', function () {
99
beforeEach(function () {

0 commit comments

Comments
 (0)