sourceverity 1.0.3 → 1.0.5

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.
Files changed (81) hide show
  1. package/README.md +91 -3
  2. package/dist/analysis/arrayBounds.d.ts +4 -0
  3. package/dist/analysis/arrayBounds.d.ts.map +1 -0
  4. package/dist/analysis/arrayBounds.js +4 -0
  5. package/dist/analysis/arrayBounds.js.map +1 -0
  6. package/dist/analysis/arrayBoundsCore.d.ts +69 -0
  7. package/dist/analysis/arrayBoundsCore.d.ts.map +1 -0
  8. package/dist/analysis/arrayBoundsCore.js +957 -0
  9. package/dist/analysis/arrayBoundsCore.js.map +1 -0
  10. package/dist/analysis/arrayConstructionBounds.d.ts +14 -0
  11. package/dist/analysis/arrayConstructionBounds.d.ts.map +1 -0
  12. package/dist/analysis/arrayConstructionBounds.js +445 -0
  13. package/dist/analysis/arrayConstructionBounds.js.map +1 -0
  14. package/dist/analysis/arrayIterationBounds.d.ts +12 -0
  15. package/dist/analysis/arrayIterationBounds.d.ts.map +1 -0
  16. package/dist/analysis/arrayIterationBounds.js +578 -0
  17. package/dist/analysis/arrayIterationBounds.js.map +1 -0
  18. package/dist/analysis/{controlFlow.d.ts → controlFlowGuards.d.ts} +1 -9
  19. package/dist/analysis/controlFlowGuards.d.ts.map +1 -0
  20. package/dist/analysis/controlFlowGuards.js +119 -0
  21. package/dist/analysis/controlFlowGuards.js.map +1 -0
  22. package/dist/analysis/controlFlowTypes.d.ts +5 -0
  23. package/dist/analysis/controlFlowTypes.d.ts.map +1 -0
  24. package/dist/analysis/controlFlowTypes.js +2 -0
  25. package/dist/analysis/controlFlowTypes.js.map +1 -0
  26. package/dist/analysis/frameworks.d.ts.map +1 -1
  27. package/dist/analysis/frameworks.js +11 -23
  28. package/dist/analysis/frameworks.js.map +1 -1
  29. package/dist/analysis/functions.d.ts.map +1 -1
  30. package/dist/analysis/functions.js +70 -30
  31. package/dist/analysis/functions.js.map +1 -1
  32. package/dist/analysis/nonNullGuards.d.ts +7 -0
  33. package/dist/analysis/nonNullGuards.d.ts.map +1 -0
  34. package/dist/analysis/nonNullGuards.js +409 -0
  35. package/dist/analysis/nonNullGuards.js.map +1 -0
  36. package/dist/analysis/promiseFlow.d.ts +5 -0
  37. package/dist/analysis/promiseFlow.d.ts.map +1 -1
  38. package/dist/analysis/promiseFlow.js +331 -1
  39. package/dist/analysis/promiseFlow.js.map +1 -1
  40. package/dist/analysis/reactStateBounds.d.ts +8 -0
  41. package/dist/analysis/reactStateBounds.d.ts.map +1 -0
  42. package/dist/analysis/reactStateBounds.js +390 -0
  43. package/dist/analysis/reactStateBounds.js.map +1 -0
  44. package/dist/analysis/values.d.ts.map +1 -1
  45. package/dist/analysis/values.js +3 -0
  46. package/dist/analysis/values.js.map +1 -1
  47. package/dist/baseline/manager.d.ts +2 -0
  48. package/dist/baseline/manager.d.ts.map +1 -1
  49. package/dist/baseline/manager.js +45 -18
  50. package/dist/baseline/manager.js.map +1 -1
  51. package/dist/cli/help.js +1 -1
  52. package/dist/cli/main.d.ts.map +1 -1
  53. package/dist/cli/main.js +22 -1
  54. package/dist/cli/main.js.map +1 -1
  55. package/dist/core/config.d.ts +7 -0
  56. package/dist/core/config.d.ts.map +1 -0
  57. package/dist/core/config.js +42 -0
  58. package/dist/core/config.js.map +1 -0
  59. package/dist/engine/runner.js +1 -1
  60. package/dist/engine/runner.js.map +1 -1
  61. package/dist/engine/symbols.d.ts +0 -1
  62. package/dist/engine/symbols.d.ts.map +1 -1
  63. package/dist/engine/symbols.js +2 -12
  64. package/dist/engine/symbols.js.map +1 -1
  65. package/dist/repository/detector.d.ts.map +1 -1
  66. package/dist/repository/detector.js +31 -11
  67. package/dist/repository/detector.js.map +1 -1
  68. package/dist/rules/async/floatingPromise.d.ts.map +1 -1
  69. package/dist/rules/async/floatingPromise.js +23 -3
  70. package/dist/rules/async/floatingPromise.js.map +1 -1
  71. package/dist/rules/network/fetchStatusUnchecked.js +1 -1
  72. package/dist/rules/network/fetchStatusUnchecked.js.map +1 -1
  73. package/dist/rules/react/derivedStateEffect.d.ts.map +1 -1
  74. package/dist/rules/react/derivedStateEffect.js +60 -5
  75. package/dist/rules/react/derivedStateEffect.js.map +1 -1
  76. package/dist/rules/typescript/nonNullAssertionRisk.js +1 -1
  77. package/dist/rules/typescript/nonNullAssertionRisk.js.map +1 -1
  78. package/package.json +1 -1
  79. package/dist/analysis/controlFlow.d.ts.map +0 -1
  80. package/dist/analysis/controlFlow.js +0 -2592
  81. package/dist/analysis/controlFlow.js.map +0 -1
