ts2famix 2.0.3 → 2.1.0-beta.1

package/.eslintrc.json

@@ -1,24 +1,24 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "overrides": [
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-        "@typescript-eslint/no-namespace": "off",
-        "semi": [1, "always"]
-    }
-}
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "overrides": [
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "@typescript-eslint/no-namespace": "off",
+        "semi": [1, "always"]
+    }
+}

package/.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "editor.detectIndentation": false,
+    "typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/LICENSE

@@ -1,24 +1,24 @@
-MIT License
-
-Copyright (c) 2021 Arezoo Nasrollah Zadeh
-Copyright (c) 2021 Christopher Fuhrman
-Copyright (c) 2023 Maël Paul
-Copyright (c) 2024 Nour Ayachi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2021 Arezoo Nasrollah Zadeh
+Copyright (c) 2021 Christopher Fuhrman
+Copyright (c) 2023 Maël Paul
+Copyright (c) 2024 Nour Ayachi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,78 +1,78 @@
-# FamixTypeScriptImporter
-
-[![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.
-
-## Installation
-
-```sh
-npm install -g ts2famix
-```
-
-## npm versions
-
-- Version 2.x.x is for Moose 11+
-- Version <= 1.x.x is for Moose 10, but lacks support for several elements of TypeScript (arrow functions, full generics).
-
-## Usage
-
-Instructions for using the command-line importer:
-
-```sh
-ts2famix --help
-```
-
-## Parse a full project
-
-```sh
-ts2famix -i ../path/to/project/tsconfig.json -o JSONModels/projectName.json
-```
-or
-```sh
-ts2famix -i "../path/to/project/**/*.ts" -o JSONModels/projectName.json
-```
-
-## Import the JSON model into Moose
-
-- Copy the "`JSONModels/projectName.json`" into your "`Pharo/images/[imageName]`" directory.
-- In a Moose Playground, load the FamixTypeScript metamodel:
-  ```smalltalk
-  Metacello new 
-    githubUser: 'fuhrmanator' project: 'FamixTypeScript' commitish: 'master' path: 'src';
-    baseline: 'FamixTypeScript';
-    load.
-  ```
-  Load the model into Moose:
-  ```smalltalk
-  'projectName.json' asFileReference readStreamDo:
-    [ :stream | model := FamixTypeScriptModel new 
-      importFromJSONStream: stream. model install ].
-  ```
-  **Note**: Windows 10/11 users can drag-and-drop the `projectName.json` model file onto the Pharo window (once the TypeScript metamodel has been loaded) for an easier way to load.
-
-## Developer info
-
-To run tests:
-
-```sh
-npm test
-```
-
-To build `ts2famix` locally:
-
-```sh
-npx tsc
-```
-
-To run the locally built version (not the globally installed one with npm).:
-
-```sh
-npx ts2famix [options]
-```
-
-## TypeScript Metamodel API documentation (visualization)
-
-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](doc-uml/famix-typescript-model.svg)
+# FamixTypeScriptImporter
+
+[![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.
+
+## Installation
+
+```sh
+npm install -g ts2famix
+```
+
+## npm versions
+
+- Version 2.x.x is for Moose 11+
+- Version <= 1.x.x is for Moose 10, but lacks support for several elements of TypeScript (arrow functions, full generics).
+
+## Usage
+
+Instructions for using the command-line importer:
+
+```sh
+ts2famix --help
+```
+
+## Parse a full project
+
+```sh
+ts2famix -i ../path/to/project/tsconfig.json -o JSONModels/projectName.json
+```
+or
+```sh
+ts2famix -i "../path/to/project/**/*.ts" -o JSONModels/projectName.json
+```
+
+## Import the JSON model into Moose
+
+- Copy the "`JSONModels/projectName.json`" into your "`Pharo/images/[imageName]`" directory.
+- In a Moose Playground, load the FamixTypeScript metamodel:
+  ```smalltalk
+  Metacello new 
+    githubUser: 'fuhrmanator' project: 'FamixTypeScript' commitish: 'master' path: 'src';
+    baseline: 'FamixTypeScript';
+    load.
+  ```
+  Load the model into Moose:
+  ```smalltalk
+  'projectName.json' asFileReference readStreamDo:
+    [ :stream | model := FamixTypeScriptModel new 
+      importFromJSONStream: stream. model install ].
+  ```
+  **Note**: Windows 10/11 users can drag-and-drop the `projectName.json` model file onto the Pharo window (once the TypeScript metamodel has been loaded) for an easier way to load.
+
+## Developer info
+
+To run tests:
+
+```sh
+npm test
+```
+
+To build `ts2famix` locally:
+
+```sh
+npx tsc
+```
+
+To run the locally built version (not the globally installed one with npm).:
+
+```sh
+npx ts2famix [options]
+```
+
+## TypeScript Metamodel API documentation (visualization)
+
+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](doc-uml/famix-typescript-model.svg)

package/TODO

@@ -0,0 +1 @@
+Fix the object map (look up fmx objects from tsmorph elements (as key))