Return js kernel

Author: jakubno

js/tests/languages/js.test.ts renamed to js/tests/languages/deno.test.ts

@@ -3,13 +3,13 @@ import { expect } from 'vitest'
 import { sandboxTest } from '../setup'
 
 sandboxTest('js simple', async ({ sandbox }) => {
-  const result = await sandbox.runCode('console.log("Hello, World!")', {language: "js"})
+  const result = await sandbox.runCode('console.log("Hello, World!")', {language: "deno"})
 
   expect(result.logs.stdout.join().trim()).toEqual('Hello, World!')
 })
 
 sandboxTest('js import', async ({ sandbox }) => {
-  const result = await sandbox.runCode('import isOdd from "npm:is-odd"\nisOdd(3)', {language: "js"})
+  const result = await sandbox.runCode('import isOdd from "npm:is-odd"\nisOdd(3)', {language: "deno"})
 
   expect(result.results[0].text).toEqual('true')
 })
@@ -21,30 +21,29 @@ sandboxTest('js top level await', async ({ sandbox }) => {
     }
 
     await main()
-    `, {language: "js"})
+    `, {language: "deno"})
   expect(result.results[0].text).toEqual('Hello, World!')
 })
 
 sandboxTest('js es6', async ({ sandbox }) => {
   const result = await sandbox.runCode(`
-const add = (x, y) => x + y;
-add(1, 2)
-`, {language: "js"})
+   const add = (x, y) => x + y;
+   add(1, 2)`, {language: "deno"})
   expect(result.results[0].text).toEqual('3')
 })
 
 
 sandboxTest('js context', async ({ sandbox }) => {
-  await sandbox.runCode('const z = 1', {language: "js"})
-  const result = await sandbox.runCode('z', {language: "js"})
+  await sandbox.runCode('const z = 1', {language: "deno"})
+  const result = await sandbox.runCode('z', {language: "deno"})
   expect(result.results[0].text).toEqual('1')
 })
 
 sandboxTest('js cwd', async ({ sandbox }) => {
-  const result = await sandbox.runCode('process.cwd()', {language: "js"})
+  const result = await sandbox.runCode('process.cwd()', {language: "deno})
   expect(result.results[0].text).toEqual('/home/user')
 
-  const ctx = await sandbox.createCodeContext( {cwd: '/home', language: "js"})
+  const ctx = await sandbox.createCodeContext( {cwd: '/home', language: "deno"})
   const result2 = await sandbox.runCode('process.cwd()', {context: ctx})
   expect(result2.results[0].text).toEqual('/home')
 })
@@ -56,7 +55,7 @@ function subtract(x: number, y: number): number {
 }
 
 subtract(1, 2)
-`, {language: "ts"})
+`, {language: "deno"})
 
   expect(result.results[0].text).toEqual('-1')
 })

python/tests/languages/test_js.py renamed to python/tests/languages/test_deno.py

@@ -5,7 +5,7 @@ async def test_javascript(async_sandbox: AsyncSandbox):
     code = """
     console.log('Hello, World!')
     """
-    execution = await async_sandbox.run_code(code, language="js")
+    execution = await async_sandbox.run_code(code, language="deno")
     assert execution.logs.stdout == ["Hello, World!\n"]
 
 
@@ -14,7 +14,7 @@ async def test_import(async_sandbox: AsyncSandbox):
     import isOdd from 'npm:is-odd'
     isOdd(3)
     """
-    execution = await async_sandbox.run_code(code, language="js")
+    execution = await async_sandbox.run_code(code, language="deno")
     assert execution.results[0].text == "true"
 
 
@@ -26,7 +26,7 @@ async def test_toplevel_await(async_sandbox: AsyncSandbox):
     
     await main()
     """
-    execution = await async_sandbox.run_code(code, language="js")
+    execution = await async_sandbox.run_code(code, language="deno")
     assert execution.results[0].text == "Hello, World!"
 
 
@@ -35,21 +35,21 @@ async def test_es6(async_sandbox: AsyncSandbox):
 const add = (x, y) => x + y;
 add(1, 2);
     """
-    execution = await async_sandbox.run_code(code, language="js")
+    execution = await async_sandbox.run_code(code, language="deno")
     assert execution.results[0].text == "3"
 
 
 async def test_context(async_sandbox: AsyncSandbox):
-    await async_sandbox.run_code("const x = 1", language="js")
-    execution = await async_sandbox.run_code("x", language="js")
+    await async_sandbox.run_code("const x = 1", language="deno")
+    execution = await async_sandbox.run_code("x", language="deno")
     assert execution.results[0].text == "1"
 
 
 async def test_cwd(async_sandbox: AsyncSandbox):
-    execution = await async_sandbox.run_code("process.cwd()", language="js")
+    execution = await async_sandbox.run_code("process.cwd()", language="deno")
     assert execution.results[0].text == "/home/user"
 
-    ctx = await async_sandbox.create_code_context("/home", language="js")
+    ctx = await async_sandbox.create_code_context("/home", language="deno")
     execution = await async_sandbox.run_code("process.cwd()", context=ctx)
     assert execution.results[0].text == "/home"
 
@@ -63,6 +63,6 @@ async def test_typescript(async_sandbox: AsyncSandbox):
   
 subtract(1, 2);
 """,
-        language="ts",
+        language="deno",
     )
     assert execution.results[0].text == "-1"

template/Dockerfile

@@ -23,6 +23,11 @@ RUN R -e "install.packages('IRkernel')"
 RUN R -e "IRkernel::installspec(user = FALSE, name = 'r', displayname = 'R')"
 
 # Javascript Kernel
+RUN npm install -g node-gyp
+RUN npm install -g --unsafe-perm ijavascript
+RUN ijsinstall --install=global
+
+# Deno Kernel
 COPY --from=denoland/deno:bin-2.0.4 /deno /usr/bin/deno
 RUN chmod +x /usr/bin/deno
 RUN deno jupyter --unstable --install

template/server/contexts.py

@@ -20,16 +20,11 @@ def normalize_language(language: Optional[str]) -> str:
 
     if language == "js":
         return "javascript"
-    if language == "ts":
-        return "typescript"
 
     return language
 
 
 async def create_context(client, websockets: dict, language: str, cwd: str) -> Context:
-    if language == "javascript" or language == "typescript":
-        language = "deno"
-
     data = {
         "path": str(uuid.uuid4()),
         "kernel": {"name": language},

template/test.Dockerfile

@@ -19,6 +19,11 @@ COPY ./template/requirements.txt requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3" --user
 
 # Javascript Kernel
+RUN npm install -g node-gyp
+RUN npm install -g --unsafe-perm ijavascript
+RUN ijsinstall --install=global
+
+# Deno Kernel
 COPY --from=denoland/deno:bin-2.0.4 /deno /usr/bin/deno
 RUN chmod +x /usr/bin/deno
 RUN deno jupyter --unstable --install