qsharp-lang 1.0.28-dev → 1.0.30-dev

package/lib/web/qsc_wasm.js

@@ -6,32 +6,7 @@ heap.push(undefined, null, true, false);
 
 function getObject(idx) { return heap[idx]; }
 
-let heap_next = heap.length;
-
-function dropObject(idx) {
-    if (idx < 132) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
-const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
-
-if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
+let WASM_VECTOR_LEN = 0;
 
 let cachedUint8Memory0 = null;
 
@@ -42,13 +17,6 @@ function getUint8Memory0() {
     return cachedUint8Memory0;
 }
 
-function getStringFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-let WASM_VECTOR_LEN = 0;
-
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
 
 const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
@@ -124,6 +92,38 @@ function getFloat64Memory0() {
     return cachedFloat64Memory0;
 }
 
+let heap_next = heap.length;
+
+function dropObject(idx) {
+    if (idx < 132) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
+const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
+
+if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
+
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
 function debugString(val) {
     // primitive types
     const type = typeof val;
@@ -189,12 +189,32 @@ function debugString(val) {
     return className;
 }
 
-let stack_pointer = 128;
+function makeMutClosure(arg0, arg1, dtor, f) {
+    const state = { a: arg0, b: arg1, cnt: 1, dtor };
+    const real = (...args) => {
+        // First up with a closure we increment the internal reference
+        // count. This ensures that the Rust closure environment won't
+        // be deallocated while we're invoking it.
+        state.cnt++;
+        const a = state.a;
+        state.a = 0;
+        try {
+            return f(a, state.b, ...args);
+        } finally {
+            if (--state.cnt === 0) {
+                wasm.__wbindgen_export_2.get(state.dtor)(a, state.b);
 
-function addBorrowedObject(obj) {
-    if (stack_pointer == 1) throw new Error('out of js stack');
-    heap[--stack_pointer] = obj;
-    return stack_pointer;
+            } else {
+                state.a = a;
+            }
+        }
+    };
+    real.original = state;
+
+    return real;
+}
+function __wbg_adapter_44(arg0, arg1, arg2) {
+    wasm.__wbindgen_export_3(arg0, arg1, addHeapObject(arg2));
 }
 
 let cachedUint32Memory0 = null;
@@ -206,13 +226,6 @@ function getUint32Memory0() {
     return cachedUint32Memory0;
 }
 
-function passArray32ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 4, 4) >>> 0;
-    getUint32Memory0().set(arg, ptr / 4);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
 function passArrayJsValueToWasm0(array, malloc) {
     const ptr = malloc(array.length * 4, 4) >>> 0;
     const mem = getUint32Memory0();
@@ -223,6 +236,21 @@ function passArrayJsValueToWasm0(array, malloc) {
     return ptr;
 }
 
+let stack_pointer = 128;
+
+function addBorrowedObject(obj) {
+    if (stack_pointer == 1) throw new Error('out of js stack');
+    heap[--stack_pointer] = obj;
+    return stack_pointer;
+}
+
+function passArray32ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 4, 4) >>> 0;
+    getUint32Memory0().set(arg, ptr / 4);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function getArrayJsValueFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     const mem = getUint32Memory0();
@@ -274,20 +302,20 @@ export function git_hash() {
         return getStringFromWasm0(r0, r1);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred1_0, deferred1_1, 1);
+        wasm.__wbindgen_export_4(deferred1_0, deferred1_1, 1);
     }
 }
 
 /**
-* @param {string} code
+* @param {(Array<any>)[]} sources
 * @returns {string}
 */
-export function get_qir(code) {
+export function get_qir(sources) {
     let deferred3_0;
     let deferred3_1;
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(code, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const ptr0 = passArrayJsValueToWasm0(sources, wasm.__wbindgen_export_0);
         const len0 = WASM_VECTOR_LEN;
         wasm.get_qir(retptr, ptr0, len0);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
@@ -305,21 +333,21 @@ export function get_qir(code) {
         return getStringFromWasm0(ptr2, len2);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred3_0, deferred3_1, 1);
+        wasm.__wbindgen_export_4(deferred3_0, deferred3_1, 1);
     }
 }
 
 /**
-* @param {string} code
+* @param {(Array<any>)[]} sources
 * @param {string} params
 * @returns {string}
 */
-export function get_estimates(code, params) {
+export function get_estimates(sources, params) {
     let deferred4_0;
     let deferred4_1;
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(code, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const ptr0 = passArrayJsValueToWasm0(sources, wasm.__wbindgen_export_0);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passStringToWasm0(params, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
         const len1 = WASM_VECTOR_LEN;
@@ -339,7 +367,7 @@ export function get_estimates(code, params) {
         return getStringFromWasm0(ptr3, len3);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred4_0, deferred4_1, 1);
+        wasm.__wbindgen_export_4(deferred4_0, deferred4_1, 1);
     }
 }
 
@@ -358,7 +386,7 @@ export function get_library_source_content(name) {
         let v2;
         if (r0 !== 0) {
             v2 = getStringFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export_2(r0, r1 * 1);
+            wasm.__wbindgen_export_4(r0, r1 * 1);
         }
         return v2;
     } finally {
@@ -385,21 +413,21 @@ export function get_hir(code) {
         return getStringFromWasm0(r0, r1);
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
-        wasm.__wbindgen_export_2(deferred2_0, deferred2_1, 1);
+        wasm.__wbindgen_export_4(deferred2_0, deferred2_1, 1);
     }
 }
 
 /**
-* @param {string} code
+* @param {(Array<any>)[]} sources
 * @param {string} expr
 * @param {Function} event_cb
 * @param {number} shots
 * @returns {boolean}
 */
-export function run(code, expr, event_cb, shots) {
+export function run(sources, expr, event_cb, shots) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(code, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        const ptr0 = passArrayJsValueToWasm0(sources, wasm.__wbindgen_export_0);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passStringToWasm0(expr, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
         const len1 = WASM_VECTOR_LEN;
@@ -438,9 +466,13 @@ function handleError(f, args) {
     try {
         return f.apply(this, args);
     } catch (e) {
-        wasm.__wbindgen_export_3(addHeapObject(e));
+        wasm.__wbindgen_export_5(addHeapObject(e));
     }
 }
+function __wbg_adapter_145(arg0, arg1, arg2, arg3) {
+    wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+}
+
 /**
 */
 export const StepResultId = Object.freeze({ BreakpointHit:0,"0":"BreakpointHit",Next:1,"1":"Next",StepIn:2,"2":"StepIn",StepOut:3,"3":"StepOut",Return:4,"4":"Return", });
@@ -474,34 +506,31 @@ export class DebugService {
         return DebugService.__wrap(ret);
     }
     /**
-    * @param {string} path
-    * @param {string} source
+    * @param {(Array<any>)[]} sources
     * @param {string} target_profile
     * @param {string | undefined} entry
     * @returns {string}
     */
-    load_source(path, source, target_profile, entry) {
-        let deferred5_0;
-        let deferred5_1;
+    load_source(sources, target_profile, entry) {
+        let deferred4_0;
+        let deferred4_1;
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            const ptr0 = passStringToWasm0(path, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+            const ptr0 = passArrayJsValueToWasm0(sources, wasm.__wbindgen_export_0);
             const len0 = WASM_VECTOR_LEN;
-            const ptr1 = passStringToWasm0(source, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+            const ptr1 = passStringToWasm0(target_profile, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
             const len1 = WASM_VECTOR_LEN;
-            const ptr2 = passStringToWasm0(target_profile, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-            const len2 = WASM_VECTOR_LEN;
-            var ptr3 = isLikeNone(entry) ? 0 : passStringToWasm0(entry, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-            var len3 = WASM_VECTOR_LEN;
-            wasm.debugservice_load_source(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3);
+            var ptr2 = isLikeNone(entry) ? 0 : passStringToWasm0(entry, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+            var len2 = WASM_VECTOR_LEN;
+            wasm.debugservice_load_source(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1, ptr2, len2);
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
-            deferred5_0 = r0;
-            deferred5_1 = r1;
+            deferred4_0 = r0;
+            deferred4_1 = r1;
             return getStringFromWasm0(r0, r1);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
-            wasm.__wbindgen_export_2(deferred5_0, deferred5_1, 1);
+            wasm.__wbindgen_export_4(deferred4_0, deferred4_1, 1);
         }
     }
     /**
@@ -652,13 +681,28 @@ export class LanguageService {
         wasm.__wbg_languageservice_free(ptr);
     }
     /**
-    * @param {(uri: string, version: number | undefined, diagnostics: VSDiagnostic[]) => void} diagnostics_callback
     */
-    constructor(diagnostics_callback) {
-        const ret = wasm.languageservice_new(addHeapObject(diagnostics_callback));
+    constructor() {
+        const ret = wasm.languageservice_new();
         return LanguageService.__wrap(ret);
     }
     /**
+    * @param {(uri: string, version: number | undefined, diagnostics: VSDiagnostic[]) => void} diagnostics_callback
+    * @param {(uri: string) => Promise<string | null>} read_file
+    * @param {(uri: string) => Promise<[string, number][]>} list_directory
+    * @param {(uri: string) => Promise<{ manifestDirectory: string }| null>} get_manifest
+    * @returns {Promise<any>}
+    */
+    start_background_work(diagnostics_callback, read_file, list_directory, get_manifest) {
+        const ret = wasm.languageservice_start_background_work(this.__wbg_ptr, addHeapObject(diagnostics_callback), addHeapObject(read_file), addHeapObject(list_directory), addHeapObject(get_manifest));
+        return takeObject(ret);
+    }
+    /**
+    */
+    stop_background_work() {
+        wasm.languageservice_stop_background_work(this.__wbg_ptr);
+    }
+    /**
     * @param {IWorkspaceConfiguration} config
     */
     update_configuration(config) {
@@ -698,14 +742,11 @@ export class LanguageService {
     }
     /**
     * @param {string} notebook_uri
-    * @param {(string)[]} cell_uris
     */
-    close_notebook_document(notebook_uri, cell_uris) {
+    close_notebook_document(notebook_uri) {
         const ptr0 = passStringToWasm0(notebook_uri, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
         const len0 = WASM_VECTOR_LEN;
-        const ptr1 = passArrayJsValueToWasm0(cell_uris, wasm.__wbindgen_export_0);
-        const len1 = WASM_VECTOR_LEN;
-        wasm.languageservice_close_notebook_document(this.__wbg_ptr, ptr0, len0, ptr1, len1);
+        wasm.languageservice_close_notebook_document(this.__wbg_ptr, ptr0, len0);
     }
     /**
     * @param {string} uri
@@ -744,7 +785,7 @@ export class LanguageService {
             var r0 = getInt32Memory0()[retptr / 4 + 0];
             var r1 = getInt32Memory0()[retptr / 4 + 1];
             var v2 = getArrayJsValueFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export_2(r0, r1 * 4);
+            wasm.__wbindgen_export_4(r0, r1 * 4);
             return v2;
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
@@ -798,6 +839,49 @@ export class LanguageService {
         return takeObject(ret);
     }
 }
+/**
+* a minimal implementation for interacting with async JS filesystem callbacks to
+* load project files
+*/
+export class ProjectLoader {
+
+    static __wrap(ptr) {
+        ptr = ptr >>> 0;
+        const obj = Object.create(ProjectLoader.prototype);
+        obj.__wbg_ptr = ptr;
+
+        return obj;
+    }
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_projectloader_free(ptr);
+    }
+    /**
+    * @param {(uri: string) => Promise<string | null>} read_file
+    * @param {(uri: string) => Promise<[string, number][]>} list_directory
+    * @param {(uri: string) => Promise<{ manifestDirectory: string }| null>} get_manifest
+    */
+    constructor(read_file, list_directory, get_manifest) {
+        const ret = wasm.projectloader_new(addHeapObject(read_file), addHeapObject(list_directory), addHeapObject(get_manifest));
+        return ProjectLoader.__wrap(ret);
+    }
+    /**
+    * @param {{ manifestDirectory: string }} manifest
+    * @returns {Promise<[string, string][]>}
+    */
+    load_project(manifest) {
+        const ret = wasm.projectloader_load_project(this.__wbg_ptr, addHeapObject(manifest));
+        return takeObject(ret);
+    }
+}
 
 async function __wbg_load(module, imports) {
     if (typeof Response === 'function' && module instanceof Response) {
@@ -833,9 +917,32 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
+    imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'string' ? obj : undefined;
+        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
+        var len1 = WASM_VECTOR_LEN;
+        getInt32Memory0()[arg0 / 4 + 1] = len1;
+        getInt32Memory0()[arg0 / 4 + 0] = ptr1;
+    };
+    imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'number' ? obj : undefined;
+        getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
+        getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
+    };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
+    imports.wbg.__wbindgen_cb_drop = function(arg0) {
+        const obj = takeObject(arg0).original;
+        if (obj.cnt-- == 1) {
+            obj.a = 0;
+            return true;
+        }
+        const ret = false;
+        return ret;
+    };
     imports.wbg.__wbindgen_bigint_from_u64 = function(arg0) {
         const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
@@ -857,14 +964,6 @@ function __wbg_get_imports() {
         const ret = getObject(arg0) in getObject(arg1);
         return ret;
     };
-    imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
-        const obj = getObject(arg1);
-        const ret = typeof(obj) === 'string' ? obj : undefined;
-        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-        var len1 = WASM_VECTOR_LEN;
-        getInt32Memory0()[arg0 / 4 + 1] = len1;
-        getInt32Memory0()[arg0 / 4 + 0] = ptr1;
-    };
     imports.wbg.__wbindgen_number_new = function(arg0) {
         const ret = arg0;
         return addHeapObject(ret);
@@ -884,10 +983,18 @@ function __wbg_get_imports() {
         getInt32Memory0()[arg0 / 4 + 1] = len1;
         getInt32Memory0()[arg0 / 4 + 0] = ptr1;
     };
+    imports.wbg.__wbindgen_is_null = function(arg0) {
+        const ret = getObject(arg0) === null;
+        return ret;
+    };
     imports.wbg.__wbindgen_is_function = function(arg0) {
         const ret = typeof(getObject(arg0)) === 'function';
         return ret;
     };
+    imports.wbg.__wbindgen_typeof = function(arg0) {
+        const ret = typeof getObject(arg0);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
         const ret = getObject(arg0);
         return addHeapObject(ret);
@@ -901,12 +1008,6 @@ function __wbg_get_imports() {
         const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
         return ret;
     };
-    imports.wbg.__wbindgen_number_get = function(arg0, arg1) {
-        const obj = getObject(arg1);
-        const ret = typeof(obj) === 'number' ? obj : undefined;
-        getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret;
-        getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
-    };
     imports.wbg.__wbg_getwithrefkey_d1f0d12f1f1b63ea = function(arg0, arg1) {
         const ret = getObject(arg0)[getObject(arg1)];
         return addHeapObject(ret);
@@ -1003,6 +1104,10 @@ function __wbg_get_imports() {
         const ret = Array.isArray(getObject(arg0));
         return ret;
     };
+    imports.wbg.__wbg_push_ca1c26067ef907ac = function(arg0, arg1) {
+        const ret = getObject(arg0).push(getObject(arg1));
+        return ret;
+    };
     imports.wbg.__wbg_instanceof_ArrayBuffer_39ac22089b74fddb = function(arg0) {
         let result;
         try {
@@ -1029,6 +1134,36 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).buffer;
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_new_43f1b47c28813cbd = function(arg0, arg1) {
+        try {
+            var state0 = {a: arg0, b: arg1};
+            var cb0 = (arg0, arg1) => {
+                const a = state0.a;
+                state0.a = 0;
+                try {
+                    return __wbg_adapter_145(a, state0.b, arg0, arg1);
+                } finally {
+                    state0.a = a;
+                }
+            };
+            const ret = new Promise(cb0);
+            return addHeapObject(ret);
+        } finally {
+            state0.a = state0.b = 0;
+        }
+    };
+    imports.wbg.__wbg_resolve_53698b95aaf7fcf8 = function(arg0) {
+        const ret = Promise.resolve(getObject(arg0));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_then_f7e06ee3c11698eb = function(arg0, arg1) {
+        const ret = getObject(arg0).then(getObject(arg1));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_then_b2267541e2a73865 = function(arg0, arg1, arg2) {
+        const ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_self_1ff1d729e9aae938 = function() { return handleError(function () {
         const ret = self.self;
         return addHeapObject(ret);
@@ -1092,6 +1227,10 @@ function __wbg_get_imports() {
         const ret = wasm.memory;
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_closure_wrapper533 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 156, __wbg_adapter_44);
+        return addHeapObject(ret);
+    };
 
     return imports;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qsharp-lang",
   "description": "qsharp language package for quantum development",
-  "version": "1.0.28-dev",
+  "version": "1.0.30-dev",
   "license": "MIT",
   "engines": {
     "node": ">=16.17.0"

package/ux/index.ts

@@ -8,4 +8,4 @@ import "./qsharp-ux.css";
 export { Histogram } from "./histogram.js";
 export { ReTable, type ReData } from "./reTable.js";
 export { SpaceChart } from "./spaceChart.js";
-export { ResultsTable, type CellValue } from "./resultsTable.js";
+export { ResultsTable } from "./resultsTable.js";

package/ux/reTable.tsx

@@ -25,6 +25,7 @@ export type ReData = {
     }[];
     assumptions: string[];
   };
+  new: boolean;
 };
 
 export function ReTable(props: {

package/ux/resultsTable.tsx

@@ -2,13 +2,14 @@
 // Licensed under the MIT License.
 
 import { useRef, useState } from "preact/hooks";
+import { type ReData } from "./reTable.js";
 
-export type CellValue = string | number | { value: string; sortBy: number };
+type CellValue = string | number | { value: string; sortBy: number };
 
 // Note: column 0 is expected to be unique amongst all rows
 export function ResultsTable(props: {
   columnNames: string[];
-  rows: CellValue[][];
+  data: ReData[];
   initialColumns: number[];
   ensureSelected: boolean;
   onRowSelected(rowId: string): void;
@@ -23,8 +24,20 @@ export function ResultsTable(props: {
   const [showColumnMenu, setShowColumnMenu] = useState(false);
   const [showRowMenu, setShowRowMenu] = useState("");
 
-  if (!selectedRow && props.ensureSelected && props.rows.length > 0) {
-    const rowId = props.rows[0][0].toString();
+  const rows = props.data.map(ReDataToRow);
+
+  // Find the first row that is new in the current sort order
+  const newest = getSortedRows(rows).find(
+    (row) => (row[row.length - 1] as string) === "New",
+  );
+
+  // Select the first of the newest rows, otherwise preserve the existing selection
+  if (newest && props.ensureSelected) {
+    const rowId = newest[0].toString();
+    setSelectedRow(rowId);
+    props.onRowSelected(rowId);
+  } else if (!selectedRow && props.ensureSelected && rows.length > 0) {
+    const rowId = rows[0][0].toString();
     setSelectedRow(rowId);
     props.onRowSelected(rowId);
   }
@@ -331,7 +344,7 @@ export function ResultsTable(props: {
         </tr>
       </thead>
       <tbody>
-        {getSortedRows(props.rows).map((row) => {
+        {getSortedRows(rows).map((row) => {
           const rowId = row[0].toString();
           return (
             <tr
@@ -383,3 +396,25 @@ export function ResultsTable(props: {
     </table>
   );
 }
+
+function ReDataToRow(data: ReData): CellValue[] {
+  return [
+    data.jobParams.runName,
+    data.jobParams.qubitParams.name,
+    data.jobParams.qecScheme.name,
+    data.jobParams.errorBudget,
+    data.physicalCounts.breakdown.algorithmicLogicalQubits,
+    data.physicalCounts.breakdown.algorithmicLogicalDepth,
+    data.logicalQubit.codeDistance,
+    data.physicalCounts.breakdown.numTstates,
+    data.physicalCounts.breakdown.numTfactories,
+    data.physicalCountsFormatted.physicalQubitsForTfactoriesPercentage,
+    {
+      value: data.physicalCountsFormatted.runtime,
+      sortBy: data.physicalCounts.runtime,
+    },
+    data.physicalCounts.rqops,
+    data.physicalCounts.physicalQubits,
+    data.new ? "New" : "Cached",
+  ];
+}