@futpib/parser 1.0.2 → 1.0.4

package/src/androidPackageParser.ts

@@ -9,15 +9,17 @@ import {
 	zip64EndOfCentralDirectoryRecordParser,
 	zipArchiveDecryptionHeaderParser,
 	zipArchiveExtraDataRecordParser,
-	ZipCentralDirectoryHeader,
+	type ZipCentralDirectoryHeader,
 	zipCentralDirectoryHeaderParser,
-	ZipEndOfCentralDirectoryRecord,
+	type ZipEndOfCentralDirectoryRecord,
 	zipEndOfCentralDirectoryRecordParser,
 	zipFromZipSegments,
-	ZipLocalFile,
+	type ZipLocalFile,
 	zipLocalFileParser,
 } from './zipParser.js';
-import { AndroidPackageSignatureV2AdditionalAttribute, AndroidPackageSignatureV2Digest, AndroidPackageSignatureV2Signature, AndroidPackageSignatureV2SignedData, AndroidPackageSignatureV2Signer, type AndroidPackage, type AndroidPackageSigningBlock, type AndroidPackageSigningBlockPair } from './androidPackage.js';
+import {
+	type AndroidPackageSignatureV2AdditionalAttribute, type AndroidPackageSignatureV2Digest, type AndroidPackageSignatureV2Signature, type AndroidPackageSignatureV2SignedData, type AndroidPackageSignatureV2Signer, type AndroidPackage, type AndroidPackageSigningBlock, type AndroidPackageSigningBlockPair,
+} from './androidPackage.js';
 import { createFixedLengthSequenceParser } from './fixedLengthSequenceParser.js';
 import { parserCreatorCompose } from './parserCreatorCompose.js';
 import { createExactSequenceParser } from './exactSequenceParser.js';
@@ -55,9 +57,7 @@ const createUint64LengthPrefixedParser = <T>(createInnerParser: (length: bigint)
 	length => createInnerParser(length),
 )();
 
-const createUint32LengthPrefixedSliceBoundedParser = <T>(innerParser: Parser<T, Uint8Array>): Parser<T, Uint8Array> => createUint32LengthPrefixedParser(
-	length => createSliceBoundedParser(innerParser, length),
-);
+const createUint32LengthPrefixedSliceBoundedParser = <T>(innerParser: Parser<T, Uint8Array>): Parser<T, Uint8Array> => createUint32LengthPrefixedParser(length => createSliceBoundedParser(innerParser, length));
 
 const createUint32LengthPrefixedSliceBoundedArrayParser = <T>(innerParser: Parser<T, Uint8Array>): Parser<T[], Uint8Array> => createUint32LengthPrefixedSliceBoundedParser(createArrayParser(innerParser));
 
@@ -143,180 +143,150 @@ const createAndroidPackageSigningBlockPairInnerParser = (length: number): Parser
 	return androidPackageSigningBlockPairInnerParser;
 };
 
-const androidPackageSigningBlockPairParser: Parser<AndroidPackageSigningBlockPairType, Uint8Array> = createUint64LengthPrefixedParser(
-	length => createAndroidPackageSigningBlockPairInnerParser(Number(length)),
-);
+const androidPackageSigningBlockPairParser: Parser<AndroidPackageSigningBlockPairType, Uint8Array> = createUint64LengthPrefixedParser(length => createAndroidPackageSigningBlockPairInnerParser(Number(length)));
 
 setParserName(androidPackageSigningBlockPairParser, 'androidPackageSigningBlockPairParser');
 
 const androidPackageSigningBlockPairsParser: Parser<AndroidPackageSigningBlockPairType[], Uint8Array> = createArrayParser(androidPackageSigningBlockPairParser);
 
