Skip to content

Commit 06a09bd

Browse files
committed
refactor: moved legacyDefaultScanPackageOptionsFactory to packageUtils as per CR
1 parent 769d612 commit 06a09bd

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

packages/shared/src/common.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
type AggregatedLicensesObj,
1111
type LicensePlistPayload,
1212
type ScanPackageOptionsFactory,
13-
legacyDefaultScanPackageOptionsFactory,
1413
} from './types';
1514
import { PackageUtils } from './utils';
1615

@@ -22,7 +21,7 @@ function scanPackage(
2221
version: string,
2322
processedPackages: Set<string>,
2423
result: AggregatedLicensesObj,
25-
scanOptionsFactory: ScanPackageOptionsFactory = legacyDefaultScanPackageOptionsFactory,
24+
scanOptionsFactory: ScanPackageOptionsFactory = PackageUtils.legacyDefaultScanPackageOptionsFactory,
2625
) {
2726
const packageKey = `${packageName}@${version}`;
2827

@@ -95,7 +94,7 @@ function scanPackage(
9594
*/
9695
export function scanDependencies(
9796
appPackageJsonPath: string,
98-
scanOptionsFactory: ScanPackageOptionsFactory = legacyDefaultScanPackageOptionsFactory,
97+
scanOptionsFactory: ScanPackageOptionsFactory = PackageUtils.legacyDefaultScanPackageOptionsFactory,
9998
): AggregatedLicensesObj {
10099
const appPackageJson = require(path.resolve(appPackageJsonPath));
101100
const dependencies: Record<string, string> = appPackageJson.dependencies;

packages/shared/src/types/ScanPackageOptions.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,3 @@ export type ScanPackageOptionsFactoryPackageInfo = {
2424
* Factory to create a filter for scan options for dependencies of a given package
2525
*/
2626
export type ScanPackageOptionsFactory = (packageInfo: ScanPackageOptionsFactoryPackageInfo) => ScanPackageOptions;
27-
28-
/**
29-
* Default value consistent with legacy behaviour assumptions for the scan package options factory
30-
* used so as not to introduce breaking API changes to the shared package
31-
*/
32-
export const legacyDefaultScanPackageOptionsFactory: ScanPackageOptionsFactory = () => ({
33-
includeTransitiveDependencies: true,
34-
includeDevDependencies: false,
35-
});

packages/shared/src/utils/packageUtils.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fs from 'fs';
22
import path from 'path';
33

4-
import type { LicenseObj } from '../types';
4+
import type { LicenseObj, ScanPackageOptionsFactory } from '../types';
55

66
import { sha512 } from './miscUtils';
77
import { normalizeRepositoryUrl } from './repositoryUtils';
@@ -80,3 +80,12 @@ export function parseRepositoryFieldToUrl(json: { repository: string | { url?: s
8080
return normalizeRepositoryUrl(json.repository);
8181
}
8282
}
83+
84+
/**
85+
* Default value consistent with legacy behaviour assumptions for the scan package options factory
86+
* used so as not to introduce breaking API changes to the shared package
87+
*/
88+
export const legacyDefaultScanPackageOptionsFactory: ScanPackageOptionsFactory = () => ({
89+
includeTransitiveDependencies: true,
90+
includeDevDependencies: false,
91+
});

0 commit comments

Comments
 (0)