effect-app 4.0.0-beta.99 → 4.0.1

package/src/Model/query/new-kid-interpreter.ts

@@ -0,0 +1,531 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { identity } from "effect/Function"
+import * as Array from "../../Array.ts"
+import * as Option from "../../Option.ts"
+import * as S from "../../Schema.ts"
+import * as SchemaAST from "../../SchemaAST.ts"
+import { dropUndefinedT } from "../../utils.ts"
+import type { FilterResult } from "../filter/filterApi.ts"
+import type { FieldValues } from "../filter/types.ts"
+import type { FieldPath } from "../filter/types/path/eager.ts"
+import { make, type Q, type QAll } from "../query/dsl.ts"
+
+export type AggregateIrExpression =
+  | { readonly _tag: "agg-count" }
+  | { readonly _tag: "agg-count-when"; readonly filter: readonly FilterResult[] }
+  | { readonly _tag: "agg-sum"; readonly field: string }
+  | { readonly _tag: "agg-min"; readonly field: string }
+  | { readonly _tag: "agg-max"; readonly field: string }
+
+export type AggregateIrItem =
+  | AggregateIrExpression
+  | { readonly _tag: "agg-field"; readonly path: string }
+
+export type ComputedProjectionMathIrExpression =
+  | {
+    readonly _tag: "field"
+    readonly field: string
+  }
+  | {
+    readonly _tag: "mul"
+    readonly left: ComputedProjectionMathIrExpression
+    readonly right: ComputedProjectionMathIrExpression
+  }
+
+export type ComputedProjectionIrExpression =
+  | {
+    readonly _tag: "relation-count"
+    readonly path: string
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-any"
+    readonly path: string
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-every"
+    readonly path: string
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-distinct-count"
+    readonly path: string
+    readonly field: string
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-sum"
+    readonly path: string
+    readonly field: string
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-sum-expr"
+    readonly path: string
+    readonly expression: ComputedProjectionMathIrExpression
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-sum-expr-by"
+    readonly path: string
+    readonly expression: ComputedProjectionMathIrExpression
+    readonly unit: string
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-sum-expr-normalized"
+    readonly path: string
+    readonly expression: ComputedProjectionMathIrExpression
+    readonly unit: string
+    readonly toBase: string
+    readonly factors: Readonly<Record<string, number>>
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-collect"
+    readonly path: string
+    readonly field: string
+    readonly distinct: boolean
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-collect-fields"
+    readonly path: string
+    readonly fields: readonly string[]
+    readonly distinct: boolean
+    readonly filter: readonly FilterResult[]
+  }
+  | {
+    readonly _tag: "relation-length"
+    readonly path: string
+  }
+
+type SelectItem<TFieldValues extends FieldValues> =
+  | keyof TFieldValues
+  | { key: string; subKeys: string[] }
+  | {
+    key: string
+    computed: ComputedProjectionIrExpression
+  }
+
+const isArraySelect = <TFieldValues extends FieldValues>(
+  item: SelectItem<TFieldValues>
+): item is { key: string; subKeys: string[] } => typeof item === "object" && item !== null && "subKeys" in item
+
+const mergeArraySelect = <TFieldValues extends FieldValues>(
+  select: SelectItem<TFieldValues>[],
+  arraySelect: { key: string; subKeys: string[] }
+) => {
+  const subKeys = [...new Set(arraySelect.subKeys)]
+  const existing = select.find(
+    (item): item is { key: string; subKeys: string[] } => isArraySelect(item) && item.key === arraySelect.key
+  )
+
+  if (existing) {
+    const existingIndex = select.indexOf(existing)
+    select[existingIndex] = {
+      key: arraySelect.key,
+      subKeys: [...new Set([...existing.subKeys, ...subKeys])]
+    }
+  } else {
+    select.push({ key: arraySelect.key, subKeys })
+  }
+
+  const scalarIndex = select.findIndex((item) => item === arraySelect.key)
+  if (scalarIndex >= 0) {
+    select.splice(scalarIndex, 1)
+  }
+}
+
+type Result<TFieldValues extends FieldValues, A = TFieldValues, R = never> = {
+  filter: FilterResult[]
+  schema: S.Codec<A, TFieldValues, R> | undefined
+  limit: number | undefined
+  skip: number | undefined
+  order: { key: FieldPath<TFieldValues>; direction: "ASC" | "DESC" }[]
+  ttype: "one" | "many" | "count" | undefined
+  mode: "collect" | "project" | "transform" | "aggregate" | undefined
+  computed: Record<string, ComputedProjectionIrExpression> | undefined
+  aggregateMap: Record<string, AggregateIrItem> | undefined
+}
+
+const interpret = <
+  TFieldValues extends FieldValues,
+  TFieldValuesRefined extends TFieldValues = TFieldValues,
+  A = TFieldValues,
+  R = never
+>(_: QAll<TFieldValues, TFieldValuesRefined, A, R>) => {
+  const a = _ as Q<TFieldValues>
+
+  const data: Result<TFieldValues, any, any> = {
+    filter: [],
+    schema: undefined,
+    limit: undefined,
+    skip: undefined,
+    order: [],
+    ttype: undefined,
+    mode: undefined,
+    computed: undefined,
+    aggregateMap: undefined
+  }
+
+  const upd = (
+    v: Result<TFieldValues, any, any>
+  ) => {
+    data.filter.push(...v.filter)
+    data.order.push(...v.order)
+    if (v.limit !== undefined) data.limit = v.limit
+    if (v.skip !== undefined) data.skip = v.skip
+    if (v.ttype !== undefined) data.ttype = v.ttype
+    if (v.schema !== undefined) data.schema = v.schema
+    if (v.mode !== undefined) data.mode = v.mode
+    if (v.computed !== undefined) data.computed = v.computed
+    if (v.aggregateMap !== undefined) data.aggregateMap = v.aggregateMap
+  }
+
+  const applyPath = (path: string) => (_: FilterResult): FilterResult =>
+    _.t === "where" || _.t === "and" || _.t === "or"
+      ? { ..._, path: `${path}.-1.${_.path}` }
+      : { ..._, result: _.result.map(applyPath(path)) }
+
+  switch (a._tag) {
+    case "value":
+      break
+    case "where": {
+      const { current, operation, relation, subPath } = a
+      upd(interpret(current))
+      if (typeof operation === "function") {
+        data.filter.push(
+          {
+            t: "where-scope",
+            result: interpret(operation(make())).filter.map(subPath ? applyPath(subPath) : identity),
+            relation
+          }
+        )
+      } else {
+        data.filter.push(
+          {
+            t: "where",
+            path: operation[0],
+            op: operation.length === 2 ? "eq" : operation[1],
+            value: operation.length === 2 ? operation[1] : operation[2]
+          }
+        )
+      }
+      break
+    }
+    case "and": {
+      const { current, operation, relation } = a
+      upd(interpret(current))
+      if (typeof operation === "function") {
+        data.filter.push(
+          { t: "and-scope", result: interpret(operation(make())).filter, relation }
+        )
+      } else {
+        data.filter.push(
+          {
+            t: "and",
+            path: operation[0],
+            op: operation.length === 2 ? "eq" : operation[1],
+            value: operation.length === 2 ? operation[1] : operation[2]
+          }
+        )
+      }
+      break
+    }
+    case "or": {
+      const { current, operation, relation } = a
+      upd(interpret(current))
+      if (typeof operation === "function") {
+        data.filter.push(
+          { t: "or-scope", result: interpret(operation(make())).filter, relation }
+        )
+      } else {
+        data.filter.push(
+          {
+            t: "or",
+            path: operation[0],
+            op: operation.length === 2 ? "eq" : operation[1],
+            value: operation.length === 2 ? operation[1] : operation[2]
+          }
+        )
+      }
+      break
+    }
+    case "one": {
+      upd(interpret(a.current))
+      data.limit = 1
+      data.ttype = "one"
+      break
+    }
+    case "count": {
+      upd(interpret(a.current))
+      data.ttype = "count"
+      data.schema = S.Struct({ id: S.String }) as any
+      break
+    }
+    case "order": {
+      upd(interpret(a.current))
+      data.order.push({ key: a.field, direction: a.direction })
+      break
+    }
+    case "page": {
+      upd(interpret(a.current))
+      data.limit = a.take
+      data.skip = a.skip
+      break
+    }
+    case "project": {
+      upd(interpret(a.current))
+      if (a.mode === "aggregate" && a.aggregateMap) {
+        data.schema = a.schema
+        data.mode = "aggregate"
+        data.aggregateMap = Object.fromEntries(
+          Object.entries(a.aggregateMap).map(([key, expression]) => {
+            switch (expression._tag) {
+              case "agg-field":
+                return [key, { _tag: "agg-field" as const, path: expression.path }]
+              case "agg-count":
+                return [key, { _tag: "agg-count" as const }]
+              case "agg-count-when": {
+                const filter = interpret(expression.operation(make())).filter
+                return [key, { _tag: "agg-count-when" as const, filter }]
+              }
+              case "agg-sum":
+                return [key, { _tag: "agg-sum" as const, field: expression.field }]
+              case "agg-min":
+                return [key, { _tag: "agg-min" as const, field: expression.field }]
+              case "agg-max":
+                return [key, { _tag: "agg-max" as const, field: expression.field }]
+            }
+          })
+        )
+        break
+      }
+      if (a.computed && a.mode === "transform") {
+        throw new Error("Computed projections require mode 'project' or 'collect', not 'transform'")
+      }
+      data.schema = a.schema
+      data.mode = a.computed
+        ? a.mode === "collect" ? "collect" : "project"
+        : a.mode
+      data.computed = a.computed
+        ? Object.fromEntries(
+          Object.entries(a.computed).map(([key, expression]) => {
+            const e = expression
+            const op = "operation" in e ? e.operation : undefined
+            const filter = op ? interpret(op(make())).filter.map(applyPath(e.path)) : []
+            switch (e._tag) {
+              case "relation-count":
+              case "relation-any":
+              case "relation-every":
+                return [key, { _tag: e._tag, path: e.path, filter }]
+              case "relation-distinct-count":
+              case "relation-sum":
+                return [
+                  key,
+                  { _tag: e._tag, path: e.path, field: e.field, filter }
+                ]
+              case "relation-sum-expr":
+                return [
+                  key,
+                  { _tag: e._tag, path: e.path, expression: e.expression, filter }
+                ]
+              case "relation-sum-expr-by":
+                return [
+                  key,
+                  {
+                    _tag: e._tag,
+                    path: e.path,
+                    expression: e.expression,
+                    unit: e.unit,
+                    filter
+                  }
+                ]
+              case "relation-sum-expr-normalized":
+                return [
+                  key,
+                  {
+                    _tag: e._tag,
+                    path: e.path,
+                    expression: e.expression,
+                    unit: e.unit,
+                    toBase: e.toBase,
+                    factors: e.factors,
+                    filter
+                  }
+                ]
+              case "relation-collect":
+                return [
+                  key,
+                  {
+                    _tag: e._tag,
+                    path: e.path,
+                    field: e.field,
+                    distinct: e.distinct,
+                    filter
+                  }
+                ]
+              case "relation-collect-fields":
+                return [
+                  key,
+                  {
+                    _tag: e._tag,
+                    path: e.path,
+                    fields: e.fields,
+                    distinct: e.distinct,
+                    filter
+                  }
+                ]
+              case "relation-length":
+                return [key, { _tag: e._tag, path: e.path }]
+            }
+          })
+        )
+        : undefined
+      break
+    }
+  }
+
+  return data
+}
+
+const walkTransformation = (t: S.AST.AST): S.AST.AST => {
+  if (S.AST.isDeclaration(t) && t.typeParameters.length > 0) {
+    return walkTransformation(t.typeParameters[0]!)
+  }
+  return t
+}
+
+const objectAsts = (ast: S.AST.AST): readonly S.AST.Objects[] => {
+  const t = walkTransformation(ast)
+  if (S.AST.isObjects(t)) {
+    return [t]
+  }
+  if (S.AST.isUnion(t)) {
+    return t.types.flatMap(objectAsts)
+  }
+  return []
+}
+
+const objectKeys = (ast: S.AST.AST): readonly string[] => [
+  ...new Set(objectAsts(ast).flatMap((object) => object.propertySignatures.map((_) => _.name as string)))
+]
+
+export const toFilter = <
+  TFieldValues extends FieldValues,
+  A,
+  R,
+  TFieldValuesRefined extends TFieldValues = TFieldValues
+>(
+  q: QAll<TFieldValues, TFieldValuesRefined, A, R>,
+  baseSchema?: S.Schema<unknown>
+) => {
+  // TODO: Native interpreter for each db adapter, instead of the intermediate "new-kid" format
+  const a = interpret(q)
+
+  // Aggregate mode: build select entirely from aggregateMap (no schema-driven field list)
+  if (a.mode === "aggregate" && a.aggregateMap) {
+    const aggSelect = Object.entries(a.aggregateMap).map(([key, item]) => {
+      if (item._tag === "agg-field") {
+        return { key, path: item.path }
+      }
+      return { key, aggregate: item }
+    })
+    return dropUndefinedT({
+      t: null as unknown as TFieldValues,
+      limit: a.limit,
+      skip: a.skip,
+      select: Option.getOrUndefined(Option.liftPredicate(Array.isReadonlyArrayNonEmpty)(aggSelect)) as any,
+      schema: a.schema,
+      computed: undefined,
+      order: Option.getOrUndefined(Option.liftPredicate(Array.isReadonlyArrayNonEmpty)(a.order)),
+      ttype: a.ttype,
+      mode: "aggregate" as const,
+      filter: a.filter.length ? a.filter : undefined
+    })
+  }
+
+  const schema = a.schema
+  let select: SelectItem<TFieldValues>[] = []
+  // TODO: support more complex (nested) schemas?
+  if (schema) {
+    const t = walkTransformation(SchemaAST.toEncoded(schema.ast))
+    const objects = [...objectAsts(t)]
+    if (Array.isArrayNonEmpty(objects)) {
+      select = [...objectKeys(t)]
+      for (const prop of objects.flatMap((_) => _.propertySignatures)) {
+        if (S.AST.isArrays(prop.type)) {
+          // make sure we only select when there are actually type literals in the tuple...
+          // otherwise we might be dealing with strings etc.
+          // TODO; be more strict, can't support arrays with unions that have non TypeLiteral members etc..
+          const arraySelect = {
+            key: prop.name as string,
+            subKeys: Array.flatMap(
+              prop.type.rest,
+              (x) => {
+                return objectKeys(x)
+              }
+            )
+          }
+          if (arraySelect.subKeys.length > 0) {
+            mergeArraySelect(select, arraySelect)
+          }
+        }
+      }
+    }
+  }
+  const computed = a.computed
+  const getSelectKey = (_: (typeof select)[number]) => {
+    if (typeof _ === "string") {
+      return _
+    }
+    if (typeof _ === "object" && _ !== null && "key" in _) {
+      return _.key
+    }
+    return String(_)
+  }
+  const schemaKeys = select.map(getSelectKey)
+  const nonEncodedSchemaKeys = (() => {
+    if (!baseSchema) {
+      return [] as string[]
+    }
+    const encoded = walkTransformation(SchemaAST.toEncoded(baseSchema.ast))
+    const encodedKeys = objectKeys(encoded)
+    return schemaKeys.filter((key) => !encodedKeys.includes(key))
+  })()
+  const missingComputedKeys = nonEncodedSchemaKeys.filter((key) => !(computed && key in computed))
+
+  if (Array.isArrayNonEmpty(missingComputedKeys)) {
+    throw new Error(`Missing computed projections for schema keys: ${missingComputedKeys.join(", ")}`)
+  }
+
+  if (computed) {
+    const computedKeys = Object.keys(computed)
+    const extraComputedKeys = computedKeys.filter((key) => !schemaKeys.includes(key))
+    if (Array.isArrayNonEmpty(extraComputedKeys)) {
+      throw new Error(`Computed projection keys must exist in projection schema: ${extraComputedKeys.join(", ")}`)
+    }
+    select = select.filter((_) => {
+      const key = getSelectKey(_)
+      return !(key in computed)
+    })
+    select.push(...Object.entries(computed).map(([key, expression]) => ({ key, computed: expression })))
+  }
+  return dropUndefinedT({
+    t: null as unknown as TFieldValues,
+    limit: a.limit,
+    skip: a.skip,
+    select: Option.getOrUndefined(Option.liftPredicate(Array.isReadonlyArrayNonEmpty)(select)),
+    schema,
+    computed,
+    order: Option.getOrUndefined(Option.liftPredicate(Array.isReadonlyArrayNonEmpty)(a.order)),
+    ttype: a.ttype,
+    mode: a.mode ?? "transform",
+    filter: a.filter.length
+      ? a.filter
+      : undefined
+  })
+}

