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/bumpy-nails-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nodesecure/scanner": minor
---

Refactor extractors imports to ensure web compatibility
18 changes: 11 additions & 7 deletions workspaces/scanner/src/extractors/payload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ import type { Simplify } from "type-fest";
import deepmerge from "@fastify/deepmerge";

// Import Internal Dependencies
import * as Scanner from "../types.js";
import { isNodesecurePayload } from "../utils/index.js";
import type {
Dependency,
DependencyVersion,
Payload as NodesecurePayload
} from "../types.js";
import { isNodesecurePayload } from "../utils/isNodesecurePayload.js";

// CONSTANTS
const kFastMerge = deepmerge({ all: true });
Expand All @@ -25,13 +29,13 @@ export type MergedExtractProbeResult<
export type ProbeExtractorLevel = "packument" | "manifest";
export type ProbeExtractorManifestParent = {
name: string;
dependency: Scanner.Dependency;
dependency: Dependency;
};

export type PackumentProbeNextCallback = (name: string, dependency: Scanner.Dependency) => void;
export type PackumentProbeNextCallback = (name: string, dependency: Dependency) => void;
export type ManifestProbeNextCallback = (
spec: string,
dependencyVersion: Scanner.DependencyVersion,
dependencyVersion: DependencyVersion,
parent: ProbeExtractorManifestParent) => void;

export interface ProbeExtractor<Defs> {
Expand All @@ -51,12 +55,12 @@ export interface ManifestProbeExtractor<Defs> extends ProbeExtractor<Defs> {
}

export class Payload<T extends ProbeExtractor<any>[]> extends EventTarget {
private dependencies: Scanner.Payload["dependencies"];
private dependencies: NodesecurePayload["dependencies"];
private probes: Record<ProbeExtractorLevel, T>;
private cachedResult: ExtractProbeResult<T>;

constructor(
data: Scanner.Payload | Scanner.Payload["dependencies"],
data: NodesecurePayload | NodesecurePayload["dependencies"],
probes: [...T]
) {
super();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Import Third-party Dependencies
import FrequencySet from "frequency-set";
import { getFlags } from "@nodesecure/flags";
import { getFlags } from "@nodesecure/flags/web";

// Import Internal Dependencies
import type {
Expand Down