Skip to content

Commit

Permalink
Merge pull request #70 from fuhrmanator/clean-famix
Browse files Browse the repository at this point in the history
Clean famix (get rid of tsconfig, project.json, etc.)
  • Loading branch information
fuhrmanator authored Aug 14, 2024
2 parents c4d4a33 + 85a5df2 commit 3e8a88d
Show file tree
Hide file tree
Showing 121 changed files with 583 additions and 887 deletions.
898 changes: 471 additions & 427 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"license": "MIT",
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "^22.0.2",
"@types/yargs": "^17.0.32",
"eslint": "^9.8.0",
"@types/node": "^22.3.0",
"@types/yargs": "^17.0.33",
"eslint": "^9.9.0",
"jest": "^29.7.0",
"tplant": "3.1.0",
"ts-jest": "^29.2.4",
Expand Down
2 changes: 1 addition & 1 deletion src/analyze.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Project } from "ts-morph";
import * as fs from 'fs';
import { FamixRepository } from "./lib/famix/src/famix_repository";
import { FamixRepository } from "./lib/famix/famix_repository";
import { Logger } from "tslog";
import * as processFunctions from "./analyze_functions/process_functions";
import { EntityDictionary } from "./famix_functions/EntityDictionary";
Expand Down
2 changes: 1 addition & 1 deletion src/analyze_functions/process_functions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ClassDeclaration, MethodDeclaration, VariableStatement, FunctionDeclaration, VariableDeclaration, InterfaceDeclaration, ParameterDeclaration, ConstructorDeclaration, MethodSignature, SourceFile, ModuleDeclaration, PropertyDeclaration, PropertySignature, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ExportedDeclarations, CommentRange, EnumDeclaration, EnumMember, TypeParameterDeclaration, TypeAliasDeclaration, SyntaxKind, FunctionExpression, Block, Identifier, ExpressionWithTypeArguments, ImportDeclaration, Node, ArrowFunction, Scope, ClassExpression } from "ts-morph";
import * as Famix from "../lib/famix/src/model/famix";
import * as Famix from "../lib/famix/model/famix";
import { calculate } from "../lib/ts-complex/cyclomatic-service";
import * as fs from 'fs';
import { logger , entityDictionary } from "../analyze";
Expand Down
4 changes: 2 additions & 2 deletions src/famix_functions/EntityDictionary.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { ClassDeclaration, ConstructorDeclaration, FunctionDeclaration, Identifier, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, PropertyDeclaration, PropertySignature, SourceFile, TypeParameterDeclaration, VariableDeclaration, ParameterDeclaration, Decorator, GetAccessorDeclaration, SetAccessorDeclaration, ImportSpecifier, CommentRange, EnumDeclaration, EnumMember, TypeAliasDeclaration, FunctionExpression, ExpressionWithTypeArguments, ImportDeclaration, ImportEqualsDeclaration, SyntaxKind, Expression, TypeNode, Node, ts, Scope, Type, ArrowFunction } from "ts-morph";
import { isAmbient, isNamespace } from "../analyze_functions/process_functions";
import * as Famix from "../lib/famix/src/model/famix";
import * as Famix from "../lib/famix/model/famix";
import { FamixRepository } from "../lib/famix/famix_repository";
import { logger, config } from "../analyze";
import GraphemeSplitter from "grapheme-splitter";
import * as Helpers from "./helpers_creation";
import * as FQNFunctions from "../fqn";
import { FamixRepository } from "../lib/famix/src/famix_repository";
import path from "path";
import _ from 'lodash';

Expand Down
2 changes: 1 addition & 1 deletion src/famix_functions/helpers_creation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Famix from "../lib/famix/src/model/famix";
import * as Famix from "../lib/famix/model/famix";
import { logger } from "../analyze";
import { ConstructorDeclaration, Identifier, FunctionDeclaration, MethodDeclaration, MethodSignature, PropertyDeclaration, PropertySignature, VariableDeclaration, ParameterDeclaration, GetAccessorDeclaration, SetAccessorDeclaration, EnumMember, TypeAliasDeclaration, Node, SyntaxKind, FunctionExpression } from "ts-morph";
import { TypeDeclaration } from "./EntityDictionary";
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { logger } from "../../../analyze";
import { logger } from "../../analyze";
import { FamixJSONExporter } from "./famix_JSON_exporter";
// import { FamixRepository } from "./famix_repository";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FamixBaseElement } from "./famix_base_element";
import { Class, Interface, Variable, Method, ArrowFunction, Function as FamixFunctionEntity, Type, NamedEntity, ScriptEntity, Module, SourceLanguage } from "./model/famix";
import * as Famix from "./model/famix";
import { TSMorphObjectType } from "../../../famix_functions/EntityDictionary";
import { TSMorphObjectType } from "../../famix_functions/EntityDictionary";
/**
* This class is used to store all Famix elements
*/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FamixJSONExporter } from "../../famix_JSON_exporter";
import { ContainerEntity } from "./container_entity";
import { logger } from "../../../../../analyze";
import { logger } from "../../../../analyze";
import { Module } from "./module";

export class ScopingEntity extends ContainerEntity {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { SourceLanguage } from "./source_language";
import { Entity } from "./entity";
import { Comment } from "./comment";
import { SourceAnchor } from "./source_anchor";
import { logger } from "../../../../../analyze";
import { logger } from "../../../../analyze";

export class SourcedEntity extends Entity {

Expand Down
File renamed without changes.
File renamed without changes.
301 changes: 0 additions & 301 deletions src/lib/famix/package-lock.json

This file was deleted.

2 changes: 1 addition & 1 deletion src/lib/famix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
"tslint": "^5.20.0",
"typescript": "^3.6.3"
}
}
}
5 changes: 0 additions & 5 deletions src/lib/famix/readme.md

This file was deleted.

Loading

0 comments on commit 3e8a88d

Please sign in to comment.