tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.63a6693bd

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 (172) hide show
  1. package/dist/compile.cjs +6 -6
  2. package/dist/compile.js +10 -10
  3. package/dist/deciders.cjs +29 -29
  4. package/dist/deciders.js +40 -40
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +1 -1
  9. package/dist/prove-worker.cjs +1 -1
  10. package/dist/prove-worker.js +1 -1
  11. package/dist/prove.cjs +54 -54
  12. package/dist/prove.js +52 -52
  13. package/dist/run.cjs +42 -42
  14. package/dist/run.js +44 -44
  15. package/dist/tlapm.cjs +2 -2
  16. package/dist/tlapm.js +2 -2
  17. package/dist/transfer.cjs +39 -39
  18. package/dist/transfer.js +41 -41
  19. package/dist/worker.cjs +4 -4
  20. package/dist/worker.js +4 -4
  21. package/package.json +1 -1
  22. package/src/ast.ts +44 -39
  23. package/src/builtins.ts +4 -13
  24. package/src/check-failure.ts +116 -0
  25. package/src/check-trace.ts +282 -0
  26. package/src/check.ts +152 -518
  27. package/src/cli/options.ts +6 -31
  28. package/src/cli/shared.ts +1 -1
  29. package/src/cli/tlapm.ts +14 -13
  30. package/src/cli/tlc-arguments.ts +222 -210
  31. package/src/cli/tlc-output.ts +687 -0
  32. package/src/cli/tlc-usage.ts +1 -1
  33. package/src/cli/tlc.ts +34 -701
  34. package/src/cli/xml-exporter.ts +23 -33
  35. package/src/codegen.ts +5 -10
  36. package/src/coverage.ts +3 -10
  37. package/src/dependencies.ts +8 -13
  38. package/src/dfid.ts +16 -16
  39. package/src/environment-config.ts +315 -0
  40. package/src/environment.ts +45 -333
  41. package/src/errors.ts +3 -2
  42. package/src/evaluate.ts +5 -4
  43. package/src/fingerprints.ts +65 -1
  44. package/src/instances.ts +47 -10
  45. package/src/java-hash.ts +7 -0
  46. package/src/json.ts +4 -7
  47. package/src/levels.ts +39 -42
  48. package/src/liveness-checker.ts +24 -37
  49. package/src/liveness.ts +47 -54
  50. package/src/obligations/action.ts +4 -11
  51. package/src/obligations/anonymize.ts +4 -2
  52. package/src/obligations/expression.ts +18 -2
  53. package/src/obligations/generate.ts +45 -38
  54. package/src/obligations/index.ts +2 -2
  55. package/src/obligations/module.ts +27 -38
  56. package/src/obligations/normalize.ts +2 -1
  57. package/src/obligations/simplify.ts +39 -44
  58. package/src/obligations/source.ts +47 -57
  59. package/src/obligations/temporal.ts +5 -5
  60. package/src/parallel-worker.ts +10 -30
  61. package/src/parallel.ts +22 -45
  62. package/src/parser.ts +19 -34
  63. package/src/prover/decide-pool.ts +3 -3
  64. package/src/prover/deciders.ts +3 -3
  65. package/src/prover/isabelle/encode.ts +1 -1
  66. package/src/prover/isabelle/isar/inner-syntax.ts +9 -4
  67. package/src/prover/isabelle/isar/method.ts +14 -25
  68. package/src/prover/isabelle/isar/theory.ts +11 -10
  69. package/src/prover/isabelle/isar/type-check.ts +6 -6
  70. package/src/prover/isabelle/provers/blast/blast.ts +7 -63
  71. package/src/prover/isabelle/provers/hypsubst.ts +17 -26
  72. package/src/prover/isabelle/pure/bicompose.ts +9 -25
  73. package/src/prover/isabelle/pure/conv.ts +2 -8
  74. package/src/prover/isabelle/pure/drule.ts +9 -2
  75. package/src/prover/isabelle/pure/logic.ts +1 -1
  76. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -13
  77. package/src/prover/isabelle/pure/rewriter.ts +5 -9
  78. package/src/prover/isabelle/pure/table.ts +2 -1
  79. package/src/prover/isabelle/pure/tactical.ts +42 -35
  80. package/src/prover/isabelle/pure/thm.ts +14 -11
  81. package/src/prover/isabelle/tla/classical-setup.ts +17 -14
  82. package/src/prover/isabelle/tla/context.ts +7 -2
  83. package/src/prover/isabelle/tla/logic.ts +10 -21
  84. package/src/prover/isabelle/tla/simpdata.ts +1 -10
  85. package/src/prover/prep/action.ts +11 -19
  86. package/src/prover/prep/fingerprint.ts +2 -5
  87. package/src/prover/prep/methods.ts +24 -3
  88. package/src/prover/prove.ts +87 -64
  89. package/src/prover/smt/context.ts +1 -2
  90. package/src/prover/smt/data.ts +418 -406
  91. package/src/prover/smt/encode.ts +30 -18
  92. package/src/prover/smt/rewrite.ts +657 -626
  93. package/src/prover/smt/solver/ast.ts +0 -22
  94. package/src/prover/smt/solver/auf-solver.ts +2 -5
  95. package/src/prover/smt/solver/context.ts +3 -3
  96. package/src/prover/smt/solver/e-matching.ts +1 -1
  97. package/src/prover/smt/solver/expr-safe-replace.ts +1 -1
  98. package/src/prover/smt/solver/internalizer.ts +1 -2
  99. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -8
  100. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -1
  101. package/src/prover/smt/solver/lp/nla-core.ts +2 -6
  102. package/src/prover/smt/solver/mam-compiler.ts +4 -2
  103. package/src/prover/smt/solver/model-checker.ts +1 -1
  104. package/src/prover/smt/solver/model-finder.ts +12 -17
  105. package/src/prover/smt/solver/model-macro-solver.ts +11 -19
  106. package/src/prover/smt/solver/nlsat/algebraic.ts +9 -9
  107. package/src/prover/smt/solver/nlsat/atoms.ts +20 -4
  108. package/src/prover/smt/solver/nlsat/explain.ts +7 -22
  109. package/src/prover/smt/solver/nlsat/levelwise.ts +1 -6
  110. package/src/prover/smt/solver/nlsat/polynomial.ts +12 -3
  111. package/src/prover/smt/solver/nlsat/solver.ts +12 -24
  112. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -1
  113. package/src/prover/smt/solver/proto-model.ts +0 -4
  114. package/src/prover/smt/solver/quantifier-analyzer.ts +10 -10
  115. package/src/prover/smt/solver/quantifier-manager.ts +1 -5
  116. package/src/prover/smt/solver/smtlib-parser.ts +78 -94
  117. package/src/prover/smt/solver/theory-lra-bounds.ts +1 -2
  118. package/src/prover/smt/solver/theory-lra-internalize.ts +5 -16
  119. package/src/prover/tlapm/cache.ts +28 -18
  120. package/src/prover/tlapm/tlapm.ts +15 -9
  121. package/src/prover/verdict.ts +7 -0
  122. package/src/prover/zenon/check/check.ts +1 -2
  123. package/src/prover/zenon/check/records.ts +1 -1
  124. package/src/prover/zenon/check/relations.ts +2 -1
  125. package/src/prover/zenon/check/rewrites.ts +2 -15
  126. package/src/prover/zenon/check/sets.ts +40 -58
  127. package/src/prover/zenon/check/terms.ts +1 -2
  128. package/src/prover/zenon/eqrel.ts +2 -0
  129. package/src/prover/zenon/expr.ts +7 -0
  130. package/src/prover/zenon/index-table.ts +9 -19
  131. package/src/prover/zenon/isar.ts +35 -35
  132. package/src/prover/zenon/llproof.ts +2 -11
  133. package/src/prover/zenon/mltoll.ts +12 -28
  134. package/src/prover/zenon/parse.ts +3 -6
  135. package/src/prover/zenon/search.ts +4 -14
  136. package/src/prover/zenon/tla/functions.ts +2 -2
  137. package/src/prover/zenon/tla/llproof.ts +9 -11
  138. package/src/prover/zenon/tla/records.ts +1 -6
  139. package/src/prover/zenon/tla/sets.ts +15 -14
  140. package/src/prover/zenon/tla/tla.ts +7 -6
  141. package/src/resolve.ts +55 -72
  142. package/src/sany/generation.ts +394 -0
  143. package/src/sany/generator-def-entries.ts +210 -0
  144. package/src/sany/generator-definitions.ts +686 -0
  145. package/src/sany/generator-expressions.ts +1100 -0
  146. package/src/sany/generator-proofs.ts +662 -0
  147. package/src/sany/generator.ts +155 -2625
  148. package/src/sany/lexer.ts +17 -16
  149. package/src/sany/nodes.ts +6 -13
  150. package/src/sany/report.ts +3 -6
  151. package/src/sany/selectors.ts +35 -38
  152. package/src/sany/xml.ts +23 -55
  153. package/src/search.ts +65 -27
  154. package/src/simulate.ts +157 -133
  155. package/src/spec-description.ts +33 -48
  156. package/src/standard-modules.ts +16 -32
  157. package/src/state-graph.ts +2 -7
  158. package/src/substitution-levels.ts +5 -4
  159. package/src/successors.ts +5 -7
  160. package/src/tlc/messages.ts +20 -15
  161. package/src/tlc/order.ts +2 -9
  162. package/src/tlc/random.ts +4 -4
  163. package/src/tlc/replay.ts +8 -15
  164. package/src/tlc/tlc-operators.ts +2 -3
  165. package/src/tlc/trace-spec.ts +25 -45
  166. package/src/typescript/actions.ts +2 -4
  167. package/src/typescript/collections.ts +34 -20
  168. package/src/typescript/compile.ts +1 -3
  169. package/src/typescript/formula.ts +5 -3
  170. package/src/typescript/model.ts +4 -5
  171. package/src/typescript/steps.ts +20 -18
  172. package/src/values.ts +63 -158
