ts2famix 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts2famix",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "A TypeScript to JSON importer for Moose 10.",
   "main": "dist/ts2famix-cli.js",
   "scripts": {

package/src/analyze_functions/processAccesses.ts

@@ -40,9 +40,16 @@ export class ProcessAccesses {
      */
     private processNodeForAccesses(n: Identifier, id: number): void {
         try {
+            // sometimes node's first ancestor is a PropertyDeclaration, which is not an access
+            // see https://github.com/fuhrmanator/FamixTypeScriptImporter/issues/9
+            // check for a node whose first ancestor is a property declaration and bail?
+            // This may be a bug in ts-morph?
+            if (n.getFirstAncestorOrThrow().getKindName() === "PropertyDeclaration") {
+                console.info(`processNodeForAccesses: node kind: ${n.getKindName()}, ${n.getText()}, (${n.getType().getText()}) is a PropertyDeclaration. Skipping...`);
+                return;
+            }
             this.famixFunctions.createFamixAccess(n, id);
-
-            console.info(`processNodeForAccesses: node: node, (${n.getType().getText()})`);
+            console.info(`processNodeForAccesses: node kind: ${n.getKindName()}, ${n.getText()}, (${n.getType().getText()})`);
         } catch (error) {
             console.error(`> WARNING: got exception ${error}. ScopeDeclaration invalid for ${n.getSymbol().getFullyQualifiedName()}. Continuing...`);
         }

package/src/analyze_functions/processFiles.ts

@@ -347,12 +347,13 @@ export class ProcessFiles {
         const fmxProperty = this.famixFunctions.createFamixProperty(p);
 
         console.info(`processProperty: property: ${p.getName()}, (${p.getType().getText()}), fqn = ${fmxProperty.getFullyQualifiedName()}`);
+        console.info(` ---> It's a Property${(p instanceof PropertySignature) ? "Signature" : "Declaration"}!`);
 
         this.processComments(p, fmxProperty);
 
         if (!(p instanceof PropertySignature)) {
             this.processDecorators(p, fmxProperty);
-
+            console.info(`processProperty: adding access: ${p.getName()}, (${p.getType().getText()}) Famix ${fmxProperty.getName()}`);
             this.accesses.set(fmxProperty.id, p);
         }