rename folder

workspace


rename


build


build


wip


remove symlink


contract generator


rebase


fix imports


missing file


build update

.devcontainer/workspace.code-workspace

@@ -4,19 +4,23 @@
       "path": ".."
     },
     {
-      "path": "../src/dotnet-interactive-npm"
+      "path": "../src/polyglot-notebooks-browser"
     },
     {
-      "name": "VS Code - Stable",
-      "path": "../src/dotnet-interactive-vscode/stable"
+      "path": "../src/polyglot-notebooks-ui-components"
     },
     {
-      "name": "VS Code - Insiders",
-      "path": "../src/dotnet-interactive-vscode/insiders"
+      "path": "../src/polyglot-notebooks"
+    },
+    {
+      "name": "VS Code - Stable",
+      "path": "../src/polyglot-notebooks-vscode"
     },
     {
-      "path": "../src/Microsoft.DotNet.Interactive.Js"
+      "name": "VS Code - Insiders",
+      "path": "../src/polyglot-notebooks-vscode-insiders"
     }
+
   ],
   "settings": {}
 }

DEVELOPER-GUIDE.md

@@ -108,7 +108,7 @@ To get started, you'll need:
 
 2. Follow the regular build instructions as given above.
 
-3. Open the `<REPO-ROOT>/src/dotnet-interactive-vscode-insiders` directory in Visual Studio Code Insiders. (From your terminal, you can run `code-insiders <REPO-ROOT>/src/dotnet-interactive-vscode-insiders`.)
+3. Open the `<REPO-ROOT>/src/polyglot-notebooks-vscode-insiders` directory in Visual Studio Code Insiders. (From your terminal, you can run `code-insiders <REPO-ROOT>/src/polyglot-notebooks-vscode-insiders`.)
 
 4. Make the desired source code changes.
 

eng/build.ps1

