ts2famix 1.2.0 → 1.3.1

package/README.md

@@ -1,6 +1,6 @@
 # FamixTypeScriptImporter
 
-[![Node.js CI](https://github.com/maelpaul/FamixTypeScriptImporter/actions/workflows/node.js.yml/badge.svg)](https://github.com/maelpaul/FamixTypeScriptImporter/actions/workflows/node.js.yml)
+[![Node.js CI](https://github.com/fuhrmanator/FamixTypeScriptImporter/actions/workflows/ci-nodejs.yml/badge.svg)](https://github.com/fuhrmanator/FamixTypeScriptImporter/actions/workflows/ci-nodejs.yml)
 
 Create a [FamixTypeScript](https://github.com/fuhrmanator/FamixTypeScript) model in JSON of TypeScript files.
 
@@ -106,4 +106,4 @@ ts-node src/famix2puml.ts -i JSONModels/projectName.json -o PUMLModels/projectNa
 
 The following was generated by CI using [tplant](https://github.com/bafolts/tplant), in a similar fashion described [here](https://modularmoose.org/posts/2021-07-19-automatic-metamodel-documentation-generation).
 
-![FamixTypeScript API Metamodel](https://raw.githubusercontent.com/maelpaul/FamixTypeScriptImporter/v1/doc/metamodel.svg)
+![FamixTypeScript API Metamodel](https://raw.githubusercontent.com/fuhrmanator/FamixTypeScriptImporter/v1/doc/metamodel.svg)

package/dist/famix_functions/famix_functions_index.js

@@ -55,10 +55,12 @@ class FamixFunctionsIndex {
         fmxIndexFileAnchor.setElement(famixElement);
         if (sourceElement !== null) {
             fmxIndexFileAnchor.setFileName(sourceElement.getSourceFile().getFilePath());
-            let sourceStart, sourceEnd;
+            let sourceStart, sourceEnd, sourceLineStart, sourceLineEnd;
             if (!(sourceElement instanceof ts_morph_1.CommentRange)) {
                 sourceStart = sourceElement.getStart();
                 sourceEnd = sourceElement.getEnd();
+                sourceLineStart = sourceElement.getStartLineNumber();
+                sourceLineEnd = sourceElement.getEndLineNumber();
             }
             else {
                 sourceStart = sourceElement.getPos();
@@ -93,6 +95,10 @@ class FamixFunctionsIndex {
             // note: the +1 is because the source anchor is 1-based, but ts-morph is 0-based
             fmxIndexFileAnchor.setStartPos(sourceStart + 1);
             fmxIndexFileAnchor.setEndPos(sourceEnd + 1);
+            if (!(sourceElement instanceof ts_morph_1.CommentRange)) {
+                fmxIndexFileAnchor.setStartLine(sourceLineStart);
+                fmxIndexFileAnchor.setEndLine(sourceLineEnd);
+            }
             if (!(famixElement instanceof Famix.Association) && !(famixElement instanceof Famix.Comment) && !(sourceElement instanceof ts_morph_1.CommentRange) && !(sourceElement instanceof ts_morph_1.Identifier) && !(sourceElement instanceof ts_morph_1.ImportSpecifier) && !(sourceElement instanceof ts_morph_1.ExpressionWithTypeArguments)) {
                 famixElement.setFullyQualifiedName(this.FQNFunctions.getFQN(sourceElement));
             }

package/dist/lib/famix/src/model/famix/class.js

@@ -61,7 +61,7 @@ class Class extends type_1.Type {
     addPropertiesToExporter(exporter) {
         super.addPropertiesToExporter(exporter);
         exporter.addProperty("isAbstract", this.getIsAbstract());
-        exporter.addProperty("properties", this.getProperties());
+        exporter.addProperty("attributes", this.getProperties()); // Moose (10) codes them as attributes
         exporter.addProperty("methods", this.getMethods());
         exporter.addProperty("superInheritances", this.getSuperInheritances());
         exporter.addProperty("subInheritances", this.getSubInheritances());

package/dist/lib/famix/src/model/famix/indexed_file_anchor.js

@@ -16,6 +16,18 @@ class IndexedFileAnchor extends source_anchor_1.SourceAnchor {
     setEndPos(endPos) {
         this.endPos = endPos;
     }
+    getEndLine() {
+        return this.endLine;
+    }
+    setEndLine(sourceEndLine) {
+        this.endLine = sourceEndLine;
+    }
+    getStartLine() {
+        return this.startLine;
+    }
+    setStartLine(sourceStartLine) {
+        this.startLine = sourceStartLine;
+    }
     getFileName() {
         return this.fileName;
     }
@@ -31,6 +43,8 @@ class IndexedFileAnchor extends source_anchor_1.SourceAnchor {
         super.addPropertiesToExporter(exporter);
         exporter.addProperty("startPos", this.getStartPos());
         exporter.addProperty("endPos", this.getEndPos());
+        exporter.addProperty("startLine", this.getStartLine());
+        exporter.addProperty("endLine", this.getEndLine());
         exporter.addProperty("fileName", this.getFileName());
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts2famix",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "A TypeScript to JSON importer for Moose 10.",
   "main": "dist/ts2famix-cli.js",
   "scripts": {
@@ -33,17 +33,17 @@
     "@typescript-eslint/parser": "^7.0.1",
     "eslint": "^8.56.0",
     "jest": "^29.7.0",
-    "tplant": "^3.1.3",
+    "tplant": "3.1.0",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.25.8",
-    "typescript": "^5.3.3"
+    "typedoc": "^0.25.8"
   },
   "dependencies": {
     "grapheme-splitter": "^1.0.4",
     "ts-morph": "^21.0.1",
     "tslog": "^4.9.2",
     "tsutils": "^3.21.0",
+    "typescript": "^5.3.3",
     "yargs": "^17.7.2"
   }
 }

package/src/famix_functions/famix_functions_index.ts

@@ -33,10 +33,12 @@ export class FamixFunctionsIndex {
 
         if (sourceElement !== null) {
             fmxIndexFileAnchor.setFileName(sourceElement.getSourceFile().getFilePath());
-            let sourceStart, sourceEnd: number;
+            let sourceStart, sourceEnd, sourceLineStart, sourceLineEnd: number;
             if (!(sourceElement instanceof CommentRange)) {
                 sourceStart = sourceElement.getStart();
                 sourceEnd = sourceElement.getEnd();
+                sourceLineStart = sourceElement.getStartLineNumber();
+                sourceLineEnd = sourceElement.getEndLineNumber();
             } else {
                 sourceStart = sourceElement.getPos();
                 sourceEnd = sourceElement.getEnd();
@@ -71,6 +73,10 @@ export class FamixFunctionsIndex {
             // note: the +1 is because the source anchor is 1-based, but ts-morph is 0-based
             fmxIndexFileAnchor.setStartPos(sourceStart + 1);
             fmxIndexFileAnchor.setEndPos(sourceEnd + 1);
+            if (!(sourceElement instanceof CommentRange)) {
+                fmxIndexFileAnchor.setStartLine(sourceLineStart);
+                fmxIndexFileAnchor.setEndLine(sourceLineEnd);    
+            }
 
             if (!(famixElement instanceof Famix.Association) && !(famixElement instanceof Famix.Comment) && !(sourceElement instanceof CommentRange) && !(sourceElement instanceof Identifier) && !(sourceElement instanceof ImportSpecifier) && !(sourceElement instanceof ExpressionWithTypeArguments)) {
                 (famixElement as Famix.NamedEntity).setFullyQualifiedName(this.FQNFunctions.getFQN(sourceElement));

package/src/generate_uml.sh

@@ -2,6 +2,9 @@
 # Gets latest plantuml
 rm -f plantuml.jar
 wget --no-verbose https://downloads.sourceforge.net/project/plantuml/plantuml.jar
+# echo the version
+echo "PlantUML version: $(java -jar plantuml.jar -version)"
+echo "tplant version: $(npx tplant --version)"
 # Builds metamodel plantuml from TypeScript sources
 npx tplant -i src/lib/famix/**/*.ts -o doc-metamodel/famix-typescript-model.puml
 sed -i 's/@startuml/& metamodel/' doc-metamodel/famix-typescript-model.puml

package/src/lib/famix/src/model/famix/class.ts

@@ -78,7 +78,7 @@ export class Class extends Type {
   public addPropertiesToExporter(exporter: FamixJSONExporter): void {
     super.addPropertiesToExporter(exporter);
     exporter.addProperty("isAbstract", this.getIsAbstract());
-    exporter.addProperty("properties", this.getProperties());
+    exporter.addProperty("attributes", this.getProperties()); // Moose (10) codes them as attributes
     exporter.addProperty("methods", this.getMethods());
     exporter.addProperty("superInheritances", this.getSuperInheritances());
     exporter.addProperty("subInheritances", this.getSubInheritances());  

package/src/lib/famix/src/model/famix/indexed_file_anchor.ts

@@ -23,6 +23,26 @@ export class IndexedFileAnchor extends SourceAnchor {
     this.endPos = endPos;
   }
 
+  private endLine: number;
+
+  public getEndLine(): number {
+    return this.endLine;
+  }
+
+  public setEndLine(sourceEndLine: number) {
+    this.endLine = sourceEndLine;
+  }
+
+  private startLine: number;
+
+  public getStartLine(): number {
+    return this.startLine;
+  }
+
+  public setStartLine(sourceStartLine: number) {
+    this.startLine = sourceStartLine;
+  }
+
   private fileName: string;
 
   public getFileName(): string {
@@ -44,6 +64,8 @@ export class IndexedFileAnchor extends SourceAnchor {
     super.addPropertiesToExporter(exporter);
     exporter.addProperty("startPos", this.getStartPos());
     exporter.addProperty("endPos", this.getEndPos());
+    exporter.addProperty("startLine", this.getStartLine());
+    exporter.addProperty("endLine", this.getEndLine());
     exporter.addProperty("fileName", this.getFileName());
   }
 }