tla-ts 0.0.3-dev.07eab97 → 0.0.3-dev.0ad0249

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.
Files changed (80) hide show
  1. package/dist/cli.cjs +1 -1
  2. package/dist/cli.js +1 -1
  3. package/dist/index.cjs +1 -1
  4. package/dist/index.d.cts +160 -46
  5. package/dist/index.d.ts +160 -46
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +2 -2
  9. package/dist/parallel.cjs +1 -1
  10. package/dist/parallel.js +2 -2
  11. package/dist/run-cli.cjs +1351 -22
  12. package/dist/run-cli.js +1351 -22
  13. package/dist/transfer.cjs +83 -33
  14. package/dist/transfer.js +83 -33
  15. package/package.json +4 -1
  16. package/src/ast.ts +42 -5
  17. package/src/bags.ts +4 -7
  18. package/src/builtins.ts +29 -17
  19. package/src/bundled-modules.ts +3 -3
  20. package/src/canonical.ts +4 -3
  21. package/src/check.ts +1296 -429
  22. package/src/cli.ts +8 -1
  23. package/src/codegen.ts +68 -21
  24. package/src/config.ts +225 -206
  25. package/src/environment.ts +388 -115
  26. package/src/errors.ts +155 -18
  27. package/src/evaluate.ts +713 -259
  28. package/src/exit-codes.ts +6 -24
  29. package/src/fingerprints.ts +1 -2
  30. package/src/index.ts +1 -0
  31. package/src/instances.ts +3 -1
  32. package/src/java-overrides.ts +104 -25
  33. package/src/levels.ts +37 -27
  34. package/src/lexer.ts +14 -1
  35. package/src/live-check.ts +204 -148
  36. package/src/liveness.ts +191 -122
  37. package/src/obligation-expression.ts +2 -2
  38. package/src/obligation-source.ts +2 -0
  39. package/src/parallel-worker.ts +6 -1
  40. package/src/parallel.ts +57 -6
  41. package/src/parser.ts +369 -115
  42. package/src/pcal-ast.ts +770 -0
  43. package/src/pcal-parse.ts +1523 -0
  44. package/src/pcal-tokenize.ts +516 -0
  45. package/src/pcal-translate.ts +1230 -0
  46. package/src/pcal-validate.ts +454 -0
  47. package/src/randomization.ts +24 -7
  48. package/src/resolve.ts +1332 -453
  49. package/src/run-cli.ts +1161 -196
  50. package/src/runtime.ts +16 -0
  51. package/src/sany-builtins.ts +147 -0
  52. package/src/sany-generator.ts +3112 -0
  53. package/src/sany-levels.ts +1208 -0
  54. package/src/sany-lexer.ts +545 -0
  55. package/src/sany-linter.ts +122 -0
  56. package/src/sany-modules.ts +1398 -0
  57. package/src/sany-nodes.ts +463 -0
  58. package/src/sany-parse-error.ts +2161 -0
  59. package/src/sany-report.ts +354 -0
  60. package/src/sany-selectors.ts +738 -0
  61. package/src/sany-source.ts +248 -0
  62. package/src/sany-xml.ts +1017 -0
  63. package/src/spec-description.ts +25 -5
  64. package/src/standard-modules.ts +172 -129
  65. package/src/standard-ranges.ts +116 -0
  66. package/src/state-graph.ts +29 -6
  67. package/src/subexpressions.ts +221 -161
  68. package/src/successors.ts +141 -173
  69. package/src/symmetry.ts +168 -50
  70. package/src/tableau.ts +3 -1
  71. package/src/tlc-ext.ts +13 -17
  72. package/src/tlc-messages.ts +329 -0
  73. package/src/tlc-module.ts +49 -21
  74. package/src/tlc-modules.ts +0 -4
  75. package/src/tlc-order.ts +55 -9
  76. package/src/tlc-random.ts +28 -3
  77. package/src/tlc-replay.ts +655 -0
  78. package/src/tlc-version.ts +18 -0
  79. package/src/transfer.ts +15 -3
  80. package/src/values.ts +664 -317
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tla-ts",
3
- "version": "0.0.3-dev.07eab97",
3
+ "version": "0.0.3-dev.0ad0249",
4
4
  "description": "A TLA+ interpreter and model checker in TypeScript, 2× faster than TLC",
