@codeyam/codeyam-cli 0.1.19 → 0.1.21
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/analyzer-template/.build-info.json +7 -7
- package/analyzer-template/log.txt +3 -3
- package/analyzer-template/package.json +2 -2
- package/analyzer-template/packages/ai/src/lib/dataStructure/ScopeDataStructure.ts +5 -1
- package/analyzer-template/packages/analyze/src/lib/files/analyze/findOrCreateEntity.ts +10 -6
- package/analyzer-template/packages/analyze/src/lib/files/analyze/gatherEntityMap.ts +9 -12
- package/analyzer-template/packages/analyze/src/lib/files/analyzeChange.ts +4 -0
- package/analyzer-template/packages/analyze/src/lib/files/analyzeInitial.ts +4 -0
- package/analyzer-template/packages/aws/package.json +1 -1
- package/analyzer-template/packages/database/package.json +1 -1
- package/analyzer-template/packages/database/src/lib/loadAnalysis.ts +19 -15
- package/analyzer-template/packages/database/src/lib/loadEntity.ts +19 -8
- package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.js +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.js.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.d.ts +4 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.js +5 -5
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.js.map +1 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.d.ts +3 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.d.ts.map +1 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js +22 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js.map +1 -1
- package/analyzer-template/packages/utils/src/lib/fs/rsyncCopy.ts +27 -0
- package/analyzer-template/project/analyzeFileEntities.ts +26 -0
- package/background/src/lib/virtualized/project/analyzeFileEntities.js +22 -0
- package/background/src/lib/virtualized/project/analyzeFileEntities.js.map +1 -1
- package/codeyam-cli/src/commands/editor.js +412 -96
- package/codeyam-cli/src/commands/editor.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorAudit.test.js +895 -16
- package/codeyam-cli/src/utils/__tests__/editorAudit.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorScenarios.test.js +20 -0
- package/codeyam-cli/src/utils/__tests__/editorScenarios.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/registerScenarioResult.test.js +127 -0
- package/codeyam-cli/src/utils/__tests__/registerScenarioResult.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/screenshotHash.test.js +84 -0
- package/codeyam-cli/src/utils/__tests__/screenshotHash.test.js.map +1 -0
- package/codeyam-cli/src/utils/analysisRunner.js +8 -6
- package/codeyam-cli/src/utils/analysisRunner.js.map +1 -1
- package/codeyam-cli/src/utils/analyzer.js +8 -0
- package/codeyam-cli/src/utils/analyzer.js.map +1 -1
- package/codeyam-cli/src/utils/editorAudit.js +183 -13
- package/codeyam-cli/src/utils/editorAudit.js.map +1 -1
- package/codeyam-cli/src/utils/editorScenarios.js +36 -4
- package/codeyam-cli/src/utils/editorScenarios.js.map +1 -1
- package/codeyam-cli/src/utils/queue/job.js +6 -3
- package/codeyam-cli/src/utils/queue/job.js.map +1 -1
- package/codeyam-cli/src/utils/registerScenarioResult.js +52 -0
- package/codeyam-cli/src/utils/registerScenarioResult.js.map +1 -0
- package/codeyam-cli/src/utils/screenshotHash.js +26 -0
- package/codeyam-cli/src/utils/screenshotHash.js.map +1 -0
- package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js +28 -1
- package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/idleDetector.test.js +22 -2
- package/codeyam-cli/src/webserver/__tests__/idleDetector.test.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/stripClaudeCommand.test.js +57 -1
- package/codeyam-cli/src/webserver/__tests__/stripClaudeCommand.test.js.map +1 -1
- package/codeyam-cli/src/webserver/app/lib/clientErrors.js +15 -0
- package/codeyam-cli/src/webserver/app/lib/clientErrors.js.map +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-save-scenario-data-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-schema-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/{cy-logo-cli-CCKUIm0S.svg → cy-logo-cli-CJzc4vOH.svg} +2 -2
- package/codeyam-cli/src/webserver/build/client/assets/cy-logo-cli-DODLxLcw.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/editor.entity.(_sha)-Dx-h1rJK.js +130 -0
- package/codeyam-cli/src/webserver/build/client/assets/editorPreview-NTuLi4Xg.js +41 -0
- package/codeyam-cli/src/webserver/build/client/assets/{entity._sha.scenarios._scenarioId.dev-KTQuL0aj.js → entity._sha.scenarios._scenarioId.dev-BA5L8bU-.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/{entity._sha.scenarios._scenarioId.fullscreen-C6eeL24i.js → entity._sha.scenarios._scenarioId.fullscreen-D4dmRgvO.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/globals-BrPXT1iR.css +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/manifest-5025e428.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/{root-BxUQigda.js → root-BCx1S8Z3.js} +26 -13
- package/codeyam-cli/src/webserver/build/server/assets/analysisRunner-C1kjC9UJ.js +13 -0
- package/codeyam-cli/src/webserver/build/server/assets/{index-Cd-ufawF.js → index-C91yWWCI.js} +1 -1
- package/codeyam-cli/src/webserver/build/server/assets/{init-CzeBGOto.js → init-Dkas-RUS.js} +1 -1
- package/codeyam-cli/src/webserver/build/server/assets/server-build-pulXLTrG.js +640 -0
- package/codeyam-cli/src/webserver/build/server/index.js +1 -1
- package/codeyam-cli/src/webserver/build-info.json +5 -5
- package/codeyam-cli/src/webserver/scripts/journalCapture.ts +17 -0
- package/codeyam-cli/src/webserver/server.js +52 -14
- package/codeyam-cli/src/webserver/server.js.map +1 -1
- package/codeyam-cli/src/webserver/terminalServer.js +61 -13
- package/codeyam-cli/src/webserver/terminalServer.js.map +1 -1
- package/codeyam-cli/templates/editor-step-hook.py +21 -0
- package/codeyam-cli/templates/skills/codeyam-editor/SKILL.md +19 -1
- package/package.json +1 -1
- package/packages/ai/src/lib/dataStructure/ScopeDataStructure.js +4 -1
- package/packages/ai/src/lib/dataStructure/ScopeDataStructure.js.map +1 -1
- package/packages/analyze/src/lib/files/analyze/findOrCreateEntity.js +3 -2
- package/packages/analyze/src/lib/files/analyze/findOrCreateEntity.js.map +1 -1
- package/packages/analyze/src/lib/files/analyze/gatherEntityMap.js +9 -7
- package/packages/analyze/src/lib/files/analyze/gatherEntityMap.js.map +1 -1
- package/packages/analyze/src/lib/files/analyzeChange.js +1 -0
- package/packages/analyze/src/lib/files/analyzeChange.js.map +1 -1
- package/packages/analyze/src/lib/files/analyzeInitial.js +1 -0
- package/packages/analyze/src/lib/files/analyzeInitial.js.map +1 -1
- package/packages/database/src/lib/loadAnalysis.js +1 -1
- package/packages/database/src/lib/loadAnalysis.js.map +1 -1
- package/packages/database/src/lib/loadEntity.js +5 -5
- package/packages/database/src/lib/loadEntity.js.map +1 -1
- package/packages/utils/src/lib/fs/rsyncCopy.js +22 -1
- package/packages/utils/src/lib/fs/rsyncCopy.js.map +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/cy-logo-cli-DcX-ZS3p.js +0 -1
- package/codeyam-cli/src/webserver/build/client/assets/editor.entity.(_sha)-CGzKlIHg.js +0 -58
- package/codeyam-cli/src/webserver/build/client/assets/editorPreview-oepecPae.js +0 -41
- package/codeyam-cli/src/webserver/build/client/assets/globals-Yn9W3zp3.css +0 -1
- package/codeyam-cli/src/webserver/build/client/assets/manifest-2ef99f38.js +0 -1
- package/codeyam-cli/src/webserver/build/server/assets/analysisRunner-BPmOG9bE.js +0 -13
- package/codeyam-cli/src/webserver/build/server/assets/server-build-Dht7CKXY.js +0 -552
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
|
-
"buildTimestamp": "2026-03-
|
|
3
|
-
"buildTime":
|
|
4
|
-
"gitCommit": "
|
|
2
|
+
"buildTimestamp": "2026-03-23T18:15:43.332Z",
|
|
3
|
+
"buildTime": 1774289743332,
|
|
4
|
+
"gitCommit": "56a7e07b8443b0a3e64a46dc6ba44404297a9a2e",
|
|
5
5
|
"nodeVersion": "v20.20.1",
|
|
6
|
-
"contentHash": "
|
|
7
|
-
"buildNumber":
|
|
8
|
-
"semanticVersion": "0.1.
|
|
9
|
-
"version": "0.1.
|
|
6
|
+
"contentHash": "6c4394ec0578dec94ea4076bc8417fa3e6c6cbcad956c30ed107dcaeaa37e131",
|
|
7
|
+
"buildNumber": 1193,
|
|
8
|
+
"semanticVersion": "0.1.1193",
|
|
9
|
+
"version": "0.1.1193 (2026-03-23T18:15+6c4394e)"
|
|
10
10
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
|
-
[3/
|
|
3
|
-
[3/
|
|
2
|
+
[3/23/2026, 6:15:43 PM] > codeyam-combo@1.0.0 mergeDependencies
|
|
3
|
+
[3/23/2026, 6:15:43 PM] > node ./scripts/mergePackageJsonFiles.cjs
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
[3/
|
|
6
|
+
[3/23/2026, 6:15:43 PM] Merged dependencies into root package.json
|
|
7
7
|
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@aws-sdk/client-cloudwatch-logs": "^3.990.0",
|
|
11
11
|
"@aws-sdk/client-cloudfront": "^3.990.0",
|
|
12
|
-
"@aws-sdk/client-codebuild": "^3.
|
|
12
|
+
"@aws-sdk/client-codebuild": "^3.1014.0",
|
|
13
13
|
"@aws-sdk/client-dynamodb": "^3.990.0",
|
|
14
14
|
"@aws-sdk/client-ec2": "^3.990.0",
|
|
15
15
|
"@aws-sdk/client-ecr": "^3.990.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@aws-sdk/s3-request-presigner": "^3.990.0",
|
|
49
49
|
"better-sqlite3": "^12.6.2",
|
|
50
50
|
"fetch-retry": "^6.0.0",
|
|
51
|
-
"kysely": "^0.28.
|
|
51
|
+
"kysely": "^0.28.14",
|
|
52
52
|
"pg": "^8.20.0",
|
|
53
53
|
"@octokit/request": "^10.0.3",
|
|
54
54
|
"lucide-react": "^0.577.0",
|
|
@@ -1050,7 +1050,11 @@ export class ScopeDataStructure {
|
|
|
1050
1050
|
) {
|
|
1051
1051
|
addEquivalencyCallCount++;
|
|
1052
1052
|
|
|
1053
|
-
|
|
1053
|
+
const limit =
|
|
1054
|
+
typeof (globalThis as any).__CODEYAM_EQUIVALENCY_LIMIT === 'number'
|
|
1055
|
+
? (globalThis as any).__CODEYAM_EQUIVALENCY_LIMIT
|
|
1056
|
+
: 50000;
|
|
1057
|
+
if (addEquivalencyCallCount > limit) {
|
|
1054
1058
|
console.error('INFINITE LOOP DETECTED in addEquivalency', {
|
|
1055
1059
|
callCount: addEquivalencyCallCount,
|
|
1056
1060
|
path,
|
|
@@ -94,12 +94,15 @@ export default async function findOrCreateEntity({
|
|
|
94
94
|
try {
|
|
95
95
|
code = fileAnalyzer.getEntityCode(localEntityName);
|
|
96
96
|
} catch (e) {
|
|
97
|
-
console.log(
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
97
|
+
console.log(
|
|
98
|
+
`CodeYam Error: Could not extract code for "${localEntityName}" from ${file.path} — export not found in file, may have been moved or renamed during refactoring`,
|
|
99
|
+
{
|
|
100
|
+
filePath: file.path,
|
|
101
|
+
localEntityName,
|
|
102
|
+
entityName,
|
|
103
|
+
error: String(e),
|
|
104
|
+
},
|
|
105
|
+
);
|
|
103
106
|
return null;
|
|
104
107
|
}
|
|
105
108
|
const sha = generateSha(file.path, entityName, code);
|
|
@@ -108,6 +111,7 @@ export default async function findOrCreateEntity({
|
|
|
108
111
|
entity = await loadEntity({
|
|
109
112
|
projectId: project.id,
|
|
110
113
|
sha,
|
|
114
|
+
silent: true, // Entity not existing yet is the normal path — we create it below
|
|
111
115
|
});
|
|
112
116
|
}
|
|
113
117
|
|
|
@@ -111,18 +111,15 @@ export default async function gatherEntityMap({
|
|
|
111
111
|
});
|
|
112
112
|
|
|
113
113
|
if (!importedEntity) {
|
|
114
|
-
|
|
115
|
-
`
|
|
116
|
-
{
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
);
|
|
123
|
-
throw new Error(
|
|
124
|
-
`Entity not found while gathering entity map: ${importedFile.path}: ${importedExport.name}`,
|
|
125
|
-
);
|
|
114
|
+
const msg = [
|
|
115
|
+
`Entity not found: "${importedExportName}" in ${importedFile.path}`,
|
|
116
|
+
` While analyzing dependencies of: ${entity.name} (${entity.filePath})`,
|
|
117
|
+
` This usually means "${importedExportName}" was moved or renamed but`,
|
|
118
|
+
` ${entity.filePath} still has stale import metadata referencing the old location.`,
|
|
119
|
+
` Fix: Update or re-analyze ${entity.filePath} so its importedExports reflect current code.`,
|
|
120
|
+
].join('\n');
|
|
121
|
+
console.log(`CodeYam Error: ${msg}`);
|
|
122
|
+
throw new Error(msg);
|
|
126
123
|
}
|
|
127
124
|
|
|
128
125
|
// Add newly created entity to context
|
|
@@ -91,6 +91,10 @@ export default async function analyzeChange({
|
|
|
91
91
|
// Structure phase: CPU-intensive, serialize via semaphore if provided
|
|
92
92
|
if (!steps || steps.includes(Step.Structure)) {
|
|
93
93
|
if (structureSemaphore) {
|
|
94
|
+
awsLogDebugLevel(
|
|
95
|
+
1,
|
|
96
|
+
`Waiting for structure semaphore for ${entity.name}...`,
|
|
97
|
+
);
|
|
94
98
|
await structureSemaphore.acquire();
|
|
95
99
|
}
|
|
96
100
|
try {
|
|
@@ -58,6 +58,10 @@ export default async function analyzeInitial({
|
|
|
58
58
|
// Structure phase: CPU-intensive, serialize via semaphore if provided
|
|
59
59
|
if (!steps || steps.includes(Step.Structure)) {
|
|
60
60
|
if (structureSemaphore) {
|
|
61
|
+
awsLogDebugLevel(
|
|
62
|
+
1,
|
|
63
|
+
`Waiting for structure semaphore for ${entity.name}...`,
|
|
64
|
+
);
|
|
61
65
|
await structureSemaphore.acquire();
|
|
62
66
|
}
|
|
63
67
|
try {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"author": "",
|
|
12
12
|
"license": "ISC",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@aws-sdk/client-codebuild": "^3.
|
|
14
|
+
"@aws-sdk/client-codebuild": "^3.1014.0",
|
|
15
15
|
"@aws-sdk/client-cloudwatch-logs": "^3.990.0",
|
|
16
16
|
"@aws-sdk/client-dynamodb": "^3.990.0",
|
|
17
17
|
"@aws-sdk/client-ecr": "^3.990.0",
|
|
@@ -173,21 +173,25 @@ export default async function loadAnalysis({
|
|
|
173
173
|
const queryTime = Date.now() - startTime;
|
|
174
174
|
|
|
175
175
|
if (!analysis) {
|
|
176
|
-
awsLog(
|
|
177
|
-
id
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
176
|
+
awsLog(
|
|
177
|
+
`CodeYam Error: Analysis not found${entityName ? ` for ${entityName}` : ''}${id ? ` (id=${id})` : ''}`,
|
|
178
|
+
null,
|
|
179
|
+
{
|
|
180
|
+
id,
|
|
181
|
+
analysisBranchId,
|
|
182
|
+
projectId,
|
|
183
|
+
fileId,
|
|
184
|
+
commitId,
|
|
185
|
+
entityName,
|
|
186
|
+
dependencyAnalyzedTreeSha,
|
|
187
|
+
analyzedTreeSha,
|
|
188
|
+
includeFile,
|
|
189
|
+
includeProject,
|
|
190
|
+
includeCommitAndBranch,
|
|
191
|
+
includeScenarios,
|
|
192
|
+
includeBranches,
|
|
193
|
+
},
|
|
194
|
+
);
|
|
191
195
|
return null;
|
|
192
196
|
}
|
|
193
197
|
|
|
@@ -7,6 +7,9 @@ import { getEntityBranchesAsJson } from './loadEntityBranches';
|
|
|
7
7
|
export interface loadEntityArgs {
|
|
8
8
|
projectId: string;
|
|
9
9
|
sha: string;
|
|
10
|
+
/** When true, suppress "Entity not found" log. Use when the caller expects
|
|
11
|
+
* the entity might not exist (e.g., findOrCreateEntity on fresh databases). */
|
|
12
|
+
silent?: boolean;
|
|
10
13
|
}
|
|
11
14
|
|
|
12
15
|
export interface loadEntityByNameAndPathArgs {
|
|
@@ -15,7 +18,11 @@ export interface loadEntityByNameAndPathArgs {
|
|
|
15
18
|
filePath: string;
|
|
16
19
|
}
|
|
17
20
|
|
|
18
|
-
export default async function loadEntity({
|
|
21
|
+
export default async function loadEntity({
|
|
22
|
+
projectId,
|
|
23
|
+
sha,
|
|
24
|
+
silent,
|
|
25
|
+
}: loadEntityArgs) {
|
|
19
26
|
const db = getDatabase();
|
|
20
27
|
|
|
21
28
|
try {
|
|
@@ -33,13 +40,17 @@ export default async function loadEntity({ projectId, sha }: loadEntityArgs) {
|
|
|
33
40
|
.executeTakeFirst();
|
|
34
41
|
|
|
35
42
|
if (!entity) {
|
|
36
|
-
//
|
|
37
|
-
// where
|
|
38
|
-
if (process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
|
|
39
|
-
awsLog(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
// Entity not found is expected in baseline mode (fresh DB) and in
|
|
44
|
+
// findOrCreateEntity where the caller creates the entity if missing.
|
|
45
|
+
if (!silent && process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
|
|
46
|
+
awsLog(
|
|
47
|
+
`CodeYam Error: Load Entity: Entity not found (sha=${sha?.substring(0, 12)})`,
|
|
48
|
+
null,
|
|
49
|
+
{
|
|
50
|
+
projectId,
|
|
51
|
+
sha,
|
|
52
|
+
},
|
|
53
|
+
);
|
|
43
54
|
}
|
|
44
55
|
return null;
|
|
45
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadAnalysis.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAA8B,YAAY,CAAC,EACzC,EAAE,EACF,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,GAChB,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"loadAnalysis.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAA8B,YAAY,CAAC,EACzC,EAAE,EACF,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,GAChB,EAAE,gBAAgB,8CAuLlB"}
|
|
@@ -91,7 +91,7 @@ export default async function loadAnalysis({ id, analysisBranchId, projectId, fi
|
|
|
91
91
|
const analysis = await query.executeTakeFirst();
|
|
92
92
|
const queryTime = Date.now() - startTime;
|
|
93
93
|
if (!analysis) {
|
|
94
|
-
awsLog(
|
|
94
|
+
awsLog(`CodeYam Error: Analysis not found${entityName ? ` for ${entityName}` : ''}${id ? ` (id=${id})` : ''}`, null, {
|
|
95
95
|
id,
|
|
96
96
|
analysisBranchId,
|
|
97
97
|
projectId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadAnalysis.js","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"loadAnalysis.js","sourceRoot":"","sources":["../../../../../database/src/lib/loadAnalysis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
export interface loadEntityArgs {
|
|
2
2
|
projectId: string;
|
|
3
3
|
sha: string;
|
|
4
|
+
/** When true, suppress "Entity not found" log. Use when the caller expects
|
|
5
|
+
* the entity might not exist (e.g., findOrCreateEntity on fresh databases). */
|
|
6
|
+
silent?: boolean;
|
|
4
7
|
}
|
|
5
8
|
export interface loadEntityByNameAndPathArgs {
|
|
6
9
|
projectId: string;
|
|
7
10
|
name: string;
|
|
8
11
|
filePath: string;
|
|
9
12
|
}
|
|
10
|
-
export default function loadEntity({ projectId, sha }: loadEntityArgs): Promise<import("~codeyam/types").Entity>;
|
|
13
|
+
export default function loadEntity({ projectId, sha, silent, }: loadEntityArgs): Promise<import("~codeyam/types").Entity>;
|
|
11
14
|
/**
|
|
12
15
|
* Load entity by name and file path instead of SHA.
|
|
13
16
|
* This is useful for E2E tests where we want to avoid hardcoding SHAs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadEntity.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadEntity.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"loadEntity.d.ts","sourceRoot":"","sources":["../../../../../database/src/lib/loadEntity.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ;oFACgF;IAChF,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAA8B,UAAU,CAAC,EACvC,SAAS,EACT,GAAG,EACH,MAAM,GACP,EAAE,cAAc,4CAyChB;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,SAAS,EACT,IAAI,EACJ,QAAQ,GACT,EAAE,2BAA2B,4CAwC7B"}
|
|
@@ -2,7 +2,7 @@ import { getDatabase } from './kysely/db';
|
|
|
2
2
|
import dbToEntity from './dbToEntity';
|
|
3
3
|
import { awsLog } from '~codeyam/utils';
|
|
4
4
|
import { getEntityBranchesAsJson } from './loadEntityBranches';
|
|
5
|
-
export default async function loadEntity({ projectId, sha }) {
|
|
5
|
+
export default async function loadEntity({ projectId, sha, silent, }) {
|
|
6
6
|
const db = getDatabase();
|
|
7
7
|
try {
|
|
8
8
|
const entity = await db
|
|
@@ -14,10 +14,10 @@ export default async function loadEntity({ projectId, sha }) {
|
|
|
14
14
|
.where('entities.sha', '=', sha)
|
|
15
15
|
.executeTakeFirst();
|
|
16
16
|
if (!entity) {
|
|
17
|
-
//
|
|
18
|
-
// where
|
|
19
|
-
if (process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
|
|
20
|
-
awsLog(
|
|
17
|
+
// Entity not found is expected in baseline mode (fresh DB) and in
|
|
18
|
+
// findOrCreateEntity where the caller creates the entity if missing.
|
|
19
|
+
if (!silent && process.env.CODEYAM_E2E_BASELINE_MODE !== 'true') {
|
|
20
|
+
awsLog(`CodeYam Error: Load Entity: Entity not found (sha=${sha?.substring(0, 12)})`, null, {
|
|
21
21
|
projectId,
|
|
22
22
|
sha,
|
|
23
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadEntity.js","sourceRoot":"","sources":["../../../../../database/src/lib/loadEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"loadEntity.js","sourceRoot":"","sources":["../../../../../database/src/lib/loadEntity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
export default function rsyncCopy({ sourcePath, destinationPath, excludes, keepExisting, silent, extraArgs, }: {
|
|
1
|
+
export default function rsyncCopy({ sourcePath, destinationPath, excludes, keepExisting, silent, extraArgs, timeoutMs, }: {
|
|
2
2
|
sourcePath: string;
|
|
3
3
|
destinationPath: string;
|
|
4
4
|
excludes?: string[];
|
|
5
5
|
keepExisting?: boolean;
|
|
6
6
|
silent?: boolean;
|
|
7
7
|
extraArgs?: string[];
|
|
8
|
+
/** Timeout in milliseconds. Defaults to 300s (5 min). */
|
|
9
|
+
timeoutMs?: number;
|
|
8
10
|
}): Promise<void>;
|
|
9
11
|
//# sourceMappingURL=rsyncCopy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rsyncCopy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAqFA,wBAA8B,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAa,EACb,YAAoB,EACpB,MAAc,EACd,SAAc,
|
|
1
|
+
{"version":3,"file":"rsyncCopy.d.ts","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAqFA,wBAA8B,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAa,EACb,YAAoB,EACpB,MAAc,EACd,SAAc,EACd,SAAmB,GACpB,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0GhB"}
|
|
@@ -71,7 +71,7 @@ function tryApfsClone({ sourcePath, destinationPath, excludes, silent, }) {
|
|
|
71
71
|
return false;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
-
export default async function rsyncCopy({ sourcePath, destinationPath, excludes = [], keepExisting = false, silent = false, extraArgs = [], }) {
|
|
74
|
+
export default async function rsyncCopy({ sourcePath, destinationPath, excludes = [], keepExisting = false, silent = false, extraArgs = [], timeoutMs = 300000, }) {
|
|
75
75
|
const startTime = Date.now();
|
|
76
76
|
// On macOS, try APFS copy-on-write clone first (near-instant).
|
|
77
77
|
// Skip when extraArgs are provided since those are rsync-specific flags
|
|
@@ -110,7 +110,23 @@ export default async function rsyncCopy({ sourcePath, destinationPath, excludes
|
|
|
110
110
|
}
|
|
111
111
|
rsyncArgs.push(source, dest);
|
|
112
112
|
const rsyncProcess = spawn('rsync', rsyncArgs);
|
|
113
|
+
let settled = false;
|
|
114
|
+
const timer = timeoutMs
|
|
115
|
+
? setTimeout(() => {
|
|
116
|
+
if (!settled) {
|
|
117
|
+
settled = true;
|
|
118
|
+
rsyncProcess.kill('SIGKILL');
|
|
119
|
+
const duration = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
120
|
+
reject(new Error(`rsync timed out after ${duration}s syncing ${sourcePath} → ${destinationPath}`));
|
|
121
|
+
}
|
|
122
|
+
}, timeoutMs)
|
|
123
|
+
: undefined;
|
|
113
124
|
rsyncProcess.on('exit', (code) => {
|
|
125
|
+
if (settled)
|
|
126
|
+
return;
|
|
127
|
+
settled = true;
|
|
128
|
+
if (timer)
|
|
129
|
+
clearTimeout(timer);
|
|
114
130
|
if (code === 0) {
|
|
115
131
|
if (!silent) {
|
|
116
132
|
const duration = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
@@ -126,6 +142,11 @@ export default async function rsyncCopy({ sourcePath, destinationPath, excludes
|
|
|
126
142
|
}
|
|
127
143
|
});
|
|
128
144
|
rsyncProcess.on('error', (error) => {
|
|
145
|
+
if (settled)
|
|
146
|
+
return;
|
|
147
|
+
settled = true;
|
|
148
|
+
if (timer)
|
|
149
|
+
clearTimeout(timer);
|
|
129
150
|
if (!silent) {
|
|
130
151
|
console.log('Error occurred:', error);
|
|
131
152
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rsyncCopy.js","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B;;;;;GAKG;AACH,SAAS,YAAY,CAAC,EACpB,UAAU,EACV,eAAe,EACf,QAAQ,EACR,MAAM,GAMP;IACC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEhD,oDAAoD;IACpD,gEAAgE;IAChE,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;YAC9C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,iEAAiE;gBACjE,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,2EAA2E;QAC3E,QAAQ,CAAC,aAAa,UAAU,MAAM,eAAe,GAAG,EAAE;YACxD,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,MAAO,EAAE,uBAAuB;SAC1C,CAAC,CAAC;QAEH,uCAAuC;QACvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,qCAAqC;gBACrC,IAAI,CAAC;oBACH,QAAQ,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,EAAE;wBACrD,KAAK,EAAE,MAAM;wBACb,KAAK,EAAE,SAAS;qBACjB,CAAC,CAAC;gBACL,CAAC;gBAAC,MAAM,CAAC;oBACP,8BAA8B;gBAChC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;gBACnD,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5B,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CACT,oCAAoC,UAAU,OAAO,eAAe,EAAE,CACvE,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,6BAA6B;QAC7B,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/C,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CAAC,EACtC,UAAU,EACV,eAAe,EACf,QAAQ,GAAG,EAAE,EACb,YAAY,GAAG,KAAK,EACpB,MAAM,GAAG,KAAK,EACd,SAAS,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"rsyncCopy.js","sourceRoot":"","sources":["../../../../../src/lib/fs/rsyncCopy.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,6 +90,7 @@ export default async function rsyncCopy({
|
|
|
90
90
|
keepExisting = false,
|
|
91
91
|
silent = false,
|
|
92
92
|
extraArgs = [],
|
|
93
|
+
timeoutMs = 300_000,
|
|
93
94
|
}: {
|
|
94
95
|
sourcePath: string;
|
|
95
96
|
destinationPath: string;
|
|
@@ -97,6 +98,8 @@ export default async function rsyncCopy({
|
|
|
97
98
|
keepExisting?: boolean;
|
|
98
99
|
silent?: boolean;
|
|
99
100
|
extraArgs?: string[];
|
|
101
|
+
/** Timeout in milliseconds. Defaults to 300s (5 min). */
|
|
102
|
+
timeoutMs?: number;
|
|
100
103
|
}): Promise<void> {
|
|
101
104
|
const startTime = Date.now();
|
|
102
105
|
|
|
@@ -147,7 +150,27 @@ export default async function rsyncCopy({
|
|
|
147
150
|
|
|
148
151
|
const rsyncProcess = spawn('rsync', rsyncArgs);
|
|
149
152
|
|
|
153
|
+
let settled = false;
|
|
154
|
+
const timer = timeoutMs
|
|
155
|
+
? setTimeout(() => {
|
|
156
|
+
if (!settled) {
|
|
157
|
+
settled = true;
|
|
158
|
+
rsyncProcess.kill('SIGKILL');
|
|
159
|
+
const duration = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
160
|
+
reject(
|
|
161
|
+
new Error(
|
|
162
|
+
`rsync timed out after ${duration}s syncing ${sourcePath} → ${destinationPath}`,
|
|
163
|
+
),
|
|
164
|
+
);
|
|
165
|
+
}
|
|
166
|
+
}, timeoutMs)
|
|
167
|
+
: undefined;
|
|
168
|
+
|
|
150
169
|
rsyncProcess.on('exit', (code) => {
|
|
170
|
+
if (settled) return;
|
|
171
|
+
settled = true;
|
|
172
|
+
if (timer) clearTimeout(timer);
|
|
173
|
+
|
|
151
174
|
if (code === 0) {
|
|
152
175
|
if (!silent) {
|
|
153
176
|
const duration = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
@@ -173,6 +196,10 @@ export default async function rsyncCopy({
|
|
|
173
196
|
});
|
|
174
197
|
|
|
175
198
|
rsyncProcess.on('error', (error) => {
|
|
199
|
+
if (settled) return;
|
|
200
|
+
settled = true;
|
|
201
|
+
if (timer) clearTimeout(timer);
|
|
202
|
+
|
|
176
203
|
if (!silent) {
|
|
177
204
|
console.log('Error occurred:', error);
|
|
178
205
|
}
|
|
@@ -120,6 +120,32 @@ export default async function analyzeFileEntities({
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
|
+
|
|
124
|
+
// If still not found at the old file path, search all project files.
|
|
125
|
+
// This handles entity extraction: e.g., MyComponent was moved from
|
|
126
|
+
// src/library/MonolithPage.tsx to src/components/MyComponent.tsx.
|
|
127
|
+
if (!basicEntity && dbEntity) {
|
|
128
|
+
for (const f of filesToIterate) {
|
|
129
|
+
if (f.path === dbEntity.filePath) continue; // already checked above
|
|
130
|
+
// Ensure entities are loaded for this file when using fileStore
|
|
131
|
+
let fileToCheck = f;
|
|
132
|
+
if (fileStore && !fileStore.isEntitiesLoaded(f.path)) {
|
|
133
|
+
fileToCheck = await fileStore.ensureEntities(f.path);
|
|
134
|
+
}
|
|
135
|
+
const match = (fileToCheck.entities || []).find(
|
|
136
|
+
(e) => e.name === dbEntity.name,
|
|
137
|
+
);
|
|
138
|
+
if (match) {
|
|
139
|
+
console.log(
|
|
140
|
+
`CodeYam: Entity "${dbEntity.name}" moved from ${dbEntity.filePath} to ${fileToCheck.path} (old SHA: ${entitySha}, new SHA: ${match.sha})`,
|
|
141
|
+
);
|
|
142
|
+
match.file = fileToCheck;
|
|
143
|
+
basicEntity = match;
|
|
144
|
+
entityShas[ii] = match.sha;
|
|
145
|
+
break;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
123
149
|
}
|
|
124
150
|
|
|
125
151
|
if (!basicEntity) {
|
|
@@ -60,6 +60,28 @@ export default async function analyzeFileEntities({ project, projectAnalyzer, co
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
+
// If still not found at the old file path, search all project files.
|
|
64
|
+
// This handles entity extraction: e.g., MyComponent was moved from
|
|
65
|
+
// src/library/MonolithPage.tsx to src/components/MyComponent.tsx.
|
|
66
|
+
if (!basicEntity && dbEntity) {
|
|
67
|
+
for (const f of filesToIterate) {
|
|
68
|
+
if (f.path === dbEntity.filePath)
|
|
69
|
+
continue; // already checked above
|
|
70
|
+
// Ensure entities are loaded for this file when using fileStore
|
|
71
|
+
let fileToCheck = f;
|
|
72
|
+
if (fileStore && !fileStore.isEntitiesLoaded(f.path)) {
|
|
73
|
+
fileToCheck = await fileStore.ensureEntities(f.path);
|
|
74
|
+
}
|
|
75
|
+
const match = (fileToCheck.entities || []).find((e) => e.name === dbEntity.name);
|
|
76
|
+
if (match) {
|
|
77
|
+
console.log(`CodeYam: Entity "${dbEntity.name}" moved from ${dbEntity.filePath} to ${fileToCheck.path} (old SHA: ${entitySha}, new SHA: ${match.sha})`);
|
|
78
|
+
match.file = fileToCheck;
|
|
79
|
+
basicEntity = match;
|
|
80
|
+
entityShas[ii] = match.sha;
|
|
81
|
+
break;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
63
85
|
}
|
|
64
86
|
if (!basicEntity) {
|
|
65
87
|
// This should be very rare now that we have early validation in prep.ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeFileEntities.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/analyzeFileEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,kBAAkB,EAClB,eAAe,EAEf,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAkB3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAChD,OAAO,EACP,eAAe,EACf,MAAM,EACN,QAAQ,EACR,UAAU,EACV,WAAW,EACX,eAAe,EACf,KAAK,EACL,OAAO,EACP,SAAS,EACT,mBAAmB,GACK;;IACxB,2EAA2E;IAC3E,uFAAuF;IACvF,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,KAAK,MAAM,EAAE,CAAC;QACrD,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,0DAA0D;IAC1D,kGAAkG;IAClG,MAAM,cAAc,GAAG,SAAS;QAC9B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAChC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAClB,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAC1C,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACZ,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3D,OAAO,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC3B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA+B,CAChC,CAAC;IAEF,OAAO,CAAC,GAAG,CACT,4DAA4D,UAAU,CAAC,MAAM,cAAc,CAC5F,CAAC;IAEF,qCAAqC;IACrC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,WAAW,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;QAE5C,mFAAmF;QACnF,qGAAqG;QACrG,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CACT,gEAAgE,SAAS,EAAE,CAC5E,CAAC;YAEF,qEAAqE;YACrE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC;gBAChC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,GAAG,EAAE,SAAS;aACf,CAAC,CAAC;YAEH,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBAClC,uEAAuE;gBACvE,IAAI,IAAI,GAAG,SAAS;oBAClB,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBACxC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAE5D,2CAA2C;gBAC3C,IAAI,IAAI,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBAChE,IAAI,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnD,CAAC;gBAED,IAAI,IAAI,EAAE,CAAC;oBACT,iDAAiD;oBACjD,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAChC,CAAC;oBAEF,IAAI,cAAc,EAAE,CAAC;wBACnB,OAAO,CAAC,GAAG,CACT,iDAAiD,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,QAAQ,cAAc,SAAS,cAAc,cAAc,CAAC,GAAG,GAAG,CACjJ,CAAC;wBACF,cAAc,CAAC,IAAI,GAAG,IAAI,CAAC;wBAC3B,WAAW,GAAG,cAAc,CAAC;wBAC7B,qDAAqD;wBACrD,UAAU,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC;oBACtC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,wEAAwE;YACxE,kFAAkF;YAClF,MAAM,YAAY,GAAG;gBACnB,KAAK,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;gBACrB,4DAA4D;gBAC5D,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;gBACnB,EAAE;gBACF,eAAe,SAAS,EAAE;gBAC1B,cAAc,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK;gBAC7C,EAAE;gBACF,oEAAoE;gBACpE,gCAAgC;gBAChC,oEAAoE;gBACpE,uDAAuD;gBACvD,8DAA8D;gBAC9D,EAAE;gBACF,gBAAgB;gBAChB,kBAAkB;gBAClB,iDAAiD;gBACjD,8DAA8D;gBAC9D,uEAAuE;gBACvE,EAAE;gBACF,uBAAuB;gBACvB,8CAA8C;gBAC9C,yDAAyD;gBACzD,EAAE;gBACF,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;aACpB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEb,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,6BAA6B,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,wCAAwC,CAChG,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAEnC,MAAM,YAAY,GAAG,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CACT,kDAAkD,EAClD,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CACpC,CAAC;YACF,MAAM,CAAC,QAAQ,KAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;YACvB,MAAA,MAAM,CAAC,QAAQ,EAAC,YAAY,QAAZ,YAAY,GAAK,EAAE,EAAC;YACpC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7C,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;YACtC,IAAI;YACJ,QAAQ;YACR,QAAQ,EAAE,MAAM,EAAE,EAAE;YACpB,UAAU,EAAE,IAAI;YAChB,YAAY;YACZ,eAAe;YACf,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CACT,+CAA+C,EAC/C,IAAI,CAAC,IAAI,EACT,IAAI,CACL,CAAC;YACF,SAAS;QACX,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE1B,IACE,MAAM;YACN,CAAC,QAAQ,CAAC,MAAM,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAC5D,CAAC;YACD,mEAAmE;YACnE,sEAAsE;YACtE,oEAAoE;YACpE,MAAM,CAAC,QAAQ,GAAG,MAAM,oBAAoB,CAAC;gBAC3C,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,eAAe,EAAE;oBACf,WAAW,EAAE,QAAQ,CAAC,MAAM;iBAC7B;aACF,CAAC,CAAC;QACL,CAAC;QAED,sCAAsC;QACtC,MAAM,eAAe,CAAC;YACpB,MAAM;YACN,QAAQ,EAAE,MAAM,EAAE,EAAE;YACpB,QAAQ;YACR,OAAO;YACP,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAG,CACT,uEAAuE,QAAQ,CAAC,MAAM,WAAW,CAClG,CAAC;IAEF,yDAAyD;IACzD,MAAM,kBAAkB,CAAC;QACvB,QAAQ;QACR,MAAM;QACN,OAAO;QACP,eAAe;QACf,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CACT,sDAAsD,QAAQ,CAAC,MAAM,kBAAkB,CACxF,CAAC;IAEF,IAAI,eAAe,EAAE,CAAC;QACpB,+BAA+B;QAC/B,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;YAC9B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YAExB,MAAM,SAAS,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACpD,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;YAErD,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC7D,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;YACtD,CAAC;YACD,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACtC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;SAAM,CAAC;QACN,wBAAwB;QACxB,MAAM,eAAe,CAAC;YACpB,YAAY,EAAE,QAAQ;YACtB,OAAO;YACP,OAAO;YACP,eAAe;YACf,MAAM;YACN,OAAO,EAAE;gBACP,QAAQ;gBACR,WAAW;gBACX,KAAK;gBACL,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK;gBAC1B,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK;gBAC1B,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS;gBACjC,mBAAmB;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAG,CACT,wDAAwD,QAAQ,CAAC,MAAM,WAAW,CACnF,CAAC;IAEF,0BAA0B;IAC1B,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,aAAa,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACL,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"analyzeFileEntities.js","sourceRoot":"","sources":["../../../../../../../background/src/lib/virtualized/project/analyzeFileEntities.ts"],"names":[],"mappings":"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"}
|