-export const androidPackageSigningBlockParser: Parser<AndroidPackageSigningBlock, Uint8Array> = createUint64LengthPrefixedParser(
-	sizeOfBlock => promiseCompose(
-		createTupleParser([
-			androidPackageSigningBlockPairsParser,
-			uint64LEParser,
-			createExactSequenceParser<Uint8Array>(Buffer.from('APK Sig Block 42', 'utf8')),
-		]),
-		async ([
-			pairs,
-			sizeOfBlockRepeated,
-			_magic,
-		]): Promise<AndroidPackageSigningBlock> => {
-			invariant(sizeOfBlock === sizeOfBlockRepeated, 'Size of block mismatch: %s !== %s.', sizeOfBlock, sizeOfBlockRepeated);
-
-			const zeroPaddingPair = pairs.find(pair => pair.type === 'zeroPadding');
-			const signatureV2Pair = pairs.find(pair => pair.type === 'signatureV2');
-
-			const genericPairs = (
-				pairs
-					.filter(pair => (
-						pair !== zeroPaddingPair
-							&& pair !== signatureV2Pair
-					))
-					.map(pair => {
-						invariant(pair.type === 'generic', 'Expected generic pair, got %s.', pair.type);
-						return pair.pair;
-					})
-			);
-
-			return {
-				zeroPaddingLength: zeroPaddingPair?.length,
-				signatureV2: signatureV2Pair ? {
+export const androidPackageSigningBlockParser: Parser<AndroidPackageSigningBlock, Uint8Array> = createUint64LengthPrefixedParser(sizeOfBlock => promiseCompose(
+	createTupleParser([
+		androidPackageSigningBlockPairsParser,
+		uint64LEParser,
+		createExactSequenceParser<Uint8Array>(Buffer.from('APK Sig Block 42', 'utf8')),
+	]),
+	async ([
+		pairs,
+		sizeOfBlockRepeated,
+		_magic,
+	]): Promise<AndroidPackageSigningBlock> => {
+		invariant(sizeOfBlock === sizeOfBlockRepeated, 'Size of block mismatch: %s !== %s.', sizeOfBlock, sizeOfBlockRepeated);
+
+		const zeroPaddingPair = pairs.find(pair => pair.type === 'zeroPadding');
+		const signatureV2Pair = pairs.find(pair => pair.type === 'signatureV2');
+
+		const genericPairs = (
+			pairs
+				.filter(pair => (
+					pair !== zeroPaddingPair
+					&& pair !== signatureV2Pair
+				))
+				.map(pair => {
+					invariant(pair.type === 'generic', 'Expected generic pair, got %s.', pair.type);
+					return pair.pair;
+				})
+		);
+
+		return {
+			zeroPaddingLength: zeroPaddingPair?.length,
+			signatureV2: signatureV2Pair
+				? {
 					signers: signatureV2Pair?.signers,
-				} : undefined,
-				pairs: genericPairs,
-			};
-		},
-	),
-);
+				}
+				: undefined,
+			pairs: genericPairs,
+		};
+	},
+));
 
-const androidPackageSignatureV2DigestParser = createUint32LengthPrefixedParser<AndroidPackageSignatureV2Digest>(
-	pairLength => promiseCompose(
-		createTupleParser([
-			uint32LEParser,
-			createUint32LengthPrefixedParser(
-				digestLength => createFixedLengthSequenceParser(digestLength),
-			),
-		]),
-		([ signatureAlgorithmId, digest ]) => ({ signatureAlgorithmId, digest }),
-	),
-);
+const androidPackageSignatureV2DigestParser = createUint32LengthPrefixedParser<AndroidPackageSignatureV2Digest>(pairLength => promiseCompose(
+	createTupleParser([
+		uint32LEParser,
+		createUint32LengthPrefixedParser(digestLength => createFixedLengthSequenceParser(digestLength)),
+	]),
+	([ signatureAlgorithmId, digest ]) => ({ signatureAlgorithmId, digest }),
+));
 
-const androidPackageSignatureV2DigestsParser = createUint32LengthPrefixedSliceBoundedArrayParser(
-	androidPackageSignatureV2DigestParser,
-);
+const androidPackageSignatureV2DigestsParser = createUint32LengthPrefixedSliceBoundedArrayParser(androidPackageSignatureV2DigestParser);
 
 setParserName(androidPackageSignatureV2DigestsParser, 'androidPackageSignatureV2DigestsParser');
 
-const androidPackageSignatureV2CertificateParser = createUint32LengthPrefixedParser(
-	certificateLength => createFixedLengthSequenceParser(certificateLength),
-);
+const androidPackageSignatureV2CertificateParser = createUint32LengthPrefixedParser(certificateLength => createFixedLengthSequenceParser(certificateLength));
 
 setParserName(androidPackageSignatureV2CertificateParser, 'androidPackageSignatureV2CertificateParser');
 
