tla-ts 0.0.3-dev.6979965 → 0.0.3-dev.6a30eee

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/src/values.ts CHANGED
@@ -5,6 +5,7 @@ export interface ModelValue {
5
5
  kind: "ModelValue";
6
6
  name: string;
7
7
  type: string | undefined;
8
+ rank: number;
8
9
  }
9
10
 
10
11
  export interface SetValue {
@@ -264,6 +265,7 @@ const stringOrder = { ranks: Object.create(null) as Record<string, number>, size
264
265
  export const setStringOrder = (texts: Iterable<string>) => {
265
266
  stringOrder.ranks = Object.create(null);
266
267
  stringOrder.size = 0;
268
+ modelValues.clear();
267
269
  for (const text of texts) rankString(text);
268
270
  };
269
271
 
@@ -353,7 +355,7 @@ export const compareValues = (left: Value, right: Value): number => {
353
355
  if (left.type !== undefined && right.type !== undefined) {
354
356
  checkModelValueTypes(left, right, false);
355
357
  }
356
- return compareStrings(left.name, right.name);
358
+ return left.rank - right.rank;
357
359
  }
358
360
  if (leftKind === "ModelValue" || rightKind === "ModelValue") {
359
361
  checkModelValueTypes(left, right, false);
@@ -385,14 +387,15 @@ export const compareValues = (left: Value, right: Value): number => {
385
387
 
386
388
  const modelValues = new Map<string, ModelValue>();
387
389
 
390
+ // A check ranks every model value's name when it creates the value, and creates its own values.
388
391
  export const createModelValue = (name: string): ModelValue => {
389
- rankString(name);
390
392
  const known = modelValues.get(name);
391
393
  if (known) return known;
392
394
  const value: ModelValue = {
393
395
  kind: "ModelValue",
394
396
  name,
395
397
  type: name.length > 2 && name[1] === "_" ? name[0] : undefined,
398
+ rank: getStringRank(name),
396
399
  };
397
400
  modelValues.set(name, value);
398
401
  return value;
@@ -562,7 +565,7 @@ const equalsModelValueWith = (modelValue: ModelValue, other: Value) => {
562
565
 
563
566
  const compareModelValue = (left: ModelValue, right: Value) => {
564
567
  const type = getModelValueType(left);
565
- if (type === undefined) return isModelValue(right) ? compareStrings(left.name, right.name) : -1;
568
+ if (type === undefined) return isModelValue(right) ? left.rank - right.rank : -1;
566
569
  if (!isModelValue(right)) {
567
570
  throw new TlaEvaluationError(
568
571
  `Attempted to compare the typed model value ${formatValue(left)} and non-model value\n${formatValue(right)}`,
@@ -574,7 +577,7 @@ const compareModelValue = (left: ModelValue, right: Value) => {
574
577
  `Attempted to compare the differently-typed model values ${formatValue(left)} and ${formatValue(right)}`,
575
578
  );
576
579
  }
577
- return compareStrings(left.name, right.name);
580
+ return left.rank - right.rank;
578
581
  };
579
582
 
580
583
  const equalsModelValue = (left: ModelValue, right: Value) => {