@vibeorm/dsl 3.0.0 → 4.0.0

package/dist/types.d.ts

@@ -5,7 +5,7 @@
  * through `defineRelations` (Drizzle-style), which keeps column references
  * type-safe without inference-heavy model types.
  */
-import type { ExclusionSpec, ExclusionEndpoint, CascadeAction, EnumStorage, ExtensionAttributeValue, PredicateIR, Provider, QualifiedSqlName, RlsContextIR, RlsContextRefIR, RlsPolicyIR } from "@vibeorm/schema";
+import type { ExclusionSpec, ExclusionEndpoint, CascadeAction, EnumStorage, JsonSchemaRefIR, ExtensionAttributeValue, PredicateExpression, PredicateIR, Provider, QualifiedSqlName, RlsContextIR, RlsContextRefIR, RlsPolicyIR } from "@vibeorm/schema";
 import type { ChainableEnumColumn } from "./column.ts";
 /** Referential actions, re-exported from the IR so both sources agree. */
 export type { CascadeAction };
@@ -74,6 +74,8 @@ export type DatetimeColumnConfig = BaseColumnConfig & {
 };
 export type JsonColumnConfig = BaseColumnConfig & {
     default?: unknown;
+    /** Consumer-owned named runtime validator export; serialized as data in SchemaIR. */
+    jsonSchema?: JsonSchemaRefIR;
 };
 export type IdColumnConfig = BaseColumnConfig & {
     type?: IdGeneratorType;
@@ -227,14 +229,14 @@ export type NamedCheckDef = {
     readonly predicate: PredicateIR;
 };
 /**
- * The `c` handed to a model's `checks` callback, returning named typed CHECKs.
+ * The `c` handed to a model's `checks` callback, returning typed or raw named CHECKs.
  *
  * @example
  * checks: (c) => [
  *   c.named("dispatch_clock", c.gt(c.field("deadlineAt"), c.field("startedAt"))),
  * ]
  */
-export type ChecksCallback<TColumns extends string = string, TSchema extends SchemaDefinition = SchemaDefinition> = (c: PredicateBuilder<TColumns, TSchema>) => NamedCheckDef[];
+export type ChecksCallback<TColumns extends string = string, TSchema extends SchemaDefinition = SchemaDefinition> = (c: PredicateBuilder<TColumns, TSchema>) => (NamedCheckDef | ModelCheckConfig)[];
 /**
  * Application-level row-scoping policy — the DSL twin of
  * `@@policy([field], context: "key")`. The runtime fails closed on policied
@@ -373,7 +375,14 @@ export type PredicateFieldExpr<TColumn extends string = string, TKind extends Co
  * use — because a foreign key and a comparison ask one question: are these two
  * columns the same scalar family?
  */
-type ComparisonOperand<TKind extends ColumnRefKind> = PredicateLiteralByRefKind[TKind] | PredicateFieldExpr<string, PairableRefKind[TKind]>;
+/** Typed scalar operand produced by the schema predicate builder. */
+export type PredicateExpr<TKind extends ColumnRefKind = ColumnRefKind> = PredicateExpression & {
+    readonly __kind: TKind;
+};
+type JsonPredicateColumns<TColumns extends string, TSchema extends SchemaDefinition> = {
+    [C in TColumns]: "Json" extends SchemaColumnRefKind<TSchema, C> ? C : never;
+}[TColumns];
+type ComparisonOperand<TKind extends ColumnRefKind> = PredicateLiteralByRefKind[TKind] | PredicateExpr<PairableRefKind[TKind]>;
 /**
  * The `c` handed to `checks` and to an index's `.where()`.
  *
@@ -389,12 +398,21 @@ type ComparisonOperand<TKind extends ColumnRefKind> = PredicateLiteralByRefKind[
 export type PredicateBuilder<TColumns extends string = string, TSchema extends SchemaDefinition = SchemaDefinition> = {
     /** Reference one of the model's own fields, by LOGICAL name. */
     field<C extends TColumns>(name: C): PredicateFieldExpr<C, SchemaColumnRefKind<TSchema, C>>;
-    eq<TKind extends ColumnRefKind>(left: PredicateFieldExpr<string, TKind>, right: ComparisonOperand<TKind>): PredicateIR;
-    ne<TKind extends ColumnRefKind>(left: PredicateFieldExpr<string, TKind>, right: ComparisonOperand<TKind>): PredicateIR;
-    gt<TKind extends ColumnRefKind>(left: PredicateFieldExpr<string, TKind>, right: ComparisonOperand<TKind>): PredicateIR;
-    gte<TKind extends ColumnRefKind>(left: PredicateFieldExpr<string, TKind>, right: ComparisonOperand<TKind>): PredicateIR;
-    lt<TKind extends ColumnRefKind>(left: PredicateFieldExpr<string, TKind>, right: ComparisonOperand<TKind>): PredicateIR;
-    lte<TKind extends ColumnRefKind>(left: PredicateFieldExpr<string, TKind>, right: ComparisonOperand<TKind>): PredicateIR;
+    eq<TKind extends ColumnRefKind>(left: PredicateExpr<TKind>, right: ComparisonOperand<NoInfer<TKind>>): PredicateIR;
+    ne<TKind extends ColumnRefKind>(left: PredicateExpr<TKind>, right: ComparisonOperand<NoInfer<TKind>>): PredicateIR;
+    gt<TKind extends ColumnRefKind>(left: PredicateExpr<TKind>, right: ComparisonOperand<NoInfer<TKind>>): PredicateIR;
+    gte<TKind extends ColumnRefKind>(left: PredicateExpr<TKind>, right: ComparisonOperand<NoInfer<TKind>>): PredicateIR;
+    lt<TKind extends ColumnRefKind>(left: PredicateExpr<TKind>, right: ComparisonOperand<NoInfer<TKind>>): PredicateIR;
+    lte<TKind extends ColumnRefKind>(left: PredicateExpr<TKind>, right: ComparisonOperand<NoInfer<TKind>>): PredicateIR;
+    /** PostgreSQL/PGlite CHECK only. Extract text without asserting the JSON leaf's type. */
+    jsonText(params: {
+        field: JsonPredicateColumns<TColumns, TSchema>;
+        path: readonly string[];
+    }): PredicateExpr<"String">;
+    /** PostgreSQL/PGlite CHECK only. Character length, preserving SQL NULL. */
+    length(expression: PredicateExpr<"String" | "Id">): PredicateExpr<"Int">;
+    /** PostgreSQL/PGlite CHECK only. Require TRUE; UNKNOWN becomes FALSE. */
+    isTrue(predicate: PredicateIR): PredicateIR;
     /** `col IN (…)`. Membership, not a set operation — every value is a literal. */
     inList<TKind extends ColumnRefKind>(field: PredicateFieldExpr<string, TKind>, values: readonly PredicateLiteralByRefKind[TKind][]): PredicateIR;
     /** `col NOT IN (…)`. NULL in the column stays UNKNOWN, as SQL defines it. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibeorm/dsl",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "TypeScript schema DSL for VibeORM v2 — compiles to canonical SchemaIR, with .prisma generation for interop",
   "keywords": [
     "orm",
@@ -43,8 +43,8 @@
     "bun": ">=1.2.0"
   },
   "dependencies": {
-    "@vibeorm/schema": "3.0.0",
-    "@vibeorm/sql": "3.0.0"
+    "@vibeorm/schema": "4.0.0",
+    "@vibeorm/sql": "4.0.0"
   },
   "publishConfig": {
     "access": "public"