Update semver usage (#10416)

* only use semver types on Web.

* fix compile

src/intellisense/intellisenseProvider.node.ts

@@ -23,7 +23,7 @@ import { LanguageServer } from './languageServer.node';
 import { IVSCodeNotebookController } from '../notebooks/controllers/types';
 import { getComparisonKey } from '../platform/vscode-path/resources';
 import { CompletionRequest } from 'vscode-languageclient';
-import { NotebookPythonPathService } from './notebookPythonPathService';
+import { NotebookPythonPathService } from './notebookPythonPathService.node';
 import { isJupyterNotebook } from '../platform/common/utils';
 
 const EmptyWorkspaceKey = '';

src/intellisense/serviceRegistry.node.ts

@@ -7,7 +7,7 @@ import { IServiceManager } from '../platform/ioc/types';
 import { NotebookCellLanguageService } from './cellLanguageService';
 import { NotebookCellBangInstallDiagnosticsProvider } from './diagnosticsProvider';
 import { EmptyNotebookCellLanguageService } from './emptyNotebookCellLanguageService';
-import { NotebookPythonPathService } from './notebookPythonPathService';
+import { NotebookPythonPathService } from './notebookPythonPathService.node';
 import { PythonKernelCompletionProvider } from './pythonKernelCompletionProvider';
 import { PythonKernelCompletionProviderRegistration } from './pythonKernelCompletionProviderRegistration';
 

src/kernels/jupyter/interpreter/nbconvertInterpreterDependencyChecker.node.ts

@@ -6,7 +6,7 @@
 import { inject, injectable } from 'inversify';
 import { SemVer } from 'semver';
 import { CancellationToken } from 'vscode';
-import { parseSemVer } from '../../../platform/common/utils';
+import { parseSemVer } from '../../../platform/common/utils.node';
 import { PythonEnvironment } from '../../../platform/pythonEnvironments/info';
 import { ResourceSet } from '../../../platform/vscode-path/map';
 import { JupyterCommands } from '../../../webviews/webview-side/common/constants';

src/platform/common/platform/platformService.web.ts

@@ -3,7 +3,6 @@
 'use strict';
 
 import { injectable } from 'inversify';
-import { SemVer } from 'semver';
 import { OSType } from '../utils/platform';
 import { IPlatformService } from './types';
 
@@ -16,16 +15,12 @@ export class PlatformService implements IPlatformService {
         return undefined;
     }
     public readonly osType: OSType = OSType.Unknown;
-    public version?: SemVer;
     public get pathVariableName() {
         return '';
     }
     public get virtualEnvBinName() {
         return this.isWindows ? 'Scripts' : 'bin';
     }
-    public async getVersion(): Promise<SemVer> {
-        throw new Error('Not Supported');
-    }
 
     public get isWindows(): boolean {
         return this.osType === OSType.Windows;

src/platform/common/platform/types.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { SemVer } from 'semver';
 import * as vscode from 'vscode';
 import { OSType } from '../utils/platform';
 
@@ -21,7 +20,6 @@ export interface IPlatformService {
     readonly isMac: boolean;
     readonly isLinux: boolean;
     readonly is64bit: boolean;
-    getVersion(): Promise<SemVer>;
     readonly homeDir: vscode.Uri | undefined;
     readonly tempDir: vscode.Uri | undefined;
 }

src/platform/common/utils.node.ts

@@ -4,6 +4,7 @@
 
 import * as path from '../../platform/vscode-path/path';
 import * as fsExtra from 'fs-extra';
+import { SemVer, parse } from 'semver';
 import { Uri } from 'vscode';
 import { fsPathToUri } from '../vscode-path/utils';
 import { IWorkspaceService } from './application/types';
@@ -70,3 +71,14 @@ export async function calculateWorkingDirectory(
     }
     return workingDir;
 }
+
+// For the given string parse it out to a SemVer or return undefined
+export function parseSemVer(versionString: string): SemVer | undefined {
+    const versionMatch = /^\s*(\d+)\.(\d+)\.(.+)\s*$/.exec(versionString);
+    if (versionMatch && versionMatch.length > 2) {
+        const major = parseInt(versionMatch[1], 10);
+        const minor = parseInt(versionMatch[2], 10);
+        const build = parseInt(versionMatch[3], 10);
+        return parse(`${major}.${minor}.${build}`, true) ?? undefined;
+    }
+}

src/platform/common/utils.ts

@@ -4,7 +4,6 @@
 
 import type * as nbformat from '@jupyterlab/nbformat';
 import * as uriPath from '../../platform/vscode-path/resources';
-import { SemVer, parse } from 'semver';
 import { NotebookData, NotebookDocument, TextDocument, Uri, workspace } from 'vscode';
 import { sendTelemetryEvent } from '../../telemetry';
 import { getTelemetrySafeLanguage } from '../../telemetry/helpers';
@@ -156,17 +155,6 @@ export function generateNewNotebookUri(
     }
 }
 
