@codeyam/codeyam-cli 0.1.0-staging.8778565 → 0.1.0-staging.8b51541
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/packages/database/src/lib/kysely/tables/editorScenariosTable.ts +56 -0
- package/analyzer-template/packages/database/src/lib/loadEntities.ts +0 -6
- package/analyzer-template/packages/database/src/lib/updateCommitMetadata.ts +0 -65
- package/analyzer-template/packages/github/dist/database/src/lib/kysely/tables/editorScenariosTable.d.ts +3 -0
- package/analyzer-template/packages/github/dist/database/src/lib/kysely/tables/editorScenariosTable.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/kysely/tables/editorScenariosTable.js +56 -0
- package/analyzer-template/packages/github/dist/database/src/lib/kysely/tables/editorScenariosTable.js.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntities.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntities.js +0 -6
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntities.js.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/updateCommitMetadata.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/updateCommitMetadata.js +0 -25
- package/analyzer-template/packages/github/dist/database/src/lib/updateCommitMetadata.js.map +1 -1
- package/codeyam-cli/src/commands/__tests__/editor.stepDispatch.test.js +45 -0
- package/codeyam-cli/src/commands/__tests__/editor.stepDispatch.test.js.map +1 -0
- package/codeyam-cli/src/commands/__tests__/init.gitignore.test.js +101 -47
- package/codeyam-cli/src/commands/__tests__/init.gitignore.test.js.map +1 -1
- package/codeyam-cli/src/commands/editor.js +799 -211
- package/codeyam-cli/src/commands/editor.js.map +1 -1
- package/codeyam-cli/src/commands/init.js +68 -34
- package/codeyam-cli/src/commands/init.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/analyzerFinalization.test.js +173 -0
- package/codeyam-cli/src/utils/__tests__/analyzerFinalization.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/editorApi.test.js +18 -8
- package/codeyam-cli/src/utils/__tests__/editorApi.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorAudit.test.js +353 -1
- package/codeyam-cli/src/utils/__tests__/editorAudit.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorLoaderHelpers.test.js +128 -1
- package/codeyam-cli/src/utils/__tests__/editorLoaderHelpers.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorPreview.test.js +88 -1
- package/codeyam-cli/src/utils/__tests__/editorPreview.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorProxySession.test.js +47 -1
- package/codeyam-cli/src/utils/__tests__/editorProxySession.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorScenarios.test.js +785 -1
- package/codeyam-cli/src/utils/__tests__/editorScenarios.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/entityChangeStatus.test.js +63 -1
- package/codeyam-cli/src/utils/__tests__/entityChangeStatus.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/parseRegisterArg.test.js +30 -2
- package/codeyam-cli/src/utils/__tests__/parseRegisterArg.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/scenarioCoverage.test.js +227 -0
- package/codeyam-cli/src/utils/__tests__/scenarioCoverage.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/scenariosManifest.test.js +426 -218
- package/codeyam-cli/src/utils/__tests__/scenariosManifest.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/setupClaudeCodeSettings.test.js +1 -0
- package/codeyam-cli/src/utils/__tests__/setupClaudeCodeSettings.test.js.map +1 -1
- package/codeyam-cli/src/utils/analyzer.js +9 -0
- package/codeyam-cli/src/utils/analyzer.js.map +1 -1
- package/codeyam-cli/src/utils/analyzerFinalization.js +100 -0
- package/codeyam-cli/src/utils/analyzerFinalization.js.map +1 -0
- package/codeyam-cli/src/utils/backgroundServer.js +2 -8
- package/codeyam-cli/src/utils/backgroundServer.js.map +1 -1
- package/codeyam-cli/src/utils/database.js +37 -2
- package/codeyam-cli/src/utils/database.js.map +1 -1
- package/codeyam-cli/src/utils/editorApi.js +11 -5
- package/codeyam-cli/src/utils/editorApi.js.map +1 -1
- package/codeyam-cli/src/utils/editorAudit.js +51 -0
- package/codeyam-cli/src/utils/editorAudit.js.map +1 -1
- package/codeyam-cli/src/utils/editorLoaderHelpers.js +32 -0
- package/codeyam-cli/src/utils/editorLoaderHelpers.js.map +1 -1
- package/codeyam-cli/src/utils/editorPreview.js +31 -0
- package/codeyam-cli/src/utils/editorPreview.js.map +1 -1
- package/codeyam-cli/src/utils/editorScenarios.js +261 -0
- package/codeyam-cli/src/utils/editorScenarios.js.map +1 -1
- package/codeyam-cli/src/utils/entityChangeStatus.js +4 -2
- package/codeyam-cli/src/utils/entityChangeStatus.js.map +1 -1
- package/codeyam-cli/src/utils/entityChangeStatus.server.js +34 -0
- package/codeyam-cli/src/utils/entityChangeStatus.server.js.map +1 -1
- package/codeyam-cli/src/utils/parseRegisterArg.js.map +1 -1
- package/codeyam-cli/src/utils/progress.js +2 -2
- package/codeyam-cli/src/utils/progress.js.map +1 -1
- package/codeyam-cli/src/utils/scenarioCoverage.js +75 -0
- package/codeyam-cli/src/utils/scenarioCoverage.js.map +1 -0
- package/codeyam-cli/src/utils/scenariosManifest.js +204 -75
- package/codeyam-cli/src/utils/scenariosManifest.js.map +1 -1
- package/codeyam-cli/src/utils/setupClaudeCodeSettings.js +1 -0
- package/codeyam-cli/src/utils/setupClaudeCodeSettings.js.map +1 -1
- package/codeyam-cli/src/utils/simulationGateMiddleware.js +8 -1
- package/codeyam-cli/src/utils/simulationGateMiddleware.js.map +1 -1
- package/codeyam-cli/src/utils/slugUtils.js +25 -0
- package/codeyam-cli/src/utils/slugUtils.js.map +1 -0
- package/codeyam-cli/src/utils/syncMocksMiddleware.js +2 -2
- package/codeyam-cli/src/utils/syncMocksMiddleware.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js +40 -0
- package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js.map +1 -0
- package/codeyam-cli/src/webserver/__tests__/editorProxy.test.js +157 -0
- package/codeyam-cli/src/webserver/__tests__/editorProxy.test.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/idleDetector.test.js +146 -0
- package/codeyam-cli/src/webserver/__tests__/idleDetector.test.js.map +1 -0
- package/codeyam-cli/src/webserver/app/lib/clientErrors.js +65 -0
- package/codeyam-cli/src/webserver/app/lib/clientErrors.js.map +1 -0
- package/codeyam-cli/src/webserver/app/lib/git.js +3 -2
- package/codeyam-cli/src/webserver/app/lib/git.js.map +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/{ScenarioViewer-0DY_NKil.js → ScenarioViewer-TSD3C211.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-scenario-coverage-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-session-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/{dev.empty-Csi0_PMl.js → dev.empty-Ii3inc0_.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/editor-16o0AIFV.js +15 -0
- package/codeyam-cli/src/webserver/build/client/assets/editorPreview-7Uga8I59.js +41 -0
- package/codeyam-cli/src/webserver/build/client/assets/{entity._sha._-BF4oLwaE.js → entity._sha._-DwCV5__E.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/{entity._sha.scenarios._scenarioId.dev-C7YX6r3H.js → entity._sha.scenarios._scenarioId.dev-BwKcai0j.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/entity._sha.scenarios._scenarioId.fullscreen-CHMiAog3.js +6 -0
- package/codeyam-cli/src/webserver/build/client/assets/globals-CQPR0pFR.css +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/manifest-76e7b62c.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/memory-9gnxSZlb.js +101 -0
- package/codeyam-cli/src/webserver/build/client/assets/{root-ClvYBUSA.js → root-DBjt6o04.js} +3 -3
- package/codeyam-cli/src/webserver/build/client/assets/useCustomSizes-C-_hOl_g.js +1 -0
- package/codeyam-cli/src/webserver/build/client/sound-test.html +98 -0
- package/codeyam-cli/src/webserver/build/server/assets/index-DsZjKspK.js +1 -0
- package/codeyam-cli/src/webserver/build/server/assets/init-DdqKD2p4.js +10 -0
- package/codeyam-cli/src/webserver/build/server/assets/server-build-CKKeWtVK.js +444 -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/editorProxy.js +99 -7
- package/codeyam-cli/src/webserver/editorProxy.js.map +1 -1
- package/codeyam-cli/src/webserver/idleDetector.js +73 -0
- package/codeyam-cli/src/webserver/idleDetector.js.map +1 -0
- package/codeyam-cli/src/webserver/public/sound-test.html +98 -0
- package/codeyam-cli/src/webserver/server.js +46 -4
- package/codeyam-cli/src/webserver/server.js.map +1 -1
- package/codeyam-cli/src/webserver/terminalServer.js +68 -29
- package/codeyam-cli/src/webserver/terminalServer.js.map +1 -1
- package/codeyam-cli/templates/chrome-extension-react/README.md +46 -0
- package/codeyam-cli/templates/chrome-extension-react/package.json +1 -0
- package/codeyam-cli/templates/codeyam-editor-claude.md +84 -5
- package/codeyam-cli/templates/editor-step-hook.py +14 -8
- package/codeyam-cli/templates/expo-react-native/README.md +41 -0
- package/codeyam-cli/templates/expo-react-native/package.json +1 -0
- package/codeyam-cli/templates/nextjs-prisma-sqlite/DATABASE.md +14 -0
- package/codeyam-cli/templates/nextjs-prisma-sqlite/README.md +53 -0
- package/codeyam-cli/templates/nextjs-prisma-sqlite/package.json +1 -0
- package/codeyam-cli/templates/nextjs-prisma-supabase/README.md +52 -0
- package/codeyam-cli/templates/nextjs-prisma-supabase/package.json +1 -0
- package/codeyam-cli/templates/skills/codeyam-dev-mode/SKILL.md +1 -1
- package/codeyam-cli/templates/skills/codeyam-editor/SKILL.md +14 -10
- package/package.json +1 -1
- package/packages/database/src/lib/kysely/tables/editorScenariosTable.js +56 -0
- package/packages/database/src/lib/kysely/tables/editorScenariosTable.js.map +1 -1
- package/packages/database/src/lib/loadEntities.js +0 -6
- package/packages/database/src/lib/loadEntities.js.map +1 -1
- package/packages/database/src/lib/updateCommitMetadata.js +0 -25
- package/packages/database/src/lib/updateCommitMetadata.js.map +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/editor-DgN1LTTt.js +0 -10
- package/codeyam-cli/src/webserver/build/client/assets/editorPreview-BLQMSKZa.js +0 -41
- package/codeyam-cli/src/webserver/build/client/assets/entity._sha.scenarios._scenarioId.fullscreen-CF164ouH.js +0 -6
- package/codeyam-cli/src/webserver/build/client/assets/globals-BkWJ_UNc.css +0 -1
- package/codeyam-cli/src/webserver/build/client/assets/manifest-c26eb85b.js +0 -1
- package/codeyam-cli/src/webserver/build/client/assets/memory-Bl2rpw8u.js +0 -96
- package/codeyam-cli/src/webserver/build/client/assets/useCustomSizes-CrAK28Bc.js +0 -1
- package/codeyam-cli/src/webserver/build/server/assets/index-DflIr5SD.js +0 -1
- package/codeyam-cli/src/webserver/build/server/assets/server-build-OhKy839M.js +0 -416
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { pageNameFromUrl } from "./entityChangeStatus.js";
|
|
2
|
+
/**
|
|
3
|
+
* Classify scenarios as stale or fresh based on when they were captured
|
|
4
|
+
* relative to when the current feature started.
|
|
5
|
+
*
|
|
6
|
+
* A scenario is "stale" if:
|
|
7
|
+
* - It belongs to a page entity that is new/edited/impacted
|
|
8
|
+
* - It was captured BEFORE the current feature started
|
|
9
|
+
*
|
|
10
|
+
* A page is "uncovered" if:
|
|
11
|
+
* - It has a new/edited/impacted entity
|
|
12
|
+
* - It has NO scenarios at all (not even stale ones)
|
|
13
|
+
*/
|
|
14
|
+
export function classifyScenarioCoverage(scenarios, entityChangeStatus, pageEntityNames, featureStartedAt) {
|
|
15
|
+
// Convert ISO timestamp to SQLite format for comparison
|
|
16
|
+
const featureTs = featureStartedAt
|
|
17
|
+
? featureStartedAt.replace('T', ' ').replace(/\.\d{3}Z$/, '')
|
|
18
|
+
: null;
|
|
19
|
+
const staleScenarios = [];
|
|
20
|
+
const freshScenarios = [];
|
|
21
|
+
const coveredPageEntities = new Set();
|
|
22
|
+
for (const row of scenarios) {
|
|
23
|
+
// Determine entity name for this scenario
|
|
24
|
+
let entityName = null;
|
|
25
|
+
if (row.component_name) {
|
|
26
|
+
entityName = row.component_name;
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
entityName = pageNameFromUrl(row.url);
|
|
30
|
+
}
|
|
31
|
+
if (!entityName)
|
|
32
|
+
continue;
|
|
33
|
+
const status = entityChangeStatus[entityName];
|
|
34
|
+
if (!status)
|
|
35
|
+
continue; // Entity not changed — not relevant
|
|
36
|
+
// Only audit page/app scenarios, not component isolation scenarios
|
|
37
|
+
if (row.component_name)
|
|
38
|
+
continue;
|
|
39
|
+
const createdAt = row.created_at || '';
|
|
40
|
+
const isFresh = featureTs ? createdAt >= featureTs : true;
|
|
41
|
+
if (isFresh) {
|
|
42
|
+
freshScenarios.push({
|
|
43
|
+
name: row.name,
|
|
44
|
+
url: row.url,
|
|
45
|
+
entityName,
|
|
46
|
+
});
|
|
47
|
+
coveredPageEntities.add(entityName);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
staleScenarios.push({
|
|
51
|
+
name: row.name,
|
|
52
|
+
url: row.url,
|
|
53
|
+
entityName,
|
|
54
|
+
changeStatus: status.status,
|
|
55
|
+
lastCaptured: createdAt,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
// Find pages with changes but zero scenarios
|
|
60
|
+
const uncoveredPages = [];
|
|
61
|
+
for (const [entityName, status] of Object.entries(entityChangeStatus)) {
|
|
62
|
+
if (!pageEntityNames.has(entityName))
|
|
63
|
+
continue; // Only pages
|
|
64
|
+
if (coveredPageEntities.has(entityName))
|
|
65
|
+
continue; // Has fresh scenarios
|
|
66
|
+
// Check if it has ANY scenario (even stale)
|
|
67
|
+
const hasStale = staleScenarios.some((s) => s.entityName === entityName);
|
|
68
|
+
if (!hasStale) {
|
|
69
|
+
uncoveredPages.push({ entityName, changeStatus: status.status });
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
const pass = staleScenarios.length === 0 && uncoveredPages.length === 0;
|
|
73
|
+
return { staleScenarios, freshScenarios, uncoveredPages, pass };
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=scenarioCoverage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scenarioCoverage.js","sourceRoot":"","sources":["../../../../src/utils/scenarioCoverage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAmCvD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAAwB,EACxB,kBAA6E,EAC7E,eAA4B,EAC5B,gBAA+B;IAE/B,wDAAwD;IACxD,MAAM,SAAS,GAAG,gBAAgB;QAChC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QAC7D,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE9C,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC5B,0CAA0C;QAC1C,IAAI,UAAU,GAAkB,IAAI,CAAC;QACrC,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;YACvB,UAAU,GAAG,GAAG,CAAC,cAAc,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,MAAM,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM;YAAE,SAAS,CAAC,oCAAoC;QAE3D,mEAAmE;QACnE,IAAI,GAAG,CAAC,cAAc;YAAE,SAAS;QAEjC,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAE1D,IAAI,OAAO,EAAE,CAAC;YACZ,cAAc,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,UAAU;aACX,CAAC,CAAC;YACH,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,UAAU;gBACV,YAAY,EAAE,MAAM,CAAC,MAAM;gBAC3B,YAAY,EAAE,SAAS;aACxB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,6CAA6C;IAC7C,MAAM,cAAc,GAAoB,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS,CAAC,aAAa;QAC7D,IAAI,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,SAAS,CAAC,sBAAsB;QACzE,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,cAAc,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC;IAExE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;AAClE,CAAC"}
|
|
@@ -1,105 +1,234 @@
|
|
|
1
1
|
import * as fs from 'fs';
|
|
2
2
|
import * as path from 'path';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { resolveViewportWithProjectDefault } from "./editorScenarios.js";
|
|
4
|
+
/**
|
|
5
|
+
* Scan .codeyam/editor-scenarios/ for scenario files with embedded _metadata.
|
|
6
|
+
* Returns an array of { id, metadata } for each file that has _metadata.
|
|
7
|
+
*/
|
|
8
|
+
export function scanScenarioFiles(codeyamRoot) {
|
|
9
|
+
const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
|
|
10
|
+
let files;
|
|
11
|
+
try {
|
|
12
|
+
files = fs.readdirSync(scenariosDir);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return [];
|
|
16
|
+
}
|
|
17
|
+
const results = [];
|
|
18
|
+
for (const file of files) {
|
|
19
|
+
// Only process {uuid}.json files, skip .seed.json and subdirectories
|
|
20
|
+
if (!file.endsWith('.json') || file.endsWith('.seed.json'))
|
|
21
|
+
continue;
|
|
22
|
+
if (file === 'client-errors.json')
|
|
23
|
+
continue;
|
|
24
|
+
const filePath = path.join(scenariosDir, file);
|
|
25
|
+
try {
|
|
26
|
+
const stat = fs.statSync(filePath);
|
|
27
|
+
if (!stat.isFile())
|
|
28
|
+
continue;
|
|
29
|
+
const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
|
30
|
+
if (content._metadata) {
|
|
31
|
+
const id = file.replace(/\.json$/, '');
|
|
32
|
+
results.push({ id, metadata: content._metadata });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
// Skip unparseable files
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return results;
|
|
5
40
|
}
|
|
6
|
-
|
|
7
|
-
|
|
41
|
+
/**
|
|
42
|
+
* Write or update _metadata in a scenario data file.
|
|
43
|
+
* Preserves all existing data in the file, only adds/updates the _metadata key.
|
|
44
|
+
*/
|
|
45
|
+
export function writeScenarioMetadata(codeyamRoot, scenarioId, metadata) {
|
|
46
|
+
const filePath = path.join(codeyamRoot, '.codeyam', 'editor-scenarios', `${scenarioId}.json`);
|
|
47
|
+
let existing = {};
|
|
8
48
|
try {
|
|
9
|
-
|
|
10
|
-
return JSON.parse(content);
|
|
49
|
+
existing = JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
|
11
50
|
}
|
|
12
51
|
catch {
|
|
13
|
-
|
|
52
|
+
// File doesn't exist yet — will be created by the caller
|
|
53
|
+
return;
|
|
14
54
|
}
|
|
55
|
+
existing._metadata = metadata;
|
|
56
|
+
fs.writeFileSync(filePath, JSON.stringify(existing, null, 2), 'utf8');
|
|
15
57
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
58
|
+
/**
|
|
59
|
+
* Backfill _metadata into scenario files that don't have it yet.
|
|
60
|
+
* Uses database rows as the source of truth for metadata.
|
|
61
|
+
* Returns the number of files updated.
|
|
62
|
+
*/
|
|
63
|
+
export function backfillScenarioMetadata(codeyamRoot, dbRows) {
|
|
64
|
+
const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
|
|
65
|
+
let updated = 0;
|
|
66
|
+
for (const row of dbRows) {
|
|
67
|
+
const filePath = path.join(scenariosDir, `${row.id}.json`);
|
|
68
|
+
try {
|
|
69
|
+
const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
|
70
|
+
if (content._metadata)
|
|
71
|
+
continue; // Already has metadata
|
|
72
|
+
const r = row;
|
|
73
|
+
content._metadata = {
|
|
74
|
+
name: row.name,
|
|
75
|
+
description: row.description,
|
|
76
|
+
componentName: row.component_name,
|
|
77
|
+
componentPath: row.component_path,
|
|
78
|
+
url: row.url,
|
|
79
|
+
type: row.type,
|
|
80
|
+
screenshotPath: row.screenshot_path ?? null,
|
|
81
|
+
viewportWidth: row.viewport_width ?? null,
|
|
82
|
+
viewportHeight: row.viewport_height ?? null,
|
|
83
|
+
dimension: r.dimension ?? null,
|
|
84
|
+
dimensions: r.dimensions ? JSON.parse(r.dimensions) : null,
|
|
85
|
+
screenshotPaths: r.screenshot_paths
|
|
86
|
+
? JSON.parse(r.screenshot_paths)
|
|
87
|
+
: null,
|
|
88
|
+
createdAt: row.created_at,
|
|
89
|
+
updatedAt: row.updated_at,
|
|
90
|
+
};
|
|
91
|
+
fs.writeFileSync(filePath, JSON.stringify(content, null, 2), 'utf8');
|
|
92
|
+
updated++;
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
// File doesn't exist or isn't valid JSON — skip
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return updated;
|
|
21
99
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
100
|
+
/**
|
|
101
|
+
* Migrate scenario files with bad/legacy formats to the current format.
|
|
102
|
+
*
|
|
103
|
+
* Fixes:
|
|
104
|
+
* 1. Null viewport → resolved via dimension name / project default / 1280×720 fallback
|
|
105
|
+
* 2. Missing `dimensions` array → wrapped from single `dimension` string
|
|
106
|
+
* 3. Missing `screenshotPaths` map → built from single `screenshotPath` + dimension name
|
|
107
|
+
*
|
|
108
|
+
* This runs during editor startup to repair files created before viewport
|
|
109
|
+
* resolution was mandatory and before multi-dimension support was added.
|
|
110
|
+
* It is idempotent — files already in the correct format are skipped.
|
|
111
|
+
*/
|
|
112
|
+
export function migrateScenarioFormats(codeyamRoot) {
|
|
113
|
+
const entries = scanScenarioFiles(codeyamRoot);
|
|
114
|
+
if (entries.length === 0) {
|
|
115
|
+
return { scanned: 0, fixed: 0 };
|
|
32
116
|
}
|
|
33
|
-
|
|
34
|
-
|
|
117
|
+
const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
|
|
118
|
+
let fixed = 0;
|
|
119
|
+
for (const { id, metadata } of entries) {
|
|
120
|
+
let needsWrite = false;
|
|
121
|
+
const updated = { ...metadata };
|
|
122
|
+
// Fix 1: Null viewport → resolve from dimension / project default / fallback
|
|
123
|
+
if (!updated.viewportWidth || !updated.viewportHeight) {
|
|
124
|
+
const resolved = resolveViewportWithProjectDefault({
|
|
125
|
+
dimension: updated.dimension ?? undefined,
|
|
126
|
+
codeyamRoot,
|
|
127
|
+
});
|
|
128
|
+
updated.viewportWidth = resolved.width;
|
|
129
|
+
updated.viewportHeight = resolved.height;
|
|
130
|
+
needsWrite = true;
|
|
131
|
+
}
|
|
132
|
+
// Fix 2: Missing dimensions array → wrap single dimension
|
|
133
|
+
if (!updated.dimensions && updated.dimension) {
|
|
134
|
+
updated.dimensions = [updated.dimension];
|
|
135
|
+
needsWrite = true;
|
|
136
|
+
}
|
|
137
|
+
// Fix 3: Missing screenshotPaths map → build from single screenshotPath
|
|
138
|
+
if (!updated.screenshotPaths &&
|
|
139
|
+
updated.screenshotPath &&
|
|
140
|
+
updated.dimension) {
|
|
141
|
+
updated.screenshotPaths = { [updated.dimension]: updated.screenshotPath };
|
|
142
|
+
needsWrite = true;
|
|
143
|
+
}
|
|
144
|
+
if (needsWrite) {
|
|
145
|
+
// Bump updatedAt so the next syncScenarioFilesToDatabase picks up the fix
|
|
146
|
+
updated.updatedAt = new Date().toISOString();
|
|
147
|
+
const filePath = path.join(scenariosDir, `${id}.json`);
|
|
148
|
+
try {
|
|
149
|
+
const content = JSON.parse(fs.readFileSync(filePath, 'utf8'));
|
|
150
|
+
content._metadata = updated;
|
|
151
|
+
fs.writeFileSync(filePath, JSON.stringify(content, null, 2), 'utf8');
|
|
152
|
+
fixed++;
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
// Non-fatal — skip files that can't be read/written
|
|
156
|
+
}
|
|
157
|
+
}
|
|
35
158
|
}
|
|
36
|
-
|
|
37
|
-
writeManifest(codeyamRoot, manifest);
|
|
38
|
-
}
|
|
39
|
-
export function removeScenarioFromManifest(codeyamRoot, id) {
|
|
40
|
-
const manifest = readManifest(codeyamRoot);
|
|
41
|
-
if (!manifest)
|
|
42
|
-
return;
|
|
43
|
-
manifest.scenarios = manifest.scenarios.filter((s) => s.id !== id);
|
|
44
|
-
manifest.updatedAt = new Date().toISOString();
|
|
45
|
-
writeManifest(codeyamRoot, manifest);
|
|
159
|
+
return { scanned: entries.length, fixed };
|
|
46
160
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
: null,
|
|
62
|
-
createdAt: row.created_at,
|
|
63
|
-
updatedAt: row.updated_at,
|
|
64
|
-
})),
|
|
65
|
-
};
|
|
161
|
+
/**
|
|
162
|
+
* Remove a scenario data file (and its .seed.json if present).
|
|
163
|
+
*/
|
|
164
|
+
export function deleteScenarioFiles(codeyamRoot, scenarioId) {
|
|
165
|
+
const scenariosDir = path.join(codeyamRoot, '.codeyam', 'editor-scenarios');
|
|
166
|
+
for (const suffix of ['.json', '.seed.json']) {
|
|
167
|
+
const filePath = path.join(scenariosDir, `${scenarioId}${suffix}`);
|
|
168
|
+
try {
|
|
169
|
+
fs.unlinkSync(filePath);
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
// File might not exist
|
|
173
|
+
}
|
|
174
|
+
}
|
|
66
175
|
}
|
|
67
176
|
/**
|
|
68
|
-
* Sync
|
|
69
|
-
*
|
|
177
|
+
* Sync scenario files (with _metadata) to database.
|
|
178
|
+
* Scans the editor-scenarios/ directory for files with embedded _metadata.
|
|
70
179
|
*/
|
|
71
|
-
export async function
|
|
72
|
-
const
|
|
73
|
-
if (
|
|
180
|
+
export async function syncScenarioFilesToDatabase(codeyamRoot, projectId, existingRows, onInsert, onUpdate) {
|
|
181
|
+
const entries = scanScenarioFiles(codeyamRoot);
|
|
182
|
+
if (entries.length === 0) {
|
|
74
183
|
return { inserted: 0, updated: 0, skipped: 0 };
|
|
75
184
|
}
|
|
76
185
|
const existingMap = new Map(existingRows.map((r) => [r.id, r.updated_at]));
|
|
77
186
|
let inserted = 0;
|
|
78
187
|
let updated = 0;
|
|
79
188
|
let skipped = 0;
|
|
80
|
-
for (const
|
|
81
|
-
const existingUpdatedAt = existingMap.get(
|
|
189
|
+
for (const { id, metadata } of entries) {
|
|
190
|
+
const existingUpdatedAt = existingMap.get(id);
|
|
82
191
|
if (existingUpdatedAt === undefined) {
|
|
83
|
-
// Not in DB — insert
|
|
84
192
|
await onInsert({
|
|
85
|
-
id
|
|
193
|
+
id,
|
|
86
194
|
project_id: projectId,
|
|
87
|
-
name:
|
|
88
|
-
description:
|
|
89
|
-
component_name:
|
|
90
|
-
component_path:
|
|
91
|
-
url:
|
|
195
|
+
name: metadata.name,
|
|
196
|
+
description: metadata.description,
|
|
197
|
+
component_name: metadata.componentName,
|
|
198
|
+
component_path: metadata.componentPath,
|
|
199
|
+
url: metadata.url,
|
|
200
|
+
type: metadata.type,
|
|
201
|
+
screenshot_path: metadata.screenshotPath,
|
|
202
|
+
viewport_width: metadata.viewportWidth,
|
|
203
|
+
viewport_height: metadata.viewportHeight,
|
|
204
|
+
dimension: metadata.dimension ?? null,
|
|
205
|
+
dimensions: metadata.dimensions
|
|
206
|
+
? JSON.stringify(metadata.dimensions)
|
|
207
|
+
: null,
|
|
208
|
+
screenshot_paths: metadata.screenshotPaths
|
|
209
|
+
? JSON.stringify(metadata.screenshotPaths)
|
|
210
|
+
: null,
|
|
92
211
|
});
|
|
93
212
|
inserted++;
|
|
94
213
|
}
|
|
95
|
-
else if (
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
214
|
+
else if (metadata.updatedAt > existingUpdatedAt) {
|
|
215
|
+
await onUpdate(id, {
|
|
216
|
+
name: metadata.name,
|
|
217
|
+
description: metadata.description,
|
|
218
|
+
component_name: metadata.componentName,
|
|
219
|
+
component_path: metadata.componentPath,
|
|
220
|
+
url: metadata.url,
|
|
221
|
+
type: metadata.type,
|
|
222
|
+
screenshot_path: metadata.screenshotPath,
|
|
223
|
+
viewport_width: metadata.viewportWidth,
|
|
224
|
+
viewport_height: metadata.viewportHeight,
|
|
225
|
+
dimension: metadata.dimension ?? null,
|
|
226
|
+
dimensions: metadata.dimensions
|
|
227
|
+
? JSON.stringify(metadata.dimensions)
|
|
228
|
+
: null,
|
|
229
|
+
screenshot_paths: metadata.screenshotPaths
|
|
230
|
+
? JSON.stringify(metadata.screenshotPaths)
|
|
231
|
+
: null,
|
|
103
232
|
});
|
|
104
233
|
updated++;
|
|
105
234
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenariosManifest.js","sourceRoot":"","sources":["../../../../src/utils/scenariosManifest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"scenariosManifest.js","sourceRoot":"","sources":["../../../../src/utils/scenariosManifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupClaudeCodeSettings.js","sourceRoot":"","sources":["../../../../src/utils/setupClaudeCodeSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAO7B;;;;;;;;;GASG;AACH,MAAM,UAAU,uBAAuB,CACrC,WAAmB,EACnB,OAAwC;IAExC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,QAAQ,CAAC;IAEvC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QAEjE,+CAA+C;QAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,8CAA8C;QAC9C,IAAI,QAAQ,GAAwB,EAAE,CAAC;QACvC,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBACtD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CACV,4BAA4B,YAAY,wBAAwB,CACjE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC1B,QAAQ,CAAC,WAAW,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAChC,QAAQ,CAAC,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC;QAClC,CAAC;QAED,uCAAuC;QACvC,MAAM,eAAe,GAAG;YACtB,uBAAuB;YACvB,yBAAyB;YACzB,eAAe;YACf,iBAAiB;YACjB,mBAAmB;YACnB,mBAAmB;YACnB,oBAAoB;YACpB,mBAAmB;SACpB,CAAC;QAEF,sFAAsF;QACtF,MAAM,4BAA4B,GAAG;YACnC,sBAAsB;YACtB,oBAAoB;YACpB,sBAAsB;YACtB,qBAAqB;YACrB,uBAAuB;YACvB,yBAAyB;YACzB,eAAe;YACf,eAAe;YACf,gBAAgB;YAChB,eAAe;YACf,qBAAqB;YACrB,iBAAiB;YACjB,aAAa;YACb,cAAc;YACd,YAAY;YACZ,eAAe;YACf,eAAe;YACf,YAAY;YACZ,cAAc;YACd,eAAe;YACf,cAAc;YACd,cAAc;YACd,iBAAiB;YACjB,aAAa;YACb,gBAAgB;
|
|
1
|
+
{"version":3,"file":"setupClaudeCodeSettings.js","sourceRoot":"","sources":["../../../../src/utils/setupClaudeCodeSettings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { findProjectRoot } from "./project.js";
|
|
2
2
|
import { initializeEnvironment, requireBranchAndProject } from "./database.js";
|
|
3
|
+
import { generateProjectSlug } from "./slugUtils.js";
|
|
3
4
|
import Database from 'better-sqlite3';
|
|
4
5
|
import * as fs from 'fs';
|
|
5
6
|
import * as path from 'path';
|
|
@@ -68,9 +69,15 @@ export async function loadProjectForMiddleware(argv) {
|
|
|
68
69
|
if (!fs.existsSync(configPath))
|
|
69
70
|
return null;
|
|
70
71
|
const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
|
|
71
|
-
|
|
72
|
+
let { projectSlug } = config;
|
|
72
73
|
if (!projectSlug)
|
|
73
74
|
return null;
|
|
75
|
+
// Fix legacy local- slugs (included username, not stable across machines)
|
|
76
|
+
if (projectSlug.startsWith('local-')) {
|
|
77
|
+
projectSlug = generateProjectSlug(projectRoot);
|
|
78
|
+
config.projectSlug = projectSlug;
|
|
79
|
+
fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
|
|
80
|
+
}
|
|
74
81
|
await initializeEnvironment();
|
|
75
82
|
const { project } = await requireBranchAndProject(projectSlug);
|
|
76
83
|
const context = { projectRoot, projectSlug, project };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulationGateMiddleware.js","sourceRoot":"","sources":["../../../../src/utils/simulationGateMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAyC;IACnE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,+CAA+C,EAAE;IAC3E,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,8BAA8B,EAAE;IACnE,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,4BAA4B,EAAE;IACrE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,8CAA8C,EAAE;IAC7E;QACE,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,mDAAmD;KAC9D;IACD;QACE,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,gDAAgD;KAC3D;IACD;QACE,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,8CAA8C;KACzD;IACD,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,4CAA4C,EAAE;IAC7E,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,uCAAuC,EAAE;IACvE;QACE,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,qDAAqD;KAChE;IACD;QACE,IAAI,EAAE,yBAAyB;QAC/B,QAAQ,EAAE,kDAAkD;KAC7D;IACD,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,iCAAiC,EAAE;IAChE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,+CAA+C,EAAE;IAC7E,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,4CAA4C,EAAE;IAC5E,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,mCAAmC,EAAE;IAChE;QACE,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,gDAAgD;KAC3D;IACD;QACE,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,yDAAyD;KACpE;IACD;QACE,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,0DAA0D;KACrE;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEvE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,IAA6B;IAM7B,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,gBAIX,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC;IACtC,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAE9B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/D,
|
|
1
|
+
{"version":3,"file":"simulationGateMiddleware.js","sourceRoot":"","sources":["../../../../src/utils/simulationGateMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { execSync } from 'child_process';
|
|
2
|
+
import * as path from 'path';
|
|
3
|
+
/**
|
|
4
|
+
* Generate a stable project slug from the project path.
|
|
5
|
+
* Prefers GitHub-derived slugs (owner-repo), falls back to directory name.
|
|
6
|
+
* Never includes username or other machine-specific values.
|
|
7
|
+
*/
|
|
8
|
+
export function generateProjectSlug(projectPath) {
|
|
9
|
+
try {
|
|
10
|
+
const gitConfig = execSync('git config --get remote.origin.url', {
|
|
11
|
+
cwd: projectPath,
|
|
12
|
+
encoding: 'utf8',
|
|
13
|
+
}).trim();
|
|
14
|
+
const githubMatch = gitConfig.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?$/);
|
|
15
|
+
if (githubMatch) {
|
|
16
|
+
return `${githubMatch[1]}-${githubMatch[2]}`;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
// Not a git repo or no remote
|
|
21
|
+
}
|
|
22
|
+
// Fallback: directory name only (stable across machines and clones)
|
|
23
|
+
return path.basename(projectPath);
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=slugUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"slugUtils.js","sourceRoot":"","sources":["../../../../src/utils/slugUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB;IACrD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,QAAQ,CAAC,oCAAoC,EAAE;YAC/D,GAAG,EAAE,WAAW;YAChB,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAC,IAAI,EAAE,CAAC;QAEV,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CACjC,6CAA6C,CAC9C,CAAC;QACF,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,8BAA8B;IAChC,CAAC;IAED,oEAAoE;IACpE,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { syncUniversalMocks } from "./syncUniversalMocks.js";
|
|
2
2
|
import { loadProjectForMiddleware } from "./simulationGateMiddleware.js";
|
|
3
|
-
// Commands that should NOT trigger sync
|
|
4
|
-
const SKIP_SYNC_COMMANDS = ['init', 'help', 'version', '$0'];
|
|
3
|
+
// Commands that should NOT trigger sync (editor/start run init internally)
|
|
4
|
+
const SKIP_SYNC_COMMANDS = ['init', 'editor', 'start', 'help', 'version', '$0'];
|
|
5
5
|
/**
|
|
6
6
|
* Middleware that syncs universal mocks before command execution.
|
|
7
7
|
* This runs automatically for most commands to keep .codeyam/universal-mocks/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncMocksMiddleware.js","sourceRoot":"","sources":["../../../../src/utils/syncMocksMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,
|
|
1
|
+
{"version":3,"file":"syncMocksMiddleware.js","sourceRoot":"","sources":["../../../../src/utils/syncMocksMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,2EAA2E;AAC3E,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAGzC;IACC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAExC,iCAAiC;IACjC,IAAI,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,aAAa;QACb,MAAM,MAAM,GAAG,MAAM,kBAAkB,CACrC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,OAAO,CAChB,CAAC;QAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CACT,UAAU,MAAM,CAAC,SAAS,mDAAmD,CAC9E,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2CAA2C;QAC3C,OAAO,CAAC,IAAI,CACV,0CAA0C,EAC1C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAC/C,CAAC;IACJ,CAAC;AACH,CAAC;AAED,eAAe,mBAAmB,CAAC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { parseClientErrors } from "../app/lib/clientErrors.js";
|
|
2
|
+
describe('parseClientErrors', () => {
|
|
3
|
+
it('extracts console.error lines', () => {
|
|
4
|
+
const output = `[JournalCapture] Page console.error: Uncaught TypeError: x is not a function`;
|
|
5
|
+
expect(parseClientErrors(output)).toEqual([
|
|
6
|
+
'Uncaught TypeError: x is not a function',
|
|
7
|
+
]);
|
|
8
|
+
});
|
|
9
|
+
it('extracts network failure lines', () => {
|
|
10
|
+
const output = `[JournalCapture] Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED`;
|
|
11
|
+
expect(parseClientErrors(output)).toEqual([
|
|
12
|
+
'Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED',
|
|
13
|
+
]);
|
|
14
|
+
});
|
|
15
|
+
it('filters out /api/health network failures', () => {
|
|
16
|
+
const output = [
|
|
17
|
+
`[JournalCapture] Network failed: GET http://127.0.0.1:3111/api/health — net::ERR_CONNECTION_REFUSED`,
|
|
18
|
+
`[JournalCapture] Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED`,
|
|
19
|
+
`[JournalCapture] Page console.error: Something broke`,
|
|
20
|
+
].join('\n');
|
|
21
|
+
expect(parseClientErrors(output)).toEqual([
|
|
22
|
+
'Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED',
|
|
23
|
+
'Something broke',
|
|
24
|
+
]);
|
|
25
|
+
});
|
|
26
|
+
it('filters out /__codeyam__/preview-health network failures', () => {
|
|
27
|
+
const output = [
|
|
28
|
+
`[JournalCapture] Network failed: POST http://localhost:3112/__codeyam__/preview-health — net::ERR_ABORTED`,
|
|
29
|
+
`[JournalCapture] Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED`,
|
|
30
|
+
].join('\n');
|
|
31
|
+
expect(parseClientErrors(output)).toEqual([
|
|
32
|
+
'Network failed: GET http://localhost:3113/api/products — net::ERR_CONNECTION_REFUSED',
|
|
33
|
+
]);
|
|
34
|
+
});
|
|
35
|
+
it('returns empty array for clean output', () => {
|
|
36
|
+
const output = `[JournalCapture] Screenshot saved\n[JournalCapture] Done`;
|
|
37
|
+
expect(parseClientErrors(output)).toEqual([]);
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
//# sourceMappingURL=clientErrors.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientErrors.test.js","sourceRoot":"","sources":["../../../../../src/webserver/__tests__/clientErrors.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,MAAM,GAAG,8EAA8E,CAAC;QAC9F,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,yCAAyC;SAC1C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,MAAM,GAAG,uGAAuG,CAAC;QACvH,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,sFAAsF;SACvF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG;YACb,qGAAqG;YACrG,uGAAuG;YACvG,sDAAsD;SACvD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,sFAAsF;YACtF,iBAAiB;SAClB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,MAAM,GAAG;YACb,2GAA2G;YAC3G,uGAAuG;SACxG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,sFAAsF;SACvF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAG,0DAA0D,CAAC;QAC1E,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|