@playcanvas/attribute-parser 1.6.0 → 1.6.1

package/package.json

@@ -5,7 +5,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "version": "1.6.0",
+  "version": "1.6.1",
   "dependencies": {
     "@playcanvas/eslint-config": "^1.7.4 || ^2.0.0",
     "@typescript/vfs": "^1.6.0",

package/src/index.js

@@ -2,7 +2,7 @@ import { createSystem, createDefaultMapFromNodeModules, createVirtualTypeScriptE
 import * as ts from 'typescript';
 
 import { ScriptParser } from './parsers/script-parser.js';
-import { isInterface } from './utils/attribute-utils.js';
+import { isInterface, isStaticMember } from './utils/attribute-utils.js';
 import { createDefaultMapFromCDN, flatMapAnyNodes, getExportedNodes, getType, inheritsFrom, isAliasedClassDeclaration } from './utils/ts-utils.js';
 
 const toLowerCamelCase = str => str[0].toLowerCase() + str.substring(1);
@@ -147,7 +147,7 @@ export class JSDocParser {
             ts.isPropertyDeclaration(member) && // Is a property declaration
             ts.isIdentifier(member.name) &&
             member.name.text === 'scriptName' &&
-            (ts.getCombinedModifierFlags(member) & ts.ModifierFlags.Static) !== 0 &&
+            isStaticMember(member) &&
             ts.isStringLiteral(member.initializer)
         );
 
@@ -235,7 +235,7 @@ export class JSDocParser {
             const members = [];
 
             for (const member of node.members) {
-                if (member.kind !== ts.SyntaxKind.PropertyDeclaration) {
+                if (member.kind !== ts.SyntaxKind.PropertyDeclaration || isStaticMember(member)) {
                     continue;
                 }
 

package/src/utils/attribute-utils.js

@@ -1,3 +1,5 @@
+import { getCombinedModifierFlags, ModifierFlags } from 'typescript';
+
 /**
  * @file Utility functions for parsing Script attributes.
  */
@@ -42,3 +44,10 @@ export const hasTag = (tag, node) => {
 export const isInterface = (node) => {
     return hasTag('interface', node);
 };
+
+/**
+ * Checks if a node is a scriptName property
+ * @param {import('typescript').Node} member - The node to analyze
+ * @returns {boolean} - True if the node is a scriptName property
+ */
+export const isStaticMember = member => (getCombinedModifierFlags(member) & ModifierFlags.Static) !== 0;

package/test/fixtures/intellisense.valid.js

@@ -14,6 +14,9 @@ class Folder {
 }
 
 export class Example extends Script {
+
+    static scriptName = 'Example';
+
     /**
      * @attribute
      */

package/test/tests/valid/intellisense.test.js

@@ -20,6 +20,10 @@ describe('VALID: Intellisense Parsing', function () {
         expect(data[0]?.example).to.exist;
     });
 
+    it('does not return static members', function () {
+        expect(data[0].example[0].name).to.not.equal('scriptName');
+    });
+
     it('attributes have correct types', function () {
         expect(data[0].folder[0].type).to.equal('any');
         expect(data[0].folder[1].type).to.equal('number');