@hyperscale0/hsx 1.0.0-beta.1 → 1.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 +58 -9
- package/LICENSING.md +3 -3
- package/README.md +39 -149
- package/TRADEMARKS.md +4 -4
- 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 +135 -10
- 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 +4 -1
- package/dist/src/cli.d.ts.map +1 -1
- package/dist/src/cli.js +172 -16
- package/dist/src/cli.js.map +1 -1
- package/dist/src/compile.d.ts +42 -7
- package/dist/src/compile.d.ts.map +1 -1
- package/dist/src/compile.js +82 -16
- package/dist/src/compile.js.map +1 -1
- package/dist/src/cost.d.ts +78 -0
- package/dist/src/cost.d.ts.map +1 -0
- package/dist/src/cost.js +369 -0
- package/dist/src/cost.js.map +1 -0
- package/dist/src/diagnostics.d.ts +11 -0
- package/dist/src/diagnostics.d.ts.map +1 -0
- package/dist/src/diagnostics.js +420 -0
- package/dist/src/diagnostics.js.map +1 -0
- package/dist/src/emit.d.ts +34 -0
- package/dist/src/emit.d.ts.map +1 -0
- package/dist/src/emit.js +137 -0
- package/dist/src/emit.js.map +1 -0
- package/dist/src/entry-overrides.d.ts +17 -3
- package/dist/src/entry-overrides.d.ts.map +1 -1
- package/dist/src/entry-overrides.js +180 -35
- package/dist/src/entry-overrides.js.map +1 -1
- package/dist/src/format.d.ts +10 -0
- package/dist/src/format.d.ts.map +1 -0
- package/dist/src/format.js +183 -0
- package/dist/src/format.js.map +1 -0
- package/dist/src/index.d.ts +11 -4
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +10 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/ir.d.ts +66 -0
- package/dist/src/ir.d.ts.map +1 -0
- package/dist/src/ir.js +15 -0
- package/dist/src/ir.js.map +1 -0
- package/dist/src/lex.d.ts +9 -1
- package/dist/src/lex.d.ts.map +1 -1
- package/dist/src/lex.js +50 -4
- package/dist/src/lex.js.map +1 -1
- package/dist/src/limits.d.ts +2 -3
- package/dist/src/limits.d.ts.map +1 -1
- package/dist/src/limits.js +2 -3
- package/dist/src/limits.js.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 +38 -0
- package/dist/src/modules.d.ts.map +1 -0
- package/dist/src/modules.js +368 -0
- package/dist/src/modules.js.map +1 -0
- package/dist/src/parse.d.ts.map +1 -1
- package/dist/src/parse.js +590 -17
- 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 +8 -0
- package/dist/src/typecheck.d.ts.map +1 -0
- package/dist/src/typecheck.js +2958 -0
- package/dist/src/typecheck.js.map +1 -0
- package/dist/src/version.d.ts +4 -15
- package/dist/src/version.d.ts.map +1 -1
- package/dist/src/version.js +4 -15
- package/dist/src/version.js.map +1 -1
- package/docs/README.md +26 -0
- package/docs/guide/01-first-program.md +24 -0
- package/docs/guide/02-money.md +25 -0
- package/docs/guide/03-instruments.md +22 -0
- package/docs/guide/04-lifecycles.md +25 -0
- package/docs/guide/05-fees-and-splits.md +45 -0
- package/docs/guide/06-schedules.md +22 -0
- package/docs/guide/07-composition.md +46 -0
- package/docs/guide/08-writing-a-module.md +26 -0
- package/docs/guide/09-cost.md +24 -0
- package/docs/guide/10-diagnostics.md +27 -0
- package/docs/llms-full.txt +1739 -0
- package/docs/llms.txt +45 -0
- package/docs/playground.md +54 -0
- package/docs/reference/cli.md +35 -0
- package/docs/reference/diagnostics.md +619 -0
- package/docs/reference/grammar.md +39 -0
- package/docs/reference/std/advance.md +35 -0
- package/docs/reference/std/cancellable_booking.md +35 -0
- package/docs/reference/std/captured_payment.md +43 -0
- package/docs/reference/std/conditional_disbursement.md +33 -0
- package/docs/reference/std/credit_facility.md +35 -0
- package/docs/reference/std/held_payment.md +64 -0
- package/docs/reference/std/instant_transfer.md +30 -0
- package/docs/reference/std/metered.md +27 -0
- package/docs/reference/std/pooled_split.md +26 -0
- package/docs/reference/std/premium_forward.md +39 -0
- package/docs/reference/std/reconciled_payout.md +33 -0
- package/docs/reference/std/recurring_collection.md +25 -0
- package/docs/reference/std/rotating_pool.md +42 -0
- package/docs/reference/std/scheduled.md +51 -0
- package/docs/reference/std/security_deposit.md +46 -0
- package/docs/reference/std/settlement_batch.md +42 -0
- package/docs/reference/std/swap.md +46 -0
- package/docs/reference/std/threshold_pool.md +47 -0
- package/docs/reference/std/weighted_distribution.md +39 -0
- package/docs/reference/types.md +20 -0
- package/docs/reference/udl-output.md +13 -0
- package/docs/sessions/2026-09-02-two-instruments.hsx +21 -0
- package/docs/sessions/2026-09-02-two-instruments.md +41 -0
- package/examples/01-first-program/README.md +45 -0
- package/examples/01-first-program/tip-jar.hsx +17 -0
- package/examples/02-imports-and-archetypes/README.md +96 -0
- package/examples/02-imports-and-archetypes/photo-booth.hsx +37 -0
- package/examples/03-diagnostics/README.md +68 -0
- package/examples/03-diagnostics/corner-shop-fixed.hsx +22 -0
- package/examples/03-diagnostics/corner-shop.hsx +19 -0
- package/examples/04-complete-product/README.md +84 -0
- package/examples/04-complete-product/study-hall.hsx +67 -0
- package/examples/05-watch-club/README.md +9 -0
- package/examples/05-watch-club/watch-club.hsx +124 -0
- package/examples/README.md +18 -0
- package/examples/advance/README.md +3 -0
- package/examples/advance/advance.hsx +13 -0
- package/examples/advance/advance.udl +339 -0
- package/examples/cancellable_booking/README.md +3 -0
- package/examples/cancellable_booking/cancellable_booking.hsx +14 -0
- package/examples/cancellable_booking/cancellable_booking.udl +391 -0
- package/examples/captured_payment/README.md +3 -0
- package/examples/captured_payment/captured_payment.hsx +21 -0
- package/examples/captured_payment/captured_payment.udl +677 -0
- package/examples/conditional_disbursement/README.md +3 -0
- package/examples/conditional_disbursement/conditional_disbursement.hsx +17 -0
- package/examples/conditional_disbursement/conditional_disbursement.udl +412 -0
- package/examples/cost-table.json +386 -0
- package/examples/credit_facility/README.md +3 -0
- package/examples/credit_facility/credit_facility.hsx +27 -0
- package/examples/credit_facility/credit_facility.udl +1373 -0
- package/examples/held_payment/README.md +3 -0
- package/examples/held_payment/held_payment.hsx +13 -0
- package/examples/held_payment/held_payment.udl +507 -0
- package/examples/instant_transfer/README.md +3 -0
- package/examples/instant_transfer/instant_transfer.hsx +16 -0
- package/examples/instant_transfer/instant_transfer.udl +364 -0
- package/examples/metered/README.md +3 -0
- package/examples/metered/metered.hsx +13 -0
- package/examples/metered/metered.udl +247 -0
- package/examples/pooled_split/README.md +3 -0
- package/examples/pooled_split/pooled_split.hsx +15 -0
- package/examples/pooled_split/pooled_split.udl +425 -0
- package/examples/premium_forward/README.md +3 -0
- package/examples/premium_forward/premium_forward.hsx +19 -0
- package/examples/premium_forward/premium_forward.udl +594 -0
- package/examples/reconciled_payout/README.md +3 -0
- package/examples/reconciled_payout/reconciled_payout.hsx +13 -0
- package/examples/reconciled_payout/reconciled_payout.udl +303 -0
- package/examples/recurring_collection/README.md +3 -0
- package/examples/recurring_collection/recurring_collection.hsx +21 -0
- package/examples/recurring_collection/recurring_collection.udl +1130 -0
- package/examples/rotating_pool/README.md +3 -0
- package/examples/rotating_pool/rotating_pool.hsx +18 -0
- package/examples/rotating_pool/rotating_pool.udl +4352 -0
- package/examples/scheduled/README.md +3 -0
- package/examples/scheduled/scheduled.hsx +12 -0
- package/examples/scheduled/scheduled.udl +335 -0
- package/examples/security_deposit/README.md +3 -0
- package/examples/security_deposit/security_deposit.hsx +21 -0
- package/examples/security_deposit/security_deposit.udl +293 -0
- package/examples/settlement_batch/README.md +3 -0
- package/examples/settlement_batch/settlement_batch.hsx +19 -0
- package/examples/settlement_batch/settlement_batch.udl +753 -0
- package/examples/swap/README.md +3 -0
- package/examples/swap/swap.hsx +19 -0
- package/examples/swap/swap.udl +876 -0
- package/examples/threshold_pool/README.md +3 -0
- package/examples/threshold_pool/threshold_pool.hsx +16 -0
- package/examples/threshold_pool/threshold_pool.udl +667 -0
- package/examples/weighted_distribution/README.md +3 -0
- package/examples/weighted_distribution/weighted_distribution.hsx +20 -0
- package/examples/weighted_distribution/weighted_distribution.udl +337 -0
- package/package.json +27 -6
- package/skills/hsx/SKILL.md +483 -0
- package/src/ast.ts +193 -9
- package/src/cli.ts +191 -20
- package/src/compile.ts +160 -23
- package/src/cost.ts +579 -0
- package/src/diagnostics.ts +442 -0
- package/src/emit.ts +201 -0
- package/src/entry-overrides.ts +263 -48
- package/src/format.ts +261 -0
- package/src/index.ts +34 -4
- package/src/ir.ts +99 -0
- package/src/lex.ts +59 -4
- package/src/limits.ts +2 -3
- package/src/lsp/server.ts +460 -0
- package/src/modules.ts +446 -0
- package/src/parse.ts +655 -21
- package/src/std-bundle.ts +91 -0
- package/src/std-library.ts +12 -0
- package/src/typecheck.ts +3876 -0
- package/src/version.ts +4 -16
- package/std/SEMANTICS.md +130 -0
- package/std/settlements/advance.hsx +177 -0
- package/std/settlements/cancellable_booking.hsx +87 -0
- package/std/settlements/captured_payment.hsx +144 -0
- package/std/settlements/conditional_disbursement.hsx +185 -0
- package/std/settlements/credit_facility.hsx +167 -0
- package/std/settlements/held_payment.hsx +578 -0
- package/std/settlements/index.hsx +3 -0
- package/std/settlements/instant_transfer.hsx +190 -0
- package/std/settlements/metered.hsx +67 -0
- package/std/settlements/pooled_split.hsx +68 -0
- package/std/settlements/premium_forward.hsx +257 -0
- package/std/settlements/reconciled_payout.hsx +77 -0
- package/std/settlements/recurring_collection.hsx +27 -0
- package/std/settlements/rotating_pool.hsx +252 -0
- package/std/settlements/scheduled.hsx +641 -0
- package/std/settlements/security_deposit.hsx +166 -0
- package/std/settlements/settlement_batch.hsx +122 -0
- package/std/settlements/swap.hsx +1114 -0
- package/std/settlements/threshold_pool.hsx +221 -0
- package/std/settlements/weighted_distribution.hsx +141 -0
- package/dist/src/archetypes.d.ts +0 -17
- package/dist/src/archetypes.d.ts.map +0 -1
- package/dist/src/archetypes.js +0 -327
- package/dist/src/archetypes.js.map +0 -1
- package/dist/src/check.d.ts +0 -12
- package/dist/src/check.d.ts.map +0 -1
- package/dist/src/check.js +0 -1910
- package/dist/src/check.js.map +0 -1
- package/dist/src/lower.d.ts +0 -146
- package/dist/src/lower.d.ts.map +0 -1
- package/dist/src/lower.js +0 -4570
- package/dist/src/lower.js.map +0 -1
- package/dist/src/model.d.ts +0 -467
- package/dist/src/model.d.ts.map +0 -1
- package/dist/src/model.js +0 -15
- package/dist/src/model.js.map +0 -1
- package/spec/hsx-ir.schema.json +0 -920
- package/src/archetypes.ts +0 -340
- package/src/check.ts +0 -2938
- package/src/lower.ts +0 -5416
- package/src/model.ts +0 -519
package/src/index.ts
CHANGED
|
@@ -1,11 +1,41 @@
|
|
|
1
|
-
export {
|
|
2
|
-
|
|
1
|
+
export {
|
|
2
|
+
compile,
|
|
3
|
+
type CompileDiagnostic,
|
|
4
|
+
type CompileOptions,
|
|
5
|
+
type CompileOriginMapEntry,
|
|
6
|
+
type CompileResult,
|
|
7
|
+
} from "./compile.ts";
|
|
8
|
+
export {
|
|
9
|
+
buildUdlCostManifest,
|
|
10
|
+
computeUdlFixedCost,
|
|
11
|
+
evaluateUdlCostManifest,
|
|
12
|
+
type HsxEffectKind,
|
|
13
|
+
type UdlCostManifest,
|
|
14
|
+
type UdlCostTable,
|
|
15
|
+
} from "./cost.ts";
|
|
16
|
+
export {
|
|
17
|
+
hsxDiagnostics,
|
|
18
|
+
type HsxDiagnosticCatalogEntry,
|
|
19
|
+
} from "./diagnostics.ts";
|
|
20
|
+
export type { HsxCompilerHost, ModuleSource } from "./modules.ts";
|
|
21
|
+
export { format, type FormatResult } from "./format.ts";
|
|
22
|
+
export { KEYWORDS } from "./lex.ts";
|
|
3
23
|
export {
|
|
4
24
|
overrideProgramEntries,
|
|
5
25
|
type ProgramEntryOverride,
|
|
6
26
|
type ProgramEntryOverrideIssue,
|
|
7
27
|
type ProgramEntryOverrideValue,
|
|
8
28
|
} from "./entry-overrides.ts";
|
|
9
|
-
export {
|
|
29
|
+
export { type OriginMapEntry } from "./emit.ts";
|
|
30
|
+
export { lowerGeneralProgram } from "./emit.ts";
|
|
10
31
|
export { parseProgram } from "./parse.ts";
|
|
11
|
-
export type
|
|
32
|
+
export { checkGeneralProgram, type GeneralCheckOptions } from "./typecheck.ts";
|
|
33
|
+
export {
|
|
34
|
+
byteOffsetToCodeUnit,
|
|
35
|
+
type BlockExpr,
|
|
36
|
+
type ExposeDecl,
|
|
37
|
+
type Program,
|
|
38
|
+
type ProgramDecl,
|
|
39
|
+
type UseDecl,
|
|
40
|
+
} from "./ast.ts";
|
|
41
|
+
export { bundledStandardLibrary, type StandardLibrary } from "./std-library.ts";
|
package/src/ir.ts
ADDED
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import type { Span } from "./ast.ts";
|
|
2
|
+
import type { UdlEffectKind } from "@hyperscale0/udl";
|
|
3
|
+
|
|
4
|
+
export type JsonValue =
|
|
5
|
+
| boolean
|
|
6
|
+
| number
|
|
7
|
+
| string
|
|
8
|
+
| null
|
|
9
|
+
| readonly JsonValue[]
|
|
10
|
+
| { readonly [key: string]: JsonValue };
|
|
11
|
+
|
|
12
|
+
export const HSX_TYPE_KINDS = [
|
|
13
|
+
"account",
|
|
14
|
+
"boolean",
|
|
15
|
+
"bps",
|
|
16
|
+
"condition",
|
|
17
|
+
"date",
|
|
18
|
+
"integer",
|
|
19
|
+
"money",
|
|
20
|
+
"party",
|
|
21
|
+
"percent",
|
|
22
|
+
"ref",
|
|
23
|
+
"text",
|
|
24
|
+
"unknown",
|
|
25
|
+
] as const;
|
|
26
|
+
|
|
27
|
+
export interface HsxType {
|
|
28
|
+
readonly currency?: string;
|
|
29
|
+
/** Positive safe integer minor units fixed by money(CUR, amount). */
|
|
30
|
+
readonly fixedAmount?: string;
|
|
31
|
+
readonly kind: (typeof HSX_TYPE_KINDS)[number];
|
|
32
|
+
readonly target?: string;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export interface TypedField {
|
|
36
|
+
readonly name: string;
|
|
37
|
+
readonly origin: Span;
|
|
38
|
+
readonly required: boolean;
|
|
39
|
+
readonly schema: Readonly<Record<string, JsonValue>>;
|
|
40
|
+
readonly type: HsxType;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export interface TypedAction {
|
|
44
|
+
readonly effects: Readonly<
|
|
45
|
+
Partial<
|
|
46
|
+
Record<
|
|
47
|
+
UdlEffectKind,
|
|
48
|
+
readonly {
|
|
49
|
+
readonly signature: string;
|
|
50
|
+
readonly source: string;
|
|
51
|
+
readonly channel?: string;
|
|
52
|
+
readonly role?: string;
|
|
53
|
+
}[]
|
|
54
|
+
>
|
|
55
|
+
>
|
|
56
|
+
>;
|
|
57
|
+
readonly name: string;
|
|
58
|
+
readonly origin: Span;
|
|
59
|
+
readonly slots: Readonly<Record<string, JsonValue>>;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export interface TypedInstrument {
|
|
63
|
+
readonly actions: readonly TypedAction[];
|
|
64
|
+
readonly fields: readonly TypedField[];
|
|
65
|
+
readonly id: string;
|
|
66
|
+
readonly origin: Span;
|
|
67
|
+
readonly slots: Readonly<Record<string, JsonValue>>;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
export interface TypedSubject {
|
|
71
|
+
readonly declaredValue: "none" | "optional" | "required";
|
|
72
|
+
readonly kind: string;
|
|
73
|
+
readonly origin: Span;
|
|
74
|
+
readonly schema: Readonly<Record<string, JsonValue>>;
|
|
75
|
+
readonly title: string;
|
|
76
|
+
readonly version: number;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
export interface TypedProgram {
|
|
80
|
+
readonly instruments: readonly TypedInstrument[];
|
|
81
|
+
readonly kind: "typed_program";
|
|
82
|
+
readonly name: string;
|
|
83
|
+
readonly origin: Span;
|
|
84
|
+
readonly subjects: readonly TypedSubject[];
|
|
85
|
+
readonly title: string;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export interface GeneralDiagnostic {
|
|
89
|
+
readonly code: string;
|
|
90
|
+
readonly fix: string;
|
|
91
|
+
readonly message: string;
|
|
92
|
+
readonly severity: "error" | "warning";
|
|
93
|
+
readonly span: Span;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
export interface GeneralCheckResult {
|
|
97
|
+
readonly diagnostics: readonly GeneralDiagnostic[];
|
|
98
|
+
readonly program?: TypedProgram;
|
|
99
|
+
}
|
package/src/lex.ts
CHANGED
|
@@ -17,13 +17,29 @@ type TokenKind =
|
|
|
17
17
|
| "string";
|
|
18
18
|
|
|
19
19
|
export const KEYWORDS = [
|
|
20
|
+
"action",
|
|
21
|
+
"as",
|
|
20
22
|
"asset",
|
|
23
|
+
"commit",
|
|
24
|
+
"const",
|
|
25
|
+
"expect",
|
|
26
|
+
"expose",
|
|
27
|
+
"expires",
|
|
28
|
+
"export",
|
|
21
29
|
"from",
|
|
22
30
|
"import",
|
|
31
|
+
"instrument",
|
|
32
|
+
"module",
|
|
23
33
|
"party",
|
|
24
34
|
"port",
|
|
25
35
|
"program",
|
|
36
|
+
"quote",
|
|
37
|
+
"rate",
|
|
38
|
+
"reconcile",
|
|
26
39
|
"settlement",
|
|
40
|
+
"subject",
|
|
41
|
+
"type",
|
|
42
|
+
"use",
|
|
27
43
|
] as const;
|
|
28
44
|
|
|
29
45
|
export interface Token {
|
|
@@ -35,7 +51,31 @@ export interface Token {
|
|
|
35
51
|
readonly value: string;
|
|
36
52
|
}
|
|
37
53
|
|
|
38
|
-
|
|
54
|
+
/** Source trivia retained for tools that must reproduce author comments. */
|
|
55
|
+
export interface CommentTrivia {
|
|
56
|
+
readonly kind: "line_comment";
|
|
57
|
+
readonly span: Span;
|
|
58
|
+
readonly text: string;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export const PUNCT = [
|
|
62
|
+
"{",
|
|
63
|
+
"}",
|
|
64
|
+
"(",
|
|
65
|
+
")",
|
|
66
|
+
"[",
|
|
67
|
+
"]",
|
|
68
|
+
":",
|
|
69
|
+
",",
|
|
70
|
+
";",
|
|
71
|
+
"=",
|
|
72
|
+
"|",
|
|
73
|
+
".",
|
|
74
|
+
"<",
|
|
75
|
+
">",
|
|
76
|
+
"?",
|
|
77
|
+
] as const;
|
|
78
|
+
const PUNCT_SET: ReadonlySet<string> = new Set(PUNCT);
|
|
39
79
|
const KEYWORD_SET: ReadonlySet<string> = new Set(KEYWORDS);
|
|
40
80
|
|
|
41
81
|
// Case conventions (snake_case declarations, uppercase currency codes) are
|
|
@@ -45,12 +85,14 @@ const isIdentPart = (ch: string): boolean => /[A-Za-z0-9_]/.test(ch);
|
|
|
45
85
|
const isDigit = (ch: string): boolean => ch >= "0" && ch <= "9";
|
|
46
86
|
|
|
47
87
|
export interface LexResult {
|
|
88
|
+
readonly comments: readonly CommentTrivia[];
|
|
48
89
|
readonly diagnostics: readonly Diagnostic[];
|
|
49
90
|
readonly tokens: readonly Token[];
|
|
50
91
|
}
|
|
51
92
|
|
|
52
93
|
export function lex(source: string): LexResult {
|
|
53
94
|
const tokens: Token[] = [];
|
|
95
|
+
const comments: CommentTrivia[] = [];
|
|
54
96
|
const diagnostics: Diagnostic[] = [];
|
|
55
97
|
let index = 0;
|
|
56
98
|
|
|
@@ -67,17 +109,30 @@ export function lex(source: string): LexResult {
|
|
|
67
109
|
}
|
|
68
110
|
|
|
69
111
|
if (ch === "/" && source[index + 1] === "/") {
|
|
112
|
+
const start = index;
|
|
70
113
|
while (index < source.length && source[index] !== "\n") index += 1;
|
|
114
|
+
comments.push({
|
|
115
|
+
kind: "line_comment",
|
|
116
|
+
span: { end: index, start },
|
|
117
|
+
text: source.slice(start, index),
|
|
118
|
+
});
|
|
71
119
|
continue;
|
|
72
120
|
}
|
|
73
121
|
|
|
74
|
-
if (
|
|
122
|
+
if (PUNCT_SET.has(ch)) {
|
|
75
123
|
const start = index;
|
|
76
124
|
index += 1;
|
|
77
125
|
push("punct", start, ch);
|
|
78
126
|
continue;
|
|
79
127
|
}
|
|
80
128
|
|
|
129
|
+
if (ch === "-" && source[index + 1] === ">") {
|
|
130
|
+
const start = index;
|
|
131
|
+
index += 2;
|
|
132
|
+
push("punct", start, "->");
|
|
133
|
+
continue;
|
|
134
|
+
}
|
|
135
|
+
|
|
81
136
|
if (ch === '"') {
|
|
82
137
|
const start = index;
|
|
83
138
|
index += 1;
|
|
@@ -139,7 +194,7 @@ export function lex(source: string): LexResult {
|
|
|
139
194
|
while (
|
|
140
195
|
index < source.length &&
|
|
141
196
|
!/[\sA-Za-z0-9_"]/.test(source[index] as string) &&
|
|
142
|
-
!
|
|
197
|
+
!PUNCT_SET.has(source[index] as string) &&
|
|
143
198
|
!(source[index] === "/" && source[index + 1] === "/")
|
|
144
199
|
) {
|
|
145
200
|
index += 1;
|
|
@@ -157,5 +212,5 @@ export function lex(source: string): LexResult {
|
|
|
157
212
|
text: "",
|
|
158
213
|
value: "",
|
|
159
214
|
});
|
|
160
|
-
return { diagnostics, tokens };
|
|
215
|
+
return { comments, diagnostics, tokens };
|
|
161
216
|
}
|
package/src/limits.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* What the compiler refuses to read, as opposed to what it refuses to emit.
|
|
3
|
-
*
|
|
4
|
-
* which is the side an attacker controls.
|
|
3
|
+
* These bounds cap the input side an attacker controls.
|
|
5
4
|
*
|
|
6
5
|
* Both numbers are set against the 34 real programs this compiler is tested
|
|
7
6
|
* on. The deepest nests 5 levels; the largest is 13,934 bytes.
|
|
@@ -16,6 +15,6 @@ export const HSX_LIMITS = Object.freeze({
|
|
|
16
15
|
* 12x the deepest real program and 144x below that measured crash.
|
|
17
16
|
*/
|
|
18
17
|
maxNestingDepth: 64,
|
|
19
|
-
/**
|
|
18
|
+
/** 18x the largest real HSX program. */
|
|
20
19
|
maxSourceBytes: 256 * 1_024,
|
|
21
20
|
});
|