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
8 changes: 8 additions & 0 deletions .changeset/easy-keys-attack.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@journeyapps-labs/micro-streaming': patch
'@journeyapps-labs/micro-codecs': patch
'@journeyapps-labs/micro-errors': patch
'@journeyapps-labs/micro-schema': patch
---

Bump all deps and fix types due to TS5.9
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "micro",
"private": "true",
"packageManager": "pnpm@10.14.0",
"packageManager": "pnpm@10.18.1",
"scripts": {
"preinstall": "npx only-allow pnpm",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx}\"",
Expand All @@ -11,9 +11,9 @@
"ncu": "ncu -u && pnpm recursive exec -- ncu -u"
},
"devDependencies": {
"@changesets/cli": "^2.29.5",
"npm-check-updates": "^18.0.2",
"@changesets/cli": "^2.29.7",
"npm-check-updates": "^19.0.0",
"prettier": "3.6.2",
"typescript": "^5.9.2"
"typescript": "^5.9.3"
}
}
4 changes: 2 additions & 2 deletions packages/codecs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"test": "vitest"
},
"dependencies": {
"@types/node": "^20.17.6",
"bson": "^6.7.0",
"@types/node": "^24.7.0",
"bson": "^6.10.4",
"ts-codec": "^1.3.0",
"vitest": "^3.2.4"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"test": "vitest"
},
"devDependencies": {
"@types/node": "^20.17.6",
"@types/node": "^24.7.0",
"vitest": "^3.2.4"
}
}
8 changes: 4 additions & 4 deletions packages/schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"dist/**"
],
"dependencies": {
"@apidevtools/json-schema-ref-parser": "^9.1.0",
"@apidevtools/json-schema-ref-parser": "^14.2.1",
"@journeyapps-labs/micro-codecs": "workspace:^",
"@journeyapps-labs/micro-errors": "workspace:^",
"ajv": "^8.11.2",
"better-ajv-errors": "^1.2.0",
"ajv": "^8.17.1",
"better-ajv-errors": "^2.0.2",
"ts-codec": "^1.3.0",
"vitest": "^3.2.4",
"zod": "^3.19.1"
"zod": "^4.1.12"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`zod-validation > fails validation for runtime codec 1`] = `
{
"errors": [
"{"_errors":[],"name":{"_errors":["Expected string, received number"]},"surname":{"_errors":["Required"]},"other":{"_errors":[],"a":{"_errors":["Required"]},"b":{"_errors":["Invalid literal value, expected \\"optional\\""]}}}",
"{"_errors":[],"name":{"_errors":["Invalid input: expected string, received number"]},"surname":{"_errors":["Invalid input: expected string, received undefined"]},"other":{"_errors":[],"a":{"_errors":["Invalid input: expected array, received undefined"]},"b":{"_errors":["Invalid input: expected \\"optional\\""]}}}",
],
"valid": false,
}
Expand Down
6 changes: 3 additions & 3 deletions packages/streaming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"dependencies": {
"@journeyapps-labs/micro-errors": "workspace:^",
"@journeyapps-labs/micro-schema": "workspace:^",
"@types/express": "^4.17.14",
"bson": "^6.7.0"
"@types/express": "^5.0.3",
"bson": "^6.10.4"
},
"devDependencies": {
"@types/lodash": "^4.14.191",
"@types/lodash": "^4.17.20",
"lodash": "^4.17.21",
"vitest": "^3.2.4"
}
Expand Down
9 changes: 6 additions & 3 deletions packages/streaming/src/bson/encoder.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
import * as stream from '../core/cross-stream';
import * as constants from './constants';
import * as bson from 'bson';
import { ReadableWritablePair } from 'stream/web';

export type BSONStreamEncoderParams<T> = {
serialize_options?: bson.SerializeOptions;
sendTerminatorOnEnd?: boolean;
writableStrategy?: QueuingStrategy<T | undefined>;
readableStrategy?: QueuingStrategy<Buffer | undefined>;
readableStrategy?: QueuingStrategy<Uint8Array | undefined>;
};

export const createBSONStreamEncoder = <T extends {} = any>(params?: BSONStreamEncoderParams<T>) => {
export const createBSONStreamEncoder = <T extends {} = any>(
params?: BSONStreamEncoderParams<T>
): ReadableWritablePair => {
let readableStrategy = params?.readableStrategy;
if (!readableStrategy) {
readableStrategy = new stream.ByteLengthStrategy({
highWaterMark: 1024 * 16
});
}

return new stream.Transform<T, Buffer>(
return new stream.Transform<T, Uint8Array>(
{
transform(chunk, controller) {
controller.enqueue(Buffer.from(bson.serialize(chunk, params?.serialize_options)));
Expand Down
5 changes: 4 additions & 1 deletion packages/streaming/src/bson/header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ export const extractHeaderFromStream = async <T = any>(
}
};

export async function* prependHeaderToStream(header: any, input_stream: Iterable<Buffer> | AsyncIterable<Buffer>) {
export async function* prependHeaderToStream<T>(
header: any,
input_stream: Iterable<T> | AsyncIterable<T>
): AsyncGenerator<T | Uint8Array> {
yield bson.serialize(header);
yield* input_stream;
}
Loading