@tom2012/cc-web 2026.5.15-f → 2026.5.16-a
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/README.md +1 -1
- package/backend/dist/tracks/__tests__/verify-starter-templates.js +10 -0
- package/backend/dist/tracks/__tests__/verify-starter-templates.js.map +1 -1
- package/backend/dist/tracks/__tests__/verify-track-cancel.d.ts +23 -0
- package/backend/dist/tracks/__tests__/verify-track-cancel.d.ts.map +1 -0
- package/backend/dist/tracks/__tests__/verify-track-cancel.js +153 -0
- package/backend/dist/tracks/__tests__/verify-track-cancel.js.map +1 -0
- package/backend/dist/tracks/registry.d.ts.map +1 -1
- package/backend/dist/tracks/registry.js +47 -1
- package/backend/dist/tracks/registry.js.map +1 -1
- package/backend/dist/tracks/track-runner.d.ts +7 -0
- package/backend/dist/tracks/track-runner.d.ts.map +1 -1
- package/backend/dist/tracks/track-runner.js +25 -1
- package/backend/dist/tracks/track-runner.js.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/builder.d.ts.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/builder.js +37 -4
- package/backend/vendor/@tom2012/train-core/dist/builder.js.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/builtins.d.ts.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/builtins.js +13 -1
- package/backend/vendor/@tom2012/train-core/dist/builtins.js.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/interpreter.d.ts.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/interpreter.js +55 -6
- package/backend/vendor/@tom2012/train-core/dist/interpreter.js.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/module-loader.d.ts.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/module-loader.js +15 -0
- package/backend/vendor/@tom2012/train-core/dist/module-loader.js.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/parser.d.ts +3 -0
- package/backend/vendor/@tom2012/train-core/dist/parser.d.ts.map +1 -1
- package/backend/vendor/@tom2012/train-core/dist/parser.js +26 -3
- package/backend/vendor/@tom2012/train-core/dist/parser.js.map +1 -1
- package/frontend/dist/assets/{ChatOverlay-DBK_GHha.js → ChatOverlay-DxpbRiER.js} +1 -1
- package/frontend/dist/assets/{GraphPreview-BHvX6YYy.js → GraphPreview-DRLMf3Nh.js} +1 -1
- package/frontend/dist/assets/{MobilePage-B1VoACwY.js → MobilePage-CokExUMn.js} +3 -3
- package/frontend/dist/assets/{OfficePreview-rNwACnY8.js → OfficePreview-CyzAoUZx.js} +2 -2
- package/frontend/dist/assets/{PdfPreview-CBwfNdVA.js → PdfPreview-C8QLFGii.js} +1 -1
- package/frontend/dist/assets/{ProjectPage-Cb3qAFMT.js → ProjectPage-BPXSttKO.js} +4 -4
- package/frontend/dist/assets/{SettingsPage-uIxHLNKl.js → SettingsPage-BsGVZ7QV.js} +1 -1
- package/frontend/dist/assets/{SkillHubPage-BLFWpXdq.js → SkillHubPage-DcT0Bqhf.js} +1 -1
- package/frontend/dist/assets/{TrackEditor-ZeR9J6Z2.js → TrackEditor-DOTXUGor.js} +3 -3
- package/frontend/dist/assets/{chevron-down-CeLZJLLj.js → chevron-down-BqO_s8Lw.js} +1 -1
- package/frontend/dist/assets/{cssMode-CPDZY6Zm.js → cssMode-DzbSJSBr.js} +1 -1
- package/frontend/dist/assets/{editor.main-CMTFknQL.js → editor.main-DC8nTgWW.js} +7 -7
- package/frontend/dist/assets/{freemarker2-DdUQQOvf.js → freemarker2-BXB8PQ7I.js} +1 -1
- package/frontend/dist/assets/{handlebars-BWWSHK2B.js → handlebars-I7ch77qF.js} +1 -1
- package/frontend/dist/assets/{html-CogR5DQq.js → html-Do_yHKxU.js} +1 -1
- package/frontend/dist/assets/{htmlMode-ewGeGdO3.js → htmlMode-BPR1scxz.js} +1 -1
- package/frontend/dist/assets/{index-D7ba4C7Y.js → index-B8JeGt0F.js} +1 -1
- package/frontend/dist/assets/{index-ckBIIrhO.js → index-CN701B8t.js} +1 -1
- package/frontend/dist/assets/{index-BRUJHdRO.js → index-OYFfhZJK.js} +1 -1
- package/frontend/dist/assets/{index-TIsKsr9c.js → index-P75DiJki.js} +2 -2
- package/frontend/dist/assets/{javascript-CtAFCRfV.js → javascript-BNXRKlsL.js} +1 -1
- package/frontend/dist/assets/{jsonMode-CuDgZ6rv.js → jsonMode-DtjdCBU0.js} +1 -1
- package/frontend/dist/assets/{jszip.min-CtANWby5.js → jszip.min-CUjeMA7z.js} +1 -1
- package/frontend/dist/assets/{liquid-DDppuNDw.js → liquid-BpL1MpJR.js} +1 -1
- package/frontend/dist/assets/{mdx-CGOC-BF-.js → mdx-tEcPj6CQ.js} +1 -1
- package/frontend/dist/assets/{python-D89wVXLt.js → python-niOtt1WT.js} +1 -1
- package/frontend/dist/assets/{razor--pAMngNp.js → razor-D_eSXSai.js} +1 -1
- package/frontend/dist/assets/{select-wY61eoHK.js → select-BkQpRbP5.js} +1 -1
- package/frontend/dist/assets/{tsMode-L_LN8w-d.js → tsMode-Cxpc0mXx.js} +1 -1
- package/frontend/dist/assets/{typescript-r8EY1eIH.js → typescript-B9YDFBes.js} +1 -1
- package/frontend/dist/assets/{user-CO1-I-jX.js → user-Da5oNB1i.js} +1 -1
- package/frontend/dist/assets/{xml-lviOObw2.js → xml-ozjuWHxB.js} +1 -1
- package/frontend/dist/assets/{yaml-Bj16Kvoi.js → yaml-QQs8YH67.js} +1 -1
- package/frontend/dist/index.html +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
A self-hosted web application (distributed as npm package) that provides a browser-based interface for [Claude Code](https://docs.anthropic.com/en/docs/claude-code) CLI sessions. Create projects, each with a persistent terminal running Claude Code, and interact with them through a real-time terminal UI.
|
|
4
4
|
|
|
5
|
-
**Current version**: v2026.5.
|
|
5
|
+
**Current version**: v2026.5.16-a | [GitHub](https://github.com/zbc0315/cc-web) | MIT License
|
|
6
6
|
|
|
7
7
|
## Features
|
|
8
8
|
|
|
@@ -106,6 +106,16 @@ async function main() {
|
|
|
106
106
|
return false;
|
|
107
107
|
}
|
|
108
108
|
ok(`${name} main is 0-arg`);
|
|
109
|
+
// Export must be exactly `export main` (no `as <alias>`). ccweb's
|
|
110
|
+
// TrackRunner calls train.runFile without an explicit entry, which
|
|
111
|
+
// defaults to 'main' in train-core. Aliasing to anything else
|
|
112
|
+
// (e.g. `export main as literature_search`) makes the entry name
|
|
113
|
+
// unreachable and the run fails with `no export named 'main' found`.
|
|
114
|
+
if (!/^\s*export\s+main\s*$/m.test(body)) {
|
|
115
|
+
fail(`${name} exports 'main' (no alias)`, "must be exactly `export main` — ccweb's default entry is 'main'; aliasing makes it unreachable");
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
ok(`${name} exports 'main' (no alias)`);
|
|
109
119
|
return true;
|
|
110
120
|
}
|
|
111
121
|
// STARTER_BASIC: full end-to-end run through an inline mock adapter.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-starter-templates.js","sourceRoot":"","sources":["../../../src/tracks/__tests__/verify-starter-templates.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAwB;AACxB,2CAA4B;AAE5B,2EAA2E;AAC3E,qEAAqE;AACrE,oDAAoD;AACpD,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAE3C,CAAA;AA2Bf,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAC9B,SAAS,EACT,iEAAiE,CAClE,CAAA;AAED,SAAS,eAAe,CAAC,MAAc,EAAE,IAAY;IACnD,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,YAAY,IAAI,2BAA2B,CAAC,CAAA;IAClE,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1B,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,iBAAiB,WAAW,EAAE,CAAC,CAAA;IACvE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;AACb,CAAC;AAED,IAAI,MAAM,GAAG,CAAC,CAAA;AACd,SAAS,EAAE,CAAC,IAAY;IACtB,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAA;AAC5B,CAAC;AACD,SAAS,IAAI,CAAC,IAAY,EAAE,GAAY;IACtC,MAAM,EAAE,CAAA;IACR,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;AACtD,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;IACjD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAY,4BAA4B,CAAC,CAAA;IAC3E,MAAM,IAAI,GAAG,MAAM,aAAa,CAAU,qBAAqB,CAAC,CAAA;IAEhE,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IAEtD,uCAAuC;IACvC,SAAS,0BAA0B,CAAC,IAAY,EAAE,IAAY;QAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAA;QACpE,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;YACjB,IAAI,CAAC,GAAG,IAAI,SAAS,EAAE,GAAG,QAAQ,WAAW,CAAC,CAAA;YAC9C,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW;gBAChC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;YAC5C,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS;gBAAE,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;YAC1E,OAAO,KAAK,CAAA;QACd,CAAC;QACD,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,CAAA;QAEpB,kEAAkE;QAClE,gEAAgE;QAChE,gEAAgE;QAChE,8DAA8D;QAC9D,+DAA+D;QAC/D,aAAa;QACb,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,IAAI,CACF,GAAG,IAAI,gBAAgB,EACvB,kHAAkH,CACnH,CAAA;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QACD,EAAE,CAAC,GAAG,IAAI,gBAAgB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"verify-starter-templates.js","sourceRoot":"","sources":["../../../src/tracks/__tests__/verify-starter-templates.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Regression test for the v-15-f/g daemon-crash bug:
|
|
3
|
+
*
|
|
4
|
+
* POST /tracks/abort while a track is suspended in __ccweb_ask_user
|
|
5
|
+
* used to bubble the reject up through bridge.requestInput →
|
|
6
|
+
* builtin → train.runFile → runner.run → registry.start's `void
|
|
7
|
+
* runner.run(...).then(...)`. Because that .then had no .catch, the
|
|
8
|
+
* rejection escaped as `unhandledRejection`, and the global fatal
|
|
9
|
+
* handler in logger.ts called process.exit(1) — ccweb daemon died.
|
|
10
|
+
*
|
|
11
|
+
* This script:
|
|
12
|
+
* 1. Installs an unhandledRejection listener that flips a flag.
|
|
13
|
+
* 2. Starts a registry-driven track that blocks on __ccweb_ask_user.
|
|
14
|
+
* 3. Calls registry.abort() once the ask_user push fires.
|
|
15
|
+
* 4. Verifies:
|
|
16
|
+
* - flag stays false (no escaping promise)
|
|
17
|
+
* - registry.getState() reports status === 'cancelled'
|
|
18
|
+
* - track_run_complete broadcast has ok=false, errorType=UserCancelError
|
|
19
|
+
*
|
|
20
|
+
* Run: cd backend && npx ts-node src/tracks/__tests__/verify-track-cancel.ts
|
|
21
|
+
*/
|
|
22
|
+
export {};
|
|
23
|
+
//# sourceMappingURL=verify-track-cancel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verify-track-cancel.d.ts","sourceRoot":"","sources":["../../../src/tracks/__tests__/verify-track-cancel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG"}
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Regression test for the v-15-f/g daemon-crash bug:
|
|
4
|
+
*
|
|
5
|
+
* POST /tracks/abort while a track is suspended in __ccweb_ask_user
|
|
6
|
+
* used to bubble the reject up through bridge.requestInput →
|
|
7
|
+
* builtin → train.runFile → runner.run → registry.start's `void
|
|
8
|
+
* runner.run(...).then(...)`. Because that .then had no .catch, the
|
|
9
|
+
* rejection escaped as `unhandledRejection`, and the global fatal
|
|
10
|
+
* handler in logger.ts called process.exit(1) — ccweb daemon died.
|
|
11
|
+
*
|
|
12
|
+
* This script:
|
|
13
|
+
* 1. Installs an unhandledRejection listener that flips a flag.
|
|
14
|
+
* 2. Starts a registry-driven track that blocks on __ccweb_ask_user.
|
|
15
|
+
* 3. Calls registry.abort() once the ask_user push fires.
|
|
16
|
+
* 4. Verifies:
|
|
17
|
+
* - flag stays false (no escaping promise)
|
|
18
|
+
* - registry.getState() reports status === 'cancelled'
|
|
19
|
+
* - track_run_complete broadcast has ok=false, errorType=UserCancelError
|
|
20
|
+
*
|
|
21
|
+
* Run: cd backend && npx ts-node src/tracks/__tests__/verify-track-cancel.ts
|
|
22
|
+
*/
|
|
23
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
24
|
+
if (k2 === undefined) k2 = k;
|
|
25
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
26
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
27
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
28
|
+
}
|
|
29
|
+
Object.defineProperty(o, k2, desc);
|
|
30
|
+
}) : (function(o, m, k, k2) {
|
|
31
|
+
if (k2 === undefined) k2 = k;
|
|
32
|
+
o[k2] = m[k];
|
|
33
|
+
}));
|
|
34
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
35
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
36
|
+
}) : function(o, v) {
|
|
37
|
+
o["default"] = v;
|
|
38
|
+
});
|
|
39
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
40
|
+
var ownKeys = function(o) {
|
|
41
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
42
|
+
var ar = [];
|
|
43
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
44
|
+
return ar;
|
|
45
|
+
};
|
|
46
|
+
return ownKeys(o);
|
|
47
|
+
};
|
|
48
|
+
return function (mod) {
|
|
49
|
+
if (mod && mod.__esModule) return mod;
|
|
50
|
+
var result = {};
|
|
51
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
52
|
+
__setModuleDefault(result, mod);
|
|
53
|
+
return result;
|
|
54
|
+
};
|
|
55
|
+
})();
|
|
56
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
57
|
+
const fs = __importStar(require("fs/promises"));
|
|
58
|
+
const os = __importStar(require("os"));
|
|
59
|
+
const path = __importStar(require("path"));
|
|
60
|
+
const __1 = require("..");
|
|
61
|
+
let failed = 0;
|
|
62
|
+
function check(name, cond, msg) {
|
|
63
|
+
if (cond) {
|
|
64
|
+
console.log(` ✓ ${name}`);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
failed++;
|
|
68
|
+
console.error(` ✗ ${name}${msg ? ': ' + msg : ''}`);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
async function writeWf(p, w) {
|
|
72
|
+
await fs.writeFile(p, JSON.stringify(w, null, 2), 'utf8');
|
|
73
|
+
}
|
|
74
|
+
async function testAbortDuringAskUser() {
|
|
75
|
+
console.log('\n=== abort during pending ask_user (regression v-15-f/g) ===');
|
|
76
|
+
let unhandled = null;
|
|
77
|
+
const onUnhandled = (reason) => {
|
|
78
|
+
unhandled = reason;
|
|
79
|
+
};
|
|
80
|
+
process.on('unhandledRejection', onUnhandled);
|
|
81
|
+
try {
|
|
82
|
+
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ccweb-cancel-'));
|
|
83
|
+
const projectDir = path.join(tmpDir, 'proj');
|
|
84
|
+
await fs.mkdir(path.join(projectDir, '.ccweb'), { recursive: true });
|
|
85
|
+
const wfPath = path.join(projectDir, '.ccweb', 'workflow_data.json');
|
|
86
|
+
await writeWf(wfPath, { constants: {}, variables: {}, task_progress: [] });
|
|
87
|
+
(0, __1.saveTrack)(projectDir, 'pause.tr', `func main() -> any {
|
|
88
|
+
let r = __ccweb_ask_user({
|
|
89
|
+
fields: [
|
|
90
|
+
{ key: "decision", label: "go?", type: "enum", variants: ["yes","no"] }
|
|
91
|
+
]
|
|
92
|
+
})
|
|
93
|
+
return r.decision
|
|
94
|
+
}
|
|
95
|
+
export main
|
|
96
|
+
`);
|
|
97
|
+
const trackAbs = path.join(projectDir, '.ccweb', 'tracks', 'pause.tr');
|
|
98
|
+
const broadcastEvents = [];
|
|
99
|
+
const registry = (0, __1.createTrackRegistry)({
|
|
100
|
+
getProjectFolder: (id) => (id === 'proj' ? projectDir : null),
|
|
101
|
+
injectIntoPty: () => { },
|
|
102
|
+
broadcast: (_projectId, msg) => {
|
|
103
|
+
broadcastEvents.push({ msg });
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
const start = await registry.start('proj', trackAbs, 'pause.tr', []);
|
|
107
|
+
check('registry.start ok', start.ok);
|
|
108
|
+
// Wait until the bridge actually pushed the ask_user event — that's
|
|
109
|
+
// the signal that bridge.requestInput is parked on the Promise and
|
|
110
|
+
// the abort path will trip the signalHandler reject.
|
|
111
|
+
const startTs = Date.now();
|
|
112
|
+
while (broadcastEvents.find((e) => e.msg.type === 'track_ask_user') === undefined &&
|
|
113
|
+
Date.now() - startTs < 8000) {
|
|
114
|
+
await new Promise((r) => setTimeout(r, 20));
|
|
115
|
+
}
|
|
116
|
+
check('track_ask_user broadcast fired before abort', broadcastEvents.find((e) => e.msg.type === 'track_ask_user') !== undefined);
|
|
117
|
+
check('ask_user is pending before abort', registry.getPendingAskUser('proj') !== null);
|
|
118
|
+
// The actual abort — this is what used to crash ccweb.
|
|
119
|
+
const aborted = registry.abort('proj');
|
|
120
|
+
check('registry.abort returned true', aborted);
|
|
121
|
+
// Give the promise chain enough ticks to settle and the fatal
|
|
122
|
+
// handler enough chance to fire if it would have.
|
|
123
|
+
await new Promise((r) => setTimeout(r, 200));
|
|
124
|
+
check('no unhandledRejection escaped (would have killed ccweb)', unhandled === null, unhandled instanceof Error ? unhandled.message : String(unhandled));
|
|
125
|
+
const finalState = registry.getState('proj');
|
|
126
|
+
check('final state non-null', finalState !== null);
|
|
127
|
+
check('final status is cancelled (not failed/running)', finalState?.status === 'cancelled', `got: ${finalState?.status}`);
|
|
128
|
+
check('final error.errorType is UserCancelError', finalState?.error?.errorType === 'UserCancelError', `got: ${finalState?.error?.errorType}`);
|
|
129
|
+
check('isRunning false after abort', !registry.isRunning('proj'));
|
|
130
|
+
const completes = broadcastEvents.filter((e) => e.msg.type === 'track_run_complete');
|
|
131
|
+
check('exactly one track_run_complete broadcast', completes.length === 1, `got ${completes.length}`);
|
|
132
|
+
if (completes.length === 1) {
|
|
133
|
+
const c = completes[0].msg;
|
|
134
|
+
check('track_run_complete ok=false', c.ok === false);
|
|
135
|
+
check('track_run_complete errorType=UserCancelError', c.error?.errorType === 'UserCancelError', `got: ${c.error?.errorType}`);
|
|
136
|
+
}
|
|
137
|
+
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
138
|
+
}
|
|
139
|
+
finally {
|
|
140
|
+
process.off('unhandledRejection', onUnhandled);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
async function main() {
|
|
144
|
+
console.log('=== verify-track-cancel ===');
|
|
145
|
+
await testAbortDuringAskUser();
|
|
146
|
+
console.log(`\n${failed === 0 ? '✅ ALL CANCEL CHECKS PASSED' : `❌ ${failed} CHECK(S) FAILED`}`);
|
|
147
|
+
process.exit(failed === 0 ? 0 : 1);
|
|
148
|
+
}
|
|
149
|
+
main().catch((e) => {
|
|
150
|
+
console.error('verify-track-cancel crashed:', e);
|
|
151
|
+
process.exit(2);
|
|
152
|
+
});
|
|
153
|
+
//# sourceMappingURL=verify-track-cancel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verify-track-cancel.js","sourceRoot":"","sources":["../../../src/tracks/__tests__/verify-track-cancel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tracks/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAA2C,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAClG,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,SAAS,CAAA;AAE5D,MAAM,WAAW,iBAAiB;IAChC,6DAA6D;IAC7D,gBAAgB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;IACtD,qDAAqD;IACrD,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACxE,wEAAwE;IACxE,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACxE,8BAA8B;IAC9B,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,SAAS,CAAA;QACjB,IAAI,CAAC,EAAE,SAAS,CAAA;QAChB,IAAI,CAAC,EAAE,SAAS,CAAA;QAChB,KAAK,CAAC,EAAE,SAAS,CAAA;KAClB,CAAA;CACF;AAMD,UAAU,SAAS;IACjB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CACxC;AAkBD,MAAM,WAAW,aAAa;IAC5B,yBAAyB;IACzB,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,OAAO,EAAE,GACf,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAEvE,8CAA8C;IAC9C,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;IAEjC,wDAAwD;IACxD,WAAW,CACT,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAEpC,qEAAqE;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAAA;IAEjD,iEAAiE;IACjE,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;IAErC,+CAA+C;IAC/C,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG;QACpC,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,MAAM,EAAE,gBAAgB,EAAE,CAAA;KAC3B,GAAG,IAAI,CAAA;CACT;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tracks/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAA2C,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAClG,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,SAAS,CAAA;AAE5D,MAAM,WAAW,iBAAiB;IAChC,6DAA6D;IAC7D,gBAAgB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;IACtD,qDAAqD;IACrD,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACxE,wEAAwE;IACxE,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACxE,8BAA8B;IAC9B,MAAM,CAAC,EAAE;QACP,KAAK,CAAC,EAAE,SAAS,CAAA;QACjB,IAAI,CAAC,EAAE,SAAS,CAAA;QAChB,IAAI,CAAC,EAAE,SAAS,CAAA;QAChB,KAAK,CAAC,EAAE,SAAS,CAAA;KAClB,CAAA;CACF;AAMD,UAAU,SAAS;IACjB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;CACxC;AAkBD,MAAM,WAAW,aAAa;IAC5B,yBAAyB;IACzB,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,OAAO,EAAE,GACf,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAEvE,8CAA8C;IAC9C,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;IAEjC,wDAAwD;IACxD,WAAW,CACT,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IAEpC,qEAAqE;IACrE,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAAA;IAEjD,iEAAiE;IACjE,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;IAErC,+CAA+C;IAC/C,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG;QACpC,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,EAAE,MAAM,CAAA;QACjB,MAAM,EAAE,gBAAgB,EAAE,CAAA;KAC3B,GAAG,IAAI,CAAA;CACT;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,aAAa,CAoK1E"}
|
|
@@ -77,6 +77,12 @@ function createTrackRegistry(deps) {
|
|
|
77
77
|
watcher,
|
|
78
78
|
logger: deps.logger,
|
|
79
79
|
askUserBridge: bridge,
|
|
80
|
+
// Pin the runner's runId to the one registry hands out, so
|
|
81
|
+
// bridge.pending keys, registry.entry.runId, the runId returned
|
|
82
|
+
// to the route, and state.runId all match. Pre-fix mismatch
|
|
83
|
+
// made getPendingAskUser/submitInput/cancelAllForRun no-ops
|
|
84
|
+
// since they looked up the wrong key.
|
|
85
|
+
runId,
|
|
80
86
|
onState: (state) => {
|
|
81
87
|
// Ignore late callbacks from a previous run — only the run
|
|
82
88
|
// whose runId matches the entry's current runId is allowed
|
|
@@ -101,7 +107,17 @@ function createTrackRegistry(deps) {
|
|
|
101
107
|
};
|
|
102
108
|
projects.set(projectId, entry);
|
|
103
109
|
// Fire and forget — the run resolves later; route returns immediately.
|
|
104
|
-
|
|
110
|
+
//
|
|
111
|
+
// The .catch is defense-in-depth: track-runner converts its own
|
|
112
|
+
// exceptions to TrackRunResult, so .then's callback handles every
|
|
113
|
+
// expected outcome. But if track-runner ever throws (host bug, OOM,
|
|
114
|
+
// future refactor), there's no .catch to break a rejected promise
|
|
115
|
+
// chain — it escapes to logger.ts's unhandledRejection handler
|
|
116
|
+
// which process.exit(1)s the entire daemon. The .catch keeps that
|
|
117
|
+
// class of bug from killing ccweb.
|
|
118
|
+
void runner
|
|
119
|
+
.run(absTrackPath, args)
|
|
120
|
+
.then((result) => {
|
|
105
121
|
const e = projects.get(projectId);
|
|
106
122
|
if (e && e.runId === runId) {
|
|
107
123
|
e.inFlight = false;
|
|
@@ -112,6 +128,36 @@ function createTrackRegistry(deps) {
|
|
|
112
128
|
value: result.value,
|
|
113
129
|
error: result.error,
|
|
114
130
|
});
|
|
131
|
+
})
|
|
132
|
+
.catch((err) => {
|
|
133
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
134
|
+
deps.logger?.error?.({ projectId, runId, err: message }, '[TrackRegistry] run threw — converted to failed event');
|
|
135
|
+
// Synthesize a terminal state so isRunning() returns false and
|
|
136
|
+
// the frontend's track_status_change consumers see a definite
|
|
137
|
+
// end-of-run, not a stuck 'running'. Without this, runner-level
|
|
138
|
+
// bugs that future-broke runner's NEVER-THROW contract would
|
|
139
|
+
// leave the project stuck (entry.lastState would stay null/running).
|
|
140
|
+
const e = projects.get(projectId);
|
|
141
|
+
const failedState = {
|
|
142
|
+
runId,
|
|
143
|
+
trackFilename: e?.trackFilename ?? '',
|
|
144
|
+
startedAt: e?.lastState?.startedAt ?? Date.now(),
|
|
145
|
+
status: 'failed',
|
|
146
|
+
endedAt: Date.now(),
|
|
147
|
+
error: { errorType: 'RunnerThrew', message },
|
|
148
|
+
};
|
|
149
|
+
if (e && e.runId === runId) {
|
|
150
|
+
e.inFlight = false;
|
|
151
|
+
e.lastState = failedState;
|
|
152
|
+
}
|
|
153
|
+
emit(projectId, 'track_status_change', {
|
|
154
|
+
state: failedState,
|
|
155
|
+
});
|
|
156
|
+
emit(projectId, 'track_run_complete', {
|
|
157
|
+
ok: false,
|
|
158
|
+
value: null,
|
|
159
|
+
error: { errorType: 'RunnerThrew', message },
|
|
160
|
+
});
|
|
115
161
|
});
|
|
116
162
|
return { ok: true, runId };
|
|
117
163
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tracks/registry.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmFH,
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tracks/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,13 @@ export interface TrackRunnerDeps {
|
|
|
40
40
|
* "Undefined identifier '__ccweb_ask_user'".
|
|
41
41
|
*/
|
|
42
42
|
askUserBridge?: AskUserBridge;
|
|
43
|
+
/**
|
|
44
|
+
* Pre-allocated runId. The caller (registry) needs to know the runId
|
|
45
|
+
* synchronously before run() awaits, so it can route submitInput /
|
|
46
|
+
* getPendingAskUser to the right bridge entry. If omitted, runner
|
|
47
|
+
* generates one. Used so registry.entry.runId === bridge pending key.
|
|
48
|
+
*/
|
|
49
|
+
runId?: string;
|
|
43
50
|
}
|
|
44
51
|
export interface TrackRunResult {
|
|
45
52
|
ok: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"track-runner.d.ts","sourceRoot":"","sources":["../../src/tracks/track-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACtC,OAAO,EAAE,mBAAmB,CAAA;IAC5B,8CAA8C;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kDAAkD;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,qBAAqB;IACrB,MAAM,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACnC,qDAAqD;IACrD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;IACxC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"track-runner.d.ts","sourceRoot":"","sources":["../../src/tracks/track-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAA;AAE1B,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACtC,OAAO,EAAE,mBAAmB,CAAA;IAC5B,8CAA8C;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,kDAAkD;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,qBAAqB;IACrB,MAAM,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACnC,qDAAqD;IACrD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAA;IACxC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAA;IACX,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAC9D;AAyBD,MAAM,WAAW,WAAW;IAC1B,gFAAgF;IAChF,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IACpE,+BAA+B;IAC/B,MAAM,IAAI,IAAI,CAAA;IACd,8BAA8B;IAC9B,QAAQ,IAAI,aAAa,GAAG,IAAI,CAAA;CACjC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,WAAW,CA4IpE"}
|
|
@@ -43,7 +43,7 @@ function createTrackRunner(deps) {
|
|
|
43
43
|
return {
|
|
44
44
|
async run(absTrackPath, args = []) {
|
|
45
45
|
const train = await loadTrain();
|
|
46
|
-
const runId = `track-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
|
46
|
+
const runId = deps.runId ?? `track-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
|
47
47
|
state = {
|
|
48
48
|
runId,
|
|
49
49
|
trackFilename: absTrackPath.split('/').pop() ?? absTrackPath,
|
|
@@ -111,6 +111,30 @@ function createTrackRunner(deps) {
|
|
|
111
111
|
});
|
|
112
112
|
return { ok: true, value: result.value };
|
|
113
113
|
}
|
|
114
|
+
catch (err) {
|
|
115
|
+
// NEVER-THROW contract: runFile / builtin / adapter throws (incl.
|
|
116
|
+
// ask_user reject during abort) MUST be converted into TrackRunResult.
|
|
117
|
+
// Without this catch the throw escapes runner.run, registry.ts's
|
|
118
|
+
// `void runner.run(...).then(...)` has no .catch, and the global
|
|
119
|
+
// unhandledRejection handler (logger.ts) calls process.exit(1).
|
|
120
|
+
// → entire ccweb daemon dies whenever a track with pending ask_user
|
|
121
|
+
// is aborted. (Repro: v-15-f / v-15-g logs, 2026-05-16 07:35 / 07:36.)
|
|
122
|
+
const aborted = abortController?.signal.aborted ?? false;
|
|
123
|
+
const e = err;
|
|
124
|
+
const errObj = aborted
|
|
125
|
+
? {
|
|
126
|
+
errorType: 'UserCancelError',
|
|
127
|
+
message: e?.message ?? 'cancelled',
|
|
128
|
+
}
|
|
129
|
+
: {
|
|
130
|
+
errorType: e?.errorType ?? 'RuntimeError',
|
|
131
|
+
message: e?.message ?? String(err),
|
|
132
|
+
code: e?.code,
|
|
133
|
+
};
|
|
134
|
+
const finalStatus = aborted ? 'cancelled' : 'failed';
|
|
135
|
+
updateState({ status: finalStatus, endedAt: Date.now(), error: errObj });
|
|
136
|
+
return { ok: false, value: null, error: errObj };
|
|
137
|
+
}
|
|
114
138
|
finally {
|
|
115
139
|
deps.watcher.stop();
|
|
116
140
|
if (deps.askUserBridge && state) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"track-runner.js","sourceRoot":"","sources":["../../src/tracks/track-runner.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;;
|
|
1
|
+
{"version":3,"file":"track-runner.js","sourceRoot":"","sources":["../../src/tracks/track-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,YAAY,CAAA;AAEjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,YAAY,CAAA;AAEjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAu2C/B;;GAEG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,GAAG,GAAG,CAAC,OAAO,GAAG,IAAI,CAGrE"}
|
|
@@ -375,7 +375,7 @@ class TrainAstBuilder extends BaseVisitor {
|
|
|
375
375
|
constDecl(ctx) {
|
|
376
376
|
const constTok = ctx.Const[0];
|
|
377
377
|
const id = ctx.Identifier[0];
|
|
378
|
-
const type = this.visit(ctx.
|
|
378
|
+
const type = this.visit(ctx.declTypeAnnot[0]);
|
|
379
379
|
const value = this.visit(ctx.expr[0]);
|
|
380
380
|
return {
|
|
381
381
|
kind: 'ConstDecl',
|
|
@@ -388,7 +388,7 @@ class TrainAstBuilder extends BaseVisitor {
|
|
|
388
388
|
varDecl(ctx) {
|
|
389
389
|
const varTok = ctx.Var[0];
|
|
390
390
|
const id = ctx.Identifier[0];
|
|
391
|
-
const type = this.visit(ctx.
|
|
391
|
+
const type = this.visit(ctx.declTypeAnnot[0]);
|
|
392
392
|
const init = ctx.expr ? this.visit(ctx.expr[0]) : null;
|
|
393
393
|
const endRange = init?.range ?? type.range;
|
|
394
394
|
return {
|
|
@@ -533,6 +533,39 @@ class TrainAstBuilder extends BaseVisitor {
|
|
|
533
533
|
return this.visit(ctx.objectType[0]);
|
|
534
534
|
return this.visit(ctx.scalarType[0]);
|
|
535
535
|
}
|
|
536
|
+
// Variant for let/var/const decl types: same AST shape as typeAnnot
|
|
537
|
+
// but scalar/array sub-rules don't allow trailing named constraints
|
|
538
|
+
// (those would silently swallow the next statement). Constraints
|
|
539
|
+
// belong on fai outputs / func params, not local bindings.
|
|
540
|
+
declTypeAnnot(ctx) {
|
|
541
|
+
if (ctx.enumType)
|
|
542
|
+
return this.visit(ctx.enumType[0]);
|
|
543
|
+
if (ctx.declArrayType)
|
|
544
|
+
return this.visit(ctx.declArrayType[0]);
|
|
545
|
+
if (ctx.objectType)
|
|
546
|
+
return this.visit(ctx.objectType[0]);
|
|
547
|
+
return this.visit(ctx.declScalarType[0]);
|
|
548
|
+
}
|
|
549
|
+
declScalarType(ctx) {
|
|
550
|
+
const id = ctx.Identifier[0];
|
|
551
|
+
return {
|
|
552
|
+
kind: 'ScalarType',
|
|
553
|
+
name: id.image,
|
|
554
|
+
constraint: null,
|
|
555
|
+
range: tokenRange(id),
|
|
556
|
+
};
|
|
557
|
+
}
|
|
558
|
+
declArrayType(ctx) {
|
|
559
|
+
const arrTok = ctx.KwArray[0];
|
|
560
|
+
const element = this.visit(ctx.typeAnnot[0]);
|
|
561
|
+
const rangle = ctx.RAngle[0];
|
|
562
|
+
return {
|
|
563
|
+
kind: 'ArrayType',
|
|
564
|
+
element,
|
|
565
|
+
constraint: null,
|
|
566
|
+
range: spanFromTokenToRange(arrTok, tokenRange(rangle)),
|
|
567
|
+
};
|
|
568
|
+
}
|
|
536
569
|
scalarType(ctx) {
|
|
537
570
|
const id = ctx.Identifier[0];
|
|
538
571
|
const constraint = ctx.typeConstraint
|
|
@@ -667,8 +700,8 @@ class TrainAstBuilder extends BaseVisitor {
|
|
|
667
700
|
letDecl(ctx) {
|
|
668
701
|
const letTok = ctx.Let[0];
|
|
669
702
|
const target = this.visit(ctx.letTarget[0]);
|
|
670
|
-
const type = ctx.
|
|
671
|
-
? this.visit(ctx.
|
|
703
|
+
const type = ctx.declTypeAnnot
|
|
704
|
+
? this.visit(ctx.declTypeAnnot[0])
|
|
672
705
|
: null;
|
|
673
706
|
const init = ctx.expr ? this.visit(ctx.expr[0]) : null;
|
|
674
707
|
const endRange = init?.range ?? type?.range ?? target.range;
|