@columnus/api-cli 0.2.3 → 0.2.4

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 +91 -28
  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;
@@ -22819,7 +22822,10 @@ var PREDICATE_VARIANTS = [
22819
22822
  { value: "between", ops: [{ op: "between", label: "between" }] },
22820
22823
  {
22821
22824
  value: "unknownArray",
22822
- ops: [{ op: "containsAll", label: "contains all" }]
22825
+ ops: [
22826
+ { op: "containsAll", label: "contains all" },
22827
+ { op: "containsAny", label: "contains any" }
22828
+ ]
22823
22829
  },
22824
22830
  {
22825
22831
  value: "none",
@@ -22835,21 +22841,6 @@ var PREDICATE_OPS = PREDICATE_VARIANTS.flatMap(
22835
22841
  var PREDICATE_OP_LABELS = new Map(
22836
22842
  PREDICATE_VARIANTS.flatMap((variant) => variant.ops.map(({ op, label }) => [op, label]))
22837
22843
  );
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
- };
22853
22844
 
22854
22845
  // ../shared/src/queryTypes.ts
22855
22846
  var listAccessKindSchema = external_exports.enum(["table", "index", "search", "idList"]);
@@ -22883,6 +22874,30 @@ var predicateSchema = external_exports.discriminatedUnion(
22883
22874
  (predicate) => Object.hasOwn(predicate, "value"),
22884
22875
  "Predicate value is required"
22885
22876
  );
22877
+ var MAX_GROUP_DEPTH = 3;
22878
+ var groupedPredicateSchema = predicateSchema.refine(
22879
+ (p) => !((p.op === "containsAll" || p.op === "containsAny") && p.value.length === 0),
22880
+ "A list inside a group needs at least one value"
22881
+ );
22882
+ var tooDeepSchema = external_exports.never({ error: `Groups nest at most ${MAX_GROUP_DEPTH} levels` });
22883
+ function conditionAt(levels) {
22884
+ const predicate = levels === MAX_GROUP_DEPTH ? predicateSchema : groupedPredicateSchema;
22885
+ const group = levels === 0 ? tooDeepSchema : groupSchema(levels);
22886
+ const union2 = external_exports.union(levels === 0 ? [predicate] : [predicate, group]);
22887
+ return dispatchByShape(
22888
+ union2,
22889
+ (value) => typeof value === "object" && value !== null && (Object.hasOwn(value, "or") || Object.hasOwn(value, "and")) ? group : predicate
22890
+ );
22891
+ }
22892
+ function dispatchByShape(union2, pick2) {
22893
+ union2._zod.run = union2._zod.parse = (payload, ctx) => pick2(payload.value)._zod.run(payload, ctx);
22894
+ return union2;
22895
+ }
22896
+ function groupSchema(levels) {
22897
+ const children = external_exports.array(conditionAt(levels - 1)).min(1, "A group needs at least one condition");
22898
+ 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 });
22899
+ }
22900
+ var conditionSchema = conditionAt(MAX_GROUP_DEPTH);
22886
22901
  var queryOrderSchema = external_exports.object({
22887
22902
  field: external_exports.string().min(1),
22888
22903
  direction: external_exports.enum(["asc", "desc"])
@@ -22892,7 +22907,7 @@ var querySearchSchema = external_exports.object({
22892
22907
  query: external_exports.string()
22893
22908
  });
22894
22909
  var querySchema = external_exports.object({
22895
- predicates: external_exports.array(predicateSchema).optional(),
22910
+ predicates: external_exports.array(conditionSchema).optional(),
22896
22911
  order: queryOrderSchema.optional(),
22897
22912
  search: querySearchSchema.optional(),
22898
22913
  /** Reserved — rejected by the planner until vector indexes exist in the manifest. */
@@ -22901,7 +22916,7 @@ var querySchema = external_exports.object({
22901
22916
  indexHint: external_exports.string().min(1).optional()
22902
22917
  });
22903
22918
  var clampQuerySchema = external_exports.object({
22904
- predicates: external_exports.array(predicateSchema).optional(),
22919
+ predicates: external_exports.array(conditionSchema).optional(),
22905
22920
  order: queryOrderSchema.optional(),
22906
22921
  search: querySearchSchema.optional()
22907
22922
  });
@@ -23347,7 +23362,7 @@ var EMPTY_RICH_DOC = JSON.stringify({
23347
23362
  });
23348
23363
 
23349
23364
  // ../shared/src/rowTrash.ts
23350
- import { ConvexError } from "convex/values";
23365
+ import { ConvexError as ConvexError2 } from "convex/values";
23351
23366
  var TRASH_DELETED_AT_FIELD = "columnusDeletedAt";
23352
23367
  var TRASH_DELETED_BY_FIELD = "columnusDeletedBy";
23353
23368
  var TRASH_FIELD_NAMES = [
@@ -24015,6 +24030,10 @@ function emitQueryTs(banner) {
24015
24030
  const value = variant.value === "unknownArray" ? "unknown[]" : variant.value === "between" ? "{ min: unknown; max: unknown }" : variant.value === "none" ? "null" : "unknown";
24016
24031
  return ` | { field: string; op: ${quotedUnion(variant.ops.map(({ op }) => op))}; value: ${value} }`;
24017
24032
  }).join("\n");
24033
+ let condition = "Predicate";
24034
+ for (let level = 0; level < MAX_GROUP_DEPTH; level++) {
24035
+ condition = `Predicate | Group<${condition}>`;
24036
+ }
24018
24037
  return `${banner}export type PredicateOp =
24019
24038
  ${multilineUnion(PREDICATE_OPS)};
24020
24039
 
@@ -24025,8 +24044,14 @@ export type QueryOrder = { field: string; direction: "asc" | "desc" };
24025
24044
 
24026
24045
  export type QuerySearch = { index: string; query: string };
24027
24046
 
24047
+ type Group<C> = { or: C[] } | { and: C[] };
24048
+
24049
+ /** A predicate, or an \`or\`/\`and\` group of conditions, up to ${MAX_GROUP_DEPTH} group levels deep. */
24050
+ export type Condition = ${condition};
24051
+
24028
24052
  export type Query = {
24029
- predicates?: Predicate[];
24053
+ /** ANDed. */
24054
+ predicates?: Condition[];
24030
24055
  order?: QueryOrder;
24031
24056
  search?: QuerySearch;
24032
24057
  maxScan?: number;
@@ -24708,6 +24733,27 @@ var gridQuerySchema = querySchema.extend({
24708
24733
 
24709
24734
  // ../shared/src/queryValidators.ts
24710
24735
  import { v as v2 } from "convex/values";
24736
+
24737
+ // ../shared/src/readModelLimits.ts
24738
+ var FACET_LIMITS = {
24739
+ perRequest: 12,
24740
+ page: 10,
24741
+ more: 50,
24742
+ searchMax: 50,
24743
+ suggestFields: 8,
24744
+ suggestPerField: 3
24745
+ };
24746
+
24747
+ // ../shared/src/facets.ts
24748
+ var FACET_SORTS = ["count", "label", "options"];
24749
+ var facetSpecSchema = external_exports.object({
24750
+ field: external_exports.string().min(1),
24751
+ bucket: external_exports.enum(GROUP_BUCKETS).optional(),
24752
+ sort: external_exports.enum(FACET_SORTS).optional()
24753
+ });
24754
+ var facetListSchema = external_exports.array(facetSpecSchema).max(FACET_LIMITS.perRequest);
24755
+
24756
+ // ../shared/src/queryValidators.ts
24711
24757
  var predicateValidators = PREDICATE_VARIANTS.flatMap(
24712
24758
  (variant) => variant.ops.map(
24713
24759
  ({ op }) => v2.object({
@@ -24720,6 +24766,16 @@ var predicateValidators = PREDICATE_VARIANTS.flatMap(
24720
24766
  var predicateValidator = v2.union(
24721
24767
  ...predicateValidators
24722
24768
  );
24769
+ function conditionValidator(levels) {
24770
+ if (levels === 0) return predicateValidator;
24771
+ const children = v2.array(conditionValidator(levels - 1));
24772
+ return v2.union(
24773
+ ...predicateValidator.members,
24774
+ v2.object({ or: children }),
24775
+ v2.object({ and: children })
24776
+ );
24777
+ }
24778
+ var conditionsValidator = v2.array(conditionValidator(MAX_GROUP_DEPTH));
24723
24779
  var queryOrderValidator = v2.object({
24724
24780
  field: v2.string(),
24725
24781
  direction: v2.union(v2.literal("asc"), v2.literal("desc"))
@@ -24729,13 +24785,19 @@ var querySearchValidator = v2.object({
24729
24785
  query: v2.string()
24730
24786
  });
24731
24787
  var queryValidator = v2.object({
24732
- predicates: v2.optional(v2.array(predicateValidator)),
24788
+ predicates: v2.optional(conditionsValidator),
24733
24789
  order: v2.optional(queryOrderValidator),
24734
24790
  search: v2.optional(querySearchValidator),
24735
24791
  maxScan: v2.optional(v2.number()),
24736
24792
  indexHint: v2.optional(v2.string()),
24737
24793
  vector: v2.optional(v2.any())
24738
24794
  });
24795
+ function literals(values) {
24796
+ return v2.union(
24797
+ ...values.map((value) => v2.literal(value))
24798
+ );
24799
+ }
24800
+ var groupBucketValidator = literals(GROUP_BUCKETS);
24739
24801
  var gridQueryValidator = v2.object({
24740
24802
  ...queryValidator.fields,
24741
24803
  order: v2.optional(v2.union(queryOrderValidator, v2.array(queryOrderValidator))),
@@ -24744,17 +24806,18 @@ var gridQueryValidator = v2.object({
24744
24806
  v2.object({
24745
24807
  field: v2.string(),
24746
24808
  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
- )
24809
+ bucket: v2.optional(groupBucketValidator)
24752
24810
  })
24753
24811
  )
24754
24812
  )
24755
24813
  });
24814
+ var facetSpecValidator = v2.object({
24815
+ field: v2.string(),
24816
+ bucket: v2.optional(groupBucketValidator),
24817
+ sort: v2.optional(literals(FACET_SORTS))
24818
+ });
24756
24819
  var clampQueryValidator = v2.object({
24757
- predicates: v2.optional(v2.array(predicateValidator)),
24820
+ predicates: v2.optional(conditionsValidator),
24758
24821
  order: v2.optional(queryOrderValidator),
24759
24822
  search: v2.optional(querySearchValidator)
24760
24823
  });
@@ -24818,7 +24881,7 @@ var stagedApiAccessValidator = v3.array(
24818
24881
  );
24819
24882
 
24820
24883
  // ../shared/src/failureMessage.ts
24821
- import { ConvexError as ConvexError2 } from "convex/values";
24884
+ import { ConvexError as ConvexError3 } from "convex/values";
24822
24885
 
24823
24886
  // ../shared/src/refsRecompute.ts
24824
24887
  var REFS_RECOMPUTE_STALE_MS = 10 * 60 * 1e3;
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.4",
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",