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
5 changes: 5 additions & 0 deletions .changeset/fluffy-frogs-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nodesecure/tarball": patch
---

fix(tarball): unused dependency false positive
18 changes: 15 additions & 3 deletions workspaces/tarball/src/class/DependencyCollectableSet.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,7 @@ export class DependencyCollectableSet implements CollectableSet<Metadata> {
}
}

const name = dependencies.includes(sourceDependency) ?
sourceDependency :
parseNpmSpec(sourceDependency)?.name ?? sourceDependency;
const name = this.#extractDependencyName(sourceDependency, dependencies);

let thirdPartyDependency: string | undefined;

Expand Down Expand Up @@ -253,6 +251,20 @@ export class DependencyCollectableSet implements CollectableSet<Metadata> {
}
}

#extractDependencyName(sourceDependency: string, dependencies: string[]) {
for (const dependency of dependencies) {
if (dependency === sourceDependency) {
return sourceDependency;
}

if (sourceDependency.startsWith(dependency)) {
return dependency;
}
}

return parseNpmSpec(sourceDependency)?.name ?? sourceDependency;
}

#isMissingDependency(thirdPartyDependency: string, thirdPartyAliasedDependency: string | undefined) {
const { dependencies, nodejsImports = {} } = this.#mama;

Expand Down
45 changes: 45 additions & 0 deletions workspaces/tarball/test/DependencyCollectableSet.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,51 @@ describe("DependencyCollectableSet", () => {
});
});

test("should not detect unused dependencies on deep import", () => {
const mama = {
dependencies: ["koa", "kleur"],
devDependencies: ["mocha"]
};
const dependencyCollectableSet = new DependencyCollectableSet(mama);

dependencyCollectableSet.add("mocha", {
file: process.cwd(), location: [[0, 0], [0, 0]], metadata: {
unsafe: false,
inTry: false,
relativeFile: process.cwd()
}
});

dependencyCollectableSet.add("kleur", {
file: process.cwd(), location: [[0, 0], [0, 0]], metadata: {
unsafe: false,
inTry: false,
relativeFile: process.cwd()
}
});

dependencyCollectableSet.add("koa/dist/index.js", {
file: process.cwd(), location: [[0, 0], [0, 0]], metadata: {
unsafe: false,
inTry: false,
relativeFile: process.cwd()
}
});

assert.deepEqual(dependencyCollectableSet.extract(), {
files: new Set([]),
dependenciesInTryBlock: [],
flags: { hasExternalCapacity: false, hasMissingOrUnusedDependency: false },
dependencies: {
nodeJs: [],
thirdparty: ["kleur", "koa"],
subpathImports: {},
unused: [],
missing: []
}
});
});

test("should be capable of detecting missing dependency 'kleur'", () => {
const mama = {
dependencies: ["mocha"],
Expand Down