effect-qb 0.16.0 → 0.17.0

package/src/internal/json/types.ts

@@ -63,6 +63,23 @@ type TupleIndex<
     : TupleIndex<Tail, Index, [...Count, unknown]>
   : never
 
+type TupleIndexFromEnd<
+  Values extends readonly unknown[],
+  Distance extends number,
+  Count extends readonly unknown[] = [unknown]
+> = Values extends readonly [...infer Rest, infer Last]
+  ? Count["length"] extends Distance
+    ? Last
+    : TupleIndexFromEnd<Rest, Distance, [...Count, unknown]>
+  : never
+
+type TupleIndexAt<
+  Values extends readonly unknown[],
+  Index extends number
+> = `${Index}` extends `-${infer Distance extends number}`
+  ? TupleIndexFromEnd<Values, Distance>
+  : TupleIndex<Values, Index>
+
 type DropTupleIndex<
   Values extends readonly unknown[],
   Index extends number,
@@ -73,6 +90,23 @@ type DropTupleIndex<
     : readonly [Head, ...DropTupleIndex<Tail, Index, [...Count, unknown]>]
   : readonly []
 
+type DropTupleIndexFromEnd<
+  Values extends readonly unknown[],
+  Distance extends number,
+  Count extends readonly unknown[] = [unknown]
+> = Values extends readonly [...infer Rest, infer Last]
+  ? Count["length"] extends Distance
+    ? readonly [...Rest]
+    : readonly [...DropTupleIndexFromEnd<Rest, Distance, [...Count, unknown]>, Last]
+  : readonly []
+
+type DropTupleIndexAt<
+  Values extends readonly unknown[],
+  Index extends number
+> = `${Index}` extends `-${infer Distance extends number}`
+  ? DropTupleIndexFromEnd<Values, Distance>
+  : DropTupleIndex<Values, Index>
+
 type SetTupleIndex<
   Values extends readonly unknown[],
   Index extends number,
@@ -84,6 +118,25 @@ type SetTupleIndex<
     : readonly [Head, ...SetTupleIndex<Tail, Index, Next, [...Count, unknown]>]
   : readonly NormalizeJsonLiteral<Next>[]
 
+type SetTupleIndexFromEnd<
+  Values extends readonly unknown[],
+  Distance extends number,
+  Next,
+  Count extends readonly unknown[] = [unknown]
+> = Values extends readonly [...infer Rest, infer Last]
+  ? Count["length"] extends Distance
+    ? readonly [...Rest, NormalizeJsonLiteral<Next>]
+    : readonly [...SetTupleIndexFromEnd<Rest, Distance, Next, [...Count, unknown]>, Last]
+  : readonly NormalizeJsonLiteral<Next>[]
+
+type SetTupleIndexAt<
+  Values extends readonly unknown[],
+  Index extends number,
+  Next
+> = `${Index}` extends `-${infer Distance extends number}`
+  ? SetTupleIndexFromEnd<Values, Distance, Next>
+  : SetTupleIndex<Values, Index, Next>
+
 type InsertTupleIndex<
   Values extends readonly unknown[],
   Index extends number,
@@ -98,6 +151,29 @@ type InsertTupleIndex<
     : readonly [Head, ...InsertTupleIndex<Tail, Index, Next, After, [...Count, unknown]>]
   : readonly NormalizeJsonLiteral<Next>[]
 
+type InsertTupleIndexFromEnd<
+  Values extends readonly unknown[],
+  Distance extends number,
+  Next,
+  After extends boolean,
+  Count extends readonly unknown[] = [unknown]
+> = Values extends readonly [...infer Rest, infer Last]
+  ? Count["length"] extends Distance
+    ? After extends true
+      ? readonly [...Rest, Last, NormalizeJsonLiteral<Next>]
+      : readonly [...Rest, NormalizeJsonLiteral<Next>, Last]
+    : readonly [...InsertTupleIndexFromEnd<Rest, Distance, Next, After, [...Count, unknown]>, Last]
+  : readonly NormalizeJsonLiteral<Next>[]
+
+type InsertTupleIndexAt<
+  Values extends readonly unknown[],
+  Index extends number,
+  Next,
+  After extends boolean
+> = `${Index}` extends `-${infer Distance extends number}`
+  ? InsertTupleIndexFromEnd<Values, Distance, Next, After>
+  : InsertTupleIndex<Values, Index, Next, After>
+
 type IndexStep<
   Root,
   Index extends number,
