@futpib/parser 1.0.2 → 1.0.4

package/build/unparser.test.js

@@ -1,8 +1,8 @@
 import test from 'ava';
 import * as fc from 'fast-check';
+import { testProp } from '@fast-check/ava';
 import { runUnparser } from './unparser.js';
 import { stringUnparserOutputCompanion } from './unparserOutputCompanion.js';
-import { testProp } from '@fast-check/ava';
 test('writeLater', async (t) => {
     const stringToBeWrittenBefore = 'before writeLater\n';
     const stringToBeWrittenLater = 'written later\n';
@@ -92,12 +92,10 @@ testProp('writeLater positions and lengths', [
     const numberUnparser = async function* (input, unparserContext) {
         yield input.toString().padStart(8, '0');
     };
-    const createLengthPrefixedUnparser = (unparser) => {
-        return async function* (input, unparserContext) {
-            const length = yield* unparserContext.writeLater(8);
-            yield* unparser(input, unparserContext);
-            yield* unparserContext.writeEarlier(length, numberUnparser, unparserContext.position - length.positionEnd);
-        };
+    const createLengthPrefixedUnparser = (unparser) => async function* (input, unparserContext) {
+        const length = yield* unparserContext.writeLater(8);
+        yield* unparser(input, unparserContext);
+        yield* unparserContext.writeEarlier(length, numberUnparser, unparserContext.position - length.positionEnd);
     };
     const unparser0 = createLengthPrefixedUnparser(async function* (input, unparserContext) {
         yield input;
@@ -109,22 +107,12 @@ testProp('writeLater positions and lengths', [
     });
     const unparser2 = createLengthPrefixedUnparser(async function* (input, unparserContext) {
         for (const stringArray2 of input) {
-            if (typeof stringArray2 === 'string') {
-                yield* unparser0(stringArray2, unparserContext);
-            }
-            else {
-                yield* unparser1(stringArray2, unparserContext);
-            }
+            yield* (typeof stringArray2 === 'string' ? unparser0(stringArray2, unparserContext) : unparser1(stringArray2, unparserContext));
         }
     });
     const unparser3 = createLengthPrefixedUnparser(async function* (input, unparserContext) {
         for (const stringArray3 of input) {
-            if (typeof stringArray3 === 'string') {
-                yield* unparser0(stringArray3, unparserContext);
-            }
-            else {
-                yield* unparser2(stringArray3, unparserContext);
-            }
+            yield* (typeof stringArray3 === 'string' ? unparser0(stringArray3, unparserContext) : unparser2(stringArray3, unparserContext));
         }
     });
     const stringsAsyncIterable = runUnparser(unparser3, stringArray3, stringUnparserOutputCompanion);

package/build/unparserContext.d.ts

@@ -1,5 +1,5 @@
-import { Unparser, UnparserResult } from "./unparser.js";
-import { UnparserOutputCompanion } from "./unparserOutputCompanion.js";
+import { type Unparser, type UnparserResult } from './unparser.js';
+import { type UnparserOutputCompanion } from './unparserOutputCompanion.js';
 export type UnparserContext<Sequence, Element> = {
     get position(): number;
     writeLater(length: number): AsyncIterable<WriteLater<Sequence, Element>, WriteLater<Sequence, Element>>;

package/build/unparserContext.js

@@ -1,6 +1,5 @@
-/* eslint-disable prefer-arrow-callback */
-import { unparserImplementationInvariant } from "./unparserImplementationInvariant.js";
-import { parserImplementationInvariant } from "./parserImplementationInvariant.js";
+import { unparserImplementationInvariant } from './unparserImplementationInvariant.js';
+import { parserImplementationInvariant } from './parserImplementationInvariant.js';
 export class WriteLater extends Error {
     _position;
     _length;

package/build/unparserError.d.ts

@@ -1,4 +1,5 @@
-export declare class UnparserError extends Error {
+import { NormalLazyMessageError } from "./lazyMessageError.js";
+export declare class UnparserError extends NormalLazyMessageError {
     name: string;
 }
 export declare class UnparserImplementationError extends UnparserError {

package/build/unparserError.js

@@ -1,4 +1,5 @@
-export class UnparserError extends Error {
+import { NormalLazyMessageError } from "./lazyMessageError.js";
+export class UnparserError extends NormalLazyMessageError {
     name = 'UnparserError';
 }
 export class UnparserImplementationError extends UnparserError {

package/build/unparserImplementationInvariant.d.ts

@@ -1,2 +1,2 @@
 import { type Falsy, type ValueOrAccessor } from './customInvariant.js';
-export declare function unparserImplementationInvariant<T>(value: T, format: ValueOrAccessor<string | string[]>, ...formatArguments: any[]): Exclude<T, Falsy>;
+export declare function unparserImplementationInvariant<T>(value: T, format: ValueOrAccessor<string | string[]>, ...formatArguments: unknown[]): Exclude<T, Falsy>;

package/build/unparserOutputCompanion.d.ts

@@ -1,4 +1,4 @@
-import { StringParserInputCompanion, Uint8ArrayParserInputCompanion } from "./parserInputCompanion.js";
+import { StringParserInputCompanion, Uint8ArrayParserInputCompanion } from './parserInputCompanion.js';
 export type UnparserOutputCompanion<Sequence, Element> = {
     is(value: unknown): value is Sequence;
     from(elements: Element[]): Sequence;

package/build/unparserOutputCompanion.js

@@ -1,4 +1,4 @@
-import { StringParserInputCompanion, Uint8ArrayParserInputCompanion } from "./parserInputCompanion.js";
+import { StringParserInputCompanion, Uint8ArrayParserInputCompanion } from './parserInputCompanion.js';
 export class StringUnparserOutputCompanion extends StringParserInputCompanion {
     concat(sequences) {
         return sequences.join('');

package/build/zipParser.js

@@ -69,7 +69,7 @@ const zipDataDescriptorSignatureParser = createExactSequenceParser(zipDataDescri
 const zipDataDescriptorParser = promiseCompose(createTupleParser([
     createNegativeLookaheadParser(zipLocalFileHeaderSignatureParser),
     // FIXME: optional in spec
-    //createOptionalParser(zipDataDescriptorSignatureParser),
+    // createOptionalParser(zipDataDescriptorSignatureParser),
     zipDataDescriptorSignatureParser,
     uint32LEParser,
     uint32LEParser,

package/build/zipUnparser.d.ts

@@ -1,6 +1,6 @@
-import { Unparser } from "./unparser.js";
-import { Zip } from "./zip.js";
-import { ZipEndOfCentralDirectoryRecord } from './zipParser.js';
+import { type Unparser } from './unparser.js';
+import { type Zip } from './zip.js';
+import { type ZipEndOfCentralDirectoryRecord } from './zipParser.js';
 export declare const zipEndOfCentralDirectoryRecordUnparser: Unparser<ZipEndOfCentralDirectoryRecord, Uint8Array>;
 export declare const createZipUnparser: ({ dataDescriptor, }?: {
     dataDescriptor?: boolean;

package/build/zipUnparser.js

@@ -28,12 +28,7 @@ const dosDateTimeUnparser = async function* (date, unparserContext) {
         | (date.getUTCFullYear() - 1980) << 9), unparserContext);
 };
 const zipCompressionMethodUnparser = async function* (compressionMethod, unparserContext) {
-    if (compressionMethod === 'store') {
-        yield* uint16LEUnparser(0, unparserContext);
-    }
-    else {
-        yield* uint16LEUnparser(8, unparserContext);
-    }
+    yield* (compressionMethod === 'store' ? uint16LEUnparser(0, unparserContext) : uint16LEUnparser(8, unparserContext));
 };
 export const zipEndOfCentralDirectoryRecordUnparser = async function* (zipEndOfCentralDirectoryRecord, unparserContext) {
     yield Buffer.from('504b0506', 'hex');
@@ -131,25 +126,20 @@ export const createZipUnparser = ({ dataDescriptor = false, } = {}) => async fun
     for (const zipEntry of zip.entries) {
         yield Buffer.from('504b0102', 'hex');
         if (zipEntry.hostSystem === 'unix') {
-            yield 0; // zip specification version
-            yield 3; // host system
+            yield 0; // Zip specification version
+            yield 3; // Host system
         }
         else {
             yield 0;
             yield 0;
         }
-        yield* uint16LEUnparser(0, unparserContext); // version needed to extract
-        yield* uint16LEUnparser(0, unparserContext); // general purpose bit flag
-        if (zipEntry.type === 'file') {
-            yield* zipCompressionMethodUnparser(zipEntry.compression, unparserContext);
-        }
-        else {
-            yield* uint16LEUnparser(0, unparserContext);
-        }
+        yield* uint16LEUnparser(0, unparserContext); // Version needed to extract
+        yield* uint16LEUnparser(0, unparserContext); // General purpose bit flag
+        yield* (zipEntry.type === 'file' ? zipCompressionMethodUnparser(zipEntry.compression, unparserContext) : uint16LEUnparser(0, unparserContext));
         yield* dosDateTimeUnparser(zipEntry.date, unparserContext);
         if (zipEntry.type === 'file') {
             const compressedContent = await compressedContentByZipFileEntry.get(zipEntry);
-            yield* uint32LEUnparser(0, unparserContext); // crc32 // TODO
+            yield* uint32LEUnparser(0, unparserContext); // Crc32 // TODO
             yield* uint32LEUnparser(compressedContent.length, unparserContext);
             yield* uint32LEUnparser(zipEntry.content.length, unparserContext);
         }
@@ -165,8 +155,8 @@ export const createZipUnparser = ({ dataDescriptor = false, } = {}) => async fun
         yield* uint16LEUnparser(extraFieldBuffer.length, unparserContext);
         const fileCommentBuffer = Buffer.from(zipEntry.comment, 'utf8');
         yield* uint16LEUnparser(fileCommentBuffer.length, unparserContext);
-        yield* uint16LEUnparser(0, unparserContext); // disk number start
-        yield* uint16LEUnparser(0, unparserContext); // internal file attributes
+        yield* uint16LEUnparser(0, unparserContext); // Disk number start
+        yield* uint16LEUnparser(0, unparserContext); // Internal file attributes
         if (zipEntry.hostSystem === 'unix') {
             yield* uint32LEUnparser((0
                 | (zipEntry.type === 'directory'

package/build/zipUnparser.test.js

@@ -1,7 +1,7 @@
+import fsPromises from 'node:fs/promises';
 import { fc, testProp } from '@fast-check/ava';
 import { temporaryFile } from 'tempy';
 import { execa } from 'execa';
-import fsPromises from 'node:fs/promises';
 import { runUnparser } from './unparser.js';
 import { createZipUnparser } from './zipUnparser.js';
 import { uint8ArrayUnparserOutputCompanion } from './unparserOutputCompanion.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@futpib/parser",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "build/index.js",
   "license": "GPL-3.0-only",
   "type": "module",
@@ -18,46 +18,40 @@
       },
       "compile": false
     },
-    "verbose": true
+    "verbose": true,
+    "timeout": "60s"
   },
   "devDependencies": {
-    "@ava/typescript": "^5.0.0",
-    "@fast-check/ava": "^2.0.1",
+    "@ava/typescript": "^6.0.0",
+    "@fast-check/ava": "^2.0.2",
+    "@gruhn/regex-utils": "^2.7.3",
     "@types/invariant": "^2.2.37",
-    "@types/node": "^22.10.2",
-    "ava": "^6.2.0",
-    "bson": "^6.10.1",
+    "@types/node": "^24.4.0",
+    "ava": "^6.4.1",
+    "bson": "^6.10.4",
     "c8": "^10.1.3",
     "coveralls": "^3.1.1",
     "env-paths": "^3.0.0",
-    "eslint-config-xo-typescript-overrides": "^1.6.1",
-    "execa": "^9.5.2",
-    "fast-check": "^3.23.2",
+    "eslint-config-xo-typescript-overrides": "^2.0.3",
+    "execa": "^9.6.0",
+    "fast-check": "^4.3.0",
     "invariant": "^2.2.4",
     "jszip": "^3.10.1",
     "leb128": "^0.0.5",
-    "mutf-8": "^1.1.4",
-    "p-memoize": "^7.1.1",
+    "mutf-8": "^1.2.2",
+    "p-memoize": "^8.0.0",
     "tempy": "^3.1.0",
-    "type-fest": "^4.30.1",
-    "typescript": "^5.7.2",
-    "xo": "^0.60.0"
+    "type-fest": "^5.0.0",
+    "typescript": "^5.9.2",
+    "xo": "^1.2.2"
   },
-  "xo": {
-    "extends": [
-      "eslint-config-xo-typescript-overrides"
-    ],
-    "rules": {
-      "ava/no-ignored-test-files": "off"
-    }
-  },
-  "packageManager": "yarn@4.5.3",
+  "packageManager": "yarn@4.9.4",
   "dependencies": {
-    "fp-ts": "^2.16.9",
+    "fp-ts": "^2.16.11",
     "mem": "^10.0.0",
     "monocle-ts": "^2.3.13",
     "newtype-ts": "^0.3.5",
-    "p-mutex": "^0.1.0"
+    "p-mutex": "^1.0.0"
   },
   "peerDependencies": {
     "mutf-8": "^1.1.4"

package/src/allSettledStream.test.ts

@@ -65,8 +65,8 @@ test('allSettledStream reader cancel', async t => {
 		0,
 		40,
 		30,
-	].map((delay) => ({
-		promise: new Promise<number>((resolve) => {
+	].map(delay => ({
+		promise: new Promise<number>(resolve => {
 			setTimeout(() => {
 				resolve(delay);
 			}, delay);

package/src/allSettledStream.ts

@@ -1,4 +1,4 @@
-import { promiseSettled } from "./promiseSettled.js";
+import { promiseSettled } from './promiseSettled.js';
 
 type AllSettledStreamFulfilledResult<T, Context> = {
 	status: 'fulfilled';
@@ -39,8 +39,8 @@ export function allSettledStream<T, Context>(tasks: Array<AllSettledStreamTask<T
 
 				if (
 					promiseSettledResult.status === 'rejected'
-						&& promiseSettledResult.reason instanceof Error
-						&& promiseSettledResult.reason.stack
+					&& promiseSettledResult.reason instanceof Error
+					&& promiseSettledResult.reason.stack
 				) {
 					promiseSettledResult.reason.stack += `\n${startStack}`;
 				}

package/src/androidPackageParser.test.ts

@@ -4,26 +4,24 @@ import { runParser } from './parser.js';
 import { androidPackageParser } from './androidPackageParser.js';
 import { fetchCid } from './fetchCid.js';
 
-for (const androidPackageCid of [
-	'bafkreicckcmzrdxwoc3w2in3tivpyxrdtcfpct4zwauq3igew3nkpvfapu',
-	'bafkreidqycbgrtp7ywhevsgtm464dqpamxsijpaqfcfz2k3ymc3wrzsb5m',
-]) {
-	test(
-		'androidPackage ' + androidPackageCid,
-		async t => {
-			const androidPackageStream = await fetchCid(androidPackageCid);
+const androidPackageMacro = test.macro({
+	title: (providedTitle, androidPackageCid: string) => providedTitle ?? `androidPackage ${androidPackageCid}`,
+	async exec(t, androidPackageCid: string) {
+		const androidPackageStream = await fetchCid(androidPackageCid);
 
-			const actual = await runParser(androidPackageParser, androidPackageStream, uint8ArrayParserInputCompanion, {
-				errorJoinMode: 'all',
-			});
+		const actual = await runParser(androidPackageParser, androidPackageStream, uint8ArrayParserInputCompanion, {
+			errorJoinMode: 'all',
+		});
 
-			for (const entry of actual.entries) {
-				if (entry.type === 'file') {
-					entry.content = new Uint8Array([ entry.content.length ]);
-				}
+		for (const entry of actual.entries) {
+			if (entry.type === 'file') {
+				entry.content = new Uint8Array([ entry.content.length ]);
 			}
+		}
 
-			t.snapshot(actual);
-		},
-	);
-}
+		t.snapshot(actual);
+	},
+});
+
+test(androidPackageMacro, 'bafkreicckcmzrdxwoc3w2in3tivpyxrdtcfpct4zwauq3igew3nkpvfapu');
+test(androidPackageMacro, 'bafkreidqycbgrtp7ywhevsgtm464dqpamxsijpaqfcfz2k3ymc3wrzsb5m');