feat(api): update aip ffeld filter types

Author: tothandras

api/spec/Makefile

@@ -16,6 +16,7 @@ generate: format ## Generate OpenAPI spec
 	pnpm --filter @openmeter/api-spec-aip exec openapi bundle output/definitions/metering-and-billing/v3/openapi.OpenMeter.yaml -o ../../../v3/openapi.yaml
 	cp packages/legacy/output/openapi.OpenMeter.yaml ../openapi.yaml
 	cp packages/legacy/output/openapi.OpenMeterCloud.yaml ../openapi.cloud.yaml
+	cp packages/aip/output/definitions/metering-and-billing/v3/openapi.Test.yaml ../v3/test/openapi.test.yaml
 
 .PHONY: lint
 lint: ## Lint OpenAPI spec

api/spec/packages/aip/src/common/parameters.tsp

@@ -25,11 +25,16 @@ model SortQuery {}
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
+@oneOf
+@summary("Boolean Field Filter")
 union BooleanFieldFilter {
-  boolean: boolean,
-  object: {
+  @summary("Equals (short form)")
+  equals: boolean,
+
+  @summary("Equals")
+  BooleanFieldEQFilter: {
     /** Value strictly equals the given boolean value. */
-    eq?: boolean,
+    eq: boolean,
   },
 }
 
@@ -43,28 +48,54 @@ union BooleanFieldFilter {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
-model NumericFieldFilter {
-  /** Value strictly equals the given numeric value. */
-  eq?: float64;
+@oneOf
+@summary("Numeric Field Filter")
+union NumericFieldFilter {
+  @summary("Equals (short form)")
+  equals: float64,
+
+  @summary("Equals")
+  NumericFieldEQFilter: {
+    /** Value strictly equals the given numeric value. */
+    eq: float64,
+  },
 
-  /** Value does not equal the given numeric value. */
-  neq?: float64;
+  @summary("Not Equals")
+  NumericFieldNEQFilter: {
+    /** Value does not equal the given numeric value. */
+    neq: float64,
+  },
 
-  /** Returns entities that match any of the comma-delimited numeric values. */
-  @encode(ArrayEncoding.commaDelimited)
-  oeq?: float64[];
+  @summary("Equals one of")
+  NumericFieldOEQFilter: {
+    /** Returns entities that match any of the comma-delimited numeric values. */
+    @encode(ArrayEncoding.commaDelimited)
+    oeq: float64[],
+  },
 
-  /** Value is less than the given numeric value. */
-  lt?: float64;
+  @summary("Less Than")
+  NumericFieldLTFilter: {
+    /** Value is less than the given numeric value. */
+    lt: float64,
+  },
 
-  /** Value is less than or equal to the given numeric value. */
-  lte?: float64;
+  @summary("Less Than or Equal To")
+  NumericFieldLTEFilter: {
+    /** Value is less than or equal to the given numeric value. */
+    lte: float64,
+  },
 
-  /** Value is greater than the given numeric value. */
-  gt?: float64;
+  @summary("Greater Than")
+  NumericFieldGTFilter: {
+    /** Value is greater than the given numeric value. */
+    gt: float64,
+  },
 
-  /** Value is greater than or equal to the given numeric value. */
-  gte?: float64;
+  @summary("Greater Than or Equal To")
+  NumericFieldGTEFilter: {
+    /** Value is greater than or equal to the given numeric value. */
+    gte: float64,
+  },
 }
 
 /**
@@ -77,40 +108,72 @@ model NumericFieldFilter {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
+@oneOf
+@summary("String Field Filter")
 union StringFieldFilter {
-  string: string,
-  object: {
+  @summary("Equals (short form)")
+  equals: string,
+
+  @summary("Equals")
+  StringFieldEQFilter: {
     /** Value strictly equals the given string value. */
-    eq?: string,
+    eq: string,
+  },
 
+  @summary("Not Equals")
+  StringFieldNEQFilter: {
     /** Value does not equal the given string value. */
-    neq?: string,
+    neq: string,
+  },
 
+  @summary("Contains")
+  StringFieldContainsFilter: {
     /** Value contains the given string value (fuzzy match). */
-    contains?: string,
+    contains: string,
+  },
 
+  @summary("Contains one of")
+  StringFieldOContainsFilter: {
     /** Returns entities that fuzzy-match any of the comma-delimited phrases in the filter string. */
     @encode(ArrayEncoding.commaDelimited)
-    ocontains?: string[],
+    ocontains: string[],
+  },
 
+  @summary("Equals one of")
+  StringFieldOEQFilter: {
     /** Returns entities that exact match any of the comma-delimited phrases in the filter string. */
     @encode(ArrayEncoding.commaDelimited)
-    oeq?: string[],
+    oeq: string[],
+  },
 
+  @summary("Greater Than")
+  StringFieldGTFilter: {
     /** Value is greater than the given string value (lexicographic compare). */
-    gt?: string,
+    gt: string,
+  },
 
+  @summary("Greater Than or Equal To")
+  StringFieldGTEFilter: {
     /** Value is greater than or equal to the given string value (lexicographic compare). */
-    gte?: string,
+    gte: string,
+  },
 
+  @summary("Less Than")
+  StringFieldLTFilter: {
     /** Value is less than the given string value (lexicographic compare). */
-    lt?: string,
+    lt: string,
+  },
 
+  @summary("Less Than or Equal To")
+  StringFieldLTEFilter: {
     /** Value is less than or equal to the given string value (lexicographic compare). */
-    lte?: string,
+    lte: string,
+  },
 
+  @summary("Exists")
+  StringFieldExistsFilter: {
     /** When true, the field must be present (non-null); when false, the field must be absent (null). */
-    exists?: boolean,
+    exists: boolean,
   },
 }
 
@@ -124,16 +187,30 @@ union StringFieldFilter {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
-model StringFieldFilterExact {
-  /** Value strictly equals the given string value. */
-  eq?: string;
+@oneOf
+@summary("String Field Filter Exact")
+union StringFieldFilterExact {
+  @summary("Equals (short form)")
+  equals: string,
+
+  @summary("Equals")
+  StringFieldEQFilter: {
+    /** Value strictly equals the given string value. */
+    eq: string,
+  },
 
-  /** Returns entities that exact match any of the comma-delimited phrases in the filter string. */
-  @encode(ArrayEncoding.commaDelimited)
-  oeq?: string[];
+  @summary("Equals one of")
+  StringFieldOEQFilter: {
+    /** Returns entities that exact match any of the comma-delimited phrases in the filter string. */
+    @encode(ArrayEncoding.commaDelimited)
+    oeq: string[],
+  },
 
-  /** Value does not equal the given string value. */
-  neq?: string;
+  @summary("Not Equals")
+  StringFieldNEQFilter: {
+    /** Value does not equal the given string value. */
+    neq: string,
+  },
 }
 
 /**
@@ -146,18 +223,29 @@ model StringFieldFilterExact {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
+@oneOf
+@summary("ULID Field Filter")
 union ULIDFieldFilter {
-  string: Shared.ULID,
-  object: {
-    /** Value strictly equals the given ULID value. */
-    eq?: Shared.ULID,
+  @summary("Equals (short form)")
+  equals: Shared.ULID,
 
-    /** Value does not equal the given ULID value. */
-    neq?: Shared.ULID,
+  @summary("Equals")
+  ULIDFieldEQFilter: {
+    /** Value strictly equals the given ULID value. */
+    eq: Shared.ULID,
+  },
 
+  @summary("Equals one of")
+  ULIDFieldOEQFilter: {
     /** Returns entities that exact match any of the comma-delimited ULIDs in the filter string. */
     @encode(ArrayEncoding.commaDelimited)
-    oeq?: Shared.ULID[],
+    oeq: Shared.ULID[],
+  },
+
+  @summary("Not Equals")
+  ULIDFieldNEQFilter: {
+    /** Value does not equal the given ULID value. */
+    neq: Shared.ULID,
   },
 }
 
@@ -171,23 +259,40 @@ union ULIDFieldFilter {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
+@oneOf
+@summary("DateTime Field Filter")
 union DateTimeFieldFilter {
-  string: string,
-  object: {
+  @summary("Equals (short form)")
+  equals: Shared.DateTime,
+
+  @summary("Equals")
+  DateTimeFieldEQFilter: {
     /** Value strictly equals given RFC-3339 formatted timestamp in UTC. */
-    eq?: Shared.DateTime,
+    eq: Shared.DateTime,
+  },
 
+  @summary("Less Than")
+  DateTimeFieldLTFilter: {
     /** Value is less than the given RFC-3339 formatted timestamp in UTC. */
-    lt?: Shared.DateTime,
+    lt: Shared.DateTime,
+  },
 
+  @summary("Less Than or Equal To")
+  DateTimeFieldLTEFilter: {
     /** Value is less than or equal to the given RFC-3339 formatted timestamp in UTC. */
-    lte?: Shared.DateTime,
+    lte: Shared.DateTime,
+  },
 
+  @summary("Greater Than")
+  DateTimeFieldGTFilter: {
     /** Value is greater than the given RFC-3339 formatted timestamp in UTC. */
-    gt?: Shared.DateTime,
+    gt: Shared.DateTime,
+  },
 
+  @summary("Greater Than or Equal To")
+  DateTimeFieldGTEFilter: {
     /** Value is greater than or equal to the given RFC-3339 formatted timestamp in UTC. */
-    gte?: Shared.DateTime,
+    gte: Shared.DateTime,
   },
 }
 
@@ -200,24 +305,41 @@ union DateTimeFieldFilter {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
+@oneOf
+@summary("Labels Field Filter")
 union LabelsFieldFilter {
-  string: string,
-  object: {
+  @summary("Equals (short form)")
+  equals: string,
+
+  @summary("Equals")
+  LabelsFieldEqualsFilter: {
     /** Value strictly equals the given string value. */
-    eq?: string,
+    eq: string,
+  },
 
+  @summary("Contains")
+  LabelsFieldContainsFilter: {
     /** Value contains the given string value (fuzzy match). */
-    contains?: string,
+    contains: string,
+  },
 
+  @summary("Contains one of")
+  LabelsFieldOContainsFilter: {
     /** Returns entities that fuzzy-match any of the comma-delimited phrases in the filter string. */
     @encode(ArrayEncoding.commaDelimited)
-    ocontains?: string[],
+    ocontains: string[],
+  },
 
+  @summary("Equals one of")
+  LabelsFieldOEQFilter: {
     /** Returns entities that exact match any of the comma-delimited phrases in the filter string. */
     @encode(ArrayEncoding.commaDelimited)
-    oeq?: string[],
+    oeq: string[],
+  },
 
+  @summary("Not Equals")
+  LabelsFieldNEQFilter: {
     /** Value does not equal the given string value. */
-    neq?: string,
+    neq: string,
   },
 }

api/spec/packages/aip/src/main.tsp

@@ -1,2 +1,3 @@
 import "./openmeter.tsp";
 import "./konnect.tsp";
+import "./test.tsp";