Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
{
"name": "Node.js",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-22-bookworm"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# http://editorconfig.org
# https://editorconfig.org
root = true

[*]
Expand Down
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

38 changes: 14 additions & 24 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,50 @@ on:
pull_request:
push:
branches:
- master
- main
env:
CI: true

jobs:
prettier:
name: Format code
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' }}

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Prettier
uses: gulpjs/prettier_action@v3.0
with:
commit_message: 'chore: Run prettier'
prettier_options: '--write .'

test:
name: Tests for Node ${{ matrix.node }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
node: [10, 12, 14, 16]
node: [22, 24, 26]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Set Node.js version
uses: actions/setup-node@v2
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
with:
node-version: ${{ matrix.node }}

- run: node --version
- run: npm --version
- name: Check node version
run: node --version

- name: Check npm version
run: npm --version

- name: Install npm dependencies
run: npm install
run: npm ci

- name: Run lint
run: npm run lint

- name: Run tests
run: npm test

- name: Check format
run: npm run format-check

- name: Coveralls
uses: coverallsapp/github-action@v1.1.2
uses: coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # v2.3.8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
flag-name: ${{matrix.os}}-node-${{ matrix.node }}
Expand All @@ -69,7 +59,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@v1.1.2
uses: coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # v2.3.8
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
9 changes: 5 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ name: release
on:
push:
branches:
- master
- main

jobs:
release-please:
runs-on: ubuntu-latest
permissions:
contents: write
issues: write
pull-requests: write
steps:
- uses: GoogleCloudPlatform/release-please-action@v2
- uses: googleapis/release-please-action@45996ed1f6d02564a971a2fa1b5860e934307cf7 # v5.0.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
release-type: node
package-name: release-please-action
bump-minor-pre-major: true
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Artem Medeusheyev & 2020-2022 Blaine Bublitz <blaine.bublitz@gmail.com> and Eric Schoffstall <yo@contra.io>
Copyright (c) 2014 Artem Medeusheyev & 2020-2022, 2026 Blaine Bublitz <blaine.bublitz@gmail.com> and Eric Schoffstall <yo@contra.io>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
28 changes: 19 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Combines array of streams into one Readable stream in strict order.
## Usage

```js
var { Readable } = require('streamx');
var ordered = require('ordered-read-streams');
var { Readable } = require("streamx");
var ordered = require("ordered-read-streams");

var s1 = new Readable({
read: function (cb) {
Expand All @@ -25,7 +25,7 @@ var s1 = new Readable({
}
setTimeout(function () {
self.called = true;
self.push('stream 1');
self.push("stream 1");
cb(null);
}, 200);
},
Expand All @@ -39,7 +39,7 @@ var s2 = new Readable({
}
setTimeout(function () {
self.called = true;
self.push('stream 2');
self.push("stream 2");
cb(null);
}, 30);
},
Expand All @@ -53,14 +53,14 @@ var s3 = new Readable({
}
setTimeout(function () {
self.called = true;
self.push('stream 3');
self.push("stream 3");
cb(null);
}, 100);
},
});

var readable = ordered([s1, s2, s3]);
readable.on('data', function (data) {
readable.on("data", function (data) {
console.log(data);
// Logs:
// stream 1
Expand All @@ -79,6 +79,16 @@ Takes an array of `Readable` streams and produces a single `OrderedReadable` str

The returned `Readable` stream has an `addSource` instance function that takes appends a `Readable` stream to the list of source streams that the `OrderedReadable` is reading from.

## Strict No LLM / No AI Policy

No LLMs for issues.

No LLMs for patches / pull requests.

No LLMs for comments on the bug tracker, including translation.

English is encouraged, but not required. You are welcome to post in your native language and rely on others to have their own translation tools of choice to interpret your words.

## License

MIT
Expand All @@ -88,9 +98,9 @@ MIT
[npm-url]: https://www.npmjs.com/package/ordered-read-streams
[npm-image]: https://img.shields.io/npm/v/ordered-read-streams.svg?style=flat-square

[ci-url]: https://github.com/gulpjs/ordered-read-streams/actions?query=workflow:dev
[ci-image]: https://img.shields.io/github/actions/workflow/status/gulpjs/ordered-read-streams/dev.yml?branch=master&style=flat-square
[ci-url]: https://github.com/gulpjs/ordered-read-streams/actions/workflows/dev.yml
[ci-image]: https://img.shields.io/github/actions/workflow/status/gulpjs/ordered-read-streams/dev.yml?style=flat-square

[coveralls-url]: https://coveralls.io/r/gulpjs/ordered-read-streams
[coveralls-image]: https://img.shields.io/coveralls/gulpjs/ordered-read-streams/master.svg?style=flat-square
[coveralls-image]: https://img.shields.io/coveralls/gulpjs/ordered-read-streams/main.svg?style=flat-square
<!-- prettier-ignore-end -->
3 changes: 3 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
var gulpConfig = require("eslint-config-gulp");

module.exports = [...gulpConfig.default];
26 changes: 13 additions & 13 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
var Readable = require('streamx').Readable;
var Readable = require("streamx").Readable;

function isReadable(stream) {
if (typeof stream.pipe !== 'function') {
if (typeof stream.pipe !== "function") {
return false;
}

if (!stream.readable) {
return false;
}

if (typeof stream.read !== 'function') {
if (typeof stream.read !== "function") {
return false;
}

Expand All @@ -18,7 +18,7 @@ function isReadable(stream) {

function assertReadableStream(stream) {
if (!isReadable(stream)) {
throw new Error('All input streams must be readable');
throw new Error("All input streams must be readable");
}
}

Expand Down Expand Up @@ -50,18 +50,18 @@ function OrderedStreams(streams, options) {
streams.forEach(setup);

function setup(stream, idx) {
stream.on('data', onData);
stream.once('error', onError);
stream.once('end', onEnd);
stream.once('close', onClose);
stream.on("data", onData);
stream.once("error", onError);
stream.once("end", onEnd);
stream.once("close", onClose);

stream.pause();

function cleanup() {
stream.off('data', onData);
stream.off('error', onError);
stream.off('end', onEnd);
stream.off('close', onClose);
stream.off("data", onData);
stream.off("error", onError);
stream.off("end", onEnd);
stream.off("close", onClose);
}

function onError(err) {
Expand Down Expand Up @@ -105,7 +105,7 @@ function OrderedStreams(streams, options) {
return stream.destroy();
}

stream.destroy(new Error('Wrapper destroyed'));
stream.destroy(new Error("Wrapper destroyed"));
}

function onData(chunk) {
Expand Down
Loading
Loading