refactor: parsePackageRow

packages/@yarn-tool/yarnlock-diff/lib/diff-service.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
 import { Diff } from "deep-diff";
 import { Option } from "fp-ts/lib/Option";
-export declare function buildDiff(oldYarnLockContent: (Buffer | string)[], newYarnLockContent: (Buffer | string)[]): Option<Diff<{}, {}>[]>;
+import { ITSValueOrArray } from 'ts-type/lib/type/base';
+import { IComputedPackage } from './diff-service/types';
+export declare function buildDiff(oldYarnLockContent: ITSValueOrArray<Buffer | string>, newYarnLockContent: ITSValueOrArray<Buffer | string>): Option<Diff<IComputedPackage, IComputedPackage>[]>;

packages/@yarn-tool/yarnlock-diff/lib/diff-service.ts

@@ -3,11 +3,13 @@ import { fromNullable, Option } from "fp-ts/lib/Option";
 import { yarnLockParse } from '@yarn-tool/yarnlock-parse/index';
 import { computeHashmapOfPackageAndVersionList } from './diff-service/computeHashmapOfPackageAndVersionList';
 import { buildComputedPackage } from './diff-service/buildComputedPackage';
+import { ITSValueOrArray } from 'ts-type/lib/type/base';
+import { IComputedPackage } from './diff-service/types';
 
 export function buildDiff(
-	oldYarnLockContent: (Buffer | string)[],
-	newYarnLockContent: (Buffer | string)[],
-): Option<Diff<{}, {}>[]>
+	oldYarnLockContent: ITSValueOrArray<Buffer | string>,
+	newYarnLockContent: ITSValueOrArray<Buffer | string>,
+): Option<Diff<IComputedPackage, IComputedPackage>[]>
 {
 	const oldPacakges = buildComputedPackage(oldYarnLockContent);
 

packages/@yarn-tool/yarnlock-diff/lib/diff-service/buildComputedPackage.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" />
 import { IComputedPackage } from './types';
-export declare function buildComputedPackage(yarnLockContentList: (Buffer | string)[], alreadyComputedPackage?: IComputedPackage): IComputedPackage;
+import { ITSValueOrArray } from 'ts-type/lib/type/base';
+export declare function buildComputedPackage(yarnLockContentList: ITSValueOrArray<Buffer | string>, alreadyComputedPackage?: IComputedPackage): IComputedPackage;

packages/@yarn-tool/yarnlock-diff/lib/diff-service/buildComputedPackage.ts

@@ -1,9 +1,15 @@
 import { IComputedPackage } from './types';
 import { yarnLockParse } from '@yarn-tool/yarnlock-parse/index';
 import { computeHashmapOfPackageAndVersionList } from './computeHashmapOfPackageAndVersionList';
+import { ITSValueOrArray } from 'ts-type/lib/type/base';
 
-export function buildComputedPackage(yarnLockContentList: (Buffer | string)[], alreadyComputedPackage: IComputedPackage = {})
+export function buildComputedPackage(yarnLockContentList: ITSValueOrArray<Buffer | string>, alreadyComputedPackage: IComputedPackage = {})
 {
+	if (!Array.isArray(yarnLockContentList))
+	{
+		yarnLockContentList = [yarnLockContentList];
+	}
+
 	return yarnLockContentList
 		.map(v => yarnLockParse(v))
 	.reduce(computeHashmapOfPackageAndVersionList, alreadyComputedPackage);

packages/@yarn-tool/yarnlock-diff/lib/diff-service/computeHashmapOfPackageAndVersionList.ts

@@ -4,21 +4,54 @@ import {
 	isYarnLockParsedV1,
 	isYarnLockParsedV2,
 } from '@yarn-tool/yarnlock-parse/index';
-import { computeHashmapOfPackageAndVersionList as v1 } from './v1/computeHashmapOfPackageAndVersionList';
-import { computeHashmapOfPackageAndVersionList as v2 } from './v2/computeHashmapOfPackageAndVersionList';
+
+import { parsePackageRow as v1 } from './v1/parsePackageRow';
+import { parsePackageRow as v2 } from './v2/parsePackageRow';
+
 import { IComputedPackage } from './types';
+import { array_unique_overwrite } from 'array-hyper-unique/index';
+import { compareLoose } from 'semver';
 
 export function computeHashmapOfPackageAndVersionList(alreadyComputedPackage: IComputedPackage,
-	parsedOldPackage: IYarnLockParsedV1 | IYarnLockParsedV2): IComputedPackage
+	parsedOldPackage: IYarnLockParsedV1 | IYarnLockParsedV2,
+): IComputedPackage
 {
+	let fn: (...argv) => {
+		name: string;
+		version: string;
+	};
+
 	if (isYarnLockParsedV1(parsedOldPackage))
 	{
-		return v1(alreadyComputedPackage, parsedOldPackage.data)
+		fn = v1
 	}
 	else if (isYarnLockParsedV2(parsedOldPackage))
 	{
-		return v2(alreadyComputedPackage, parsedOldPackage.data)
+		fn = v2
+	}
+	else
+	{
+		throw new TypeError(`can't detect yarn.lock version`)
 	}
 
-	throw new TypeError(`can't detect yarn.lock version`)
+	Object.entries(parsedOldPackage.data)
+		.forEach(([packageName, packageData]) =>
+		{
+			const result = fn(packageName, packageData);
+
+			if (typeof result === 'undefined' || result === null)
+			{
+				return;
+			}
+
+			alreadyComputedPackage[result.name] ??= [];
+			alreadyComputedPackage[result.name].push(result.version);
+
+			array_unique_overwrite(alreadyComputedPackage[result.name])
+
+			alreadyComputedPackage[result.name].sort(compareLoose);
+		})
+	;
+
+	return alreadyComputedPackage;
 }

packages/@yarn-tool/yarnlock-diff/lib/diff-service/types.d.ts

@@ -1,3 +1,7 @@
 export interface IComputedPackage {
     [packagename: string]: string[];
 }
+export interface IParsePackageRow {
+    name: string;
+    version: string;
+}

packages/@yarn-tool/yarnlock-diff/lib/diff-service/types.ts

@@ -3,3 +3,9 @@ export interface IComputedPackage
 {
 	[packagename: string]: string[];
 }
+
+export interface IParsePackageRow
+{
+	name: string;
+	version: string;
+}

packages/@yarn-tool/yarnlock-diff/lib/diff-service/v1/const.d.ts

@@ -0,0 +1 @@
+export declare const PACKAGE_REGEX: RegExp;

packages/@yarn-tool/yarnlock-diff/lib/diff-service/v1/const.ts

@@ -0,0 +1 @@
+export const PACKAGE_REGEX = /(?<packageName>.*)@(?:(?<semverPin>[\^\$])?(?<major>\d)(?:\.(?<minor>\d))?(?:\.(?<patch>\d))?(?:-(?<prerelease>[0-9a-zA-Z-]+)(?:.(?<prereleaseVersion>[0-9a-zA-Z]+))?)?(?:\+(?<metadata>[0-9a-zA-Z-]+)(?:.(?<metadataVersion>[0-9a-zA-Z]+))?)?|\*)/;

packages/@yarn-tool/yarnlock-diff/lib/diff-service/v1/parsePackageRow.d.ts

@@ -0,0 +1,3 @@
+import { IPackageData } from './types';
+import { IParsePackageRow } from '../types';
+export declare function parsePackageRow(packageName: string, packageData: IPackageData): IParsePackageRow;

packages/@yarn-tool/yarnlock-diff/lib/diff-service/v1/parsePackageRow.ts

@@ -0,0 +1,19 @@
+import { IPackageData } from './types';
+import { PACKAGE_REGEX } from './const';
+import { IParsePackageRow } from '../types';
+
+export function parsePackageRow(packageName: string, packageData: IPackageData): IParsePackageRow
+{
+	const regexResult = PACKAGE_REGEX.exec(packageName);
+
+	const packageNameWithoutVersion =
+		regexResult?.groups?.packageName;
+
+	if (packageNameWithoutVersion)
+	{
+		return {
+			name: packageNameWithoutVersion,
+			version: packageData.version,
+		}
+	}
+}

packages/@yarn-tool/yarnlock-diff/lib/diff-service/v2/parsePackageRow.d.ts

@@ -0,0 +1,2 @@
+import { IParsePackageRow } from '../types';
+export declare function parsePackageRow(packageName: string, packageData: any): IParsePackageRow;

packages/@yarn-tool/yarnlock-diff/lib/diff-service/v2/parsePackageRow.ts

@@ -0,0 +1,7 @@
+import { IPackageData } from '../v1/types';
+import { IParsePackageRow } from '../types';
+
+export function parsePackageRow(packageName: string, packageData): IParsePackageRow
+{
+	throw new Error(`not implemented`)
+}

packages/@yarn-tool/yarnlock-diff/package.json

@@ -39,7 +39,9 @@
     "chalk": "^4.1.0",
     "cli-table": "^0.3.1",
     "deep-diff": "^1.0.2",
-    "fp-ts": "^2.7.1"
+    "fp-ts": "^2.7.1",
+    "semver": "^7.3.2",
+    "ts-type": "^1.2.32"
   },
   "devDependencies": {},
   "publishConfig": {