@@ -12,12 +12,12 @@ $ErrorActionPreference = "Stop"
 try {
     $repoRoot = Resolve-Path "$PSScriptRoot\.."
     $symlinkDirectories = @(
-        "$repoRoot\src\microsoft-dotnet-interactive-browser\src\dotnet-interactive",
-        "$repoRoot\src\dotnet-interactive-vscode-common\src\dotnet-interactive",
-        "$repoRoot\src\dotnet-interactive-vscode\src\vscode-common",
-        "$repoRoot\src\dotnet-interactive-vscode\tests\vscode-common-tests",
-        "$repoRoot\src\dotnet-interactive-vscode-insiders\src\vscode-common",
-        "$repoRoot\src\dotnet-interactive-vscode-insiders\tests\vscode-common-tests"
+        "$repoRoot\src\polyglot-notebooks-browser\src\polyglot-notebooks",
+        "$repoRoot\src\polyglot-notebooks-vscode-common\src\polyglot-notebooks",
+        "$repoRoot\src\polyglot-notebooks-vscode\src\vscode-common",
+        "$repoRoot\src\polyglot-notebooks-vscode\tests\vscode-common-tests",
+        "$repoRoot\src\polyglot-notebooks-vscode-insiders\src\vscode-common",
+        "$repoRoot\src\polyglot-notebooks-vscode-insiders\tests\vscode-common-tests"
     )
 
     foreach ($symlinkDir in $symlinkDirectories) {
@@ -29,11 +29,11 @@ try {
 
     # build and test NPM
     $npmDirs = @(
-        "src\microsoft-dotnet-interactive",
-        "src\microsoft-dotnet-interactive-browser",
+        "src\polyglot-notebooks",
+        "src\polyglot-notebooks-browser",
         "src\polyglot-notebooks-ui-components",
-        "src\dotnet-interactive-vscode",
-        "src\dotnet-interactive-vscode-insiders"
+        "src\polyglot-notebooks-vscode",
+        "src\polyglot-notebooks-vscode-insiders"
 
     )
     foreach ($npmDir in $npmDirs) {

eng/build.sh

@@ -42,11 +42,11 @@ while [[ $# > 0 ]]; do
 done
 
 # build and test NPM
-npmDirs='src/microsoft-dotnet-interactive
-         src/microsoft-dotnet-interactive-browser
+npmDirs='src/polyglot-notebooks
+         src/polyglot-notebooks-browser
          src/polyglot-notebooks-ui-components
-         src/dotnet-interactive-vscode
-         src/dotnet-interactive-vscode-insiders'
+         src/polyglot-notebooks-vscode
+         src/polyglot-notebooks-vscode-insiders'
 for npmDir in $npmDirs;
 do
   echo "Building NPM in directory $npmDir"

eng/package/PackNpmPackage.ps1

@@ -16,7 +16,7 @@ function Build-NpmPackage() {
     # pack
     Write-Host "Packing package"
     npm pack
-    Copy-Item -Path (Join-Path (Get-Location) "microsoft-dotnet-interactive-$packageVersionNumber.tgz") -Destination $outDir
+    Copy-Item -Path (Join-Path (Get-Location) "microsoft-polyglot-notebooks-$packageVersionNumber.tgz") -Destination $outDir
 }
 
 try {

eng/package/PackVSCodeExtension.ps1

@@ -44,9 +44,9 @@ try {
 
     $stablePackageVersion = "${stableToolVersionNumber}0"
     $insidersPackageVersion = "${stableToolVersionNumber}1"
-    Build-VsCodeExtension -packageDirectory "dotnet-interactive-vscode" -outputSubDirectory "stable-locked" -packageVersionNumber $stablePackageVersion
-    Build-VsCodeExtension -packageDirectory "dotnet-interactive-vscode" -outputSubDirectory "stable" -packageVersionNumber $stablePackageVersion -kernelVersionNumber $stableToolVersionNumber
-    Build-VsCodeExtension -packageDirectory "dotnet-interactive-vscode-insiders" -outputSubDirectory "insiders" -packageVersionNumber $insidersPackageVersion -kernelVersionNumber $stableToolVersionNumber
+    Build-VsCodeExtension -packageDirectory "polyglot-notebooks-vscode" -outputSubDirectory "stable-locked" -packageVersionNumber $stablePackageVersion
+    Build-VsCodeExtension -packageDirectory "polyglot-notebooks-vscode" -outputSubDirectory "stable" -packageVersionNumber $stablePackageVersion -kernelVersionNumber $stableToolVersionNumber
+    Build-VsCodeExtension -packageDirectory "polyglot-notebooks-vscode-insiders" -outputSubDirectory "insiders" -packageVersionNumber $insidersPackageVersion -kernelVersionNumber $stableToolVersionNumber
 }
 catch {
     Write-Host $_

src/Microsoft.DotNet.Interactive.Browser/Microsoft.DotNet.Interactive.Browser.csproj

@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="..\microsoft-dotnet-interactive\lib\dotnet-interactive.js" />
+    <EmbeddedResource Include="..\polyglot-notebooks\lib\dotnet-interactive.js" />
   </ItemGroup>
 
   <ItemGroup>

src/dotnet-interactive.Tests/TypeScriptInterfacesContractTests.cs

@@ -49,6 +49,6 @@ dotnet run --project src/interface-generator -- --out-file {contractFile.FullNam
     [Fact]
     public void vscode_generated_TypeScript_interfaces_file_has_known_shape()
     {
-        CheckTypeScriptInterfaceFile("src/microsoft-dotnet-interactive/src/contracts.ts");
+        CheckTypeScriptInterfaceFile("src/polyglot-notebooks/src/contracts.ts");
     }
 }

src/dotnet-interactive/dotnet-interactive.csproj

@@ -118,7 +118,7 @@
   </Target>
 
   <PropertyGroup>
-    <JsApiRoot>$(MSBuildThisFileDirectory)/../microsoft-dotnet-interactive-browser/</JsApiRoot>
+    <JsApiRoot>$(MSBuildThisFileDirectory)/../polyglot-notebooks-browser/</JsApiRoot>
   </PropertyGroup>
 
   <ItemGroup>

src/ensure-symlinks.ps1

@@ -16,14 +16,14 @@ function EnsureSymlink([string]$sourceDirectory, [string] $linkName, [string] $d
     }
 }
 
-EnsureSymlink -sourceDirectory "$PSScriptRoot\microsoft-dotnet-interactive-browser\src" -linkName "dotnet-interactive" -destinationLocation "..\..\microsoft-dotnet-interactive\src"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-browser\src" -linkName "polyglot-notebooks" -destinationLocation "..\..\polyglot-notebooks\src"
 
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode-common\src" -linkName "dotnet-interactive" -destinationLocation "..\..\microsoft-dotnet-interactive\src"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode-common\src" -linkName "polyglot-notebooks" -destinationLocation "..\..\polyglot-notebooks\src"
 
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode\src" -linkName "ui" -destinationLocation "..\..\polyglot-notebooks-ui-components\src\contracts"
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode\src" -linkName "vscode-common" -destinationLocation "..\..\dotnet-interactive-vscode-common\src"
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode\tests" -linkName "vscode-common-tests" -destinationLocation "..\..\dotnet-interactive-vscode-common\tests"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode\src" -linkName "ui" -destinationLocation "..\..\polyglot-notebooks-ui-components\src\contracts"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode\src" -linkName "vscode-common" -destinationLocation "..\..\polyglot-notebooks-vscode-common\src"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode\tests" -linkName "vscode-common-tests" -destinationLocation "..\..\polyglot-notebooks-vscode-common\tests"
 
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode-insiders\src" -linkName "ui" -destinationLocation "..\..\polyglot-notebooks-ui-components\src\contracts"
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode-insiders\src" -linkName "vscode-common" -destinationLocation "..\..\dotnet-interactive-vscode-common\src"
-EnsureSymlink -sourceDirectory "$PSScriptRoot\dotnet-interactive-vscode-insiders\tests" -linkName "vscode-common-tests" -destinationLocation "..\..\dotnet-interactive-vscode-common\tests"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode-insiders\src" -linkName "ui" -destinationLocation "..\..\polyglot-notebooks-ui-components\src\contracts"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode-insiders\src" -linkName "vscode-common" -destinationLocation "..\..\polyglot-notebooks-vscode-common\src"
+EnsureSymlink -sourceDirectory "$PSScriptRoot\polyglot-notebooks-vscode-insiders\tests" -linkName "vscode-common-tests" -destinationLocation "..\..\polyglot-notebooks-vscode-common\tests"

src/microsoft-dotnet-interactive-browser/.gitignore → src/polyglot-notebooks-browser/.gitignore

@@ -1 +1 @@
-dist/
+dist/

src/microsoft-dotnet-interactive-browser/src/index.ts → src/polyglot-notebooks-browser/src/index.ts

@@ -1,4 +1,4 @@
 export * from "./library-init";
-export * from "./dotnet-interactive-interfaces";
-export * from "./dotnet-interactive/contracts";
+export * from "./polyglot-notebooks-interfaces";
+export * from "./polyglot-notebooks/contracts";
 export { createDotnetInteractiveClient } from "./kernel-client-impl";

src/microsoft-dotnet-interactive-browser/src/kernel-client-impl.ts → src/polyglot-notebooks-browser/src/kernel-client-impl.ts

@@ -1,14 +1,14 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import * as dotnetInteractiveInterfaces from "./dotnet-interactive-interfaces";
-import { Kernel, IKernelCommandHandler } from "./dotnet-interactive/kernel";
-import { TokenGenerator } from "./dotnet-interactive/tokenGenerator";
+import * as dotnetInteractiveInterfaces from "./polyglot-notebooks-interfaces";
+import { Kernel, IKernelCommandHandler } from "./polyglot-notebooks/kernel";
+import { TokenGenerator } from "./polyglot-notebooks/tokenGenerator";
 import { signalTransportFactory } from "./signalr-client";
-import * as contracts from "./dotnet-interactive/contracts";
+import * as contracts from "./polyglot-notebooks/contracts";
 import { createDefaultClientFetch } from "./clientFetch";
 import { clientSideKernelFactory } from "./kernel-factory";
-import { DisposableSubscription, IKernelCommandAndEventReceiver, IKernelCommandAndEventSender, isKernelEventEnvelope } from "./dotnet-interactive";
+import { DisposableSubscription, IKernelCommandAndEventReceiver, IKernelCommandAndEventSender, isKernelEventEnvelope } from "./polyglot-notebooks";
 
 export interface KernelClientImplParameteres {
     clientFetch: (input: RequestInfo, init?: RequestInit) => Promise<Response>;

src/microsoft-dotnet-interactive-browser/src/kernel-factory.ts → src/polyglot-notebooks-browser/src/kernel-factory.ts

@@ -1,8 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import { IKernelCommandAndEventReceiver, IKernelCommandAndEventSender, isKernelCommandEnvelope } from "./dotnet-interactive/connection";
-import { Kernel } from "./dotnet-interactive/kernel";
+import { IKernelCommandAndEventReceiver, IKernelCommandAndEventSender, isKernelCommandEnvelope } from "./polyglot-notebooks/connection";
+import { Kernel } from "./polyglot-notebooks/kernel";
 
 export function attachKernelToChannel(kernel: Kernel, channel: {
     sender: IKernelCommandAndEventSender,

src/microsoft-dotnet-interactive-browser/src/library-init.ts → src/polyglot-notebooks-browser/src/library-init.ts

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import { DotnetInteractiveScopeContainer, DotnetInteractiveScope } from "./dotnet-interactive-interfaces";
+import { DotnetInteractiveScopeContainer, DotnetInteractiveScope } from "./polyglot-notebooks-interfaces";
 import { createDotnetInteractiveClient } from "./kernel-client-impl";
 
 export function init(global: any) {

src/polyglot-notebooks-browser/src/polyglot-notebooks

@@ -0,0 +1 @@
+../../polyglot-notebooks/src

src/microsoft-dotnet-interactive-browser/src/dotnet-interactive-interfaces.ts → src/polyglot-notebooks-browser/src/polyglot-notebooks-interfaces.ts

@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import * as contracts from "./dotnet-interactive/contracts";
-import { DisposableSubscription } from "./dotnet-interactive/disposables";
-import { IKernelCommandHandler } from "./dotnet-interactive/kernel";
+import * as contracts from "./polyglot-notebooks/contracts";
+import { DisposableSubscription } from "./polyglot-notebooks/disposables";
+import { IKernelCommandHandler } from "./polyglot-notebooks/kernel";
 
 export interface VariableRequest {
     [kernelName: string]: Array<any>;

src/microsoft-dotnet-interactive-browser/src/signalr-client.ts → src/polyglot-notebooks-browser/src/signalr-client.ts

@@ -3,8 +3,8 @@
 
 import * as signalR from "@microsoft/signalr";
 import { Subject } from "rxjs";
-import { IKernelCommandAndEventReceiver, IKernelCommandAndEventSender, isKernelCommandEnvelope, isKernelEventEnvelope, KernelCommandAndEventReceiver, KernelCommandAndEventSender, KernelCommandOrEventEnvelope } from "./dotnet-interactive";
-import { KernelEventEnvelope, KernelCommandEnvelope } from "./dotnet-interactive/contracts";
+import { IKernelCommandAndEventReceiver, IKernelCommandAndEventSender, isKernelCommandEnvelope, isKernelEventEnvelope, KernelCommandAndEventReceiver, KernelCommandAndEventSender, KernelCommandOrEventEnvelope } from "./polyglot-notebooks";
+import { KernelEventEnvelope, KernelCommandEnvelope } from "./polyglot-notebooks/contracts";
 
 
 

src/microsoft-dotnet-interactive-browser/tests/kernel-client.test.ts → src/polyglot-notebooks-browser/tests/kernel-client.test.ts

@@ -5,10 +5,10 @@ import { expect } from "chai";
 import { createDotnetInteractiveClient } from "../src/kernel-client-impl";
 import * as fetchMock from "fetch-mock";
 import { configureFetchForKernelDiscovery, createMockChannel, MockKernelCommandAndEventChannel, asKernelClientContainer } from "./testSupport";
-import * as contracts from "../src/dotnet-interactive/contracts";
-import { IKernelCommandInvocation, Kernel } from "../src/dotnet-interactive/kernel";
+import * as contracts from "../src/polyglot-notebooks/contracts";
+import { IKernelCommandInvocation, Kernel } from "../src/polyglot-notebooks/kernel";
 import { attachKernelToChannel } from "../src/kernel-factory";
-import { KernelInvocationContext } from "../src/dotnet-interactive/kernelInvocationContext";
+import { KernelInvocationContext } from "../src/polyglot-notebooks/kernelInvocationContext";
 
 
 interface CustomCommand extends contracts.KernelCommand {
@@ -19,7 +19,7 @@ interface CustomCommand2 extends contracts.KernelCommand {
     moreData: string
 }
 
-describe("dotnet-interactive", () => {
+describe("polyglot-notebooks", () => {
 
 
     describe("langauge kernel", () => {

src/microsoft-dotnet-interactive-browser/tests/testSupport.ts → src/polyglot-notebooks-browser/tests/testSupport.ts

@@ -3,10 +3,10 @@
 
 import * as fetchMock from "fetch-mock";
 import * as rxjs from "rxjs";
-import { DotnetInteractiveClient, KernelClientContainer } from "../src/dotnet-interactive-interfaces";
-import * as connection from "../src/dotnet-interactive/connection";
-import * as contracts from "../src/dotnet-interactive/contracts";
-import { TokenGenerator } from "../src/dotnet-interactive/tokenGenerator";
+import { DotnetInteractiveClient, KernelClientContainer } from "../src/polyglot-notebooks-interfaces";
+import * as connection from "../src/polyglot-notebooks/connection";
+import * as contracts from "../src/polyglot-notebooks/contracts";
+import { TokenGenerator } from "../src/polyglot-notebooks/tokenGenerator";
 
 
 export function asKernelClientContainer(client: DotnetInteractiveClient): KernelClientContainer {

src/microsoft-dotnet-interactive-browser/tests/variable-api-contract.test.ts → src/polyglot-notebooks-browser/tests/variable-api-contract.test.ts

@@ -4,7 +4,7 @@
 import { expect } from "chai";
 import { createDotnetInteractiveClient } from "../src/kernel-client-impl";
 import * as fetchMock from "fetch-mock";
-import { VariableResponse, VariableRequest } from "../src/dotnet-interactive-interfaces";
+import { VariableResponse, VariableRequest } from "../src/polyglot-notebooks-interfaces";
 import { asKernelClientContainer, configureFetchForKernelDiscovery, createMockChannel } from "./testSupport";
 
 describe("dotnet-interactive", () => {

src/dotnet-interactive-vscode-common/src/DotnetInteractiveChannel.ts → src/polyglot-notebooks-vscode-common/src/DotnetInteractiveChannel.ts

@@ -1,8 +1,8 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import { IKernelCommandAndEventReceiver, IKernelCommandAndEventSender } from "./dotnet-interactive/connection";
-import { Disposable } from "./dotnet-interactive/disposables";
+import { IKernelCommandAndEventReceiver, IKernelCommandAndEventSender } from "./polyglot-notebooks/connection";
+import { Disposable } from "./polyglot-notebooks/disposables";
 
 export interface KernelCommandAndEventChannel extends Disposable {
     sender: IKernelCommandAndEventSender,

src/dotnet-interactive-vscode-common/src/clientMapper.ts → src/polyglot-notebooks-vscode-common/src/clientMapper.ts

@@ -3,9 +3,9 @@
 
 import { ErrorOutputCreator, InteractiveClient } from "./interactiveClient";
 import { ReportChannel, Uri } from "./interfaces/vscode-like";
-import { CompositeKernel } from './dotnet-interactive/compositeKernel';
+import { CompositeKernel } from './polyglot-notebooks/compositeKernel';
 import { KernelCommandAndEventChannel } from "./DotnetInteractiveChannel";
-import { Logger } from "./dotnet-interactive";
+import { Logger } from "./polyglot-notebooks";
 
 export interface ClientMapperConfiguration {
     channelCreator: (notebookUri: Uri) => Promise<KernelCommandAndEventChannel>,

src/dotnet-interactive-vscode-common/src/commands.ts → src/polyglot-notebooks-vscode-common/src/commands.ts

@@ -15,7 +15,7 @@ import * as metadataUtilities from './metadataUtilities';
 import { ReportChannel } from './interfaces/vscode-like';
 import { NotebookParserServer } from './notebookParserServer';
 import * as versionSpecificFunctions from '../versionSpecificFunctions';
-import { PromiseCompletionSource } from './dotnet-interactive/promiseCompletionSource';
+import { PromiseCompletionSource } from './polyglot-notebooks/promiseCompletionSource';
 
 import * as constants from './constants';
 

src/dotnet-interactive-vscode-common/src/constants.ts → src/polyglot-notebooks-vscode-common/src/constants.ts

@@ -1,22 +1,22 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-// languages
-export const CellLanguageIdentifier = 'polyglot-notebook';
-
-// notebook controllers
-export const NotebookControllerId = 'polyglot-notebook';
-export const JupyterNotebookControllerId = 'polyglot-notebook-for-jupyter';
-
-// notebook kernel
-export const JupyterKernelId = 'polyglot-notebook-for-jupyter';
-
-// view types
-export const NotebookViewType = 'polyglot-notebook';
-export const JupyterNotebookViewType = 'polyglot-notebook-jupyter';
-export const JupyterViewType = 'jupyter-notebook';
-
-// other
-export const DotnetConfigurationSectionName = 'dotnet-interactive';
-export const PolyglotConfigurationSectionName = 'polyglot-notebook';
-export const InteractiveWindowControllerId = 'polyglot-notebook-window';
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+// languages
+export const CellLanguageIdentifier = 'polyglot-notebook';
+
+// notebook controllers
+export const NotebookControllerId = 'polyglot-notebook';
+export const JupyterNotebookControllerId = 'polyglot-notebook-for-jupyter';
+
+// notebook kernel
+export const JupyterKernelId = 'polyglot-notebook-for-jupyter';
+
+// view types
+export const NotebookViewType = 'polyglot-notebook';
+export const JupyterNotebookViewType = 'polyglot-notebook-jupyter';
+export const JupyterViewType = 'jupyter-notebook';
+
+// other
+export const DotnetConfigurationSectionName = 'dotnet-interactive';
+export const PolyglotConfigurationSectionName = 'polyglot-notebook';
+export const InteractiveWindowControllerId = 'polyglot-notebook-window';