joist-core 2.3.0-next.95 → 2.3.0-next.97

package/build/dataloaders/fastWhereFilterHash.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"fastWhereFilterHash.cjs","names":["maybeRequireTemporal","isAlias","isEntity","isReference","zonedDateTimeMapper","plainDateTimeMapper","plainDateMapper","plainTimeMapper"],"sources":["../../src/dataloaders/fastWhereFilterHash.ts"],"sourcesContent":["import { isAlias } from \"../Aliases.ts\";\nimport { isEntity } from \"../Entity.ts\";\nimport { isReference } from \"../relations/index.ts\";\nimport { maybeRequireTemporal } from \"../temporal.ts\";\nimport { plainDateMapper, plainDateTimeMapper, plainTimeMapper, zonedDateTimeMapper } from \"../temporalMappers.ts\";\n\nconst Temporal = maybeRequireTemporal()?.Temporal;\n\n/**\n * Returns a fast stable key for find filters.\n *\n * This avoids `object-hash` for simple find filters; the phase 8 query-prep benchmark saw 1,000-query p50s drop\n * from ~22-26ms to ~7.6-10.9ms, with heap allocation dropping from ~24-30MB to ~10-16MB.\n *\n * We also benchmarked native/WASM non-cryptographic hash libraries, but they only hash bytes; they still need this\n * deterministic serialization first. For 1,000 filter keys, this helper alone had p50s of 0.337/0.353/0.410ms vs.\n * object-hash md5 at 7.467/7.436/7.620ms, and wrapping this key with native hashes was slower: farmhash\n * fingerprint64 at 0.517/0.524/0.538ms, @node-rs/xxhash xxh3-128 at 0.611/0.613/0.627ms, and xxhash-addon\n * XXH128 at 1.031/1.078/1.348ms. So the stable serialization is the necessary work, and keeping it as the cache\n * key avoids extra native-call/digest overhead and avoids introducing probabilistic hash collisions.\n */\nexport function fastWhereFilterHash(value: unknown): string | undefined {\n  return appendStableValue(\"\", value, new WeakSet<object>());\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableValue(key: string, value: unknown, seen: WeakSet<object>): string | undefined {\n  if (value === undefined) return `${key}u;`;\n  if (value === null) return `${key}n;`;\n  switch (typeof value) {\n    case \"string\":\n      return `${key}s${value.length}:${value};`;\n    case \"number\":\n      return `${key}d${value};`;\n    case \"boolean\":\n      return `${key}b${value ? 1 : 0};`;\n    case \"bigint\":\n      return `${key}i${value.toString()};`;\n    case \"object\":\n      return appendStableObject(key, value, seen);\n    case \"function\":\n      return isAlias(value) ? `${key}xalias;` : undefined;\n    default:\n      return undefined;\n  }\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (value instanceof Date) return `${key}t${value.toISOString().length}:${value.toISOString()};`;\n  if (ArrayBuffer.isView(value)) return appendArrayBufferView(key, value);\n\n  if (Array.isArray(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n    key = `${key}a${value.length}[`;\n    for (const item of value) {\n      const nextKey = appendStableValue(key, item, seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}]`;\n  }\n\n  if (isPlainObject(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n\n    const keys = Object.keys(value).sort();\n    key = `${key}o${keys.length}{`;\n    for (const property of keys) {\n      key = `${key}${property.length}:${property}=`;\n      const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}}`;\n  }\n\n  if (isEntity(value)) return `${key}e${value.toString().length}:${value.toString()};`;\n  const referenceKey = appendReferenceValue(key, value);\n  if (referenceKey !== undefined) return referenceKey;\n  const temporalValue = toTemporalDbValue(value);\n  if (temporalValue !== undefined) return appendTemporalValue(key, temporalValue);\n  const valueObjectKey = appendValueObject(key, value, seen);\n  if (valueObjectKey !== undefined) return valueObjectKey;\n  return undefined;\n}\n\n/** Appends an ArrayBuffer view by its exact byte contents. */\nfunction appendArrayBufferView(key: string, value: ArrayBufferView): string {\n  const bytes = Buffer.from(value.buffer, value.byteOffset, value.byteLength).toString(\"base64\");\n  return `${key}y${value.constructor.name.length}:${value.constructor.name}:${bytes.length}:${bytes};`;\n}\n\n/** Appends a Joist reference by its tagged id. */\nfunction appendReferenceValue(key: string, value: object): string | undefined {\n  if (!isReference(value)) return undefined;\n  const id = value.idTaggedMaybe;\n  return id === undefined ? `${key}r;` : `${key}r${id.length}:${id};`;\n}\n\n/** Appends a custom value object by constructor name and enumerable properties. */\nfunction appendValueObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (!isValueObject(value)) return undefined;\n  if (seen.has(value)) return undefined;\n  seen.add(value);\n\n  const constructorName = value.constructor.name;\n  const keys = Object.keys(value).sort();\n  key = `${key}c${constructorName.length}:${constructorName}:${keys.length}{`;\n  for (const property of keys) {\n    key = `${key}${property.length}:${property}=`;\n    const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n    if (nextKey === undefined) {\n      seen.delete(value);\n      return undefined;\n    }\n    key = nextKey;\n  }\n  seen.delete(value);\n  return `${key}}`;\n}\n\n/** Appends a Temporal value as a distinct scalar type. */\nfunction appendTemporalValue(key: string, value: string): string {\n  return `${key}t${value.length}:${value};`;\n}\n\n/** Returns the db representation for Temporal values, or undefined for non-Temporal values. */\nfunction toTemporalDbValue(value: object): string | undefined {\n  if (!Temporal) return undefined;\n  if (value instanceof Temporal.ZonedDateTime) return zonedDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDateTime) return plainDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDate) return plainDateMapper.toDb(value);\n  if (value instanceof Temporal.PlainTime) return plainTimeMapper.toDb(value);\n  return undefined;\n}\n\n/** Returns true for plain object literals used by find filters/settings. */\nfunction isPlainObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype === Object.prototype || prototype === null;\n}\n\n/** Returns true for custom value objects that can be represented by enumerable fields. */\nfunction isValueObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype !== Object.prototype && prototype !== null && Object.keys(value).length > 0;\n}\n"],"mappings":"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"}
+{"version":3,"file":"fastWhereFilterHash.cjs","names":["maybeRequireTemporal","isAlias","isEntity","isReference","zonedDateTimeMapper","plainDateTimeMapper","plainDateMapper","plainTimeMapper"],"sources":["../../src/dataloaders/fastWhereFilterHash.ts"],"sourcesContent":["import { isEntity } from \"../Entity.ts\";\nimport { isAlias } from \"../queries/find/Aliases.ts\";\nimport { isReference } from \"../relations/index.ts\";\nimport { maybeRequireTemporal } from \"../temporal.ts\";\nimport { plainDateMapper, plainDateTimeMapper, plainTimeMapper, zonedDateTimeMapper } from \"../temporalMappers.ts\";\n\nconst Temporal = maybeRequireTemporal()?.Temporal;\n\n/**\n * Returns a fast stable key for find filters.\n *\n * This avoids `object-hash` for simple find filters; the phase 8 query-prep benchmark saw 1,000-query p50s drop\n * from ~22-26ms to ~7.6-10.9ms, with heap allocation dropping from ~24-30MB to ~10-16MB.\n *\n * We also benchmarked native/WASM non-cryptographic hash libraries, but they only hash bytes; they still need this\n * deterministic serialization first. For 1,000 filter keys, this helper alone had p50s of 0.337/0.353/0.410ms vs.\n * object-hash md5 at 7.467/7.436/7.620ms, and wrapping this key with native hashes was slower: farmhash\n * fingerprint64 at 0.517/0.524/0.538ms, @node-rs/xxhash xxh3-128 at 0.611/0.613/0.627ms, and xxhash-addon\n * XXH128 at 1.031/1.078/1.348ms. So the stable serialization is the necessary work, and keeping it as the cache\n * key avoids extra native-call/digest overhead and avoids introducing probabilistic hash collisions.\n */\nexport function fastWhereFilterHash(value: unknown): string | undefined {\n  return appendStableValue(\"\", value, new WeakSet<object>());\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableValue(key: string, value: unknown, seen: WeakSet<object>): string | undefined {\n  if (value === undefined) return `${key}u;`;\n  if (value === null) return `${key}n;`;\n  switch (typeof value) {\n    case \"string\":\n      return `${key}s${value.length}:${value};`;\n    case \"number\":\n      return `${key}d${value};`;\n    case \"boolean\":\n      return `${key}b${value ? 1 : 0};`;\n    case \"bigint\":\n      return `${key}i${value.toString()};`;\n    case \"object\":\n      return appendStableObject(key, value, seen);\n    case \"function\":\n      return isAlias(value) ? `${key}xalias;` : undefined;\n    default:\n      return undefined;\n  }\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (value instanceof Date) return `${key}t${value.toISOString().length}:${value.toISOString()};`;\n  if (ArrayBuffer.isView(value)) return appendArrayBufferView(key, value);\n\n  if (Array.isArray(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n    key = `${key}a${value.length}[`;\n    for (const item of value) {\n      const nextKey = appendStableValue(key, item, seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}]`;\n  }\n\n  if (isPlainObject(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n\n    const keys = Object.keys(value).sort();\n    key = `${key}o${keys.length}{`;\n    for (const property of keys) {\n      key = `${key}${property.length}:${property}=`;\n      const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}}`;\n  }\n\n  if (isEntity(value)) return `${key}e${value.toString().length}:${value.toString()};`;\n  const referenceKey = appendReferenceValue(key, value);\n  if (referenceKey !== undefined) return referenceKey;\n  const temporalValue = toTemporalDbValue(value);\n  if (temporalValue !== undefined) return appendTemporalValue(key, temporalValue);\n  const valueObjectKey = appendValueObject(key, value, seen);\n  if (valueObjectKey !== undefined) return valueObjectKey;\n  return undefined;\n}\n\n/** Appends an ArrayBuffer view by its exact byte contents. */\nfunction appendArrayBufferView(key: string, value: ArrayBufferView): string {\n  const bytes = Buffer.from(value.buffer, value.byteOffset, value.byteLength).toString(\"base64\");\n  return `${key}y${value.constructor.name.length}:${value.constructor.name}:${bytes.length}:${bytes};`;\n}\n\n/** Appends a Joist reference by its tagged id. */\nfunction appendReferenceValue(key: string, value: object): string | undefined {\n  if (!isReference(value)) return undefined;\n  const id = value.idTaggedMaybe;\n  return id === undefined ? `${key}r;` : `${key}r${id.length}:${id};`;\n}\n\n/** Appends a custom value object by constructor name and enumerable properties. */\nfunction appendValueObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (!isValueObject(value)) return undefined;\n  if (seen.has(value)) return undefined;\n  seen.add(value);\n\n  const constructorName = value.constructor.name;\n  const keys = Object.keys(value).sort();\n  key = `${key}c${constructorName.length}:${constructorName}:${keys.length}{`;\n  for (const property of keys) {\n    key = `${key}${property.length}:${property}=`;\n    const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n    if (nextKey === undefined) {\n      seen.delete(value);\n      return undefined;\n    }\n    key = nextKey;\n  }\n  seen.delete(value);\n  return `${key}}`;\n}\n\n/** Appends a Temporal value as a distinct scalar type. */\nfunction appendTemporalValue(key: string, value: string): string {\n  return `${key}t${value.length}:${value};`;\n}\n\n/** Returns the db representation for Temporal values, or undefined for non-Temporal values. */\nfunction toTemporalDbValue(value: object): string | undefined {\n  if (!Temporal) return undefined;\n  if (value instanceof Temporal.ZonedDateTime) return zonedDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDateTime) return plainDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDate) return plainDateMapper.toDb(value);\n  if (value instanceof Temporal.PlainTime) return plainTimeMapper.toDb(value);\n  return undefined;\n}\n\n/** Returns true for plain object literals used by find filters/settings. */\nfunction isPlainObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype === Object.prototype || prototype === null;\n}\n\n/** Returns true for custom value objects that can be represented by enumerable fields. */\nfunction isValueObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype !== Object.prototype && prototype !== null && Object.keys(value).length > 0;\n}\n"],"mappings":"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"}

