@query-farm/vgi 0.7.0 → 0.9.0

package/dist/types.d.ts

@@ -45,6 +45,10 @@ export declare const VGI_VARARGS_TRUE = "true";
 export declare const VGI_CONST_KEY = "vgi_const";
 export declare const VGI_CONST_TRUE = "true";
 export declare const VGI_DOC_KEY = "vgi_doc";
+export declare const VGI_DEFAULT_KEY = "vgi_default";
+export declare const VGI_CHOICES_KEY = "vgi_choices";
+export declare const VGI_RANGE_KEY = "vgi_range";
+export declare const VGI_PATTERN_KEY = "vgi_pattern";
 export interface TableCardinality {
     estimate: number | null;
     max: number | null;

package/dist/worker-cf-entry.js

@@ -2850,6 +2850,10 @@ var VGI_VARARGS_TRUE = "true";
 var VGI_CONST_KEY = "vgi_const";
 var VGI_CONST_TRUE = "true";
 var VGI_DOC_KEY = "vgi_doc";
+var VGI_DEFAULT_KEY = "vgi_default";
+var VGI_CHOICES_KEY = "vgi_choices";
+var VGI_RANGE_KEY = "vgi_range";
+var VGI_PATTERN_KEY = "vgi_pattern";
 var DEFAULT_MAX_WORKERS = 99999;
 
 // src/util/arrow/index.ts
@@ -3259,7 +3263,19 @@ var ScanBranchSchema = schema2([
   field2("function_name", utf82(), false),
   field2("arguments", binary2(), false),
   field2("branch_filter", utf82(), true),
-  field2("writable", bool2(), false)
+  field2("writable", bool2(), false),
+  field2("source_catalog", utf82(), true),
+  field2("source_schema", utf82(), true),
+  field2("source_table", utf82(), true)
+]);
+var AttachCatalogInfoSchema = schema2([
+  field2("alias", utf82(), false),
+  field2("target", utf82(), false),
+  field2("db_type", utf82(), false),
+  field2("options", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
+  field2("hidden", bool2(), false),
+  field2("required", bool2(), false),
+  field2("secret_ref", utf82(), false)
 ]);
 var AggregateBindResultSchema = schema2([
   field2("output_schema", binary2(), false),
@@ -3303,6 +3319,7 @@ var CatalogAttachResultSchema = schema2([
   field2("default_schema", utf82(), false),
   field2("settings", list2(field2("item", binary2(), true)), false),
   field2("secret_types", list2(field2("item", binary2(), true)), false),
+  field2("attach_catalogs", list2(field2("item", binary2(), true)), false),
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("supports_column_statistics", bool2(), false),
@@ -6199,12 +6216,24 @@ var encodeCopyFromFormatInfo = (v) => encodeASD(CopyFromFormatInfoSchema, {
   description: v.description ?? "",
   ordered: v.ordered ?? false
 });
+var encodeAttachCatalogInfo = (v) => encodeASD(AttachCatalogInfoSchema, {
+  alias: v.alias,
+  target: v.target,
+  db_type: v.db_type ?? "",
+  options: v.options ?? {},
+  hidden: v.hidden ?? false,
+  required: v.required ?? false,
+  secret_ref: v.secret_ref ?? ""
+});
 function singleBranchResult(legacy) {
   const branchBatch = batchFromColumns({
     function_name: [legacy.function_name],
     arguments: [toUint8Array(legacy.arguments)],
     branch_filter: [null],
-    writable: [false]
+    writable: [false],
+    source_catalog: [null],
+    source_schema: [null],
+    source_table: [null]
   }, ScanBranchSchema);
   return {
     branches: [serializeBatch(branchBatch)],
@@ -6373,6 +6402,7 @@ function registerCatalogAdminMethods(protocol, getCatalog, signingKey) {
         default_schema: result.default_schema ?? "main",
         settings: result.settings ?? [],
         secret_types: result.secret_types ?? [],
+        attach_catalogs: result.attach_catalogs ?? [],
         comment: result.comment ?? null,
         tags: result.tags ?? {},
         supports_column_statistics: result.supports_column_statistics ?? true,
@@ -6959,6 +6989,138 @@ function buildVgiProtocol(config) {
 
 // src/functions/scalar.ts
 init_arrow();
+
+// src/arguments/argument-spec.ts
+init_arrow();
+function safeJson(value) {
+  try {
+    const encoded = JSON.stringify(value);
+    if (encoded === undefined) {
+      return JSON.stringify(String(value));
+    }
+    return encoded;
+  } catch {
+    return JSON.stringify(String(value));
+  }
+}
+function formatRange(ge, le, gt, lt) {
+  if (ge === undefined && le === undefined && gt === undefined && lt === undefined) {
+    return;
+  }
+  let low;
+  if (gt !== undefined) {
+    low = `(${gt}`;
+  } else if (ge !== undefined) {
+    low = `[${ge}`;
+  } else {
+    low = "(-inf";
+  }
+  let high;
+  if (lt !== undefined) {
+    high = `${lt})`;
+  } else if (le !== undefined) {
+    high = `${le}]`;
+  } else {
+    high = "+inf)";
+  }
+  return `${low}, ${high}`;
+}
+function constraintSpecFields(constraints) {
+  const fields = {};
+  if (constraints === undefined)
+    return fields;
+  if ("default" in constraints && constraints.default !== undefined) {
+    fields.defaultJson = safeJson(constraints.default);
+  }
+  if (constraints.choices !== undefined) {
+    fields.choicesJson = safeJson([...constraints.choices]);
+  }
+  const range = formatRange(constraints.ge, constraints.le, constraints.gt, constraints.lt);
+  if (range !== undefined) {
+    fields.rangeNotation = range;
+  }
+  if (constraints.pattern !== undefined) {
+    fields.pattern = constraints.pattern;
+  }
+  return fields;
+}
+function argumentSpecSortKey(spec) {
+  if (typeof spec.position === "number") {
+    return [0, spec.position];
+  }
+  return [1, spec.position];
+}
+function argumentSpecsToSchema(specs) {
+  const sorted = [...specs].sort((a, b) => {
+    const ka = argumentSpecSortKey(a);
+    const kb = argumentSpecSortKey(b);
+    if (ka[0] !== kb[0])
+      return ka[0] - kb[0];
+    if (typeof ka[1] === "number" && typeof kb[1] === "number") {
+      return ka[1] - kb[1];
+    }
+    return String(ka[1]).localeCompare(String(kb[1]));
+  });
+  const fields = [];
+  for (const spec of sorted) {
+    const metadata = new Map;
+    if (typeof spec.position === "string") {
+      metadata.set(VGI_ARG_KEY, VGI_ARG_NAMED);
+    }
+    if (spec.isTableInput) {
+      metadata.set(VGI_TYPE_KEY, VGI_TYPE_TABLE);
+    } else if (spec.isAnyType) {
+      metadata.set(VGI_TYPE_KEY, VGI_TYPE_ANY);
+    }
+    if (spec.isVarargs) {
+      metadata.set(VGI_VARARGS_KEY, VGI_VARARGS_TRUE);
+    }
+    if (spec.isConst) {
+      metadata.set(VGI_CONST_KEY, VGI_CONST_TRUE);
+    }
+    if (spec.doc) {
+      metadata.set(VGI_DOC_KEY, spec.doc);
+    }
+    if (spec.defaultJson !== undefined) {
+      metadata.set(VGI_DEFAULT_KEY, spec.defaultJson);
+    }
+    if (spec.choicesJson !== undefined) {
+      metadata.set(VGI_CHOICES_KEY, spec.choicesJson);
+    }
+    if (spec.rangeNotation !== undefined) {
+      metadata.set(VGI_RANGE_KEY, spec.rangeNotation);
+    }
+    if (spec.pattern !== undefined) {
+      metadata.set(VGI_PATTERN_KEY, spec.pattern);
+    }
+    const field3 = field2(spec.name, spec.arrowType, true, metadata.size > 0 ? metadata : undefined);
+    fields.push(field3);
+  }
+  return schema2(fields);
+}
+function macroArgumentsSchema(parameters, parameterDefaultValues, parameterDocs) {
+  const docs = parameterDocs ?? {};
+  const defaultTypes = new Map;
+  if (parameterDefaultValues && parameterDefaultValues.length > 0) {
+    const batch = deserializeBatch(parameterDefaultValues);
+    for (const f of batch.schema.fields) {
+      defaultTypes.set(f.name, f.type);
+    }
+  }
+  const fields = [];
+  for (const name of parameters) {
+    const metadata = new Map;
+    const doc = docs[name];
+    if (doc) {
+      metadata.set(VGI_DOC_KEY, doc);
+    }
+    const fieldType = defaultTypes.get(name) ?? nullType2();
+    fields.push(field2(name, fieldType, true, metadata.size > 0 ? metadata : undefined));
+  }
+  return schema2(fields);
+}
+
+// src/functions/scalar.ts
 function defineScalarFunction(config) {
   const repr = config.repr ?? "rich";
   const specs = [];
@@ -6972,7 +7134,8 @@ function defineScalarFunction(config) {
         isAnyType: isAny,
         isConst: p.const,
         isVarargs: p.varargs,
-        doc: p.doc
+        doc: p.doc,
+        ...constraintSpecFields(p)
       });
     }
   } else {
@@ -7541,72 +7704,6 @@ function defineTableInOutFunction(config) {
 // src/catalog/read-only.ts
 init_arrow();
 
-// src/arguments/argument-spec.ts
-init_arrow();
-function argumentSpecSortKey(spec) {
-  if (typeof spec.position === "number") {
-    return [0, spec.position];
-  }
-  return [1, spec.position];
-}
-function argumentSpecsToSchema(specs) {
-  const sorted = [...specs].sort((a, b) => {
-    const ka = argumentSpecSortKey(a);
-    const kb = argumentSpecSortKey(b);
-    if (ka[0] !== kb[0])
-      return ka[0] - kb[0];
-    if (typeof ka[1] === "number" && typeof kb[1] === "number") {
-      return ka[1] - kb[1];
-    }
-    return String(ka[1]).localeCompare(String(kb[1]));
-  });
-  const fields = [];
-  for (const spec of sorted) {
-    const metadata = new Map;
-    if (typeof spec.position === "string") {
-      metadata.set(VGI_ARG_KEY, VGI_ARG_NAMED);
-    }
-    if (spec.isTableInput) {
-      metadata.set(VGI_TYPE_KEY, VGI_TYPE_TABLE);
-    } else if (spec.isAnyType) {
-      metadata.set(VGI_TYPE_KEY, VGI_TYPE_ANY);
-    }
-    if (spec.isVarargs) {
-      metadata.set(VGI_VARARGS_KEY, VGI_VARARGS_TRUE);
-    }
-    if (spec.isConst) {
-      metadata.set(VGI_CONST_KEY, VGI_CONST_TRUE);
-    }
-    if (spec.doc) {
-      metadata.set(VGI_DOC_KEY, spec.doc);
-    }
-    const field3 = field2(spec.name, spec.arrowType, true, metadata.size > 0 ? metadata : undefined);
-    fields.push(field3);
-  }
-  return schema2(fields);
-}
-function macroArgumentsSchema(parameters, parameterDefaultValues, parameterDocs) {
-  const docs = parameterDocs ?? {};
-  const defaultTypes = new Map;
-  if (parameterDefaultValues && parameterDefaultValues.length > 0) {
-    const batch = deserializeBatch(parameterDefaultValues);
-    for (const f of batch.schema.fields) {
-      defaultTypes.set(f.name, f.type);
-    }
-  }
-  const fields = [];
-  for (const name of parameters) {
-    const metadata = new Map;
-    const doc = docs[name];
-    if (doc) {
-      metadata.set(VGI_DOC_KEY, doc);
-    }
-    const fieldType = defaultTypes.get(name) ?? nullType2();
-    fields.push(field2(name, fieldType, true, metadata.size > 0 ? metadata : undefined));
-  }
-  return schema2(fields);
-}
-
 // src/metadata/resolve.ts
 init_arrow();
 function arrowTypeToName(type) {
@@ -7727,6 +7824,7 @@ class ReadOnlyCatalogInterface extends CatalogInterface {
     this._attachments.set(name, attachOpaqueData);
     const settings = (this._descriptor.settings ?? []).map((s) => serializeSetting(s));
     const secretTypes = (this._descriptor.secretTypes ?? []).map((s) => serializeSecretType(s));
+    const attachCatalogs = (this._descriptor.attachCatalogs ?? []).map((c) => encodeAttachCatalogInfo(c));
     const hasTimeTravel = this._descriptor.schemas.some((s) => s.tables?.some((t) => t.supportsTimeTravel) ?? false);
     return {
       attach_opaque_data: attachOpaqueData,
@@ -7738,6 +7836,7 @@ class ReadOnlyCatalogInterface extends CatalogInterface {
       default_schema: this._descriptor.defaultSchema ?? "main",
       settings,
       secret_types: secretTypes,
+      attach_catalogs: attachCatalogs,
       comment: this._descriptor.comment ?? null,
       tags: this._descriptor.tags ?? {},
       supports_column_statistics: true,
@@ -8764,4 +8863,4 @@ export {
   Arguments
 };
 
-//# debugId=6A376318AEA9632964756E2164756E21
+//# debugId=5A27AF075D6D5AD464756E2164756E21