@datalayer/jupyter-react 0.0.11 → 0.0.14

package/lib/jupyter/services/kernel/Kernel.d.ts

@@ -1,15 +1,14 @@
-import { Kernel as JupyterKernel } from '@jupyterlab/services';
+import { Kernel as JupyterKernel, KernelManager } from '@jupyterlab/services';
 export declare type IKernelProps = {
-    baseUrl?: string;
-    wsUrl?: string;
+    kernelManager: KernelManager;
     kernelType?: string;
 };
 export declare class Kernel {
-    private _serverSettings;
+    private _kernelManager;
     private _kernelType;
     private _kernel;
-    constructor(options?: IKernelProps);
-    getJupyterKernel(): Promise<JupyterKernel.IKernelConnection>;
+    constructor(options: IKernelProps);
     private requestKernel;
+    getJupyterKernel(): Promise<JupyterKernel.IKernelConnection>;
 }
 export default Kernel;

package/lib/jupyter/services/kernel/Kernel.js

@@ -7,46 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { ServerConnection, KernelManager, SessionManager } from '@jupyterlab/services';
+import { SessionManager } from '@jupyterlab/services';
 import { UUID } from '@lumino/coreutils';
-/*
-const headers = new Headers({
-  'X-Datalayer': 'Datalayer',
-});
-*/
 export class Kernel {
-    constructor(options = {}) {
-        this._serverSettings = ServerConnection.makeSettings({
-            baseUrl: options.baseUrl || (location.protocol + '//' + location.host + "/api/jupyter"),
-            wsUrl: options.wsUrl || (location.protocol.replace('http', 'ws') + '//' + location.host + "/api/jupyter"),
-            appendToken: true,
-            init: {
-                credentials: 'include',
-                mode: 'cors',
-                //        headers: headers,
-            }
-        });
+    constructor(options) {
+        this._kernelManager = options.kernelManager;
         this._kernelType = options.kernelType || 'python3';
         this._kernel = this.requestKernel();
     }
-    getJupyterKernel() {
-        /*
-        if (this._kernel) {
-          return this._kernel;
-        }
-        this._kernel = this.requestKernel();
-        */
-        return this._kernel;
-    }
     requestKernel() {
         return __awaiter(this, void 0, void 0, function* () {
-            const kernelManager = new KernelManager({
-                serverSettings: this._serverSettings,
-                standby: 'never',
-            });
             const sessionManager = new SessionManager({
-                serverSettings: this._serverSettings,
-                kernelManager,
+                kernelManager: this._kernelManager,
                 standby: 'never',
             });
             yield sessionManager.ready;
@@ -60,6 +32,9 @@ export class Kernel {
             return session.kernel;
         });
     }
+    getJupyterKernel() {
+        return this._kernel;
+    }
 }
 export default Kernel;
 //# sourceMappingURL=Kernel.js.map

package/lib/jupyter/services/kernel/Kernel.js.map

@@ -1 +1 @@
-{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../../../../src/jupyter/services/kernel/Kernel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAA2B,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAOzC;;;;EAIE;AACF,MAAM,OAAO,MAAM;IAKjB,YAAmB,UAAwB,EAAE;QAC3C,IAAI,CAAC,eAAe,GAAI,gBAAgB,CAAC,YAAY,CAAC;YACpD,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,cAAc,CAAC;YACvF,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,GAAG,QAAQ,CAAC,IAAI,GAAG,cAAc,CAAC;YACzG,WAAW,EAAE,IAAI;YACjB,IAAI,EAAE;gBACJ,WAAW,EAAE,SAAS;gBACtB,IAAI,EAAE,MAAM;gBACpB,2BAA2B;aACpB;SACF,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IAEM,gBAAgB;QACrB;;;;;UAKE;QACF,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEa,aAAa;;YACzB,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC;gBACtC,cAAc,EAAE,IAAI,CAAC,eAAe;gBACpC,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;gBACxC,cAAc,EAAE,IAAI,CAAC,eAAe;gBACpC,aAAa;gBACb,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;YACH,MAAM,cAAc,CAAC,KAAK,CAAC;YAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC;gBAC5C,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI,CAAC,WAAW;aACvB,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,MAAO,CAAC,IAAI,CAAC;YAC3B,OAAO,OAAO,CAAC,MAAO,CAAC;QACzB,CAAC;KAAA;CAEF;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Kernel.js","sourceRoot":"","sources":["../../../../src/jupyter/services/kernel/Kernel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAA0C,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAOzC,MAAM,OAAO,MAAM;IAKjB,YAAmB,OAAqB;QACtC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IAEa,aAAa;;YACzB,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;gBACxC,aAAa,EAAE,IAAI,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;YACH,MAAM,cAAc,CAAC,KAAK,CAAC;YAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC;gBAC5C,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI,CAAC,WAAW;aACvB,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,MAAO,CAAC,IAAI,CAAC;YAC3B,OAAO,OAAO,CAAC,MAAO,CAAC;QACzB,CAAC;KAAA;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CAEF;AAED,eAAe,MAAM,CAAC"}

package/lib/jupyter/utils/Ids.d.ts

@@ -0,0 +1,2 @@
+export declare const newSourceId: (base: string) => string;
+export declare const newUuid: () => string;

package/lib/jupyter/utils/Ids.js

@@ -0,0 +1,11 @@
+import { v4 as uuid_v4 } from 'uuid';
+// const MAX = Number.MAX_SAFE_INTEGER;
+// const MAX = 999999;
+export const newSourceId = (base) => {
+    //  return base + Math.floor(Math.random() * MAX).toString();
+    return base;
+};
+export const newUuid = () => {
+    return uuid_v4();
+};
+//# sourceMappingURL=Ids.js.map

package/lib/jupyter/utils/Ids.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Ids.js","sourceRoot":"","sources":["../../../src/jupyter/utils/Ids.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,OAAO,EAAE,MAAM,MAAM,CAAC;AAErC,uCAAuC;AACvC,sBAAsB;AAEtB,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE;IAC5C,6DAA6D;IAC3D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,EAAE;IAC1B,OAAO,OAAO,EAAE,CAAC;AACnB,CAAC,CAAA"}

package/lib/state/State.d.ts

@@ -3,12 +3,12 @@ import { ICellState } from "../components/cell/CellState";
 import { INotebookState } from "../components/notebook/NotebookState";
 import { ITerminalState } from "../components/terminal/TerminalState";
 import { IOutputsState } from "../components/outputs/OutputState";
-export interface IState {
+export interface IJupyterReactState {
     cell: ICellState;
     outputs: IOutputsState;
     notebook: INotebookState;
     terminal: ITerminalState;
 }
-export declare const initialState: IState;
+export declare const initialState: IJupyterReactState;
 export declare const epics: import("redux-observable").Epic<AnyAction, AnyAction, any, any>;
-export declare const reducers: import("redux").Reducer<import("redux").CombinedState<IState>, import("redux").AnyAction>;
+export declare const reducers: import("redux").Reducer<import("redux").CombinedState<IJupyterReactState>, import("redux").AnyAction>;

package/lib/state/State.js.map

@@ -1 +1 @@
-{"version":3,"file":"State.js","sourceRoot":"","sources":["../../src/state/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAc,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,eAAe,EAAkB,MAAM,sCAAsC,CAAC;AAC5H,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAkB,MAAM,sCAAsC,CAAC;AAC7G,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAiB,MAAM,mCAAmC,CAAC;AAWrG,MAAM,CAAC,MAAM,YAAY,GAAW;IAClC,IAAI,EAAE,gBAAgB;IACtB,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE,oBAAoB;IAC9B,QAAQ,EAAE,oBAAoB;CAC/B,CAAA;AAED;;;;;;;;;EASE;AAEF,WAAW;AACX,MAAM,CAAC,MAAM,KAAK,GAAG,YAAY,CAC/B,aAAa,CACd,CAAC;AAEF,cAAc;AACd,MAAM,CAAC,MAAM,QAAQ,GAAG,eAAe,CAAS;IAC9C,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,aAAa;IACtB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;CAC1B,CAAC,CAAC"}
+{"version":3,"file":"State.js","sourceRoot":"","sources":["../../src/state/State.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAc,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,eAAe,EAAkB,MAAM,sCAAsC,CAAC;AAC5H,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAkB,MAAM,sCAAsC,CAAC;AAC7G,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAiB,MAAM,mCAAmC,CAAC;AAWrG,MAAM,CAAC,MAAM,YAAY,GAAuB;IAC9C,IAAI,EAAE,gBAAgB;IACtB,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE,oBAAoB;IAC9B,QAAQ,EAAE,oBAAoB;CAC/B,CAAA;AAED;;;;;;;;;EASE;AAEF,WAAW;AACX,MAAM,CAAC,MAAM,KAAK,GAAG,YAAY,CAC/B,aAAa,CACd,CAAC;AAEF,cAAc;AACd,MAAM,CAAC,MAAM,QAAQ,GAAG,eAAe,CAAqB;IAC1D,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,aAAa;IACtB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;CAC1B,CAAC,CAAC"}

package/lib/state/Store.js

@@ -1,11 +1,8 @@
 import { applyMiddleware, combineReducers, createStore } from "redux";
 import { createEpicMiddleware } from "redux-observable";
-import { cellReducer } from "../components/cell/CellState";
-import { notebookReducer } from "../components/notebook/NotebookState";
-import { terminalReducer } from "../components/terminal/TerminalState";
 const epicMiddleware = createEpicMiddleware();
 function createReducer(asyncReducers) {
-    return combineReducers(Object.assign({ cell: cellReducer, notebook: notebookReducer, terminal: terminalReducer }, asyncReducers));
+    return combineReducers(Object.assign({}, asyncReducers));
 }
 function createInjectableStore() {
     const injectableStore = createStore(createReducer({}), applyMiddleware(epicMiddleware));

package/lib/state/Store.js.map

@@ -1 +1 @@
-{"version":3,"file":"Store.js","sourceRoot":"","sources":["../../src/state/Store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAEvE,MAAM,cAAc,GAAG,oBAAoB,EAAgD,CAAC;AAE5F,SAAS,aAAa,CAAS,aAAkB;IAC/C,OAAO,eAAe,iBACpB,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,eAAe,IACtB,aAAa,EAChB,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB;IAC5B,MAAM,eAAe,GAAG,WAAW,CACjC,aAAa,CAAC,EAAE,CAAC,EACjB,eAAe,CAAC,cAAc,CAAC,CAChC,CAAC;IACD,eAAuB,CAAC,aAAa,GAAG,EAAE,CAAC;IAC3C,eAAuB,CAAC,MAAM,GAAG,CAAC,GAAW,EAAE,YAAiB,EAAE,IAAU,EAAE,EAAE;QAC/E,MAAM,OAAO,GAAI,eAAuB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,IAAI,EAAE;gBACR,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAC1B;YACA,eAAuB,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;YAC3D,MAAM,UAAU,GAAG,aAAa,CAAE,eAAuB,CAAC,aAAa,CAAC,CAAC;YACzE,eAAe,CAAC,cAAc,CAAC,UAAiB,CAAC,CAAC;SACnD;IACH,CAAC,CAAA;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AACD;;;;;;EAME;AACF,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;AAEhD,eAAe,eAAe,CAAC"}
+{"version":3,"file":"Store.js","sourceRoot":"","sources":["../../src/state/Store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxD,MAAM,cAAc,GAAG,oBAAoB,EAAgD,CAAC;AAE5F,SAAS,aAAa,CAAC,aAAkB;IACvC,OAAO,eAAe,mBACjB,aAAa,EAChB,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB;IAC5B,MAAM,eAAe,GAAG,WAAW,CACjC,aAAa,CAAC,EAAE,CAAC,EACjB,eAAe,CAAC,cAAc,CAAC,CAChC,CAAC;IACD,eAAuB,CAAC,aAAa,GAAG,EAAE,CAAC;IAC3C,eAAuB,CAAC,MAAM,GAAG,CAAC,GAAW,EAAE,YAAiB,EAAE,IAAU,EAAE,EAAE;QAC/E,MAAM,OAAO,GAAI,eAAuB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,IAAI,EAAE;gBACR,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAC1B;YACA,eAAuB,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;YAC3D,MAAM,UAAU,GAAG,aAAa,CAAE,eAAuB,CAAC,aAAa,CAAC,CAAC;YACzE,eAAe,CAAC,cAAc,CAAC,UAAiB,CAAC,CAAC;SACnD;IACH,CAAC,CAAA;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AACD;;;;;;EAME;AACF,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;AAEhD,eAAe,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/jupyter-react",
-  "version": "0.0.11",
+  "version": "0.0.14",
   "description": "Jupyter React",
   "license": "MIT",
   "private": false,
@@ -67,16 +67,16 @@
     "@jupyterlab/terminal": "4.0.0-alpha.12",
     "@jupyterlab/theme-dark-extension": "4.0.0-alpha.12",
     "@jupyterlab/theme-light-extension": "4.0.0-alpha.12",
-    "@datalayer/jupyterlite-kernel": "0.1.0-beta.11",
-    "@datalayer/jupyterlite-ipykernel": "0.1.0-beta.11",
-    "@datalayer/jupyterlite-ipykernel-extension": "0.1.0-beta.11",
-    "@jupyterlite/server": "0.1.0-beta.11",
-    "@jupyterlite/server-extension": "0.1.0-beta.11",
+    "@datalayer/jupyterlite-kernel": "0.1.0-beta.12",
+    "@datalayer/jupyterlite-ipykernel": "0.1.0-beta.12",
+    "@datalayer/jupyterlite-ipykernel-extension": "0.1.0-beta.12",
+    "@datalayer/jupyterlite-server": "0.1.0-beta.12",
+    "@datalayer/jupyterlite-server-extension": "0.1.0-beta.12",
     "@lumino/commands": "1.20.0",
     "@lumino/coreutils": "1.12.0",
     "@lumino/default-theme": "0.21.1",
     "@lumino/widgets": "1.31.1",
-    "@primer/react": "35.7.1-rc.ebe39a33",
+    "@primer/react": "35.8.0",
     "@primer/octicons-react": "17.0.0",
     "assert": "2.0.0",
     "marked": "4.0.10",

package/style/index.css

@@ -4,3 +4,29 @@ body {
   margin: 0;
   padding: 0;
 }
+
+:root {
+  --jp-ui-font-size1: 16px !important;
+}
+
+html {
+  box-sizing: content-box !important;
+}
+/*
+p {
+  font-size: 14px !important;
+}
+[data-component="leadingIcon"] {
+  margin-top: 2px;
+}
+[data-component="trailingIcon"] {
+  margin-top: 2px;
+}
+Reset the jupyter unset variables and rules.
+*, *::before, *::after {
+  box-sizing: border-box !important;
+}
+p {
+  margin: 0 0 10px !important;
+}
+*/