diff --git a/packages/cli/generators/relation/base-relation.generator.js b/packages/cli/generators/relation/base-relation.generator.js index d1127d2f425a..b94d10940d28 100644 --- a/packages/cli/generators/relation/base-relation.generator.js +++ b/packages/cli/generators/relation/base-relation.generator.js @@ -158,7 +158,7 @@ module.exports = class BaseRelationGenerator extends ArtifactGenerator { this.artifactInfo.srcRepositoryClassName = utils.toClassName(options.sourceModel) + 'Repository'; - this.artifactInfo.srcRepositoryFileObj = new relationUtils.AstLoopBackProject().addExistingSourceFile( + this.artifactInfo.srcRepositoryFileObj = new relationUtils.AstLoopBackProject().addSourceFileAtPath( this.artifactInfo.srcRepositoryFile, ); diff --git a/packages/cli/generators/relation/index.js b/packages/cli/generators/relation/index.js index 9b65bc41926b..2f29064b14ce 100644 --- a/packages/cli/generators/relation/index.js +++ b/packages/cli/generators/relation/index.js @@ -295,7 +295,7 @@ module.exports = class RelationGenerator extends ArtifactGenerator { this.artifactInfo.modelDir, utils.getModelFileName(this.artifactInfo.destinationModel), ); - const df = project.addExistingSourceFile(destinationFile); + const df = project.addSourceFileAtPath(destinationFile); const cl = relationUtils.getClassObj( df, this.artifactInfo.destinationModel, diff --git a/packages/cli/generators/relation/utils.generator.js b/packages/cli/generators/relation/utils.generator.js index c2448ba46d6e..bb897c3bd730 100644 --- a/packages/cli/generators/relation/utils.generator.js +++ b/packages/cli/generators/relation/utils.generator.js @@ -40,14 +40,14 @@ exports.getModelPropertyType = function(modelDir, modelName, propertyName) { const project = new this.AstLoopBackProject(); const modelFile = path.join(modelDir, utils.getModelFileName(modelName)); - const sf = project.addExistingSourceFile(modelFile); + const sf = project.addSourceFileAtPath(modelFile); const co = this.getClassObj(sf, modelName); return this.getPropertyType(co, propertyName); }; exports.addFileToProject = function(project, dir, modelName) { const fileName = path.resolve(dir, utils.getModelFileName(modelName)); - return project.addExistingSourceFile(fileName); + return project.addSourceFileAtPath(fileName); }; exports.getClassObj = function(fileName, modelName) { @@ -72,7 +72,7 @@ exports.addExportController = async function( }; if (generator.fs.exists(fileName)) { - pFile = project.addExistingSourceFile(fileName); + pFile = project.addSourceFileAtPath(fileName); // Exported declarations is now a `Map` const exportedDeclarations = pFile.getExportedDeclarations(); for (const declarations of exportedDeclarations.values()) { diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json index 9c34aac97bfa..92b75dfe010e 100644 --- a/packages/cli/package-lock.json +++ b/packages/cli/package-lock.json @@ -191,14 +191,13 @@ } }, "@ts-morph/common": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.1.1.tgz", - "integrity": "sha512-8TLlC85CXgKNoTeqoXtrscPmKDbQCBfwZJ4hqli/QI4STa7sD2H6UqI9LSg8uBV5FYaD0QSdj/mtrCDrELvF+Q==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.2.2.tgz", + "integrity": "sha512-cMUlKTWvrfE5RYJn2VvM67iwIPl3aXm4xfm8oHzCCi2YaWp+NlSuiqj5cUMh+Lse2y84BqjAVOxAv1AY1Ncf+w==", "requires": { "@dsherret/to-absolute-glob": "^2.0.2", + "fast-glob": "^3.1.0", "fs-extra": "^8.1.0", - "glob-parent": "^5.1.0", - "globby": "^10.0.1", "is-negated-glob": "^1.0.0", "multimatch": "^4.0.0", "typescript": "~3.7.2" @@ -1431,14 +1430,6 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==" }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "requires": { - "path-type": "^4.0.0" - } - }, "dot-case": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz", @@ -2141,21 +2132,6 @@ "cldrjs": "^0.5.0" } }, - "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", - "requires": { - "@types/glob": "^7.1.1", - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", - "slash": "^3.0.0" - } - }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -2385,11 +2361,6 @@ "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, - "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" - }, "ignore-walk": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", @@ -4745,11 +4716,6 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" - }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -5444,11 +5410,6 @@ "supports-color": "^7.1.0" } }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" - }, "smart-buffer": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", @@ -6195,13 +6156,13 @@ "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" }, "ts-morph": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-5.0.0.tgz", - "integrity": "sha512-VP5dFnOzmlsDkSyuGczgVNtyJdYXMxFqMO2Rb0pIeni0o0Cy/nDljETBWhJs4FI4DIWv7Ftq69kgZO8p8w6LCw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-6.0.2.tgz", + "integrity": "sha512-o7FPVY0jMSKlJHfyfEkiCWTq7vqdmNLQaQd4jXY7lxCELgh+h7zI+frvSe7S0o/TJAAKViy9wM/FzRXW+9LnZQ==", "requires": { "@dsherret/to-absolute-glob": "^2.0.2", - "@ts-morph/common": "~0.1.0", - "code-block-writer": "^10.0.0" + "@ts-morph/common": "~0.2.2", + "code-block-writer": "^10.1.0" } }, "tslib": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 49a89c8581f5..3cfd2936ea94 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -64,7 +64,7 @@ "swagger-parser": "^8.0.4", "swagger2openapi": "^5.3.2", "tildify": "^2.0.0", - "ts-morph": "^5.0.0", + "ts-morph": "^6.0.2", "typescript": "~3.7.4", "unicode-10.0.0": "^0.7.5", "untildify": "^4.0.0",