@@ -1,4 +1,6 @@
1
+ import { getJavaHashCode } from "../java-hash";
1
2
  import { formatValue, type Value } from "../values";
3
+ import { zeroPad } from "./messages";
2
4
 
3
5
  interface TraceSpecInput {
4
6
  module: string;
@@ -10,23 +12,14 @@ interface TraceSpecInput {
10
12
  isDefined: (name: string) => boolean;
11
13
  }
12
14
 
13
- interface TraceState {
14
- values: [string, string][];
15
- number: number;
16
- isStuttering: boolean;
17
- isBackToState: boolean;
18
- }
19
-
20
15
  const INDENT = " ";
21
16
  const SEPARATOR = "\n----\n";
22
17
  const CLOSING_TAG = `${"=".repeat(77)}\n`;
23
18
  const LASSO_START = "_TTraceLassoStart";
24
19
  const LASSO_END = "_TTraceLassoEnd";
25
20
 
26
- const getJavaHash = (text: string) => {
27
- const hash = text
28
- .split("")
29
- .reduce((current, unit) => (Math.imul(current, 31) + unit.charCodeAt(0)) | 0, 0);
21
+ const getHashMapHash = (text: string) => {
22
+ const hash = getJavaHashCode(text);
30
23
  return hash ^ (hash >>> 16);
31
24
  };
32
25
 
@@ -34,17 +27,16 @@ const getHashOrder = (names: string[]) => {
34
27
  const unique = [...new Set(names)];
35
28
  const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
36
29
  return unique
37
- .map((name, index) => ({ name, index, bucket: getJavaHash(name) & (capacity - 1) }))
30
+ .map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
38
31
  .sort((left, right) => left.bucket - right.bucket || left.index - right.index)
39
32
  .map((entry) => entry.name);
40
33
  };
41
34
 
42
35
  const formatJavaDate = (date: Date) => {
43
- const pad = (value: number) => String(value).padStart(2, "0");
44
36
  const getPart = (options: Intl.DateTimeFormatOptions, type: Intl.DateTimeFormatPartTypes) =>
45
37
  new Intl.DateTimeFormat("en-US", options).formatToParts(date).find((part) => part.type === type)
46
38
  ?.value;
47
- return `${getPart({ weekday: "short" }, "weekday")} ${getPart({ month: "short" }, "month")} ${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())} ${getPart({ timeZoneName: "short" }, "timeZoneName")} ${date.getFullYear()}`;
39
+ return `${getPart({ weekday: "short" }, "weekday")} ${getPart({ month: "short" }, "month")} ${zeroPad(date.getDate())} ${zeroPad(date.getHours())}:${zeroPad(date.getMinutes())}:${zeroPad(date.getSeconds())} ${getPart({ timeZoneName: "short" }, "timeZoneName")} ${date.getFullYear()}`;
48
40
  };
49
41
 
50
42
  const splitLines = (text: string) => {
@@ -61,11 +53,11 @@ const indent = (text: string, depth: number) => {
61
53
  const getPrimer = (module: string, extendedModules: string[]) =>
62
54
  `---- MODULE ${module} ----\nEXTENDS ${extendedModules.join(", ")}\n\n`;
63
55
 
64
- const getConjunction = (state: TraceState, prefix?: string) =>
56
+ const getConjunction = (state: [string, string][], prefix?: string) =>
65
57
  indent(
66
58
  [
67
59
  ...(prefix === undefined ? [] : [prefix]),
68
- ...state.values.map(([name, value]) => `${name} = (${value})`),
60
+ ...state.map(([name, value]) => `${name} = (${value})`),
69
61
  ].join("\n/\\\n"),
70
62
  2,
71
63
  );
@@ -109,26 +101,18 @@ ${examples}`;
109
101
 
110
102
  export const writeTraceSpec = (input: TraceSpecInput) => {
111
103
  const loopStart = input.loopStart;
112
- const states = input.states.map((state, index): TraceState => ({
113
- values: getHashOrder(Object.keys(state)).map((name) => [name, formatValue(state[name])]),
114
- number: index + 1,
115
- isStuttering: false,
116
- isBackToState: false,
117
- }));
118
- const trace =
119
- loopStart === undefined
120
- ? states
121
- : [
122
- ...states,
123
- loopStart === states.length - 1
124
- ? { ...states[loopStart], isStuttering: true }
125
- : { ...states[loopStart], isBackToState: true },
126
- ];
127
- if (trace.length <= 1) return undefined;
104
+ const states = input.states.map((state) =>
105
+ getHashOrder(Object.keys(state)).map((name): [string, string] => [
106
+ name,
107
+ formatValue(state[name]),
108
+ ]),
109
+ );
110
+ if (states.length + (loopStart === undefined ? 0 : 1) <= 1) return undefined;
128
111
  const variables = Object.keys(input.states[0]);
129
112
  const specName = input.specName;
130
- const final = trace[trace.length - 1];
131
- const isLasso = final.isBackToState;
113
+ const final = states[states.length - 1];
114
+ const isStuttering = loopStart === states.length - 1;
115
+ const isLasso = loopStart !== undefined && !isStuttering;
132
116
 
133
117
  const declaredNames = new Set(input.rawConstants.map((line) => line.split(" = ")[0]));
134
118
  const constantLines = [
@@ -136,7 +120,7 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
136
120
  ...input.modelValues
137
121
  .filter((name) => !declaredNames.has(name))
138
122
  .map((name) => indent(`${name} = ${name}`, 1)),
139
- ...(isLasso ? [`${LASSO_START} = ${final.number}`, `${LASSO_END} = ${trace.length - 1}`] : []),
123
+ ...(isLasso ? [`${LASSO_START} = ${loopStart + 1}`, `${LASSO_END} = ${states.length}`] : []),
140
124
  ];
141
125
  const teConstants = [
142
126
  ...input.modelValues.filter((name) => !input.isDefined(name)),
@@ -158,16 +142,16 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
158
142
  const expressionModule = `${specName}_TEExpression`;
159
143
  const traceModule = `${specName}_TETrace`;
160
144
 
161
- const property = final.isStuttering
145
+ const property = isStuttering
162
146
  ? {
163
147
  config: "\nPROPERTY\n _prop\n",
164
- definition: `\n_prop ==\n${INDENT}~<>[](\n${getConjunction(trace[trace.length - 2])}\n${INDENT})`,
148
+ definition: `\n_prop ==\n${INDENT}~<>[](\n${getConjunction(final)}\n${INDENT})`,
165
149
  }
166
150
  : isLasso
167
151
  ? {
168
152
  config: "\nPROPERTY\n _prop\n",
169
153
  definition: `\n_prop ==\n${indent(
170
- `~(([]<>(\n${getConjunction(trace[trace.length - 2])}\n))/\\([]<>(\n${getConjunction(trace[final.number - 1])}\n)))`,
154
+ `~(([]<>(\n${getConjunction(final)}\n))/\\([]<>(\n${getConjunction(states[loopStart])}\n)))`,
171
155
  1,
172
156
  )}`,
173
157
  }
@@ -196,11 +180,8 @@ ${lassoStep}${variables
196
180
  \\* IN J!JsonSerialize("${input.module}.json", _TETrace)
197
181
 
198
182
  `;
199
- const statesWithoutLasso = trace.filter((state) => !state.isBackToState && !state.isStuttering);
200
183
  const isViewed =
201
- isLasso &&
202
- new Set(statesWithoutLasso.map((state) => JSON.stringify(state.values))).size <
203
- statesWithoutLasso.length;
184
+ isLasso && new Set(states.map((state) => JSON.stringify(state))).size < states.length;
204
185
  const view = isViewed
205
186
  ? {
206
187
  config: "\nVIEW\n _view\n",
@@ -208,10 +189,9 @@ ${lassoStep}${variables
208
189
  }
209
190
  : { config: "", definition: "" };
210
191
  const deserializedTrace = `\n${getPrimer(traceModule, getHashOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
211
- const traceFunction = `${INDENT}<<\n${statesWithoutLasso
192
+ const traceFunction = `${INDENT}<<\n${states
212
193
  .map(
213
- (state) =>
214
- `${INDENT}([${state.values.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
194
+ (state) => `${INDENT}([${state.map(([name, value]) => `${name} |-> ${value}`).join(",")}])`,
215
195
  )
216
196
  .join(",\n")}\n${INDENT}>>${SEPARATOR}\n`;
217
197
 
@@ -1,5 +1,5 @@
1
1
  import ts from "@typescript/typescript6";
2
- import { getUpdatedValue, MUTATING_METHODS } from "./collections";
2
+ import { getUpdatedValue, MUTATING_METHODS, REMOVALS } from "./collections";
3
3
  import {
4
4
  type Context,
5
5
  getFunction,
@@ -177,9 +177,7 @@ const getRemovedValue = (
177
177
  const sequence = translateExpression(receiver, path.scope, context);
178
178
  return {
179
179
  value: method === "shift" ? `Head(${sequence})` : `${wrap(sequence)}[Len(${sequence})]`,
180
- path: assign(receiver, path, context, (current) =>
181
- method === "shift" ? `Tail(${current})` : `SubSeq(${current}, 1, Len(${current}) - 1)`,
182
- ),
180
+ path: assign(receiver, path, context, REMOVALS[method]),
183
181
  };
184
182
  };
185
183
 
@@ -278,6 +278,12 @@ const translateFirstIndex = (
278
278
  };
279
279
  };
280
280
 
281
+ const orUndefined = (exists: string, value: string, isDefined: boolean, context: Context) => {
282
+ if (isDefined) return value;
283
+ context.prelude.add("Undefined");
284
+ return `IF ${exists} THEN ${value} ELSE Undefined`;
285
+ };
286
+
281
287
  const translateSequenceOperation = (
282
288
  node: MethodCall,
283
289
  sequence: string,
@@ -293,11 +299,6 @@ const translateSequenceOperation = (
293
299
  ts.isPrefixUnaryExpression(inner) && inner.operator === ts.SyntaxKind.MinusToken;
294
300
  const getOffset = (inner: ts.Expression) =>
295
301
  isNegative(inner) ? `Len(${sequence}) - ${wrap(translate(inner.operand))}` : translate(inner);
296
- const orUndefined = (exists: string, value: string) => {
297
- if (isDefined) return value;
298
- context.prelude.add("Undefined");
299
- return `IF ${exists} THEN ${value} ELSE Undefined`;
300
- };
301
302
  const translateEach = (format: (index: string, body: string) => string) => () => {
302
303
  const index = context.names.getFresh("index");
303
304
  const inner = bindIndexed(argument, `${wrapped}[${index}]`, index, scope, context);
@@ -310,7 +311,12 @@ const translateSequenceOperation = (
310
311
  const index = isNegative(argument)
311
312
  ? `${getOffset(argument)} + 1`
312
313
  : `${wrap(translate(argument))} + 1`;
313
- return orUndefined(`${index} \\in DOMAIN ${wrapped}`, `${wrapped}[${index}]`);
314
+ return orUndefined(
315
+ `${index} \\in DOMAIN ${wrapped}`,
316
+ `${wrapped}[${index}]`,
317
+ isDefined,
318
+ context,
319
+ );
314
320
  },
315
321
  ],
316
322
  [
@@ -383,7 +389,7 @@ const translateSequenceOperation = (
383
389
  "find",
384
390
  () => {
385
391
  const result = translateFirstIndex(sequence, argument, scope, context);
386
- return orUndefined(result.exists, `${wrapped}[${result.first}]`);
392
+ return orUndefined(result.exists, `${wrapped}[${result.first}]`, isDefined, context);
387
393
  },
388
394
  ],
389
395
  [
@@ -421,9 +427,7 @@ const translateUnorderedMethod = (
421
427
  const binding = `${element.variable} \\in ${wrap(source.set)} : ${body}`;
422
428
  if (method === "every") return `\\A ${binding}`;
423
429
  if (method === "some") return `\\E ${binding}`;
424
- if (isDefined) return `CHOOSE ${binding}`;
425
- context.prelude.add("Undefined");
426
- return `IF \\E ${binding} THEN CHOOSE ${binding} ELSE Undefined`;
430
+ return orUndefined(`\\E ${binding}`, `CHOOSE ${binding}`, isDefined, context);
427
431
  };
428
432
 
429
433
  const translateSetMethod = (node: MethodCall, scope: Scope, context: Context) => {
@@ -446,6 +450,8 @@ const translateSetMethod = (node: MethodCall, scope: Scope, context: Context) =>
446
450
  const operation = operations.get(method);
447
451
  if (operation === undefined)
448
452
  throw new TlaTypeScriptError(`Unsupported Set method: ${method}`, node);
453
+ if (node.arguments[0] === undefined)
454
+ throw new TlaTypeScriptError(`Set method needs an argument: ${method}`, node);
449
455
  return operation;
450
456
  };
451
457
 
@@ -461,21 +467,29 @@ const translateMapMethod = (
461
467
  node.arguments[0] === undefined
462
468
  ? ""
463
469
  : wrap(translateExpression(node.arguments[0], scope, context));
470
+ if (method !== "has" && method !== "get")
471
+ throw new TlaTypeScriptError(`Unsupported Map method: ${method}`, node);
472
+ if (node.arguments[0] === undefined)
473
+ throw new TlaTypeScriptError(`Map method needs a key: ${method}`, node);
464
474
  if (method === "has") return `${key} \\in DOMAIN ${map}`;
465
- if (method !== "get") throw new TlaTypeScriptError(`Unsupported Map method: ${method}`, node);
466
475
  if (isDefined) return `${map}[${key}]`;
467
- context.prelude.add("Undefined");
468
476
  return share(map, "map", context, (sharedMap) =>
469
- share(
470
- key,
471
- "key",
472
- context,
473
- (sharedKey) =>
474
- `IF ${sharedKey} \\in DOMAIN ${sharedMap} THEN ${sharedMap}[${sharedKey}] ELSE Undefined`,
477
+ share(key, "key", context, (sharedKey) =>
478
+ orUndefined(
479
+ `${sharedKey} \\in DOMAIN ${sharedMap}`,
480
+ `${sharedMap}[${sharedKey}]`,
481
+ isDefined,
482
+ context,
483
+ ),
475
484
  ),
476
485
  );
477
486
  };
478
487
 
488
+ export const REMOVALS = {
489
+ pop: (current: string) => `SubSeq(${current}, 1, Len(${current}) - 1)`,
490
+ shift: (current: string) => `Tail(${current})`,
491
+ };
492
+
479
493
  const UPDATES = new Map<Kind, Map<string, Update>>([
480
494
  [
481
495
  "sequence",
@@ -488,8 +502,8 @@ const UPDATES = new Map<Kind, Map<string, Update>>([
488
502
  : `${wrap(current)} \\o <<${values.join(", ")}>>`,
489
503
  ],
490
504
  ["unshift", (current, values) => `<<${values.join(", ")}>> \\o ${wrap(current)}`],
491
- ["pop", (current) => `SubSeq(${current}, 1, Len(${current}) - 1)`],
492
- ["shift", (current) => `Tail(${current})`],
505
+ ["pop", REMOVALS.pop],
506
+ ["shift", REMOVALS.shift],
493
507
  ]),
494
508
  ],
495
509
  [
@@ -31,11 +31,9 @@ const translateExported = (
31
31
  ) => {
32
32
  const tag = [...definition.tags.keys()].find((candidate) => VALUE_TAGS.has(candidate));
33
33
  if (tag !== undefined) return translateProperty(definition, tag, model, sections, context);
34
- if (writesState(definition.body, context)) {
35
- return translateStep(definition, sections, context);
36
- }
37
34
  const returnType = context.checker.getSignatureFromDeclaration(definition.node)?.getReturnType();
38
35
  if (
36
+ writesState(definition.body, context) ||
39
37
  returnType === undefined ||
40
38
  (returnType.flags & (ts.TypeFlags.Void | ts.TypeFlags.Undefined)) !== 0
41
39
  ) {
@@ -142,11 +142,13 @@ const LOOSE_OPERATORS = [
142
142
  " ~> ",
143
143
  ];
144
144
 
145
- export const wrapEquated = (expression: string) =>
146
- expression.startsWith("~") ||
147
- LOOSE_OPERATORS.some((operator) => getSurface(expression).includes(operator))
145
+ export const wrapEquated = (expression: string) => {
146
+ if (expression.startsWith("~")) return `(${expression})`;
147
+ const surface = getSurface(expression);
148
+ return LOOSE_OPERATORS.some((operator) => surface.includes(operator))
148
149
  ? `(${expression})`
149
150
  : expression;
151
+ };
150
152
 
151
153
  export const indent = (expression: string, prefix: string) =>
152
154
  expression.split("\n").join(`\n${prefix}`);
@@ -66,9 +66,8 @@ const getTags = (node: ts.Node) =>
66
66
  const isExported = (node: ts.Declaration) =>
67
67
  (ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export) !== 0;
68
68
 
69
- const isLet = (declared: Declared) =>
70
- ts.isVariableDeclaration(declared.declaration) &&
71
- (declared.declaration.parent.flags & ts.NodeFlags.Let) !== 0;
69
+ const isLet = (declaration: ts.Declaration): declaration is ts.VariableDeclaration =>
70
+ ts.isVariableDeclaration(declaration) && (declaration.parent.flags & ts.NodeFlags.Let) !== 0;
72
71
 
73
72
  const declareModelValues = (statement: ts.TypeAliasDeclaration, context: Context) => {
74
73
  const type = context.checker.getTypeAtLocation(statement.name);
@@ -126,7 +125,7 @@ export const readModel = (sourceFile: ts.SourceFile, context: Context): Model =>
126
125
  const declarations = statements.flatMap(getDeclarations);
127
126
  const variables = declarations.flatMap((declared) => {
128
127
  const declaration = declared.declaration;
129
- if (!isLet(declared) || !ts.isVariableDeclaration(declaration)) return [];
128
+ if (!isLet(declaration)) return [];
130
129
  const symbol = getSymbol(declaration.name, context.checker);
131
130
  if (isExported(declaration) || symbol === undefined) {
132
131
  throw new TlaTypeScriptError("State variables can't be exported", declaration);
@@ -135,7 +134,7 @@ export const readModel = (sourceFile: ts.SourceFile, context: Context): Model =>
135
134
  context.variables.set(symbol, name);
136
135
  return [{ name, declaration }];
137
136
  });
138
- const helpers = declarations.filter((declared) => !isLet(declared));
137
+ const helpers = declarations.filter((declared) => !isLet(declared.declaration));
139
138
  const exported = helpers.flatMap((declared) => {
140
139
  const declaration = declared.declaration;
141
140
  const node = getFunction(declaration);
@@ -130,15 +130,16 @@ export const translateStep = (definition: Exported, sections: Sections, context:
130
130
  return;
131
131
  }
132
132
  const getType = (parameter: Parameter) => context.checker.getTypeAtLocation(parameter.node.name);
133
- const domains = parameters.map(
134
- (parameter) =>
135
- guards.chosen.get(parameter)?.domain ??
136
- getDomain(getType(parameter), parameter.node, context),
137
- );
138
- const independent = parameters.flatMap((parameter, index) =>
139
- guards.chosen.get(parameter)?.isDependent === true
140
- ? []
141
- : [`${parameter.name} \\in ${domains[index]}`],
133
+ const choices = parameters.map((parameter) => {
134
+ const chosen = guards.chosen.get(parameter);
135
+ return {
136
+ parameter,
137
+ chosen,
138
+ domain: chosen?.domain ?? getDomain(getType(parameter), parameter.node, context),
139
+ };
140
+ });
141
+ const independent = choices.flatMap((choice) =>
142
+ choice.chosen?.isDependent === true ? [] : [`${choice.parameter.name} \\in ${choice.domain}`],
142
143
  );
143
144
  const dependent = [...guards.chosen]
144
145
  .filter((entry) => entry[1].isDependent)
@@ -146,18 +147,19 @@ export const translateStep = (definition: Exported, sections: Sections, context:
146
147
  const step = `\\E ${independent.join(", ")} : ${dependent.join("")}${head}`;
147
148
  sections.next.push(step);
148
149
  if (fairness === undefined) return;
149
- const typeDomains = parameters.map((parameter, index) =>
150
- guards.chosen.has(parameter) ? findDomain(getType(parameter), context) : domains[index],
151
- );
152
- const conditions = parameters.flatMap((parameter, index) =>
153
- guards.chosen.has(parameter) ? [`${parameter.name} \\in ${wrap(domains[index])}`] : [],
154
- );
155
- if (!typeDomains.every((domain): domain is string => typeof domain === "string")) {
150
+ const forAll = choices.map((choice) => {
151
+ const typeDomain =
152
+ choice.chosen === undefined ? choice.domain : findDomain(getType(choice.parameter), context);
153
+ return typeof typeDomain === "string"
154
+ ? `${choice.parameter.name} \\in ${typeDomain}`
155
+ : undefined;
156
+ });
157
+ if (!forAll.every((bound) => bound !== undefined)) {
156
158
  sections.fairness.push(`${fairness}(${step})`);
157
159
  return;
158
160
  }
159
- const forAll = parameters.map(
160
- (parameter, index) => `${parameter.name} \\in ${typeDomains[index]}`,
161
+ const conditions = choices.flatMap((choice) =>
162
+ choice.chosen === undefined ? [] : [`${choice.parameter.name} \\in ${wrap(choice.domain)}`],
161
163
  );
162
164
  sections.fairness.push(
163
165
  `\\A ${forAll.join(", ")} : ${fairness}(${[...conditions, head].join(" /\\ ")})`,