5
5
  "keywords": [
6
6
  "formal verification",
@@ -54,6 +54,9 @@
54
54
  "publishConfig": {
55
55
  "access": "public"
56
56
  },
57
+ "dependencies": {
58
+ "fflate": "^0.8.3"
59
+ },
57
60
  "devDependencies": {
58
61
  "@types/node": "^22",
59
62
  "publint": "^0.3.0",
package/src/ast.ts CHANGED
@@ -33,9 +33,12 @@ export interface StringExpression {
33
33
  location: SourceLocation;
34
34
  }
35
35
 
36
+ // selectorRanges holds the range of each part of a name such as foo!lab, where SANY reports an
37
+ // error in selecting that part.
36
38
  export interface IdentifierExpression {
37
39
  kind: "Identifier";
38
40
  name: string;
41
+ selectorRanges?: SourceRange[];
39
42
  location: SourceLocation;
40
43
  resolution?: LocalResolution;
41
44
  }
@@ -49,6 +52,9 @@ export interface ApplyExpression {
49
52
  argumentCounts?: number[];
50
53
  // The range of the parenthesized arguments of a named operator, where SANY reports their count.
51
54
  argumentsRange?: SourceRange;
55
+ selectorRanges?: SourceRange[];
56
+ // The range of the arguments of each part of a name like F(x)!l(y), for a part that takes some.
57
+ argumentRanges?: (SourceRange | undefined)[];
52
58
  location: SourceLocation;
53
59
  resolution?: LocalResolution;
54
60
  }
@@ -62,6 +68,7 @@ export interface OperatorReferenceExpression {
62
68
  export interface LambdaExpression {
63
69
  kind: "Lambda";
64
70
  params: string[];
71
+ paramRanges?: SourceRange[];
65
72
  body: Expression;
66
73
  location: SourceLocation;
67
74
  }
@@ -70,6 +77,9 @@ export interface JunctionExpression {
70
77
  kind: "And" | "Or";
71
78
  operands: Expression[];
72
79
  isBulleted?: boolean;
80
+ // SANY parses an infix chain such as A /\ B /\ C as (A /\ B) /\ C, whose node of each prefix of
81
+ // two or more operands ends after the parentheses of its last operand.
82
+ prefixEnds?: SourceLocation[];
73
83
  location: SourceLocation;
74
84
  }
75
85
 
@@ -119,7 +129,10 @@ export interface LetExpression {
119
129
  location: SourceLocation;
120
130
  }
121
131
 
122
- export type BoundPattern = { kind: "Name"; name: string } | { kind: "Tuple"; names: string[] };
132
+ // ranges holds the range of each name the pattern binds.
133
+ export type BoundPattern =
134
+ | { kind: "Name"; name: string; ranges?: SourceRange[] }
135
+ | { kind: "Tuple"; names: string[]; ranges?: SourceRange[] };
123
136
 
124
137
  export interface Bound {
125
138
  pattern: BoundPattern;
@@ -137,6 +150,7 @@ export interface UnboundedQuantifierExpression {
137
150
  kind: "UnboundedQuantifier";
138
151
  quantifier: "Forall" | "Exists";
139
152
  names: string[];
153
+ nameRanges?: SourceRange[];
140
154
  isTemporal?: boolean;
141
155
  body: Expression;
142
156
  location: SourceLocation;
@@ -231,6 +245,14 @@ export interface FunctionApplicationExpression {
231
245
  location: SourceLocation;
232
246
  }
233
247
 
248
+ // SANY parses [e1, ..., en] as a function application without the function, and its semantic
249
+ // checker rejects it.
250
+ export interface BracketExpression {
251
+ kind: "Bracket";
252
+ args: Expression[];
253
+ location: SourceLocation;
254
+ }
255
+
234
256
  export interface FieldAccessExpression {
235
257
  kind: "FieldAccess";
236
258
  record: Expression;
@@ -269,6 +291,7 @@ export interface LabelExpression {
269
291
  kind: "Label";
270
292
  name: string;
271
293
  params: string[];
294
+ paramRanges?: SourceRange[];
272
295
  body: Expression;
273
296
  location: SourceLocation;
274
297
  }
@@ -283,6 +306,8 @@ export type Selector =
283
306
  export interface SubexpressionExpression {
284
307
  kind: "Subexpression";
285
308
  selectors: Selector[];
309
+ selectorRanges?: SourceRange[];
310
+ argumentRanges?: (SourceRange | undefined)[];
286
311
  location: SourceLocation;
287
312
  }
288
313
 
@@ -314,6 +339,7 @@ export type Expression =
314
339
  | ExceptExpression
315
340
  | ExceptAtExpression
316
341
  | FunctionApplicationExpression
342
+ | BracketExpression
317
343
  | FieldAccessExpression
318
344
  | ProductExpression
319
345
  | TemporalExpression
@@ -346,6 +372,8 @@ export interface FunctionDefinition {
346
372
  body: Expression;
347
373
  isLocal: boolean;
348
374
  isRecursive: boolean;
375
+ // Whether the body applies the function, which SANY makes a recursive function definition.
376
+ isSelfReferential?: boolean;
349
377
  location: SourceLocation;
350
378
  }
351
379
 
@@ -366,6 +394,7 @@ export interface Assumption {
366
394
 
367
395
  export interface InstanceSubstitution {
368
396
  name: string;
397
+ nameRange: SourceRange;
369
398
  expression: Expression;
370
399
  }
371
400
 
@@ -387,6 +416,7 @@ export interface NewSymbol {
387
416
  arity: number;
388
417
  level: "Constant" | "Variable" | "State" | "Action" | "Temporal";
389
418
  set: Expression | undefined;
419
+ nameRange?: SourceRange;
390
420
  location: SourceLocation;
391
421
  }
392
422
 
@@ -438,9 +468,15 @@ export type StepBody =
438
468
  | Instance
439
469
  | DefineStep
440
470
  | { kind: "Have"; expression: Expression }
441
- | { kind: "Take"; names: string[]; bounds: Bound[] }
471
+ | { kind: "Take"; names: string[]; nameRanges?: SourceRange[]; bounds: Bound[] }
442
472
  | { kind: "Witness"; expressions: Expression[] }
443
- | { kind: "Pick"; names: string[]; bounds: Bound[]; body: Expression }
473
+ | {
474
+ kind: "Pick";
475
+ names: string[];
476
+ nameRanges?: SourceRange[];
477
+ bounds: Bound[];
478
+ body: Expression;
479
+ }
444
480
  | { kind: "Case"; expression: Expression }
445
481
  | { kind: "Assert"; isSuffices: boolean; statement: Expression | AssumeProve }
446
482
  | { kind: "Qed" };
@@ -466,8 +502,7 @@ export interface Theorem {
466
502
 
467
503
  // The units of a module in source order, for consumers that need the order across kinds.
468
504
  export type ModuleUnit =
469
- | { kind: "Constants"; declarations: Declaration[] }
470
- | { kind: "Variables"; declarations: Declaration[] }
505
+ | { kind: "Constants" | "Variables"; declarations: Declaration[]; location: SourceLocation }
471
506
  | { kind: "Recursive"; declarations: Declaration[] }
472
507
  | { kind: "Definition"; definition: Definition }
473
508
  | { kind: "Instance"; instance: Instance }
@@ -561,6 +596,8 @@ export const getChildren = (expression: Expression): Expression[] => {
561
596
  ];
562
597
  case "FunctionApplication":
563
598
  return [expression.function, ...expression.args];
599
+ case "Bracket":
600
+ return expression.args;
564
601
  case "FieldAccess":
565
602
  return [expression.record];
566
603
  case "Product":
package/src/bags.ts CHANGED
@@ -123,7 +123,8 @@ const mergeBags = (bags: FunctionValue[], method: string) =>
123
123
 
124
124
  const EMPTY_BAG = createSortedFunction([], []);
125
125
 
126
- export const BAGS_OPERATORS: Builtin[] = [
126
+ // SubBag compares the counts with the >= of Naturals, which Integers replaces when TLC loads it.
127
+ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Builtin[] => [
127
128
  defineConstant("EmptyBag", EMPTY_BAG),
128
129
  defineOperator("IsABag", 1, (args) => {
129
130
  const functionValue = toFunction(getValue(args, 0, "IsABag"));
@@ -228,12 +229,8 @@ export const BAGS_OPERATORS: Builtin[] = [
228
229
  const functionValue = toFiniteFunction(value);
229
230
  const range = createSet(functionValue.range).elements;
230
231
  const invalid = range.find((count) => typeof count !== "number");
231
- if (invalid !== undefined) {
232
- const isFirst = typeof range[0] !== "number";
233
- throw new TlaEvaluationError(
234
- `The ${isFirst ? "first" : "second"} argument of >= should be an integer, but instead it is:\n${formatValue(isFirst ? range[0] : invalid)}`,
235
- );
236
- }
232
+ // A count that isn't an integer fails the comparison.
233
+ if (invalid !== undefined) builtins.get(">=")?.evaluateBinary?.(range[0], invalid);
237
234
  const counts = functionValue.range.filter((count) => typeof count === "number");
238
235
  if (counts.some((count) => count < 1)) {
239
236
  throw new TlaEvaluationError(
package/src/builtins.ts CHANGED
@@ -2,6 +2,7 @@ import { TlaEvaluationError, TlaModuleError } from "./errors";
2
2
  import type { Builtin, BuiltinArgument, Context, OperatorValue } from "./evaluate";
3
3
  import {
4
4
  formatValue,
5
+ getFunctionClass,
5
6
  getSequenceElements,
6
7
  isEnumerable,
7
8
  isFunctionValue,
@@ -9,6 +10,7 @@ import {
9
10
  toFiniteFunction,
10
11
  MAXIMUM_INTEGER,
11
12
  MINIMUM_INTEGER,
13
+ setTrace,
12
14
  toFiniteSet,
13
15
  type Value,
14
16
  } from "./values";
@@ -243,17 +245,20 @@ const KIND_STRINGS: Record<string, string> = {
243
245
  UnionValue: "a set of the form UNION S",
244
246
  };
245
247
 
246
- // TLC stores a function as a TupleValue or a RecordValue when it has that shape, so the
247
- // shape stands in for how TLC built the value.
248
+ const FUNCTION_CLASSES = {
249
+ lambda: "FcnLambdaValue",
250
+ tuple: "TupleValue",
251
+ record: "RecordValue",
252
+ };
253
+
248
254
  export const getJavaClassName = (value: Value) => {
249
255
  if (typeof value === "number") return "IntValue";
250
256
  if (typeof value === "string") return "StringValue";
251
257
  if (typeof value === "boolean") return "BoolValue";
252
258
  if (value.kind === "SetOperation") return SET_OPERATION_CLASSES[value.operator];
253
259
  if (value.kind !== "Function") return JAVA_CLASSES[value.kind];
254
- const domain = value.domain;
255
- if (domain.every((key, index) => key === index + 1)) return "TupleValue";
256
- return domain.every((key) => typeof key === "string") ? "RecordValue" : "FcnRcdValue";
260
+ const functionClass = getFunctionClass(value);
261
+ return functionClass === undefined ? "FcnRcdValue" : FUNCTION_CLASSES[functionClass];
257
262
  };
258
263
 
259
264
  export const getKindString = (value: Value) => KIND_STRINGS[getJavaClassName(value)];
@@ -270,13 +275,17 @@ export const overrideWithJava = (builtin: Builtin, signature: string): Builtin =
270
275
  const guard =
271
276
  <Arguments extends unknown[]>(compute: (...args: Arguments) => Value) =>
272
277
  (...args: Arguments) => {
278
+ const depth = setTrace.sets?.length ?? 0;
273
279
  try {
274
280
  return compute(...args);
275
281
  } catch (error) {
276
282
  const isWrapped =
277
283
  error instanceof TlaEvaluationError &&
278
284
  (builtin.isLazy === true || !(error instanceof TlaModuleError));
279
- throw isWrapped ? createJavaOverrideError(signature, error.message) : error;
285
+ if (!isWrapped) throw error;
286
+ // The wrapping error replaces a FingerprintException that a set with a source raised.
287
+ if (setTrace.sets) setTrace.sets.length = depth;
288
+ throw createJavaOverrideError(signature, error.message);
280
289
  }
281
290
  };
282
291
  return {
@@ -297,21 +306,16 @@ export const getJavaInteger = (value: Value, signature: string) => {
297
306
  return value;
298
307
  };
299
308
 
300
- export const getArithmeticSignature = (
301
- javaClass: "Naturals" | "Integers",
302
- method: string,
303
- result: string,
304
- arity: number,
305
- ) =>
306
- `public static tlc2.value.impl.${result} tlc2.module.${javaClass}.${method}(${Array.from({ length: arity }, () => "tlc2.value.impl.IntValue").join(",")})`;
309
+ export const getJavaSignature = (module: string, method: string, result: string, arity: number) =>
310
+ `public static tlc2.value.impl.${result} tlc2.module.${module}.${method}(${Array.from({ length: arity }, () => "tlc2.value.impl.IntValue").join(",")})`;
307
311
 
308
312
  export const defineArithmetic = (
309
- javaClass: "Naturals" | "Integers",
313
+ module: string,
310
314
  name: string,
311
315
  method: string,
312
316
  compute: (left: number, right: number) => number,
313
317
  ) => {
314
- const signature = getArithmeticSignature(javaClass, method, "IntValue", 2);
318
+ const signature = getJavaSignature(module, method, "IntValue", 2);
315
319
  return defineBinary(name, (left, right) => {
316
320
  const leftNumber = getJavaInteger(left, signature);
317
321
  const rightNumber = getJavaInteger(right, signature);
@@ -330,9 +334,17 @@ const getIntegerArgument = (value: Value, position: string, name: string) => {
330
334
  return value;
331
335
  };
332
336
 
333
- export const defineComparison = (name: string, compare: (left: number, right: number) => boolean) =>
337
+ // The error of an argument that isn't an integer names the operator as TLC's method does.
338
+ export const defineComparison = (
339
+ name: string,
340
+ compare: (left: number, right: number) => boolean,
341
+ errorName = name,
342
+ ) =>
334
343
  defineBinary(name, (left, right) =>
335
- compare(getIntegerArgument(left, "first", name), getIntegerArgument(right, "second", name)),
344
+ compare(
345
+ getIntegerArgument(left, "first", errorName),
346
+ getIntegerArgument(right, "second", errorName),
347
+ ),
336
348
  );
337
349
 
338
350
  export const defineLazyOperator = (
@@ -1,6 +1,6 @@
1
1
  // TLC's Reals.tla, RealTime.tla, and Toolbox.tla, verbatim, so that errors inside them name the same
2
2
  // lines as TLC's errors.
3
- const REALS = `-------------------------------- MODULE Reals -------------------------------
3
+ export const REALS = `-------------------------------- MODULE Reals -------------------------------
4
4
  (***************************************************************************)
5
5
  (* This module provides dummy definitions of the operators that are *)
6
6
  (* defined by the real Reals module. It is expected that any tool that *)
@@ -19,7 +19,7 @@ a / b == CHOOSE m \\in Real : m * b = a
19
19
  Infinity == CHOOSE i : (i \\notin Real) /\\ (\\A r \\in Real : i > r)
20
20
  =============================================================================`;
21
21
 
22
- const REAL_TIME = `----------------------------- MODULE RealTime -------------------------------
22
+ export const REAL_TIME = `----------------------------- MODULE RealTime -------------------------------
23
23
  (***************************************************************************)
24
24
  (* This standard module is described in Chapter 9 of the book "Specifying *)
25
25
  (* Systems". The type of specification described there cannot be handled *)
@@ -47,7 +47,7 @@ RTnow(v) == LET NowNext == /\\ now' \\in {r \\in Real : r > now}
47
47
  /\\ \\A r \\in Real : WF_now(NowNext /\\ (now'>r))
48
48
  =============================================================================`;
49
49
 
50
- const TOOLBOX = `----------------------------- MODULE Toolbox --------------------------------
50
+ export const TOOLBOX = `----------------------------- MODULE Toolbox --------------------------------
51
51
  (***************************************************************************)
52
52
  (* *)
53
53
  (***************************************************************************)
package/src/canonical.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { getValueHash, isSameValue, type Value } from "./values";
1
+ import { getValueHash, isInterchangeableValue, type Value } from "./values";
2
2
 
3
3
  const canonicalizeElements = (elements: Value[], canonicalize: (value: Value) => Value) => {
4
4
  for (let index = 0; index < elements.length; index++) {
@@ -15,11 +15,12 @@ export const createCanonicalizer = () => {
15
15
  const hash = getValueHash(value);
16
16
  const bucket = canonicalValues.get(hash);
17
17
  if (bucket !== undefined && !Array.isArray(bucket)) {
18
- if (bucket === value || isSameValue(bucket, value)) return bucket;
18
+ if (bucket === value || isInterchangeableValue(bucket, value)) return bucket;
19
19
  }
20
20
  if (Array.isArray(bucket)) {
21
21
  for (let index = 0; index < bucket.length; index++) {
22
- if (bucket[index] === value || isSameValue(bucket[index], value)) return bucket[index];
22
+ if (bucket[index] === value || isInterchangeableValue(bucket[index], value))
23
+ return bucket[index];
23
24
  }
24
25
  }
25
26
  if (value.kind === "Set") canonicalizeElements(value.elements, canonicalize);