@nodesecure/js-x-ray 11.7.0 → 13.0.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/dist/AstAnalyser.d.ts +6 -11
- package/dist/AstAnalyser.d.ts.map +1 -1
- package/dist/AstAnalyser.js +63 -33
- package/dist/AstAnalyser.js.map +1 -1
- package/dist/CollectableSet.d.ts +14 -7
- package/dist/CollectableSet.d.ts.map +1 -1
- package/dist/CollectableSet.js +4 -1
- package/dist/CollectableSet.js.map +1 -1
- package/dist/CollectableSetRegistry.d.ts +2 -1
- package/dist/CollectableSetRegistry.d.ts.map +1 -1
- package/dist/CollectableSetRegistry.js +3 -2
- package/dist/CollectableSetRegistry.js.map +1 -1
- package/dist/EntryFilesAnalyser.d.ts +2 -2
- package/dist/EntryFilesAnalyser.d.ts.map +1 -1
- package/dist/EntryFilesAnalyser.js +7 -2
- package/dist/EntryFilesAnalyser.js.map +1 -1
- package/dist/ProbeRunner.d.ts +1 -3
- package/dist/ProbeRunner.d.ts.map +1 -1
- package/dist/ProbeRunner.js +6 -5
- package/dist/ProbeRunner.js.map +1 -1
- package/dist/SourceFile.d.ts +10 -1
- package/dist/SourceFile.d.ts.map +1 -1
- package/dist/SourceFile.js +19 -1
- package/dist/SourceFile.js.map +1 -1
- package/dist/contants.d.ts +1 -0
- package/dist/contants.d.ts.map +1 -1
- package/dist/contants.js +1 -0
- package/dist/contants.js.map +1 -1
- package/dist/parsers/TsSourceParser.d.ts +3 -2
- package/dist/parsers/TsSourceParser.d.ts.map +1 -1
- package/dist/parsers/TsSourceParser.js +7 -1
- package/dist/parsers/TsSourceParser.js.map +1 -1
- package/dist/probes/isLiteral.d.ts +0 -2
- package/dist/probes/isLiteral.d.ts.map +1 -1
- package/dist/probes/isLiteral.js +2 -1
- package/dist/probes/isLiteral.js.map +1 -1
- package/dist/probes/isUnsafeCallee.d.ts +4 -3
- package/dist/probes/isUnsafeCallee.d.ts.map +1 -1
- package/dist/probes/isUnsafeCallee.js +11 -11
- package/dist/probes/isUnsafeCallee.js.map +1 -1
- package/package.json +3 -3
package/dist/AstAnalyser.d.ts
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
import type { ESTree } from "meriyah";
|
|
2
1
|
import { type SourceParser } from "./parsers/JsSourceParser.ts";
|
|
3
2
|
import { type Pipeline } from "./pipelines/index.ts";
|
|
4
3
|
import { type Probe } from "./ProbeRunner.ts";
|
|
5
4
|
import { SourceFile, type SourceFlags } from "./SourceFile.ts";
|
|
6
5
|
import { type OptionalWarningName, type Warning } from "./warnings.ts";
|
|
7
|
-
import { CollectableSet } from "./CollectableSet.ts";
|
|
8
|
-
export
|
|
6
|
+
import type { CollectableSet, Type } from "./CollectableSet.ts";
|
|
7
|
+
export type Dependency = {
|
|
9
8
|
unsafe: boolean;
|
|
10
9
|
inTry: boolean;
|
|
11
|
-
|
|
12
|
-
}
|
|
10
|
+
};
|
|
13
11
|
export interface RuntimeOptions {
|
|
14
12
|
/**
|
|
15
13
|
* A filesystem location for the given source code.
|
|
@@ -30,12 +28,9 @@ export interface RuntimeOptions {
|
|
|
30
28
|
*/
|
|
31
29
|
customParser?: SourceParser;
|
|
32
30
|
metadata?: Record<string, unknown>;
|
|
33
|
-
}
|
|
34
|
-
export interface RuntimeFileOptions extends Omit<RuntimeOptions, "isMinified"> {
|
|
35
31
|
packageName?: string;
|
|
36
32
|
}
|
|
37
33
|
export interface Report {
|
|
38
|
-
dependencies: Map<string, Dependency>;
|
|
39
34
|
warnings: Warning[];
|
|
40
35
|
flags: Set<SourceFlags>;
|
|
41
36
|
idsLengthAvg: number;
|
|
@@ -44,7 +39,6 @@ export interface Report {
|
|
|
44
39
|
export type ReportOnFile = {
|
|
45
40
|
ok: true;
|
|
46
41
|
warnings: Warning[];
|
|
47
|
-
dependencies: Map<string, Dependency>;
|
|
48
42
|
flags: Set<SourceFlags>;
|
|
49
43
|
} | {
|
|
50
44
|
ok: false;
|
|
@@ -90,8 +84,9 @@ export declare class AstAnalyser {
|
|
|
90
84
|
probes: Probe[];
|
|
91
85
|
constructor(options?: AstAnalyserOptions);
|
|
92
86
|
analyse(str: string, options?: RuntimeOptions): Report;
|
|
93
|
-
analyseFile(pathToFile: string | URL, options?:
|
|
94
|
-
analyseFileSync(pathToFile: string | URL, options?:
|
|
87
|
+
analyseFile(pathToFile: string | URL, options?: RuntimeOptions): Promise<ReportOnFile>;
|
|
88
|
+
analyseFileSync(pathToFile: string | URL, options?: RuntimeOptions): ReportOnFile;
|
|
95
89
|
prepareSource(source: string, options?: PrepareSourceOptions): string;
|
|
90
|
+
getCollectableSet(type: Type): CollectableSet<Record<string, unknown>> | undefined;
|
|
96
91
|
}
|
|
97
92
|
//# sourceMappingURL=AstAnalyser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AstAnalyser.d.ts","sourceRoot":"","sources":["../src/AstAnalyser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AstAnalyser.d.ts","sourceRoot":"","sources":["../src/AstAnalyser.ts"],"names":[],"mappings":"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"}
|
package/dist/AstAnalyser.js
CHANGED
|
@@ -4,14 +4,15 @@ import fs from "node:fs/promises";
|
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
// Import Internal Dependencies
|
|
6
6
|
import { JsSourceParser } from "./parsers/JsSourceParser.js";
|
|
7
|
+
import { TsSourceParser } from "./parsers/TsSourceParser.js";
|
|
7
8
|
import * as trojan from "./obfuscators/trojan-source.js";
|
|
8
9
|
import { PipelineRunner } from "./pipelines/index.js";
|
|
9
10
|
import { ProbeRunner } from "./ProbeRunner.js";
|
|
10
11
|
import { SourceFile } from "./SourceFile.js";
|
|
11
12
|
import { isMinifiedCode, isOneLineExpressionExport } from "./utils/index.js";
|
|
12
13
|
import { walkEnter } from "./walker/index.js";
|
|
14
|
+
import { getCallExpressionIdentifier } from "./estree/index.js";
|
|
13
15
|
import { generateWarning } from "./warnings.js";
|
|
14
|
-
import { CollectableSet } from "./CollectableSet.js";
|
|
15
16
|
import { CollectableSetRegistry } from "./CollectableSetRegistry.js";
|
|
16
17
|
export class AstAnalyser {
|
|
17
18
|
static DefaultParser = new JsSourceParser();
|
|
@@ -19,6 +20,7 @@ export class AstAnalyser {
|
|
|
19
20
|
probes;
|
|
20
21
|
#collectables;
|
|
21
22
|
#sensitivity;
|
|
23
|
+
#collectableSetRegistry;
|
|
22
24
|
constructor(options = {}) {
|
|
23
25
|
const { customProbes = [], optionalWarnings = false, skipDefaultProbes = false, pipelines = [], collectables = [], sensitivity = "conservative" } = options;
|
|
24
26
|
this.#pipelineRunner = new PipelineRunner(pipelines);
|
|
@@ -44,15 +46,20 @@ export class AstAnalyser {
|
|
|
44
46
|
this.probes = probes;
|
|
45
47
|
}
|
|
46
48
|
analyse(str, options = {}) {
|
|
47
|
-
const { location, isMinified = false, removeHTMLComments = false, initialize, finalize, metadata } = options;
|
|
49
|
+
const { packageName, location, isMinified = false, removeHTMLComments = false, initialize, finalize, metadata } = options;
|
|
48
50
|
const parser = options.customParser ?? AstAnalyser.DefaultParser;
|
|
49
51
|
const body = parser.parse(this.prepareSource(str, { removeHTMLComments }), void 0);
|
|
50
|
-
const source = new SourceFile(location,
|
|
52
|
+
const source = new SourceFile(location, {
|
|
53
|
+
metadata,
|
|
54
|
+
collectables: this.#collectables,
|
|
55
|
+
packageName
|
|
56
|
+
});
|
|
57
|
+
this.#collectableSetRegistry = source.collectablesSetRegistry;
|
|
51
58
|
source.sensitivity = this.#sensitivity;
|
|
52
59
|
if (trojan.verify(str)) {
|
|
53
60
|
source.warnings.push(generateWarning("obfuscated-code", { value: "trojan-source" }));
|
|
54
61
|
}
|
|
55
|
-
const probeRunner = new ProbeRunner(source,
|
|
62
|
+
const probeRunner = new ProbeRunner(source, this.probes);
|
|
56
63
|
if (initialize) {
|
|
57
64
|
if (typeof initialize !== "function") {
|
|
58
65
|
throw new TypeError("options.initialize must be a function");
|
|
@@ -61,18 +68,7 @@ export class AstAnalyser {
|
|
|
61
68
|
}
|
|
62
69
|
// we walk each AST Nodes, this is a purely synchronous I/O
|
|
63
70
|
const reducedBody = this.#pipelineRunner.reduce(body);
|
|
64
|
-
walkEnter(reducedBody,
|
|
65
|
-
// Skip the root of the AST.
|
|
66
|
-
if (Array.isArray(node)) {
|
|
67
|
-
return;
|
|
68
|
-
}
|
|
69
|
-
for (const probeNode of source.walk(node)) {
|
|
70
|
-
const action = probeRunner.walk(probeNode);
|
|
71
|
-
if (action === "skip") {
|
|
72
|
-
this.skip();
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
});
|
|
71
|
+
this.#walkEnter(reducedBody, probeRunner);
|
|
76
72
|
if (finalize) {
|
|
77
73
|
if (typeof finalize !== "function") {
|
|
78
74
|
throw new TypeError("options.finalize must be a function");
|
|
@@ -86,15 +82,43 @@ export class AstAnalyser {
|
|
|
86
82
|
}
|
|
87
83
|
return {
|
|
88
84
|
...source.getResult(isMinified),
|
|
89
|
-
dependencies: source.dependencies,
|
|
90
85
|
flags: source.flags
|
|
91
86
|
};
|
|
92
87
|
}
|
|
88
|
+
#walkEnter(body, probeRunner) {
|
|
89
|
+
const recur = this.#walkEnter.bind(this);
|
|
90
|
+
walkEnter(body, function walk(node) {
|
|
91
|
+
if (Array.isArray(node)) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
for (const probeNode of probeRunner.sourceFile.walk(node)) {
|
|
95
|
+
const action = probeRunner.walk(probeNode);
|
|
96
|
+
if (action === "skip") {
|
|
97
|
+
this.skip();
|
|
98
|
+
}
|
|
99
|
+
if (probeNode.type === "CallExpression" && getCallExpressionIdentifier(probeNode, {
|
|
100
|
+
resolveCallExpression: true
|
|
101
|
+
}) === "eval" && probeNode.arguments[0].type === "Literal" && typeof probeNode.arguments[0].value === "string") {
|
|
102
|
+
const evalBody = AstAnalyser.DefaultParser.parse(probeNode.arguments[0].value, void 0);
|
|
103
|
+
recur(evalBody, probeRunner);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
}
|
|
93
108
|
async analyseFile(pathToFile, options = {}) {
|
|
109
|
+
const filePathString = pathToFile instanceof URL ?
|
|
110
|
+
pathToFile.href :
|
|
111
|
+
pathToFile;
|
|
112
|
+
if (filePathString.includes("d.ts")) {
|
|
113
|
+
throw new Error("Declaration files are not supported");
|
|
114
|
+
}
|
|
94
115
|
try {
|
|
95
|
-
const { packageName
|
|
116
|
+
const { packageName, removeHTMLComments = false, initialize, finalize, customParser, metadata } = options;
|
|
117
|
+
let customParserToUse = customParser;
|
|
118
|
+
if (!customParser && path.extname(filePathString) === ".ts") {
|
|
119
|
+
customParserToUse = new TsSourceParser();
|
|
120
|
+
}
|
|
96
121
|
const str = await fs.readFile(pathToFile, "utf-8");
|
|
97
|
-
const filePathString = pathToFile instanceof URL ? pathToFile.href : pathToFile;
|
|
98
122
|
const isMin = filePathString.includes(".min") || isMinifiedCode(str);
|
|
99
123
|
const data = this.analyse(str, {
|
|
100
124
|
location: path.dirname(filePathString),
|
|
@@ -102,19 +126,16 @@ export class AstAnalyser {
|
|
|
102
126
|
removeHTMLComments,
|
|
103
127
|
initialize,
|
|
104
128
|
finalize,
|
|
105
|
-
customParser,
|
|
106
|
-
metadata
|
|
129
|
+
customParser: customParserToUse,
|
|
130
|
+
metadata,
|
|
131
|
+
packageName
|
|
107
132
|
});
|
|
108
|
-
if (packageName !== null) {
|
|
109
|
-
data.dependencies.delete(packageName);
|
|
110
|
-
}
|
|
111
133
|
// Add is-minified flag if the file is minified and not a one-line require
|
|
112
134
|
if (!data.flags.has("oneline-require") && isMin) {
|
|
113
135
|
data.flags.add("is-minified");
|
|
114
136
|
}
|
|
115
137
|
return {
|
|
116
138
|
ok: true,
|
|
117
|
-
dependencies: data.dependencies,
|
|
118
139
|
warnings: data.warnings,
|
|
119
140
|
flags: data.flags
|
|
120
141
|
};
|
|
@@ -131,10 +152,19 @@ export class AstAnalyser {
|
|
|
131
152
|
}
|
|
132
153
|
}
|
|
133
154
|
analyseFileSync(pathToFile, options = {}) {
|
|
155
|
+
const filePathString = pathToFile instanceof URL ?
|
|
156
|
+
pathToFile.href :
|
|
157
|
+
pathToFile;
|
|
158
|
+
if (filePathString.includes("d.ts")) {
|
|
159
|
+
throw new Error("Declaration files are not supported");
|
|
160
|
+
}
|
|
134
161
|
try {
|
|
135
|
-
const { packageName
|
|
162
|
+
const { packageName, removeHTMLComments = false, initialize, finalize, customParser, metadata } = options;
|
|
163
|
+
let customParserToUse = customParser;
|
|
164
|
+
if (!customParser && path.extname(filePathString) === ".ts") {
|
|
165
|
+
customParserToUse = new TsSourceParser();
|
|
166
|
+
}
|
|
136
167
|
const str = fsSync.readFileSync(pathToFile, "utf-8");
|
|
137
|
-
const filePathString = pathToFile instanceof URL ? pathToFile.href : pathToFile;
|
|
138
168
|
const isMin = filePathString.includes(".min") || isMinifiedCode(str);
|
|
139
169
|
const data = this.analyse(str, {
|
|
140
170
|
location: path.dirname(filePathString),
|
|
@@ -142,19 +172,16 @@ export class AstAnalyser {
|
|
|
142
172
|
removeHTMLComments,
|
|
143
173
|
initialize,
|
|
144
174
|
finalize,
|
|
145
|
-
customParser,
|
|
146
|
-
metadata
|
|
175
|
+
customParser: customParserToUse,
|
|
176
|
+
metadata,
|
|
177
|
+
packageName
|
|
147
178
|
});
|
|
148
|
-
if (packageName !== null) {
|
|
149
|
-
data.dependencies.delete(packageName);
|
|
150
|
-
}
|
|
151
179
|
// Add is-minified flag if the file is minified and not a one-line require
|
|
152
180
|
if (!data.flags.has("oneline-require") && isMin) {
|
|
153
181
|
data.flags.add("is-minified");
|
|
154
182
|
}
|
|
155
183
|
return {
|
|
156
184
|
ok: true,
|
|
157
|
-
dependencies: data.dependencies,
|
|
158
185
|
warnings: data.warnings,
|
|
159
186
|
flags: data.flags
|
|
160
187
|
};
|
|
@@ -188,5 +215,8 @@ export class AstAnalyser {
|
|
|
188
215
|
#removeHTMLComment(str) {
|
|
189
216
|
return str.replaceAll(/<!--[\s\S]*?(?:-->)/g, "");
|
|
190
217
|
}
|
|
218
|
+
getCollectableSet(type) {
|
|
219
|
+
return this.#collectableSetRegistry.get(type);
|
|
220
|
+
}
|
|
191
221
|
}
|
|
192
222
|
//# sourceMappingURL=AstAnalyser.js.map
|
package/dist/AstAnalyser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AstAnalyser.js","sourceRoot":"","sources":["../src/AstAnalyser.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAK7B,+BAA+B;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"AstAnalyser.js","sourceRoot":"","sources":["../src/AstAnalyser.ts"],"names":[],"mappings":"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"}
|
package/dist/CollectableSet.d.ts
CHANGED
|
@@ -1,19 +1,26 @@
|
|
|
1
1
|
import { type SourceArrayLocation } from "./utils/toArrayLocation.ts";
|
|
2
|
-
export type Type = "url" | "hostname" | "ip" | "email" | (string & {});
|
|
2
|
+
export type Type = "url" | "hostname" | "ip" | "email" | "dependency" | (string & {});
|
|
3
3
|
export type Location<T = Record<string, unknown>> = {
|
|
4
4
|
file: string | null;
|
|
5
5
|
location: SourceArrayLocation[];
|
|
6
6
|
metadata?: T;
|
|
7
7
|
};
|
|
8
|
-
export
|
|
8
|
+
export type CollectableInfos<T = Record<string, unknown>> = {
|
|
9
|
+
file?: string | null;
|
|
10
|
+
metadata?: T;
|
|
11
|
+
location: SourceArrayLocation;
|
|
12
|
+
};
|
|
13
|
+
export interface CollectableSet<T = Record<string, unknown>> {
|
|
14
|
+
add(value: string, infos: CollectableInfos<T>): void;
|
|
15
|
+
type: Type;
|
|
16
|
+
values(): Iterable<string>;
|
|
17
|
+
}
|
|
18
|
+
export declare class DefaultCollectableSet<T = Record<string, unknown>> implements CollectableSet<T> {
|
|
9
19
|
#private;
|
|
10
20
|
type: Type;
|
|
11
21
|
constructor(type: string);
|
|
12
|
-
add(value: string, { file, location, metadata }:
|
|
13
|
-
|
|
14
|
-
metadata?: T;
|
|
15
|
-
location: SourceArrayLocation;
|
|
16
|
-
}): void;
|
|
22
|
+
add(value: string, { file, location, metadata }: CollectableInfos<T>): void;
|
|
23
|
+
values(): Iterable<string>;
|
|
17
24
|
[Symbol.iterator](): Generator<{
|
|
18
25
|
value: string;
|
|
19
26
|
locations: Location<T>[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectableSet.d.ts","sourceRoot":"","sources":["../src/CollectableSet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,MAAM,IAAI,GAAG,KAAK,GAAG,UAAU,GAAG,IAAI,GAAG,OAAO,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"CollectableSet.d.ts","sourceRoot":"","sources":["../src/CollectableSet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,MAAM,IAAI,GAAG,KAAK,GAAG,UAAU,GAAG,IAAI,GAAG,OAAO,GAAG,YAAY,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAEtF,MAAM,MAAM,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IAClD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,QAAQ,CAAC,EAAE,CAAC,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IAC1D,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,CAAC;IACb,QAAQ,EAAE,mBAAmB,CAAC;CAC/B,CAAC;AAEF,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACzD,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACrD,IAAI,EAAE,IAAI,CAAC;IACX,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,qBAAa,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,YAAW,cAAc,CAAC,CAAC,CAAC;;IAE1F,IAAI,EAAE,IAAI,CAAC;gBACC,IAAI,EAAE,MAAM;IAIxB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAkB3E,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAIxB,CAAC,MAAM,CAAC,QAAQ,CAAC;;;;CAmBpB"}
|
package/dist/CollectableSet.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Import Internal Dependencies
|
|
2
2
|
import {} from "./utils/toArrayLocation.js";
|
|
3
|
-
export class
|
|
3
|
+
export class DefaultCollectableSet {
|
|
4
4
|
#entries = new Map();
|
|
5
5
|
type;
|
|
6
6
|
constructor(type) {
|
|
@@ -18,6 +18,9 @@ export class CollectableSet {
|
|
|
18
18
|
}
|
|
19
19
|
files?.set(file, [{ location, metadata }]);
|
|
20
20
|
}
|
|
21
|
+
values() {
|
|
22
|
+
return this.#entries.keys();
|
|
23
|
+
}
|
|
21
24
|
*[Symbol.iterator]() {
|
|
22
25
|
for (const [value, files] of this.#entries) {
|
|
23
26
|
const locations = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectableSet.js","sourceRoot":"","sources":["../src/CollectableSet.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAA4B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"CollectableSet.js","sourceRoot":"","sources":["../src/CollectableSet.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAA4B,MAAM,4BAA4B,CAAC;AAsBtE,MAAM,OAAO,qBAAqB;IAChC,QAAQ,GAAwF,IAAI,GAAG,EAAE,CAAC;IAC1G,IAAI,CAAO;IACX,YAAY,IAAY;QACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,GAAG,CAAC,KAAa,EAAE,EAAE,IAAI,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAuB;QACzE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtE,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEvC,IAAI,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YAE/C,OAAO;QACT,CAAC;QAED,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,CAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;QACjB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAkB,EAAE,CAAC;YAEpC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;gBACjC,KAAK,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;oBAC1C,SAAS,CAAC,IAAI,CAAC;wBACb,IAAI;wBACJ,QAAQ,EAAE,CAAC,QAAQ,CAAC;wBACpB,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,CAAC;qBAC9B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,MAAM;gBACJ,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CollectableSet,
|
|
1
|
+
import type { CollectableSet, Type } from "./CollectableSet.ts";
|
|
2
2
|
import type { SourceArrayLocation } from "./utils/toArrayLocation.ts";
|
|
3
3
|
export declare class CollectableSetRegistry {
|
|
4
4
|
#private;
|
|
@@ -10,5 +10,6 @@ export declare class CollectableSetRegistry {
|
|
|
10
10
|
metadata?: Record<string, unknown>;
|
|
11
11
|
}): void;
|
|
12
12
|
has(type: Type): boolean;
|
|
13
|
+
get(type: Type): CollectableSet | undefined;
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=CollectableSetRegistry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectableSetRegistry.d.ts","sourceRoot":"","sources":["../src/CollectableSetRegistry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"CollectableSetRegistry.d.ts","sourceRoot":"","sources":["../src/CollectableSetRegistry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,qBAAa,sBAAsB;;gBAErB,eAAe,EAAE,cAAc,EAAE;IAM7C,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;QACnD,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,QAAQ,EAAE,mBAAmB,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACpC;IAKD,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIxB,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,SAAS;CAG5C"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Import Internal Dependencies
|
|
2
|
-
import { CollectableSet } from "./CollectableSet.js";
|
|
3
1
|
export class CollectableSetRegistry {
|
|
4
2
|
#collectableSets = new Map();
|
|
5
3
|
constructor(collectableSets) {
|
|
@@ -14,5 +12,8 @@ export class CollectableSetRegistry {
|
|
|
14
12
|
has(type) {
|
|
15
13
|
return this.#collectableSets.has(type);
|
|
16
14
|
}
|
|
15
|
+
get(type) {
|
|
16
|
+
return this.#collectableSets.get(type);
|
|
17
|
+
}
|
|
17
18
|
}
|
|
18
19
|
//# sourceMappingURL=CollectableSetRegistry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CollectableSetRegistry.js","sourceRoot":"","sources":["../src/CollectableSetRegistry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CollectableSetRegistry.js","sourceRoot":"","sources":["../src/CollectableSetRegistry.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,sBAAsB;IACjC,gBAAgB,GAA8B,IAAI,GAAG,EAAE,CAAC;IACxD,YAAY,eAAiC;QAC3C,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;YACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,IAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAKhD;QACC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvD,cAAc,EAAE,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,IAAU;QACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DiGraph, type VertexBody, type VertexDefinition } from "digraph-js";
|
|
2
|
-
import { AstAnalyser, type ReportOnFile, type
|
|
2
|
+
import { AstAnalyser, type ReportOnFile, type RuntimeOptions } from "./AstAnalyser.ts";
|
|
3
3
|
import { JsSourceParser, type SourceParser } from "./parsers/JsSourceParser.ts";
|
|
4
4
|
export interface EntryFilesAnalyserOptions {
|
|
5
5
|
astAnalyzer?: AstAnalyser;
|
|
@@ -18,7 +18,7 @@ export declare class EntryFilesAnalyser {
|
|
|
18
18
|
dependencies: DiGraph<VertexDefinition<VertexBody>>;
|
|
19
19
|
ignoreENOENT: boolean;
|
|
20
20
|
constructor(options?: EntryFilesAnalyserOptions);
|
|
21
|
-
analyse(entryFiles: Iterable<string | URL>, options?:
|
|
21
|
+
analyse(entryFiles: Iterable<string | URL>, options?: RuntimeOptions): AsyncGenerator<ReportOnFile & {
|
|
22
22
|
file: string;
|
|
23
23
|
}>;
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntryFilesAnalyser.d.ts","sourceRoot":"","sources":["../src/EntryFilesAnalyser.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,OAAO,EACP,KAAK,UAAU,EACf,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,
|
|
1
|
+
{"version":3,"file":"EntryFilesAnalyser.d.ts","sourceRoot":"","sources":["../src/EntryFilesAnalyser.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,OAAO,EACP,KAAK,UAAU,EACf,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,KAAK,YAAY,EAClB,MAAM,6BAA6B,CAAC;AASrC,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC;IAClD,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,qBAAa,kBAAkB;;IAC7B,MAAM,CAAC,OAAO;;qBAE2B,YAAY;MACH;IAGlD,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,YAAY,EAAE,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;IACpD,YAAY,EAAE,OAAO,CAAC;gBAGpB,OAAO,GAAE,yBAA8B;IAoBlC,OAAO,CACZ,UAAU,EAAE,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,EAClC,OAAO,GAAE,cAAmB,GAC3B,cAAc,CAAC,YAAY,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;KAAE,CAAC;CAkKpD"}
|
|
@@ -69,6 +69,10 @@ export class EntryFilesAnalyser {
|
|
|
69
69
|
return void 0;
|
|
70
70
|
}
|
|
71
71
|
async *#analyseFile(file, relativeFile, options) {
|
|
72
|
+
// Skip declaration files as they are not meant to be analysed
|
|
73
|
+
if (file.includes("d.ts")) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
72
76
|
this.dependencies.addVertex({
|
|
73
77
|
id: relativeFile,
|
|
74
78
|
adjacentTo: [],
|
|
@@ -79,10 +83,11 @@ export class EntryFilesAnalyser {
|
|
|
79
83
|
customParser: this.#getParserFromFileExtension(file)
|
|
80
84
|
});
|
|
81
85
|
yield { file: relativeFile, ...report };
|
|
82
|
-
|
|
86
|
+
const dependencySet = this.astAnalyzer.getCollectableSet("dependency");
|
|
87
|
+
if (!report.ok || typeof dependencySet === "undefined") {
|
|
83
88
|
return;
|
|
84
89
|
}
|
|
85
|
-
for (const
|
|
90
|
+
for (const name of dependencySet.values()) {
|
|
86
91
|
const depFile = await this.#getInternalDepPath(path.join(path.dirname(file), name));
|
|
87
92
|
if (depFile === null) {
|
|
88
93
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntryFilesAnalyser.js","sourceRoot":"","sources":["../src/EntryFilesAnalyser.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,kCAAkC;AAClC,OAAO,EACL,OAAO,EAGR,MAAM,YAAY,CAAC;AAEpB,+BAA+B;AAC/B,OAAO,EACL,WAAW,EAGZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,cAAc,EAEf,MAAM,6BAA6B,CAAC;AAErC,YAAY;AACZ,MAAM,kBAAkB,GAAG;IACzB,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvE,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM;CACP,CAAC;AASF,MAAM,OAAO,kBAAkB;IAC7B,MAAM,CAAC,OAAO,GAAG;QACf,EAAE,EAAE,IAAI,cAAc,EAAE;QACxB,EAAE,EAAE,IAAI,cAAc,EAA6B;KACJ,CAAC;IAElD,SAAS,GAAkB,IAAI,CAAC;IAChC,WAAW,CAAc;IACzB,iBAAiB,CAAc;IAC/B,YAAY,CAAwC;IACpD,YAAY,CAAU;IAEtB,YACE,UAAqC,EAAE;QAEvC,MAAM,EACJ,WAAW,GAAG,IAAI,WAAW,EAAE,EAC/B,cAAc,EACd,QAAQ,GAAG,IAAI,EACf,YAAY,GAAG,KAAK,EACrB,GAAG,OAAO,CAAC;QAEZ,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,MAAM,oBAAoB,GAAG,cAAc;YACzC,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC;YACpC,CAAC,CAAC,kBAAkB,CAAC;QAEvB,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC;YAClC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,KAAK,CAAA,CAAE,OAAO,CACZ,UAAkC,EAClC,
|
|
1
|
+
{"version":3,"file":"EntryFilesAnalyser.js","sourceRoot":"","sources":["../src/EntryFilesAnalyser.ts"],"names":[],"mappings":"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"}
|
package/dist/ProbeRunner.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { ESTree } from "meriyah";
|
|
2
2
|
import type { SourceFile } from "./SourceFile.ts";
|
|
3
3
|
import type { OptionalWarningName } from "./warnings.ts";
|
|
4
|
-
import type { CollectableSetRegistry } from "./CollectableSetRegistry.ts";
|
|
5
4
|
export type ProbeReturn = void | null | symbol;
|
|
6
5
|
export type ProbeContextDef = Record<string | symbol, any>;
|
|
7
6
|
export type NamedMainHandlers<T extends ProbeContextDef = ProbeContextDef> = {
|
|
@@ -10,7 +9,6 @@ export type NamedMainHandlers<T extends ProbeContextDef = ProbeContextDef> = {
|
|
|
10
9
|
};
|
|
11
10
|
export type ProbeContext<T extends ProbeContextDef = ProbeContextDef> = {
|
|
12
11
|
sourceFile: SourceFile;
|
|
13
|
-
collectableSetRegistry: CollectableSetRegistry;
|
|
14
12
|
context?: T;
|
|
15
13
|
setEntryPoint: (handlerName: string) => void;
|
|
16
14
|
};
|
|
@@ -45,7 +43,7 @@ export declare class ProbeRunner {
|
|
|
45
43
|
*/
|
|
46
44
|
static Defaults: Probe[];
|
|
47
45
|
static Optionals: Record<OptionalWarningName, Probe>;
|
|
48
|
-
constructor(sourceFile: SourceFile,
|
|
46
|
+
constructor(sourceFile: SourceFile, probes?: Probe[]);
|
|
49
47
|
walk(node: ESTree.Node): null | "skip";
|
|
50
48
|
finalize(): void;
|
|
51
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProbeRunner.d.ts","sourceRoot":"","sources":["../src/ProbeRunner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAyBtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"ProbeRunner.d.ts","sourceRoot":"","sources":["../src/ProbeRunner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAyBtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAQzD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,IAAI,GAAG,MAAM,CAAC;AAC/C,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;AAE3D,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,IAAI;IAC3E,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;IAC9D,CAAC,WAAW,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;CAC7E,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,IAAI;IACtE,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,CAAC,CAAC;IACZ,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C,CAAC;AACF,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG;IAC5F,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,OAAO,WAAW,CAAC,OAAO,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,uBAAuB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,IAAI,CACjF,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,KACpC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;AAErB,MAAM,WAAW,KAAK,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,YAAY,CAAC;IAC3D,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAC1C,YAAY,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC;IACxE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACpF,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAC1C,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,qBAAa,WAAW;;IACtB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IAGvB,MAAM,CAAC,OAAO;;;;OAIX;IAEH;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,CAkBtB;IAEF,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAIlD;gBAGA,UAAU,EAAE,UAAU,EACtB,MAAM,GAAE,KAAK,EAAyB;IAyGxC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,IAAI,GAChB,IAAI,GAAG,MAAM;IA0DhB,QAAQ,IAAI,IAAI;CAMjB"}
|
package/dist/ProbeRunner.js
CHANGED
|
@@ -22,12 +22,11 @@ import isMonkeyPatch from "./probes/isMonkeyPatch.js";
|
|
|
22
22
|
import isRandom from "./probes/isRandom.js";
|
|
23
23
|
import isPrototypePollution from "./probes/isPrototypePollution.js";
|
|
24
24
|
import { getCallExpressionIdentifier } from "./estree/index.js";
|
|
25
|
-
import { CALL_EXPRESSION_DATA } from "./contants.js";
|
|
25
|
+
import { CALL_EXPRESSION_DATA, CALL_EXPRESSION_IDENTIFIER } from "./contants.js";
|
|
26
26
|
const kProbeOriginalContext = Symbol.for("ProbeOriginalContext");
|
|
27
27
|
export class ProbeRunner {
|
|
28
28
|
probes;
|
|
29
29
|
sourceFile;
|
|
30
|
-
#collectableSetRegistry;
|
|
31
30
|
#selectedEntryPoints = new Map();
|
|
32
31
|
static Signals = Object.freeze({
|
|
33
32
|
Break: Symbol.for("breakWalk"),
|
|
@@ -62,9 +61,8 @@ export class ProbeRunner {
|
|
|
62
61
|
"log-usage": logUsage,
|
|
63
62
|
"insecure-random": isRandom
|
|
64
63
|
};
|
|
65
|
-
constructor(sourceFile,
|
|
64
|
+
constructor(sourceFile, probes = ProbeRunner.Defaults) {
|
|
66
65
|
this.sourceFile = sourceFile;
|
|
67
|
-
this.#collectableSetRegistry = collectableSetRegistry;
|
|
68
66
|
for (const probe of probes) {
|
|
69
67
|
assert(typeof probe.validateNode === "function" || Array.isArray(probe.validateNode), `Invalid probe ${probe.name}: validateNode must be a function or an array of functions`);
|
|
70
68
|
assert(typeof probe.main === "function" || typeof probe.main === "object", `Invalid probe ${probe.name}: main must be a function or an object with named handlers`);
|
|
@@ -97,7 +95,6 @@ export class ProbeRunner {
|
|
|
97
95
|
};
|
|
98
96
|
return {
|
|
99
97
|
sourceFile: this.sourceFile,
|
|
100
|
-
collectableSetRegistry: this.#collectableSetRegistry,
|
|
101
98
|
context: probe.context,
|
|
102
99
|
setEntryPoint
|
|
103
100
|
};
|
|
@@ -134,12 +131,14 @@ export class ProbeRunner {
|
|
|
134
131
|
walk(node) {
|
|
135
132
|
const breakGroups = new Set();
|
|
136
133
|
let tracedIdentifierReport;
|
|
134
|
+
let tracedIdentifier;
|
|
137
135
|
if (node.type === "CallExpression") {
|
|
138
136
|
const id = getCallExpressionIdentifier(node, {
|
|
139
137
|
externalIdentifierLookup: (name) => this.sourceFile.tracer.literalIdentifiers.get(name)?.value ?? null
|
|
140
138
|
});
|
|
141
139
|
if (id !== null) {
|
|
142
140
|
tracedIdentifierReport = this.sourceFile.tracer.getDataFromIdentifier(id);
|
|
141
|
+
tracedIdentifier = id;
|
|
143
142
|
}
|
|
144
143
|
}
|
|
145
144
|
for (const probe of this.probes) {
|
|
@@ -148,6 +147,7 @@ export class ProbeRunner {
|
|
|
148
147
|
}
|
|
149
148
|
try {
|
|
150
149
|
if (probe.context && tracedIdentifierReport) {
|
|
150
|
+
probe.context[CALL_EXPRESSION_IDENTIFIER] = tracedIdentifier;
|
|
151
151
|
probe.context[CALL_EXPRESSION_DATA] = tracedIdentifierReport;
|
|
152
152
|
}
|
|
153
153
|
const signal = this.#runProbe(probe, node);
|
|
@@ -171,6 +171,7 @@ export class ProbeRunner {
|
|
|
171
171
|
probe.teardown?.(this.#getProbeContext(probe));
|
|
172
172
|
if (probe.context) {
|
|
173
173
|
delete probe.context[CALL_EXPRESSION_DATA];
|
|
174
|
+
delete probe.context[CALL_EXPRESSION_IDENTIFIER];
|
|
174
175
|
}
|
|
175
176
|
}
|
|
176
177
|
}
|
package/dist/ProbeRunner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProbeRunner.js","sourceRoot":"","sources":["../src/ProbeRunner.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,MAAM,MAAM,aAAa,CAAC;AAKjC,+BAA+B;AAC/B,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAC7D,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,kBAAkB,MAAM,gCAAgC,CAAC;AAChE,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,mBAAmB,MAAM,iCAAiC,CAAC;AAClE,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,SAAS,MAAM,iCAAiC,CAAC;AACxD,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAC1D,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,aAAa,MAAM,2BAA2B,CAAC;AACtD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"ProbeRunner.js","sourceRoot":"","sources":["../src/ProbeRunner.ts"],"names":[],"mappings":"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"}
|
package/dist/SourceFile.d.ts
CHANGED
|
@@ -3,7 +3,14 @@ import { VariableTracer } from "./VariableTracer.ts";
|
|
|
3
3
|
import type { Dependency, Sensitivity } from "./AstAnalyser.ts";
|
|
4
4
|
import { Deobfuscator } from "./Deobfuscator.ts";
|
|
5
5
|
import { type Warning } from "./warnings.ts";
|
|
6
|
+
import { CollectableSetRegistry } from "./CollectableSetRegistry.ts";
|
|
7
|
+
import type { CollectableSet } from "./CollectableSet.ts";
|
|
6
8
|
export type SourceFlags = "fetch" | "oneline-require" | "is-minified";
|
|
9
|
+
export type SourceFileOptions = {
|
|
10
|
+
metadata?: Record<string, unknown>;
|
|
11
|
+
collectables?: CollectableSet[];
|
|
12
|
+
packageName?: string;
|
|
13
|
+
};
|
|
7
14
|
export declare class SourceFile {
|
|
8
15
|
tracer: VariableTracer;
|
|
9
16
|
inTryStatement: boolean;
|
|
@@ -16,7 +23,9 @@ export declare class SourceFile {
|
|
|
16
23
|
path: SourceFilePath;
|
|
17
24
|
sensitivity?: Sensitivity;
|
|
18
25
|
metadata?: Record<string, unknown>;
|
|
19
|
-
|
|
26
|
+
collectablesSetRegistry: CollectableSetRegistry;
|
|
27
|
+
packageName?: string;
|
|
28
|
+
constructor(sourceLocation?: string, options?: SourceFileOptions);
|
|
20
29
|
addDependency(name: string, location?: ESTree.SourceLocation | null, unsafe?: boolean): void;
|
|
21
30
|
addEncodedLiteral(value: string, location: ESTree.SourceLocation | undefined | null): void;
|
|
22
31
|
analyzeLiteral(node: ESTree.Literal, inArrayExpr?: boolean): void;
|
package/dist/SourceFile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceFile.d.ts","sourceRoot":"","sources":["../src/SourceFile.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOjD,OAAO,EAEL,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"SourceFile.d.ts","sourceRoot":"","sources":["../src/SourceFile.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOjD,OAAO,EAEL,KAAK,OAAO,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,MAAM,MAAM,WAAW,GACnB,OAAO,GACP,iBAAiB,GACjB,aAAa,CAAC;AAElB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,YAAY,CAAC,EAAE,cAAc,EAAE,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,UAAU;IACrB,MAAM,iBAA+C;IACrD,cAAc,UAAS;IACvB,qBAAqB,UAAS;IAC9B,YAAY,eAAsB;IAClC,YAAY,0BAAiC;IAC7C,eAAe,sBAA6B;IAC5C,QAAQ,EAAE,OAAO,EAAE,CAAM;IACzB,KAAK,mBAA0B;IAC/B,IAAI,iBAAwB;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAC;gBAET,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAQhE,aAAa,CACX,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,CAAC,cAAc,GAAG,IAAI,EACvC,MAAM,GAAE,OAAoC;IAoC9C,iBAAiB,CACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,CAAC,cAAc,GAAG,SAAS,GAAG,IAAI;IAiBpD,cAAc,CACZ,IAAI,EAAE,MAAM,CAAC,OAAO,EACpB,WAAW,UAAQ;IA6BrB,SAAS,CACP,UAAU,EAAE,OAAO,GAClB;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;KAAE;IA0CtE,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,IAAI,GAChB,MAAM,CAAC,IAAI,EAAE;CA2BjB;AAED,qBAAa,cAAc;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE/B,GAAG,CACD,QAAQ,CAAC,EAAE,MAAM;IAKnB,OAAO,CACL,GAAG,KAAK,EAAE,MAAM,EAAE;CAQrB"}
|
package/dist/SourceFile.js
CHANGED
|
@@ -6,6 +6,7 @@ import { InlinedRequire } from "./probes/isRequire/InlinedRequire.js";
|
|
|
6
6
|
import { Deobfuscator } from "./Deobfuscator.js";
|
|
7
7
|
import { rootLocation, toArrayLocation, isSvg, isStringBase64 } from "./utils/index.js";
|
|
8
8
|
import { generateWarning } from "./warnings.js";
|
|
9
|
+
import { CollectableSetRegistry } from "./CollectableSetRegistry.js";
|
|
9
10
|
// CONSTANTS
|
|
10
11
|
const kMaximumEncodedLiterals = 10;
|
|
11
12
|
export class SourceFile {
|
|
@@ -20,9 +21,14 @@ export class SourceFile {
|
|
|
20
21
|
path = new SourceFilePath();
|
|
21
22
|
sensitivity;
|
|
22
23
|
metadata;
|
|
23
|
-
|
|
24
|
+
collectablesSetRegistry;
|
|
25
|
+
packageName;
|
|
26
|
+
constructor(sourceLocation, options) {
|
|
27
|
+
const { metadata, collectables = [] } = options ?? {};
|
|
24
28
|
this.path.use(sourceLocation);
|
|
25
29
|
this.metadata = metadata;
|
|
30
|
+
this.collectablesSetRegistry = new CollectableSetRegistry(collectables ?? []);
|
|
31
|
+
this.packageName = options?.packageName;
|
|
26
32
|
}
|
|
27
33
|
addDependency(name, location, unsafe = this.dependencyAutoWarning) {
|
|
28
34
|
if (typeof name !== "string" || name.trim() === "") {
|
|
@@ -35,6 +41,18 @@ export class SourceFile {
|
|
|
35
41
|
inTry: this.inTryStatement,
|
|
36
42
|
...(location ? { location } : {})
|
|
37
43
|
});
|
|
44
|
+
if (this.packageName !== dependencyName) {
|
|
45
|
+
this.collectablesSetRegistry.add("dependency", {
|
|
46
|
+
value: dependencyName,
|
|
47
|
+
file: this.path.location,
|
|
48
|
+
location: toArrayLocation(location ?? undefined),
|
|
49
|
+
metadata: {
|
|
50
|
+
...this.metadata,
|
|
51
|
+
inTry: this.inTryStatement,
|
|
52
|
+
unsafe
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
}
|
|
38
56
|
if (this.dependencyAutoWarning) {
|
|
39
57
|
this.warnings.push(generateWarning("unsafe-import", {
|
|
40
58
|
value: dependencyName,
|
package/dist/SourceFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceFile.js","sourceRoot":"","sources":["../src/SourceFile.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAK7B,+BAA+B;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EACL,YAAY,EACZ,eAAe,EACf,KAAK,EACL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EAEhB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"SourceFile.js","sourceRoot":"","sources":["../src/SourceFile.ts"],"names":[],"mappings":"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"}
|
package/dist/contants.d.ts
CHANGED
package/dist/contants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contants.d.ts","sourceRoot":"","sources":["../src/contants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,oBAAoB,eAAmC,CAAC"}
|
|
1
|
+
{"version":3,"file":"contants.d.ts","sourceRoot":"","sources":["../src/contants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,oBAAoB,eAAmC,CAAC;AACrE,eAAO,MAAM,0BAA0B,eAAyC,CAAC"}
|
package/dist/contants.js
CHANGED
package/dist/contants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contants.js","sourceRoot":"","sources":["../src/contants.ts"],"names":[],"mappings":"AAAA,YAAY;AACZ,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"contants.js","sourceRoot":"","sources":["../src/contants.ts"],"names":[],"mappings":"AAAA,YAAY;AACZ,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type TSESTreeOptions } from "@typescript-eslint/typescript-estree";
|
|
2
|
+
import { type ESTree } from "meriyah";
|
|
2
3
|
export type { TSESTreeOptions };
|
|
3
4
|
export declare class TsSourceParser {
|
|
4
5
|
static FileExtensions: Set<string>;
|
|
5
|
-
parse(source: string, options?: TSESTreeOptions):
|
|
6
|
+
parse(source: string, options?: TSESTreeOptions): ESTree.Statement[];
|
|
6
7
|
}
|
|
7
8
|
//# sourceMappingURL=TsSourceParser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TsSourceParser.d.ts","sourceRoot":"","sources":["../../src/parsers/TsSourceParser.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,
|
|
1
|
+
{"version":3,"file":"TsSourceParser.d.ts","sourceRoot":"","sources":["../../src/parsers/TsSourceParser.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,KAAK,MAAM,EACZ,MAAM,SAAS,CAAC;AAUjB,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,qBAAa,cAAc;IACzB,MAAM,CAAC,cAAc,cAKlB;IAEH,KAAK,CACH,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,eAAoB,GAC5B,MAAM,CAAC,SAAS,EAAE;CAatB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Import Third-party Dependencies
|
|
2
|
-
import { parse
|
|
2
|
+
import { parse } from "@typescript-eslint/typescript-estree";
|
|
3
|
+
import {} from "meriyah";
|
|
3
4
|
// CONSTANTS
|
|
4
5
|
const kTypeScriptParsingOptions = {
|
|
5
6
|
jsDocParsingMode: "none",
|
|
@@ -19,6 +20,11 @@ export class TsSourceParser {
|
|
|
19
20
|
...kTypeScriptParsingOptions,
|
|
20
21
|
...options
|
|
21
22
|
});
|
|
23
|
+
/**
|
|
24
|
+
* Not pretty but the types are not compatible and we know
|
|
25
|
+
* that the body is compatible with ESTree.Statement[]
|
|
26
|
+
* since the parser is designed to be compatible with ESTree.
|
|
27
|
+
*/
|
|
22
28
|
return body;
|
|
23
29
|
}
|
|
24
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TsSourceParser.js","sourceRoot":"","sources":["../../src/parsers/TsSourceParser.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EACL,KAAK,
|
|
1
|
+
{"version":3,"file":"TsSourceParser.js","sourceRoot":"","sources":["../../src/parsers/TsSourceParser.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,OAAO,EACL,KAAK,EAEN,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAEN,MAAM,SAAS,CAAC;AAEjB,YAAY;AACZ,MAAM,yBAAyB,GAAoB;IACjD,gBAAgB,EAAE,MAAM;IACxB,GAAG,EAAE,IAAI;IACT,GAAG,EAAE,IAAI;IACT,KAAK,EAAE,KAAK;CACb,CAAC;AAIF,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,cAAc,GAAG,IAAI,GAAG,CAAC;QAC9B,KAAK;QACL,MAAM;QACN,MAAM;QACN,MAAM;KACP,CAAC,CAAC;IAEH,KAAK,CACH,MAAc,EACd,UAA2B,EAAE;QAE7B,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE;YAC7B,GAAG,yBAAyB;YAC5B,GAAG,OAAO;SACX,CAAC,CAAC;QAEH;;;;WAIG;QACH,OAAO,IAAqC,CAAC;IAC/C,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { ESTree } from "meriyah";
|
|
2
2
|
import { SourceFile } from "../SourceFile.ts";
|
|
3
3
|
import type { Literal } from "../estree/types.ts";
|
|
4
|
-
import type { CollectableSetRegistry } from "../CollectableSetRegistry.ts";
|
|
5
4
|
/**
|
|
6
5
|
* @description Search for Literal AST Node
|
|
7
6
|
* @see https://github.com/estree/estree/blob/master/es5.md#literal
|
|
@@ -11,7 +10,6 @@ import type { CollectableSetRegistry } from "../CollectableSetRegistry.ts";
|
|
|
11
10
|
declare function validateNode(node: ESTree.Node): [boolean, any?];
|
|
12
11
|
declare function main(node: Literal<string>, options: {
|
|
13
12
|
sourceFile: SourceFile;
|
|
14
|
-
collectableSetRegistry: CollectableSetRegistry;
|
|
15
13
|
}): void;
|
|
16
14
|
declare const _default: {
|
|
17
15
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isLiteral.d.ts","sourceRoot":"","sources":["../../src/probes/isLiteral.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAItC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"isLiteral.d.ts","sourceRoot":"","sources":["../../src/probes/isLiteral.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAItC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAUlD;;;;;GAKG;AACH,iBAAS,YAAY,CACnB,IAAI,EAAE,MAAM,CAAC,IAAI,GAChB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAIjB;AAED,iBAAS,IAAI,CACX,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,EACrB,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;CACxB,QA0EF;;;;;;;AAED,wBAKE"}
|
package/dist/probes/isLiteral.js
CHANGED
|
@@ -20,7 +20,8 @@ function validateNode(node) {
|
|
|
20
20
|
];
|
|
21
21
|
}
|
|
22
22
|
function main(node, options) {
|
|
23
|
-
const { sourceFile
|
|
23
|
+
const { sourceFile } = options;
|
|
24
|
+
const collectableSetRegistry = sourceFile.collectablesSetRegistry;
|
|
24
25
|
const location = node.loc ?? void 0;
|
|
25
26
|
const shadyLinkOptions = {
|
|
26
27
|
file: sourceFile.path.location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isLiteral.js","sourceRoot":"","sources":["../../src/probes/isLiteral.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAK7C,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EACL,eAAe,EACf,GAAG,EACJ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"isLiteral.js","sourceRoot":"","sources":["../../src/probes/isLiteral.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
import type { ESTree } from "meriyah";
|
|
2
|
-
import type { ProbeMainContext } from "../ProbeRunner.ts";
|
|
2
|
+
import type { ProbeContext, ProbeMainContext } from "../ProbeRunner.ts";
|
|
3
3
|
/**
|
|
4
4
|
* @description Detect unsafe statement
|
|
5
5
|
* @example
|
|
6
6
|
* eval("this");
|
|
7
7
|
* Function("return this")();
|
|
8
8
|
*/
|
|
9
|
-
declare function validateNode(node: ESTree.Node): [boolean, any?];
|
|
9
|
+
declare function validateNode(node: ESTree.Node, ctx: ProbeContext): [boolean, any?];
|
|
10
10
|
declare function main(node: ESTree.CallExpression, ctx: ProbeMainContext): symbol;
|
|
11
|
-
export declare function isUnsafeCallee(node: ESTree.CallExpression | ESTree.Node): [boolean, "eval" | "Function" | null];
|
|
11
|
+
export declare function isUnsafeCallee(node: ESTree.CallExpression | ESTree.Node, ctx: ProbeContext): [boolean, "eval" | "Function" | null];
|
|
12
12
|
declare const _default: {
|
|
13
13
|
name: string;
|
|
14
14
|
validateNode: typeof validateNode;
|
|
15
15
|
main: typeof main;
|
|
16
16
|
breakOnMatch: boolean;
|
|
17
|
+
context: {};
|
|
17
18
|
};
|
|
18
19
|
export default _default;
|
|
19
20
|
//# sourceMappingURL=isUnsafeCallee.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isUnsafeCallee.d.ts","sourceRoot":"","sources":["../../src/probes/isUnsafeCallee.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"isUnsafeCallee.d.ts","sourceRoot":"","sources":["../../src/probes/isUnsafeCallee.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKxE;;;;;GAKG;AACH,iBAAS,YAAY,CACnB,IAAI,EAAE,MAAM,CAAC,IAAI,EACjB,GAAG,EAAE,YAAY,GAChB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAEjB;AAED,iBAAS,IAAI,CACX,IAAI,EAAE,MAAM,CAAC,cAAc,EAC3B,GAAG,EAAE,gBAAgB,UAsBtB;AAmBD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,IAAI,EACzC,GAAG,EAAE,YAAY,GAChB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,CAcvC;;;;;;;;AAED,wBAME"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Import Internal Dependencies
|
|
2
1
|
import { getCallExpressionIdentifier } from "../estree/index.js";
|
|
2
|
+
import { CALL_EXPRESSION_IDENTIFIER } from "../contants.js";
|
|
3
3
|
import { generateWarning } from "../warnings.js";
|
|
4
4
|
/**
|
|
5
5
|
* @description Detect unsafe statement
|
|
@@ -7,8 +7,8 @@ import { generateWarning } from "../warnings.js";
|
|
|
7
7
|
* eval("this");
|
|
8
8
|
* Function("return this")();
|
|
9
9
|
*/
|
|
10
|
-
function validateNode(node) {
|
|
11
|
-
return isUnsafeCallee(node);
|
|
10
|
+
function validateNode(node, ctx) {
|
|
11
|
+
return isUnsafeCallee(node, ctx);
|
|
12
12
|
}
|
|
13
13
|
function main(node, ctx) {
|
|
14
14
|
const { sourceFile, data: calleeName, signals } = ctx;
|
|
@@ -27,24 +27,23 @@ function main(node, ctx) {
|
|
|
27
27
|
sourceFile.warnings.push(warning);
|
|
28
28
|
return signals.Skip;
|
|
29
29
|
}
|
|
30
|
+
function isFunctionCallee(node, identifier) {
|
|
31
|
+
return identifier === "Function" && node.callee.type === "CallExpression";
|
|
32
|
+
}
|
|
30
33
|
function isEvalCallee(node) {
|
|
31
34
|
const identifier = getCallExpressionIdentifier(node, {
|
|
32
|
-
resolveCallExpression:
|
|
35
|
+
resolveCallExpression: true
|
|
33
36
|
});
|
|
34
37
|
return identifier === "eval";
|
|
35
38
|
}
|
|
36
|
-
function
|
|
37
|
-
const identifier = getCallExpressionIdentifier(node);
|
|
38
|
-
return identifier === "Function" && node.callee.type === "CallExpression";
|
|
39
|
-
}
|
|
40
|
-
export function isUnsafeCallee(node) {
|
|
39
|
+
export function isUnsafeCallee(node, ctx) {
|
|
41
40
|
if (node.type !== "CallExpression") {
|
|
42
41
|
return [false, null];
|
|
43
42
|
}
|
|
44
43
|
if (isEvalCallee(node)) {
|
|
45
44
|
return [true, "eval"];
|
|
46
45
|
}
|
|
47
|
-
if (isFunctionCallee(node)) {
|
|
46
|
+
if (isFunctionCallee(node, ctx.context?.[CALL_EXPRESSION_IDENTIFIER])) {
|
|
48
47
|
return [true, "Function"];
|
|
49
48
|
}
|
|
50
49
|
return [false, null];
|
|
@@ -53,6 +52,7 @@ export default {
|
|
|
53
52
|
name: "isUnsafeCallee",
|
|
54
53
|
validateNode,
|
|
55
54
|
main,
|
|
56
|
-
breakOnMatch: false
|
|
55
|
+
breakOnMatch: false,
|
|
56
|
+
context: {}
|
|
57
57
|
};
|
|
58
58
|
//# sourceMappingURL=isUnsafeCallee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isUnsafeCallee.js","sourceRoot":"","sources":["../../src/probes/isUnsafeCallee.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isUnsafeCallee.js","sourceRoot":"","sources":["../../src/probes/isUnsafeCallee.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;GAKG;AACH,SAAS,YAAY,CACnB,IAAiB,EACjB,GAAiB;IAEjB,OAAO,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,IAAI,CACX,IAA2B,EAC3B,GAAqB;IAErB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;IAEtD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,OAAO,CAAC,IAAI,CAAC;IACtB,CAAC;IACD,IACE,UAAU,KAAK,UAAU;QACzB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QAChC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,aAAa,EAChD,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC;IACtB,CAAC;IAED,MAAM,OAAO,GAAG,eAAe,CAAC,aAAa,EAAE;QAC7C,KAAK,EAAE,UAAU;QACjB,QAAQ,EAAE,IAAI,CAAC,GAAG;KACnB,CAAC,CAAC;IACH,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAElC,OAAO,OAAO,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CACvB,IAA2B,EAC3B,UAAqC;IAErC,OAAO,UAAU,KAAK,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,gBAAgB,CAAC;AAC5E,CAAC;AAED,SAAS,YAAY,CACnB,IAA2B;IAE3B,MAAM,UAAU,GAAG,2BAA2B,CAAC,IAAI,EAAE;QACnD,qBAAqB,EAAE,IAAI;KAC5B,CAAC,CAAC;IAEH,OAAO,UAAU,KAAK,MAAM,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,IAAyC,EACzC,GAAiB;IAEjB,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,0BAA0B,CAAC,CAAC,EAAE,CAAC;QACtE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AACvB,CAAC;AAED,eAAe;IACb,IAAI,EAAE,gBAAgB;IACtB,YAAY;IACZ,IAAI;IACJ,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,EAAE;CACZ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nodesecure/js-x-ray",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "13.0.0",
|
|
4
4
|
"description": "JavaScript AST XRay analysis",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -52,12 +52,12 @@
|
|
|
52
52
|
},
|
|
53
53
|
"homepage": "https://github.com/NodeSecure/js-x-ray#readme",
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@typescript-eslint/typescript-estree": "8.
|
|
55
|
+
"@typescript-eslint/typescript-estree": "8.55.0",
|
|
56
56
|
"digraph-js": "2.2.4",
|
|
57
57
|
"frequency-set": "^2.1.0",
|
|
58
58
|
"ipaddr.js": "2.3.0",
|
|
59
59
|
"is-svg": "6.1.0",
|
|
60
|
-
"meriyah": "7.
|
|
60
|
+
"meriyah": "7.1.0",
|
|
61
61
|
"safe-regex": "^2.1.1",
|
|
62
62
|
"ts-pattern": "^5.0.6"
|
|
63
63
|
},
|