@query-farm/vgi 0.38.0 → 0.40.0

package/dist/functions/copy-to.d.ts

@@ -30,7 +30,7 @@ export interface CopyToOption {
      * Optional allowed value set, validated worker-side at bind. Mirrors
      * vgi-python's `Arg(..., choices=[...])`.
      */
-    choices?: unknown[];
+    choices?: readonly unknown[];
     /**
      * Optional inclusive lower bound for numeric options, validated worker-side at
      * bind. Mirrors vgi-python's `Arg(..., ge=...)`.

package/dist/index.core.d.ts

@@ -39,11 +39,11 @@ export type { ScalarComputeRow, ScalarOutputValue, ScalarComputeResult } from ".
 export { type FunctionStorage, type WorkerStateKey, FunctionStorageSqlite, BoundStorage, UnknownInvocationError, resolveStorageFromEnv, setStorage, storage as functionStorage, } from "./functions/storage.js";
 export { FunctionStorageCfDo, type FetchLike } from "./functions/storage-cf-do.js";
 export { VgiClient, VgiClientError } from "./client/client.js";
-export type { VgiClientOptions, TableFunctionOptions, ScalarFunctionOptions, TableInOutFunctionOptions, OnCreateConflict, CatalogFunctionType as ClientCatalogFunctionType, CatalogAttachOptions, AttachOptionValue, } from "./client/types.js";
+export type { VgiClientOptions, TableFunctionOptions, ScalarFunctionOptions, TableInOutFunctionOptions, OnCreateConflict, CatalogFunctionType as ClientCatalogFunctionType, CatalogAttachOptions, AttachOptionValue, CatalogSnapshot, LoadCatalogOptions, } from "./client/types.js";
 export { str, bytes, int, int32, float, float32, bool, toSchema, OutputCollector, AuthContext } from "@query-farm/vgi-rpc";
 export { subprocessConnect, httpConnect, tcpConnect } from "@query-farm/vgi-rpc";
 export type { RpcClient, StreamSession, LogMessage } from "@query-farm/vgi-rpc";
-export { buildRpcServer, INTROSPECT_PRINCIPALS_ENV, type BuildRpcServerOptions, type HostingOptions, type ServerTransport, } from "./rpc-server.js";
-export { AuthUnavailableError, GrantRefusedError, IdentityUnavailableError, StatusError, } from "@query-farm/vgi-rpc";
+export { buildRpcServer, grantKeysFromArgv, INTROSPECT_PRINCIPALS_ENV, type BuildRpcServerOptions, type HostingOptions, type ServerTransport, } from "./rpc-server.js";
+export { AuthUnavailableError, GrantKeys, GrantRefusedError, IdentityUnavailableError, StatusError, } from "@query-farm/vgi-rpc";
 export type { GrantMinter, IssuedGrant, TokenIdentity, TokenResolver } from "@query-farm/vgi-rpc";
 export { normalizeSchemaPath, schemaPathDisplay, schemaPathKey, schemaPathsEqual, type SchemaPath } from "./schema-path.js";

package/dist/index.js

@@ -7139,21 +7139,23 @@ function normalizeValue(raw, type) {
     return out;
   }
   if (isMap(type)) {
+    const entries = type.children[0].type;
+    const valueType = entries.children[1].type;
     const out = {};
+    const put = (k, v) => {
+      out[String(k)] = normalizeValue(v, valueType);
+    };
     if (raw[Symbol.iterator]) {
       for (const entry of raw) {
         if (Array.isArray(entry)) {
-          out[String(entry[0])] = String(entry[1] ?? "");
+          put(entry[0], entry[1]);
         } else if (entry && typeof entry === "object") {
-          const k = entry.key ?? entry[0];
-          const v = entry.value ?? entry[1];
-          out[String(k)] = v == null ? "" : String(v);
+          put(entry.key ?? entry[0], entry.value ?? entry[1]);
         }
       }
     } else if (typeof raw === "object") {
-      for (const [k, v] of Object.entries(raw)) {
-        out[String(k)] = v == null ? "" : String(v);
-      }
+      for (const [k, v] of Object.entries(raw))
+        put(k, v);
     }
     return out;
   }
@@ -13226,6 +13228,84 @@ class VgiClient {
       schemas
     };
   }
+  async loadCatalog(attach, opts) {
+    const attachOpaqueData = attach.attach_opaque_data;
+    const previous = opts?.previous ?? null;
+    const useContents = attach.supports_catalog_contents === true && opts?.useCatalogContents !== false && opts?.transactionOpaqueData == null;
+    if (!useContents) {
+      return this._loadCatalogPerSchema(attachOpaqueData, opts?.transactionOpaqueData, null);
+    }
+    let fallbackError = null;
+    const ifNoneMatch = previous?.etag ?? null;
+    const knownVersion = previous?.catalog_version ?? 0;
+    for (let attempt = 0;attempt < 2; attempt++) {
+      let response;
+      try {
+        response = await this.catalogContents(attachOpaqueData, ifNoneMatch);
+      } catch (err) {
+        fallbackError = err instanceof Error ? err.message : String(err);
+        break;
+      }
+      if (response.not_modified) {
+        if (previous == null || ifNoneMatch == null) {
+          fallbackError = "catalog_contents answered not_modified to an unconditional request";
+          break;
+        }
+        return {
+          ...previous,
+          catalog_version: response.catalog_version !== 0 ? response.catalog_version : previous.catalog_version,
+          etag: response.etag ?? ifNoneMatch,
+          not_modified: true,
+          fallback_error: null
+        };
+      }
+      if (response.catalog_version !== 0 && knownVersion !== 0 && response.catalog_version < knownVersion) {
+        fallbackError = `catalog_contents snapshot version ${response.catalog_version} is older than the known version ${knownVersion}`;
+        continue;
+      }
+      return {
+        catalog_version: response.catalog_version,
+        etag: response.etag,
+        source: "catalog_contents",
+        not_modified: false,
+        fallback_error: null,
+        schemas: response.schemas
+      };
+    }
+    return this._loadCatalogPerSchema(attachOpaqueData, undefined, fallbackError);
+  }
+  async _loadCatalogPerSchema(attachOpaqueData, transactionOpaqueData, fallbackError) {
+    const schemas = await this.schemas(attachOpaqueData, transactionOpaqueData);
+    const out = [];
+    for (const schema of schemas) {
+      const counts = schema.estimated_object_count ?? {};
+      const path = schema.path;
+      const has = (kind) => {
+        const n = counts[kind];
+        return n == null || Number(n) !== 0;
+      };
+      const t = transactionOpaqueData;
+      out.push({
+        schema,
+        tables: has("table") ? await this.schemaContentsTables(attachOpaqueData, path, t) : [],
+        views: has("view") ? await this.schemaContentsViews(attachOpaqueData, path, t) : [],
+        scalar_functions: has("scalar_function") ? await this.schemaContentsFunctions(attachOpaqueData, path, "SCALAR_FUNCTION", t) : [],
+        aggregate_functions: has("aggregate_function") ? await this.schemaContentsFunctions(attachOpaqueData, path, "AGGREGATE_FUNCTION", t) : [],
+        table_functions: has("table_function") ? await this.schemaContentsFunctions(attachOpaqueData, path, "TABLE_FUNCTION", t) : [],
+        scalar_macros: has("macro") ? await this.schemaContentsMacros(attachOpaqueData, path, "SCALAR_MACRO", t) : [],
+        table_macros: has("macro") ? await this.schemaContentsMacros(attachOpaqueData, path, "TABLE_MACRO", t) : [],
+        indexes: has("index") ? await this.schemaContentsIndexes(attachOpaqueData, path, t) : []
+      });
+    }
+    return {
+      catalog_version: null,
+      etag: null,
+      source: "per_schema",
+      not_modified: false,
+      fallback_error: fallbackError,
+      schemas: out
+    };
+  }
   async catalogDetach(attachOpaqueData) {
     await this.rpc.call("catalog_detach", { attach_opaque_data: attachOpaqueData });
   }
@@ -13364,6 +13444,17 @@ class VgiClient {
     const inner = unwrapResult(result);
     return deserializeInfoList(inner.items, decodeFunctionInfo);
   }
+  async schemaContentsIndexes(attachOpaqueData, path, transactionOpaqueData) {
+    const result = await this.rpc.call("catalog_schema_contents_indexes", {
+      attach_opaque_data: attachOpaqueData,
+      path: normalizeSchemaPath(path),
+      transaction_opaque_data: transactionOpaqueData ?? null
+    });
+    if (!result)
+      return [];
+    const inner = unwrapResult(result);
+    return deserializeInfoList(inner.items, decodeIndexInfo);
+  }
   async tableGet(attachOpaqueData, schemaPath, name, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_table_get", {
       attach_opaque_data: attachOpaqueData,
@@ -13631,6 +13722,7 @@ import { subprocessConnect, httpConnect, tcpConnect } from "@query-farm/vgi-rpc"
 
 // src/rpc-server.ts
 import {
+  GrantKeys,
   IdentityImpl,
   VgiRpcServer
 } from "@query-farm/vgi-rpc";
@@ -13647,7 +13739,8 @@ function buildRpcServer(primary, hosting, options) {
   return new VgiRpcServer(primary, {
     serverId: options.serverId,
     protocols,
-    identity
+    identity,
+    grantKeys: null
   });
 }
 function validatedHostedProtocols(hosting, primary) {
@@ -13690,11 +13783,13 @@ function validatedHostedProtocols(hosting, primary) {
 }
 function buildIdentity(hosting, env) {
   const { resolveToken, mintGrant } = hosting;
-  if (!resolveToken && !mintGrant)
+  const grantKeys = hosting.grantKeys === undefined ? GrantKeys.fromEnv(env ?? processEnv()) : hosting.grantKeys;
+  if (!resolveToken && !mintGrant && !grantKeys)
     return;
   return new IdentityImpl({
     resolveToken,
     mintGrant,
+    grantKeys: grantKeys ?? undefined,
     introspectPrincipals: resolveToken ? resolveIntrospectPrincipals(hosting.introspectPrincipals, env) : undefined,
     maxAuthAge: hosting.maxAuthAge
   });
@@ -13715,10 +13810,31 @@ function resolveIntrospectPrincipals(explicit, env) {
   }
   return principals;
 }
+function processEnv() {
+  return globalThis.process?.env;
+}
+function grantKeysFromArgv(argv, env = processEnv()) {
+  const keys = [];
+  for (let i = 0;i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--grant-key") {
+      if (i + 1 >= argv.length)
+        throw new Error("--grant-key requires a value");
+      keys.push(argv[++i]);
+    } else if (a.startsWith("--grant-key=")) {
+      keys.push(a.slice("--grant-key=".length));
+    }
+  }
+  if (keys.length === 0)
+    return;
+  const fromEnv = GrantKeys.fromEnv({ ...env ?? {}, VGI_RPC_GRANT_KEYS: keys.join(",") });
+  return fromEnv ?? undefined;
+}
 
 // src/index.core.ts
 import {
   AuthUnavailableError,
+  GrantKeys as GrantKeys2,
   GrantRefusedError,
   IdentityUnavailableError,
   StatusError
@@ -13951,6 +14067,7 @@ export {
   FunctionStorageSqlite,
   FunctionType,
   GROUP_COLUMN_NAME,
+  GrantKeys2 as GrantKeys,
   GrantRefusedError,
   INTROSPECT_PRINCIPALS_ENV,
   IdentityUnavailableError,
@@ -14072,6 +14189,7 @@ export {
   fromBrandedBigInt,
   fromBrandedNumber,
   storage as functionStorage,
+  grantKeysFromArgv,
   httpConnect,
   int3 as int,
   int162 as int16,
@@ -14159,4 +14277,4 @@ export {
   utf82 as utf8
 };
 
-//# debugId=B9E14A528C9EAE0164756E2164756E21
+//# debugId=E43EFCB3DEBB959264756E2164756E21