@@ -105,7 +181,7 @@ type IndexStep<
 > = Root extends readonly unknown[]
   ? number extends Root["length"]
     ? NormalizeJsonLiteral<Root[number]> | null
-    : NormalizeJsonLiteral<TupleIndex<Root, Index>> | (TupleIndex<Root, Index> extends never ? null : never)
+    : NormalizeJsonLiteral<TupleIndexAt<Root, Index>> | (TupleIndexAt<Root, Index> extends never ? null : never)
   : JsonPathUsageError<Operation, Root, JsonPath.IndexSegment<Index>, "index segments require an array-like json value">
 
 type NonExactStep<
@@ -146,9 +222,9 @@ type StepSet<
     ? Root extends readonly unknown[]
       ? number extends Root["length"]
         ? readonly (NormalizeJsonLiteral<Root[number]> | NormalizeJsonLiteral<Next>)[]
-        : SetTupleIndex<Root, Index, Next>
+        : SetTupleIndexAt<Root, Index, Next>
       : JsonPathUsageError<Operation, Root, Segment, "index segments require an array-like json value">
-    : NormalizeJsonLiteral<Root>
+    : JsonPathUsageError<Operation, Root, Segment, "mutation paths require exact key/index segments">
 
 type StepDelete<
   Root,
@@ -164,9 +240,9 @@ type StepDelete<
     ? Root extends readonly unknown[]
       ? number extends Root["length"]
         ? Root
-        : DropTupleIndex<Root, Index>
+        : DropTupleIndexAt<Root, Index>
       : JsonPathUsageError<Operation, Root, Segment, "index segments require an array-like json value">
-    : NormalizeJsonLiteral<Root>
+    : JsonPathUsageError<Operation, Root, Segment, "mutation paths require exact key/index segments">
 
 type StepInsert<
   Root,
@@ -178,7 +254,7 @@ type StepInsert<
   ? Root extends readonly unknown[]
     ? number extends Root["length"]
       ? readonly (NormalizeJsonLiteral<Root[number]> | NormalizeJsonLiteral<Next>)[]
-      : InsertTupleIndex<Root, Index, Next, After>
+      : InsertTupleIndexAt<Root, Index, Next, After>
     : JsonPathUsageError<Operation, Root, Segment, "index segments require an array-like json value">
   : Segment extends JsonPath.KeySegment<infer Key extends string>
     ? Root extends readonly unknown[]
@@ -190,7 +266,7 @@ type StepInsert<
               readonly [K in Key]: NormalizeJsonLiteral<Next>
             }
         : JsonPathUsageError<Operation, Root, Segment, "key segments require an object-like json value">
-    : NormalizeJsonLiteral<Root>
+    : JsonPathUsageError<Operation, Root, Segment, "mutation paths require exact key/index segments">
 
 type RecurseValue<
   Current,
@@ -219,12 +295,16 @@ type RecurseSet<
     : StepValue<Current, Head, Operation> extends infer Child
       ? Child extends JsonPathUsageError<any, any, any, any>
         ? Child
-        : StepSet<
-            Current,
-            Head,
-            RecurseSet<StripNull<Child>, Tail, Next, Operation>,
-            Operation
-          >
+        : RecurseSet<StripNull<Child>, Tail, Next, Operation> extends infer UpdatedChild
+          ? UpdatedChild extends JsonPathUsageError<any, any, any, any>
+            ? UpdatedChild
+            : StepSet<
+                Current,
+                Head,
+                UpdatedChild,
+                Operation
+              >
+          : never
       : never
   : NormalizeJsonLiteral<Next>
 
@@ -238,12 +318,16 @@ type RecurseDelete<
     : StepValue<Current, Head, Operation> extends infer Child
       ? Child extends JsonPathUsageError<any, any, any, any>
         ? Child
-        : StepSet<
-            Current,
-            Head,
-            RecurseDelete<StripNull<Child>, Tail, Operation>,
-            Operation
-          >
+        : RecurseDelete<StripNull<Child>, Tail, Operation> extends infer UpdatedChild
+          ? UpdatedChild extends JsonPathUsageError<any, any, any, any>
+            ? UpdatedChild
+            : StepSet<
+                Current,
+                Head,
+                UpdatedChild,
+                Operation
+              >
+          : never
       : never
   : NormalizeJsonLiteral<Current>
 
@@ -259,12 +343,16 @@ type RecurseInsert<
     : StepValue<Current, Head, Operation> extends infer Child
       ? Child extends JsonPathUsageError<any, any, any, any>
         ? Child