package/build/dataloaders/fastWhereFilterHash.js

@@ -1,9 +1,9 @@
+import { maybeRequireTemporal } from "../temporal.js";
+import { isAlias } from "../queries/find/Aliases.js";
 import { isReference } from "../relations/Reference.js";
 import "../relations/index.js";
-import { maybeRequireTemporal } from "../temporal.js";
 import { plainDateMapper, plainDateTimeMapper, plainTimeMapper, zonedDateTimeMapper } from "../temporalMappers.js";
 import { isEntity } from "../Entity.js";
-import { isAlias } from "../Aliases.js";
 //#region src/dataloaders/fastWhereFilterHash.ts
 const Temporal = maybeRequireTemporal()?.Temporal;
 /**

package/build/dataloaders/fastWhereFilterHash.js.map

@@ -1 +1 @@
-{"version":3,"file":"fastWhereFilterHash.js","names":[],"sources":["../../src/dataloaders/fastWhereFilterHash.ts"],"sourcesContent":["import { isAlias } from \"../Aliases.ts\";\nimport { isEntity } from \"../Entity.ts\";\nimport { isReference } from \"../relations/index.ts\";\nimport { maybeRequireTemporal } from \"../temporal.ts\";\nimport { plainDateMapper, plainDateTimeMapper, plainTimeMapper, zonedDateTimeMapper } from \"../temporalMappers.ts\";\n\nconst Temporal = maybeRequireTemporal()?.Temporal;\n\n/**\n * Returns a fast stable key for find filters.\n *\n * This avoids `object-hash` for simple find filters; the phase 8 query-prep benchmark saw 1,000-query p50s drop\n * from ~22-26ms to ~7.6-10.9ms, with heap allocation dropping from ~24-30MB to ~10-16MB.\n *\n * We also benchmarked native/WASM non-cryptographic hash libraries, but they only hash bytes; they still need this\n * deterministic serialization first. For 1,000 filter keys, this helper alone had p50s of 0.337/0.353/0.410ms vs.\n * object-hash md5 at 7.467/7.436/7.620ms, and wrapping this key with native hashes was slower: farmhash\n * fingerprint64 at 0.517/0.524/0.538ms, @node-rs/xxhash xxh3-128 at 0.611/0.613/0.627ms, and xxhash-addon\n * XXH128 at 1.031/1.078/1.348ms. So the stable serialization is the necessary work, and keeping it as the cache\n * key avoids extra native-call/digest overhead and avoids introducing probabilistic hash collisions.\n */\nexport function fastWhereFilterHash(value: unknown): string | undefined {\n  return appendStableValue(\"\", value, new WeakSet<object>());\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableValue(key: string, value: unknown, seen: WeakSet<object>): string | undefined {\n  if (value === undefined) return `${key}u;`;\n  if (value === null) return `${key}n;`;\n  switch (typeof value) {\n    case \"string\":\n      return `${key}s${value.length}:${value};`;\n    case \"number\":\n      return `${key}d${value};`;\n    case \"boolean\":\n      return `${key}b${value ? 1 : 0};`;\n    case \"bigint\":\n      return `${key}i${value.toString()};`;\n    case \"object\":\n      return appendStableObject(key, value, seen);\n    case \"function\":\n      return isAlias(value) ? `${key}xalias;` : undefined;\n    default:\n      return undefined;\n  }\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (value instanceof Date) return `${key}t${value.toISOString().length}:${value.toISOString()};`;\n  if (ArrayBuffer.isView(value)) return appendArrayBufferView(key, value);\n\n  if (Array.isArray(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n    key = `${key}a${value.length}[`;\n    for (const item of value) {\n      const nextKey = appendStableValue(key, item, seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}]`;\n  }\n\n  if (isPlainObject(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n\n    const keys = Object.keys(value).sort();\n    key = `${key}o${keys.length}{`;\n    for (const property of keys) {\n      key = `${key}${property.length}:${property}=`;\n      const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}}`;\n  }\n\n  if (isEntity(value)) return `${key}e${value.toString().length}:${value.toString()};`;\n  const referenceKey = appendReferenceValue(key, value);\n  if (referenceKey !== undefined) return referenceKey;\n  const temporalValue = toTemporalDbValue(value);\n  if (temporalValue !== undefined) return appendTemporalValue(key, temporalValue);\n  const valueObjectKey = appendValueObject(key, value, seen);\n  if (valueObjectKey !== undefined) return valueObjectKey;\n  return undefined;\n}\n\n/** Appends an ArrayBuffer view by its exact byte contents. */\nfunction appendArrayBufferView(key: string, value: ArrayBufferView): string {\n  const bytes = Buffer.from(value.buffer, value.byteOffset, value.byteLength).toString(\"base64\");\n  return `${key}y${value.constructor.name.length}:${value.constructor.name}:${bytes.length}:${bytes};`;\n}\n\n/** Appends a Joist reference by its tagged id. */\nfunction appendReferenceValue(key: string, value: object): string | undefined {\n  if (!isReference(value)) return undefined;\n  const id = value.idTaggedMaybe;\n  return id === undefined ? `${key}r;` : `${key}r${id.length}:${id};`;\n}\n\n/** Appends a custom value object by constructor name and enumerable properties. */\nfunction appendValueObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (!isValueObject(value)) return undefined;\n  if (seen.has(value)) return undefined;\n  seen.add(value);\n\n  const constructorName = value.constructor.name;\n  const keys = Object.keys(value).sort();\n  key = `${key}c${constructorName.length}:${constructorName}:${keys.length}{`;\n  for (const property of keys) {\n    key = `${key}${property.length}:${property}=`;\n    const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n    if (nextKey === undefined) {\n      seen.delete(value);\n      return undefined;\n    }\n    key = nextKey;\n  }\n  seen.delete(value);\n  return `${key}}`;\n}\n\n/** Appends a Temporal value as a distinct scalar type. */\nfunction appendTemporalValue(key: string, value: string): string {\n  return `${key}t${value.length}:${value};`;\n}\n\n/** Returns the db representation for Temporal values, or undefined for non-Temporal values. */\nfunction toTemporalDbValue(value: object): string | undefined {\n  if (!Temporal) return undefined;\n  if (value instanceof Temporal.ZonedDateTime) return zonedDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDateTime) return plainDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDate) return plainDateMapper.toDb(value);\n  if (value instanceof Temporal.PlainTime) return plainTimeMapper.toDb(value);\n  return undefined;\n}\n\n/** Returns true for plain object literals used by find filters/settings. */\nfunction isPlainObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype === Object.prototype || prototype === null;\n}\n\n/** Returns true for custom value objects that can be represented by enumerable fields. */\nfunction isValueObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype !== Object.prototype && prototype !== null && Object.keys(value).length > 0;\n}\n"],"mappings":"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"}
+{"version":3,"file":"fastWhereFilterHash.js","names":[],"sources":["../../src/dataloaders/fastWhereFilterHash.ts"],"sourcesContent":["import { isEntity } from \"../Entity.ts\";\nimport { isAlias } from \"../queries/find/Aliases.ts\";\nimport { isReference } from \"../relations/index.ts\";\nimport { maybeRequireTemporal } from \"../temporal.ts\";\nimport { plainDateMapper, plainDateTimeMapper, plainTimeMapper, zonedDateTimeMapper } from \"../temporalMappers.ts\";\n\nconst Temporal = maybeRequireTemporal()?.Temporal;\n\n/**\n * Returns a fast stable key for find filters.\n *\n * This avoids `object-hash` for simple find filters; the phase 8 query-prep benchmark saw 1,000-query p50s drop\n * from ~22-26ms to ~7.6-10.9ms, with heap allocation dropping from ~24-30MB to ~10-16MB.\n *\n * We also benchmarked native/WASM non-cryptographic hash libraries, but they only hash bytes; they still need this\n * deterministic serialization first. For 1,000 filter keys, this helper alone had p50s of 0.337/0.353/0.410ms vs.\n * object-hash md5 at 7.467/7.436/7.620ms, and wrapping this key with native hashes was slower: farmhash\n * fingerprint64 at 0.517/0.524/0.538ms, @node-rs/xxhash xxh3-128 at 0.611/0.613/0.627ms, and xxhash-addon\n * XXH128 at 1.031/1.078/1.348ms. So the stable serialization is the necessary work, and keeping it as the cache\n * key avoids extra native-call/digest overhead and avoids introducing probabilistic hash collisions.\n */\nexport function fastWhereFilterHash(value: unknown): string | undefined {\n  return appendStableValue(\"\", value, new WeakSet<object>());\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableValue(key: string, value: unknown, seen: WeakSet<object>): string | undefined {\n  if (value === undefined) return `${key}u;`;\n  if (value === null) return `${key}n;`;\n  switch (typeof value) {\n    case \"string\":\n      return `${key}s${value.length}:${value};`;\n    case \"number\":\n      return `${key}d${value};`;\n    case \"boolean\":\n      return `${key}b${value ? 1 : 0};`;\n    case \"bigint\":\n      return `${key}i${value.toString()};`;\n    case \"object\":\n      return appendStableObject(key, value, seen);\n    case \"function\":\n      return isAlias(value) ? `${key}xalias;` : undefined;\n    default:\n      return undefined;\n  }\n}\n\n/** Appends a deterministic, type-tagged representation of `value` to `key`. */\nfunction appendStableObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (value instanceof Date) return `${key}t${value.toISOString().length}:${value.toISOString()};`;\n  if (ArrayBuffer.isView(value)) return appendArrayBufferView(key, value);\n\n  if (Array.isArray(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n    key = `${key}a${value.length}[`;\n    for (const item of value) {\n      const nextKey = appendStableValue(key, item, seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}]`;\n  }\n\n  if (isPlainObject(value)) {\n    if (seen.has(value)) return undefined;\n    seen.add(value);\n\n    const keys = Object.keys(value).sort();\n    key = `${key}o${keys.length}{`;\n    for (const property of keys) {\n      key = `${key}${property.length}:${property}=`;\n      const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n      if (nextKey === undefined) {\n        seen.delete(value);\n        return undefined;\n      }\n      key = nextKey;\n    }\n    seen.delete(value);\n    return `${key}}`;\n  }\n\n  if (isEntity(value)) return `${key}e${value.toString().length}:${value.toString()};`;\n  const referenceKey = appendReferenceValue(key, value);\n  if (referenceKey !== undefined) return referenceKey;\n  const temporalValue = toTemporalDbValue(value);\n  if (temporalValue !== undefined) return appendTemporalValue(key, temporalValue);\n  const valueObjectKey = appendValueObject(key, value, seen);\n  if (valueObjectKey !== undefined) return valueObjectKey;\n  return undefined;\n}\n\n/** Appends an ArrayBuffer view by its exact byte contents. */\nfunction appendArrayBufferView(key: string, value: ArrayBufferView): string {\n  const bytes = Buffer.from(value.buffer, value.byteOffset, value.byteLength).toString(\"base64\");\n  return `${key}y${value.constructor.name.length}:${value.constructor.name}:${bytes.length}:${bytes};`;\n}\n\n/** Appends a Joist reference by its tagged id. */\nfunction appendReferenceValue(key: string, value: object): string | undefined {\n  if (!isReference(value)) return undefined;\n  const id = value.idTaggedMaybe;\n  return id === undefined ? `${key}r;` : `${key}r${id.length}:${id};`;\n}\n\n/** Appends a custom value object by constructor name and enumerable properties. */\nfunction appendValueObject(key: string, value: object, seen: WeakSet<object>): string | undefined {\n  if (!isValueObject(value)) return undefined;\n  if (seen.has(value)) return undefined;\n  seen.add(value);\n\n  const constructorName = value.constructor.name;\n  const keys = Object.keys(value).sort();\n  key = `${key}c${constructorName.length}:${constructorName}:${keys.length}{`;\n  for (const property of keys) {\n    key = `${key}${property.length}:${property}=`;\n    const nextKey = appendStableValue(key, (value as Record<string, unknown>)[property], seen);\n    if (nextKey === undefined) {\n      seen.delete(value);\n      return undefined;\n    }\n    key = nextKey;\n  }\n  seen.delete(value);\n  return `${key}}`;\n}\n\n/** Appends a Temporal value as a distinct scalar type. */\nfunction appendTemporalValue(key: string, value: string): string {\n  return `${key}t${value.length}:${value};`;\n}\n\n/** Returns the db representation for Temporal values, or undefined for non-Temporal values. */\nfunction toTemporalDbValue(value: object): string | undefined {\n  if (!Temporal) return undefined;\n  if (value instanceof Temporal.ZonedDateTime) return zonedDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDateTime) return plainDateTimeMapper.toDb(value);\n  if (value instanceof Temporal.PlainDate) return plainDateMapper.toDb(value);\n  if (value instanceof Temporal.PlainTime) return plainTimeMapper.toDb(value);\n  return undefined;\n}\n\n/** Returns true for plain object literals used by find filters/settings. */\nfunction isPlainObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype === Object.prototype || prototype === null;\n}\n\n/** Returns true for custom value objects that can be represented by enumerable fields. */\nfunction isValueObject(value: object): boolean {\n  const prototype = Object.getPrototypeOf(value);\n  return prototype !== Object.prototype && prototype !== null && Object.keys(value).length > 0;\n}\n"],"mappings":"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"}

