fix(app): drop usage of ts-simple-ast for ts-morph

compodoc · Jul 14, 2021 · 7bb9a40 · 7bb9a40
1 parent ee0d9c3
commit 7bb9a40
Show file tree

Hide file tree

Showing 27 changed files with 75 additions and 1,164 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -115,7 +115,6 @@
         "semver": "^7.3.5",
         "traverse": "^0.6.6",
         "ts-morph": "^11.0.3",
-        "ts-simple-ast": "21.0.4",
         "uuid": "^8.3.2"
     },
     "devDependencies": {

diff --git a/src/app/application.ts b/src/app/application.ts
@@ -3,7 +3,7 @@ import * as LiveServer from '@compodoc/live-server';
 import * as _ from 'lodash';
 import * as path from 'path';
 
-import { SyntaxKind } from 'ts-simple-ast';
+import { SyntaxKind } from 'ts-morph';
 
 const chokidar = require('chokidar');
 const marked = require('marked');

diff --git a/src/app/compiler/angular-dependencies.ts b/src/app/compiler/angular-dependencies.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 
 import * as _ from 'lodash';
-import Ast, { ts, SyntaxKind } from 'ts-simple-ast';
+import { Project, ts, SyntaxKind } from 'ts-morph';
 
 import { kindToType } from '../../utils/kind-to-type';
 import { logger } from '../../utils/logger';
@@ -48,7 +48,7 @@ import {
 
 const crypto = require('crypto');
 const marked = require('marked');
-const ast = new Ast();
+const ast = new Project();
 
 // TypeScript reference : https://github.com/Microsoft/TypeScript/blob/master/lib/typescript.d.ts
 
@@ -288,7 +288,7 @@ export class AngularDependencies extends FrameworkDependencies {
         const astFile =
             typeof ast.getSourceFile(initialSrcFile.fileName) !== 'undefined'
                 ? ast.getSourceFile(initialSrcFile.fileName)
-                : ast.addExistingSourceFile(initialSrcFile.fileName);
+                : ast.addSourceFileAtPath(initialSrcFile.fileName);
 
         const variableRoutesStatements = astFile.getVariableStatements();
         let hasRoutesStatements = false;

diff --git a/src/app/compiler/angular/code-generator.ts b/src/app/compiler/angular/code-generator.ts
@@ -1,4 +1,4 @@
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 
 export class CodeGenerator {
     public generate(node: ts.Node): string {
@@ -38,10 +38,10 @@ class TsKindsToText {
 }
 
 const TsKindConversion: Array<TsKindsToText> = [
-    new TsKindsToText(node => ['"', node.text, '"'], [
-        SyntaxKind.FirstLiteralToken,
-        SyntaxKind.Identifier
-    ]),
+    new TsKindsToText(
+        node => ['"', node.text, '"'],
+        [SyntaxKind.FirstLiteralToken, SyntaxKind.Identifier]
+    ),
     new TsKindsToText(node => ['"', node.text, '"'], [SyntaxKind.StringLiteral]),
     new TsKindsToText(node => [], [SyntaxKind.ArrayLiteralExpression]),
     new TsKindsToText(node => ['import', ' '], [SyntaxKind.ImportKeyword]),
@@ -57,10 +57,10 @@ const TsKindConversion: Array<TsKindsToText> = [
     new TsKindsToText(node => ['+'], [SyntaxKind.PlusToken]),
     new TsKindsToText(node => [' => '], [SyntaxKind.EqualsGreaterThanToken]),
     new TsKindsToText(node => ['('], [SyntaxKind.OpenParenToken]),
-    new TsKindsToText(node => ['{', ' '], [
-        SyntaxKind.ImportClause,
-        SyntaxKind.ObjectLiteralExpression
-    ]),
+    new TsKindsToText(
+        node => ['{', ' '],
+        [SyntaxKind.ImportClause, SyntaxKind.ObjectLiteralExpression]
+    ),
     new TsKindsToText(node => ['{', '\n'], [SyntaxKind.Block]),
     new TsKindsToText(node => ['}'], [SyntaxKind.CloseBraceToken]),
     new TsKindsToText(node => [')'], [SyntaxKind.CloseParenToken]),

diff --git a/src/app/compiler/angular/deps/controller-dep.factory.ts b/src/app/compiler/angular/deps/controller-dep.factory.ts
@@ -1,5 +1,5 @@
 import { IDep } from '../dependencies.interfaces';
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 const crypto = require('crypto');
 

diff --git a/src/app/compiler/angular/deps/helpers/class-helper.ts b/src/app/compiler/angular/deps/helpers/class-helper.ts
@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import * as util from 'util';
 import * as path from 'path';
 
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 
 import { getNamesCompareFn, mergeTagsAndArgs, markedtags } from '../../../../../utils/utils';
 import { kindToType } from '../../../../../utils/kind-to-type';

diff --git a/src/app/compiler/angular/deps/helpers/component-helper.ts b/src/app/compiler/angular/deps/helpers/component-helper.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 import { detectIndent } from '../../../../../utils';
 import { ClassHelper } from './class-helper';
 import { IParseDeepIdentifierResult, SymbolHelper } from './symbol-helper';
@@ -177,7 +177,7 @@ export class ComponentHelper {
         let exampleUrlsMatches = text.match(/<example-url>(.*?)<\/example-url>/g);
         let exampleUrls = undefined;
         if (exampleUrlsMatches && exampleUrlsMatches.length) {
-            exampleUrls = exampleUrlsMatches.map(function(val) {
+            exampleUrls = exampleUrlsMatches.map(function (val) {
                 return val.replace(/<\/?example-url>/g, '');
             });
         }

diff --git a/src/app/compiler/angular/deps/helpers/js-doc-helper.ts b/src/app/compiler/angular/deps/helpers/js-doc-helper.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 export class JsDocHelper {
     public hasJSDocInternalTag(

diff --git a/src/app/compiler/angular/deps/helpers/module-helper.ts b/src/app/compiler/angular/deps/helpers/module-helper.ts
@@ -1,7 +1,7 @@
 import { SymbolHelper, IParseDeepIdentifierResult } from './symbol-helper';
 import { ComponentCache } from './component-helper';
 import { Deps } from '../../dependencies.interfaces';
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 export class ModuleHelper {
     constructor(

diff --git a/src/app/compiler/angular/deps/helpers/symbol-helper.spec.ts b/src/app/compiler/angular/deps/helpers/symbol-helper.spec.ts
@@ -1,5 +1,5 @@
 import { SymbolHelper } from './symbol-helper';
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 import { expect } from 'chai';
 
 describe(SymbolHelper.name, () => {

diff --git a/src/app/compiler/angular/deps/helpers/symbol-helper.ts b/src/app/compiler/angular/deps/helpers/symbol-helper.ts
@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 
 import { TsPrinterUtil } from '../../../../../utils/ts-printer.util';
 

diff --git a/src/app/compiler/angular/deps/module-dep.factory.ts b/src/app/compiler/angular/deps/module-dep.factory.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 import { IDep } from '../dependencies.interfaces';
 import { ModuleHelper } from './helpers/module-helper';

diff --git a/src/app/compiler/framework-dependencies.ts b/src/app/compiler/framework-dependencies.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 import { ClassHelper } from './angular/deps/helpers/class-helper';
 import { ComponentHelper } from './angular/deps/helpers/component-helper';

diff --git a/src/app/engines/html-engine-helpers/modif-icon.helper.ts b/src/app/engines/html-engine-helpers/modif-icon.helper.ts
@@ -1,6 +1,6 @@
 import { IHtmlEngineHelper } from './html-engine-helper.interface';
 
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 
 export class ModifIconHelper implements IHtmlEngineHelper {
     public helperFunc(context: any, kind: SyntaxKind): string {

diff --git a/src/app/engines/html-engine-helpers/modif-kind-helper.ts b/src/app/engines/html-engine-helpers/modif-kind-helper.ts
@@ -1,7 +1,7 @@
 import { IHtmlEngineHelper } from './html-engine-helper.interface';
 import * as Handlebars from 'handlebars';
 
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 
 export class ModifKindHelper implements IHtmlEngineHelper {
     /**

diff --git a/src/index-cli.ts b/src/index-cli.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
 
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 import { Application } from './app/application';
 import Configuration from './app/configuration';

diff --git a/src/utils/get-module-with-providers.ts b/src/utils/get-module-with-providers.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 export function getModuleWithProviders(node: ts.VariableStatement) {
     let result;

diff --git a/src/utils/has-spread-element-in-array.ts b/src/utils/has-spread-element-in-array.ts
@@ -1,4 +1,4 @@
-import { SyntaxKind } from 'ts-simple-ast';
+import { SyntaxKind } from 'ts-morph';
 
 export function hasSpreadElementInArray(arr): boolean {
     let result = false;

diff --git a/src/utils/imports.util.ts b/src/utils/imports.util.ts
@@ -1,8 +1,8 @@
 import * as path from 'path';
 
-import Ast, { ts, PropertyDeclaration, SyntaxKind } from 'ts-simple-ast';
+import { Project, ts, PropertyDeclaration, SyntaxKind } from 'ts-morph';
 
-const ast = new Ast();
+const ast = new Project();
 
 export class ImportsUtil {
     private static instance: ImportsUtil;
@@ -109,7 +109,7 @@ export class ImportsUtil {
         const file =
             typeof ast.getSourceFile(sourceFile.fileName) !== 'undefined'
                 ? ast.getSourceFile(sourceFile.fileName)
-                : ast.addExistingSourceFileIfExists(sourceFile.fileName); // tslint:disable-line
+                : ast.addSourceFileAtPathIfExists(sourceFile.fileName); // tslint:disable-line
         const imports = file.getImportDeclarations();
 
         /**
@@ -166,7 +166,7 @@ export class ImportsUtil {
                 const sourceFileImport =
                     typeof ast.getSourceFile(importPath) !== 'undefined'
                         ? ast.getSourceFile(importPath)
-                        : ast.addExistingSourceFileIfExists(importPath); // tslint:disable-line
+                        : ast.addSourceFileAtPathIfExists(importPath); // tslint:disable-line
 
                 if (sourceFileImport) {
                     let variableName = foundWithAlias ? aliasOriginalName : metadataVariableName;
@@ -193,7 +193,7 @@ export class ImportsUtil {
                                             sourceFileExportedReferencePath
                                         ) !== 'undefined'
                                             ? ast.getSourceFile(sourceFileExportedReferencePath)
-                                            : ast.addExistingSourceFileIfExists(
+                                            : ast.addSourceFileAtPathIfExists(
                                                   sourceFileExportedReferencePath
                                               );
 
@@ -242,7 +242,7 @@ export class ImportsUtil {
         const file =
             typeof ast.getSourceFile(sourceFile.fileName) !== 'undefined'
                 ? ast.getSourceFile(sourceFile.fileName)
-                : ast.addExistingSourceFile(sourceFile.fileName); // tslint:disable-line
+                : ast.addSourceFileAtPath(sourceFile.fileName); // tslint:disable-line
         const imports = file.getImportDeclarations();
         let searchedImport,
             aliasOriginalName = '',
@@ -300,7 +300,7 @@ export class ImportsUtil {
         const file =
             typeof ast.getSourceFile(sourceFilePath) !== 'undefined'
                 ? ast.getSourceFile(sourceFilePath)
-                : ast.addExistingSourceFile(sourceFilePath); // tslint:disable-line
+                : ast.addSourceFileAtPath(sourceFilePath); // tslint:disable-line
         const imports = file.getImportDeclarations();
 
         /**
@@ -358,7 +358,7 @@ export class ImportsUtil {
         const file =
             typeof ast.getSourceFile(sourceFile.fileName) !== 'undefined'
                 ? ast.getSourceFile(sourceFile.fileName)
-                : ast.addExistingSourceFile(sourceFile.fileName); // tslint:disable-line
+                : ast.addSourceFileAtPath(sourceFile.fileName); // tslint:disable-line
         const imports = file.getImportDeclarations();
 
         /**
@@ -402,7 +402,7 @@ export class ImportsUtil {
             const sourceFileImport =
                 typeof ast.getSourceFile(importPath) !== 'undefined'
                     ? ast.getSourceFile(importPath)
-                    : ast.addExistingSourceFile(importPath); // tslint:disable-line
+                    : ast.addSourceFileAtPath(importPath); // tslint:disable-line
             if (sourceFileImport) {
                 fileToSearchIn = sourceFileImport;
                 let variableName = foundWithAlias ? aliasOriginalName : metadataVariableName;

diff --git a/src/utils/is-module-with-providers.ts b/src/utils/is-module-with-providers.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 export function isModuleWithProviders(node: ts.VariableStatement): boolean {
     let result = false;

diff --git a/src/utils/jsdoc-parser.util.ts b/src/utils/jsdoc-parser.util.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { ts, SyntaxKind } from 'ts-simple-ast';
+import { ts, SyntaxKind } from 'ts-morph';
 
 import * as _ts from './ts-internal';
 

diff --git a/src/utils/kind-to-type.ts b/src/utils/kind-to-type.ts
@@ -1,4 +1,4 @@
-import { SyntaxKind } from 'ts-simple-ast';
+import { SyntaxKind } from 'ts-morph';
 
 export function kindToType(kind: number): string {
     let _type = '';

diff --git a/src/utils/object-literal-expression.util.ts b/src/utils/object-literal-expression.util.ts
@@ -1,4 +1,4 @@
-import { SyntaxKind } from 'ts-simple-ast';
+import { SyntaxKind } from 'ts-morph';
 
 export function StringifyObjectLiteralExpression(ole) {
     let returnedString = '{';

diff --git a/src/utils/router-parser.util.ts b/src/utils/router-parser.util.ts
@@ -2,7 +2,7 @@ import * as Handlebars from 'handlebars';
 import * as JSON5 from 'json5';
 import * as _ from 'lodash';
 import * as path from 'path';
-import Ast, { ts, SourceFile, SyntaxKind, TypeGuards } from 'ts-simple-ast';
+import { Project, ts, SourceFile, SyntaxKind, TypeGuards } from 'ts-morph';
 
 import FileEngine from '../app/engines/file.engine';
 import { RoutingGraphNode } from '../app/nodes/routing-graph-node';
@@ -12,7 +12,7 @@ import { logger } from './logger';
 
 const traverse = require('traverse');
 
-const ast = new Ast();
+const ast = new Project();
 
 export class RouterParserUtil {
     private routes: any[] = [];
@@ -591,7 +591,7 @@ export class RouterParserUtil {
                     const sourceFileImport =
                         typeof ast.getSourceFile(importPath) !== 'undefined'
                             ? ast.getSourceFile(importPath)
-                            : ast.addExistingSourceFile(importPath);
+                            : ast.addSourceFileAtPath(importPath);
                     if (sourceFileImport) {
                         let variableName = foundWithAlias
                             ? aliasOriginalName

diff --git a/src/utils/ts-printer.util.ts b/src/utils/ts-printer.util.ts
@@ -1,4 +1,4 @@
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 export class TsPrinterUtil {
     private printer: ts.Printer;

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs-extra';
 import * as _ from 'lodash';
 import * as path from 'path';
-import { ts } from 'ts-simple-ast';
+import { ts } from 'ts-morph';
 
 import { LinkParser } from './link-parser';
 
@@ -177,7 +177,7 @@ export function isIgnore(member): boolean {
 // https://tc39.github.io/ecma262/#sec-array.prototype.includes
 if (!Array.prototype.includes) {
     Object.defineProperty(Array.prototype, 'includes', {
-        value: function(searchElement, fromIndex) {
+        value: function (searchElement, fromIndex) {
             if (this == null) {
                 throw new TypeError('"this" is null or not defined');
             }
@@ -319,7 +319,10 @@ export function detectIndent(str, count): string {
         }
 
         // TODO: use spread operator when targeting Node.js 6
-        const indent = Math.min.apply(Math, match.map(x => x.length)); // eslint-disable-line
+        const indent = Math.min.apply(
+            Math,
+            match.map(x => x.length)
+        ); // eslint-disable-line
         const re = new RegExp(`^[ \\t]{${indent}}`, 'gm');
 
         return indent > 0 ? stripedString.replace(re, '') : stripedString;