trellis 3.2.2 → 3.2.4

package/dist/{chunk-N6MYZT4O.js → chunk-547FZFKO.js}

@@ -1,6 +1,6 @@
 import {
   __esm
-} from "./chunk-KFQGP6VL.js";
+} from "./chunk-2ESYSVXG.js";
 
 // src/vcs/types.ts
 function fileEntityId(path) {

package/dist/{chunk-H6JB3PZ3.js → chunk-5KSGGKET.js}

@@ -1,6 +1,6 @@
 import {
   TrellisDb
-} from "./chunk-J2TXUFCZ.js";
+} from "./chunk-6RWGFC3N.js";
 
 // src/react/provider.tsx
 import React, {

package/dist/{chunk-J2TXUFCZ.js → chunk-6RWGFC3N.js}

@@ -7,6 +7,37 @@ function browserOnlyRemoteError(feature) {
     `${feature} is not available in browser bundles. Use remote mode with \`new TrellisDb({ url })\`, or import \`trellis/client\` in Node.`
   );
 }
+function randomId() {
+  if (typeof globalThis.crypto?.randomUUID === "function") {
+    return globalThis.crypto.randomUUID();
+  }
+  return `${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 11)}`;
+}
+function needsXhrForBody() {
+  if (typeof globalThis.window !== "undefined" && window.__TRELLIS_NATIVE_HTTP__) {
+    return false;
+  }
+  if (typeof navigator === "undefined") return false;
+  const ua = navigator.userAgent;
+  if (/iPad|iPhone|iPod/i.test(ua)) return true;
+  if (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1) return true;
+  if (/AppleWebKit/i.test(ua) && /KHTML, like Gecko\)/i.test(ua) && !/Safari\/|Chrome\/|Chromium\/|Edg\/|Version\//i.test(ua)) {
+    return true;
+  }
+  return false;
+}
+function xhrRequest(method, url, headers, body) {
+  return new Promise((resolve, reject) => {
+    const xhr = new XMLHttpRequest();
+    xhr.open(method, url);
+    for (const [key, value] of Object.entries(headers)) {
+      xhr.setRequestHeader(key, value);
+    }
+    xhr.onload = () => resolve({ status: xhr.status, text: xhr.responseText });
+    xhr.onerror = () => reject(new Error(`XHR network error on ${method} ${url}`));
+    xhr.send(body);
+  });
+}
 var TrellisDb = class {
   opts;
   _ws = null;
@@ -101,10 +132,21 @@ var TrellisDb = class {
    */
   async registerType(schema) {
     const def = "@id" in schema ? schema : schema.definition;
+    const label = def?.label ?? (def?.["@id"] ? String(def["@id"]).replace(/^trellis:/, "") : "unknown");
+    if (!def?.["@id"]) {
+      throw new Error(`registerType(${label}): schema is missing a definition with @id`);
+    }
     try {
       await this._fetch("POST", "/ontologies", def);
     } catch (err) {
       if (err instanceof FetchError && err.status === 409) return;
+      if (err instanceof FetchError) {
+        const serverMsg = typeof err.body?.message === "string" ? String(err.body.message) : err.message;
+        throw new FetchError(err.status, serverMsg, err.body, {
+          ...err.context,
+          operation: `registerType(${label})`
+        });
+      }
       throw err;
     }
   }
@@ -176,7 +218,7 @@ var TrellisDb = class {
    * Callback is fired immediately with the initial result, then on every update.
    */
   subscribe(eql, callback, opts) {
-    const subId = `sub_${crypto.randomUUID()}`;
+    const subId = `sub_${randomId()}`;
     this._subCallbacks.set(subId, callback);
     this._ensureWs().then((ws) => {
       ws.send(
@@ -184,6 +226,7 @@ var TrellisDb = class {
           type: "subscribe",
           id: subId,
           query: eql,
+          ...this.opts.tenantId ? { tenantId: this.opts.tenantId } : {},
           ...opts?.entityType ? { entityType: opts.entityType } : {},
           ...opts?.resolve ? { resolve: opts.resolve } : {}
         })
@@ -214,23 +257,69 @@ var TrellisDb = class {
   // -------------------------------------------------------------------------
   // Private
   // -------------------------------------------------------------------------
+  /**
+   * Tenant isolation, not authorization: when `tenantId` is supplied out-of-band
+   * (not bound to the JWT), the server trusts the query param. Safe for ephemeral
+   * showcase rooms with unguessable ids; real multi-tenant auth must bind the
+   * tenant to the auth token instead. Skipped when the JWT already carries it.
+   */
+  _applyTenant(path) {
+    const tenantId = this.opts.tenantId;
+    if (!tenantId) return path;
+    const sep = path.includes("?") ? "&" : "?";
+    return `${path}${sep}tenantId=${encodeURIComponent(tenantId)}`;
+  }
   async _fetch(method, path, body) {
-    const url = `${this.opts.url}${path}`;
-    const res = await fetch(url, {
-      method,
-      headers: {
-        "Content-Type": "application/json",
-        ...this.opts.apiKey ? { Authorization: `Bearer ${this.opts.apiKey}` } : {}
-      },
-      body: body !== void 0 ? JSON.stringify(body) : void 0
-    });
-    const data = await res.json();
-    if (!res.ok)
-      throw new FetchError(
-        res.status,
-        data?.message ?? res.statusText,
-        data
-      );
+    const url = `${this.opts.url}${this._applyTenant(path)}`;
+    let jsonBody;
+    if (body !== void 0) {
+      jsonBody = JSON.stringify(body);
+      if (jsonBody === void 0) {
+        throw new Error(`Request body is not JSON-serializable (${method} ${path})`);
+      }
+    }
+    const headers = {
+      "Content-Type": "application/json",
+      ...this.opts.apiKey ? { Authorization: `Bearer ${this.opts.apiKey}` } : {}
+    };
+    const transport = jsonBody !== void 0 && needsXhrForBody() ? "xhr" : "fetch";
+    headers["X-Trellis-Transport"] = transport;
+    const bodyBytes = jsonBody ? new TextEncoder().encode(jsonBody).byteLength : 0;
+    let status;
+    let text;
+    if (transport === "xhr" && jsonBody !== void 0) {
+      ({ status, text } = await xhrRequest(method, url, headers, jsonBody));
+    } else {
+      const res = await fetch(url, {
+        method,
+        headers,
+        body: jsonBody
+      });
+      status = res.status;
+      text = await res.text();
+    }
+    let data = null;
+    if (text) {
+      try {
+        data = JSON.parse(text);
+      } catch {
+        data = { raw: text };
+      }
+    }
+    if (status < 200 || status >= 300) {
+      const server = data;
+      const message = typeof server?.message === "string" && server.message || typeof server?.error === "string" && server.error || "request failed";
+      const err = new FetchError(status, message, data, {
+        method,
+        path,
+        url,
+        requestBodyBytes: bodyBytes,
+        responseBytes: text.length,
+        transport
+      });
+      console.error("[trellis]", err.toString());
+      throw err;
+    }
     return data;
   }
   _ensureWs() {
@@ -274,12 +363,37 @@ var TrellisDb = class {
     return this._wsPromise;
   }
 };
-var FetchError = class extends Error {
-  constructor(status, message, body) {
-    super(`HTTP ${status}: ${message}`);
+var FetchError = class _FetchError extends Error {
+  constructor(status, message, body, context = {}) {
+    super(_FetchError.format(status, message, context));
     this.status = status;
     this.body = body;
     this.name = "FetchError";
+    this.context = context;
+  }
+  context;
+  static format(status, message, ctx) {
+    const parts = [`HTTP ${status}`];
+    if (ctx.operation) parts.push(ctx.operation);
+    if (ctx.method && ctx.path) parts.push(`${ctx.method} ${ctx.path}`);
+    parts.push(message);
+    if (ctx.requestBodyBytes !== void 0) {
+      parts.push(`sent ${ctx.requestBodyBytes}B`);
+    }
+    if (ctx.responseBytes !== void 0) {
+      parts.push(`response ${ctx.responseBytes}B`);
+    }
+    if (ctx.transport) parts.push(ctx.transport);
+    return parts.join(" \xB7 ");
+  }
+  toString() {
+    const extra = [];
+    if (this.body && typeof this.body === "object") {
+      const b = this.body;
+      if (typeof b.path === "string") extra.push(`server ${b.method} ${b.path}`);
+      if (typeof b.bodyBytes === "number") extra.push(`server saw ${b.bodyBytes}B`);
+    }
+    return extra.length ? `${this.message} (${extra.join(", ")})` : this.message;
   }
 };
 

package/dist/{chunk-QB5ISE47.js → chunk-7WVOPXJV.js}

@@ -18,7 +18,7 @@ var TrellisDb = class _TrellisDb {
    * Create a TrellisDb instance from `.trellis-db.json` in the given directory.
    */
   static async fromConfig(dir = ".") {
-    const { readConfig } = await import("./config-PFTP67TR.js");
+    const { readConfig } = await import("./config-KMY6RRK3.js");
     const config = readConfig(dir);
     if (!config)
       throw new Error(
@@ -146,7 +146,7 @@ var TrellisDb = class _TrellisDb {
         query: eql
       });
     }
-    const { parseSimple } = await import("./query-XYLTJYSA.js");
+    const { parseSimple } = await import("./query-KHDDIR5G.js");
     const pool = await this._getPool();
     const tenantId = this.opts.tenantId ?? null;
     const kernel = pool.get(tenantId);
@@ -330,7 +330,7 @@ var TrellisDb = class _TrellisDb {
   async _getPool() {
     if (this._pool) return this._pool;
     if (!this._poolPromise) {
-      this._poolPromise = import("./tenancy-POMWQP6M.js").then(({ TenantPool }) => {
+      this._poolPromise = import("./tenancy-U4E7ZEAG.js").then(({ TenantPool }) => {
         const path = this.opts.path;
         this._pool = new TenantPool(path);
         return this._pool;