package/build/dataloaders/findByUniqueDataLoader.cjs

@@ -1,9 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_EntityMetadata = require("../EntityMetadata.cjs");
+const require_queries_entityQueryUtils = require("../queries/entityQueryUtils.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_utils = require("../utils.cjs");
-require("../EntityManager.cjs");
-require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
+const require_EntityMetadata = require("../EntityMetadata.cjs");
 //#region src/dataloaders/findByUniqueDataLoader.ts
 const findByUniqueOperation = "find-by-unique";
 function findByUniqueDataLoader(em, type, field, softDeletes) {
@@ -26,8 +25,8 @@ function findByUniqueDataLoader(em, type, field, softDeletes) {
 			},
 			orderBys: []
 		};
-		require_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
-		require_QueryParser.maybeAddNotSoftDeleted(conditions, meta, alias, softDeletes);
+		require_queries_find_QueryParser.addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		require_queries_entityQueryUtils.maybeAddNotSoftDeleted(conditions, meta, alias, softDeletes);
 		let column;
 		switch (field.kind) {
 			case "primitive":

package/build/dataloaders/findByUniqueDataLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"findByUniqueDataLoader.cjs","names":["getMetadata","abbreviation","groupBy"],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Column } from \"../columns.ts\";\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor } from \"../EntityManager.ts\";\nimport { type Field, getMetadata } from \"../EntityMetadata.ts\";\nimport {\n  type ColumnCondition,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  maybeAddNotSoftDeleted,\n} from \"../QueryParser.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const findByUniqueOperation = \"find-by-unique\";\n\nexport function findByUniqueDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  field: Field,\n  softDeletes: \"include\" | \"exclude\",\n): DataLoader<any, unknown | undefined> {\n  const batchKey = `${type.name}-${field.fieldName}-${softDeletes}`;\n  return em.getLoader(findByUniqueOperation, batchKey, async (values) => {\n    const meta = getMetadata(type);\n    const alias = abbreviation(meta.tableName);\n\n    const conditions: ColumnCondition[] = [];\n    const query: ParsedFindQuery = {\n      selects: [`${alias}.*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: { kind: \"exp\", op: \"and\", conditions },\n      orderBys: [],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    maybeAddNotSoftDeleted(conditions, meta, alias, softDeletes);\n\n    let column: Column;\n    switch (field.kind) {\n      case \"primitive\":\n        column = field.serde.columns[0];\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"in\", value: values.map((v) => column.mapToDb(v)) },\n        });\n        break;\n      default:\n        throw new Error(`Unsupported field ${field.fieldName}`);\n    }\n\n    const rows = await em[\"executeFind\"](meta, findByUniqueOperation, query, {});\n\n    const rowsByValue = groupBy(rows, (row) => row[column.columnName]);\n\n    // Re-order the output by the batched input\n    return values.map((value) => {\n      const result = rowsByValue.get(value) ?? [];\n      return result[0];\n    });\n  });\n}\n"],"mappings":";;;;;;;AAcA,MAAa,wBAAwB;AAErC,SAAgB,uBACd,IACA,MACA,OACA,aACsC;CACtC,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,UAAU,GAAG;CACpD,OAAO,GAAG,UAAU,uBAAuB,UAAU,OAAO,WAAW;EACrE,MAAM,OAAOA,uBAAAA,YAAY,IAAI;EAC7B,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EAEzC,MAAM,aAAgC,CAAC;EACvC,MAAM,QAAyB;GAC7B,SAAS,CAAC,GAAG,MAAM,GAAG;GACtB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IAAE,MAAM;IAAO,IAAI;IAAO;GAAW;GAChD,UAAU,CAAC;EACb;EAEA,oBAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EACzD,oBAAA,uBAAuB,YAAY,MAAM,OAAO,WAAW;EAE3D,IAAI;EACJ,QAAQ,MAAM,MAAd;GACE,KAAK;IACH,SAAS,MAAM,MAAM,QAAQ;IAC7B,WAAW,KAAK;KACd,MAAM;KACN;KACA,QAAQ,OAAO;KACf,QAAQ,OAAO;KACf,MAAM;MAAE,MAAM;MAAM,OAAO,OAAO,KAAK,MAAM,OAAO,QAAQ,CAAC,CAAC;KAAE;IAClE,CAAC;IACD;GACF,SACE,MAAM,IAAI,MAAM,qBAAqB,MAAM,WAAW;EAC1D;EAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,MAAM,uBAAuB,OAAO,CAAC,CAAC;EAE3E,MAAM,cAAcC,cAAAA,QAAQ,OAAO,QAAQ,IAAI,OAAO,WAAW;EAGjE,OAAO,OAAO,KAAK,UAAU;GAE3B,QADe,YAAY,IAAI,KAAK,KAAK,CAAC,EAAA,CAC5B;EAChB,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"findByUniqueDataLoader.cjs","names":["getMetadata","abbreviation","groupBy"],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport type { Column } from \"../columns.ts\";\nimport type { Entity } from \"../Entity.ts\";\nimport type { EntityManager, MaybeAbstractEntityConstructor } from \"../EntityManager.ts\";\nimport { type Field, getMetadata } from \"../EntityMetadata.ts\";\nimport { maybeAddNotSoftDeleted } from \"../queries/entityQueryUtils.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag } from \"../queries/find/QueryParser.ts\";\nimport type { ColumnCondition } from \"../queries/parsedConditions.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const findByUniqueOperation = \"find-by-unique\";\n\nexport function findByUniqueDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  field: Field,\n  softDeletes: \"include\" | \"exclude\",\n): DataLoader<any, unknown | undefined> {\n  const batchKey = `${type.name}-${field.fieldName}-${softDeletes}`;\n  return em.getLoader(findByUniqueOperation, batchKey, async (values) => {\n    const meta = getMetadata(type);\n    const alias = abbreviation(meta.tableName);\n\n    const conditions: ColumnCondition[] = [];\n    const query: ParsedFindQuery = {\n      selects: [`${alias}.*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: { kind: \"exp\", op: \"and\", conditions },\n      orderBys: [],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    maybeAddNotSoftDeleted(conditions, meta, alias, softDeletes);\n\n    let column: Column;\n    switch (field.kind) {\n      case \"primitive\":\n        column = field.serde.columns[0];\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"in\", value: values.map((v) => column.mapToDb(v)) },\n        });\n        break;\n      default:\n        throw new Error(`Unsupported field ${field.fieldName}`);\n    }\n\n    const rows = await em[\"executeFind\"](meta, findByUniqueOperation, query, {});\n\n    const rowsByValue = groupBy(rows, (row) => row[column.columnName]);\n\n    // Re-order the output by the batched input\n    return values.map((value) => {\n      const result = rowsByValue.get(value) ?? [];\n      return result[0];\n    });\n  });\n}\n"],"mappings":";;;;;;AAWA,MAAa,wBAAwB;AAErC,SAAgB,uBACd,IACA,MACA,OACA,aACsC;CACtC,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,UAAU,GAAG;CACpD,OAAO,GAAG,UAAU,uBAAuB,UAAU,OAAO,WAAW;EACrE,MAAM,OAAOA,uBAAAA,YAAY,IAAI;EAC7B,MAAM,QAAQC,cAAAA,aAAa,KAAK,SAAS;EAEzC,MAAM,aAAgC,CAAC;EACvC,MAAM,QAAyB;GAC7B,SAAS,CAAC,GAAG,MAAM,GAAG;GACtB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IAAE,MAAM;IAAO,IAAI;IAAO;GAAW;GAChD,UAAU,CAAC;EACb;EAEA,iCAAA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EACzD,iCAAA,uBAAuB,YAAY,MAAM,OAAO,WAAW;EAE3D,IAAI;EACJ,QAAQ,MAAM,MAAd;GACE,KAAK;IACH,SAAS,MAAM,MAAM,QAAQ;IAC7B,WAAW,KAAK;KACd,MAAM;KACN;KACA,QAAQ,OAAO;KACf,QAAQ,OAAO;KACf,MAAM;MAAE,MAAM;MAAM,OAAO,OAAO,KAAK,MAAM,OAAO,QAAQ,CAAC,CAAC;KAAE;IAClE,CAAC;IACD;GACF,SACE,MAAM,IAAI,MAAM,qBAAqB,MAAM,WAAW;EAC1D;EAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,MAAM,uBAAuB,OAAO,CAAC,CAAC;EAE3E,MAAM,cAAcC,cAAAA,QAAQ,OAAO,QAAQ,IAAI,OAAO,WAAW;EAGjE,OAAO,OAAO,KAAK,UAAU;GAE3B,QADe,YAAY,IAAI,KAAK,KAAK,CAAC,EAAA,CAC5B;EAChB,CAAC;CACH,CAAC;AACH"}

