@nrwl/workspace 14.8.7 → 14.9.0-beta.1

package/src/utilities/typescript/compilation.js

@@ -3,25 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypeScriptWatcher = exports.compileTypeScript = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const fs_extra_1 = require("fs-extra");
-const ts = require("typescript");
+const fs_1 = require("fs");
+const ts_config_1 = require("../ts-config");
 const typescript_1 = require("../typescript");
+let tsModule;
 function compileTypeScript(options) {
     const normalizedOptions = normalizeOptions(options);
     const tsConfig = getNormalizedTsConfig(normalizedOptions);
     if (normalizedOptions.deleteOutputPath) {
-        (0, fs_extra_1.removeSync)(normalizedOptions.outputPath);
+        (0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
     }
     return createProgram(tsConfig, normalizedOptions);
 }
 exports.compileTypeScript = compileTypeScript;
 function compileTypeScriptWatcher(options, callback) {
+    if (!tsModule) {
+        tsModule = (0, typescript_1.ensureTypescript)();
+    }
     const normalizedOptions = normalizeOptions(options);
     const tsConfig = getNormalizedTsConfig(normalizedOptions);
     if (normalizedOptions.deleteOutputPath) {
-        (0, fs_extra_1.removeSync)(normalizedOptions.outputPath);
+        (0, fs_1.rmSync)(normalizedOptions.outputPath, { recursive: true, force: true });
     }
-    const host = ts.createWatchCompilerHost(tsConfig.fileNames, tsConfig.options, ts.sys);
+    const host = tsModule.createWatchCompilerHost(tsConfig.fileNames, tsConfig.options, tsModule.sys);
     const originalAfterProgramCreate = host.afterProgramCreate;
     host.afterProgramCreate = (builderProgram) => {
         const originalProgramEmit = builderProgram.emit;
@@ -39,7 +43,7 @@ function compileTypeScriptWatcher(options, callback) {
         originalOnWatchStatusChange === null || originalOnWatchStatusChange === void 0 ? void 0 : originalOnWatchStatusChange(a, b, c, d);
         yield (callback === null || callback === void 0 ? void 0 : callback(a, b, c, d));
     });
-    return ts.createWatchProgram(host);
+    return tsModule.createWatchProgram(host);
 }
 exports.compileTypeScriptWatcher = compileTypeScriptWatcher;
 function mergeCustomTransformers(originalCustomTransformers, consumerCustomTransformers) {
@@ -74,15 +78,21 @@ function mergeCustomTransformers(originalCustomTransformers, consumerCustomTrans
     return mergedCustomTransformers;
 }
 function getNormalizedTsConfig(options) {
-    const tsConfig = (0, typescript_1.readTsConfig)(options.tsConfig);
+    const tsConfig = (0, ts_config_1.readTsConfig)(options.tsConfig);
     tsConfig.options.outDir = options.outputPath;
     tsConfig.options.noEmitOnError = true;
     tsConfig.options.rootDir = options.rootDir;
+    if (tsConfig.options.incremental && !tsConfig.options.tsBuildInfoFile) {
+        tsConfig.options.tsBuildInfoFile = (0, devkit_1.joinPathFragments)(options.outputPath, 'tsconfig.tsbuildinfo');
+    }
     return tsConfig;
 }
 function createProgram(tsconfig, { projectName, getCustomTransformers }) {
-    const host = ts.createCompilerHost(tsconfig.options);
-    const program = ts.createProgram({
+    if (!tsModule) {
+        tsModule = (0, typescript_1.ensureTypescript)();
+    }
+    const host = tsModule.createCompilerHost(tsconfig.options);
+    const program = tsModule.createProgram({
         rootNames: tsconfig.fileNames,
         options: tsconfig.options,
         host,
@@ -90,9 +100,9 @@ function createProgram(tsconfig, { projectName, getCustomTransformers }) {
     devkit_1.logger.info(`Compiling TypeScript files for project "${projectName}"...`);
     const results = program.emit(undefined, undefined, undefined, undefined, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(program));
     if (results.emitSkipped) {
-        const diagnostics = ts.formatDiagnosticsWithColorAndContext(results.diagnostics, {
-            getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
-            getNewLine: () => ts.sys.newLine,
+        const diagnostics = tsModule.formatDiagnosticsWithColorAndContext(results.diagnostics, {
+            getCurrentDirectory: () => tsModule.sys.getCurrentDirectory(),
+            getNewLine: () => tsModule.sys.newLine,
             getCanonicalFileName: (name) => name,
         });
         devkit_1.logger.error(diagnostics);

package/src/utilities/typescript/compilation.js.map

@@ -1 +1 @@
-{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compilation.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/compilation.ts"],"names":[],"mappings":"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"}

package/src/utilities/typescript/find-nodes.d.ts

@@ -1,2 +1,5 @@
-import * as ts from 'typescript';
-export declare function findNodes(node: ts.Node, kind: ts.SyntaxKind | ts.SyntaxKind[], max?: number): ts.Node[];
+import type { Node, SyntaxKind } from 'typescript';
+/**
+ * @deprecated This function is deprecated and no longer supported.
+ */
+export declare function findNodes(node: Node, kind: SyntaxKind | SyntaxKind[], max?: number): Node[];

package/src/utilities/typescript/find-nodes.js

@@ -1,32 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findNodes = void 0;
+const typescript_1 = require("nx/src/utils/typescript");
+// TODO(v16): This should be removed.
+/**
+ * @deprecated This function is deprecated and no longer supported.
+ */
 function findNodes(node, kind, max = Infinity) {
-    if (!node || max == 0) {
-        return [];
-    }
-    const arr = [];
-    const hasMatch = Array.isArray(kind)
-        ? kind.includes(node.kind)
-        : node.kind === kind;
-    if (hasMatch) {
-        arr.push(node);
-        max--;
-    }
-    if (max > 0) {
-        for (const child of node.getChildren()) {
-            findNodes(child, kind, max).forEach((node) => {
-                if (max > 0) {
-                    arr.push(node);
-                }
-                max--;
-            });
-            if (max <= 0) {
-                break;
-            }
-        }
-    }
-    return arr;
+    console.warn('"findNodes" is deprecated and no longer supported.');
+    return (0, typescript_1.findNodes)(node, kind, max);
 }
 exports.findNodes = findNodes;
 //# sourceMappingURL=find-nodes.js.map

package/src/utilities/typescript/find-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/find-nodes.ts"],"names":[],"mappings":";;;AAEA,SAAgB,SAAS,CACvB,IAAa,EACb,IAAqC,EACrC,GAAG,GAAG,QAAQ;IAEd,IAAI,CAAC,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,GAAG,GAAc,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;IACvB,IAAI,QAAQ,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,GAAG,EAAE,CAAC;KACP;IACD,IAAI,GAAG,GAAG,CAAC,EAAE;QACX,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YACtC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3C,IAAI,GAAG,GAAG,CAAC,EAAE;oBACX,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAChB;gBACD,GAAG,EAAE,CAAC;YACR,CAAC,CAAC,CAAC;YAEH,IAAI,GAAG,IAAI,CAAC,EAAE;gBACZ,MAAM;aACP;SACF;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAjCD,8BAiCC"}
+{"version":3,"file":"find-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/find-nodes.ts"],"names":[],"mappings":";;;AAAA,wDAAkE;AAGlE,qCAAqC;AAErC;;GAEG;AACH,SAAgB,SAAS,CACvB,IAAU,EACV,IAA+B,EAC/B,GAAG,GAAG,QAAQ;IAEd,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;IACnE,OAAO,IAAA,sBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AACrC,CAAC;AAPD,8BAOC"}

package/src/utilities/typescript/get-source-nodes.d.ts

@@ -1,2 +1,5 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
+/**
+ * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ */
 export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];

package/src/utilities/typescript/get-source-nodes.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSourceNodes = void 0;
+/**
+ * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ */
 function getSourceNodes(sourceFile) {
     const nodes = [sourceFile];
     const result = [];

package/src/utilities/typescript/get-source-nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-source-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/get-source-nodes.ts"],"names":[],"mappings":";;;AAEA,SAAgB,cAAc,CAAC,UAAyB;IACtD,MAAM,KAAK,GAAc,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACvC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACtC;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,wCAgBC"}
+{"version":3,"file":"get-source-nodes.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/typescript/get-source-nodes.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,SAAgB,cAAc,CAAC,UAAyB;IACtD,MAAM,KAAK,GAAc,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACvC,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACtC;SACF;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,wCAgBC"}

package/src/utilities/typescript.d.ts

@@ -4,7 +4,6 @@ export { compileTypeScript } from './typescript/compilation';
 export type { TypeScriptCompilationOptions } from './typescript/compilation';
 export { findNodes } from './typescript/find-nodes';
 export { getSourceNodes } from './typescript/get-source-nodes';
-export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine;
 /**
  * Find a module based on it's import
  *
@@ -13,7 +12,12 @@ export declare function readTsConfig(tsConfigPath: string): ts.ParsedCommandLine
  * @param tsConfigPath
  */
 export declare function resolveModuleByImport(importExpr: string, filePath: string, tsConfigPath: string): string;
-export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
+export declare function ensureTypescript(): typeof ts;
+/**
+ * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ */
 export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
-export declare function getRootTsConfigFileName(): string | null;
-export declare function getRootTsConfigPath(): string | null;
+/**
+ * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ */
+export declare function getRootTsConfigPathInTree(tree: Tree): string;

package/src/utilities/typescript.js

@@ -1,34 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRootTsConfigPath = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.resolveModuleByImport = exports.readTsConfig = exports.getSourceNodes = exports.findNodes = exports.compileTypeScript = void 0;
+exports.getRootTsConfigPathInTree = exports.getRelativePathToRootTsConfig = exports.ensureTypescript = exports.resolveModuleByImport = exports.getSourceNodes = exports.findNodes = exports.compileTypeScript = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
-const fs_1 = require("fs");
 const path_1 = require("path");
+const versions_1 = require("../utils/versions");
 var compilation_1 = require("./typescript/compilation");
 Object.defineProperty(exports, "compileTypeScript", { enumerable: true, get: function () { return compilation_1.compileTypeScript; } });
-var find_nodes_1 = require("./typescript/find-nodes");
+var find_nodes_1 = require("./typescript/find-nodes"); // TODO(v16): remove this
 Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
 var get_source_nodes_1 = require("./typescript/get-source-nodes");
 Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_1.getSourceNodes; } });
-const normalizedAppRoot = devkit_2.workspaceRoot.replace(/\\/g, '/');
+const normalizedAppRoot = devkit_1.workspaceRoot.replace(/\\/g, '/');
 let tsModule;
-function readTsConfig(tsConfigPath) {
-    if (!tsModule) {
-        tsModule = require('typescript');
-    }
-    const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
-    return tsModule.parseJsonConfigFileContent(readResult.config, tsModule.sys, (0, path_1.dirname)(tsConfigPath));
-}
-exports.readTsConfig = readTsConfig;
 function readTsConfigOptions(tsConfigPath) {
     if (!tsModule) {
-        tsModule = require('typescript');
+        tsModule = ensureTypescript();
     }
     const readResult = tsModule.readConfigFile(tsConfigPath, tsModule.sys.readFile);
     // we don't need to scan the files, we only care about options
     const host = {
         readDirectory: () => [],
+        readFile: () => '',
         fileExists: tsModule.sys.fileExists,
     };
     return tsModule.parseJsonConfigFileContent(readResult.config, host, (0, path_1.dirname)(tsConfigPath)).options;
@@ -56,35 +48,26 @@ exports.resolveModuleByImport = resolveModuleByImport;
 function getCompilerHost(tsConfigPath) {
     const options = readTsConfigOptions(tsConfigPath);
     const host = tsModule.createCompilerHost(options, true);
-    const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_2.workspaceRoot, host.getCanonicalFileName);
+    const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_1.workspaceRoot, host.getCanonicalFileName);
     return { options, host, moduleResolutionCache };
 }
-function getRootTsConfigPathInTree(tree) {
-    for (const path of ['tsconfig.base.json', 'tsconfig.json']) {
-        if (tree.exists(path)) {
-            return path;
-        }
-    }
-    return 'tsconfig.base.json';
+function ensureTypescript() {
+    return (0, devkit_1.ensurePackage)('typescript', versions_1.typescriptVersion);
 }
-exports.getRootTsConfigPathInTree = getRootTsConfigPathInTree;
+exports.ensureTypescript = ensureTypescript;
+const ts_config_1 = require("./ts-config");
+/**
+ * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ */
 function getRelativePathToRootTsConfig(tree, targetPath) {
-    return (0, devkit_1.offsetFromRoot)(targetPath) + getRootTsConfigPathInTree(tree);
+    return (0, ts_config_1.getRelativePathToRootTsConfig)(tree, targetPath);
 }
 exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
-function getRootTsConfigFileName() {
-    for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
-        const tsConfigPath = (0, path_1.join)(devkit_2.workspaceRoot, tsConfigName);
-        if ((0, fs_1.existsSync)(tsConfigPath)) {
-            return tsConfigName;
-        }
-    }
-    return null;
-}
-exports.getRootTsConfigFileName = getRootTsConfigFileName;
-function getRootTsConfigPath() {
-    const tsConfigFileName = getRootTsConfigFileName();
-    return tsConfigFileName ? (0, path_1.join)(devkit_2.workspaceRoot, tsConfigFileName) : null;
+/**
+ * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ */
+function getRootTsConfigPathInTree(tree) {
+    return (0, ts_config_1.getRootTsConfigPathInTree)(tree);
 }
-exports.getRootTsConfigPath = getRootTsConfigPath;
+exports.getRootTsConfigPathInTree = getRootTsConfigPathInTree;
 //# sourceMappingURL=typescript.js.map

package/src/utilities/typescript.js.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,+BAA+B;AAE/B,gDAAsD;AACtD,wDAA6D;AAApD,gHAAA,iBAAiB,OAAA;AAE1B,sDAAoD,CAAC,yBAAyB;AAArE,uGAAA,SAAS,OAAA;AAClB,kEAA+D;AAAtD,kHAAA,cAAc,OAAA;AAEvB,MAAM,iBAAiB,GAAG,sBAAa,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAE5D,IAAI,QAAqC,CAAC;AAE1C,SAAS,mBAAmB,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,gBAAgB,EAAE,CAAC;KAC/B;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IAEF,8DAA8D;IAC9D,MAAM,IAAI,GAAgC;QACxC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE;QACvB,QAAQ,EAAE,GAAG,EAAE,CAAC,EAAE;QAClB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,UAAU;KACpC,CAAC;IAEF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,IAA0B,EAC1B,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC,OAAO,CAAC;AACZ,CAAC;AAED,IAAI,YAIH,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,UAAkB,EAClB,QAAgB,EAChB,YAAoB;IAEpB,YAAY,GAAG,YAAY,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,YAAY,CAAC;IAE9D,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CACnD,UAAU,EACV,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,qBAAqB,CACtB,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO;KACR;SAAM;QACL,OAAO,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,EAAE,EAAE,CAAC,CAAC;KAC7E;AACH,CAAC;AArBD,sDAqBC;AAED,SAAS,eAAe,CAAC,YAAoB;IAC3C,MAAM,OAAO,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACxD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,2BAA2B,CAChE,sBAAa,EACb,IAAI,CAAC,oBAAoB,CAC1B,CAAC;IACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;AAClD,CAAC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,IAAA,sBAAa,EAClB,YAAY,EACZ,4BAAiB,CAClB,CAAC;AACJ,CAAC;AALD,4CAKC;AAED,2CAGqB;AAErB;;GAEG;AACH,SAAgB,6BAA6B,CAAC,IAAU,EAAE,UAAkB;IAC1E,OAAO,IAAA,yCAA8B,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC1D,CAAC;AAFD,sEAEC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CAAC,IAAU;IAClD,OAAO,IAAA,qCAA0B,EAAC,IAAI,CAAC,CAAC;AAC1C,CAAC;AAFD,8DAEC"}

package/src/utilities/version-utils.d.ts

@@ -1 +1,4 @@
+/** @deprecated Use checkAndCleanWithSemver from @nrwl/devkit/src/utils/semver instead.
+ * TODO(v17): Remove this function from workspace. Keep it for now since there are projects that use it (e.g. https://github.com/gperdomor/nx-tools).
+ */
 export declare function checkAndCleanWithSemver(pkgName: string, version: string): string;

package/src/utilities/version-utils.js

@@ -1,19 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAndCleanWithSemver = void 0;
-const semver_1 = require("semver");
+const semver_1 = require("@nrwl/devkit/src/utils/semver");
+const devkit_1 = require("@nrwl/devkit");
+/** @deprecated Use checkAndCleanWithSemver from @nrwl/devkit/src/utils/semver instead.
+ * TODO(v17): Remove this function from workspace. Keep it for now since there are projects that use it (e.g. https://github.com/gperdomor/nx-tools).
+ */
 function checkAndCleanWithSemver(pkgName, version) {
-    let newVersion = version;
-    if ((0, semver_1.valid)(newVersion)) {
-        return newVersion;
-    }
-    if (version.startsWith('~') || version.startsWith('^')) {
-        newVersion = version.substring(1);
-    }
-    if (!(0, semver_1.valid)(newVersion)) {
-        throw new Error(`The package.json lists a version of ${pkgName} that Nx is unable to validate - (${version})`);
-    }
-    return newVersion;
+    devkit_1.logger.warn(`checkAndCleanWithSemver has been moved to @nrwl/devkit/src/utils/semver`);
+    return (0, semver_1.checkAndCleanWithSemver)(pkgName, version);
 }
 exports.checkAndCleanWithSemver = checkAndCleanWithSemver;
 //# sourceMappingURL=version-utils.js.map

package/src/utilities/version-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/version-utils.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAE/B,SAAgB,uBAAuB,CAAC,OAAe,EAAE,OAAe;IACtE,IAAI,UAAU,GAAG,OAAO,CAAC;IAEzB,IAAI,IAAA,cAAK,EAAC,UAAU,CAAC,EAAE;QACrB,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtD,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACnC;IAED,IAAI,CAAC,IAAA,cAAK,EAAC,UAAU,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,qCAAqC,OAAO,GAAG,CAC9F,CAAC;KACH;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAlBD,0DAkBC"}
+{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/version-utils.ts"],"names":[],"mappings":";;;AAAA,0DAAoG;AACpG,yCAAsC;AAEtC;;GAEG;AACH,SAAgB,uBAAuB,CAAC,OAAe,EAAE,OAAe;IACtE,eAAM,CAAC,IAAI,CACT,yEAAyE,CAC1E,CAAC;IACF,OAAO,IAAA,gCAAwB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AALD,0DAKC"}

package/src/utils/ast-utils.d.ts

@@ -1,125 +1,2 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT- style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Rule, SchematicContext, Source, Tree } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-import { FileData } from '@nrwl/devkit';
-import { Path } from '@angular-devkit/core';
-import type { NxJsonConfiguration } from '@nrwl/devkit';
-export declare function sortObjectByKeys(obj: unknown): {};
 export { findNodes } from '../utilities/typescript/find-nodes';
 export { getSourceNodes } from '../utilities/typescript/get-source-nodes';
-export interface Change {
-    apply(host: any): Promise<void>;
-    readonly type: string;
-    readonly path: string | null;
-    readonly order: number;
-    readonly description: string;
-}
-export declare class NoopChange implements Change {
-    type: string;
-    description: string;
-    order: number;
-    path: any;
-    apply(): Promise<void>;
-}
-export declare class InsertChange implements Change {
-    path: string;
-    pos: number;
-    toAdd: string;
-    type: string;
-    order: number;
-    description: string;
-    constructor(path: string, pos: number, toAdd: string);
-    apply(host: any): any;
-}
-export declare class RemoveChange implements Change {
-    path: string;
-    pos: number;
-    toRemove: string;
-    type: string;
-    order: number;
-    description: string;
-    constructor(path: string, pos: number, toRemove: string);
-    apply(host: any): Promise<void>;
-}
-export declare class ReplaceChange implements Change {
-    path: string;
-    pos: number;
-    oldText: string;
-    newText: string;
-    type: string;
-    order: number;
-    description: string;
-    constructor(path: string, pos: number, oldText: string, newText: string);
-    apply(host: any): Promise<void>;
-}
-export declare function addParameterToConstructor(source: ts.SourceFile, modulePath: string, opts: {
-    className: string;
-    param: string;
-}): Change[];
-export declare function addMethod(source: ts.SourceFile, modulePath: string, opts: {
-    className: string;
-    methodHeader: string;
-    body: string;
-}): Change[];
-export declare function findClass(source: ts.SourceFile, className: string, silent?: boolean): ts.ClassDeclaration;
-export declare function offset(text: string, numberOfTabs: number, wrap: boolean): string;
-export declare function addIncludeToTsConfig(tsConfigPath: string, source: ts.SourceFile, include: string): Change[];
-export declare function getImport(source: ts.SourceFile, predicate: (a: any) => boolean): {
-    moduleSpec: string;
-    bindings: string[];
-}[];
-export declare function addGlobal(source: ts.SourceFile, modulePath: string, statement: string): Change[];
-export declare function insert(host: Tree, modulePath: string, changes: Change[]): void;
-/**
- * This method is specifically for reading JSON files in a Tree
- * @param host The host tree
- * @param path The path to the JSON file
- * @returns The JSON data in the file.
- */
-export declare function readJsonInTree<T extends object = any>(host: Tree, path: string): T;
-/**
- * @deprecated This method is deprecated
- */
-export declare function getFileDataInHost(host: Tree, path: Path): FileData;
-export declare function allFilesInDirInHost(host: Tree, path: Path, options?: {
-    recursive: boolean;
-}): Path[];
-/**
- * This method is specifically for updating JSON in a Tree
- * @param path Path of JSON file in the Tree
- * @param callback Manipulation of the JSON data
- * @returns A rule which updates a JSON file file in a Tree
- */
-export declare function updateJsonInTree<T extends object = any, O extends object = T>(path: string, callback: (json: T, context: SchematicContext) => O): Rule;
-export declare function updateWorkspaceInTree<T extends object = any, O extends object = T>(callback: (json: T, context: SchematicContext, host: Tree) => O): Rule;
-export declare function readNxJsonInTree(host: Tree): NxJsonConfiguration<string[] | "*">;
-export declare function libsDir(host: Tree): string;
-export declare function appsDir(host: Tree): string;
-export declare function updateNxJsonInTree(callback: (json: NxJsonConfiguration, context: SchematicContext) => NxJsonConfiguration): Rule;
-export declare function readWorkspace(host: Tree): any;
-/**
- * Updates the package.json given the passed deps and/or devDeps. Only updates
- * if the packages are not yet present
- *
- * @param deps the package.json dependencies to add
- * @param devDeps the package.json devDependencies to add
- * @param addInstall default `true`; set to false to avoid installs
- */
-export declare function addDepsToPackageJson(deps: any, devDeps: any, addInstall?: boolean): Rule;
-export declare function updatePackageJsonDependencies(deps: any, devDeps: any, addInstall?: boolean): Rule;
-export declare function getProjectConfig(host: Tree, name: string): any;
-export declare function createOrUpdate(host: Tree, path: string, content: string): void;
-export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean): Change;
-export declare function replaceNodeValue(host: Tree, modulePath: string, node: ts.Node, content: string): void;
-export declare function renameSyncInTree(tree: Tree, from: string, to: string, cb: (err: string) => void): void;
-export declare function renameDirSyncInTree(tree: Tree, from: string, to: string, cb: (err: string) => void): void;
-/**
- * Applies a template merge but skips for already existing entries
- */
-export declare function applyWithSkipExisting(source: Source, rules: Rule[]): Rule;