-// For the given string parse it out to a SemVer or return undefined
-export function parseSemVer(versionString: string): SemVer | undefined {
-    const versionMatch = /^\s*(\d+)\.(\d+)\.(.+)\s*$/.exec(versionString);
-    if (versionMatch && versionMatch.length > 2) {
-        const major = parseInt(versionMatch[1], 10);
-        const minor = parseInt(versionMatch[2], 10);
-        const build = parseInt(versionMatch[3], 10);
-        return parse(`${major}.${minor}.${build}`, true) ?? undefined;
-    }
-}
-
 export function sendNotebookOrKernelLanguageTelemetry(
     telemetryEvent: Telemetry.SwitchToExistingKernel | Telemetry.NotebookLanguage,
     language?: string

src/platform/pythonEnvironments/info/interpreter.node.ts

@@ -5,7 +5,7 @@ import { Uri } from 'vscode';
 import { InterpreterInformation } from '.';
 import { interpreterInfo as getInterpreterInfoCommand, PythonEnvInfo } from '../../common/process/internal/scripts/index.node';
 import { copyPythonExecInfo, PythonExecInfo } from '../exec';
-import { parsePythonVersion } from './pythonVersion';
+import { parsePythonVersion } from './pythonVersion.node';
 
 
 /**

src/platform/pythonEnvironments/info/pythonVersion.node.ts

@@ -0,0 +1,47 @@
+/**
+ * Convert a Python version string.
+ *
+ * The supported formats are:
+ *
+ *  * MAJOR.MINOR.MICRO-RELEASE_LEVEL
+ *
+ *  (where RELEASE_LEVEL is one of {alpha,beta,candidate,final})
+ *
+ * Everything else, including an empty string, results in `undefined`.
+ */
+// Eventually we will want to also support the release serial
+// (e.g. beta1, candidate3) and maybe even release abbreviations
+
+import { SemVer } from 'semver';
+import { PythonVersion } from './pythonVersion';
+
+// (e.g. 3.9.2b1, 3.8.10rc3).
+export function parsePythonVersion(raw: string): PythonVersion | undefined {
+    if (!raw || raw.trim().length === 0) {
+        return;
+    }
+    const versionParts = (raw || '')
+        .split('.')
+        .map((item) => item.trim())
+        .filter((item) => item.length > 0)
+        .filter((_, index) => index < 4);
+
+    if (versionParts.length > 0 && versionParts[versionParts.length - 1].indexOf('-') > 0) {
+        const lastPart = versionParts[versionParts.length - 1];
+        versionParts[versionParts.length - 1] = lastPart.split('-')[0].trim();
+        versionParts.push(lastPart.split('-')[1].trim());
+    }
+    while (versionParts.length < 4) {
+        versionParts.push('');
+    }
+    // Exclude PII from `version_info` to ensure we don't send this up via telemetry.
+    for (let index = 0; index < 3; index += 1) {
+        versionParts[index] = /^\d+$/.test(versionParts[index]) ? versionParts[index] : '0';
+    }
+    if (['alpha', 'beta', 'candidate', 'final'].indexOf(versionParts[3]) === -1) {
+        versionParts.pop();
+    }
+    const numberParts = `${versionParts[0]}.${versionParts[1]}.${versionParts[2]}`;
+    const rawVersion = versionParts.length === 4 ? `${numberParts}-${versionParts[3]}` : numberParts;
+    return new SemVer(rawVersion);
+}

src/platform/pythonEnvironments/info/pythonVersion.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { SemVer } from 'semver';
-
 /**
  * A representation of a Python runtime's version.
  *
@@ -27,47 +25,3 @@ export type PythonVersion = {
     build: string[];
     prerelease: string[];
 };
-
-/**
- * Convert a Python version string.
- *
- * The supported formats are:
- *
- *  * MAJOR.MINOR.MICRO-RELEASE_LEVEL
- *
- *  (where RELEASE_LEVEL is one of {alpha,beta,candidate,final})
- *
- * Everything else, including an empty string, results in `undefined`.
- */
-// Eventually we will want to also support the release serial
-// (e.g. beta1, candidate3) and maybe even release abbreviations
-// (e.g. 3.9.2b1, 3.8.10rc3).
-export function parsePythonVersion(raw: string): PythonVersion | undefined {
-    if (!raw || raw.trim().length === 0) {
-        return;
-    }
-    const versionParts = (raw || '')
-        .split('.')
-        .map((item) => item.trim())
-        .filter((item) => item.length > 0)
-        .filter((_, index) => index < 4);
-
-    if (versionParts.length > 0 && versionParts[versionParts.length - 1].indexOf('-') > 0) {
-        const lastPart = versionParts[versionParts.length - 1];
-        versionParts[versionParts.length - 1] = lastPart.split('-')[0].trim();
-        versionParts.push(lastPart.split('-')[1].trim());
-    }
-    while (versionParts.length < 4) {
-        versionParts.push('');
-    }
-    // Exclude PII from `version_info` to ensure we don't send this up via telemetry.
-    for (let index = 0; index < 3; index += 1) {
-        versionParts[index] = /^\d+$/.test(versionParts[index]) ? versionParts[index] : '0';
-    }
-    if (['alpha', 'beta', 'candidate', 'final'].indexOf(versionParts[3]) === -1) {
-        versionParts.pop();
-    }
-    const numberParts = `${versionParts[0]}.${versionParts[1]}.${versionParts[2]}`;
-    const rawVersion = versionParts.length === 4 ? `${numberParts}-${versionParts[3]}` : numberParts;
-    return new SemVer(rawVersion);
-}

src/test/interpreters/index.node.ts

@@ -8,7 +8,7 @@ import { BufferDecoder } from '../../platform/common/process/decoder.node';
 import { PythonEnvInfo } from '../../platform/common/process/internal/scripts/index.node';
 import { ProcessService } from '../../platform/common/process/proc.node';
 import { PythonEnvironment } from '../../platform/pythonEnvironments/info';
-import { parsePythonVersion } from '../../platform/pythonEnvironments/info/pythonVersion';
+import { parsePythonVersion } from '../../platform/pythonEnvironments/info/pythonVersion.node';
 import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../constants.node';
 import { isCondaEnvironment } from './condaLocator.node';
 import { getCondaEnvironment, getCondaFile, isCondaAvailable } from './condaService.node';

src/webviews/extension-side/dataviewer/dataViewerDependencyService.node.ts

@@ -13,7 +13,7 @@ import { Cancellation, createPromiseFromCancellation } from '../../../platform/c
 import { traceWarning } from '../../../platform/logging';
 import { IPythonExecutionFactory } from '../../../platform/common/process/types.node';
 import { IsCodeSpace } from '../../../platform/common/types';
-import { parseSemVer } from '../../../platform/common/utils';
+import { parseSemVer } from '../../../platform/common/utils.node';
 import { DataScience, Common } from '../../../platform/common/utils/localize';
 import { IInterpreterService } from '../../../platform/interpreter/contracts';
 import { PythonEnvironment } from '../../../platform/pythonEnvironments/info';