-const androidPackageSignatureV2CertificatesParser = createUint32LengthPrefixedSliceBoundedArrayParser(
-	androidPackageSignatureV2CertificateParser,
-);
+const androidPackageSignatureV2CertificatesParser = createUint32LengthPrefixedSliceBoundedArrayParser(androidPackageSignatureV2CertificateParser);
 
 setParserName(androidPackageSignatureV2CertificatesParser, 'androidPackageSignatureV2CertificatesParser');
 
-const androidPackageSignatureV2AdditionalAttributeParser = createUint32LengthPrefixedParser<AndroidPackageSignatureV2AdditionalAttribute>(
-	pairLength => promiseCompose(
-		createTupleParser([
-			uint32LEParser,
-			createFixedLengthSequenceParser(pairLength - 4),
-		]),
-		([ id, value ]) => ({ id, value }),
-	),
-);
+const androidPackageSignatureV2AdditionalAttributeParser = createUint32LengthPrefixedParser<AndroidPackageSignatureV2AdditionalAttribute>(pairLength => promiseCompose(
+	createTupleParser([
+		uint32LEParser,
+		createFixedLengthSequenceParser(pairLength - 4),
+	]),
+	([ id, value ]) => ({ id, value }),
+));
 
 setParserName(androidPackageSignatureV2AdditionalAttributeParser, 'androidPackageSignatureV2AdditionalAttributeParser');
 
-const androidPackageSignatureV2AdditionalAttributesParser = createUint32LengthPrefixedSliceBoundedArrayParser(
-	androidPackageSignatureV2AdditionalAttributeParser,
-);
+const androidPackageSignatureV2AdditionalAttributesParser = createUint32LengthPrefixedSliceBoundedArrayParser(androidPackageSignatureV2AdditionalAttributeParser);
 
 setParserName(androidPackageSignatureV2AdditionalAttributesParser, 'androidPackageSignatureV2AdditionalAttributesParser');
 
-const androidPackageSignatureV2SignedDataParser = createUint32LengthPrefixedSliceBoundedParser(
-	promiseCompose(
-		createTupleParser([
-			androidPackageSignatureV2DigestsParser,
-			androidPackageSignatureV2CertificatesParser,
-			androidPackageSignatureV2AdditionalAttributesParser,
-			createArrayParser(createExactElementParser(0)),
-		]),
-		([
-			digests,
-			certificates,
-			additionalAttributes,
-			zeroPadding,
-		]): AndroidPackageSignatureV2SignedData => ({
-			digests,
-			certificates,
-			additionalAttributes,
-			zeroPaddingLength: zeroPadding.length,
-		}),
-	),
-);
+const androidPackageSignatureV2SignedDataParser = createUint32LengthPrefixedSliceBoundedParser(promiseCompose(
+	createTupleParser([
+		androidPackageSignatureV2DigestsParser,
+		androidPackageSignatureV2CertificatesParser,
+		androidPackageSignatureV2AdditionalAttributesParser,
+		createArrayParser(createExactElementParser(0)),
+	]),
+	([
+		digests,
+		certificates,
+		additionalAttributes,
+		zeroPadding,
+	]): AndroidPackageSignatureV2SignedData => ({
+		digests,
+		certificates,
+		additionalAttributes,
+		zeroPaddingLength: zeroPadding.length,
+	}),
+));
 
 setParserName(androidPackageSignatureV2SignedDataParser, 'androidPackageSignatureV2SignedDataParser');
 
-const androidPackageSignatureV2SignatureParser = createUint32LengthPrefixedParser(
-	signatureLength => promiseCompose(
-		createTupleParser([
-			uint32LEParser,
-			createUint32LengthPrefixedParser(
-				signatureLength => createFixedLengthSequenceParser(signatureLength),
-			),
-		]),
-		([
-			signatureAlgorithmId,
-			signature,
-		]): AndroidPackageSignatureV2Signature => ({
-			signatureAlgorithmId,
-			signature,
-		}),
-	),
-);
+const androidPackageSignatureV2SignatureParser = createUint32LengthPrefixedParser(signatureLength => promiseCompose(
+	createTupleParser([
+		uint32LEParser,
+		createUint32LengthPrefixedParser(signatureLength => createFixedLengthSequenceParser(signatureLength)),
+	]),
+	([
+		signatureAlgorithmId,
+		signature,
+	]): AndroidPackageSignatureV2Signature => ({
+		signatureAlgorithmId,
+		signature,
+	}),
+));
 
