@hyperscale0/hsx 1.0.0-rc.1 → 2.0.0
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/CHANGELOG.md +32 -4
- package/README.md +58 -36
- package/bin/hsx.ts +2 -0
- package/dist/bin/hsx.js +2 -0
- package/dist/bin/hsx.js.map +1 -1
- package/dist/src/ast.d.ts +10 -2
- package/dist/src/ast.d.ts.map +1 -1
- package/dist/src/ast.js +24 -0
- package/dist/src/ast.js.map +1 -1
- package/dist/src/cli.d.ts +3 -1
- package/dist/src/cli.d.ts.map +1 -1
- package/dist/src/cli.js +25 -5
- package/dist/src/cli.js.map +1 -1
- package/dist/src/compile.d.ts +9 -5
- package/dist/src/compile.d.ts.map +1 -1
- package/dist/src/compile.js +9 -3
- package/dist/src/compile.js.map +1 -1
- package/dist/src/cost.d.ts +3 -1
- package/dist/src/cost.d.ts.map +1 -1
- package/dist/src/cost.js +124 -94
- package/dist/src/cost.js.map +1 -1
- package/dist/src/diagnostics.d.ts.map +1 -1
- package/dist/src/diagnostics.js +89 -5
- package/dist/src/diagnostics.js.map +1 -1
- package/dist/src/emit.d.ts +4 -3
- package/dist/src/emit.d.ts.map +1 -1
- package/dist/src/emit.js +28 -233
- package/dist/src/emit.js.map +1 -1
- package/dist/src/format.js.map +1 -1
- package/dist/src/index.d.ts +4 -3
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/ir.d.ts.map +1 -1
- package/dist/src/lex.d.ts.map +1 -1
- package/dist/src/lsp/server.d.ts +32 -0
- package/dist/src/lsp/server.d.ts.map +1 -0
- package/dist/src/lsp/server.js +391 -0
- package/dist/src/lsp/server.js.map +1 -0
- package/dist/src/modules.d.ts +2 -0
- package/dist/src/modules.d.ts.map +1 -1
- package/dist/src/modules.js +14 -14
- package/dist/src/modules.js.map +1 -1
- package/dist/src/parse.js +3 -3
- package/dist/src/parse.js.map +1 -1
- package/dist/src/std-bundle.d.ts +2 -0
- package/dist/src/std-bundle.d.ts.map +1 -0
- package/dist/src/std-bundle.js +88 -0
- package/dist/src/std-bundle.js.map +1 -0
- package/dist/src/std-library.d.ts +5 -0
- package/dist/src/std-library.d.ts.map +1 -0
- package/dist/src/std-library.js +9 -0
- package/dist/src/std-library.js.map +1 -0
- package/dist/src/typecheck.d.ts.map +1 -1
- package/dist/src/typecheck.js +859 -156
- package/dist/src/typecheck.js.map +1 -1
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.d.ts.map +1 -1
- package/dist/src/version.js +1 -1
- package/dist/src/version.js.map +1 -1
- package/docs/README.md +12 -0
- package/docs/assets/hsx.svg +18 -0
- package/docs/guide/01-first-program.md +2 -2
- package/docs/guide/02-money.md +1 -1
- package/docs/guide/03-instruments.md +44 -3
- package/docs/guide/04-lifecycles.md +18 -3
- package/docs/guide/05-fees-and-splits.md +2 -2
- package/docs/guide/06-schedules.md +1 -1
- package/docs/guide/07-composition.md +8 -2
- package/docs/guide/08-writing-a-module.md +13 -2
- package/docs/guide/09-cost.md +3 -3
- package/docs/guide/10-diagnostics.md +1 -1
- package/docs/llms-full.txt +458 -194
- package/docs/llms.txt +2 -2
- package/docs/playground.md +55 -0
- package/docs/reference/cli.md +5 -3
- package/docs/reference/diagnostics.md +223 -37
- package/docs/reference/grammar.md +2 -2
- package/docs/reference/std/advance.md +2 -2
- package/docs/reference/std/cancellable_booking.md +10 -10
- package/docs/reference/std/captured_payment.md +14 -14
- package/docs/reference/std/conditional_disbursement.md +3 -3
- package/docs/reference/std/credit_facility.md +2 -2
- package/docs/reference/std/held_payment.md +37 -33
- package/docs/reference/std/instant_transfer.md +8 -8
- package/docs/reference/std/metered.md +2 -2
- package/docs/reference/std/pooled_split.md +2 -2
- package/docs/reference/std/premium_forward.md +13 -13
- package/docs/reference/std/reconciled_payout.md +2 -2
- package/docs/reference/std/recurring_collection.md +2 -2
- package/docs/reference/std/rotating_pool.md +2 -2
- package/docs/reference/std/scheduled.md +18 -18
- package/docs/reference/std/security_deposit.md +14 -14
- package/docs/reference/std/settlement_batch.md +2 -2
- package/docs/reference/std/swap.md +18 -18
- package/docs/reference/std/threshold_pool.md +2 -2
- package/docs/reference/std/weighted_distribution.md +2 -2
- package/docs/reference/types.md +1 -1
- package/docs/reference/udl-output.md +2 -3
- package/examples/01-first-program/README.md +1 -1
- package/examples/01-first-program/tip-jar.hsx +1 -1
- package/examples/02-imports-and-archetypes/README.md +1 -4
- package/examples/02-imports-and-archetypes/photo-booth.hsx +1 -1
- package/examples/03-diagnostics/corner-shop-fixed.hsx +1 -1
- package/examples/03-diagnostics/corner-shop.hsx +1 -1
- package/examples/04-complete-product/README.md +0 -3
- package/examples/04-complete-product/study-hall.hsx +1 -1
- package/examples/05-watch-club/README.md +0 -3
- package/examples/05-watch-club/watch-club.hsx +1 -1
- package/examples/README.md +35 -4
- package/examples/advance/advance.hsx +1 -1
- package/examples/advance/advance.udl +10 -5
- package/examples/cancellable_booking/cancellable_booking.hsx +1 -1
- package/examples/cancellable_booking/cancellable_booking.udl +3 -1
- package/examples/captured_payment/captured_payment.hsx +1 -1
- package/examples/captured_payment/captured_payment.udl +4 -1
- package/examples/conditional_disbursement/conditional_disbursement.hsx +1 -1
- package/examples/conditional_disbursement/conditional_disbursement.udl +5 -3
- package/examples/cost-table.json +1602 -382
- package/examples/credit_facility/credit_facility.hsx +1 -1
- package/examples/credit_facility/credit_facility.udl +16 -9
- package/examples/held_payment/held_payment.hsx +1 -1
- package/examples/held_payment/held_payment.udl +38 -3
- package/examples/instant_transfer/instant_transfer.hsx +1 -1
- package/examples/instant_transfer/instant_transfer.udl +11 -5
- package/examples/metered/metered.hsx +1 -1
- package/examples/metered/metered.udl +4 -2
- package/examples/pooled_split/pooled_split.hsx +1 -1
- package/examples/pooled_split/pooled_split.udl +6 -3
- package/examples/premium_forward/premium_forward.hsx +1 -1
- package/examples/premium_forward/premium_forward.udl +10 -4
- package/examples/reconciled_payout/reconciled_payout.hsx +1 -1
- package/examples/reconciled_payout/reconciled_payout.udl +4 -2
- package/examples/recurring_collection/recurring_collection.hsx +1 -1
- package/examples/recurring_collection/recurring_collection.udl +12 -7
- package/examples/rotating_pool/rotating_pool.hsx +1 -1
- package/examples/rotating_pool/rotating_pool.udl +14 -4
- package/examples/scheduled/scheduled.hsx +1 -1
- package/examples/scheduled/scheduled.udl +9 -4
- package/examples/security_deposit/security_deposit.hsx +1 -1
- package/examples/security_deposit/security_deposit.udl +17 -3
- package/examples/settlement_batch/settlement_batch.hsx +1 -1
- package/examples/swap/swap.hsx +1 -1
- package/examples/swap/swap.udl +12 -6
- package/examples/threshold_pool/threshold_pool.hsx +1 -1
- package/examples/threshold_pool/threshold_pool.udl +4 -2
- package/examples/weighted_distribution/weighted_distribution.hsx +1 -1
- package/examples/weighted_distribution/weighted_distribution.udl +4 -2
- package/package.json +15 -6
- package/skills/hsx/SKILL.md +26 -26
- package/src/ast.ts +34 -2
- package/src/cli.ts +32 -13
- package/src/compile.ts +15 -7
- package/src/cost.ts +176 -104
- package/src/diagnostics.ts +89 -4
- package/src/emit.ts +34 -266
- package/src/index.ts +10 -7
- package/src/lsp/server.ts +460 -0
- package/src/modules.ts +21 -13
- package/src/parse.ts +3 -3
- package/src/std-bundle.ts +91 -0
- package/src/std-library.ts +12 -0
- package/src/typecheck.ts +1147 -235
- package/src/version.ts +1 -1
- package/std/SEMANTICS.md +12 -3
- package/std/{settlements → money_flows}/advance.hsx +1 -1
- package/std/{settlements → money_flows}/cancellable_booking.hsx +4 -3
- package/std/{settlements → money_flows}/captured_payment.hsx +35 -6
- package/std/{settlements → money_flows}/conditional_disbursement.hsx +17 -16
- package/std/{settlements → money_flows}/credit_facility.hsx +1 -2
- package/std/{settlements → money_flows}/held_payment.hsx +59 -25
- package/std/money_flows/index.hsx +3 -0
- package/std/{settlements → money_flows}/instant_transfer.hsx +2 -3
- package/std/{settlements → money_flows}/metered.hsx +1 -1
- package/std/{settlements → money_flows}/pooled_split.hsx +3 -3
- package/std/{settlements → money_flows}/premium_forward.hsx +22 -23
- package/std/{settlements → money_flows}/reconciled_payout.hsx +3 -3
- package/std/{settlements → money_flows}/recurring_collection.hsx +1 -1
- package/std/{settlements → money_flows}/rotating_pool.hsx +8 -6
- package/std/{settlements → money_flows}/scheduled.hsx +22 -27
- package/std/{settlements → money_flows}/security_deposit.hsx +38 -14
- package/std/{settlements → money_flows}/settlement_batch.hsx +3 -3
- package/std/{settlements → money_flows}/swap.hsx +41 -16
- package/std/{settlements → money_flows}/threshold_pool.hsx +5 -5
- package/std/{settlements → money_flows}/weighted_distribution.hsx +6 -6
- package/docs/sessions/2026-09-02-two-instruments.hsx +0 -21
- package/docs/sessions/2026-09-02-two-instruments.md +0 -41
- package/std/settlements/index.hsx +0 -3
|
@@ -0,0 +1,460 @@
|
|
|
1
|
+
import { existsSync, readFileSync, statSync } from "node:fs";
|
|
2
|
+
import { dirname, isAbsolute, resolve } from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
4
|
+
import { lineIndex, type LineIndex } from "../ast.ts";
|
|
5
|
+
import { format } from "../format.ts";
|
|
6
|
+
import type { HsxCompilerHost, ModuleSource } from "../modules.ts";
|
|
7
|
+
import { resolveProgramModules } from "../modules.ts";
|
|
8
|
+
import { parseProgram } from "../parse.ts";
|
|
9
|
+
import { checkGeneralProgram } from "../typecheck.ts";
|
|
10
|
+
|
|
11
|
+
export interface LspPosition {
|
|
12
|
+
readonly character: number;
|
|
13
|
+
readonly line: number;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface LspRange {
|
|
17
|
+
readonly end: LspPosition;
|
|
18
|
+
readonly start: LspPosition;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export interface LspDiagnostic {
|
|
22
|
+
readonly code?: string;
|
|
23
|
+
readonly message: string;
|
|
24
|
+
readonly range: LspRange;
|
|
25
|
+
readonly severity: 1 | 2;
|
|
26
|
+
readonly source: "hsx";
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export interface LspServerOptions {
|
|
30
|
+
readonly host?: HsxCompilerHost;
|
|
31
|
+
readonly onExit?: (code: number) => void;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export interface LspServer {
|
|
35
|
+
readonly stop: () => void;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export function offsetToPosition(
|
|
39
|
+
index: LineIndex,
|
|
40
|
+
offset: number,
|
|
41
|
+
): LspPosition {
|
|
42
|
+
const clamped = Math.max(0, Math.min(offset, index.length));
|
|
43
|
+
let low = 0;
|
|
44
|
+
let high = index.starts.length - 1;
|
|
45
|
+
while (low < high) {
|
|
46
|
+
const middle = Math.floor((low + high + 1) / 2);
|
|
47
|
+
if ((index.starts[middle] as number) <= clamped) low = middle;
|
|
48
|
+
else high = middle - 1;
|
|
49
|
+
}
|
|
50
|
+
const lineStart = index.starts[low] as number;
|
|
51
|
+
return {
|
|
52
|
+
character: clamped - lineStart,
|
|
53
|
+
line: low,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export function spanToRange(
|
|
58
|
+
index: LineIndex,
|
|
59
|
+
span: { readonly end: number; readonly start: number },
|
|
60
|
+
): LspRange {
|
|
61
|
+
return {
|
|
62
|
+
end: offsetToPosition(index, Math.max(span.start, span.end)),
|
|
63
|
+
start: offsetToPosition(index, span.start),
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
export function createHostForUri(
|
|
68
|
+
uri: string,
|
|
69
|
+
fallbackHost?: HsxCompilerHost,
|
|
70
|
+
): HsxCompilerHost {
|
|
71
|
+
let docDir: string | undefined;
|
|
72
|
+
try {
|
|
73
|
+
if (uri.startsWith("file://")) {
|
|
74
|
+
docDir = dirname(fileURLToPath(uri));
|
|
75
|
+
}
|
|
76
|
+
} catch {
|
|
77
|
+
docDir = undefined;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
return {
|
|
81
|
+
resolveModule(specifier: string, from: string): ModuleSource | undefined {
|
|
82
|
+
if (fallbackHost?.resolveModule) {
|
|
83
|
+
const custom = fallbackHost.resolveModule(specifier, from);
|
|
84
|
+
if (custom) return custom;
|
|
85
|
+
}
|
|
86
|
+
if (!docDir) return undefined;
|
|
87
|
+
const baseDir = from
|
|
88
|
+
? isAbsolute(from)
|
|
89
|
+
? dirname(from)
|
|
90
|
+
: resolve(docDir, dirname(from))
|
|
91
|
+
: docDir;
|
|
92
|
+
const candidates = [
|
|
93
|
+
resolve(baseDir, specifier),
|
|
94
|
+
resolve(baseDir, `${specifier}.hsx`),
|
|
95
|
+
resolve(docDir, specifier),
|
|
96
|
+
resolve(docDir, `${specifier}.hsx`),
|
|
97
|
+
];
|
|
98
|
+
for (const candidate of candidates) {
|
|
99
|
+
if (existsSync(candidate)) {
|
|
100
|
+
try {
|
|
101
|
+
const stat = statSync(candidate);
|
|
102
|
+
if (stat.isFile()) {
|
|
103
|
+
return {
|
|
104
|
+
name: candidate,
|
|
105
|
+
source: readFileSync(candidate, "utf8"),
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
} catch {
|
|
109
|
+
// Ignore filesystem errors and check subsequent candidates.
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
return undefined;
|
|
114
|
+
},
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
interface JsonRpcMessage {
|
|
119
|
+
readonly id?: number | string;
|
|
120
|
+
readonly jsonrpc: "2.0";
|
|
121
|
+
readonly method?: string;
|
|
122
|
+
readonly params?: any;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
export function startLspServer(
|
|
126
|
+
input: NodeJS.ReadableStream,
|
|
127
|
+
output: NodeJS.WritableStream,
|
|
128
|
+
options: LspServerOptions = {},
|
|
129
|
+
): LspServer {
|
|
130
|
+
const documents = new Map<string, string>();
|
|
131
|
+
let isInitialized = false;
|
|
132
|
+
let isShutdown = false;
|
|
133
|
+
let buffer = Buffer.alloc(0);
|
|
134
|
+
|
|
135
|
+
const send = (message: unknown): void => {
|
|
136
|
+
const json = JSON.stringify(message);
|
|
137
|
+
const bytes = Buffer.from(json, "utf8");
|
|
138
|
+
output.write(`Content-Length: ${bytes.length}\r\n\r\n${json}`);
|
|
139
|
+
};
|
|
140
|
+
|
|
141
|
+
const validateAndPublish = (uri: string, source: string): void => {
|
|
142
|
+
const lineIdx = lineIndex(source);
|
|
143
|
+
const diagnostics: LspDiagnostic[] = [];
|
|
144
|
+
|
|
145
|
+
const parsed = parseProgram(source);
|
|
146
|
+
for (const diag of parsed.diagnostics) {
|
|
147
|
+
diagnostics.push({
|
|
148
|
+
...(diag.code ? { code: diag.code } : {}),
|
|
149
|
+
message: diag.message,
|
|
150
|
+
range: spanToRange(lineIdx, diag.span),
|
|
151
|
+
severity: 1,
|
|
152
|
+
source: "hsx",
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
if (parsed.diagnostics.length === 0) {
|
|
157
|
+
const host = createHostForUri(uri, options.host);
|
|
158
|
+
const resolved = resolveProgramModules(parsed.program, host);
|
|
159
|
+
if (!resolved.ok) {
|
|
160
|
+
for (const issue of resolved.issues) {
|
|
161
|
+
diagnostics.push({
|
|
162
|
+
code: issue.code,
|
|
163
|
+
message: issue.message,
|
|
164
|
+
range: spanToRange(lineIdx, issue.span),
|
|
165
|
+
severity: 1,
|
|
166
|
+
source: "hsx",
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
} else {
|
|
170
|
+
const checked = checkGeneralProgram(resolved.program);
|
|
171
|
+
for (const diag of checked.diagnostics) {
|
|
172
|
+
if (!resolved.origins.has(diag.span)) {
|
|
173
|
+
diagnostics.push({
|
|
174
|
+
code: diag.code,
|
|
175
|
+
message: diag.message,
|
|
176
|
+
range: spanToRange(lineIdx, diag.span),
|
|
177
|
+
severity: diag.severity === "warning" ? 2 : 1,
|
|
178
|
+
source: "hsx",
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
send({
|
|
186
|
+
jsonrpc: "2.0",
|
|
187
|
+
method: "textDocument/publishDiagnostics",
|
|
188
|
+
params: {
|
|
189
|
+
diagnostics,
|
|
190
|
+
uri,
|
|
191
|
+
},
|
|
192
|
+
});
|
|
193
|
+
};
|
|
194
|
+
|
|
195
|
+
const handleMessage = (msg: JsonRpcMessage): void => {
|
|
196
|
+
const { id, method, params } = msg;
|
|
197
|
+
|
|
198
|
+
// Requests (id is present)
|
|
199
|
+
if (id !== undefined) {
|
|
200
|
+
if (isShutdown) {
|
|
201
|
+
send({
|
|
202
|
+
error: {
|
|
203
|
+
code: -32600,
|
|
204
|
+
message: "Invalid request: server is shutting down",
|
|
205
|
+
},
|
|
206
|
+
id,
|
|
207
|
+
jsonrpc: "2.0",
|
|
208
|
+
});
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
if (!isInitialized) {
|
|
213
|
+
if (method !== "initialize") {
|
|
214
|
+
send({
|
|
215
|
+
error: {
|
|
216
|
+
code: -32002,
|
|
217
|
+
message: "Server not initialized",
|
|
218
|
+
},
|
|
219
|
+
id,
|
|
220
|
+
jsonrpc: "2.0",
|
|
221
|
+
});
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
isInitialized = true;
|
|
226
|
+
send({
|
|
227
|
+
id,
|
|
228
|
+
jsonrpc: "2.0",
|
|
229
|
+
result: {
|
|
230
|
+
capabilities: {
|
|
231
|
+
documentFormattingProvider: true,
|
|
232
|
+
textDocumentSync: 1,
|
|
233
|
+
},
|
|
234
|
+
serverInfo: {
|
|
235
|
+
name: "hsx-lsp",
|
|
236
|
+
version: "1.0.0",
|
|
237
|
+
},
|
|
238
|
+
},
|
|
239
|
+
});
|
|
240
|
+
return;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
if (method === "initialize") {
|
|
244
|
+
send({
|
|
245
|
+
id,
|
|
246
|
+
jsonrpc: "2.0",
|
|
247
|
+
result: {
|
|
248
|
+
capabilities: {
|
|
249
|
+
documentFormattingProvider: true,
|
|
250
|
+
textDocumentSync: 1,
|
|
251
|
+
},
|
|
252
|
+
serverInfo: {
|
|
253
|
+
name: "hsx-lsp",
|
|
254
|
+
version: "1.0.0",
|
|
255
|
+
},
|
|
256
|
+
},
|
|
257
|
+
});
|
|
258
|
+
return;
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
if (method === "shutdown") {
|
|
262
|
+
isShutdown = true;
|
|
263
|
+
send({
|
|
264
|
+
id,
|
|
265
|
+
jsonrpc: "2.0",
|
|
266
|
+
result: null,
|
|
267
|
+
});
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
if (method === "textDocument/formatting") {
|
|
272
|
+
const uri = params?.textDocument?.uri;
|
|
273
|
+
const source = uri ? documents.get(uri) : undefined;
|
|
274
|
+
if (!source) {
|
|
275
|
+
send({ id, jsonrpc: "2.0", result: null });
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
const formatted = format(source);
|
|
279
|
+
if (!formatted.ok) {
|
|
280
|
+
send({ id, jsonrpc: "2.0", result: null });
|
|
281
|
+
return;
|
|
282
|
+
}
|
|
283
|
+
if (formatted.formatted === source) {
|
|
284
|
+
send({ id, jsonrpc: "2.0", result: [] });
|
|
285
|
+
return;
|
|
286
|
+
}
|
|
287
|
+
const lines = lineIndex(source);
|
|
288
|
+
send({
|
|
289
|
+
id,
|
|
290
|
+
jsonrpc: "2.0",
|
|
291
|
+
result: [
|
|
292
|
+
{
|
|
293
|
+
newText: formatted.formatted,
|
|
294
|
+
range: {
|
|
295
|
+
end: offsetToPosition(lines, source.length),
|
|
296
|
+
start: { character: 0, line: 0 },
|
|
297
|
+
},
|
|
298
|
+
},
|
|
299
|
+
],
|
|
300
|
+
});
|
|
301
|
+
return;
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
send({
|
|
305
|
+
error: {
|
|
306
|
+
code: -32601,
|
|
307
|
+
message: `Method not found: ${method ?? "unknown"}`,
|
|
308
|
+
},
|
|
309
|
+
id,
|
|
310
|
+
jsonrpc: "2.0",
|
|
311
|
+
});
|
|
312
|
+
return;
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
// Notifications (id is undefined)
|
|
316
|
+
if (method === "exit") {
|
|
317
|
+
const code = isShutdown ? 0 : 1;
|
|
318
|
+
if (options.onExit) {
|
|
319
|
+
options.onExit(code);
|
|
320
|
+
} else {
|
|
321
|
+
process.exit(code);
|
|
322
|
+
}
|
|
323
|
+
return;
|
|
324
|
+
}
|
|
325
|
+
|
|
326
|
+
if (isShutdown || !isInitialized) {
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
if (method === "initialized") {
|
|
331
|
+
return;
|
|
332
|
+
}
|
|
333
|
+
|
|
334
|
+
if (method === "textDocument/didOpen") {
|
|
335
|
+
const doc = params?.textDocument;
|
|
336
|
+
if (doc?.uri && typeof doc.text === "string") {
|
|
337
|
+
documents.set(doc.uri, doc.text);
|
|
338
|
+
validateAndPublish(doc.uri, doc.text);
|
|
339
|
+
}
|
|
340
|
+
return;
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
if (method === "textDocument/didChange") {
|
|
344
|
+
const uri = params?.textDocument?.uri;
|
|
345
|
+
const changes = params?.contentChanges;
|
|
346
|
+
if (!uri || !Array.isArray(changes) || changes.length === 0) {
|
|
347
|
+
// Empty contentChanges keeps the document and republishes nothing.
|
|
348
|
+
return;
|
|
349
|
+
}
|
|
350
|
+
// Full sync only; an incremental entry would replace the document with a fragment.
|
|
351
|
+
const hasIncremental = changes.some(
|
|
352
|
+
(change: any) =>
|
|
353
|
+
change && typeof change === "object" && "range" in change,
|
|
354
|
+
);
|
|
355
|
+
if (hasIncremental) {
|
|
356
|
+
return;
|
|
357
|
+
}
|
|
358
|
+
const lastChange = changes[changes.length - 1];
|
|
359
|
+
if (lastChange && typeof lastChange.text === "string") {
|
|
360
|
+
documents.set(uri, lastChange.text);
|
|
361
|
+
validateAndPublish(uri, lastChange.text);
|
|
362
|
+
}
|
|
363
|
+
return;
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
if (method === "textDocument/didClose") {
|
|
367
|
+
const uri = params?.textDocument?.uri;
|
|
368
|
+
if (uri) {
|
|
369
|
+
documents.delete(uri);
|
|
370
|
+
send({
|
|
371
|
+
jsonrpc: "2.0",
|
|
372
|
+
method: "textDocument/publishDiagnostics",
|
|
373
|
+
params: {
|
|
374
|
+
diagnostics: [],
|
|
375
|
+
uri,
|
|
376
|
+
},
|
|
377
|
+
});
|
|
378
|
+
}
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
};
|
|
382
|
+
|
|
383
|
+
const processBuffer = (): void => {
|
|
384
|
+
while (true) {
|
|
385
|
+
const headerEnd = buffer.indexOf("\r\n\r\n");
|
|
386
|
+
if (headerEnd === -1) break;
|
|
387
|
+
const headerText = buffer.subarray(0, headerEnd).toString("ascii");
|
|
388
|
+
const match = /content-length:\s*(\d+)/i.exec(headerText);
|
|
389
|
+
if (!match) {
|
|
390
|
+
buffer = buffer.subarray(headerEnd + 4);
|
|
391
|
+
continue;
|
|
392
|
+
}
|
|
393
|
+
const contentLength = parseInt(match[1] as string, 10);
|
|
394
|
+
if (Number.isNaN(contentLength) || contentLength < 0) {
|
|
395
|
+
buffer = buffer.subarray(headerEnd + 4);
|
|
396
|
+
continue;
|
|
397
|
+
}
|
|
398
|
+
const totalLength = headerEnd + 4 + contentLength;
|
|
399
|
+
if (buffer.length < totalLength) {
|
|
400
|
+
break;
|
|
401
|
+
}
|
|
402
|
+
const bodyBytes = buffer.subarray(headerEnd + 4, totalLength);
|
|
403
|
+
buffer = buffer.subarray(totalLength);
|
|
404
|
+
const bodyStr = bodyBytes.toString("utf8");
|
|
405
|
+
try {
|
|
406
|
+
const msg = JSON.parse(bodyStr) as JsonRpcMessage;
|
|
407
|
+
handleMessage(msg);
|
|
408
|
+
} catch {
|
|
409
|
+
// Ignore unparseable JSON payload.
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
};
|
|
413
|
+
|
|
414
|
+
const flushPending = (): void => {
|
|
415
|
+
const headerEnd = buffer.indexOf("\r\n\r\n");
|
|
416
|
+
if (headerEnd !== -1) {
|
|
417
|
+
const bodyStr = buffer
|
|
418
|
+
.subarray(headerEnd + 4)
|
|
419
|
+
.toString("utf8")
|
|
420
|
+
.trim();
|
|
421
|
+
if (bodyStr.length > 0) {
|
|
422
|
+
try {
|
|
423
|
+
const msg = JSON.parse(bodyStr) as JsonRpcMessage;
|
|
424
|
+
handleMessage(msg);
|
|
425
|
+
} catch {
|
|
426
|
+
// Ignore unparseable body.
|
|
427
|
+
}
|
|
428
|
+
}
|
|
429
|
+
}
|
|
430
|
+
};
|
|
431
|
+
|
|
432
|
+
const onData = (chunk: Buffer | string): void => {
|
|
433
|
+
const incoming =
|
|
434
|
+
typeof chunk === "string" ? Buffer.from(chunk, "utf8") : chunk;
|
|
435
|
+
buffer = Buffer.concat([buffer, incoming]);
|
|
436
|
+
processBuffer();
|
|
437
|
+
};
|
|
438
|
+
|
|
439
|
+
const onEnd = (): void => {
|
|
440
|
+
processBuffer();
|
|
441
|
+
if (buffer.length > 0) {
|
|
442
|
+
flushPending();
|
|
443
|
+
}
|
|
444
|
+
if (options.onExit) {
|
|
445
|
+
options.onExit(0);
|
|
446
|
+
} else {
|
|
447
|
+
process.exit(0);
|
|
448
|
+
}
|
|
449
|
+
};
|
|
450
|
+
|
|
451
|
+
input.on("data", onData);
|
|
452
|
+
input.on("end", onEnd);
|
|
453
|
+
|
|
454
|
+
return {
|
|
455
|
+
stop(): void {
|
|
456
|
+
input.removeListener("data", onData);
|
|
457
|
+
input.removeListener("end", onEnd);
|
|
458
|
+
},
|
|
459
|
+
};
|
|
460
|
+
}
|
package/src/modules.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { existsSync, readFileSync } from "node:fs";
|
|
2
1
|
import type { UdlDocument } from "@hyperscale0/udl";
|
|
3
2
|
import type {
|
|
4
3
|
ApplicationScopeDecl,
|
|
@@ -10,6 +9,7 @@ import type {
|
|
|
10
9
|
} from "./ast.ts";
|
|
11
10
|
import { lineColIn, lineIndex } from "./ast.ts";
|
|
12
11
|
import { parseProgram } from "./parse.ts";
|
|
12
|
+
import { bundledStandardLibrary, type StandardLibrary } from "./std-library.ts";
|
|
13
13
|
|
|
14
14
|
export interface ModuleSource {
|
|
15
15
|
readonly name: string;
|
|
@@ -24,6 +24,7 @@ export interface HsxCompilerHost {
|
|
|
24
24
|
specifier: string,
|
|
25
25
|
from: string,
|
|
26
26
|
) => ModuleSource | undefined;
|
|
27
|
+
readonly standardLibrary?: StandardLibrary;
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
export interface ModuleIssue {
|
|
@@ -68,7 +69,12 @@ export function resolveProgramModules(
|
|
|
68
69
|
);
|
|
69
70
|
for (const declaration of imports) {
|
|
70
71
|
const requested = declaration.names.map((name) => name.name);
|
|
71
|
-
const
|
|
72
|
+
const stdLib = host.standardLibrary ?? bundledStandardLibrary;
|
|
73
|
+
const sources = standardSources(
|
|
74
|
+
stdLib,
|
|
75
|
+
declaration.from.value,
|
|
76
|
+
requested,
|
|
77
|
+
);
|
|
72
78
|
const custom =
|
|
73
79
|
sources.length === 0
|
|
74
80
|
? host.resolveModule?.(declaration.from.value, from)
|
|
@@ -321,7 +327,13 @@ function declarationReferences(decl: Decl): {
|
|
|
321
327
|
if (decl.kind === "type") collectExprNames(decl.value, names, ports);
|
|
322
328
|
if (decl.kind === "party" && decl.attrs)
|
|
323
329
|
collectExprNames(decl.attrs, names, ports);
|
|
324
|
-
if (decl.kind === "port")
|
|
330
|
+
if (decl.kind === "port") {
|
|
331
|
+
collectExprNames(decl.body, names, ports);
|
|
332
|
+
const allowed = decl.body.entries.find(
|
|
333
|
+
(entry) => entry.key.name === "allowed",
|
|
334
|
+
);
|
|
335
|
+
if (allowed) collectApplicationPartyNames(allowed.value, parties);
|
|
336
|
+
}
|
|
325
337
|
if (decl.kind === "instrument_apply" || isApplicationScopeDecl(decl)) {
|
|
326
338
|
names.delete(decl.name.name);
|
|
327
339
|
parties.delete(decl.name.name);
|
|
@@ -421,22 +433,18 @@ function collectTemplatedNameReferences(
|
|
|
421
433
|
}
|
|
422
434
|
|
|
423
435
|
function standardSources(
|
|
436
|
+
standardLibrary: StandardLibrary,
|
|
424
437
|
specifier: string,
|
|
425
438
|
names: readonly string[],
|
|
426
439
|
): ModuleSource[] {
|
|
427
|
-
if (specifier !== "std/
|
|
440
|
+
if (specifier !== "std/money_flows") return [];
|
|
428
441
|
return names.flatMap((name) => {
|
|
429
|
-
const
|
|
430
|
-
|
|
431
|
-
new URL(`../std/${relative}`, import.meta.url),
|
|
432
|
-
new URL(`../../std/${relative}`, import.meta.url),
|
|
433
|
-
];
|
|
434
|
-
const url = candidates.find((candidate) => existsSync(candidate));
|
|
435
|
-
return url
|
|
442
|
+
const source = standardLibrary.source(specifier, name);
|
|
443
|
+
return source !== undefined
|
|
436
444
|
? [
|
|
437
445
|
{
|
|
438
|
-
name: `std.
|
|
439
|
-
source
|
|
446
|
+
name: `std.money_flows.${name}`,
|
|
447
|
+
source,
|
|
440
448
|
},
|
|
441
449
|
]
|
|
442
450
|
: [];
|
package/src/parse.ts
CHANGED
|
@@ -367,7 +367,7 @@ class Parser {
|
|
|
367
367
|
if (
|
|
368
368
|
!this.expectPunct(
|
|
369
369
|
"{",
|
|
370
|
-
'import lists its names in braces: import { held_payment } from "std/
|
|
370
|
+
'import lists its names in braces: import { held_payment } from "std/money_flows"',
|
|
371
371
|
)
|
|
372
372
|
) {
|
|
373
373
|
return undefined;
|
|
@@ -385,7 +385,7 @@ class Parser {
|
|
|
385
385
|
if (!this.at("keyword") || this.peek().text !== "from") {
|
|
386
386
|
this.error(
|
|
387
387
|
this.peek().span,
|
|
388
|
-
'import needs from: import { held_payment } from "std/
|
|
388
|
+
'import needs from: import { held_payment } from "std/money_flows"',
|
|
389
389
|
);
|
|
390
390
|
return undefined;
|
|
391
391
|
}
|
|
@@ -393,7 +393,7 @@ class Parser {
|
|
|
393
393
|
if (!this.at("string")) {
|
|
394
394
|
this.error(
|
|
395
395
|
this.peek().span,
|
|
396
|
-
'the import source must be a quoted module name like "std/
|
|
396
|
+
'the import source must be a quoted module name like "std/money_flows"',
|
|
397
397
|
);
|
|
398
398
|
return undefined;
|
|
399
399
|
}
|