Update attribute-parser.js and enum.valid.js

playcanvas · Sep 18, 2024 · f235b9b · f235b9b
1 parent 4d36fdb
commit f235b9b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/parsers/attribute-parser.js b/src/parsers/attribute-parser.js
@@ -4,7 +4,7 @@ import * as ts from 'typescript';
 import { ParsingError } from './parsing-error.js';
 import { hasTag } from '../utils/attribute-utils.js';
 import { parseTag, validateTag } from '../utils/tag-utils.js';
-import { extractTextFromDocNode, getLeadingBlockCommentRanges, getType } from '../utils/ts-utils.js';
+import { extractTextFromDocNode, getLeadingBlockCommentRanges, getLiteralValue, getType } from '../utils/ts-utils.js';
 
 /**
  * A class to parse JSDoc comments and extract attribute metadata.
@@ -260,14 +260,16 @@ export class AttributeParser {
 
                     const node = property.initializer;
 
+                    value = getLiteralValue(node, this.typeChecker);
+
                     // Enums can only contain primitives (string|number|boolean)
-                    if (ts.isNumericLiteral(node)) {
-                        value = parseFloat(node.getText());
-                    } else if (node.kind === ts.SyntaxKind.TrueKeyword || node.kind === ts.SyntaxKind.FalseKeyword) {
-                        value = node.kind === ts.SyntaxKind.TrueKeyword;
-                    } else {
-                        value = node.getText();
-                    }
+                    // if (ts.isNumericLiteral(node)) {
+                    //     value = parseFloat(node.getText());
+                    // } else if (node.kind === ts.SyntaxKind.TrueKeyword || node.kind === ts.SyntaxKind.FalseKeyword) {
+                    //     value = node.kind === ts.SyntaxKind.TrueKeyword;
+                    // } else {
+                    //     value = node.getText();
+                    // }
 
                     members.push({ [name]: value });
                 }

diff --git a/test/fixtures/enum.valid.js b/test/fixtures/enum.valid.js
@@ -4,9 +4,9 @@ import { Script, Vec3 } from 'playcanvas';
  * @enum {number}
  */
 const NumberEnum = {
-    A: 0,
-    B: 1,
-    C: 2
+    A: 13,
+    B: 14,
+    C: 23
 };
 
 /**

diff --git a/test/tests/valid/enum.test.js b/test/tests/valid/enum.test.js
@@ -26,7 +26,7 @@ describe('VALID: Enum attribute', function () {
         expect(data[0].example.attributes.e.name).to.equal('e');
         expect(data[0].example.attributes.e.type).to.equal('number');
         expect(data[0].example.attributes.e.array).to.equal(false);
-        expect(data[0].example.attributes.e.default).to.equal(0);
+        expect(data[0].example.attributes.e.default).to.equal(13);
     });
 
     it('f: should be a enum attribute with a default value', function () {
@@ -51,6 +51,10 @@ describe('VALID: Enum attribute', function () {
         expect(data[0].example.attributes.h.name).to.equal('h');
         expect(data[0].example.attributes.h.type).to.equal('string');
         expect(data[0].example.attributes.h.array).to.equal(false);
+        expect(data[0].example.attributes.h.enum).to.be.an('array').with.lengthOf(3)
+        expect(data[0].example.attributes.h.enum[0]).to.deep.equal({ A: 'a' });
+        expect(data[0].example.attributes.h.enum[1]).to.deep.equal({ B: 'b' });
+        expect(data[0].example.attributes.h.enum[2]).to.deep.equal({ C: 'c' });
         expect(data[0].example.attributes.h.default).to.equal('');
     });