package/src/Model/query.ts

@@ -0,0 +1,13 @@
+export * from "./query/dsl.ts"
+export * from "./query/new-kid-interpreter.ts"
+
+export interface RawQuery<Encoded, Out> {
+  cosmos: (vals: { name: string }) => {
+    query: string
+    parameters: {
+      name: string
+      value: any
+    }[]
+  }
+  memory: (t: readonly Encoded[]) => readonly Out[]
+}

package/src/Model.ts

@@ -0,0 +1,5 @@
+export * from "./Model/dsl.ts"
+export * as Q from "./Model/query.ts"
+export { makeRepo } from "./Model/Repository.ts"
+export { repositoryDependency } from "./Model/Repository.ts"
+export { type RegisteredRepository, RepositoryRegistry, RepositoryRegistryLive } from "./Model/Repository.ts"

package/src/NonEmptySet.ts

@@ -1,7 +1,9 @@
-import { type Equivalence, Option, type Order } from "effect"
 import type { NonEmptyReadonlyArray } from "effect/Array"
-import { flow, pipe } from "./Function.js"
-import { filter_, filterMap, filterMap_, fromArray as fromArrayOriginal, insert as insertOriginal, insert_ as insert_Original, map, map_, reduce, reduce_, remove, remove_, type Set, toArray as toArrayOriginal } from "./Set.js"
+import type * as Equivalence from "effect/Equivalence"
+import * as Option from "effect/Option"
+import type * as Order from "effect/Order"
+import { flow, pipe } from "./Function.ts"
+import { filter_, filterMap, filterMap_, fromArray as fromArrayOriginal, insert as insertOriginal, insert_ as insert_Original, map, map_, reduce, reduce_, remove, remove_, type Set, toArray as toArrayOriginal } from "./Set.ts"
 
 export interface NonEmptyBrand {
   readonly NonEmpty: unique symbol
@@ -87,4 +89,4 @@ export function fromSet<A>(set: Set<A>) {
 }
 
 // TODO
-export * from "./Set.js"
+export * from "./Set.ts"

package/src/Option.ts

@@ -2,22 +2,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { getOrUndefined as value, type Some } from "effect/Option"
+// eslint-disable-next-line import/no-unassigned-import
+import "./builtin.ts"
+import { type Some } from "effect/Option"
 import * as Option from "effect/Option"
 
 export * from "effect/Option"
 
-export const getOrUndefined = value
-
 export function omitableToNullable<T>(om: Option.Option<T> | undefined) {
   return om ?? Option.fromNullishOr(om)
 }
 
-export const toBool = Option.match({
-  onNone: () => false,
-  onSome: () => true
-})
-
 export const fromBool = (b: boolean) => (b ? Option.some(true) : Option.none())
 
 /**