-        : StepSet<
-            Current,
-            Head,
-            RecurseInsert<StripNull<Child>, Tail, Next, After, Operation>,
-            Operation
-          >
+        : RecurseInsert<StripNull<Child>, Tail, Next, After, Operation> extends infer UpdatedChild
+          ? UpdatedChild extends JsonPathUsageError<any, any, any, any>
+            ? UpdatedChild
+            : StepSet<
+                Current,
+                Head,
+                UpdatedChild,
+                Operation
+              >
+          : never
       : never
   : NormalizeJsonLiteral<Current>
 
@@ -364,23 +452,50 @@ export type JsonBuildArray<
 
 export type JsonTextResult<Value> = Value extends JsonPrimitive ? `${Value}` : string
 
-export type JsonTypeName<Value> =
-  NormalizeJsonLiteral<Value> extends null ? "null"
-    : NormalizeJsonLiteral<Value> extends string ? "string"
-      : NormalizeJsonLiteral<Value> extends number ? "number"
-        : NormalizeJsonLiteral<Value> extends boolean ? "boolean"
-          : NormalizeJsonLiteral<Value> extends readonly unknown[] ? "array"
-            : NormalizeJsonLiteral<Value> extends object ? "object"
+type JsonTypeNameOfNormalized<Value> =
+  Value extends null ? "null"
+    : Value extends string ? "string"
+      : Value extends number ? "number"
+        : Value extends boolean ? "boolean"
+          : Value extends readonly unknown[] ? "array"
+            : Value extends object ? "object"
               : "unknown"
 
-export type JsonLengthResult<Value> =
-  NormalizeJsonLiteral<Value> extends readonly unknown[] ? number :
-    NormalizeJsonLiteral<Value> extends object ? number :
+export type JsonTypeName<Value> =
+  [NormalizeJsonLiteral<Value>] extends [never]
+    ? "unknown"
+    : NormalizeJsonLiteral<Value> extends infer Normalized
+      ? Normalized extends unknown
+        ? JsonTypeNameOfNormalized<Normalized>
+        : never
+      : never
+
+type JsonLengthResultOfNormalized<Value> =
+  Value extends readonly unknown[] ? number :
+    Value extends object ? number :
       null
 
+export type JsonLengthResult<Value> =
+  [NormalizeJsonLiteral<Value>] extends [never]
+    ? null
+    : NormalizeJsonLiteral<Value> extends infer Normalized
+      ? Normalized extends unknown
+        ? JsonLengthResultOfNormalized<Normalized>
+        : never
+      : never
+
+type JsonKeysResultOfNormalized<Value> =
+  Value extends readonly unknown[]
+    ? null
+    : Value extends object
+      ? readonly Extract<keyof Value, string>[]
+      : null
+
 export type JsonKeysResult<Value> =
-  NormalizeJsonLiteral<Value> extends object
-    ? NormalizeJsonLiteral<Value> extends readonly unknown[]
-      ? readonly []
-      : readonly Extract<keyof NormalizeJsonLiteral<Value>, string>[]
-    : null
+  [NormalizeJsonLiteral<Value>] extends [never]
+    ? null
+    : NormalizeJsonLiteral<Value> extends infer Normalized
+      ? Normalized extends unknown
+        ? JsonKeysResultOfNormalized<Normalized>
+        : never
+      : never

package/src/internal/predicate/context.ts

@@ -46,7 +46,20 @@ type Frame<
   readonly polarity: Direction
 }
 
-type SourceNameOfKey<Key extends string> = Key extends `${infer SourceName}.${string}` ? SourceName : never
+type SourceNameOfKey<
+  Key extends string,
+  Current extends string = ""
+> = string extends Key
+  ? string
+  : Key extends `\\.${infer Rest}`
+    ? SourceNameOfKey<Rest, `${Current}.`>
+    : Key extends `\\\\${infer Rest}`
+      ? SourceNameOfKey<Rest, `${Current}\\`>
+      : Key extends `.${string}`
+        ? Current
+        : Key extends `${infer Character}${infer Rest}`
+          ? SourceNameOfKey<Rest, `${Current}${Character}`>
+          : never
 
 type EqLiteralValueOf<
   EqLiterals,

package/src/internal/predicate/key.ts

@@ -2,10 +2,27 @@ import type * as Expression from "../scalar.js"
 import type * as ExpressionAst from "../expression-ast.js"
 import type * as JsonPath from "../json/path.js"
 
