@malloy-publisher/server 0.0.226 → 0.0.228

package/dist/default-publisher.config.json

@@ -2,19 +2,19 @@
   "frozenConfig": false,
   "environments": [
     {
-      "name": "malloy-samples",
+      "name": "examples",
       "packages": [
         {
-          "name": "ecommerce",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/ecommerce"
+          "name": "storefront",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/storefront"
         },
         {
-          "name": "imdb",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/imdb"
+          "name": "governed-analytics",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/governed-analytics"
         },
         {
-          "name": "faa",
-          "location": "https://github.com/credibledata/malloy-samples/tree/main/faa"
+          "name": "html-data-app",
+          "location": "https://github.com/malloydata/publisher/tree/main/examples/html-data-app"
         }
       ],
       "connections": []

package/dist/package_load_worker.mjs

@@ -12147,6 +12147,47 @@ function errMessage(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
+// src/package_load/rpc_wait_accountant.ts
+class RpcWaitAccountant {
+  now;
+  inFlight = 0;
+  waitStartMs = 0;
+  accumMs = 0;
+  startedCount = 0;
+  activeJobId;
+  constructor(now = () => performance.now()) {
+    this.now = now;
+  }
+  begin(jobId) {
+    this.activeJobId = jobId;
+    this.inFlight = 0;
+    this.waitStartMs = 0;
+    this.accumMs = 0;
+    this.startedCount = 0;
+  }
+  noteStart(jobId) {
+    if (jobId !== this.activeJobId)
+      return;
+    if (this.inFlight === 0)
+      this.waitStartMs = this.now();
+    this.inFlight += 1;
+    this.startedCount += 1;
+  }
+  noteSettle(jobId) {
+    if (jobId !== this.activeJobId)
+      return;
+    this.inFlight -= 1;
+    if (this.inFlight === 0)
+      this.accumMs += this.now() - this.waitStartMs;
+  }
+  get waitMs() {
+    return this.accumMs;
+  }
+  get fetches() {
+    return this.startedCount;
+  }
+}
+
 // src/package_load/package_load_worker.ts
 if (!parentPort) {
   throw new Error("package_load_worker.ts must be loaded inside a worker_threads Worker");
@@ -12168,6 +12209,7 @@ function callMain(send) {
     send(requestId);
   });
 }
+var schemaWait = new RpcWaitAccountant;
 function dispatchMainResponse(message) {
   if (message.type === "schema-for-tables-response" || message.type === "schema-for-sql-response" || message.type === "read-url-response" || message.type === "connection-metadata-response") {
     const pending = pendingRpc.get(message.requestId);
@@ -12202,31 +12244,42 @@ class ProxyConnection {
     return this.digest;
   }
   async fetchSchemaForTables(tables, options) {
-    const response = await callMain((requestId) => {
-      const req = {
-        type: "schema-for-tables",
-        requestId,
-        jobId: this.jobId,
-        connectionName: this.name,
-        tables,
-        options: serializeFetchOptions(options)
-      };
-      port.postMessage(req);
-    });
-    return { schemas: response.schemas, errors: response.errors };
+    schemaWait.noteStart(this.jobId);
+    try {
+      const response = await callMain((requestId) => {
+        const req = {
+          type: "schema-for-tables",
+          requestId,
+          jobId: this.jobId,
+          connectionName: this.name,
+          tables,
+          options: serializeFetchOptions(options)
+        };
+        port.postMessage(req);
+      });
+      return { schemas: response.schemas, errors: response.errors };
+    } finally {
+      schemaWait.noteSettle(this.jobId);
+    }
   }
   async fetchSchemaForSQLStruct(sentence, options) {
-    const response = await callMain((requestId) => {
-      const req = {
-        type: "schema-for-sql",
-        requestId,
-        jobId: this.jobId,
-        connectionName: this.name,
-        sentence,
-        options: serializeFetchOptions(options)
-      };
-      port.postMessage(req);
-    });
+    schemaWait.noteStart(this.jobId);
+    let response;
+    try {
+      response = await callMain((requestId) => {
+        const req = {
+          type: "schema-for-sql",
+          requestId,
+          jobId: this.jobId,
+          connectionName: this.name,
+          sentence,
+          options: serializeFetchOptions(options)
+        };
+        port.postMessage(req);
+      });
+    } finally {
+      schemaWait.noteSettle(this.jobId);
+    }
     if (response.error !== undefined)
       return { error: response.error };
     if (response.structDef === undefined) {
@@ -12559,13 +12612,22 @@ async function loadPackage(job) {
   const malloyConfig = buildWorkerMalloyConfig(job);
   const allFiles = await listPackageFiles(job.packagePath);
   const modelPaths = filterModelPaths(allFiles);
+  const compileRegionStart = performance.now();
+  schemaWait.begin(job.requestId);
   const models = await Promise.all(modelPaths.map((modelPath) => compileOneModel(job, malloyConfig, modelPath)));
+  const loadEnd = performance.now();
+  const schemaFetchDurationMs = schemaWait.waitMs;
   return {
     type: "load-package-result",
     requestId: job.requestId,
     packageMetadata,
     models,
-    loadDurationMs: performance.now() - loadStart
+    loadDurationMs: loadEnd - loadStart,
+    timings: {
+      compileDurationMs: Math.max(0, loadEnd - compileRegionStart - schemaFetchDurationMs),
+      schemaFetchDurationMs,
+      schemaFetchCount: schemaWait.fetches
+    }
   };
 }
 function serializeError(error) {

package/dist/runtime/publisher.js

@@ -5,6 +5,10 @@
 // Exposes window.Publisher with:
 //   - Publisher.query(model, malloy, opts?)     → Promise<rows[]>
 //   - Publisher.queryFull(model, malloy, opts?) → Promise<MalloyResult>  (envelope for <malloy-render>)
+//       opts: { environment?, package?, sourceName?, queryName?, filterParams?,
+//               bypassFilters?, givens? }. givens is a name→value map bound as
+//               Malloy given: runtime parameters for this query (safe parameterization,
+//               not string interpolation) — see the malloy-html-data-app-runtime skill.
 //   - Publisher.embed(selector, { src, height?, token? })
 //   - Publisher.context  ({ environment, package } inferred from URL)
 //   - Publisher.setToken(token)  (override Bearer token; default uses cookies)
@@ -92,6 +96,7 @@
       if (opts.queryName) body.queryName = opts.queryName;
       if (opts.filterParams) body.filterParams = opts.filterParams;
       if (opts.bypassFilters) body.bypassFilters = true;
+      if (opts.givens) body.givens = opts.givens;
 
       var headers = Object.assign(
          { "content-type": "application/json" },