@nodesecure/scanner 10.9.0 → 10.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -53,12 +53,12 @@ function workingDir(
53
53
  logger?: Scanner.Logger
54
54
  ): Promise<Scanner.Payload>;
55
55
  function from(
56
- packageName: string,
56
+ spec: string,
57
57
  options?: Scanner.FromOptions,
58
58
  logger?: Scanner.Logger
59
59
  ): Promise<Scanner.Payload>;
60
60
  function verify(
61
- packageName?: string
61
+ spec?: string
62
62
  ): Promise<tarball.ScannedPackageResult>;
63
63
  ```
64
64
 
@@ -75,7 +75,8 @@ type WorkingDirOptions = Options & {
75
75
  * Optional cache lookup called after reading the local package.json.
76
76
  */
77
77
  cacheLookup?: (
78
- packageJSON: PackageJSON
78
+ packageJSON: PackageJSON,
79
+ integrity: string | null
79
80
  ) => Promise<Payload | null>;
80
81
  };
81
82
 
@@ -1,7 +1,7 @@
1
1
  import { EventEmitter } from "node:events";
2
2
  import { type DateProvider } from "./DateProvider.class.ts";
3
3
  import { type LoggerEventsMap } from "./logger.class.ts";
4
- import type { Stats } from "../types.ts";
4
+ import type { ApiStats, Stats } from "../types.ts";
5
5
  export type Providers = {
6
6
  dateProvider?: DateProvider;
7
7
  logger?: EventEmitter<LoggerEventsMap>;
@@ -9,10 +9,16 @@ export type Providers = {
9
9
  export type Options = {
10
10
  isVerbose: boolean;
11
11
  };
12
+ export type OnSuccess<T extends () => any> = (res: Awaited<ReturnType<T>>, stat: ApiStats) => void;
12
13
  export declare class StatsCollector {
13
14
  #private;
14
15
  constructor(providers: Providers, options: Options);
15
- track<T extends () => any>(name: string, phase: string, fn: T): ReturnType<T>;
16
+ track<T extends () => any>(options: {
17
+ name: string;
18
+ phase: string;
19
+ fn: T;
20
+ onSuccess?: OnSuccess<T>;
21
+ }): ReturnType<T>;
16
22
  getStats(): Stats;
17
23
  }
18
24
  //# sourceMappingURL=StatsCollector.class.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"StatsCollector.class.d.ts","sourceRoot":"","sources":["../../src/class/StatsCollector.class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAY,KAAK,EAAS,MAAM,aAAa,CAAC;AAE1D,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,qBAAa,cAAc;;gBAQb,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO;IAQlD,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IAkF7E,QAAQ,IAAI,KAAK;CAUlB"}
1
+ {"version":3,"file":"StatsCollector.class.d.ts","sourceRoot":"","sources":["../../src/class/StatsCollector.class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAM3C,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,KAAK,eAAe,EAAU,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAS,MAAM,aAAa,CAAC;AAE1D,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,YAAY,CAAC,eAAe,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,CAC3C,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAC3B,IAAI,EAAE,QAAQ,KACX,IAAI,CAAC;AAEV,qBAAa,cAAc;;gBAQb,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO;IAQlD,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,EAAE,OAAO,EAAE;QAClC,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,EAAE,EAAE,CAAC,CAAC;QACN,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;KAC1B,GAAG,UAAU,CAAC,CAAC,CAAC;IAwGjB,QAAQ,IAAI,KAAK;CAUlB"}
@@ -19,14 +19,21 @@ export class StatsCollector {
19
19
  this.#startedAt = this.#dateProvider.now();
20
20
  this.#isVerbose = options.isVerbose;
21
21
  }
22
- track(name, phase, fn) {
22
+ track(options) {
23
+ const { name, phase, fn, onSuccess } = options;
23
24
  const startedAt = this.#dateProvider.now();
24
25
  try {
25
26
  const result = fn();
26
27
  if (result instanceof Promise) {
27
28
  return result
28
29
  .then((res) => {
29
- this.#addApiStatVerbose(name, startedAt, this.#calcExecutionTime(startedAt));
30
+ this.#addApiStatVerbose({
31
+ name,
32
+ startedAt,
33
+ executionTime: this.#calcExecutionTime(startedAt),
34
+ result: res,
35
+ onSuccess
36
+ });
30
37
  return res;
31
38
  })
32
39
  .catch((err) => {
@@ -42,7 +49,13 @@ export class StatsCollector {
42
49
  throw err;
43
50
  });
44
51
  }
45
- this.#addApiStatVerbose(name, startedAt, this.#calcExecutionTime(startedAt));
52
+ this.#addApiStatVerbose({
53
+ name,
54
+ startedAt,
55
+ executionTime: this.#calcExecutionTime(startedAt),
56
+ result,
57
+ onSuccess
58
+ });
46
59
  return result;
47
60
  }
48
61
  catch (err) {
@@ -61,12 +74,15 @@ export class StatsCollector {
61
74
  #calcExecutionTime(startedAt) {
62
75
  return this.#dateProvider.now() - startedAt;
63
76
  }
64
- #addApiStatVerbose(name, startedAt, executionTime) {
77
+ #addApiStatVerbose({ name, startedAt, executionTime, result, onSuccess }) {
65
78
  const stat = {
66
79
  name,
67
80
  startedAt,
68
81
  executionTime
69
82
  };
83
+ if (onSuccess) {
84
+ onSuccess(result, stat);
85
+ }
70
86
  this.#apiCalls.push(stat);
71
87
  if (this.#isVerbose) {
72
88
  this.#logger.emit("stat", stat);
@@ -1 +1 @@
1
- {"version":3,"file":"StatsCollector.class.js","sourceRoot":"","sources":["../../src/class/StatsCollector.class.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StatsCollector.class.js","sourceRoot":"","sources":["../../src/class/StatsCollector.class.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"TarballScanner.class.d.ts","sourceRoot":"","sources":["../../src/class/TarballScanner.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,qBAAqB,EAEtB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAuB,MAAM,mBAAmB,CAAC;AAEhE,KAAK,mBAAmB,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;CAAE,CAAC;AAE9C,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,YAAY,EAAE,qBAAqB,CAAC,mBAAmB,CAAC,EAAE,CAAC;IAC3D,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC5B;AAED,qBAAa,cAAc;;gBAWvB,OAAO,EAAE,qBAAqB;IA4B1B,IAAI,CACR,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;IAqIV,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7C"}
1
+ {"version":3,"file":"TarballScanner.class.d.ts","sourceRoot":"","sources":["../../src/class/TarballScanner.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,cAAc,EAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,qBAAqB,EAEtB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAuB,MAAM,mBAAmB,CAAC;AAEhE,KAAK,mBAAmB,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;CAAE,CAAC;AAE9C,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,YAAY,EAAE,qBAAqB,CAAC,mBAAmB,CAAC,EAAE,CAAC;IAC3D,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC5B;AAED,qBAAa,cAAc;;gBAWvB,OAAO,EAAE,qBAAqB;IA4B1B,IAAI,CACR,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;IAkJV,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7C"}
@@ -45,13 +45,23 @@ export class TarballScanner {
45
45
  const spec = `${name}@${version}`;
46
46
  const hasLocation = typeof location !== "undefined";
47
47
  const mama = await this.#extract(spec, registry);
48
- const result = await this.#statsCollector.track(`tarball.scanDirOrArchive ${spec}`, "tarball-scan", () => this.#workerPool.scan({
49
- location: mama.location,
50
- astAnalyserOptions: {
51
- optionalWarnings: hasLocation
52
- },
53
- collectableTypes: this.#collectableTypes
54
- }));
48
+ const result = await this.#statsCollector.track({
49
+ name: `tarball.scanDirOrArchive ${spec}`,
50
+ phase: "tarball-scan",
51
+ fn: () => this.#workerPool.scan({
52
+ location: mama.location,
53
+ astAnalyserOptions: {
54
+ optionalWarnings: hasLocation
55
+ },
56
+ collectableTypes: this.#collectableTypes
57
+ }),
58
+ onSuccess: (result, stat) => {
59
+ stat.tarball = {
60
+ path: result.path,
61
+ filesCount: result.composition.files.length
62
+ };
63
+ }
64
+ });
55
65
  this.#applyResult(ref, result);
56
66
  this.#mergeCollectables(result.collectables);
57
67
  }
@@ -67,12 +77,23 @@ export class TarballScanner {
67
77
  registry,
68
78
  pacoteProvider: this.#pacoteProvider
69
79
  }));
70
- await this.#statsCollector.track(`tarball.scanDirOrArchive ${spec}`, "tarball-scan", () => scanDirOrArchive(mama, ref, {
71
- astAnalyserOptions: {
72
- optionalWarnings: hasLocation,
73
- collectables: this.#collectables
80
+ await this.#statsCollector.track({
81
+ name: `tarball.scanDirOrArchive ${spec}`,
82
+ phase: "tarball-scan",
83
+ fn: () => scanDirOrArchive(mama, ref, {
84
+ astAnalyserOptions: {
85
+ optionalWarnings: hasLocation,
86
+ collectables: this.#collectables
87
+ }
88
+ }),
89
+ onSuccess: (_, stat) => {
90
+ stat.tarball = {
91
+ path: ref.path,
92
+ filesCount: ref.composition.files.length
93
+ };
94
+ delete ref.path;
74
95
  }
75
- }));
96
+ });
76
97
  }
77
98
  async #extract(spec, registry) {
78
99
  using _ = await this.#locker.acquire();
@@ -1 +1 @@
1
- {"version":3,"file":"TarballScanner.class.js","sourceRoot":"","sources":["../../src/class/TarballScanner.class.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TarballScanner.class.js","sourceRoot":"","sources":["../../src/class/TarballScanner.class.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { ManifestVersion, PackageJSON, WorkspacesPackageJSON } from "@nodesecure/npm-types";
1
+ import { ManifestManager } from "@nodesecure/mama";
2
2
  import type Config from "@npmcli/config";
3
3
  import { Logger } from "./class/logger.class.ts";
4
4
  import type { Options, Payload } from "./types.ts";
@@ -7,7 +7,8 @@ type WalkerOptions = Omit<Options, "registry"> & {
7
7
  location?: string;
8
8
  npmRcConfig?: Config;
9
9
  npmRcEntries?: Record<string, string>;
10
+ integrity?: string | null;
10
11
  };
11
- export declare function depWalker(manifest: PackageJSON | WorkspacesPackageJSON | ManifestVersion, options: WalkerOptions, logger?: Logger): Promise<Payload>;
12
+ export declare function depWalker(mama: ManifestManager, options: WalkerOptions, logger?: Logger): Promise<Payload>;
12
13
  export {};
13
14
  //# sourceMappingURL=depWalker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"depWalker.d.ts","sourceRoot":"","sources":["../src/depWalker.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEjG,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAiBzC,OAAO,EAAE,MAAM,EAAuB,MAAM,yBAAyB,CAAC;AAEtE,OAAO,KAAK,EAKV,OAAO,EACP,OAAO,EACR,MAAM,YAAY,CAAC;AAiDpB,KAAK,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AAYF,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,WAAW,GAAG,qBAAqB,GAAG,eAAe,EAC/D,OAAO,EAAE,aAAa,EACtB,MAAM,SAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CA+TlB"}
1
+ {"version":3,"file":"depWalker.d.ts","sourceRoot":"","sources":["../src/depWalker.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAmBzC,OAAO,EACL,MAAM,EAEP,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAKV,OAAO,EACP,OAAO,EACR,MAAM,YAAY,CAAC;AAiDpB,KAAK,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAYF,wBAAsB,SAAS,CAC7B,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,MAAM,SAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CA8UlB"}
package/dist/depWalker.js CHANGED
@@ -8,10 +8,8 @@ import {} from "@nodesecure/tarball";
8
8
  import { DefaultCollectableSet } from "@nodesecure/js-x-ray";
9
9
  import * as Vulnera from "@nodesecure/vulnera";
10
10
  import { npm } from "@nodesecure/tree-walker";
11
- import { parseAuthor } from "@nodesecure/utils";
12
- import { parseNpmSpec } from "@nodesecure/mama";
11
+ import { ManifestManager, parseNpmSpec } from "@nodesecure/mama";
13
12
  import { getNpmRegistryURL } from "@nodesecure/npm-registry-sdk";
14
- import { fromData } from "ssri";
15
13
  import semver from "semver";
16
14
  // Import Internal Dependencies
17
15
  import { getDependenciesWarnings, addMissingVersionFlags, getUsedDeps, getManifestLinks, NPM_TOKEN } from "./utils/index.js";
@@ -60,8 +58,8 @@ const kDefaultDependencyMetadata = {
60
58
  const kRootDependencyId = 0;
61
59
  const kCollectableTypes = ["url", "hostname", "ip", "email"];
62
60
  const { version: packageVersion } = JSON.parse(readFileSync(new URL(path.join("..", "package.json"), import.meta.url), "utf-8"));
63
- export async function depWalker(manifest, options, logger = new Logger()) {
64
- const { scanRootNode = false, includeDevDeps = false, isVerbose = false, packageLock, maxDepth, location, vulnerabilityStrategy = Vulnera.strategies.NONE, registry, npmRcConfig, npmRcEntries = {}, maxConcurrency = 8, workers } = options;
61
+ export async function depWalker(mama, options, logger = new Logger()) {
62
+ const { scanRootNode = false, includeDevDeps = false, isVerbose = false, packageLock, maxDepth, location, vulnerabilityStrategy = Vulnera.strategies.NONE, registry, npmRcConfig, npmRcEntries = {}, maxConcurrency = 8, workers, integrity: manifestIntegrity = null } = options;
65
63
  const statsCollector = new StatsCollector({ logger }, { isVerbose });
66
64
  const collectables = kCollectableTypes.map((type) => new DefaultCollectableSet(type));
67
65
  const tokenStore = new RegistryTokenStore(npmRcConfig, NPM_TOKEN.token, npmRcEntries);
@@ -73,10 +71,14 @@ export async function depWalker(manifest, options, logger = new Logger()) {
73
71
  };
74
72
  const pacoteProvider = {
75
73
  async extract(spec, dest, opts) {
76
- await statsCollector.track(`pacote.extract ${spec}`, "tarball-scan", () => pacote.extract(spec, dest, {
77
- ...opts,
78
- ...pacoteScopedConfig
79
- }));
74
+ await statsCollector.track({
75
+ name: `pacote.extract ${spec}`,
76
+ phase: "tarball-scan",
77
+ fn: () => pacote.extract(spec, dest, {
78
+ ...opts,
79
+ ...pacoteScopedConfig
80
+ })
81
+ });
80
82
  }
81
83
  };
82
84
  const isRemoteScanning = typeof location === "undefined";
@@ -85,8 +87,8 @@ export async function depWalker(manifest, options, logger = new Logger()) {
85
87
  const payload = {
86
88
  id: tempDir.id,
87
89
  rootDependency: {
88
- name: manifest.name ?? "workspace",
89
- version: manifest.version ?? "0.0.0",
90
+ name: mama.name,
91
+ version: mama.version,
90
92
  integrity: null
91
93
  },
92
94
  scannerVersion: packageVersion,
@@ -100,15 +102,34 @@ export async function depWalker(manifest, options, logger = new Logger()) {
100
102
  registry,
101
103
  providers: {
102
104
  pacote: {
103
- manifest: (spec, opts) => statsCollector.track(`pacote.manifest ${spec}`, "tree-walk", () => pacote.manifest(spec, { ...opts, ...pacoteScopedConfig })),
104
- packument: (spec, opts) => statsCollector.track(`pacote.packument ${spec}`, "tree-walk", () => pacote.packument(spec, { ...opts, ...pacoteScopedConfig }))
105
+ manifest: (spec, opts) => statsCollector.track({
106
+ name: `pacote.manifest ${spec}`,
107
+ phase: "tree-walk", fn: () => pacote.manifest(spec, { ...opts, ...pacoteScopedConfig })
108
+ }),
109
+ packument: (spec, opts) => statsCollector.track({
110
+ name: `pacote.packument ${spec}`,
111
+ phase: "tree-walk",
112
+ fn: () => pacote.packument(spec, { ...opts, ...pacoteScopedConfig })
113
+ })
105
114
  }
106
115
  }
107
116
  });
108
117
  const npmApiClient = {
109
- packument: (name, opts) => statsCollector.track(`npmRegistrySDK.packument ${name}`, "metadata-fetch", () => npmRegistrySDK.packument(name, opts)),
110
- packumentVersion: (name, version, opts) => statsCollector.track(`npmRegistrySDK.packumentVersion ${name}@${version}`, "metadata-fetch", () => npmRegistrySDK.packumentVersion(name, version, opts)),
111
- org: (namespace) => statsCollector.track(`npmRegistrySDK.org ${namespace}`, "metadata-fetch", () => npmRegistrySDK.org(namespace))
118
+ packument: (name, opts) => statsCollector.track({
119
+ name: `npmRegistrySDK.packument ${name}`,
120
+ phase: "metadata-fetch",
121
+ fn: () => npmRegistrySDK.packument(name, opts)
122
+ }),
123
+ packumentVersion: (name, version, opts) => statsCollector.track({
124
+ name: `npmRegistrySDK.packumentVersion ${name}@${version}`,
125
+ phase: "metadata-fetch",
126
+ fn: () => npmRegistrySDK.packumentVersion(name, version, opts)
127
+ }),
128
+ org: (namespace) => statsCollector.track({
129
+ name: `npmRegistrySDK.org ${namespace}`,
130
+ phase: "metadata-fetch",
131
+ fn: () => npmRegistrySDK.org(namespace)
132
+ })
112
133
  };
113
134
  logger
114
135
  .start(ScannerLoggerEvents.analysis.tree)
@@ -131,7 +152,7 @@ export async function depWalker(manifest, options, logger = new Logger()) {
131
152
  packageLock
132
153
  };
133
154
  try {
134
- for await (const current of npmTreeWalker.walk(manifest, rootDepsOptions)) {
155
+ for await (const current of npmTreeWalker.walk(mama, rootDepsOptions)) {
135
156
  const { name, version, integrity, ...currentVersion } = current;
136
157
  const dependency = {
137
158
  versions: {
@@ -170,10 +191,7 @@ export async function depWalker(manifest, options, logger = new Logger()) {
170
191
  payload.rootDependency.integrity = integrity;
171
192
  }
172
193
  else if (isRoot) {
173
- const isWorkspace = options.location && "workspaces" in manifest;
174
- payload.rootDependency.integrity = isWorkspace ?
175
- null :
176
- fromData(JSON.stringify(manifest), { algorithms: ["sha512"] }).toString();
194
+ payload.rootDependency.integrity = manifestIntegrity ?? mama.documentDigest;
177
195
  }
178
196
  // If the dependency is a DevDependencies we ignore it.
179
197
  if (current.isDevDependency || !proceedDependencyScan) {
@@ -204,7 +222,7 @@ export async function depWalker(manifest, options, logger = new Logger()) {
204
222
  version,
205
223
  ref: dependency.versions[version],
206
224
  location,
207
- isRootNode: scanRootNode && name === manifest.name,
225
+ isRootNode: scanRootNode && name === mama.name,
208
226
  registry
209
227
  }));
210
228
  }
@@ -252,20 +270,24 @@ export async function depWalker(manifest, options, logger = new Logger()) {
252
270
  const semverRanges = parseSemverRange(options.highlight?.packages ?? {});
253
271
  for (const version of Object.entries(dependency.versions)) {
254
272
  const [verStr, verDescriptor] = version;
255
- const range = semverRanges?.[packageName];
256
- if (range && semver.satisfies(verStr, range)) {
273
+ const packageRange = semverRanges?.[packageName];
274
+ const org = parseNpmSpec(packageName)?.org;
275
+ const isScopeHighlighted = org !== null && `@${org}` in semverRanges;
276
+ if ((packageRange && semver.satisfies(verStr, packageRange)) ||
277
+ isScopeHighlighted) {
257
278
  highlightedPackages.add(`${packageName}@${verStr}`);
258
279
  }
259
280
  verDescriptor.flags.push(...addMissingVersionFlags(new Set(verDescriptor.flags), dependency));
260
- if (isLocalManifest(verDescriptor, manifest, packageName)) {
281
+ if (isLocalManifest(verDescriptor, mama, packageName)) {
282
+ const author = mama.author;
261
283
  Object.assign(dependency.metadata, {
262
- author: parseAuthor(manifest.author),
263
- homepage: manifest.homepage
284
+ author,
285
+ homepage: mama.document.homepage
264
286
  });
265
287
  Object.assign(verDescriptor, {
266
- author: parseAuthor(manifest.author),
267
- links: getManifestLinks(manifest),
268
- repository: manifest.repository
288
+ author,
289
+ links: getManifestLinks(mama.document),
290
+ repository: mama.document.repository
269
291
  });
270
292
  }
271
293
  const usedDeps = npmTreeWalker.relationsMap.get(`${packageName}@${verStr}`) || new Set();
@@ -312,7 +334,7 @@ function extractHighlightedIdentifiers(collectables, identifiersToHighlight) {
312
334
  };
313
335
  }) : [])));
314
336
  }
315
- function isLocalManifest(verDescriptor, manifest, packageName) {
316
- return verDescriptor.existOnRemoteRegistry === false && (packageName === manifest.name || manifest.name === undefined);
337
+ function isLocalManifest(verDescriptor, mama, packageName) {
338
+ return verDescriptor.existOnRemoteRegistry === false && (packageName === mama.document.name || mama.document.name === undefined);
317
339
  }
318
340
  //# sourceMappingURL=depWalker.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"depWalker.js","sourceRoot":"","sources":["../src/depWalker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"depWalker.js","sourceRoot":"","sources":["../src/depWalker.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -14,13 +14,13 @@ export type WorkingDirOptions = Options & {
14
14
  * It is optionally used to fetch registry authentication tokens
15
15
  */
16
16
  npmRcConfig?: Config;
17
- cacheLookup?: (packageJSON: PackageJSON) => Promise<Payload | null>;
17
+ cacheLookup?: (packageJSON: PackageJSON, integrity: string | null) => Promise<Payload | null>;
18
18
  };
19
19
  export declare function workingDir(location?: string, options?: WorkingDirOptions, logger?: Logger): Promise<Payload>;
20
20
  export type FromOptions = Omit<Options, "includeDevDeps"> & {
21
21
  cacheLookup?: (manifest: pacote.AbbreviatedManifest & pacote.ManifestResult) => Promise<Payload | null>;
22
22
  };
23
- export declare function from(packageName: string, options?: FromOptions, logger?: Logger): Promise<Payload>;
24
- export declare function verify(packageName?: string): Promise<tarball.ScannedPackageResult>;
23
+ export declare function from(spec: string, options?: FromOptions, logger?: Logger): Promise<Payload>;
24
+ export declare function verify(spec?: string): Promise<tarball.ScannedPackageResult>;
25
25
  export { depWalker, tarball, comparePayloads, Logger, ScannerLoggerEvents };
26
26
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAGzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAM3C,OAAO,EACL,MAAM,EACN,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACR,MAAM,YAAY,CAAC;AAQpB,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AAEtC,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG;IACxC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,CACZ,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAsB,UAAU,CAC9B,QAAQ,SAAgB,EACxB,OAAO,GAAE,iBAAsB,EAC/B,MAAM,SAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CAsClB;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG;IAC1D,WAAW,CAAC,EAAE,CACZ,QAAQ,EAAE,MAAM,CAAC,mBAAmB,GAAG,MAAM,CAAC,cAAc,KACzD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAsB,IAAI,CACxB,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,WAAgB,EACzB,MAAM,SAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CAuBlB;AAED,wBAAsB,MAAM,CAC1B,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAevC;AAED,OAAO,EACL,SAAS,EACT,OAAO,EACP,eAAe,EACf,MAAM,EACN,mBAAmB,EACpB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAGzC,OAAO,EACL,SAAS,EACV,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EACL,MAAM,EACN,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACR,MAAM,YAAY,CAAC;AAQpB,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AAEtC,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG;IACxC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,CACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,GAAG,IAAI,KACrB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAsB,UAAU,CAC9B,QAAQ,SAAgB,EACxB,OAAO,GAAE,iBAAsB,EAC/B,MAAM,SAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CAyClB;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG;IAC1D,WAAW,CAAC,EAAE,CACZ,QAAQ,EAAE,MAAM,CAAC,mBAAmB,GAAG,MAAM,CAAC,cAAc,KACzD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,wBAAsB,IAAI,CACxB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,WAAgB,EACzB,MAAM,SAAe,GACpB,OAAO,CAAC,OAAO,CAAC,CAwBlB;AAED,wBAAsB,MAAM,CAC1B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAevC;AAED,OAAO,EACL,SAAS,EACT,OAAO,EACP,eAAe,EACf,MAAM,EACN,mBAAmB,EACpB,CAAC"}
package/dist/index.js CHANGED
@@ -6,6 +6,7 @@ import os from "node:os";
6
6
  import pacote from "pacote";
7
7
  import { getLocalRegistryURL } from "@nodesecure/npm-registry-sdk";
8
8
  import * as tarball from "@nodesecure/tarball";
9
+ import { ManifestManager } from "@nodesecure/mama";
9
10
  // Import Internal Dependencies
10
11
  import { depWalker } from "./depWalker.js";
11
12
  import { NPM_TOKEN, urlToString, readNpmRc } from "./utils/index.js";
@@ -38,18 +39,20 @@ export async function workingDir(location = process.cwd(), options = {}, logger
38
39
  const str = await fs.readFile(packagePath, "utf-8");
39
40
  logger.end(ScannerLoggerEvents.manifest.read);
40
41
  const packageJSON = JSON.parse(str);
41
- const cachedPayload = await options.cacheLookup?.(packageJSON);
42
+ const mama = new ManifestManager(packageJSON, { location });
43
+ const integrity = mama.documentDigest;
44
+ const cachedPayload = await options.cacheLookup?.(packageJSON, integrity);
42
45
  if (cachedPayload) {
43
46
  return cachedPayload;
44
47
  }
45
- return depWalker(packageJSON, finalizedOptions, logger);
48
+ return depWalker(mama, Object.assign(finalizedOptions, { integrity }), logger);
46
49
  }
47
- export async function from(packageName, options = {}, logger = new Logger()) {
50
+ export async function from(spec, options = {}, logger = new Logger()) {
48
51
  const registry = options.registry ?
49
52
  urlToString(options.registry) :
50
53
  getLocalRegistryURL();
51
54
  logger.start(ScannerLoggerEvents.manifest.fetch);
52
- const manifest = await pacote.manifest(packageName, {
55
+ const manifest = await pacote.manifest(spec, {
53
56
  ...NPM_TOKEN, registry, cache: `${os.homedir()}/.npm`,
54
57
  userAgent: `@nodesecure/scanner node/${process.version}`
55
58
  });
@@ -58,17 +61,16 @@ export async function from(packageName, options = {}, logger = new Logger()) {
58
61
  if (cachedPayload) {
59
62
  return cachedPayload;
60
63
  }
61
- return depWalker(
62
- // FIX: find a way to merge pacote & registry interfaces
63
- manifest, Object.assign(options, { registry }), logger);
64
+ const mama = new ManifestManager(manifest);
65
+ return depWalker(mama, Object.assign(options, { registry }), logger);
64
66
  }
65
- export async function verify(packageName) {
66
- if (typeof packageName === "undefined") {
67
+ export async function verify(spec) {
68
+ if (typeof spec === "undefined") {
67
69
  return tarball.scanPackage(process.cwd());
68
70
  }
69
71
  await using tempDir = await TempDirectory.create();
70
72
  const mama = await tarball.extractAndResolve(tempDir.location, {
71
- spec: packageName,
73
+ spec,
72
74
  registry: getLocalRegistryURL()
73
75
  });
74
76
  const scanResult = await tarball.scanPackage(mama);
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,kCAAkC;AAClC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD,+BAA+B;AAC/B,OAAO,EACL,SAAS,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,SAAS,EACT,WAAW,EACX,SAAS,EACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,MAAM,EACN,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,YAAY;AACZ,MAAM,yBAAyB,GAAG;IAChC,iBAAiB,EAAE,IAAI;IACvB,cAAc,EAAE,KAAK;CACtB,CAAC;AAEF,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AActC,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,EACxB,UAA6B,EAAE,EAC/B,MAAM,GAAG,IAAI,MAAM,EAAE;IAErB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/B,mBAAmB,EAAE,CAAC;IAExB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI;QACzC,QAAQ;KACT,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC,EAAE,QAAQ,EAAE,EACZ,yBAAyB,EACzB;QACE,GAAG,OAAO;QACV,WAAW;QACX,QAAQ;QACR,YAAY;KACb,CACF,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAgB,CAAC;IACnD,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC;IACtC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAC1E,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,SAAS,CACd,IAAI,EACJ,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,CAAC,EAC9C,MAAM,CACP,CAAC;AACJ,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,IAAY,EACZ,UAAuB,EAAE,EACzB,MAAM,GAAG,IAAI,MAAM,EAAE;IAErB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC/B,mBAAmB,EAAE,CAAC;IAExB,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE;QAC3C,GAAG,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO;QACrD,SAAS,EAAE,4BAA4B,OAAO,CAAC,OAAO,EAAE;KACzD,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE/C,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE3C,OAAO,SAAS,CACd,IAAI,EACJ,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,CAAC,EACpC,MAAM,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAAa;IAEb,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,YAAY,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC;IAEnD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE;QAC7D,IAAI;QACJ,QAAQ,EAAE,mBAAmB,EAAE;KAChC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,OAAO,EACL,SAAS,EACT,OAAO,EACP,eAAe,EACf,MAAM,EACN,mBAAmB,EACpB,CAAC"}
package/dist/types.d.ts CHANGED
@@ -4,6 +4,7 @@ import type { PackageModuleType } from "@nodesecure/mama";
4
4
  import type { SpdxFileLicenseConformance } from "@nodesecure/conformance";
5
5
  import type { IlluminatedContact } from "@nodesecure/contact";
6
6
  import type { Contact, Dist } from "@nodesecure/npm-types";
7
+ import type { Path } from "@nodesecure/tarball";
7
8
  export type Maintainer = Contact & {
8
9
  /**
9
10
  * Path to publisher's avatar on "https://www.npmjs.com"
@@ -179,6 +180,13 @@ export type ApiStats = {
179
180
  * Name of the api call
180
181
  */
181
182
  name: string;
183
+ /**
184
+ * Tarball specific stats
185
+ */
186
+ tarball?: {
187
+ path: Path;
188
+ filesCount: number;
189
+ };
182
190
  };
183
191
  export type Error = {
184
192
  name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
@@ -16,6 +16,11 @@ export function parseSemverRange(packages) {
16
16
  }
17
17
  function parseSpecs(specs) {
18
18
  return specs.reduce((acc, spec) => {
19
+ // Handle scope-only entries like "@fastify", matching all packages under that scope
20
+ if (/^@[^/@]+$/.test(spec)) {
21
+ acc[spec] = ["*"];
22
+ return acc;
23
+ }
19
24
  const parsedSpec = parseNpmSpec(spec);
20
25
  if (!parsedSpec) {
21
26
  return acc;
@@ -1 +1 @@
1
- {"version":3,"file":"parseSemverRange.js","sourceRoot":"","sources":["../../src/utils/parseSemverRange.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,+BAA+B;AAC/B,OAAO,EAA0B,MAAM,aAAa,CAAC;AAErD,MAAM,UAAU,gBAAgB,CAAC,QAA2B;IAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEvE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;aACI,CAAC;YACJ,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;QAC1B,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,UAAU,CAAC,KAAe;IACjC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,GAAG,CAAC;QAC9B,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;aACI,CAAC;YACJ,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"parseSemverRange.js","sourceRoot":"","sources":["../../src/utils/parseSemverRange.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,+BAA+B;AAC/B,OAAO,EAA0B,MAAM,aAAa,CAAC;AAErD,MAAM,UAAU,gBAAgB,CAAC,QAA2B;IAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAEvE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE;QAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;aACI,CAAC;YACJ,GAAG,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC;QAC1B,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,UAAU,CAAC,KAAe;IACjC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,oFAAoF;QACpF,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAElB,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,GAAG,CAAC;QAC9B,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;aACI,CAAC;YACJ,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nodesecure/scanner",
3
- "version": "10.9.0",
3
+ "version": "10.11.0",
4
4
  "description": "A package API to run a static analysis of your module's dependencies.",
5
5
  "type": "module",
6
6
  "exports": {
@@ -69,12 +69,12 @@
69
69
  "@nodesecure/flags": "^3.0.3",
70
70
  "@nodesecure/i18n": "^4.1.0",
71
71
  "@nodesecure/js-x-ray": "15.0.0",
72
- "@nodesecure/mama": "^2.2.0",
72
+ "@nodesecure/mama": "^2.3.1",
73
73
  "@nodesecure/npm-registry-sdk": "4.5.2",
74
- "@nodesecure/npm-types": "^1.3.0",
74
+ "@nodesecure/npm-types": "^1.4.0",
75
75
  "@nodesecure/rc": "^5.6.0",
76
- "@nodesecure/tarball": "^4.0.1",
77
- "@nodesecure/tree-walker": "^3.0.0",
76
+ "@nodesecure/tarball": "^4.1.0",
77
+ "@nodesecure/tree-walker": "^4.0.1",
78
78
  "@nodesecure/utils": "^2.3.0",
79
79
  "@nodesecure/vulnera": "3.1.0",
80
80
  "@openally/mutex": "^2.0.0",
@@ -82,7 +82,6 @@
82
82
  "frequency-set": "^2.1.0",
83
83
  "pacote": "^21.0.0",
84
84
  "semver": "^7.5.4",
85
- "ssri": "13.0.1",
86
85
  "type-fest": "^5.0.1"
87
86
  },
88
87
  "devDependencies": {