-const androidPackageSignatureV2SignaturesParser = createUint32LengthPrefixedSliceBoundedArrayParser(
-	androidPackageSignatureV2SignatureParser,
-);
+const androidPackageSignatureV2SignaturesParser = createUint32LengthPrefixedSliceBoundedArrayParser(androidPackageSignatureV2SignatureParser);
 
 setParserName(androidPackageSignatureV2SignaturesParser, 'androidPackageSignatureV2SignaturesParser');
 
-const androidPackageSignatureV2PublicKeyParser = createUint32LengthPrefixedParser(
-	publicKeyLength => createFixedLengthSequenceParser(publicKeyLength),
-);
+const androidPackageSignatureV2PublicKeyParser = createUint32LengthPrefixedParser(publicKeyLength => createFixedLengthSequenceParser(publicKeyLength));
 
 setParserName(androidPackageSignatureV2PublicKeyParser, 'androidPackageSignatureV2PublicKeyParser');
 
-const androidPackageSignatureV2SignerParser = createUint32LengthPrefixedSliceBoundedParser(
-	promiseCompose(
-		createTupleParser([
-			androidPackageSignatureV2SignedDataParser,
-			androidPackageSignatureV2SignaturesParser,
-			androidPackageSignatureV2PublicKeyParser,
-		]),
-		([
-			signedData,
-			signatures = [],
-			publicKey,
-		]): AndroidPackageSignatureV2Signer => ({
-			signedData,
-			signatures,
-			publicKey,
-		}),
-	),
-);
+const androidPackageSignatureV2SignerParser = createUint32LengthPrefixedSliceBoundedParser(promiseCompose(
+	createTupleParser([
+		androidPackageSignatureV2SignedDataParser,
+		androidPackageSignatureV2SignaturesParser,
+		androidPackageSignatureV2PublicKeyParser,
+	]),
+	([
+		signedData,
+		signatures = [],
+		publicKey,
+	]): AndroidPackageSignatureV2Signer => ({
+		signedData,
+		signatures,
+		publicKey,
+	}),
+));
 
 setParserName(androidPackageSignatureV2SignerParser, 'androidPackageSignatureV2SignerParser');
 
-const androidPackageSignatureV2SignersParser = createUint32LengthPrefixedSliceBoundedArrayParser(
-	androidPackageSignatureV2SignerParser,
-);
+const androidPackageSignatureV2SignersParser = createUint32LengthPrefixedSliceBoundedArrayParser(androidPackageSignatureV2SignerParser);
 
 setParserName(androidPackageSignatureV2SignersParser, 'androidPackageSignatureV2SignersParser');
 
