logicstamp-context 0.5.2 → 0.5.3
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/LLM_CONTEXT.md +3 -3
- package/README.md +6 -6
- package/dist/cli/commands/context/tokenEstimator.d.ts.map +1 -1
- package/dist/cli/commands/context/tokenEstimator.js +13 -4
- package/dist/cli/commands/context/tokenEstimator.js.map +1 -1
- package/dist/cli/commands/context.d.ts +1 -1
- package/dist/cli/commands/context.js +4 -4
- package/dist/cli/commands/context.js.map +1 -1
- package/dist/cli/index.d.ts +1 -1
- package/dist/cli/index.js +1 -1
- package/dist/cli/parser/helpText.js +2 -2
- package/dist/core/astParser/detectors.d.ts.map +1 -1
- package/dist/core/astParser/detectors.js +18 -4
- package/dist/core/astParser/detectors.js.map +1 -1
- package/dist/core/astParser.d.ts +1 -1
- package/dist/core/astParser.d.ts.map +1 -1
- package/dist/core/astParser.js +5 -3
- package/dist/core/astParser.js.map +1 -1
- package/dist/core/pack/collector.d.ts.map +1 -1
- package/dist/core/pack/collector.js +3 -2
- package/dist/core/pack/collector.js.map +1 -1
- package/dist/core/pack/loader.d.ts +37 -4
- package/dist/core/pack/loader.d.ts.map +1 -1
- package/dist/core/pack/loader.js +92 -32
- package/dist/core/pack/loader.js.map +1 -1
- package/dist/core/pack/resolver.d.ts.map +1 -1
- package/dist/core/pack/resolver.js +4 -3
- package/dist/core/pack/resolver.js.map +1 -1
- package/dist/core/pack.d.ts.map +1 -1
- package/dist/core/pack.js +20 -4
- package/dist/core/pack.js.map +1 -1
- package/dist/extractors/express/expressExtractor.d.ts.map +1 -1
- package/dist/extractors/express/expressExtractor.js +12 -5
- package/dist/extractors/express/expressExtractor.js.map +1 -1
- package/dist/extractors/react/hookParameterExtractor.js +4 -4
- package/dist/extractors/react/hookParameterExtractor.js.map +1 -1
- package/dist/extractors/react/propExtractor.d.ts.map +1 -1
- package/dist/extractors/react/propExtractor.js +33 -27
- package/dist/extractors/react/propExtractor.js.map +1 -1
- package/dist/extractors/styling/chakra.d.ts.map +1 -1
- package/dist/extractors/styling/chakra.js +2 -1
- package/dist/extractors/styling/chakra.js.map +1 -1
- package/dist/extractors/styling/motion.d.ts.map +1 -1
- package/dist/extractors/styling/motion.js +10 -6
- package/dist/extractors/styling/motion.js.map +1 -1
- package/dist/extractors/styling/shadcn.d.ts.map +1 -1
- package/dist/extractors/styling/shadcn.js +2 -4
- package/dist/extractors/styling/shadcn.js.map +1 -1
- package/dist/extractors/styling/styleExtractor.d.ts +1 -1
- package/dist/extractors/styling/styleExtractor.d.ts.map +1 -1
- package/dist/extractors/styling/styleExtractor.js +6 -5
- package/dist/extractors/styling/styleExtractor.js.map +1 -1
- package/dist/extractors/styling/tailwind.d.ts.map +1 -1
- package/dist/extractors/styling/tailwind.js +4 -12
- package/dist/extractors/styling/tailwind.js.map +1 -1
- package/dist/extractors/vue/componentExtractor.d.ts.map +1 -1
- package/dist/extractors/vue/componentExtractor.js +8 -1
- package/dist/extractors/vue/componentExtractor.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/utils/tokens.d.ts +6 -0
- package/dist/utils/tokens.d.ts.map +1 -1
- package/dist/utils/tokens.js +22 -0
- package/dist/utils/tokens.js.map +1 -1
- package/package.json +2 -2
- package/schema/logicstamp.context.schema.json +1 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../../src/core/pack/collector.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAa9F;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAe,EACf,QAAyB,EACzB,KAAa,EACb,QAAgB,EAChB,WAAoB;IAEpB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC,CAAC,mDAAmD;IAC3F,MAAM,KAAK,GAAyC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAEhF,6EAA6E;IAC7E,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9D,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzD,wDAAwD;QACxD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1C,iBAAiB,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC9C,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"collector.js","sourceRoot":"","sources":["../../../src/core/pack/collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,39 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type { UIFContract } from '../../types/UIFContract.js';
|
|
5
5
|
import type { ProjectManifest } from '../manifest.js';
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Clear the security report cache
|
|
8
|
+
* Call this when switching projects or to free memory in long-running processes
|
|
9
|
+
*/
|
|
10
|
+
export declare function clearSecurityReportCache(): void;
|
|
11
|
+
export interface SanitizeStats {
|
|
7
12
|
filesWithSecrets: number;
|
|
8
13
|
totalSecretsReplaced: number;
|
|
9
14
|
filesProcessed: string[];
|
|
10
15
|
}
|
|
16
|
+
export interface SanitizeInfo {
|
|
17
|
+
hadSecrets: boolean;
|
|
18
|
+
secretCount: number;
|
|
19
|
+
entryId: string;
|
|
20
|
+
}
|
|
21
|
+
export interface CodeHeaderResult {
|
|
22
|
+
header: string | null;
|
|
23
|
+
sanitizeInfo?: SanitizeInfo;
|
|
24
|
+
}
|
|
25
|
+
export interface SourceCodeResult {
|
|
26
|
+
code: string | null;
|
|
27
|
+
sanitizeInfo?: SanitizeInfo;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Record sanitization info into the module-level accumulator
|
|
31
|
+
* Thread-safe: callers aggregate results and call this once after processing
|
|
32
|
+
*/
|
|
33
|
+
export declare function recordSanitization(info: SanitizeInfo): void;
|
|
34
|
+
/**
|
|
35
|
+
* Record multiple sanitization infos at once (for batch processing)
|
|
36
|
+
* This is the preferred method - aggregate locally, then record once
|
|
37
|
+
*/
|
|
38
|
+
export declare function recordSanitizationBatch(infos: SanitizeInfo[]): void;
|
|
11
39
|
/**
|
|
12
40
|
* Get and reset sanitization statistics
|
|
13
41
|
*/
|
|
@@ -25,13 +53,18 @@ export declare function loadContract(entryId: string, projectRoot: string): Prom
|
|
|
25
53
|
* Extract code header (JSDoc @uif block) from source file
|
|
26
54
|
* NOTE: Source files are NEVER modified. Only the in-memory content is sanitized
|
|
27
55
|
* before being included in generated JSON bundles.
|
|
56
|
+
*
|
|
57
|
+
* Returns both the header and sanitization info to avoid race conditions.
|
|
58
|
+
* Callers should aggregate sanitization info and record it once after batch processing.
|
|
28
59
|
*/
|
|
29
|
-
export declare function extractCodeHeader(entryId: string, projectRoot: string): Promise<
|
|
60
|
+
export declare function extractCodeHeader(entryId: string, projectRoot: string): Promise<CodeHeaderResult>;
|
|
30
61
|
/**
|
|
31
62
|
* Read full source code
|
|
32
63
|
* NOTE: Source files are NEVER modified. Only the in-memory content is sanitized
|
|
33
64
|
* before being included in generated JSON bundles.
|
|
65
|
+
*
|
|
66
|
+
* Returns both the code and sanitization info to avoid race conditions.
|
|
67
|
+
* Callers should aggregate sanitization info and record it once after batch processing.
|
|
34
68
|
*/
|
|
35
|
-
export declare function readSourceCode(entryId: string, projectRoot: string): Promise<
|
|
36
|
-
export {};
|
|
69
|
+
export declare function readSourceCode(entryId: string, projectRoot: string): Promise<SourceCodeResult>;
|
|
37
70
|
//# sourceMappingURL=loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/pack/loader.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/pack/loader.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAiBtD;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C;AAsBD,MAAM,WAAW,aAAa;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAGD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AASD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAM3D;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,CAQnE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,aAAa,CAQxD;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CA8B7E;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAYpG;AAkCD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkCvG;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA4BpG"}
|
package/dist/core/pack/loader.js
CHANGED
|
@@ -5,14 +5,63 @@ import { readFile } from 'node:fs/promises';
|
|
|
5
5
|
import { join, resolve, isAbsolute } from 'node:path';
|
|
6
6
|
import { debugError } from '../../utils/debug.js';
|
|
7
7
|
import { loadSecurityReport, sanitizeCode } from '../../utils/codeSanitizer.js';
|
|
8
|
-
// Cache
|
|
9
|
-
|
|
10
|
-
let
|
|
8
|
+
// Cache expiration time (5 minutes) - balances performance vs memory for long-running processes
|
|
9
|
+
const CACHE_MAX_AGE_MS = 5 * 60 * 1000;
|
|
10
|
+
let securityReportCache = null;
|
|
11
|
+
/**
|
|
12
|
+
* Clear the security report cache
|
|
13
|
+
* Call this when switching projects or to free memory in long-running processes
|
|
14
|
+
*/
|
|
15
|
+
export function clearSecurityReportCache() {
|
|
16
|
+
securityReportCache = null;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Check if cache is still valid (not expired and same project)
|
|
20
|
+
*/
|
|
21
|
+
function isCacheValid(cache, projectRoot) {
|
|
22
|
+
if (!cache)
|
|
23
|
+
return false;
|
|
24
|
+
const normalizedCached = normalizeProjectRoot(cache.projectRoot);
|
|
25
|
+
const normalizedCurrent = normalizeProjectRoot(projectRoot);
|
|
26
|
+
// Check if same project
|
|
27
|
+
if (normalizedCached !== normalizedCurrent)
|
|
28
|
+
return false;
|
|
29
|
+
// Check if expired
|
|
30
|
+
const age = Date.now() - cache.timestamp;
|
|
31
|
+
if (age > CACHE_MAX_AGE_MS)
|
|
32
|
+
return false;
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
// Module-level stats accumulator (populated by recordSanitization, read by getAndResetSanitizeStats)
|
|
11
36
|
let sanitizeStats = {
|
|
12
37
|
filesWithSecrets: 0,
|
|
13
38
|
totalSecretsReplaced: 0,
|
|
14
39
|
filesProcessed: [],
|
|
15
40
|
};
|
|
41
|
+
/**
|
|
42
|
+
* Record sanitization info into the module-level accumulator
|
|
43
|
+
* Thread-safe: callers aggregate results and call this once after processing
|
|
44
|
+
*/
|
|
45
|
+
export function recordSanitization(info) {
|
|
46
|
+
if (info.hadSecrets) {
|
|
47
|
+
sanitizeStats.filesWithSecrets++;
|
|
48
|
+
sanitizeStats.totalSecretsReplaced += info.secretCount;
|
|
49
|
+
sanitizeStats.filesProcessed.push(info.entryId);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* Record multiple sanitization infos at once (for batch processing)
|
|
54
|
+
* This is the preferred method - aggregate locally, then record once
|
|
55
|
+
*/
|
|
56
|
+
export function recordSanitizationBatch(infos) {
|
|
57
|
+
for (const info of infos) {
|
|
58
|
+
if (info.hadSecrets) {
|
|
59
|
+
sanitizeStats.filesWithSecrets++;
|
|
60
|
+
sanitizeStats.totalSecretsReplaced += info.secretCount;
|
|
61
|
+
sanitizeStats.filesProcessed.push(info.entryId);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
16
65
|
/**
|
|
17
66
|
* Get and reset sanitization statistics
|
|
18
67
|
*/
|
|
@@ -86,26 +135,30 @@ function normalizeProjectRoot(path) {
|
|
|
86
135
|
return normalized.replace(/\\/g, '/');
|
|
87
136
|
}
|
|
88
137
|
/**
|
|
89
|
-
* Get security report (cached per project)
|
|
138
|
+
* Get security report (cached per project with expiration)
|
|
139
|
+
* Cache automatically expires after CACHE_MAX_AGE_MS to prevent memory leaks
|
|
90
140
|
*/
|
|
91
141
|
async function getSecurityReport(projectRoot) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
const normalizedCachedRoot = normalizeProjectRoot(cachedProjectRoot);
|
|
96
|
-
if (normalizedCachedRoot === normalizedRoot) {
|
|
97
|
-
return cachedSecurityReport;
|
|
98
|
-
}
|
|
142
|
+
// Check if we have a valid cached report
|
|
143
|
+
if (isCacheValid(securityReportCache, projectRoot)) {
|
|
144
|
+
return securityReportCache.report;
|
|
99
145
|
}
|
|
100
|
-
// Load and cache the report
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
146
|
+
// Load and cache the report with timestamp
|
|
147
|
+
const report = await loadSecurityReport(projectRoot);
|
|
148
|
+
securityReportCache = {
|
|
149
|
+
report,
|
|
150
|
+
projectRoot,
|
|
151
|
+
timestamp: Date.now(),
|
|
152
|
+
};
|
|
153
|
+
return report;
|
|
104
154
|
}
|
|
105
155
|
/**
|
|
106
156
|
* Extract code header (JSDoc @uif block) from source file
|
|
107
157
|
* NOTE: Source files are NEVER modified. Only the in-memory content is sanitized
|
|
108
158
|
* before being included in generated JSON bundles.
|
|
159
|
+
*
|
|
160
|
+
* Returns both the header and sanitization info to avoid race conditions.
|
|
161
|
+
* Callers should aggregate sanitization info and record it once after batch processing.
|
|
109
162
|
*/
|
|
110
163
|
export async function extractCodeHeader(entryId, projectRoot) {
|
|
111
164
|
try {
|
|
@@ -114,33 +167,38 @@ export async function extractCodeHeader(entryId, projectRoot) {
|
|
|
114
167
|
let content = await readFile(absolutePath, 'utf8');
|
|
115
168
|
// Sanitize code in-memory only (for JSON generation, source files remain unchanged)
|
|
116
169
|
const securityReport = await getSecurityReport(projectRoot);
|
|
117
|
-
let
|
|
170
|
+
let sanitizeInfo = undefined;
|
|
118
171
|
if (securityReport) {
|
|
119
|
-
sanitizeResult = sanitizeCode(content, absolutePath, securityReport, projectRoot);
|
|
172
|
+
const sanitizeResult = sanitizeCode(content, absolutePath, securityReport, projectRoot);
|
|
120
173
|
content = sanitizeResult.sanitized;
|
|
121
|
-
//
|
|
174
|
+
// Return sanitization info for caller to aggregate (no global mutation)
|
|
122
175
|
if (sanitizeResult.secretsReplaced) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
176
|
+
sanitizeInfo = {
|
|
177
|
+
hadSecrets: true,
|
|
178
|
+
secretCount: sanitizeResult.matchCount,
|
|
179
|
+
entryId,
|
|
180
|
+
};
|
|
126
181
|
console.log(` 🔒 Sanitized ${sanitizeResult.matchCount} secret(s) in ${entryId}`);
|
|
127
182
|
}
|
|
128
183
|
}
|
|
129
184
|
// Look for @uif JSDoc block
|
|
130
185
|
const headerMatch = content.match(/\/\*\*[\s\S]*?@uif[\s\S]*?\*\//);
|
|
131
186
|
if (headerMatch) {
|
|
132
|
-
return headerMatch[0];
|
|
187
|
+
return { header: headerMatch[0], sanitizeInfo };
|
|
133
188
|
}
|
|
134
|
-
return null;
|
|
189
|
+
return { header: null, sanitizeInfo };
|
|
135
190
|
}
|
|
136
191
|
catch (error) {
|
|
137
|
-
return null;
|
|
192
|
+
return { header: null };
|
|
138
193
|
}
|
|
139
194
|
}
|
|
140
195
|
/**
|
|
141
196
|
* Read full source code
|
|
142
197
|
* NOTE: Source files are NEVER modified. Only the in-memory content is sanitized
|
|
143
198
|
* before being included in generated JSON bundles.
|
|
199
|
+
*
|
|
200
|
+
* Returns both the code and sanitization info to avoid race conditions.
|
|
201
|
+
* Callers should aggregate sanitization info and record it once after batch processing.
|
|
144
202
|
*/
|
|
145
203
|
export async function readSourceCode(entryId, projectRoot) {
|
|
146
204
|
try {
|
|
@@ -149,22 +207,24 @@ export async function readSourceCode(entryId, projectRoot) {
|
|
|
149
207
|
let content = await readFile(absolutePath, 'utf8');
|
|
150
208
|
// Sanitize code in-memory only (for JSON generation, source files remain unchanged)
|
|
151
209
|
const securityReport = await getSecurityReport(projectRoot);
|
|
152
|
-
let
|
|
210
|
+
let sanitizeInfo = undefined;
|
|
153
211
|
if (securityReport) {
|
|
154
|
-
sanitizeResult = sanitizeCode(content, absolutePath, securityReport, projectRoot);
|
|
212
|
+
const sanitizeResult = sanitizeCode(content, absolutePath, securityReport, projectRoot);
|
|
155
213
|
content = sanitizeResult.sanitized;
|
|
156
|
-
//
|
|
214
|
+
// Return sanitization info for caller to aggregate (no global mutation)
|
|
157
215
|
if (sanitizeResult.secretsReplaced) {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
216
|
+
sanitizeInfo = {
|
|
217
|
+
hadSecrets: true,
|
|
218
|
+
secretCount: sanitizeResult.matchCount,
|
|
219
|
+
entryId,
|
|
220
|
+
};
|
|
161
221
|
console.log(` 🔒 Sanitized ${sanitizeResult.matchCount} secret(s) in ${entryId}`);
|
|
162
222
|
}
|
|
163
223
|
}
|
|
164
|
-
return content;
|
|
224
|
+
return { code: content, sanitizeInfo };
|
|
165
225
|
}
|
|
166
226
|
catch (error) {
|
|
167
|
-
return null;
|
|
227
|
+
return { code: null };
|
|
168
228
|
}
|
|
169
229
|
}
|
|
170
230
|
//# sourceMappingURL=loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/core/pack/loader.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAuB,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/core/pack/loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/core/pack/resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAErE;;;GAGG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,IAAI,CAkCf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,MAAM,GACjB,aAAa,GAAG,IAAI,CAGtB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/core/pack/resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAErE;;;GAGG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,eAAe,EACzB,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,IAAI,CAkCf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,MAAM,GACjB,aAAa,GAAG,IAAI,CAGtB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,IAAI,CA8Bf"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Resolver module - Resolve component names and paths to manifest keys
|
|
3
3
|
*/
|
|
4
|
-
import { normalizeEntryId } from '../../utils/fsx.js';
|
|
4
|
+
import { normalizeEntryId, getFolderPath } from '../../utils/fsx.js';
|
|
5
5
|
/**
|
|
6
6
|
* Resolve input (path or name) to a manifest key
|
|
7
7
|
* This is the canonical resolution used by both pack and similar commands
|
|
@@ -54,8 +54,9 @@ export function resolveDependency(manifest, depName, parentId) {
|
|
|
54
54
|
// parentId is a manifest key (canonical identifier)
|
|
55
55
|
// First, try relative path resolution based on parent directory
|
|
56
56
|
// This ensures we resolve to components in the same directory tree first
|
|
57
|
-
// parentId is a manifest key
|
|
58
|
-
|
|
57
|
+
// parentId is a manifest key - use getFolderPath which normalizes path separators
|
|
58
|
+
// This fixes Windows compatibility where parentId might contain backslashes
|
|
59
|
+
const parentDir = getFolderPath(parentId);
|
|
59
60
|
const possiblePaths = [
|
|
60
61
|
`${parentDir}/${depName}.tsx`,
|
|
61
62
|
`${parentDir}/${depName}.ts`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/core/pack/resolver.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/core/pack/resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/core/pack.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pack.d.ts","sourceRoot":"","sources":["../../src/core/pack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAUH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,eAAe,CAAC;AAIpE,OAAO,EAKL,KAAK,iBAAiB,EAStB,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"pack.d.ts","sourceRoot":"","sources":["../../src/core/pack.ts"],"names":[],"mappings":"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"}
|
package/dist/core/pack.js
CHANGED
|
@@ -31,7 +31,7 @@ import { getRelativePath } from '../utils/fsx.js';
|
|
|
31
31
|
import { normalizeEntryId } from '../utils/fsx.js';
|
|
32
32
|
import { createRequire } from 'node:module';
|
|
33
33
|
// Import from extracted modules
|
|
34
|
-
import { resolveKey, collectDependencies, loadContract, readSourceCode, extractCodeHeader, buildEdges, computeBundleHash, stableSort, validateHashLock, isThirdPartyPackage, extractPackageName, getPackageVersion, } from './pack/index.js';
|
|
34
|
+
import { resolveKey, collectDependencies, loadContract, readSourceCode, extractCodeHeader, buildEdges, computeBundleHash, stableSort, validateHashLock, isThirdPartyPackage, extractPackageName, getPackageVersion, recordSanitizationBatch, } from './pack/index.js';
|
|
35
35
|
// Load package.json to get version
|
|
36
36
|
const require = createRequire(import.meta.url);
|
|
37
37
|
const pkg = require('../../package.json');
|
|
@@ -174,6 +174,8 @@ export async function pack(entryId, manifest, options, projectRoot) {
|
|
|
174
174
|
// Load contracts for all visited nodes
|
|
175
175
|
// visited contains manifest keys (canonical identifiers, now project-relative)
|
|
176
176
|
const nodes = [];
|
|
177
|
+
// Collect sanitization info to record once after processing (avoids race conditions)
|
|
178
|
+
const sanitizationInfos = [];
|
|
177
179
|
for (const manifestKey of Array.from(visited)) {
|
|
178
180
|
// Try to get contract from in-memory map first (standalone mode), then from sidecar file
|
|
179
181
|
const contract = options.contractsMap?.get(manifestKey) || await loadContract(manifestKey, projectRoot);
|
|
@@ -218,11 +220,21 @@ export async function pack(entryId, manifest, options, projectRoot) {
|
|
|
218
220
|
let codeHeader = undefined;
|
|
219
221
|
let code = undefined;
|
|
220
222
|
if (options.includeCode === 'header') {
|
|
221
|
-
|
|
223
|
+
const headerResult = await extractCodeHeader(manifestKey, projectRoot);
|
|
224
|
+
codeHeader = headerResult.header;
|
|
225
|
+
if (headerResult.sanitizeInfo) {
|
|
226
|
+
sanitizationInfos.push(headerResult.sanitizeInfo);
|
|
227
|
+
}
|
|
222
228
|
}
|
|
223
229
|
else if (options.includeCode === 'full') {
|
|
224
|
-
|
|
225
|
-
|
|
230
|
+
const codeResult = await readSourceCode(manifestKey, projectRoot);
|
|
231
|
+
code = codeResult.code;
|
|
232
|
+
if (codeResult.sanitizeInfo) {
|
|
233
|
+
sanitizationInfos.push(codeResult.sanitizeInfo);
|
|
234
|
+
}
|
|
235
|
+
const headerResult = await extractCodeHeader(manifestKey, projectRoot);
|
|
236
|
+
codeHeader = headerResult.header;
|
|
237
|
+
// Note: sanitization info from header is already captured by readSourceCode for the same file
|
|
226
238
|
}
|
|
227
239
|
if (contract) {
|
|
228
240
|
// Ensure node entryId is relative (manifest keys should already be relative, but convert if needed)
|
|
@@ -238,6 +250,10 @@ export async function pack(entryId, manifest, options, projectRoot) {
|
|
|
238
250
|
});
|
|
239
251
|
}
|
|
240
252
|
}
|
|
253
|
+
// Record sanitization stats once after batch processing (thread-safe)
|
|
254
|
+
if (sanitizationInfos.length > 0) {
|
|
255
|
+
recordSanitizationBatch(sanitizationInfos);
|
|
256
|
+
}
|
|
241
257
|
// DX & guardrails: If no nodes were packed, provide helpful error
|
|
242
258
|
if (nodes.length === 0) {
|
|
243
259
|
throw new Error(`No nodes packed. ` +
|
package/dist/core/pack.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/core/pack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,gCAAgC;AAChC,OAAO,EACL,UAAU,EAGV,mBAAmB,EAGnB,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EAEhB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"pack.js","sourceRoot":"","sources":["../../src/core/pack.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressExtractor.d.ts","sourceRoot":"","sources":["../../../src/extractors/express/expressExtractor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"expressExtractor.d.ts","sourceRoot":"","sources":["../../../src/extractors/express/expressExtractor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAA4F,MAAM,UAAU,CAAC;AAChI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG/D,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,EAAE,CAoFvE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,MAAM,GAClB,YAAY,GAAG,SAAS,CA2E1B"}
|
|
@@ -92,16 +92,22 @@ export function extractExpressRoutes(source) {
|
|
|
92
92
|
export function extractExpressApiSignature(source, handlerName) {
|
|
93
93
|
const filePath = source.getFilePath?.() ?? 'unknown';
|
|
94
94
|
try {
|
|
95
|
-
// Find the handler function
|
|
95
|
+
// Find the handler function - can be FunctionDeclaration, ArrowFunction, or FunctionExpression
|
|
96
|
+
let handlerFunc;
|
|
97
|
+
// Check function declarations first
|
|
96
98
|
const functions = source.getFunctions();
|
|
97
|
-
|
|
99
|
+
handlerFunc = functions.find(f => f.getName() === handlerName);
|
|
98
100
|
// Also check arrow functions assigned to variables
|
|
99
101
|
if (!handlerFunc) {
|
|
100
102
|
const variables = source.getVariableDeclarations();
|
|
101
103
|
for (const varDecl of variables) {
|
|
102
104
|
if (varDecl.getName() === handlerName) {
|
|
103
105
|
const initializer = varDecl.getInitializer();
|
|
104
|
-
if (Node.isArrowFunction(initializer)
|
|
106
|
+
if (Node.isArrowFunction(initializer)) {
|
|
107
|
+
handlerFunc = initializer;
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
else if (Node.isFunctionExpression(initializer)) {
|
|
105
111
|
handlerFunc = initializer;
|
|
106
112
|
break;
|
|
107
113
|
}
|
|
@@ -111,8 +117,9 @@ export function extractExpressApiSignature(source, handlerName) {
|
|
|
111
117
|
if (!handlerFunc) {
|
|
112
118
|
return undefined;
|
|
113
119
|
}
|
|
120
|
+
// handlerFunc is now FunctionDeclaration | ArrowFunction | FunctionExpression
|
|
114
121
|
const parameters = {};
|
|
115
|
-
const params = handlerFunc.getParameters
|
|
122
|
+
const params = handlerFunc.getParameters();
|
|
116
123
|
for (const param of params) {
|
|
117
124
|
const paramName = param.getName();
|
|
118
125
|
let paramType = 'any';
|
|
@@ -134,7 +141,7 @@ export function extractExpressApiSignature(source, handlerName) {
|
|
|
134
141
|
// Try to extract return type
|
|
135
142
|
let returnType;
|
|
136
143
|
try {
|
|
137
|
-
returnType = handlerFunc.getReturnType
|
|
144
|
+
returnType = handlerFunc.getReturnType()?.getText();
|
|
138
145
|
}
|
|
139
146
|
catch {
|
|
140
147
|
// Return type extraction failed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressExtractor.js","sourceRoot":"","sources":["../../../src/extractors/express/expressExtractor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAc,UAAU,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"expressExtractor.js","sourceRoot":"","sources":["../../../src/extractors/express/expressExtractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,8 +57,8 @@ export function hasExportedHooks(source) {
|
|
|
57
57
|
for (const exportDecl of exportDeclarations) {
|
|
58
58
|
try {
|
|
59
59
|
// Skip re-exports (export { useX } from "./x") - params can't be extracted anyway
|
|
60
|
-
//
|
|
61
|
-
if (exportDecl.getModuleSpecifierValue
|
|
60
|
+
// getModuleSpecifierValue() returns the module path or undefined
|
|
61
|
+
if (exportDecl.getModuleSpecifierValue()) {
|
|
62
62
|
continue;
|
|
63
63
|
}
|
|
64
64
|
const namedExports = exportDecl.getNamedExports();
|
|
@@ -237,8 +237,8 @@ function isExported(source, name) {
|
|
|
237
237
|
const exportDeclarations = source.getExportDeclarations();
|
|
238
238
|
for (const exportDecl of exportDeclarations) {
|
|
239
239
|
// Skip re-exports (export { useX } from "./x") - can't extract params anyway
|
|
240
|
-
//
|
|
241
|
-
if (exportDecl.getModuleSpecifierValue
|
|
240
|
+
// getModuleSpecifierValue() returns the module path or undefined
|
|
241
|
+
if (exportDecl.getModuleSpecifierValue()) {
|
|
242
242
|
continue;
|
|
243
243
|
}
|
|
244
244
|
const namedExports = exportDecl.getNamedExports();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookParameterExtractor.js","sourceRoot":"","sources":["../../../src/extractors/react/hookParameterExtractor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hookParameterExtractor.js","sourceRoot":"","sources":["../../../src/extractors/react/hookParameterExtractor.ts"],"names":[],"mappings":"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"}
|