jupyter-specta 0.4.0 → 0.4.2

package/lib/sharedscope.d.ts

@@ -1,3 +1,4 @@
 import '@jupyterlab/logconsole';
 import '@jupyterlab/console';
 import '@jupyterlite/apputils';
+import 'mock-socket';

package/lib/sharedscope.js

@@ -1,3 +1,4 @@
 import '@jupyterlab/logconsole';
 import '@jupyterlab/console';
 import '@jupyterlite/apputils';
+import 'mock-socket';

package/lib/specta_model.js

@@ -78,6 +78,9 @@ export class AppModel {
         switch (cellModel.type) {
             case 'code': {
                 let sourceCell;
+                cellModel.sharedModel.transact(() => {
+                    cellModel.clearExecution();
+                }, false);
                 if (cellConfig.showSource) {
                     sourceCell = new CodeCell({
                         model: cellModel,

package/lib/tool.d.ts

@@ -23,7 +23,7 @@ export declare function createFileBrowser(options: {
     urlFactory: ISpectaUrlFactory | null;
 }): any;
 export declare function hideAppLoadingIndicator(): void;
-export declare function mergeObjects(...objects: Record<string, any>[]): Record<string, any>;
+export declare function mergeObjects(lowerPriority: Record<string, any>, higherPriority: Record<string, any>): Record<string, any>;
 export declare function getSpectaAssetUrl(path: string): string;
 export declare function isSpectaApp(): boolean;
 export declare function readSpectaConfig({ nbMetadata, nbPath }: {

package/lib/tool.js

@@ -91,17 +91,31 @@ export function hideAppLoadingIndicator() {
         }, 1000);
     }
 }
-export function mergeObjects(...objects) {
-    const result = {};
-    for (const obj of objects) {
-        for (const [key, value] of Object.entries(obj)) {
-            if (value !== null && value !== undefined) {
-                result[key] = value;
+export function mergeObjects(lowerPriority, higherPriority) {
+    const result = Object.assign({}, lowerPriority);
+    for (const key of Object.keys(higherPriority)) {
+        const highVal = higherPriority[key];
+        const lowVal = lowerPriority[key];
+        // If higher is null or undefined, keep lower if it exists
+        if (highVal === null || highVal === undefined) {
+            if (lowVal !== null && lowVal !== undefined) {
+                result[key] = lowVal;
             }
+            continue;
         }
+        // Deep merge plain objects
+        if (isPlainObject(lowVal) && isPlainObject(highVal)) {
+            result[key] = mergeObjects(lowVal, highVal);
+            continue;
+        }
+        // Otherwise, higher priority wins
+        result[key] = highVal;
     }
     return result;
 }
+function isPlainObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
 export function getSpectaAssetUrl(path) {
     const labExtension = PageConfig.getOption('fullLabextensionsUrl');
     const url = URLExt.join(labExtension, 'jupyter-specta', 'static', path);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyter-specta",
-    "version": "0.4.0",
+    "version": "0.4.2",
     "description": "",
     "keywords": [],
     "homepage": "https://github.com/trungleduc/specta",
@@ -88,11 +88,12 @@
         "@jupyterlab/translation-extension": "^4.5.0",
         "@jupyterlab/ui-components": "^4.5.0",
         "@jupyterlab/ui-components-extension": "^4.5.0",
-        "@jupyterlite/application": "^0.7.0",
-        "@jupyterlite/application-extension": "^0.7.0",
-        "@jupyterlite/apputils": "^0.7.0",
-        "@jupyterlite/iframe-extension": "^0.7.0",
-        "@jupyterlite/services-extension": "^0.7.0",
+        "@jupyterlite/application": "^0.7.1",
+        "@jupyterlite/application-extension": "^0.7.1",
+        "@jupyterlite/apputils": "^0.7.1",
+        "@jupyterlite/iframe-extension": "^0.7.1",
+        "@jupyterlite/services-extension": "^0.7.1",
+        "@jupyterlite/apputils-extension": "0.7.1",
         "@lumino/algorithm": "^2.0.0",
         "@lumino/application": "^2.0.0",
         "@lumino/commands": "^2.0.0",
@@ -110,6 +111,7 @@
         "@lumino/widgets": "^2.0.0",
         "@types/reveal.js": "^5.2.0",
         "@voila-dashboards/voila": "^0.5.5",
+        "mock-socket": "^9.3.1",
         "react": "^18.3.0",
         "react-dom": "^18.3.0",
         "reveal.js": "^5.2.1"

package/style/base.css

@@ -92,7 +92,7 @@
   gap: 10px;
   align-items: center;
   justify-content: space-between;
-  padding: 0 1rem;
+  padding: 0;
   position: relative;
 }