@@ -0,0 +1,390 @@
1
+ import { resolveReactHook } from "../engine/symbols.js";
2
+ import { isNodeDescendantOf, isParamBoundedCondition, resolveStaticConstArrayLiteral, } from "./arrayBounds.js";
3
+ import { statementExitsControlFlow } from "./controlFlowGuards.js";
4
+ import { unwrapExpression } from "./values.js";
5
+ function isStateUpperBoundGuard(cond, stateName, maxExclusive, ts, checker) {
6
+ const unwrapped = unwrapExpression(cond, ts);
7
+ if (ts.isBinaryExpression(unwrapped)) {
8
+ const op = unwrapped.operatorToken.kind;
9
+ const left = unwrapExpression(unwrapped.left, ts);
10
+ const right = unwrapExpression(unwrapped.right, ts);
11
+ if (ts.isIdentifier(left) && left.text === stateName) {
12
+ if (ts.isNumericLiteral(right)) {
13
+ const limit = Number(right.text);
14
+ if (op === ts.SyntaxKind.LessThanToken && limit <= maxExclusive)
15
+ return true;
16
+ if (op === ts.SyntaxKind.LessThanEqualsToken && limit <= maxExclusive - 1)
17
+ return true;
18
+ }
19
+ if (ts.isBinaryExpression(right) && right.operatorToken.kind === ts.SyntaxKind.MinusToken) {
20
+ const rLeft = unwrapExpression(right.left, ts);
21
+ const rRight = unwrapExpression(right.right, ts);
22
+ if (ts.isPropertyAccessExpression(rLeft) && rLeft.name.text === "length" && ts.isNumericLiteral(rRight)) {
23
+ const minusNum = Number(rRight.text);
24
+ if (op === ts.SyntaxKind.LessThanToken && minusNum >= 1)
25
+ return true;
26
+ if (op === ts.SyntaxKind.LessThanEqualsToken && minusNum >= 2)
27
+ return true;
28
+ }
29
+ }
30
+ }
31
+ }
32
+ return false;
33
+ }
34
+ function isStateLowerBoundGuard(cond, stateName, minInclusive, ts, checker) {
35
+ const unwrapped = unwrapExpression(cond, ts);
36
+ if (ts.isBinaryExpression(unwrapped)) {
37
+ const op = unwrapped.operatorToken.kind;
38
+ const left = unwrapExpression(unwrapped.left, ts);
39
+ const right = unwrapExpression(unwrapped.right, ts);
40
+ if (ts.isIdentifier(left) && left.text === stateName) {
41
+ if (ts.isNumericLiteral(right)) {
42
+ const limit = Number(right.text);
43
+ if (op === ts.SyntaxKind.GreaterThanToken && limit >= minInclusive - 1)
44
+ return true;
45
+ if (op === ts.SyntaxKind.GreaterThanEqualsToken && limit >= minInclusive)
46
+ return true;
47
+ }
48
+ }
49
+ }
50
+ return false;
51
+ }
52
+ /**
53
+ * Checks if a React state variable indexing a static const array is provably bounded by verified state transitions.
54
+ */
55
+ function isReactStateBoundedIndex(operand, ts, checker) {
56
+ if (!checker)
57
+ return undefined;
58
+ const staticArray = resolveStaticConstArrayLiteral(operand.expression, ts, checker);
59
+ if (!staticArray)
60
+ return undefined;
61
+ const indexExpr = unwrapExpression(operand.argumentExpression, ts);
62
+ if (!ts.isIdentifier(indexExpr))
63
+ return undefined;
64
+ const stateName = indexExpr.text;
65
+ const stateSymbol = checker.getSymbolAtLocation(indexExpr);
66
+ if (!stateSymbol)
67
+ return undefined;
68
+ const decls = stateSymbol.getDeclarations();
69
+ if (!decls || decls.length === 0)
70
+ return undefined;
71
+ const stateDecl = decls[0];
72
+ if (!stateDecl || !ts.isBindingElement(stateDecl))
73
+ return undefined;
74
+ if (!stateDecl.parent || !ts.isArrayBindingPattern(stateDecl.parent))
75
+ return undefined;
76
+ const bindingPattern = stateDecl.parent;
77
+ const bindingElements = bindingPattern.elements;
78
+ if (bindingElements.length < 2)
79
+ return undefined;
80
+ // Verify 1st element is this state variable
81
+ if (bindingElements[0] !== stateDecl)
82
+ return undefined;
83
+ // Verify 2nd element is the setter
84
+ const setterElement = bindingElements[1];
85
+ if (!setterElement || !ts.isBindingElement(setterElement) || !ts.isIdentifier(setterElement.name)) {
86
+ return undefined;
87
+ }
88
+ const setterName = setterElement.name.text;
89
+ const setterIdent = setterElement.name;
90
+ const arrayLength = staticArray.length;
91
+ const arrayName = staticArray.name;
92
+ // Verify initialized by useState(initialNumber)
93
+ const varDecl = bindingPattern.parent;
94
+ if (!ts.isVariableDeclaration(varDecl) || !varDecl.initializer || !ts.isCallExpression(varDecl.initializer)) {
95
+ return undefined;
96
+ }
97
+ const chk = checker;
98
+ const initCall = varDecl.initializer;
99
+ if (!resolveReactHook(initCall, chk, "useState")) {
100
+ return undefined;
101
+ }
102
+ const initArg = initCall.arguments[0];
103
+ if (!initArg || !ts.isNumericLiteral(initArg))
104
+ return undefined;
105
+ const initialVal = Number(initArg.text);
106
+ if (!Number.isInteger(initialVal) || initialVal < 0 || initialVal >= arrayLength) {
107
+ return undefined;
108
+ }
109
+ // Find enclosing component / hook function
110
+ let funcNode = varDecl;
111
+ while (funcNode.parent &&
112
+ !ts.isFunctionDeclaration(funcNode) &&
113
+ !ts.isFunctionExpression(funcNode) &&
114
+ !ts.isArrowFunction(funcNode) &&
115
+ !ts.isSourceFile(funcNode)) {
116
+ funcNode = funcNode.parent;
117
+ }
118
+ if (ts.isSourceFile(funcNode))
119
+ return undefined;
120
+ // Check all references to setterName within the enclosing function
121
+ let setterEscapes = false;
122
+ let hasInvalidSetterWrite = false;
123
+ let setterCallCount = 0;
124
+ function scanSetterUsages(n) {
125
+ if (setterEscapes || hasInvalidSetterWrite || !ts)
126
+ return;
127
+ if (ts.isIdentifier(n) && n.text === setterName && n !== setterIdent) {
128
+ const parent = n.parent;
129
+ if (!parent)
130
+ return;
131
+ // Check if it's being called: setter(arg)
132
+ if (ts.isCallExpression(parent) && parent.expression === n) {
133
+ setterCallCount++;
134
+ const arg = parent.arguments[0];
135
+ if (!arg) {
136
+ hasInvalidSetterWrite = true;
137
+ return;
138
+ }
139
+ // Sub-case 1: Literal integer: setter(0)
140
+ if (ts.isNumericLiteral(arg)) {
141
+ const val = Number(arg.text);
142
+ if (!Number.isInteger(val) || val < 0 || val >= arrayLength) {
143
+ hasInvalidSetterWrite = true;
144
+ return;
145
+ }
146
+ return;
147
+ }
148
+ // Sub-case 2: Functional updater: setter(s => s + 1) or setter(prev => ...)
149
+ if (ts.isArrowFunction(arg) || ts.isFunctionExpression(arg)) {
150
+ const updaterParam = arg.parameters[0];
151
+ const paramText = updaterParam && ts.isIdentifier(updaterParam.name) ? updaterParam.name.text : undefined;
152
+ let retExpr;
153
+ if (ts.isBlock(arg.body)) {
154
+ for (const st of arg.body.statements) {
155
+ if (ts.isReturnStatement(st) && st.expression) {
156
+ retExpr = unwrapExpression(st.expression, ts);
157
+ break;
158
+ }
159
+ }
160
+ }
161
+ else if (ts.isExpression(arg.body)) {
162
+ retExpr = unwrapExpression(arg.body, ts);
163
+ }
164
+ if (!retExpr) {
165
+ hasInvalidSetterWrite = true;
166
+ return;
167
+ }
168
+ // Bounded literal integer: s => 0
169
+ if (ts.isNumericLiteral(retExpr)) {
170
+ const num = Number(retExpr.text);
171
+ if (Number.isInteger(num) && num >= 0 && num < arrayLength) {
172
+ return;
173
+ }
174
+ hasInvalidSetterWrite = true;
175
+ return;
176
+ }
177
+ // Increment: s => s + 1 (requires enclosing upper bound guard)
178
+ if (ts.isBinaryExpression(retExpr) &&
179
+ retExpr.operatorToken.kind === ts.SyntaxKind.PlusToken) {
180
+ const l = unwrapExpression(retExpr.left, ts);
181
+ const r = unwrapExpression(retExpr.right, ts);
182
+ if (((paramText && ts.isIdentifier(l) && l.text === paramText) || (ts.isIdentifier(l) && l.text === stateName)) &&
183
+ ts.isNumericLiteral(r)) {
184
+ const inc = Number(r.text);
185
+ if (inc >= 1) {
186
+ let isGuardedInc = false;
187
+ let curCheck = parent;
188
+ while (curCheck.parent && curCheck.parent !== funcNode) {
189
+ if (ts.isIfStatement(curCheck.parent)) {
190
+ const ifStmt = curCheck.parent;
191
+ if (ifStmt.thenStatement === curCheck ||
192
+ (ts.isBlock(ifStmt.thenStatement) && isNodeDescendantOf(curCheck, ifStmt.thenStatement))) {
193
+ if (isStateUpperBoundGuard(ifStmt.expression, stateName, arrayLength - inc, ts, checker)) {
194
+ isGuardedInc = true;
195
+ break;
196
+ }
197
+ }
198
+ }
199
+ curCheck = curCheck.parent;
200
+ }
201
+ if (isGuardedInc)
202
+ return;
203
+ }
204
+ }
205
+ hasInvalidSetterWrite = true;
206
+ return;
207
+ }
208
+ // Decrement: s => s - 1 (requires enclosing lower bound guard)
209
+ if (ts.isBinaryExpression(retExpr) &&
210
+ retExpr.operatorToken.kind === ts.SyntaxKind.MinusToken) {
211
+ const l = unwrapExpression(retExpr.left, ts);
212
+ const r = unwrapExpression(retExpr.right, ts);
213
+ if (((paramText && ts.isIdentifier(l) && l.text === paramText) || (ts.isIdentifier(l) && l.text === stateName)) &&
214
+ ts.isNumericLiteral(r)) {
215
+ const dec = Number(r.text);
216
+ if (dec >= 1) {
217
+ let isGuardedDec = false;
218
+ let curCheck = parent;
219
+ while (curCheck.parent && curCheck.parent !== funcNode) {
220
+ if (ts.isIfStatement(curCheck.parent)) {
221
+ const ifStmt = curCheck.parent;
222
+ if (ifStmt.thenStatement === curCheck ||
223
+ (ts.isBlock(ifStmt.thenStatement) && isNodeDescendantOf(curCheck, ifStmt.thenStatement))) {
224
+ if (isStateLowerBoundGuard(ifStmt.expression, stateName, dec, ts, checker)) {
225
+ isGuardedDec = true;
226
+ break;
227
+ }
228
+ }
229
+ }
230
+ curCheck = curCheck.parent;
231
+ }
232
+ if (isGuardedDec)
233
+ return;
234
+ }
235
+ }
236
+ hasInvalidSetterWrite = true;
237
+ return;
238
+ }
239
+ hasInvalidSetterWrite = true;
240
+ return;
241
+ }
242
+ // Sub-case 3: Identifier target (e.g. setStep(target)): check if target was bounds-checked in enclosing function
243
+ if (ts.isIdentifier(arg)) {
244
+ const paramName = arg.text;
245
+ let enclosingBlock = parent;
246
+ while (enclosingBlock.parent &&
247
+ !ts.isBlock(enclosingBlock) &&
248
+ enclosingBlock !== funcNode) {
249
+ enclosingBlock = enclosingBlock.parent;
250
+ }
251
+ let paramGuarded = false;
252
+ if (ts.isBlock(enclosingBlock)) {
253
+ for (const stmt of enclosingBlock.statements) {
254
+ if (stmt.end <= parent.pos && ts.isIfStatement(stmt)) {
255
+ if (statementExitsControlFlow(stmt.thenStatement, ts)) {
256
+ if (isParamBoundedCondition(stmt.expression, paramName, arrayLength, ts, true)) {
257
+ paramGuarded = true;
258
+ break;
259
+ }
260
+ }
261
+ }
262
+ }
263
+ }
264
+ if (!paramGuarded) {
265
+ // Check entry guard enclosing parent
266
+ let curN = parent;
267
+ while (curN.parent && curN.parent !== funcNode) {
268
+ if (ts.isIfStatement(curN.parent)) {
269
+ const ifStmt = curN.parent;
270
+ if (ifStmt.thenStatement === curN ||
271
+ (ts.isBlock(ifStmt.thenStatement) && isNodeDescendantOf(curN, ifStmt.thenStatement))) {
272
+ if (isParamBoundedCondition(ifStmt.expression, paramName, arrayLength, ts, false)) {
273
+ paramGuarded = true;
274
+ break;
275
+ }
276
+ }
277
+ }
278
+ curN = curN.parent;
279
+ }
280
+ }
281
+ if (!paramGuarded) {
282
+ hasInvalidSetterWrite = true;
283
+ return;
284
+ }
285
+ return;
286
+ }
287
+ // Sub-case 4: Binary expression: step + 1 or step - 1 (check enclosing if guard)
288
+ if (ts.isBinaryExpression(arg)) {
289
+ const left = unwrapExpression(arg.left, ts);
290
+ const right = unwrapExpression(arg.right, ts);
291
+ if (ts.isIdentifier(left) && left.text === stateName && ts.isNumericLiteral(right)) {
292
+ const offsetNum = Number(right.text);
293
+ if (arg.operatorToken.kind === ts.SyntaxKind.PlusToken) {
294
+ let isGuarded = false;
295
+ let curN = parent;
296
+ while (curN.parent && curN.parent !== funcNode) {
297
+ if (ts.isIfStatement(curN.parent)) {
298
+ const ifStmt = curN.parent;
299
+ if (ifStmt.thenStatement === curN ||
300
+ (ts.isBlock(ifStmt.thenStatement) && isNodeDescendantOf(curN, ifStmt.thenStatement))) {
301
+ if (isStateUpperBoundGuard(ifStmt.expression, stateName, arrayLength - offsetNum, ts, checker)) {
302
+ isGuarded = true;
303
+ break;
304
+ }
305
+ }
306
+ }
307
+ curN = curN.parent;
308
+ }
309
+ if (isGuarded)
310
+ return;
311
+ }
312
+ else if (arg.operatorToken.kind === ts.SyntaxKind.MinusToken) {
313
+ let isGuarded = false;
314
+ let curN = parent;
315
+ while (curN.parent && curN.parent !== funcNode) {
316
+ if (ts.isIfStatement(curN.parent)) {
317
+ const ifStmt = curN.parent;
318
+ if (ifStmt.thenStatement === curN ||
319
+ (ts.isBlock(ifStmt.thenStatement) && isNodeDescendantOf(curN, ifStmt.thenStatement))) {
320
+ if (isStateLowerBoundGuard(ifStmt.expression, stateName, offsetNum, ts, checker)) {
321
+ isGuarded = true;
322
+ break;
323
+ }
324
+ }
325
+ }
326
+ curN = curN.parent;
327
+ }
328
+ if (isGuarded)
329
+ return;
330
+ }
331
+ }
332
+ hasInvalidSetterWrite = true;
333
+ return;
334
+ }
335
+ // Unknown setter argument
336
+ hasInvalidSetterWrite = true;
337
+ return;
338
+ }
339
+ // If setter appears as a JSX attribute or JSX expression (e.g. <Child onStep={setStep} />) or is returned
340
+ if (ts.isJsxAttribute(parent) ||
341
+ ts.isJsxExpression(parent) ||
342
+ ts.isJsxSpreadAttribute(parent) ||
343
+ ts.isReturnStatement(parent) ||
344
+ ts.isPropertyAssignment(parent) ||
345
+ ts.isVariableDeclaration(parent)) {
346
+ setterEscapes = true;
347
+ return;
348
+ }
349
+ // Passed as an argument to another function call (not setter itself)
350
+ if (ts.isCallExpression(parent) && parent.expression !== n) {
351
+ if (resolveReactHook(parent, chk, "useCallback") ||
352
+ resolveReactHook(parent, chk, "useMemo") ||
353
+ resolveReactHook(parent, chk, "useEffect") ||
354
+ resolveReactHook(parent, chk, "useLayoutEffect")) {
355
+ // Setter in hook dependency array is fine
356
+ return;
357
+ }
358
+ setterEscapes = true;
359
+ return;
360
+ }
361
+ if (ts.isArrayLiteralExpression(parent)) {
362
+ // Check if array literal is a hook dependency array
363
+ if (parent.parent &&
364
+ ts.isCallExpression(parent.parent) &&
365
+ (resolveReactHook(parent.parent, chk, "useCallback") ||
366
+ resolveReactHook(parent.parent, chk, "useMemo") ||
367
+ resolveReactHook(parent.parent, chk, "useEffect") ||
368
+ resolveReactHook(parent.parent, chk, "useLayoutEffect"))) {
369
+ return;
370
+ }
371
+ setterEscapes = true;
372
+ return;
373
+ }
374
+ // Any other unmodeled usage is treated as escape
375
+ setterEscapes = true;
376
+ return;
377
+ }
378
+ n.forEachChild(scanSetterUsages);
379
+ }
380
+ scanSetterUsages(funcNode);
381
+ if (setterEscapes || hasInvalidSetterWrite) {
382
+ return undefined;
383
+ }
384
+ return {
385
+ isGuarded: true,
386
+ evidence: `React state '${stateName}' is initialized to ${initialVal} and all state transitions are proven within [0, ${arrayLength - 1}] for static array '${arrayName}'.`,
387
+ };
388
+ }
389
+ export { isReactStateBoundedIndex };
390
+ //# sourceMappingURL=reactStateBounds.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reactStateBounds.js","sourceRoot":"","sources":["../../src/analysis/reactStateBounds.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"values.d.ts","sourceRoot":"","sources":["../../src/analysis/values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC;IAChF,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,MAAM,GAAG,MAAM,CAAC,UAAU,CAgB9F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,UAAU,EACvB,EAAE,EAAE,OAAO,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,SAAS,GACvC,qBAAqB,CA6IvB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,CAAC,UAAU,EACvB,EAAE,EAAE,OAAO,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,SAAS,GACvC,OAAO,CAyBT"}
1
+ {"version":3,"file":"values.d.ts","sourceRoot":"","sources":["../../src/analysis/values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC;IAChF,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,MAAM,GAAG,MAAM,CAAC,UAAU,CAkB9F;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,UAAU,EACvB,EAAE,EAAE,OAAO,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,SAAS,GACvC,qBAAqB,CA6IvB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,CAAC,UAAU,EACvB,EAAE,EAAE,OAAO,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,SAAS,GACvC,OAAO,CAyBT"}
@@ -17,6 +17,9 @@ export function unwrapExpression(expr, ts) {
17
17
  else if (ts.isNonNullExpression(current)) {
18
18
  current = current.expression;
19
19
  }
20
+ else if (ts.isSatisfiesExpression && ts.isSatisfiesExpression(current)) {
21
+ current = current.expression;
22
+ }
20
23
  else {
21
24
  break;
22
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"values.js","sourceRoot":"","sources":["../../src/analysis/values.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"values.js","sourceRoot":"","sources":["../../src/analysis/values.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,8 @@ export declare function saveBaseline(baseline: BaselineFile, filePath: string):
15
15
  export declare function loadBaseline(filePath: string): Promise<BaselineFile | null>;
16
16
  /**
17
17
  * Compares current audit findings against a baseline to determine new and resolved findings.
18
+ * Implements multiset (bag) difference semantics so that duplicate findings with identical
19
+ * fingerprints are tracked with accurate cardinality.
18
20
  */
19
21
  export declare function compareWithBaseline(currentFindings: readonly Finding[], baseline: BaselineFile): BaselineDelta;
20
22
  //# sourceMappingURL=manager.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/baseline/manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,EAAiB,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE7E,eAAO,MAAM,yBAAyB,gCAAgC,CAAC;AAEvE;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY,CAsB3F;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAU1F;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAYjF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,SAAS,OAAO,EAAE,EACnC,QAAQ,EAAE,YAAY,GACrB,aAAa,CAmBf"}
1
+ {"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/baseline/manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,EAAiB,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE7E,eAAO,MAAM,yBAAyB,gCAAgC,CAAC;AAEvE;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,YAAY,CAsB3F;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAU1F;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAYjF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,SAAS,OAAO,EAAE,EACnC,QAAQ,EAAE,YAAY,GACrB,aAAa,CAyCf"}
@@ -6,18 +6,22 @@ export const DEFAULT_BASELINE_FILENAME = ".sourceverity-baseline.json";
6
6
  * Creates a BaselineFile structure from a list of audit findings.
7
7
  */
8
8
  export function createBaseline(findings, repoRoot) {
9
- const entriesMap = new Map();
10
- for (const f of findings) {
11
- if (!entriesMap.has(f.fingerprint)) {
12
- entriesMap.set(f.fingerprint, {
13
- fingerprint: f.fingerprint,
14
- ruleId: f.ruleId,
15
- file: normalizePath(f.file, repoRoot),
16
- message: f.message,
17
- });
18
- }
19
- }
20
- const entries = Array.from(entriesMap.values()).sort((a, b) => a.fingerprint.localeCompare(b.fingerprint));
9
+ const entries = findings
10
+ .map((f) => ({
11
+ fingerprint: f.fingerprint,
12
+ ruleId: f.ruleId,
13
+ file: normalizePath(f.file, repoRoot),
14
+ message: f.message,
15
+ }))
16
+ .sort((a, b) => {
17
+ const fpCmp = a.fingerprint.localeCompare(b.fingerprint);
18
+ if (fpCmp !== 0)
19
+ return fpCmp;
20
+ const fileCmp = a.file.localeCompare(b.file);
21
+ if (fileCmp !== 0)
22
+ return fileCmp;
23
+ return a.ruleId.localeCompare(b.ruleId);
24
+ });
21
25
  return {
22
26
  version: 1,
23
27
  generatedAt: new Date().toISOString(),
@@ -56,15 +60,38 @@ export async function loadBaseline(filePath) {
56
60
  }
57
61
  /**
58
62
  * Compares current audit findings against a baseline to determine new and resolved findings.
63
+ * Implements multiset (bag) difference semantics so that duplicate findings with identical
64
+ * fingerprints are tracked with accurate cardinality.
59
65
  */
60
66
  export function compareWithBaseline(currentFindings, baseline) {
61
- const baselineFingerprints = new Set(baseline.entries.map((e) => e.fingerprint));
62
- const currentFingerprints = new Set(currentFindings.map((f) => f.fingerprint));
63
- const newFindings = currentFindings.filter((f) => !baselineFingerprints.has(f.fingerprint));
67
+ // Count occurrences of each fingerprint in baseline
68
+ const baselineCounts = new Map();
69
+ for (const entry of baseline.entries) {
70
+ baselineCounts.set(entry.fingerprint, (baselineCounts.get(entry.fingerprint) ?? 0) + 1);
71
+ }
72
+ // Count occurrences of each fingerprint in current scan
73
+ const currentCounts = new Map();
74
+ for (const f of currentFindings) {
75
+ currentCounts.set(f.fingerprint, (currentCounts.get(f.fingerprint) ?? 0) + 1);
76
+ }
77
+ // Filter new findings using multiset credit consumption
78
+ const availableCredits = new Map(baselineCounts);
79
+ const newFindings = [];
80
+ for (const f of currentFindings) {
81
+ const credits = availableCredits.get(f.fingerprint) ?? 0;
82
+ if (credits > 0) {
83
+ availableCredits.set(f.fingerprint, credits - 1);
84
+ }
85
+ else {
86
+ newFindings.push(f);
87
+ }
88
+ }
89
+ // Calculate resolved findings count: sum of max(0, baselineCount - currentCount)
64
90
  let resolvedCount = 0;
65
- for (const fp of baselineFingerprints) {
66
- if (!currentFingerprints.has(fp)) {
67
- resolvedCount++;
91
+ for (const [fp, baseCount] of baselineCounts) {
92
+ const currCount = currentCounts.get(fp) ?? 0;
93
+ if (baseCount > currCount) {
94
+ resolvedCount += baseCount - currCount;
68
95
  }
69
96
  }
70
97
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/baseline/manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/baseline/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,MAAM,CAAC,MAAM,yBAAyB,GAAG,6BAA6B,CAAC;AAEvE;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,QAA4B,EAAE,QAAgB;IAC3E,MAAM,OAAO,GAAoB,QAAQ;SACtC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC;QACrC,OAAO,EAAE,CAAC,CAAC,OAAO;KACnB,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACzD,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,CAAC;YAAE,OAAO,OAAO,CAAC;QAClC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEL,OAAO;QACL,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACrC,cAAc,EAAE,GAAG;QACnB,OAAO;KACR,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,QAAsB,EAAE,QAAgB;IACzE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzC,MAAM,QAAQ,GAAG,GAAG,YAAY,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;IACrD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAErD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC1C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,QAAgB;IACjD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/D,0HAA0H;QAC1H,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC;QAC/C,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACpE,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,eAAmC,EACnC,QAAsB;IAEtB,oDAAoD;IACpD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;IACjD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;QACrC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,wDAAwD;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAChD,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;QAChC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,wDAAwD;IACxD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAiB,cAAc,CAAC,CAAC;IACjE,MAAM,WAAW,GAAc,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,iFAAiF;IACjF,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,cAAc,EAAE,CAAC;QAC7C,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,SAAS,GAAG,SAAS,EAAE,CAAC;YAC1B,aAAa,IAAI,SAAS,GAAG,SAAS,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO;QACL,WAAW;QACX,aAAa,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM;QACtC,aAAa;QACb,QAAQ,EAAE,WAAW,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC"}
package/dist/cli/help.js CHANGED
@@ -29,7 +29,7 @@ OPTIONS:
29
29
  -b, --baseline <path> Path to baseline file (default: .sourceverity-baseline.json)
30
30
  -u, --update-baseline Update baseline file with current findings
31
31
  --changed Analyze only git-changed files in the repository
32
- -c, --config <path> Path to custom sourceverity.json configuration
32
+ -c, --config <path> JSON ignore configuration for scan and baseline commands
33
33
  --color / --no-color Force enable or disable ANSI color output
34
34
  -q, --quiet Suppress informational messages and progress
35
35
  --verbose Show extended diagnostic and framework metadata
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAqB3D,OAAO,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6JvE"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAyB3D,OAAO,mBAAmB,CAAC;AAE3B;;GAEG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAkLvE"}