package/build/dataloaders/findByUniqueDataLoader.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"findByUniqueDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"mappings":";;;;;cAca;iBAEG,uBAAuB,UAAU,QAC/C,IAAI,eACJ,MAAM,+BAA+B,IACrC,OAAO,OACP,qCACC"}
+{"version":3,"file":"findByUniqueDataLoader.d.cts","names":[],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"mappings":";;;;;cAWa;iBAEG,uBAAuB,UAAU,QAC/C,IAAI,eACJ,MAAM,+BAA+B,IACrC,OAAO,OACP,qCACC"}

package/build/dataloaders/findByUniqueDataLoader.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"findByUniqueDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"mappings":";;;;;cAca;iBAEG,uBAAuB,UAAU,QAC/C,IAAI,eACJ,MAAM,+BAA+B,IACrC,OAAO,OACP,qCACC"}
+{"version":3,"file":"findByUniqueDataLoader.d.mts","names":[],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"mappings":";;;;;cAWa;iBAEG,uBAAuB,UAAU,QAC/C,IAAI,eACJ,MAAM,+BAA+B,IACrC,OAAO,OACP,qCACC"}

package/build/dataloaders/findByUniqueDataLoader.js

@@ -1,8 +1,7 @@
-import { getMetadata } from "../EntityMetadata.js";
+import { maybeAddNotSoftDeleted } from "../queries/entityQueryUtils.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
 import { abbreviation, groupBy } from "../utils.js";
-import "../EntityManager.js";
-import "../Entity.js";
-import { addTablePerClassJoinsAndClassTag, maybeAddNotSoftDeleted } from "../QueryParser.js";
+import { getMetadata } from "../EntityMetadata.js";
 //#region src/dataloaders/findByUniqueDataLoader.ts
 const findByUniqueOperation = "find-by-unique";
 function findByUniqueDataLoader(em, type, field, softDeletes) {

package/build/dataloaders/findByUniqueDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"findByUniqueDataLoader.js","names":[],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport { type Column } from \"../columns.ts\";\nimport { type Entity } from \"../Entity.ts\";\nimport { type EntityManager, type MaybeAbstractEntityConstructor } from \"../EntityManager.ts\";\nimport { type Field, getMetadata } from \"../EntityMetadata.ts\";\nimport {\n  type ColumnCondition,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  maybeAddNotSoftDeleted,\n} from \"../QueryParser.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const findByUniqueOperation = \"find-by-unique\";\n\nexport function findByUniqueDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  field: Field,\n  softDeletes: \"include\" | \"exclude\",\n): DataLoader<any, unknown | undefined> {\n  const batchKey = `${type.name}-${field.fieldName}-${softDeletes}`;\n  return em.getLoader(findByUniqueOperation, batchKey, async (values) => {\n    const meta = getMetadata(type);\n    const alias = abbreviation(meta.tableName);\n\n    const conditions: ColumnCondition[] = [];\n    const query: ParsedFindQuery = {\n      selects: [`${alias}.*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: { kind: \"exp\", op: \"and\", conditions },\n      orderBys: [],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    maybeAddNotSoftDeleted(conditions, meta, alias, softDeletes);\n\n    let column: Column;\n    switch (field.kind) {\n      case \"primitive\":\n        column = field.serde.columns[0];\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"in\", value: values.map((v) => column.mapToDb(v)) },\n        });\n        break;\n      default:\n        throw new Error(`Unsupported field ${field.fieldName}`);\n    }\n\n    const rows = await em[\"executeFind\"](meta, findByUniqueOperation, query, {});\n\n    const rowsByValue = groupBy(rows, (row) => row[column.columnName]);\n\n    // Re-order the output by the batched input\n    return values.map((value) => {\n      const result = rowsByValue.get(value) ?? [];\n      return result[0];\n    });\n  });\n}\n"],"mappings":";;;;;;AAcA,MAAa,wBAAwB;AAErC,SAAgB,uBACd,IACA,MACA,OACA,aACsC;CACtC,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,UAAU,GAAG;CACpD,OAAO,GAAG,UAAU,uBAAuB,UAAU,OAAO,WAAW;EACrE,MAAM,OAAO,YAAY,IAAI;EAC7B,MAAM,QAAQ,aAAa,KAAK,SAAS;EAEzC,MAAM,aAAgC,CAAC;EACvC,MAAM,QAAyB;GAC7B,SAAS,CAAC,GAAG,MAAM,GAAG;GACtB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IAAE,MAAM;IAAO,IAAI;IAAO;GAAW;GAChD,UAAU,CAAC;EACb;EAEA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EACzD,uBAAuB,YAAY,MAAM,OAAO,WAAW;EAE3D,IAAI;EACJ,QAAQ,MAAM,MAAd;GACE,KAAK;IACH,SAAS,MAAM,MAAM,QAAQ;IAC7B,WAAW,KAAK;KACd,MAAM;KACN;KACA,QAAQ,OAAO;KACf,QAAQ,OAAO;KACf,MAAM;MAAE,MAAM;MAAM,OAAO,OAAO,KAAK,MAAM,OAAO,QAAQ,CAAC,CAAC;KAAE;IAClE,CAAC;IACD;GACF,SACE,MAAM,IAAI,MAAM,qBAAqB,MAAM,WAAW;EAC1D;EAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,MAAM,uBAAuB,OAAO,CAAC,CAAC;EAE3E,MAAM,cAAc,QAAQ,OAAO,QAAQ,IAAI,OAAO,WAAW;EAGjE,OAAO,OAAO,KAAK,UAAU;GAE3B,QADe,YAAY,IAAI,KAAK,KAAK,CAAC,EAAA,CAC5B;EAChB,CAAC;CACH,CAAC;AACH"}
+{"version":3,"file":"findByUniqueDataLoader.js","names":[],"sources":["../../src/dataloaders/findByUniqueDataLoader.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\n\nimport type { Column } from \"../columns.ts\";\nimport type { Entity } from \"../Entity.ts\";\nimport type { EntityManager, MaybeAbstractEntityConstructor } from \"../EntityManager.ts\";\nimport { type Field, getMetadata } from \"../EntityMetadata.ts\";\nimport { maybeAddNotSoftDeleted } from \"../queries/entityQueryUtils.ts\";\nimport { type ParsedFindQuery, addTablePerClassJoinsAndClassTag } from \"../queries/find/QueryParser.ts\";\nimport type { ColumnCondition } from \"../queries/parsedConditions.ts\";\nimport { abbreviation, groupBy } from \"../utils.ts\";\n\nexport const findByUniqueOperation = \"find-by-unique\";\n\nexport function findByUniqueDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  field: Field,\n  softDeletes: \"include\" | \"exclude\",\n): DataLoader<any, unknown | undefined> {\n  const batchKey = `${type.name}-${field.fieldName}-${softDeletes}`;\n  return em.getLoader(findByUniqueOperation, batchKey, async (values) => {\n    const meta = getMetadata(type);\n    const alias = abbreviation(meta.tableName);\n\n    const conditions: ColumnCondition[] = [];\n    const query: ParsedFindQuery = {\n      selects: [`${alias}.*`],\n      tables: [{ alias, join: \"primary\", table: meta.tableName }],\n      condition: { kind: \"exp\", op: \"and\", conditions },\n      orderBys: [],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n    maybeAddNotSoftDeleted(conditions, meta, alias, softDeletes);\n\n    let column: Column;\n    switch (field.kind) {\n      case \"primitive\":\n        column = field.serde.columns[0];\n        conditions.push({\n          kind: \"column\",\n          alias,\n          column: column.columnName,\n          dbType: column.dbType,\n          cond: { kind: \"in\", value: values.map((v) => column.mapToDb(v)) },\n        });\n        break;\n      default:\n        throw new Error(`Unsupported field ${field.fieldName}`);\n    }\n\n    const rows = await em[\"executeFind\"](meta, findByUniqueOperation, query, {});\n\n    const rowsByValue = groupBy(rows, (row) => row[column.columnName]);\n\n    // Re-order the output by the batched input\n    return values.map((value) => {\n      const result = rowsByValue.get(value) ?? [];\n      return result[0];\n    });\n  });\n}\n"],"mappings":";;;;;AAWA,MAAa,wBAAwB;AAErC,SAAgB,uBACd,IACA,MACA,OACA,aACsC;CACtC,MAAM,WAAW,GAAG,KAAK,KAAK,GAAG,MAAM,UAAU,GAAG;CACpD,OAAO,GAAG,UAAU,uBAAuB,UAAU,OAAO,WAAW;EACrE,MAAM,OAAO,YAAY,IAAI;EAC7B,MAAM,QAAQ,aAAa,KAAK,SAAS;EAEzC,MAAM,aAAgC,CAAC;EACvC,MAAM,QAAyB;GAC7B,SAAS,CAAC,GAAG,MAAM,GAAG;GACtB,QAAQ,CAAC;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,CAAC;GAC1D,WAAW;IAAE,MAAM;IAAO,IAAI;IAAO;GAAW;GAChD,UAAU,CAAC;EACb;EAEA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EACzD,uBAAuB,YAAY,MAAM,OAAO,WAAW;EAE3D,IAAI;EACJ,QAAQ,MAAM,MAAd;GACE,KAAK;IACH,SAAS,MAAM,MAAM,QAAQ;IAC7B,WAAW,KAAK;KACd,MAAM;KACN;KACA,QAAQ,OAAO;KACf,QAAQ,OAAO;KACf,MAAM;MAAE,MAAM;MAAM,OAAO,OAAO,KAAK,MAAM,OAAO,QAAQ,CAAC,CAAC;KAAE;IAClE,CAAC;IACD;GACF,SACE,MAAM,IAAI,MAAM,qBAAqB,MAAM,WAAW;EAC1D;EAEA,MAAM,OAAO,MAAM,GAAG,cAAc,CAAC,MAAM,uBAAuB,OAAO,CAAC,CAAC;EAE3E,MAAM,cAAc,QAAQ,OAAO,QAAQ,IAAI,OAAO,WAAW;EAGjE,OAAO,OAAO,KAAK,UAAU;GAE3B,QADe,YAAY,IAAI,KAAK,KAAK,CAAC,EAAA,CAC5B;EAChB,CAAC;CACH,CAAC;AACH"}