@@ -371,35 +341,23 @@ export type AndroidPackageSignableSections = {
 	androidPackageSigningBlockUint8Array?: Uint8Array;
 	zipCentralDirectoryUint8Array: Uint8Array;
 	zipEndOfCentralDirectoryUint8Array: Uint8Array;
-}
+};
 
 export const androidPackageSignableSectionsParser: Parser<AndroidPackageSignableSections, Uint8Array> = promiseCompose(
 	createTupleParser([
-		createParserConsumedSequenceParser(
-			createTupleParser([
-				createArrayParser(zipLocalFileParser),
-				createOptionalParser(zipArchiveDecryptionHeaderParser),
-				createOptionalParser(zipArchiveExtraDataRecordParser),
-			]),
-		),
-		createArrayParser(
-			createExactElementParser(0),
-		),
-		createOptionalParser(
-			createParserConsumedSequenceParser(
-				androidPackageSigningBlockParser
-			),
-		),
-		createParserConsumedSequenceParser(
-			createTupleParser([
-				createArrayParser(zipCentralDirectoryHeaderParser),
-				createOptionalParser(zip64EndOfCentralDirectoryRecordParser),
-				createOptionalParser(zip64EndOfCentralDirectoryLocatorParser),
-			]),
-		),
-		createParserConsumedSequenceParser(
-			zipEndOfCentralDirectoryRecordParser,
-		),
+		createParserConsumedSequenceParser(createTupleParser([
+			createArrayParser(zipLocalFileParser),
+			createOptionalParser(zipArchiveDecryptionHeaderParser),
+			createOptionalParser(zipArchiveExtraDataRecordParser),
+		])),
+		createArrayParser(createExactElementParser(0)),
+		createOptionalParser(createParserConsumedSequenceParser(androidPackageSigningBlockParser)),
+		createParserConsumedSequenceParser(createTupleParser([
+			createArrayParser(zipCentralDirectoryHeaderParser),
+			createOptionalParser(zip64EndOfCentralDirectoryRecordParser),
+			createOptionalParser(zip64EndOfCentralDirectoryLocatorParser),
+		])),
+		createParserConsumedSequenceParser(zipEndOfCentralDirectoryRecordParser),
 	]),
 	async ([
 		[

package/src/androidPackageUnparser.test.ts

@@ -1,36 +1,34 @@
 import test from 'ava';
+import invariant from 'invariant';
 import { uint8ArrayParserInputCompanion } from './parserInputCompanion.js';
 import { runParser } from './parser.js';
 import { androidPackageParser, androidPackageSigningBlockParser } from './androidPackageParser.js';
 import { runUnparser } from './unparser.js';
 import { androidPackageSigningBlockUnparser } from './androidPackageUnparser.js';
 import { uint8ArrayUnparserOutputCompanion } from './unparserOutputCompanion.js';
-import invariant from 'invariant';
 import { fetchCid } from './fetchCid.js';
 
-for (const androidPackageCid of [
-	'bafkreicckcmzrdxwoc3w2in3tivpyxrdtcfpct4zwauq3igew3nkpvfapu',
-]) {
-	test(
-		'androidPackage ' + androidPackageCid,
-		async t => {
-			const androidPackageStream = await fetchCid(androidPackageCid);
+const androidPackageUnparserMacro = test.macro({
+	title: (providedTitle, androidPackageCid: string) => providedTitle ?? `androidPackage ${androidPackageCid}`,
+	async exec(t, androidPackageCid: string) {
+		const androidPackageStream = await fetchCid(androidPackageCid);
+
+		const androidPackage = await runParser(androidPackageParser, androidPackageStream, uint8ArrayParserInputCompanion, {
+			errorJoinMode: 'all',
+		});
 
-			const androidPackage = await runParser(androidPackageParser, androidPackageStream, uint8ArrayParserInputCompanion, {
-				errorJoinMode: 'all',
-			});
+		const androidPackageSigningBlock = androidPackage.signingBlock;
 
-			const androidPackageSigningBlock = androidPackage.signingBlock;
+		invariant(androidPackageSigningBlock, 'APK has no signing block');
 
-			invariant(androidPackageSigningBlock, 'APK has no signing block');
+		const androidPackageSigningBlockStream = runUnparser(androidPackageSigningBlockUnparser, androidPackageSigningBlock, uint8ArrayUnparserOutputCompanion);
 
-			const androidPackageSigningBlockStream = runUnparser(androidPackageSigningBlockUnparser, androidPackageSigningBlock, uint8ArrayUnparserOutputCompanion);
+		const actual = await runParser(androidPackageSigningBlockParser, androidPackageSigningBlockStream, uint8ArrayParserInputCompanion, {
+			errorJoinMode: 'all',
+		});
 
-			const actual = await runParser(androidPackageSigningBlockParser, androidPackageSigningBlockStream, uint8ArrayParserInputCompanion, {
-				errorJoinMode: 'all',
-			});
+		t.deepEqual(actual, androidPackageSigningBlock);
+	},
+});
 
-			t.deepEqual(actual, androidPackageSigningBlock);
-		},
-	);
-}
+test(androidPackageUnparserMacro, 'bafkreicckcmzrdxwoc3w2in3tivpyxrdtcfpct4zwauq3igew3nkpvfapu');

package/src/androidPackageUnparser.ts

@@ -1,7 +1,9 @@
-import { AndroidPackageSignatureV2AdditionalAttribute, AndroidPackageSignatureV2Digest, AndroidPackageSignatureV2Signature, AndroidPackageSignatureV2SignedData, AndroidPackageSignatureV2Signer, AndroidPackageSigningBlock } from "./androidPackage.js";
-import { createArrayUnparser } from "./arrayUnparser.js";
-import { createSequenceUnparser } from "./sequenceUnparser.js";
-import { Unparser } from "./unparser.js";
+import {
+	type AndroidPackageSignatureV2AdditionalAttribute, type AndroidPackageSignatureV2Digest, type AndroidPackageSignatureV2Signature, type AndroidPackageSignatureV2SignedData, type AndroidPackageSignatureV2Signer, type AndroidPackageSigningBlock,
+} from './androidPackage.js';
+import { createArrayUnparser } from './arrayUnparser.js';
+import { createSequenceUnparser } from './sequenceUnparser.js';
+import { type Unparser } from './unparser.js';
 
 const uint8ArrayUnparser = createSequenceUnparser<Uint8Array>();
 
@@ -9,7 +11,7 @@ const uint32LEUnparser: Unparser<number, Uint8Array> = async function * (input)
 	const buffer = Buffer.alloc(4);
 	buffer.writeUInt32LE(input);
 	yield buffer;
-}
+};
 
 const uint64LEUnparser: Unparser<number | bigint, Uint8Array> = async function * (input) {
 	const buffer = Buffer.alloc(8);
@@ -97,18 +99,22 @@ export const androidPackageSigningBlockUnparser: Unparser<AndroidPackageSigningB
 ) {
 	const pairs = [
 		...input.pairs,
-		...(input.signatureV2 ? [
-			{
-				id: 0x7109871a,
-				value: input.signatureV2!.signers,
-			},
-		] : []),
-		...(input.zeroPaddingLength ? [
-			{
-				id: 0x42726577,
-				value: Buffer.alloc(input.zeroPaddingLength),
-			},
-		] : []),
+		...(input.signatureV2
+			? [
+				{
+					id: 0x71_09_87_1A,
+					value: input.signatureV2.signers,
+				},
+			]
+			: []),
+		...(input.zeroPaddingLength
+			? [
+				{
+					id: 0x42_72_65_77,
+					value: Buffer.alloc(input.zeroPaddingLength),
+				},
+			]
+			: []),
 	];
 
 	const sizeOfBlockWriteLater = yield * unparserContext.writeLater(8);

package/src/arbitrarilySlicedAsyncInterable.ts

@@ -26,7 +26,7 @@ export function arbitrarilySlicedAsyncIterable<Sliceable extends string | Uint8A
 	{
 		minSlices = 1,
 	}: {
-		minSlices?: number,
+		minSlices?: number;
 	} = {},
 ): Arbitrary<[ Sliceable, AsyncIterable<Sliceable> ]> {
 	return (

package/src/arbitrarilySlicedAsyncInterator.ts

@@ -1,19 +1,19 @@
 import { type Arbitrary } from 'fast-check';
 import { arbitrarilySlicedAsyncIterable } from './arbitrarilySlicedAsyncInterable.js';
 
-export function arbitrarilySlicedAsyncIterator<Sliceable extends string | Uint8Array>(
-	arbitrarySliceable: Arbitrary<Sliceable>,
-): Arbitrary<[ Sliceable, AsyncIterator<Sliceable> ]> {
+export function arbitrarilySlicedAsyncIterator<Sliceable extends string | Uint8Array>(arbitrarySliceable: Arbitrary<Sliceable>): Arbitrary<[ Sliceable, AsyncIterator<Sliceable> ]> {
 	return (
 		arbitrarilySlicedAsyncIterable(arbitrarySliceable)
 			.map(([ sliceable, asyncIterable ]) => {
 				const asyncIterator_ = asyncIterable[Symbol.asyncIterator]();
 
+				const asyncIterableWithTag = asyncIterable as AsyncIterable<Sliceable> & { [Symbol.toStringTag]?: string };
+
 				const asyncIterator = {
 					next: asyncIterator_.next.bind(asyncIterator_),
 					return: asyncIterator_.return?.bind(asyncIterator_),
 					throw: asyncIterator_.throw?.bind(asyncIterator_),
-					[Symbol.toStringTag]: 'ArbitrarilySlicedAsyncIterator ' + (asyncIterable as any)[Symbol.toStringTag],
+					[Symbol.toStringTag]: 'ArbitrarilySlicedAsyncIterator ' + (asyncIterableWithTag[Symbol.toStringTag] ?? ''),
 				};
 
 				return [