Fix so that enum member values are actually numbers (#909)

* Fix so that enum member values are actually numbers

* Pretty

ts/.prettierignore

@@ -14,3 +14,4 @@ src/model/endpoint.test.ts
 src/pbModel/statement.ts
 src/model/statement.test.ts
 src/model/field.test.ts
+src/model/enum.test.ts

ts/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@anz-bank/sysl",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "description": "Sysl (pronounced \"sizzle\") is a open source system specification language.",
     "author": "ANZ Bank",
     "publisher": "anz-bank",

ts/src/model/enum.test.ts

@@ -0,0 +1,15 @@
+import { realign } from "../common/format";
+import { Enum } from "./enum";
+import { Model } from "./model";
+import "jest-extended";
+
+test.concurrent("Enum value is number", async () => {
+    const model = await Model.fromText(realign(`
+        App:
+            !enum Enum:
+                A: 5
+    `));
+    const enumVal = (model.getApp("App").children[0] as Enum).children[0].value;
+    expect(enumVal).toBeNumber();
+    expect(enumVal).toBe(5);
+});

ts/src/pbModel/type.ts

@@ -126,8 +126,8 @@ export class PbTypeDefUnion {
 
 @jsonObject
 export class PbTypeDefEnum {
-    @jsonMapMember(String, Number, serializerFor(String))
-    items!: Map<string, number>;
+    @jsonMapMember(String, String, serializerFor(String))
+    items!: Map<string, string>;
 }
 
 @jsonObject
@@ -141,6 +141,7 @@ export class PbTypeDef {
     @jsonArrayMember(PbTypeConstraint) constraint?: PbTypeConstraint[];
     @jsonMember opt!: boolean;
     @jsonArrayMember(Location) sourceContexts!: Location[];
+
     @jsonMember enum?: PbTypeDefEnum;
     @jsonMember tuple?: PbTypeDefStruct;
     // FIXME: Defaults to an empty map even if not defined in the deserialized source.
@@ -199,7 +200,9 @@ export class PbTypeDef {
         if (type) return new Type(name, !!this.relation, PbTypeDef.defsToFields(type.attrDefs, parentRef), params);
         if (this.enum) {
             // Original order of enum items is not serialized, so assume value (number) order, since it's most common.
-            const values = [...this.enum.items].map(([k, v]) => new EnumValue(k, v)).sort((a, b) => a.value - b.value);
+            const values = [...this.enum.items]
+                .map(([k, v]) => new EnumValue(k, Number(v)))
+                .sort((a, b) => a.value - b.value);
             return new Enum(name, values, params);
         }
         if (this.oneOf) {