package/build/dataloaders/findCountDataLoader.cjs

@@ -1,22 +1,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_scopes = require("../scopes.cjs");
-require("../EntityFilter.cjs");
-require("../EntityGraphQLFilter.cjs");
-const require_keywords = require("../keywords.cjs");
-const require_EntityMetadata = require("../EntityMetadata.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
+const require_queries_find_scopes = require("../queries/find/scopes.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_utils = require("../utils.cjs");
+const require_EntityMetadata = require("../EntityMetadata.cjs");
 const require_unnest = require("../unnest.cjs");
 const require_dataloaders_findDataLoader = require("./findDataLoader.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
-require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/dataloaders/findCountDataLoader.ts
 const findCountOperation = "find-count";
 function findCountDataLoader(em, type, filter) {
 	const { where, ...opts } = filter;
 	if (opts.limit || opts.offset) throw new Error("Cannot use limit/offset with findCountDataLoader");
 	const meta = require_EntityMetadata.getMetadata(type);
-	const query = require_QueryParser.parseFindQuery(meta, where, opts);
+	const query = require_queries_find_QueryParser.parseFindQuery(meta, where, opts);
 	const pendingDeletedIds = appendPendingDeletedIds(em, type, query, meta.idDbType, where, opts);
 	const { findSettings } = em["prepareFind"](meta, findCountOperation, query, {
 		...opts,
@@ -36,7 +33,7 @@ function findCountDataLoader(em, type, filter) {
 		if (entries.length === 1) {
 			const { query, findSettings } = entries[0];
 			const primary = query.tables.find((t) => t.join === "primary") ?? require_utils.fail("No primary");
-			query.selects = [`count(distinct ${require_keywords.kq(primary.alias)}.id) as count`];
+			query.selects = [`count(distinct ${require_queries_sql_keywords.kq(primary.alias)}.id) as count`];
 			query.orderBys = [];
 			const rows = await em["executePreparedFind"](meta, findCountOperation, query, findSettings, false);
 			return [Number(rows[0].count)];
@@ -48,7 +45,7 @@ function findCountDataLoader(em, type, filter) {
 			dbType: "int"
 		}, ...args.map((a) => a.column)];
 		const primary = query.tables.find((t) => t.join === "primary") ?? require_utils.fail("No primary");
-		query.selects = [`count(distinct ${require_keywords.kq(primary.alias)}.id) as count`];
+		query.selects = [`count(distinct ${require_queries_sql_keywords.kq(primary.alias)}.id) as count`];
 		query.orderBys = [];
 		const query2 = {
 			selects: ["_find.tag as tag", "_data.count as count"],
@@ -73,11 +70,11 @@ function findCountDataLoader(em, type, filter) {
 	}, { cacheKeyFn: (entry) => require_dataloaders_findDataLoader.queryFilterHash(entry) }).load(prepared);
 }
 function mergeCountOptions(where, options) {
-	if (!require_scopes.isScope(where)) return {
+	if (!require_queries_find_scopes.isScope(where)) return {
 		where,
 		options
 	};
-	const resolved = require_scopes.resolveScope(where);
+	const resolved = require_queries_find_scopes.resolveScope(where);
 	const scopeOptions = {};
 	if (resolved.softDeletes !== void 0) scopeOptions.softDeletes = resolved.softDeletes;
 	return {
@@ -90,7 +87,7 @@ function mergeCountOptions(where, options) {
 }
 /** Adds `id not in pendingDeletedIds` to the count query so pending deletes are excluded in SQL. */
 function appendPendingDeletedIds(em, type, query, idDbType, where, opts) {
-	const pendingDeletedIds = require_scopes.isSelectAllFilter(where, opts.conditions) ? [] : require_EntityManager.getEmInternalApi(em).pendingDeleteIds(type);
+	const pendingDeletedIds = require_queries_find_scopes.isSelectAllFilter(where, opts.conditions) ? [] : require_EntityManager.getEmInternalApi(em).pendingDeleteIds(type);
 	if (pendingDeletedIds.length === 0) return pendingDeletedIds;
 	const condition = {
 		kind: "column",

package/build/dataloaders/findCountDataLoader.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"findCountDataLoader.cjs","names":["getMetadata","parseFindQuery","getBatchKeyFromGenericStructure","fail","kq","collectAndReplaceArgs","buildUnnestCte","createColumnValuesFromPrepared","queryFilterHash","isScope","resolveScope","isSelectAllFilter","getEmInternalApi"],"sources":["../../src/dataloaders/findCountDataLoader.ts"],"sourcesContent":["import { type Entity, type IdType } from \"../Entity.ts\";\nimport { type FilterAndSettings, type FindFilter } from \"../EntityFilter.ts\";\nimport { type GraphQLFilterWithAlias } from \"../EntityGraphQLFilter.ts\";\nimport {\n  type EntityManager,\n  type FindCountFilterOptions,\n  type MaybeAbstractEntityConstructor,\n  getEmInternalApi,\n} from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport { kq } from \"../keywords.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../QueryParser.ts\";\nimport { isScope, isSelectAllFilter, resolveScope } from \"../scopes.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport { fail } from \"../utils.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.ts\";\n\nexport const findCountOperation = \"find-count\";\n\nexport function findCountDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  filter: FilterAndSettings<T>,\n): Promise<number> {\n  const { where, ...opts } = filter;\n  if (opts.limit || opts.offset) {\n    throw new Error(\"Cannot use limit/offset with findCountDataLoader\");\n  }\n\n  const meta = getMetadata(type);\n  const query = parseFindQuery(meta, where, opts);\n  const pendingDeletedIds = appendPendingDeletedIds(em, type, query, meta.idDbType, where, opts);\n  const { findSettings } = em[\"prepareFind\"](meta, findCountOperation, query, { ...opts, checkLimit: false });\n  const bindings: any[] = [];\n  collectValues(bindings, query);\n  const prepared = { filter, pendingDeletedIds, query, bindings, findSettings };\n  const batchKey = getBatchKeyFromGenericStructure(meta, query);\n\n  return em\n    .getLoader<typeof prepared, number>(\n      findCountOperation,\n      batchKey,\n      async (entries) => {\n        // We're guaranteed that these queries all have the same structure\n\n        // Don't bother with the CTE if there's only 1 query (or each query has exactly the same filter values)\n        if (entries.length === 1) {\n          const { query, findSettings } = entries[0];\n          const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n          query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n          query.orderBys = [];\n          const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query, findSettings, false);\n          return [Number(rows[0].count)];\n        }\n\n        // WITH _find (tag, arg1, arg2) AS (\n        //  SELECT unnest($0::int[]), unnest($0::varchar[]), unnest($0::varchar[])\n        // )\n        // SELECT _find.tag, _data.count\n        // FROM _find\n        // CROSS JOIN LATERAL (\n        //   SELECT count(*) as count\n        //   FROM author a WHERE a.first_name = _find.arg1 OR a.last_name = _find.arg2\n        // ) _data\n\n        // Build the list of 'arg1', 'arg2', ... strings\n        const { query, findSettings } = entries[0];\n        const args = collectAndReplaceArgs(query, entries);\n        const argsColumns = [{ columnName: \"tag\", dbType: \"int\" }, ...args.map((a) => a.column)];\n\n        // We're not returning the entities, just counting them...\n        const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n        query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n        query.orderBys = [];\n\n        const query2: ParsedFindQuery = {\n          selects: [\"_find.tag as tag\", \"_data.count as count\"],\n          tables: [\n            { join: \"primary\", table: \"_find\", alias: \"_find\" },\n            // Not sure what fromAlias is for/that it matters...\n            { join: \"lateral\", query: query, table: meta.tableName, alias: \"_data\", fromAlias: \"_f\" },\n          ],\n          // For each unique query, capture its filter values in `bindings` to populate the CTE _find table\n          ctes: [buildUnnestCte(\"_find\", argsColumns, createColumnValuesFromPrepared(args, entries))],\n          orderBys: [],\n        };\n\n        const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query2, findSettings, false);\n\n        // Make an empty array for each batched query, per the dataloader contract\n        const results = entries.map(() => 0);\n        // Then put each row into the tagged query it matched\n        for (const row of rows) {\n          results[row.tag] = Number(row.count);\n        }\n        return results;\n      },\n      // Our filter/order tuple is a complex object, so use a stable cache key to ensure caching works.\n      { cacheKeyFn: (entry) => queryFilterHash(entry) },\n    )\n    .load(prepared);\n}\n\n/** Merges root-scope count/id settings with caller options, dropping pagination-only settings. */\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> } {\n  if (!isScope<T>(where)) return { where, options };\n\n  const resolved = resolveScope(where);\n  const scopeOptions: FindCountFilterOptions<T> = {};\n  if (resolved.softDeletes !== undefined) scopeOptions.softDeletes = resolved.softDeletes;\n  return { where, options: { ...scopeOptions, ...options } };\n}\n\n/** Adds `id not in pendingDeletedIds` to the count query so pending deletes are excluded in SQL. */\nfunction appendPendingDeletedIds<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  query: ParsedFindQuery,\n  idDbType: \"bigint\" | \"int\" | \"uuid\" | \"text\",\n  where: FilterAndSettings<T>[\"where\"],\n  opts: Omit<FilterAndSettings<T>, \"where\">,\n): readonly IdType[] {\n  const pendingDeletedIds = isSelectAllFilter(where, opts.conditions)\n    ? []\n    : getEmInternalApi(em).pendingDeleteIds(type);\n  if (pendingDeletedIds.length === 0) return pendingDeletedIds;\n\n  const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n  const condition = {\n    kind: \"column\" as const,\n    alias: primary.alias,\n    column: \"id\",\n    dbType: idDbType,\n    cond: { kind: \"nin\" as const, value: pendingDeletedIds },\n    pruneable: true,\n  };\n\n  if (!query.condition) {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [condition] };\n  } else if (query.condition.op === \"and\") {\n    query.condition.conditions.push(condition);\n  } else {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [query.condition, condition] };\n  }\n  return pendingDeletedIds;\n}\n"],"mappings":"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"}
+{"version":3,"file":"findCountDataLoader.cjs","names":["getMetadata","parseFindQuery","getBatchKeyFromGenericStructure","fail","kq","collectAndReplaceArgs","buildUnnestCte","createColumnValuesFromPrepared","queryFilterHash","isScope","resolveScope","isSelectAllFilter","getEmInternalApi"],"sources":["../../src/dataloaders/findCountDataLoader.ts"],"sourcesContent":["import type { Entity, IdType } from \"../Entity.ts\";\nimport {\n  type EntityManager,\n  type FindCountFilterOptions,\n  type MaybeAbstractEntityConstructor,\n  getEmInternalApi,\n} from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport type { FilterAndSettings, FindFilter } from \"../queries/find/EntityFilter.ts\";\nimport type { GraphQLFilterWithAlias } from \"../queries/find/EntityGraphQLFilter.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../queries/find/QueryParser.ts\";\nimport { isScope, isSelectAllFilter, resolveScope } from \"../queries/find/scopes.ts\";\nimport { kq } from \"../queries/sql/keywords.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport { fail } from \"../utils.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.ts\";\n\nexport const findCountOperation = \"find-count\";\n\nexport function findCountDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  filter: FilterAndSettings<T>,\n): Promise<number> {\n  const { where, ...opts } = filter;\n  if (opts.limit || opts.offset) {\n    throw new Error(\"Cannot use limit/offset with findCountDataLoader\");\n  }\n\n  const meta = getMetadata(type);\n  const query = parseFindQuery(meta, where, opts);\n  const pendingDeletedIds = appendPendingDeletedIds(em, type, query, meta.idDbType, where, opts);\n  const { findSettings } = em[\"prepareFind\"](meta, findCountOperation, query, { ...opts, checkLimit: false });\n  const bindings: any[] = [];\n  collectValues(bindings, query);\n  const prepared = { filter, pendingDeletedIds, query, bindings, findSettings };\n  const batchKey = getBatchKeyFromGenericStructure(meta, query);\n\n  return em\n    .getLoader<typeof prepared, number>(\n      findCountOperation,\n      batchKey,\n      async (entries) => {\n        // We're guaranteed that these queries all have the same structure\n\n        // Don't bother with the CTE if there's only 1 query (or each query has exactly the same filter values)\n        if (entries.length === 1) {\n          const { query, findSettings } = entries[0];\n          const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n          query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n          query.orderBys = [];\n          const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query, findSettings, false);\n          return [Number(rows[0].count)];\n        }\n\n        // WITH _find (tag, arg1, arg2) AS (\n        //  SELECT unnest($0::int[]), unnest($0::varchar[]), unnest($0::varchar[])\n        // )\n        // SELECT _find.tag, _data.count\n        // FROM _find\n        // CROSS JOIN LATERAL (\n        //   SELECT count(*) as count\n        //   FROM author a WHERE a.first_name = _find.arg1 OR a.last_name = _find.arg2\n        // ) _data\n\n        // Build the list of 'arg1', 'arg2', ... strings\n        const { query, findSettings } = entries[0];\n        const args = collectAndReplaceArgs(query, entries);\n        const argsColumns = [{ columnName: \"tag\", dbType: \"int\" }, ...args.map((a) => a.column)];\n\n        // We're not returning the entities, just counting them...\n        const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n        query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n        query.orderBys = [];\n\n        const query2: ParsedFindQuery = {\n          selects: [\"_find.tag as tag\", \"_data.count as count\"],\n          tables: [\n            { join: \"primary\", table: \"_find\", alias: \"_find\" },\n            // Not sure what fromAlias is for/that it matters...\n            { join: \"lateral\", query: query, table: meta.tableName, alias: \"_data\", fromAlias: \"_f\" },\n          ],\n          // For each unique query, capture its filter values in `bindings` to populate the CTE _find table\n          ctes: [buildUnnestCte(\"_find\", argsColumns, createColumnValuesFromPrepared(args, entries))],\n          orderBys: [],\n        };\n\n        const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query2, findSettings, false);\n\n        // Make an empty array for each batched query, per the dataloader contract\n        const results = entries.map(() => 0);\n        // Then put each row into the tagged query it matched\n        for (const row of rows) {\n          results[row.tag] = Number(row.count);\n        }\n        return results;\n      },\n      // Our filter/order tuple is a complex object, so use a stable cache key to ensure caching works.\n      { cacheKeyFn: (entry) => queryFilterHash(entry) },\n    )\n    .load(prepared);\n}\n\n/** Merges root-scope count/id settings with caller options, dropping pagination-only settings. */\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> } {\n  if (!isScope<T>(where)) return { where, options };\n\n  const resolved = resolveScope(where);\n  const scopeOptions: FindCountFilterOptions<T> = {};\n  if (resolved.softDeletes !== undefined) scopeOptions.softDeletes = resolved.softDeletes;\n  return { where, options: { ...scopeOptions, ...options } };\n}\n\n/** Adds `id not in pendingDeletedIds` to the count query so pending deletes are excluded in SQL. */\nfunction appendPendingDeletedIds<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  query: ParsedFindQuery,\n  idDbType: \"bigint\" | \"int\" | \"uuid\" | \"text\",\n  where: FilterAndSettings<T>[\"where\"],\n  opts: Omit<FilterAndSettings<T>, \"where\">,\n): readonly IdType[] {\n  const pendingDeletedIds = isSelectAllFilter(where, opts.conditions)\n    ? []\n    : getEmInternalApi(em).pendingDeleteIds(type);\n  if (pendingDeletedIds.length === 0) return pendingDeletedIds;\n\n  const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n  const condition = {\n    kind: \"column\" as const,\n    alias: primary.alias,\n    column: \"id\",\n    dbType: idDbType,\n    cond: { kind: \"nin\" as const, value: pendingDeletedIds },\n    pruneable: true,\n  };\n\n  if (!query.condition) {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [condition] };\n  } else if (query.condition.op === \"and\") {\n    query.condition.conditions.push(condition);\n  } else {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [query.condition, condition] };\n  }\n  return pendingDeletedIds;\n}\n"],"mappings":"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"}

package/build/dataloaders/findCountDataLoader.d.cts

@@ -1,7 +1,7 @@
-import { GraphQLFilterWithAlias } from "../EntityGraphQLFilter.cjs";
+import { GraphQLFilterWithAlias } from "../queries/find/EntityGraphQLFilter.cjs";
+import { FilterAndSettings, FindFilter } from "../queries/find/EntityFilter.cjs";
 import { EntityManager, FindCountFilterOptions, MaybeAbstractEntityConstructor } from "../EntityManager.cjs";
 import { Entity } from "../Entity.cjs";
-import { FilterAndSettings, FindFilter } from "../EntityFilter.cjs";
 //#region src/dataloaders/findCountDataLoader.d.ts
 declare const findCountOperation = "find-count";
 declare function findCountDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>): Promise<number>;

package/build/dataloaders/findCountDataLoader.d.mts

@@ -1,7 +1,7 @@
-import { GraphQLFilterWithAlias } from "../EntityGraphQLFilter.mjs";
+import { GraphQLFilterWithAlias } from "../queries/find/EntityGraphQLFilter.mjs";
+import { FilterAndSettings, FindFilter } from "../queries/find/EntityFilter.mjs";
 import { EntityManager, FindCountFilterOptions, MaybeAbstractEntityConstructor } from "../EntityManager.mjs";
 import { Entity } from "../Entity.mjs";
-import { FilterAndSettings, FindFilter } from "../EntityFilter.mjs";
 //#region src/dataloaders/findCountDataLoader.d.ts
 declare const findCountOperation = "find-count";
 declare function findCountDataLoader<T extends Entity>(em: EntityManager, type: MaybeAbstractEntityConstructor<T>, filter: FilterAndSettings<T>): Promise<number>;

package/build/dataloaders/findCountDataLoader.js

@@ -1,14 +1,11 @@
-import { isScope, isSelectAllFilter, resolveScope } from "../scopes.js";
-import "../EntityFilter.js";
-import "../EntityGraphQLFilter.js";
-import { kq } from "../keywords.js";
-import { getMetadata } from "../EntityMetadata.js";
+import { kq } from "../queries/sql/keywords.js";
+import { isScope, isSelectAllFilter, resolveScope } from "../queries/find/scopes.js";
+import { parseFindQuery } from "../queries/find/QueryParser.js";
 import { fail } from "../utils.js";
+import { getMetadata } from "../EntityMetadata.js";
 import { buildUnnestCte } from "../unnest.js";
 import { collectAndReplaceArgs, collectValues, createColumnValuesFromPrepared, getBatchKeyFromGenericStructure, queryFilterHash } from "./findDataLoader.js";
 import { getEmInternalApi } from "../EntityManager.js";
-import "../Entity.js";
-import { parseFindQuery } from "../QueryParser.js";
 //#region src/dataloaders/findCountDataLoader.ts
 const findCountOperation = "find-count";
 function findCountDataLoader(em, type, filter) {

package/build/dataloaders/findCountDataLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"findCountDataLoader.js","names":[],"sources":["../../src/dataloaders/findCountDataLoader.ts"],"sourcesContent":["import { type Entity, type IdType } from \"../Entity.ts\";\nimport { type FilterAndSettings, type FindFilter } from \"../EntityFilter.ts\";\nimport { type GraphQLFilterWithAlias } from \"../EntityGraphQLFilter.ts\";\nimport {\n  type EntityManager,\n  type FindCountFilterOptions,\n  type MaybeAbstractEntityConstructor,\n  getEmInternalApi,\n} from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport { kq } from \"../keywords.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../QueryParser.ts\";\nimport { isScope, isSelectAllFilter, resolveScope } from \"../scopes.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport { fail } from \"../utils.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.ts\";\n\nexport const findCountOperation = \"find-count\";\n\nexport function findCountDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  filter: FilterAndSettings<T>,\n): Promise<number> {\n  const { where, ...opts } = filter;\n  if (opts.limit || opts.offset) {\n    throw new Error(\"Cannot use limit/offset with findCountDataLoader\");\n  }\n\n  const meta = getMetadata(type);\n  const query = parseFindQuery(meta, where, opts);\n  const pendingDeletedIds = appendPendingDeletedIds(em, type, query, meta.idDbType, where, opts);\n  const { findSettings } = em[\"prepareFind\"](meta, findCountOperation, query, { ...opts, checkLimit: false });\n  const bindings: any[] = [];\n  collectValues(bindings, query);\n  const prepared = { filter, pendingDeletedIds, query, bindings, findSettings };\n  const batchKey = getBatchKeyFromGenericStructure(meta, query);\n\n  return em\n    .getLoader<typeof prepared, number>(\n      findCountOperation,\n      batchKey,\n      async (entries) => {\n        // We're guaranteed that these queries all have the same structure\n\n        // Don't bother with the CTE if there's only 1 query (or each query has exactly the same filter values)\n        if (entries.length === 1) {\n          const { query, findSettings } = entries[0];\n          const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n          query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n          query.orderBys = [];\n          const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query, findSettings, false);\n          return [Number(rows[0].count)];\n        }\n\n        // WITH _find (tag, arg1, arg2) AS (\n        //  SELECT unnest($0::int[]), unnest($0::varchar[]), unnest($0::varchar[])\n        // )\n        // SELECT _find.tag, _data.count\n        // FROM _find\n        // CROSS JOIN LATERAL (\n        //   SELECT count(*) as count\n        //   FROM author a WHERE a.first_name = _find.arg1 OR a.last_name = _find.arg2\n        // ) _data\n\n        // Build the list of 'arg1', 'arg2', ... strings\n        const { query, findSettings } = entries[0];\n        const args = collectAndReplaceArgs(query, entries);\n        const argsColumns = [{ columnName: \"tag\", dbType: \"int\" }, ...args.map((a) => a.column)];\n\n        // We're not returning the entities, just counting them...\n        const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n        query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n        query.orderBys = [];\n\n        const query2: ParsedFindQuery = {\n          selects: [\"_find.tag as tag\", \"_data.count as count\"],\n          tables: [\n            { join: \"primary\", table: \"_find\", alias: \"_find\" },\n            // Not sure what fromAlias is for/that it matters...\n            { join: \"lateral\", query: query, table: meta.tableName, alias: \"_data\", fromAlias: \"_f\" },\n          ],\n          // For each unique query, capture its filter values in `bindings` to populate the CTE _find table\n          ctes: [buildUnnestCte(\"_find\", argsColumns, createColumnValuesFromPrepared(args, entries))],\n          orderBys: [],\n        };\n\n        const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query2, findSettings, false);\n\n        // Make an empty array for each batched query, per the dataloader contract\n        const results = entries.map(() => 0);\n        // Then put each row into the tagged query it matched\n        for (const row of rows) {\n          results[row.tag] = Number(row.count);\n        }\n        return results;\n      },\n      // Our filter/order tuple is a complex object, so use a stable cache key to ensure caching works.\n      { cacheKeyFn: (entry) => queryFilterHash(entry) },\n    )\n    .load(prepared);\n}\n\n/** Merges root-scope count/id settings with caller options, dropping pagination-only settings. */\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> } {\n  if (!isScope<T>(where)) return { where, options };\n\n  const resolved = resolveScope(where);\n  const scopeOptions: FindCountFilterOptions<T> = {};\n  if (resolved.softDeletes !== undefined) scopeOptions.softDeletes = resolved.softDeletes;\n  return { where, options: { ...scopeOptions, ...options } };\n}\n\n/** Adds `id not in pendingDeletedIds` to the count query so pending deletes are excluded in SQL. */\nfunction appendPendingDeletedIds<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  query: ParsedFindQuery,\n  idDbType: \"bigint\" | \"int\" | \"uuid\" | \"text\",\n  where: FilterAndSettings<T>[\"where\"],\n  opts: Omit<FilterAndSettings<T>, \"where\">,\n): readonly IdType[] {\n  const pendingDeletedIds = isSelectAllFilter(where, opts.conditions)\n    ? []\n    : getEmInternalApi(em).pendingDeleteIds(type);\n  if (pendingDeletedIds.length === 0) return pendingDeletedIds;\n\n  const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n  const condition = {\n    kind: \"column\" as const,\n    alias: primary.alias,\n    column: \"id\",\n    dbType: idDbType,\n    cond: { kind: \"nin\" as const, value: pendingDeletedIds },\n    pruneable: true,\n  };\n\n  if (!query.condition) {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [condition] };\n  } else if (query.condition.op === \"and\") {\n    query.condition.conditions.push(condition);\n  } else {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [query.condition, condition] };\n  }\n  return pendingDeletedIds;\n}\n"],"mappings":"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"}
+{"version":3,"file":"findCountDataLoader.js","names":[],"sources":["../../src/dataloaders/findCountDataLoader.ts"],"sourcesContent":["import type { Entity, IdType } from \"../Entity.ts\";\nimport {\n  type EntityManager,\n  type FindCountFilterOptions,\n  type MaybeAbstractEntityConstructor,\n  getEmInternalApi,\n} from \"../EntityManager.ts\";\nimport { getMetadata } from \"../EntityMetadata.ts\";\nimport type { FilterAndSettings, FindFilter } from \"../queries/find/EntityFilter.ts\";\nimport type { GraphQLFilterWithAlias } from \"../queries/find/EntityGraphQLFilter.ts\";\nimport { type ParsedFindQuery, parseFindQuery } from \"../queries/find/QueryParser.ts\";\nimport { isScope, isSelectAllFilter, resolveScope } from \"../queries/find/scopes.ts\";\nimport { kq } from \"../queries/sql/keywords.ts\";\nimport { buildUnnestCte } from \"../unnest.ts\";\nimport { fail } from \"../utils.ts\";\nimport {\n  collectAndReplaceArgs,\n  collectValues,\n  createColumnValuesFromPrepared,\n  getBatchKeyFromGenericStructure,\n  queryFilterHash,\n} from \"./findDataLoader.ts\";\n\nexport const findCountOperation = \"find-count\";\n\nexport function findCountDataLoader<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  filter: FilterAndSettings<T>,\n): Promise<number> {\n  const { where, ...opts } = filter;\n  if (opts.limit || opts.offset) {\n    throw new Error(\"Cannot use limit/offset with findCountDataLoader\");\n  }\n\n  const meta = getMetadata(type);\n  const query = parseFindQuery(meta, where, opts);\n  const pendingDeletedIds = appendPendingDeletedIds(em, type, query, meta.idDbType, where, opts);\n  const { findSettings } = em[\"prepareFind\"](meta, findCountOperation, query, { ...opts, checkLimit: false });\n  const bindings: any[] = [];\n  collectValues(bindings, query);\n  const prepared = { filter, pendingDeletedIds, query, bindings, findSettings };\n  const batchKey = getBatchKeyFromGenericStructure(meta, query);\n\n  return em\n    .getLoader<typeof prepared, number>(\n      findCountOperation,\n      batchKey,\n      async (entries) => {\n        // We're guaranteed that these queries all have the same structure\n\n        // Don't bother with the CTE if there's only 1 query (or each query has exactly the same filter values)\n        if (entries.length === 1) {\n          const { query, findSettings } = entries[0];\n          const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n          query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n          query.orderBys = [];\n          const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query, findSettings, false);\n          return [Number(rows[0].count)];\n        }\n\n        // WITH _find (tag, arg1, arg2) AS (\n        //  SELECT unnest($0::int[]), unnest($0::varchar[]), unnest($0::varchar[])\n        // )\n        // SELECT _find.tag, _data.count\n        // FROM _find\n        // CROSS JOIN LATERAL (\n        //   SELECT count(*) as count\n        //   FROM author a WHERE a.first_name = _find.arg1 OR a.last_name = _find.arg2\n        // ) _data\n\n        // Build the list of 'arg1', 'arg2', ... strings\n        const { query, findSettings } = entries[0];\n        const args = collectAndReplaceArgs(query, entries);\n        const argsColumns = [{ columnName: \"tag\", dbType: \"int\" }, ...args.map((a) => a.column)];\n\n        // We're not returning the entities, just counting them...\n        const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n        query.selects = [`count(distinct ${kq(primary.alias)}.id) as count`];\n        query.orderBys = [];\n\n        const query2: ParsedFindQuery = {\n          selects: [\"_find.tag as tag\", \"_data.count as count\"],\n          tables: [\n            { join: \"primary\", table: \"_find\", alias: \"_find\" },\n            // Not sure what fromAlias is for/that it matters...\n            { join: \"lateral\", query: query, table: meta.tableName, alias: \"_data\", fromAlias: \"_f\" },\n          ],\n          // For each unique query, capture its filter values in `bindings` to populate the CTE _find table\n          ctes: [buildUnnestCte(\"_find\", argsColumns, createColumnValuesFromPrepared(args, entries))],\n          orderBys: [],\n        };\n\n        const rows = await em[\"executePreparedFind\"](meta, findCountOperation, query2, findSettings, false);\n\n        // Make an empty array for each batched query, per the dataloader contract\n        const results = entries.map(() => 0);\n        // Then put each row into the tagged query it matched\n        for (const row of rows) {\n          results[row.tag] = Number(row.count);\n        }\n        return results;\n      },\n      // Our filter/order tuple is a complex object, so use a stable cache key to ensure caching works.\n      { cacheKeyFn: (entry) => queryFilterHash(entry) },\n    )\n    .load(prepared);\n}\n\n/** Merges root-scope count/id settings with caller options, dropping pagination-only settings. */\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> };\nexport function mergeCountOptions<T extends Entity>(\n  where: FindFilter<T> | GraphQLFilterWithAlias<T>,\n  options: FindCountFilterOptions<T>,\n): { where: FindFilter<T> | GraphQLFilterWithAlias<T>; options: FindCountFilterOptions<T> } {\n  if (!isScope<T>(where)) return { where, options };\n\n  const resolved = resolveScope(where);\n  const scopeOptions: FindCountFilterOptions<T> = {};\n  if (resolved.softDeletes !== undefined) scopeOptions.softDeletes = resolved.softDeletes;\n  return { where, options: { ...scopeOptions, ...options } };\n}\n\n/** Adds `id not in pendingDeletedIds` to the count query so pending deletes are excluded in SQL. */\nfunction appendPendingDeletedIds<T extends Entity>(\n  em: EntityManager,\n  type: MaybeAbstractEntityConstructor<T>,\n  query: ParsedFindQuery,\n  idDbType: \"bigint\" | \"int\" | \"uuid\" | \"text\",\n  where: FilterAndSettings<T>[\"where\"],\n  opts: Omit<FilterAndSettings<T>, \"where\">,\n): readonly IdType[] {\n  const pendingDeletedIds = isSelectAllFilter(where, opts.conditions)\n    ? []\n    : getEmInternalApi(em).pendingDeleteIds(type);\n  if (pendingDeletedIds.length === 0) return pendingDeletedIds;\n\n  const primary = query.tables.find((t) => t.join === \"primary\") ?? fail(\"No primary\");\n  const condition = {\n    kind: \"column\" as const,\n    alias: primary.alias,\n    column: \"id\",\n    dbType: idDbType,\n    cond: { kind: \"nin\" as const, value: pendingDeletedIds },\n    pruneable: true,\n  };\n\n  if (!query.condition) {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [condition] };\n  } else if (query.condition.op === \"and\") {\n    query.condition.conditions.push(condition);\n  } else {\n    query.condition = { kind: \"exp\", op: \"and\", conditions: [query.condition, condition] };\n  }\n  return pendingDeletedIds;\n}\n"],"mappings":"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"}

package/build/dataloaders/findDataLoader.cjs

@@ -1,27 +1,23 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../EntityFilter.cjs");
-const require_EntityGraphQLFilter = require("../EntityGraphQLFilter.cjs");
-const require_keywords = require("../keywords.cjs");
-const require_EntityMetadata = require("../EntityMetadata.cjs");
 const require_fields = require("../fields.cjs");
+const require_queries_sql_keywords = require("../queries/sql/keywords.cjs");
+const require_queries_find_QueryVisitor = require("../queries/find/QueryVisitor.cjs");
+const require_queries_find_QueryParser = require("../queries/find/QueryParser.cjs");
 const require_normalizeHints = require("../normalizeHints.cjs");
-require("../loadHints.cjs");
 const require_utils = require("../utils.cjs");
-const require_QueryVisitor = require("../QueryVisitor.cjs");
-require("../drivers/EntityWriter.cjs");
+const require_EntityMetadata = require("../EntityMetadata.cjs");
+const require_queries_find_EntityGraphQLFilter = require("../queries/find/EntityGraphQLFilter.cjs");
 const require_HintTree = require("../HintTree.cjs");
 const require_unnest = require("../unnest.cjs");
 const require_dataloaders_fastWhereFilterHash = require("./fastWhereFilterHash.cjs");
 const require_EntityManager = require("../EntityManager.cjs");
-require("../Entity.cjs");
-const require_QueryParser = require("../QueryParser.cjs");
 //#region src/dataloaders/findDataLoader.ts
 const findOperation = "find";
 function findDataLoader(em, type, filter, hint) {
 	const { where, ...opts } = filter;
 	if ("limit" in opts || "offset" in opts) throw new Error("Cannot use limit/offset with findDataLoader");
 	const meta = require_EntityMetadata.getMetadata(type);
-	const query = require_QueryParser.parseFindQuery(meta, where, opts);
+	const query = require_queries_find_QueryParser.parseFindQuery(meta, where, opts);
 	const { checkLimit, findSettings } = em["prepareFind"](meta, findOperation, query, {
 		...opts,
 		limit: em.entityLimit
@@ -68,7 +64,7 @@ function findDataLoader(em, type, filter, hint) {
 			query2.tables.push(...preloadJoins.map((j) => j.join));
 		}
 		query2.groupBys = buildGroupBys(query2.selects);
-		const [primary] = require_QueryParser.getTables(query2);
+		const [primary] = require_queries_find_QueryParser.getTables(query2);
 		for (const { alias, column } of query2.orderBys) if (alias !== primary.alias) query2.groupBys.push({
 			alias,
 			column
@@ -141,7 +137,7 @@ function collectAndReplaceArgs(query, entries) {
 	const argsIndex = new ArgCounter();
 	const constant = computeConstantBindings(entries);
 	let bindingIndex = 0;
-	require_QueryVisitor.visitConditions(query, { visitCond(c) {
+	require_queries_find_QueryVisitor.visitConditions(query, { visitCond(c) {
 		if ("value" in c.cond) {
 			const { kind } = c.cond;
 			const consumed = kind === "between" ? 2 : 1;
@@ -188,7 +184,7 @@ function rewriteToRawCondition(c, argsIndex) {
 	return {
 		kind: "raw",
 		aliases: [c.alias],
-		condition: `${negate ? "NOT " : ""}${require_keywords.kqDot(c.alias, c.column)} ${op}`,
+		condition: `${negate ? "NOT " : ""}${require_queries_sql_keywords.kqDot(c.alias, c.column)} ${op}`,
 		pruneable: c.pruneable ?? false,
 		bindings: []
 	};
@@ -210,7 +206,7 @@ function createColumnValuesFromPrepared(args, entries) {
 }
 /** Pushes the arg values of a given query in the cross-query `bindings` array. */
 function collectValues(bindings, query) {
-	require_QueryVisitor.visitConditions(query, { visitCond(c) {
+	require_queries_find_QueryVisitor.visitConditions(query, { visitCond(c) {
 		if ("value" in c.cond) {
 			if (c.cond.kind === "between") {
 				bindings.push(c.cond.value[0]);
@@ -226,7 +222,7 @@ function isAggregateSelect(select) {
 /** Builds GROUP BYs for selected values, accounting for whole-row selects that are grouped by primary key. */
 function buildGroupBys(selects) {
 	const sqlSelects = selects.map(selectSqlForGroupBy);
-	const wholeRowAliases = new Set(sqlSelects.filter((select) => !isAggregateSelect(select) && stripSelectAlias(select).endsWith(".*")).map(require_QueryParser.parseAlias));
+	const wholeRowAliases = new Set(sqlSelects.filter((select) => !isAggregateSelect(select) && stripSelectAlias(select).endsWith(".*")).map(require_queries_find_QueryParser.parseAlias));
 	return sqlSelects.filter((select) => !isAggregateSelect(select)).filter((select) => !isCoveredByWholeRowGroupBy(select, wholeRowAliases)).map((select) => groupBySelect(select));
 }
 /** Returns a SQL string for group-by analysis, until we support bindings in ParsedGroupBy. */
@@ -238,7 +234,7 @@ function selectSqlForGroupBy(select) {
 function groupBySelect(select) {
 	const expression = stripSelectAlias(select);
 	if (expression.endsWith(".*")) return {
-		alias: require_QueryParser.parseAlias(expression),
+		alias: require_queries_find_QueryParser.parseAlias(expression),
 		column: "id"
 	};
 	return { expression };
@@ -281,9 +277,9 @@ function makeOp(cond, argsIndex) {
 		case "jsonPathPredicate":
 		case "contains":
 		case "overlaps":
-		case "containedBy": return [`${require_EntityGraphQLFilter.opToFn[cond.kind] ?? require_utils.fail(`Invalid operator ${cond.kind}`)} _find.arg${argsIndex.next()}`, false];
+		case "containedBy": return [`${require_queries_find_EntityGraphQLFilter.opToFn[cond.kind] ?? require_utils.fail(`Invalid operator ${cond.kind}`)} _find.arg${argsIndex.next()}`, false];
 		case "noverlaps":
-		case "ncontains": return [`${require_EntityGraphQLFilter.opToFn[cond.kind.substring(1)] ?? require_utils.fail(`Invalid operator ${cond.kind}`)} _find.arg${argsIndex.next()}`, true];
+		case "ncontains": return [`${require_queries_find_EntityGraphQLFilter.opToFn[cond.kind.substring(1)] ?? require_utils.fail(`Invalid operator ${cond.kind}`)} _find.arg${argsIndex.next()}`, true];
 		case "is-null": return [`IS NULL`, false];
 		case "not-null": return [`IS NOT NULL`, false];
 		case "in": return [`= ANY(_find.arg${argsIndex.next()})`, false];
@@ -342,7 +338,7 @@ function argsEqual(a, b) {
 }
 function getBatchKeyFromGenericStructure(meta, query) {
 	const saved = /* @__PURE__ */ new Map();
-	require_QueryVisitor.visitConditions(query, { visitCond(c) {
+	require_queries_find_QueryVisitor.visitConditions(query, { visitCond(c) {
 		const { cond } = c;
 		if ("value" in cond && !saved.has(cond)) {
 			saved.set(cond, cond.value);