@query-farm/vgi 0.43.0 → 0.44.0

package/dist/protocol/handlers/shared.d.ts

@@ -11,7 +11,8 @@ export declare function unwrapRequest(requestBytes: any): Record<string, any>;
 export declare function normalizeRequestSchemaPaths(params: Record<string, any>): void;
 /**
  * Wrap a dict of values into a single "result" Binary column.
- * Builds a 1-row batch from the values using the given schema,
+ * Builds a 1-row batch from the values using the given schema (conformed to
+ * the protocol's container rules, see `conformRecord`),
  * serializes it to IPC bytes, and returns { result: bytes }.
  */
 export declare function wrapResult(values: Record<string, any>, innerSchema: VgiSchema | import("../../arrow/index.js").VgiSchema): {

package/dist/protocol/serializers/shared.d.ts

@@ -7,6 +7,7 @@ import { type VgiSchema, type VgiBatch } from "../../arrow/index.js";
 export declare function toUint8Array(val: any): Uint8Array;
 /**
  * Build a single-row RecordBatch from a {fieldName: value} dict matching the
- * given schema. Auto-coerces JS numbers to BigInt for Int64 fields.
+ * given schema. Auto-coerces JS numbers to BigInt for Int64 fields, and
+ * applies the protocol's container rules (`conformRecord`).
  */
 export declare function buildSingleRowBatch(schema: VgiSchema, values: Record<string, any>): VgiBatch;

package/dist/rpc-server.d.ts

@@ -31,13 +31,13 @@ export interface HostingOptions {
      *
      * Each needs a distinct wire name, which may not be `vgi.v2` and may not
      * use the reserved `vgi_rpc.` prefix: reflection is hosted automatically and
-     * `vgi_rpc.Identity.v1` is enabled through {@link resolveToken} /
+     * `vgi_rpc.Identity.v2` is enabled through {@link resolveToken} /
      * {@link mintGrant}. Violations are a startup error naming this hook.
      */
     hostedProtocols?: () => Iterable<Protocol>;
     /**
      * Resolve an opaque bearer credential to the identity it authenticates as.
-     * Supplying it hosts `vgi_rpc.Identity.v1`'s `introspect_token` -- on HTTP,
+     * Supplying it hosts `vgi_rpc.Identity.v2`'s `introspect_token` -- on HTTP,
      * the transport that authenticates callers. Absent, the method is absent
      * (not hosted-and-refusing), which keeps a dependency upgrade from growing a
      * credential-to-identity oracle on every existing worker.

package/dist/serve-entry.js

@@ -1,5 +1,28 @@
 // @bun
 var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toCommonJS = (from) => {
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
+  if (entry)
+    return entry;
+  entry = __defProp({}, "__esModule", { value: true });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
+  __moduleCache.set(from, entry);
+  return entry;
+};
+var __moduleCache;
 var __returnValue = (v) => v;
 function __exportSetter(name, newValue) {
   this[name] = __returnValue.bind(null, newValue);
@@ -26,6 +49,11 @@ var __esm = (fn, res, err) => () => {
 };
 
 // src/functions/storage-cf-do.ts
+var exports_storage_cf_do = {};
+__export(exports_storage_cf_do, {
+  FunctionStorageCfDo: () => FunctionStorageCfDo
+});
+
 class FunctionStorageCfDo {
   _baseUrl;
   _token;
@@ -471,7 +499,7 @@ function resolveStorageFromEnv() {
     return new FunctionStorageSqlite;
   }
   if (backend === "cloudflare-do") {
-    init_storage_cf_do();
+    const { FunctionStorageCfDo } = (init_storage_cf_do(), __toCommonJS(exports_storage_cf_do));
     return FunctionStorageCfDo.fromEnv();
   }
   throw new Error(`Unknown VGI_WORKER_SHARED_STORAGE backend: '${backend}'. Supported: 'memory', 'sqlite', 'cloudflare-do'.`);
@@ -512,6 +540,79 @@ var init_storage = __esm(() => {
   });
 });
 
+// src/arrow/impl-arrowjs/index.ts
+var exports_impl_arrowjs = {};
+__export(exports_impl_arrowjs, {
+  DateUnit: () => DateUnit,
+  IntervalUnit: () => IntervalUnit,
+  TimeUnit: () => TimeUnit,
+  UnionMode: () => UnionMode,
+  adoptArrowJsShape: () => adoptArrowJsShape,
+  backend: () => backend,
+  batchFromColumns: () => batchFromColumns,
+  batchFromRows: () => batchFromRows,
+  batchToScalarDict: () => batchToScalarDict,
+  batchToSecretDict: () => batchToSecretDict,
+  binary: () => binary,
+  bool: () => bool,
+  buildStatisticsBatch: () => buildStatisticsBatch,
+  columnFromArray: () => columnFromArray,
+  date: () => date,
+  dateDay: () => dateDay,
+  dateMillisecond: () => dateMillisecond,
+  decimal: () => decimal,
+  decimal128: () => decimal128,
+  decimal256: () => decimal256,
+  decodeDictValue: () => decodeDictValue,
+  denseUnion: () => denseUnion,
+  deserializeBatch: () => deserializeBatch,
+  deserializeSchema: () => deserializeSchema,
+  dictionary: () => dictionary,
+  duration: () => duration,
+  emptyBatch: () => emptyBatch,
+  field: () => field,
+  filterBatch: () => filterBatch,
+  fixedSizeBinary: () => fixedSizeBinary,
+  fixedSizeList: () => fixedSizeList,
+  float16: () => float16,
+  float32: () => float32,
+  float64: () => float64,
+  int: () => int,
+  int16: () => int16,
+  int32: () => int32,
+  int64: () => int64,
+  int8: () => int8,
+  interval: () => interval,
+  iterRows: () => iterRows,
+  largeBinary: () => largeBinary,
+  largeUtf8: () => largeUtf8,
+  list: () => list,
+  map: () => map,
+  nullType: () => nullType,
+  projectBatch: () => projectBatch,
+  projectSchema: () => projectSchema,
+  readCanonicalValue: () => readCanonicalValue,
+  safeNumber: () => safeNumber,
+  schema: () => schema,
+  serializeBatch: () => serializeBatch,
+  serializeSchema: () => serializeSchema,
+  sparseUnion: () => sparseUnion,
+  struct: () => struct,
+  time: () => time,
+  timeMicrosecond: () => timeMicrosecond,
+  timeMillisecond: () => timeMillisecond,
+  timeNanosecond: () => timeNanosecond,
+  timeSecond: () => timeSecond,
+  timestamp: () => timestamp,
+  uint16: () => uint16,
+  uint32: () => uint32,
+  uint64: () => uint64,
+  uint8: () => uint8,
+  union: () => union,
+  utf8: () => utf8,
+  withBatchMetadata: () => withBatchMetadata
+});
+
 // src/serve-entry.ts
 import {
   irohForwardedHeaderIdentityProvider,
@@ -551,6 +652,21 @@ var TypeId = {
   LargeUtf8: 20,
   Dictionary: -1
 };
+function isInt(t) {
+  return t.typeId === TypeId.Int;
+}
+function isFloat(t) {
+  return t.typeId === TypeId.Float;
+}
+function isBinary(t) {
+  return t.typeId === TypeId.Binary || t.typeId === TypeId.LargeBinary;
+}
+function isUtf8(t) {
+  return t.typeId === TypeId.Utf8 || t.typeId === TypeId.LargeUtf8;
+}
+function isBool(t) {
+  return t.typeId === TypeId.Bool;
+}
 function isDecimal(t) {
   return t.typeId === TypeId.Decimal;
 }
@@ -563,6 +679,9 @@ function isStruct(t) {
 function isMap(t) {
   return t.typeId === TypeId.Map;
 }
+function isDictionary(t) {
+  return t.typeId === TypeId.Dictionary;
+}
 function typeSignature(t) {
   if (t == null)
     return "null";
@@ -599,79 +718,6 @@ function typeSignature(t) {
       return Array.isArray(a.children) ? `${t.typeId}<${kids()}>` : String(t.typeId);
   }
 }
-// src/arrow/impl-arrowjs/index.ts
-var exports_impl_arrowjs = {};
-__export(exports_impl_arrowjs, {
-  DateUnit: () => DateUnit,
-  IntervalUnit: () => IntervalUnit,
-  TimeUnit: () => TimeUnit,
-  UnionMode: () => UnionMode,
-  adoptArrowJsShape: () => adoptArrowJsShape,
-  backend: () => backend,
-  batchFromColumns: () => batchFromColumns,
-  batchFromRows: () => batchFromRows,
-  batchToScalarDict: () => batchToScalarDict,
-  batchToSecretDict: () => batchToSecretDict,
-  binary: () => binary,
-  bool: () => bool,
-  buildStatisticsBatch: () => buildStatisticsBatch,
-  columnFromArray: () => columnFromArray,
-  date: () => date,
-  dateDay: () => dateDay,
-  dateMillisecond: () => dateMillisecond,
-  decimal: () => decimal,
-  decimal128: () => decimal128,
-  decimal256: () => decimal256,
-  decodeDictValue: () => decodeDictValue,
-  denseUnion: () => denseUnion,
-  deserializeBatch: () => deserializeBatch,
-  deserializeSchema: () => deserializeSchema,
-  dictionary: () => dictionary,
-  duration: () => duration,
-  emptyBatch: () => emptyBatch,
-  field: () => field,
-  filterBatch: () => filterBatch,
-  fixedSizeBinary: () => fixedSizeBinary,
-  fixedSizeList: () => fixedSizeList,
-  float16: () => float16,
-  float32: () => float32,
-  float64: () => float64,
-  int: () => int,
-  int16: () => int16,
-  int32: () => int32,
-  int64: () => int64,
-  int8: () => int8,
-  interval: () => interval,
-  iterRows: () => iterRows,
-  largeBinary: () => largeBinary,
-  largeUtf8: () => largeUtf8,
-  list: () => list,
-  map: () => map,
-  nullType: () => nullType,
-  projectBatch: () => projectBatch,
-  projectSchema: () => projectSchema,
-  readCanonicalValue: () => readCanonicalValue,
-  safeNumber: () => safeNumber,
-  schema: () => schema,
-  serializeBatch: () => serializeBatch,
-  serializeSchema: () => serializeSchema,
-  sparseUnion: () => sparseUnion,
-  struct: () => struct,
-  time: () => time,
-  timeMicrosecond: () => timeMicrosecond,
-  timeMillisecond: () => timeMillisecond,
-  timeNanosecond: () => timeNanosecond,
-  timeSecond: () => timeSecond,
-  timestamp: () => timestamp,
-  uint16: () => uint16,
-  uint32: () => uint32,
-  uint64: () => uint64,
-  uint8: () => uint8,
-  union: () => union,
-  utf8: () => utf8,
-  withBatchMetadata: () => withBatchMetadata
-});
-
 // src/arrow/impl-arrowjs/schema.ts
 import {
   Schema as A_Schema,
@@ -2638,6 +2684,116 @@ function deserializeArguments(bytes) {
   }
   return new Arguments(positional, named, sch);
 }
+// src/codec/conform.ts
+var OPTIONAL_ITEM_FIELDS = new Set(["argument_names"]);
+function children(type) {
+  return type.children ?? [];
+}
+function mapValueType(type) {
+  const entries = children(type)[0].type;
+  return children(entries)[1].type;
+}
+function mapPairs(raw) {
+  if (Array.isArray(raw))
+    return raw.map((e) => Array.isArray(e) ? [e[0], e[1]] : [e?.key, e?.value]);
+  if (raw instanceof Map)
+    return Array.from(raw.entries());
+  if (typeof raw[Symbol.iterator] === "function")
+    return Array.from(raw);
+  return Object.entries(raw);
+}
+function zeroValue(type) {
+  if (isUtf8(type) || isDictionary(type))
+    return "";
+  if (isBinary(type))
+    return new Uint8Array(0);
+  if (isBool(type))
+    return false;
+  if (isInt(type))
+    return type.bitWidth === 64 ? 0n : 0;
+  if (isFloat(type))
+    return 0;
+  if (isList(type) || isMap(type))
+    return [];
+  if (isStruct(type)) {
+    const out = {};
+    for (const c of children(type))
+      out[c.name] = c.nullable ? null : conformValue(c.type, undefined, false, c.name);
+    return out;
+  }
+  return null;
+}
+var HAS_CONTAINER = new WeakMap;
+function hasContainer(type) {
+  const cached = HAS_CONTAINER.get(type);
+  if (cached !== undefined)
+    return cached;
+  let has = isList(type) || isMap(type);
+  if (!has && isStruct(type))
+    has = children(type).some((c) => hasContainer(c.type));
+  HAS_CONTAINER.set(type, has);
+  return has;
+}
+function conformValue(type, value, nullable, name) {
+  if (value == null) {
+    if (nullable)
+      return value ?? null;
+    if (isList(type) || isMap(type))
+      return [];
+    return value;
+  }
+  if (!hasContainer(type))
+    return value;
+  if (isList(type)) {
+    const itemType = children(type)[0].type;
+    const itemsNullable = OPTIONAL_ITEM_FIELDS.has(name);
+    const items = Array.isArray(value) ? value : Array.from(value);
+    let changed = !Array.isArray(value);
+    const out = items.map((item) => {
+      const next = item == null && !itemsNullable ? zeroValue(itemType) : conformValue(itemType, item, true, name);
+      if (next !== item)
+        changed = true;
+      return next;
+    });
+    return changed ? out : value;
+  }
+  if (isMap(type)) {
+    const valueType = mapValueType(type);
+    const pairs = mapPairs(value);
+    let changed = false;
+    const out = pairs.map(([k, v]) => {
+      const next = v == null ? zeroValue(valueType) : conformValue(valueType, v, true, name);
+      if (next !== v)
+        changed = true;
+      return [k, next];
+    });
+    return changed ? out : value;
+  }
+  if (isStruct(type)) {
+    let out = null;
+    for (const c of children(type)) {
+      const v = value[c.name];
+      const next = conformValue(c.type, v, c.nullable, c.name);
+      if (next !== v) {
+        (out ??= { ...value })[c.name] = next;
+      }
+    }
+    return out ?? value;
+  }
+  return value;
+}
+function conformRecord(schema, obj) {
+  let out = null;
+  for (const f of schema.fields) {
+    const v = obj[f.name];
+    const next = conformValue(f.type, v, f.nullable, f.name);
+    if (next !== v) {
+      (out ??= { ...obj })[f.name] = next;
+    }
+  }
+  return out ?? obj;
+}
+
 // src/protocol/serializers/shared.ts
 function toUint8Array2(val) {
   if (typeof val === "string")
@@ -5436,7 +5592,8 @@ function normalizeRequestSchemaPaths(params) {
 }
 function wrapResult(values, innerSchema) {
   const a = innerSchema;
-  const batch = batchFromColumns(Object.fromEntries(a.fields.map((f) => [f.name, [values[f.name] ?? null]])), a);
+  const row = conformRecord(a, values);
+  const batch = batchFromColumns(Object.fromEntries(a.fields.map((f) => [f.name, [row[f.name] ?? null]])), a);
   return { result: serializeBatch(batch) };
 }
 function overloadContext(req, catalogInterface) {
@@ -5459,21 +5616,24 @@ function overloadContext(req, catalogInterface) {
 
 // src/errors.ts
 class VgiError extends Error {
-  constructor(message) {
+  errorCode;
+  constructor(message, code) {
     super(message);
     this.name = "VgiError";
+    if (code !== undefined)
+      this.errorCode = code;
   }
 }
 class ArgumentValidationError extends VgiError {
   constructor(message) {
-    super(message);
+    super(message, "INVALID_ARGUMENT");
     this.name = "ArgumentValidationError";
   }
 }
 
 class NoCatalogError extends VgiError {
   constructor() {
-    super("No catalog is configured for this worker");
+    super("No catalog is configured for this worker", "UNIMPLEMENTED");
     this.name = "NoCatalogError";
   }
 }
@@ -7323,7 +7483,7 @@ function hex(buf) {
 
 // src/codec/asd.ts
 function encodeASD(schema, obj) {
-  return serializeBatch(batchFromRows([sortMapsForSchema(schema, obj)], schema));
+  return serializeBatch(batchFromRows([sortMapsForSchema(schema, conformRecord(schema, obj))], schema));
 }
 function compareCodePoints(a, b) {
   const n = Math.min(a.length, b.length);
@@ -7340,7 +7500,7 @@ function compareCodePoints(a, b) {
   }
   return a.length - b.length;
 }
-function mapPairs(raw) {
+function mapPairs2(raw) {
   if (Array.isArray(raw))
     return raw.map((e) => Array.isArray(e) ? [e[0], e[1]] : [e?.key, e?.value]);
   if (raw instanceof Map)
@@ -7375,7 +7535,7 @@ function sortMapsForType(type, value) {
   if (isMap(type)) {
     const entries = type.children[0].type;
     const valueType = entries.children[1].type;
-    return mapPairs(value).map(([k, v]) => [k, sortMapsForType(valueType, v)]).sort((x, y) => compareKeys(x[0], y[0]));
+    return mapPairs2(value).map(([k, v]) => [k, sortMapsForType(valueType, v)]).sort((x, y) => compareKeys(x[0], y[0]));
   }
   if (isList(type)) {
     const child = type.children[0].type;
@@ -7703,7 +7863,7 @@ async function checkReservedAttachOptions(catalog) {
 var ATTACH_TICKET_PREFIX = "vgia1.";
 var ATTACH_TICKET_OPTION = RESERVED_ATTACH_OPTION;
 var ATTACH_TICKETS_PROTOCOL_NAME = "vgi.attach_tickets.v1";
-var ATTACH_TICKETS_PROTOCOL_VERSION = "1.0.0";
+var ATTACH_TICKETS_PROTOCOL_VERSION = "2.0.0";
 var TICKET_ENVELOPE_VERSION = 1;
 var MAX_OPTIONS_BYTES = 16 * 1024;
 var MAX_TICKET_CHARS = 32 * 1024;
@@ -7978,8 +8138,19 @@ var SEAL_ATTACH_REQUEST_SCHEMA = schema2([
 ]);
 var ATTACH_TICKET_SCHEMA = schema2([
   field2("ticket", utf82(), false),
-  field2("expires_at", float642(), false)
+  field2("expires_at", timestamp2(TimeUnit2.MICROSECOND, "UTC"), true)
 ]);
+function expiresAtMicros(value) {
+  if (value === null)
+    return null;
+  const ms = value.getTime();
+  if (!Number.isFinite(ms))
+    throw new TypeError("AttachTicket.expires_at must be a valid Date or null");
+  return BigInt(ms) * 1000n;
+}
+function encodeAttachTicket(ticket) {
+  return serializeBatch(batchFromColumns({ ticket: [ticket.ticket], expires_at: [expiresAtMicros(ticket.expires_at)] }, ATTACH_TICKET_SCHEMA));
+}
 function resolveTicketMaxTtl(grantKeys, env) {
   if (grantKeys)
     return Math.trunc(grantKeys.maxTtlSeconds);
@@ -8066,7 +8237,7 @@ async function sealAttach2(config, request, auth) {
   } catch (e) {
     throw new AttachTicketRequestError("seal_attach request is invalid", [["request", e.message]]);
   }
-  return { ticket: token, expires_at: expiresAt === 0 ? Number.POSITIVE_INFINITY : expiresAt };
+  return { ticket: token, expires_at: expiresAt === 0 ? null : new Date(expiresAt * 1000) };
 }
 function buildAttachTicketsProtocol(config) {
   const p = new Protocol2(ATTACH_TICKETS_PROTOCOL_NAME, { protocolVersion: ATTACH_TICKETS_PROTOCOL_VERSION });
@@ -8077,8 +8248,7 @@ function buildAttachTicketsProtocol(config) {
     handler: async (params, ctx) => {
       const request = unwrapRequest(params.request);
       const sealed = await sealAttach2(config, request, ctx?.auth);
-      const batch = batchFromColumns({ ticket: [sealed.ticket], expires_at: [sealed.expires_at] }, ATTACH_TICKET_SCHEMA);
-      return { result: serializeBatch(batch) };
+      return { result: encodeAttachTicket(sealed) };
     }
   });
   return p;
@@ -8605,7 +8775,7 @@ function validatedHostedProtocols(hosting, primary) {
     }
     const name = p.name;
     if (name.startsWith(RESERVED_PREFIX)) {
-      throw new Error(`${owner} entry ${index} is named '${name}', which claims the reserved '${RESERVED_PREFIX}' prefix. ` + "Framework protocols are not supplied through this hook: reflection is hosted automatically, and " + "vgi_rpc.Identity.v1 is enabled by supplying resolveToken and/or mintGrant.");
+      throw new Error(`${owner} entry ${index} is named '${name}', which claims the reserved '${RESERVED_PREFIX}' prefix. ` + "Framework protocols are not supplied through this hook: reflection is hosted automatically, and " + "vgi_rpc.Identity.v2 is enabled by supplying resolveToken and/or mintGrant.");
     }
     if (!/^[A-Za-z_][A-Za-z0-9_.]*$/.test(name)) {
       throw new Error(`${owner} entry ${index}: protocol name '${name}' is not an identifier, optionally dot-qualified ` + "(e.g. 'acme.Reports.v1').");
@@ -8655,7 +8825,7 @@ function resolveIntrospectPrincipals(explicit, env) {
     principals = raw.split(",").map((p) => p.trim()).filter((p) => p !== "");
   }
   if (principals.length === 0) {
-    throw new Error("This worker supplies resolveToken, which hosts the vgi_rpc.Identity.v1 protocol, but no " + `introspector allowlist was configured. Set ${INTROSPECT_PRINCIPALS_ENV} (comma-separated) or pass ` + `introspectPrincipals.
+    throw new Error("This worker supplies resolveToken, which hosts the vgi_rpc.Identity.v2 protocol, but no " + `introspector allowlist was configured. Set ${INTROSPECT_PRINCIPALS_ENV} (comma-separated) or pass ` + `introspectPrincipals.
 
 ` + "There is no permissive default on purpose: introspection is a separate capability from " + "authentication, and allowing every authenticated caller lets any user resolve any other user's " + "credential to its owner. Remove resolveToken to leave the protocol unhosted entirely.");
   }
@@ -8890,4 +9060,4 @@ export {
   serveVgiWorker
 };
 
-//# debugId=7D0DFE46FB512EAD64756E2164756E21
+//# debugId=8C488693F22A8E5A64756E2164756E21