+type EscapePredicateBackslashes<Value extends string> = string extends Value
+  ? string
+  : Value extends `${infer Head}\\${infer Tail}`
+    ? `${Head}\\\\${EscapePredicateBackslashes<Tail>}`
+    : Value
+
+type EscapePredicateDots<Value extends string> = string extends Value
+  ? string
+  : Value extends `${infer Head}.${infer Tail}`
+    ? `${Head}\\.${EscapePredicateDots<Tail>}`
+    : Value
+
+type EscapePredicateSegment<Value extends string> =
+  EscapePredicateDots<EscapePredicateBackslashes<Value>>
+
+type EscapeJsonPathSegment<Value extends string> = EscapePredicateSegment<Value>
+
 export type ColumnKey<
   TableName extends string,
   ColumnName extends string
-> = `${TableName}.${ColumnName}`
+> = `${EscapePredicateSegment<TableName>}.${EscapePredicateSegment<ColumnName>}`
 
 export type ColumnKeyOfAst<Ast extends ExpressionAst.Any> =
   [Ast] extends [ExpressionAst.ColumnNode<infer TableName extends string, infer ColumnName extends string>]
@@ -25,7 +42,7 @@ type JsonPathKey<
     ? Segment extends JsonPath.KeySegment<infer Key extends string>
       ? JsonPathKey<
           Tail,
-          [Current] extends [never] ? Key : `${Current}.${Key}`,
+          [Current] extends [never] ? EscapeJsonPathSegment<Key> : `${Current}.${EscapeJsonPathSegment<Key>}`,
           readonly [...Seen, unknown]
         >
       : never

package/src/internal/predicate/runtime.ts

@@ -98,7 +98,26 @@ const cloneContext = (context: MutableContext): MutableContext => ({
 
 const freezeContext = (context: MutableContext): RuntimeContext => context
 
-const sourceNameOfKey = (key: string): string => key.split(".", 1)[0] ?? key
+export const columnPredicateKey = (tableName: string, columnName: string): string =>
+  JSON.stringify([tableName, columnName])
+
+const columnPredicateKeyParts = (key: string): readonly [string, string] | undefined => {
+  const jsonSeparator = key.indexOf("#json:")
+  const columnKey = jsonSeparator === -1 ? key : key.slice(0, jsonSeparator)
+  try {
+    const parsed = JSON.parse(columnKey) as unknown
+    return Array.isArray(parsed) &&
+      parsed.length === 2 &&
+      typeof parsed[0] === "string" &&
+      typeof parsed[1] === "string"
+      ? [parsed[0], parsed[1]]
+      : undefined
+  } catch {
+    return undefined
+  }
+}
+
+const sourceNameOfKey = (key: string): string => columnPredicateKeyParts(key)?.[0] ?? key.split(".", 1)[0] ?? key
 
 const addSourceName = (context: MutableContext, key: string): void => {
   context.sourceNames.add(sourceNameOfKey(key))
@@ -386,12 +405,15 @@ const astOf = (value: Expression.Any): ExpressionAst.Any =>
 
 const columnKeyOfExpression = (value: Expression.Any): string | undefined => {
   const ast = astOf(value)
-  return ast.kind === "column" ? `${ast.tableName}.${ast.columnName}` : undefined
+  return ast.kind === "column" ? columnPredicateKey(ast.tableName, ast.columnName) : undefined
 }
 
 const sameDbType = (left: Expression.DbType.Any, right: Expression.DbType.Any): boolean =>
   left.dialect === right.dialect && left.kind === right.kind
 
+const escapeJsonPathPredicateKeySegment = (value: string): string =>
+  value.replaceAll("\\", "\\\\").replaceAll(".", "\\.")
+
 const jsonPathPredicateKeyOfExpression = (value: Expression.Any): string | undefined => {
   const ast = astOf(value)
   switch (ast.kind) {
@@ -415,7 +437,9 @@ const jsonPathPredicateKeyOfExpression = (value: Expression.Any): string | undef
         return undefined
       }
       const baseKey = columnKeyOfExpression(jsonAst.base)
-      return baseKey === undefined ? undefined : `${baseKey}#json:${path.join(".")}`
+      return baseKey === undefined
+        ? undefined
+        : `${baseKey}#json:${path.map(escapeJsonPathPredicateKeySegment).join(".")}`
     }
     default:
       return undefined