@columnus/api-cli 0.2.3 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/cli.js +251 -104
  2. package/package.json +1 -1
package/dist/cli.js CHANGED
@@ -22750,6 +22750,9 @@ function date4(params) {
22750
22750
  return _coercedDate(ZodDate, params);
22751
22751
  }
22752
22752
 
22753
+ // ../shared/src/queryTypes.ts
22754
+ import { ConvexError } from "convex/values";
22755
+
22753
22756
  // ../shared/src/fieldValueShape.ts
22754
22757
  function enumOptions(type) {
22755
22758
  if (type.kind !== "union") return null;
@@ -22770,6 +22773,10 @@ function fieldShape(type) {
22770
22773
  if (type.kind === "array" && hasKindTrait(type.element, "chipItem")) return "scalarList";
22771
22774
  return type.kind;
22772
22775
  }
22776
+ function linkTargetTable(type) {
22777
+ const ref = type.kind === "array" ? type.element : type;
22778
+ return ref.kind === "id" ? ref.table : void 0;
22779
+ }
22773
22780
  var SHAPE_TRAITS = {
22774
22781
  string: ["inline", "editable", "textScalar", "previewLabel", "chipItem"],
22775
22782
  markdown: ["editable", "previewLabel"],
@@ -22806,6 +22813,7 @@ var PREDICATE_VARIANTS = [
22806
22813
  { op: "neq", label: "\u2260" }
22807
22814
  ]
22808
22815
  },
22816
+ { value: "string", ops: [{ op: "contains", label: "contains" }] },
22809
22817
  { value: "unknownArray", ops: [{ op: "in", label: "in" }] },
22810
22818
  {
22811
22819
  value: "unknown",
@@ -22819,7 +22827,10 @@ var PREDICATE_VARIANTS = [
22819
22827
  { value: "between", ops: [{ op: "between", label: "between" }] },
22820
22828
  {
22821
22829
  value: "unknownArray",
22822
- ops: [{ op: "containsAll", label: "contains all" }]
22830
+ ops: [
22831
+ { op: "containsAll", label: "contains all" },
22832
+ { op: "containsAny", label: "contains any" }
22833
+ ]
22823
22834
  },
22824
22835
  {
22825
22836
  value: "none",
@@ -22835,24 +22846,46 @@ var PREDICATE_OPS = PREDICATE_VARIANTS.flatMap(
22835
22846
  var PREDICATE_OP_LABELS = new Map(
22836
22847
  PREDICATE_VARIANTS.flatMap((variant) => variant.ops.map(({ op, label }) => [op, label]))
22837
22848
  );
22838
- var FREEFORM_COLUMN_FILTER_OPS = {
22839
- text: ["eq", "neq", "in"],
22840
- number: ["eq", "between"],
22841
- date: ["between"]
22842
- };
22843
- var COLUMN_FILTER_EDITOR_OPS = {
22844
- enumChecklist: ["in"],
22845
- idChecklist: ["in"],
22846
- idListChecklist: ["containsAll"],
22847
- boolean: ["eq"],
22848
- text: FREEFORM_COLUMN_FILTER_OPS.text,
22849
- number: FREEFORM_COLUMN_FILTER_OPS.number,
22850
- date: FREEFORM_COLUMN_FILTER_OPS.date,
22851
- none: []
22852
- };
22849
+ function subFields(type, throughLists) {
22850
+ if (type.kind === "object") return type.fields;
22851
+ return throughLists && type.kind === "array" && type.element.kind === "object" ? type.element.fields : [];
22852
+ }
22853
+ function fieldsAlongPath(table, path5, throughLists = false) {
22854
+ const chain = [];
22855
+ let fields = table.fields;
22856
+ for (const segment of path5.split(".")) {
22857
+ const field = fields.find((f) => f.name === segment);
22858
+ if (!field) return null;
22859
+ chain.push(field);
22860
+ fields = subFields(field.type, throughLists);
22861
+ }
22862
+ return chain;
22863
+ }
22864
+ function comparableUnionKind(t) {
22865
+ if (t.kind !== "union" || t.options.length === 0) return null;
22866
+ const first = t.options[0];
22867
+ if (!t.options.every((o) => o.kind === first.kind)) return null;
22868
+ if (first.kind === "string" || first.kind === "number" || first.kind === "bigint" || first.kind === "boolean" || first.kind === "date" || first.kind === "datetime" || first.kind === "id") {
22869
+ return first;
22870
+ }
22871
+ if (first.kind === "literal") {
22872
+ if (t.options.some((o) => o.kind === "literal" && typeof o.value !== typeof first.value)) {
22873
+ return first;
22874
+ }
22875
+ const v4 = first.value;
22876
+ if (typeof v4 === "string") return { kind: "string" };
22877
+ if (typeof v4 === "number") return { kind: "number" };
22878
+ if (typeof v4 === "boolean") return { kind: "boolean" };
22879
+ }
22880
+ return null;
22881
+ }
22882
+ function effectiveQueryFieldType(t) {
22883
+ if (t.kind === "union") return comparableUnionKind(t);
22884
+ return t;
22885
+ }
22853
22886
 
22854
22887
  // ../shared/src/queryTypes.ts
22855
- var listAccessKindSchema = external_exports.enum(["table", "index", "search", "idList"]);
22888
+ var listAccessKindSchema = external_exports.enum(["table", "index", "idList"]);
22856
22889
  var listPageKindSchema = external_exports.enum(["paginate", "boundedSort"]);
22857
22890
  var queryErrorCodeSchema = external_exports.enum([
22858
22891
  "query_invalid",
@@ -22867,13 +22900,16 @@ var betweenValueSchema = external_exports.object({
22867
22900
  (value) => Object.hasOwn(value, "min") && Object.hasOwn(value, "max"),
22868
22901
  "Between requires min and max"
22869
22902
  );
22903
+ var valueSchemas = {
22904
+ unknown: external_exports.unknown(),
22905
+ unknownArray: external_exports.array(external_exports.unknown()),
22906
+ between: betweenValueSchema,
22907
+ none: external_exports.null(),
22908
+ string: external_exports.string().min(1)
22909
+ };
22870
22910
  var predicateSchemas = PREDICATE_VARIANTS.flatMap(
22871
22911
  (variant) => variant.ops.map(
22872
- ({ op }) => external_exports.object({
22873
- field: external_exports.string().min(1),
22874
- op: external_exports.literal(op),
22875
- value: variant.value === "unknownArray" ? external_exports.array(external_exports.unknown()) : variant.value === "between" ? betweenValueSchema : variant.value === "none" ? external_exports.null() : external_exports.unknown()
22876
- })
22912
+ ({ op }) => external_exports.object({ field: external_exports.string().min(1), op: external_exports.literal(op), value: valueSchemas[variant.value] })
22877
22913
  )
22878
22914
  );
22879
22915
  var predicateSchema = external_exports.discriminatedUnion(
@@ -22883,38 +22919,49 @@ var predicateSchema = external_exports.discriminatedUnion(
22883
22919
  (predicate) => Object.hasOwn(predicate, "value"),
22884
22920
  "Predicate value is required"
22885
22921
  );
22922
+ var MAX_GROUP_DEPTH = 3;
22923
+ var groupedPredicateSchema = predicateSchema.refine(
22924
+ (p) => !((p.op === "containsAll" || p.op === "containsAny") && p.value.length === 0),
22925
+ "A list inside a group needs at least one value"
22926
+ );
22927
+ var tooDeepSchema = external_exports.never({ error: `Groups nest at most ${MAX_GROUP_DEPTH} levels` });
22928
+ function conditionAt(levels) {
22929
+ const predicate = levels === MAX_GROUP_DEPTH ? predicateSchema : groupedPredicateSchema;
22930
+ const group = levels === 0 ? tooDeepSchema : groupSchema(levels);
22931
+ const union2 = external_exports.union(levels === 0 ? [predicate] : [predicate, group]);
22932
+ return dispatchByShape(
22933
+ union2,
22934
+ (value) => typeof value === "object" && value !== null && (Object.hasOwn(value, "or") || Object.hasOwn(value, "and")) ? group : predicate
22935
+ );
22936
+ }
22937
+ function dispatchByShape(union2, pick2) {
22938
+ union2._zod.run = union2._zod.parse = (payload, ctx) => pick2(payload.value)._zod.run(payload, ctx);
22939
+ return union2;
22940
+ }
22941
+ function groupSchema(levels) {
22942
+ const children = external_exports.array(conditionAt(levels - 1)).min(1, "A group needs at least one condition");
22943
+ return external_exports.partialRecord(external_exports.enum(["or", "and"]), children).refine((group) => Object.keys(group).length === 1, 'A group takes "or" or "and", not both').meta({ minProperties: 1, maxProperties: 1 });
22944
+ }
22945
+ var conditionSchema = conditionAt(MAX_GROUP_DEPTH);
22886
22946
  var queryOrderSchema = external_exports.object({
22887
22947
  field: external_exports.string().min(1),
22888
22948
  direction: external_exports.enum(["asc", "desc"])
22889
22949
  });
22890
- var querySearchSchema = external_exports.object({
22891
- index: external_exports.string().min(1),
22892
- query: external_exports.string()
22893
- });
22894
22950
  var querySchema = external_exports.object({
22895
- predicates: external_exports.array(predicateSchema).optional(),
22951
+ predicates: external_exports.array(conditionSchema).optional(),
22896
22952
  order: queryOrderSchema.optional(),
22897
- search: querySearchSchema.optional(),
22898
- /** Reserved — rejected by the planner until vector indexes exist in the manifest. */
22899
- vector: external_exports.unknown().optional(),
22900
22953
  maxScan: external_exports.number().int().positive().optional(),
22901
22954
  indexHint: external_exports.string().min(1).optional()
22902
22955
  });
22903
22956
  var clampQuerySchema = external_exports.object({
22904
- predicates: external_exports.array(predicateSchema).optional(),
22905
- order: queryOrderSchema.optional(),
22906
- search: querySearchSchema.optional()
22957
+ predicates: external_exports.array(conditionSchema).optional(),
22958
+ order: queryOrderSchema.optional()
22907
22959
  });
22908
- var listMetaOrderSchema = external_exports.union([
22909
- queryOrderSchema,
22910
- external_exports.object({ kind: external_exports.literal("relevance") })
22911
- ]);
22912
22960
  var listMetaSchema = external_exports.object({
22913
22961
  access: listAccessKindSchema,
22914
22962
  page: listPageKindSchema,
22915
- order: listMetaOrderSchema.optional(),
22963
+ order: queryOrderSchema.optional(),
22916
22964
  indexName: external_exports.string().optional(),
22917
- searchIndexName: external_exports.string().optional(),
22918
22965
  scanned: external_exports.number().int().nonnegative().optional(),
22919
22966
  truncated: external_exports.boolean().optional()
22920
22967
  });
@@ -22938,7 +22985,7 @@ var apiTableAccessSchema = external_exports.object({
22938
22985
  autoAccept: external_exports.boolean().optional(),
22939
22986
  /**
22940
22987
  * Opaque row clamp: AND-merged with caller Query on Read API / guest lists.
22941
- * Sync membership uses `rowQuery.predicates` only (order/search ignored; maxScanLimit ignored).
22988
+ * Sync membership uses `rowQuery.predicates` only (order and maxScanLimit ignored).
22942
22989
  */
22943
22990
  rowQuery: clampQuerySchema.optional(),
22944
22991
  /** Scan ceiling for Read/guest list plans; callers may only lower. Not applied to Sync/Resync. */
@@ -22969,6 +23016,8 @@ var apiProfileSnapshotSchema = external_exports.object({
22969
23016
  autoAcceptProposals: external_exports.boolean().optional(),
22970
23017
  /** Hosted MCP endpoint for this profile. Missing/undefined = disabled (opt-in). */
22971
23018
  mcpEnabled: external_exports.boolean().optional(),
23019
+ /** Plan 108 D2: ✨ Meaning search for API callers. Missing/undefined = off (opt-in). */
23020
+ meaningSearch: external_exports.boolean().optional(),
22972
23021
  apiVersion: external_exports.number(),
22973
23022
  updatedAt: external_exports.number()
22974
23023
  });
@@ -23156,6 +23205,7 @@ var bffErrorCodeSchema = external_exports.enum([
23156
23205
  "unknown_host",
23157
23206
  "disabled_host",
23158
23207
  "conflict",
23208
+ "meaning_unavailable",
23159
23209
  "executor_mismatch",
23160
23210
  "executor_unavailable",
23161
23211
  "validation_error",
@@ -23317,9 +23367,6 @@ var MCP_OAUTH_UNUSED_CLIENT_TTL_MS = 7 * 24 * 60 * MINUTE;
23317
23367
  var MCP_ENDPOINT_PATH_PREFIX = `${COLUMNUS_BFF_API_PREFIX}/mcp/`;
23318
23368
  var MCP_OAUTH_PATH_PREFIX = `${COLUMNUS_BFF_API_PREFIX}/oauth`;
23319
23369
 
23320
- // ../shared/src/queryPlan.ts
23321
- import { compareValues as compareValues2 } from "convex/values";
23322
-
23323
23370
  // ../shared/src/queryBetween.ts
23324
23371
  import { compareValues } from "convex/values";
23325
23372
 
@@ -23347,7 +23394,7 @@ var EMPTY_RICH_DOC = JSON.stringify({
23347
23394
  });
23348
23395
 
23349
23396
  // ../shared/src/rowTrash.ts
23350
- import { ConvexError } from "convex/values";
23397
+ import { ConvexError as ConvexError2 } from "convex/values";
23351
23398
  var TRASH_DELETED_AT_FIELD = "columnusDeletedAt";
23352
23399
  var TRASH_DELETED_BY_FIELD = "columnusDeletedBy";
23353
23400
  var TRASH_FIELD_NAMES = [
@@ -23369,6 +23416,65 @@ function withTrashFields(table) {
23369
23416
  };
23370
23417
  }
23371
23418
 
23419
+ // ../shared/src/tableSearch.ts
23420
+ var SEARCH_BOOSTS = ["high", "normal", "low"];
23421
+ var MEANING_STRICTNESS = ["strict", "loose"];
23422
+ var tableSearchSchema = external_exports.object({
23423
+ fields: external_exports.array(
23424
+ external_exports.object({
23425
+ field: external_exports.string(),
23426
+ boost: external_exports.enum(SEARCH_BOOSTS).optional(),
23427
+ meaning: external_exports.boolean().optional()
23428
+ })
23429
+ ),
23430
+ meaningStrictness: external_exports.enum(MEANING_STRICTNESS).optional()
23431
+ });
23432
+ var SHAPE_SEARCH = {
23433
+ string: () => "rawText",
23434
+ markdown: () => "text",
23435
+ // By the option's label, the literal itself.
23436
+ enum: () => "rawText",
23437
+ scalarList: (type) => type.kind === "array" && effectiveQueryFieldType(type.element)?.kind === "string" ? "text" : null,
23438
+ id: () => "link",
23439
+ idList: () => "link",
23440
+ number: () => null,
23441
+ bigint: () => null,
23442
+ boolean: () => null,
23443
+ null: () => null,
23444
+ any: () => null,
23445
+ bytes: () => null,
23446
+ file: () => null,
23447
+ image: () => null,
23448
+ date: () => null,
23449
+ datetime: () => null,
23450
+ literal: () => null,
23451
+ // Lists of objects are searched through their objects' raw text fields.
23452
+ array: () => null,
23453
+ // Searched through its leaves.
23454
+ object: () => null,
23455
+ union: () => null
23456
+ };
23457
+ function searchKind(table, path5, tables) {
23458
+ const type = fieldsAlongPath(table, path5, true)?.at(-1)?.type;
23459
+ if (!type) return null;
23460
+ const kind = SHAPE_SEARCH[fieldShape(type)](type);
23461
+ if (!fieldsAlongPath(table, path5)) return kind === "rawText" ? kind : null;
23462
+ if (kind !== "link") return kind;
23463
+ const target = linkTargetTable(type);
23464
+ return tables.some((t) => t.name === target && t.kind !== "asset") ? "link" : null;
23465
+ }
23466
+ function searchIssues(table, tables) {
23467
+ const issues = [];
23468
+ const seen = /* @__PURE__ */ new Set();
23469
+ for (const { field } of table.search?.fields ?? []) {
23470
+ if (seen.has(field)) issues.push(`${table.name}.search lists ${field} twice`);
23471
+ else if (!searchKind(table, field, tables))
23472
+ issues.push(`${table.name}.search: ${field} is not a searchable field`);
23473
+ seen.add(field);
23474
+ }
23475
+ return issues;
23476
+ }
23477
+
23372
23478
  // ../shared/src/schemaTypes.ts
23373
23479
  var IDENT = /^[A-Za-z_][A-Za-z0-9_]*$/;
23374
23480
  var RESERVED_TABLE_NAMES = /* @__PURE__ */ new Set([
@@ -23478,11 +23584,6 @@ var indexSchema = external_exports.object({
23478
23584
  name: external_exports.string().regex(IDENT),
23479
23585
  fields: external_exports.array(external_exports.string().regex(IDENT)).min(1)
23480
23586
  });
23481
- var searchIndexSchema = external_exports.object({
23482
- name: external_exports.string().regex(IDENT),
23483
- searchField: external_exports.string().regex(IDENT),
23484
- filterFields: external_exports.array(external_exports.string().regex(IDENT)).optional()
23485
- });
23486
23587
  var tableSchema = external_exports.object({
23487
23588
  name: external_exports.string().regex(IDENT).refine((n) => !RESERVED_TABLE_NAMES.has(n), {
23488
23589
  message: "table name is reserved by the studio"
@@ -23493,8 +23594,9 @@ var tableSchema = external_exports.object({
23493
23594
  kind: tableKindSchema.optional().default("record"),
23494
23595
  fields: external_exports.array(fieldSchema),
23495
23596
  indexes: external_exports.array(indexSchema).default([]),
23496
- searchIndexes: external_exports.array(searchIndexSchema).default([]),
23497
- displayTemplates: displayTemplatesSchema.optional()
23597
+ displayTemplates: displayTemplatesSchema.optional(),
23598
+ /** The read model's search box (plan 106); absent: every searchable field. */
23599
+ search: tableSearchSchema.optional()
23498
23600
  });
23499
23601
  var manifestSchema = external_exports.object({
23500
23602
  tables: external_exports.array(tableSchema)
@@ -23519,24 +23621,24 @@ var manifestSchema = external_exports.object({
23519
23621
  path: ["tables"]
23520
23622
  });
23521
23623
  }
23522
- if (t.searchIndexes.length > 0) {
23624
+ if (t.displayTemplates !== void 0) {
23523
23625
  ctx.addIssue({
23524
23626
  code: external_exports.ZodIssueCode.custom,
23525
- message: `${t.name} is an asset metadata table and cannot define search indexes`,
23627
+ message: `${t.name} is an asset metadata table and cannot define display templates`,
23526
23628
  path: ["tables"]
23527
23629
  });
23528
23630
  }
23529
- if (t.displayTemplates !== void 0) {
23631
+ if (t.color !== void 0) {
23530
23632
  ctx.addIssue({
23531
23633
  code: external_exports.ZodIssueCode.custom,
23532
- message: `${t.name} is an asset metadata table and cannot define display templates`,
23634
+ message: `${t.name} is an asset metadata table and cannot define a color`,
23533
23635
  path: ["tables"]
23534
23636
  });
23535
23637
  }
23536
- if (t.color !== void 0) {
23638
+ if (t.search !== void 0) {
23537
23639
  ctx.addIssue({
23538
23640
  code: external_exports.ZodIssueCode.custom,
23539
- message: `${t.name} is an asset metadata table and cannot define a color`,
23641
+ message: `${t.name} is an asset metadata table and cannot define search`,
23540
23642
  path: ["tables"]
23541
23643
  });
23542
23644
  }
@@ -23560,7 +23662,7 @@ var manifestSchema = external_exports.object({
23560
23662
  }
23561
23663
  assertAssetBindingAllowed(ctx, t, f);
23562
23664
  }
23563
- for (const idx of [...t.indexes, ...t.searchIndexes]) {
23665
+ for (const idx of t.indexes) {
23564
23666
  if (idx.name === TRASH_INDEX_NAME) {
23565
23667
  ctx.addIssue({
23566
23668
  code: external_exports.ZodIssueCode.custom,
@@ -23571,6 +23673,8 @@ var manifestSchema = external_exports.object({
23571
23673
  }
23572
23674
  }
23573
23675
  for (const t of manifest.tables) {
23676
+ for (const message of searchIssues(t, manifest.tables))
23677
+ ctx.addIssue({ code: external_exports.ZodIssueCode.custom, message, path: ["tables"] });
23574
23678
  for (const f of t.fields) {
23575
23679
  const invalidRef = findInvalidReference(f, tablesByName);
23576
23680
  if (invalidRef) {
@@ -23872,7 +23976,7 @@ ${schemaBody}});
23872
23976
  `;
23873
23977
  }
23874
23978
  function renderTable(t) {
23875
- const { fields, indexes, searchIndexes } = isAssetTable(t) ? {
23979
+ const { fields, indexes } = isAssetTable(t) ? {
23876
23980
  fields: [
23877
23981
  ...t.fields,
23878
23982
  {
@@ -23881,8 +23985,7 @@ function renderTable(t) {
23881
23985
  optional: false
23882
23986
  }
23883
23987
  ],
23884
- indexes: [{ name: "by_assetId", fields: ["assetId"] }],
23885
- searchIndexes: []
23988
+ indexes: [{ name: "by_assetId", fields: ["assetId"] }]
23886
23989
  } : withTrashFields(t);
23887
23990
  const fieldsBlock = fields.map((f) => {
23888
23991
  const inner = renderType(f.type);
@@ -23892,20 +23995,12 @@ function renderTable(t) {
23892
23995
  let out = `defineTable({
23893
23996
  ${fieldsBlock}
23894
23997
  })`;
23895
- const inlineSingleIndex = indexes.length === 1 && searchIndexes.length === 0;
23998
+ const inlineSingleIndex = indexes.length === 1;
23896
23999
  for (const idx of indexes) {
23897
24000
  const cols = idx.fields.map((c) => JSON.stringify(c)).join(", ");
23898
24001
  const sep = inlineSingleIndex ? "" : "\n ";
23899
24002
  out += `${sep}.index(${JSON.stringify(idx.name)}, [${cols}])`;
23900
24003
  }
23901
- for (const sx of searchIndexes) {
23902
- const cfg = [`searchField: ${JSON.stringify(sx.searchField)}`];
23903
- if (sx.filterFields && sx.filterFields.length > 0) {
23904
- cfg.push(`filterFields: [${sx.filterFields.map((c) => JSON.stringify(c)).join(", ")}]`);
23905
- }
23906
- out += `
23907
- .searchIndex(${JSON.stringify(sx.name)}, { ${cfg.join(", ")} })`;
23908
- }
23909
24004
  return out;
23910
24005
  }
23911
24006
  function renderLeaf(t) {
@@ -24010,11 +24105,22 @@ function quotedUnion(values) {
24010
24105
  function multilineUnion(values) {
24011
24106
  return values.map((value) => ` | ${JSON.stringify(value)}`).join("\n");
24012
24107
  }
24108
+ var VALUE_TYPES = {
24109
+ unknown: "unknown",
24110
+ unknownArray: "unknown[]",
24111
+ between: "{ min: unknown; max: unknown }",
24112
+ none: "null",
24113
+ string: "string"
24114
+ };
24013
24115
  function emitQueryTs(banner) {
24014
24116
  const predicate = PREDICATE_VARIANTS.map((variant) => {
24015
- const value = variant.value === "unknownArray" ? "unknown[]" : variant.value === "between" ? "{ min: unknown; max: unknown }" : variant.value === "none" ? "null" : "unknown";
24117
+ const value = VALUE_TYPES[variant.value];
24016
24118
  return ` | { field: string; op: ${quotedUnion(variant.ops.map(({ op }) => op))}; value: ${value} }`;
24017
24119
  }).join("\n");
24120
+ let condition = "Predicate";
24121
+ for (let level = 0; level < MAX_GROUP_DEPTH; level++) {
24122
+ condition = `Predicate | Group<${condition}>`;
24123
+ }
24018
24124
  return `${banner}export type PredicateOp =
24019
24125
  ${multilineUnion(PREDICATE_OPS)};
24020
24126
 
@@ -24023,23 +24129,24 @@ ${predicate};
24023
24129
 
24024
24130
  export type QueryOrder = { field: string; direction: "asc" | "desc" };
24025
24131
 
24026
- export type QuerySearch = { index: string; query: string };
24132
+ type Group<C> = { or: C[] } | { and: C[] };
24133
+
24134
+ /** A predicate, or an \`or\`/\`and\` group of conditions, up to ${MAX_GROUP_DEPTH} group levels deep. */
24135
+ export type Condition = ${condition};
24027
24136
 
24028
24137
  export type Query = {
24029
- predicates?: Predicate[];
24138
+ /** ANDed. */
24139
+ predicates?: Condition[];
24030
24140
  order?: QueryOrder;
24031
- search?: QuerySearch;
24032
24141
  maxScan?: number;
24033
24142
  indexHint?: string;
24034
- vector?: unknown;
24035
24143
  };
24036
24144
 
24037
24145
  export type ListMeta = {
24038
- access: "table" | "index" | "search" | "idList";
24146
+ access: "table" | "index" | "idList";
24039
24147
  page: "paginate" | "boundedSort";
24040
- order?: QueryOrder | { kind: "relevance" };
24148
+ order?: QueryOrder;
24041
24149
  indexName?: string;
24042
- searchIndexName?: string;
24043
24150
  scanned?: number;
24044
24151
  truncated?: boolean;
24045
24152
  };
@@ -24493,7 +24600,6 @@ export type ManifestTable = {
24493
24600
  label?: string;
24494
24601
  fields: ManifestField[];
24495
24602
  indexes: ManifestIndex[];
24496
- searchIndexes: unknown[];
24497
24603
  };
24498
24604
 
24499
24605
  export type PulledManifest = { tables: ManifestTable[] };
@@ -24708,34 +24814,69 @@ var gridQuerySchema = querySchema.extend({
24708
24814
 
24709
24815
  // ../shared/src/queryValidators.ts
24710
24816
  import { v as v2 } from "convex/values";
24817
+
24818
+ // ../shared/src/readModelLimits.ts
24819
+ var FACET_LIMITS = {
24820
+ perRequest: 12,
24821
+ page: 10,
24822
+ more: 50,
24823
+ searchMax: 50,
24824
+ suggestFields: 8,
24825
+ suggestPerField: 3
24826
+ };
24827
+
24828
+ // ../shared/src/facets.ts
24829
+ var FACET_SORTS = ["count", "label", "options"];
24830
+ var facetSpecSchema = external_exports.object({
24831
+ field: external_exports.string().min(1),
24832
+ bucket: external_exports.enum(GROUP_BUCKETS).optional(),
24833
+ sort: external_exports.enum(FACET_SORTS).optional()
24834
+ });
24835
+ var facetListSchema = external_exports.array(facetSpecSchema).max(FACET_LIMITS.perRequest);
24836
+
24837
+ // ../shared/src/queryValidators.ts
24838
+ var valueValidators = {
24839
+ unknown: v2.any(),
24840
+ unknownArray: v2.array(v2.any()),
24841
+ between: v2.object({ min: v2.any(), max: v2.any() }),
24842
+ none: v2.null(),
24843
+ string: v2.string()
24844
+ };
24711
24845
  var predicateValidators = PREDICATE_VARIANTS.flatMap(
24712
24846
  (variant) => variant.ops.map(
24713
- ({ op }) => v2.object({
24714
- field: v2.string(),
24715
- op: v2.literal(op),
24716
- value: variant.value === "unknownArray" ? v2.array(v2.any()) : variant.value === "between" ? v2.object({ min: v2.any(), max: v2.any() }) : variant.value === "none" ? v2.null() : v2.any()
24717
- })
24847
+ ({ op }) => v2.object({ field: v2.string(), op: v2.literal(op), value: valueValidators[variant.value] })
24718
24848
  )
24719
24849
  );
24720
24850
  var predicateValidator = v2.union(
24721
24851
  ...predicateValidators
24722
24852
  );
24853
+ function conditionValidator(levels) {
24854
+ if (levels === 0) return predicateValidator;
24855
+ const children = v2.array(conditionValidator(levels - 1));
24856
+ return v2.union(
24857
+ ...predicateValidator.members,
24858
+ v2.object({ or: children }),
24859
+ v2.object({ and: children })
24860
+ );
24861
+ }
24862
+ var conditionsValidator = v2.array(conditionValidator(MAX_GROUP_DEPTH));
24723
24863
  var queryOrderValidator = v2.object({
24724
24864
  field: v2.string(),
24725
24865
  direction: v2.union(v2.literal("asc"), v2.literal("desc"))
24726
24866
  });
24727
- var querySearchValidator = v2.object({
24728
- index: v2.string(),
24729
- query: v2.string()
24730
- });
24867
+ var legacySearchValidator = v2.optional(v2.object({ index: v2.string(), query: v2.string() }));
24731
24868
  var queryValidator = v2.object({
24732
- predicates: v2.optional(v2.array(predicateValidator)),
24869
+ predicates: v2.optional(conditionsValidator),
24733
24870
  order: v2.optional(queryOrderValidator),
24734
- search: v2.optional(querySearchValidator),
24735
24871
  maxScan: v2.optional(v2.number()),
24736
- indexHint: v2.optional(v2.string()),
24737
- vector: v2.optional(v2.any())
24872
+ indexHint: v2.optional(v2.string())
24738
24873
  });
24874
+ function literals(values) {
24875
+ return v2.union(
24876
+ ...values.map((value) => v2.literal(value))
24877
+ );
24878
+ }
24879
+ var groupBucketValidator = literals(GROUP_BUCKETS);
24739
24880
  var gridQueryValidator = v2.object({
24740
24881
  ...queryValidator.fields,
24741
24882
  order: v2.optional(v2.union(queryOrderValidator, v2.array(queryOrderValidator))),
@@ -24744,19 +24885,25 @@ var gridQueryValidator = v2.object({
24744
24885
  v2.object({
24745
24886
  field: v2.string(),
24746
24887
  direction: v2.optional(v2.union(v2.literal("asc"), v2.literal("desc"))),
24747
- bucket: v2.optional(
24748
- v2.union(
24749
- ...GROUP_BUCKETS.map((bucket) => v2.literal(bucket))
24750
- )
24751
- )
24888
+ bucket: v2.optional(groupBucketValidator)
24752
24889
  })
24753
24890
  )
24754
24891
  )
24755
24892
  });
24893
+ var storedGridQueryValidator = v2.object({
24894
+ ...gridQueryValidator.fields,
24895
+ search: legacySearchValidator,
24896
+ vector: v2.optional(v2.any())
24897
+ });
24898
+ var facetSpecValidator = v2.object({
24899
+ field: v2.string(),
24900
+ bucket: v2.optional(groupBucketValidator),
24901
+ sort: v2.optional(literals(FACET_SORTS))
24902
+ });
24756
24903
  var clampQueryValidator = v2.object({
24757
- predicates: v2.optional(v2.array(predicateValidator)),
24904
+ predicates: v2.optional(conditionsValidator),
24758
24905
  order: v2.optional(queryOrderValidator),
24759
- search: v2.optional(querySearchValidator)
24906
+ search: legacySearchValidator
24760
24907
  });
24761
24908
  var queryArgValidator = v2.optional(queryValidator);
24762
24909
  var maxScanLimitValidator = v2.optional(v2.number());
@@ -24818,7 +24965,7 @@ var stagedApiAccessValidator = v3.array(
24818
24965
  );
24819
24966
 
24820
24967
  // ../shared/src/failureMessage.ts
24821
- import { ConvexError as ConvexError2 } from "convex/values";
24968
+ import { ConvexError as ConvexError3 } from "convex/values";
24822
24969
 
24823
24970
  // ../shared/src/refsRecompute.ts
24824
24971
  var REFS_RECOMPUTE_STALE_MS = 10 * 60 * 1e3;
@@ -24827,7 +24974,8 @@ var REFS_RECOMPUTE_STALE_MS = 10 * 60 * 1e3;
24827
24974
  var stagedApiAccessSchema = external_exports.array(
24828
24975
  external_exports.object({
24829
24976
  profile: external_exports.string().min(1),
24830
- tableAccess: external_exports.array(apiTableAccessSchema).min(1)
24977
+ // A pasted clamp is a write: a key it can't have (plan 106's `search`) is refused, not dropped (D8).
24978
+ tableAccess: external_exports.array(apiTableAccessSchema.extend({ rowQuery: clampQuerySchema.strict().optional() })).min(1)
24831
24979
  }).strict()
24832
24980
  );
24833
24981
 
@@ -25032,17 +25180,16 @@ async function runColumnusApiDev(config2) {
25032
25180
  const client = new ConvexClient(config2.convexUrl, {
25033
25181
  webSocketConstructor: ws
25034
25182
  });
25035
- let unsubscribe;
25036
25183
  const stop = new Promise((resolve) => {
25037
25184
  const onSignal = () => {
25038
- unsubscribe?.();
25185
+ unsubscribe();
25039
25186
  client.close();
25040
25187
  resolve();
25041
25188
  };
25042
25189
  process.once("SIGINT", onSignal);
25043
25190
  process.once("SIGTERM", onSignal);
25044
25191
  });
25045
- unsubscribe = client.onUpdate(
25192
+ const unsubscribe = client.onUpdate(
25046
25193
  anyApi2.columnus.read.introspect.introspect,
25047
25194
  { apiToken: config2.token },
25048
25195
  (rawSnapshot) => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@columnus/api-cli",
3
- "version": "0.2.3",
3
+ "version": "0.2.5",
4
4
  "private": false,
5
5
  "type": "module",
6
6
  "description": "columnus-api pull and dev — live-sync read API codegen for Columnus consumer apps",