@event-driven-io/pongo 0.17.0-beta.41 → 0.17.0-beta.42

package/dist/core-5npofT4H.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"core-5npofT4H.js","names":[],"sources":["../src/storage/sqlite/core/sqlBuilder/filter/queryOperators.ts","../src/storage/sqlite/core/sqlBuilder/filter/index.ts","../src/storage/sqlite/core/sqlBuilder/update/index.ts","../src/storage/sqlite/core/sqlBuilder/index.ts"],"sourcesContent":["import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { JSONParam, SQL } from '@event-driven-io/dumbo';\nimport { SQLiteJSON } from '@event-driven-io/dumbo/sqlite';\nimport { objectEntries, OperatorMap } from '../../../../../core';\n\nexport const handleOperator = (\n  path: string,\n  operator: string,\n  value: unknown,\n  serializer: JSONSerializer,\n): SQL => {\n  if (path === '_id' || path === '_version') {\n    return handleMetadataOperator(path, operator, value);\n  }\n\n  switch (operator) {\n    case '$eq': {\n      const jsonPath = SQLiteJSON.path(path);\n\n      return SQL`(\n        json_extract(data, ${jsonPath}) = ${value}\n        OR (\n          json_type(data, ${jsonPath}) = 'array'\n          AND EXISTS(\n            SELECT 1 FROM json_each(data, ${jsonPath})\n            WHERE json_each.value = ${value}\n          )\n        )\n      )`;\n    }\n    case '$gt':\n    case '$gte':\n    case '$lt':\n    case '$lte':\n    case '$ne': {\n      const jsonPath = SQLiteJSON.path(path);\n\n      return SQL`json_extract(data, ${jsonPath}) ${SQL.plain(OperatorMap[operator])} ${value}`;\n    }\n    case '$in': {\n      const jsonPath = SQLiteJSON.path(path);\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n\n      return SQL`json_extract(data, ${jsonPath}) IN (${inClause})`;\n    }\n    case '$nin': {\n      const jsonPath = SQLiteJSON.path(path);\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n\n      return SQL`json_extract(data, ${jsonPath}) NOT IN (${inClause})`;\n    }\n    case '$elemMatch': {\n      const subConditions = objectEntries(value as Record<string, unknown>).map(\n        ([subKey, subValue]) =>\n          SQL`json_extract(value, ${SQLiteJSON.path(subKey)}) = json(${JSONParam.value(subValue, serializer)})`,\n      );\n\n      const jsonPath = SQLiteJSON.path(path);\n      return SQL`EXISTS(SELECT 1 FROM json_each(data, ${jsonPath}) WHERE ${SQL.merge(subConditions, ' AND ')})`;\n    }\n    case '$all': {\n      const jsonPath = SQLiteJSON.path(path);\n      const serializedValue = JSONParam.value(value, serializer);\n\n      return SQL`(SELECT COUNT(*) FROM json_each(json(${serializedValue})) WHERE json_each.value NOT IN (SELECT value FROM json_each(data, ${jsonPath}))) = 0`;\n    }\n    case '$size': {\n      const jsonPath = SQLiteJSON.path(path);\n\n      return SQL`json_array_length(json_extract(data, ${jsonPath})) = ${value}`;\n    }\n    default:\n      throw new Error(`Unsupported operator: ${operator}`);\n  }\n};\n\nconst handleMetadataOperator = (\n  fieldName: string,\n  operator: string,\n  value: unknown,\n): SQL => {\n  switch (operator) {\n    case '$eq':\n      return SQL`${SQL.plain(fieldName)} = ${value}`;\n    case '$gt':\n    case '$gte':\n    case '$lt':\n    case '$lte':\n    case '$ne':\n      return SQL`${SQL.plain(fieldName)} ${SQL.plain(OperatorMap[operator])} ${value}`;\n    case '$in': {\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n      return SQL`${SQL.plain(fieldName)} IN (${inClause})`;\n    }\n    case '$nin': {\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n      return SQL`${SQL.plain(fieldName)} NOT IN (${inClause})`;\n    }\n    default:\n      throw new Error(`Unsupported operator: ${operator}`);\n  }\n};\n","import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { SQL } from '@event-driven-io/dumbo';\nimport {\n  hasOperators,\n  objectEntries,\n  QueryOperators,\n  type PongoFilter,\n} from '../../../../../core';\nimport { handleOperator } from './queryOperators';\n\nexport * from './queryOperators';\n\nconst AND = 'AND';\nconst OR = 'OR';\n\nconst unsupportedRootOperators = ['$text', '$where', '$comment'] as const;\n\nexport const constructFilterQuery = <T>(\n  filter: PongoFilter<T>,\n  serializer: JSONSerializer,\n): SQL => {\n  ensureSupportedRootOperators(filter);\n  const parts: SQL[] = [];\n\n  const fieldFilterQuery = constructFieldFilterQuery(filter, serializer);\n  if (!SQL.check.isEmpty(fieldFilterQuery)) {\n    parts.push(fieldFilterQuery);\n  }\n\n  const orFilterQuery = constructLogicalFilterQuery(filter.$or, OR, serializer);\n  if (!SQL.check.isEmpty(orFilterQuery)) {\n    parts.push(orFilterQuery);\n  }\n\n  const andFilterQuery = constructLogicalFilterQuery(\n    filter.$and,\n    AND,\n    serializer,\n  );\n  if (!SQL.check.isEmpty(andFilterQuery)) {\n    parts.push(andFilterQuery);\n  }\n\n  const norFilterQuery = constructNorFilterQuery(filter.$nor, serializer);\n  if (!SQL.check.isEmpty(norFilterQuery)) {\n    parts.push(norFilterQuery);\n  }\n\n  return SQL.merge(parts, ` ${AND} `);\n};\n\nconst constructFieldFilterQuery = <T>(\n  filter: PongoFilter<T>,\n  serializer: JSONSerializer,\n): SQL =>\n  SQL.merge(\n    objectEntries(filter).flatMap(([key, value]) =>\n      isLogicalRootOperator(key)\n        ? []\n        : [\n            isRecord(value)\n              ? constructComplexFilterQuery(key, value, serializer)\n              : handleOperator(key, QueryOperators.$eq, value, serializer),\n          ],\n    ),\n    ` ${AND} `,\n  );\n\nconst constructLogicalFilterQuery = <T>(\n  filters: PongoFilter<T>[] | undefined,\n  joinOperator: typeof AND | typeof OR,\n  serializer: JSONSerializer,\n): SQL => {\n  if (!filters?.length) {\n    return SQL.EMPTY;\n  }\n\n  const subFilterQueries = filters.reduce<SQL[]>((queries, filter) => {\n    const query = constructFilterQuery(filter, serializer);\n    if (!SQL.check.isEmpty(query)) {\n      queries.push(query);\n    }\n\n    return queries;\n  }, []);\n\n  if (subFilterQueries.length === 0) {\n    return SQL.EMPTY;\n  }\n\n  if (subFilterQueries.length === 1) {\n    return wrapFilterQuery(subFilterQueries[0]!);\n  }\n\n  return SQL`(${SQL.merge(subFilterQueries.map(wrapFilterQuery), ` ${joinOperator} `)})`;\n};\n\nconst constructNorFilterQuery = <T>(\n  filters: PongoFilter<T>[] | undefined,\n  serializer: JSONSerializer,\n): SQL => {\n  if (!filters?.length) {\n    return SQL.EMPTY;\n  }\n\n  const logicalFilterQuery = constructLogicalFilterQuery(\n    filters,\n    OR,\n    serializer,\n  );\n  return SQL.check.isEmpty(logicalFilterQuery)\n    ? SQL.EMPTY\n    : SQL`NOT ${logicalFilterQuery}`;\n};\n\nconst constructComplexFilterQuery = (\n  key: string,\n  value: Record<string, unknown>,\n  serializer: JSONSerializer,\n): SQL => {\n  const isEquality = !hasOperators(value);\n\n  return SQL.merge(\n    objectEntries(value).map(([nestedKey, val]) =>\n      isEquality\n        ? handleOperator(\n            `${key}.${nestedKey}`,\n            QueryOperators.$eq,\n            val,\n            serializer,\n          )\n        : handleOperator(key, nestedKey, val, serializer),\n    ),\n    ` ${AND} `,\n  );\n};\n\nconst wrapFilterQuery = (filterQuery: SQL): SQL => SQL`(${filterQuery})`;\n\nconst ensureSupportedRootOperators = (filter: object): void => {\n  for (const operator of unsupportedRootOperators) {\n    if (operator in filter) {\n      throw new Error(`Unsupported root operator: ${operator}`);\n    }\n  }\n};\n\nconst isLogicalRootOperator = (key: string): key is '$and' | '$nor' | '$or' =>\n  key === '$and' || key === '$nor' || key === '$or';\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  value !== null && typeof value === 'object' && !Array.isArray(value);\n","import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { JSONParam, SQL } from '@event-driven-io/dumbo';\nimport { SQLiteJSON } from '@event-driven-io/dumbo/sqlite';\nimport {\n  objectEntries,\n  type $inc,\n  type $push,\n  type $set,\n  type $unset,\n  type PongoUpdate,\n} from '../../../../../core';\n\nexport const buildUpdateQuery = <T>(\n  update: PongoUpdate<T>,\n  serializer: JSONSerializer,\n): SQL =>\n  objectEntries(update).reduce(\n    (currentUpdateQuery, [op, value]) => {\n      switch (op) {\n        case '$set':\n          return buildSetQuery(value, currentUpdateQuery, serializer);\n        case '$unset':\n          return buildUnsetQuery(value, currentUpdateQuery);\n        case '$inc':\n          return buildIncQuery(value, currentUpdateQuery);\n        case '$push':\n          return buildPushQuery(value, currentUpdateQuery, serializer);\n        default:\n          return currentUpdateQuery;\n      }\n    },\n    SQL`data`,\n  );\n\nexport const buildSetQuery = <T>(\n  set: $set<T>,\n  currentUpdateQuery: SQL,\n  serializer: JSONSerializer,\n): SQL =>\n  SQL`json_patch(${currentUpdateQuery}, ${JSONParam.value(set, serializer)})`;\n\nexport const buildUnsetQuery = <T>(\n  unset: $unset<T>,\n  currentUpdateQuery: SQL,\n): SQL => {\n  const keys = Object.keys(unset);\n  let query = currentUpdateQuery;\n  for (const key of keys) {\n    query = SQL`json_remove(${query}, ${SQLiteJSON.path(key)})`;\n  }\n  return query;\n};\n\nexport const buildIncQuery = <T>(\n  inc: $inc<T>,\n  currentUpdateQuery: SQL,\n): SQL => {\n  for (const [key, value] of Object.entries(inc)) {\n    currentUpdateQuery =\n      typeof value === 'bigint'\n        ? SQL`json_set(${currentUpdateQuery}, ${SQLiteJSON.path(key)}, CAST((COALESCE(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)}), 0) + ${value}) AS TEXT))`\n        : SQL`json_set(${currentUpdateQuery}, ${SQLiteJSON.path(key)}, COALESCE(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)}), 0) + ${value})`;\n  }\n  return currentUpdateQuery;\n};\n\nexport const buildPushQuery = <T>(\n  push: $push<T>,\n  currentUpdateQuery: SQL,\n  serializer: JSONSerializer,\n): SQL => {\n  for (const [key, value] of Object.entries(push)) {\n    const serializedValue = JSONParam.value(value, serializer);\n    currentUpdateQuery = SQL`json_set(${currentUpdateQuery}, ${SQLiteJSON.path(key)}, CASE\n      WHEN json_type(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)})) = 'array'\n      THEN json_insert(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)}), '$[#]', json(${serializedValue}))\n      ELSE json(${JSONParam.arrayContaining(value, serializer)})\n    END)`;\n  }\n  return currentUpdateQuery;\n};\n","import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { isSQL, JSONParam, SQL, sqlMigration } from '@event-driven-io/dumbo';\nimport { SQLiteJSON } from '@event-driven-io/dumbo/sqlite';\nimport {\n  expectedVersionPredicate,\n  type DeleteOneOptions,\n  type ExpectedDocumentVersion,\n  type FindOptions,\n  type OptionalUnlessRequiredIdAndVersion,\n  type PongoCollectionSQLBuilder,\n  type PongoFilter,\n  type PongoUpdate,\n  type ReplaceOneOptions,\n  type UpdateOneOptions,\n  type WithId,\n  type WithIdAndVersion,\n  type WithoutId,\n} from '../../../../core';\nimport { constructFilterQuery } from './filter';\nimport { buildUpdateQuery } from './update';\n\nconst versionCheckClause = (\n  expectedVersion: ExpectedDocumentVersion | undefined,\n): SQL => {\n  const predicate = expectedVersionPredicate(expectedVersion);\n  return predicate.operator === 'none'\n    ? SQL.EMPTY\n    : SQL`AND _version = ${predicate.value}`;\n};\n\nconst createCollection = (collectionName: string): SQL =>\n  SQL`\n    CREATE TABLE IF NOT EXISTS ${SQL.identifier(collectionName)} (\n      _id           TEXT           PRIMARY KEY,\n      data          JSON           NOT NULL,\n      metadata      JSON           NOT NULL     DEFAULT '{}',\n      _version      INTEGER        NOT NULL     DEFAULT 1,\n      _partition    TEXT           NOT NULL     DEFAULT 'png_global',\n      _archived     INTEGER        NOT NULL     DEFAULT 0,\n      _created      TEXT           NOT NULL     DEFAULT (datetime('now')),\n      _updated      TEXT           NOT NULL     DEFAULT (datetime('now'))\n  )`;\n\nexport const pongoCollectionSQLiteMigrations = (collectionName: string) => [\n  sqlMigration(`pongoCollection:${collectionName}:001:createtable`, [\n    createCollection(collectionName),\n  ]),\n];\n\nexport const sqliteSQLBuilder = (\n  collectionName: string,\n  serializer: JSONSerializer,\n): PongoCollectionSQLBuilder => ({\n  createCollection: (): SQL => createCollection(collectionName),\n  insertOne: <T>(document: OptionalUnlessRequiredIdAndVersion<T>): SQL => {\n    const serialized = JSONParam.document(document, serializer);\n    const id = document._id;\n    const version = document._version ?? 1n;\n\n    return SQL`\n      INSERT OR IGNORE INTO ${SQL.identifier(collectionName)} (_id, data, _version)\n      VALUES (${id}, ${serialized}, ${version})\n      RETURNING _id;`;\n  },\n  insertMany: <T>(documents: OptionalUnlessRequiredIdAndVersion<T>[]): SQL => {\n    const values = SQL.merge(\n      documents.map(\n        (doc) =>\n          SQL`(${doc._id}, ${JSONParam.document(doc, serializer)}, ${doc._version ?? 1n})`,\n      ),\n      ',',\n    );\n\n    return SQL`\n      INSERT OR IGNORE INTO ${SQL.identifier(collectionName)} (_id, data, _version) VALUES ${values}\n      RETURNING _id;`;\n  },\n  insertOrReplace: <T>(documents: Array<WithId<T>>): SQL => {\n    const col = SQL.identifier(collectionName);\n    const values = SQL.merge(\n      documents.map(\n        (d) =>\n          SQL`(${d._id}, json_patch(${JSONParam.document(d, serializer)}, json_object('_id', ${d._id}, '_version', '1')), 1)`,\n      ),\n      ',',\n    );\n\n    return SQL`\n      INSERT INTO ${col} (_id, data, _version)\n      VALUES ${values}\n      ON CONFLICT(_id) DO UPDATE SET\n        data = json_patch(excluded.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),\n        _version = ${col}._version + 1\n      RETURNING _id, cast(_version as TEXT) as version;`;\n  },\n  updateOne: <T>(\n    filter: PongoFilter<T> | SQL,\n    update: PongoUpdate<T> | SQL,\n    options?: UpdateOneOptions,\n  ): SQL => {\n    const expectedVersionCheck = versionCheckClause(options?.expectedVersion);\n\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    const updateQuery = isSQL(update)\n      ? update\n      : buildUpdateQuery(update, serializer);\n\n    return SQL`\n      UPDATE ${SQL.identifier(collectionName)}\n      SET\n        data = json_patch(${updateQuery}, json_object('_id', _id, '_version', cast(_version + 1 as TEXT))),\n        _version = _version + 1,\n        _updated = datetime('now')\n      WHERE _id = (\n        SELECT _id FROM ${SQL.identifier(collectionName)}\n        ${where(filterQuery)}\n        LIMIT 1\n      ) ${expectedVersionCheck}\n      RETURNING\n        _id,\n        cast(_version as TEXT) as version,\n        1 as matched,\n        1 as modified;`;\n  },\n  replaceOne: <T>(\n    filter: PongoFilter<T> | SQL,\n    document: WithoutId<T>,\n    options?: ReplaceOneOptions,\n  ): SQL => {\n    const expectedVersionCheck = versionCheckClause(options?.expectedVersion);\n\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`\n      UPDATE ${SQL.identifier(collectionName)}\n      SET\n        data = json_patch(${JSONParam.document(document, serializer)}, json_object('_id', _id, '_version', cast(_version + 1 as TEXT))),\n        _version = _version + 1,\n        _updated = datetime('now')\n      WHERE _id = (\n        SELECT _id FROM ${SQL.identifier(collectionName)}\n        ${where(filterQuery)}\n        LIMIT 1\n      ) ${expectedVersionCheck}\n      RETURNING\n        _id,\n        cast(_version as TEXT) AS version,\n        1 AS matched,\n        1 AS modified;`;\n  },\n  updateMany: <T>(\n    filter: PongoFilter<T> | SQL,\n    update: PongoUpdate<T> | SQL,\n  ): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    const updateQuery = isSQL(update)\n      ? update\n      : buildUpdateQuery(update, serializer);\n\n    return SQL`\n      UPDATE ${SQL.identifier(collectionName)}\n      SET\n        data = json_patch(${updateQuery}, json_object('_version', cast(_version + 1 as TEXT))),\n        _version = _version + 1,\n        _updated = datetime('now')\n      ${where(filterQuery)}\n      RETURNING _id;`;\n  },\n  deleteOne: <T>(\n    filter: PongoFilter<T> | SQL,\n    options?: DeleteOneOptions,\n  ): SQL => {\n    const expectedVersionCheck = versionCheckClause(options?.expectedVersion);\n\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`\n      DELETE FROM ${SQL.identifier(collectionName)}\n      WHERE _id = (\n        SELECT _id FROM ${SQL.identifier(collectionName)}\n        ${where(filterQuery)}\n        LIMIT 1\n      ) ${expectedVersionCheck}\n      RETURNING\n        _id,\n        1 AS matched,\n        1 AS deleted;`;\n  },\n  deleteMany: <T>(filter: PongoFilter<T> | SQL): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`DELETE FROM ${SQL.identifier(collectionName)} ${where(filterQuery)} RETURNING _id`;\n  },\n  replaceMany: <T>(\n    documents: Array<WithIdAndVersion<T>> | Array<WithId<T>>,\n  ): SQL => {\n    const col = SQL.identifier(collectionName);\n    const hasVersions = documents.some(\n      (d) => '_version' in d && d._version !== undefined,\n    );\n\n    if (hasVersions) {\n      const values = SQL.merge(\n        documents.map((d) => {\n          const expectedVersion = (d as WithIdAndVersion<T>)._version;\n          return expectedVersion !== undefined\n            ? SQL`(${d._id}, ${JSONParam.document(d, serializer)}, ${expectedVersion})`\n            : SQL`(${d._id}, ${JSONParam.document(d, serializer)}, NULL)`;\n        }),\n        ',',\n      );\n      return SQL`\n        WITH replacements(_id, data, expected_version) AS (\n          VALUES ${values}\n        )\n        UPDATE ${col}\n        SET\n          data = json_patch(r.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),\n          _version = ${col}._version + 1,\n          _updated = datetime('now')\n        FROM replacements r\n        WHERE ${col}._id = r._id AND (r.expected_version IS NULL OR ${col}._version = r.expected_version)\n        RETURNING ${col}._id, cast(${col}._version as TEXT) as version;`;\n    }\n\n    const values = SQL.merge(\n      documents.map(\n        (d) => SQL`(${d._id}, ${JSONParam.document(d, serializer)})`,\n      ),\n      ',',\n    );\n    return SQL`\n      WITH replacements(_id, data) AS (\n        VALUES ${values}\n      )\n      UPDATE ${col}\n      SET\n        data = json_patch(r.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),\n        _version = ${col}._version + 1,\n        _updated = datetime('now')\n      FROM replacements r\n      WHERE ${col}._id = r._id\n      RETURNING ${col}._id, cast(${col}._version as TEXT) as version;`;\n  },\n  deleteManyByIds: (ids: Array<{ _id: string; _version?: bigint }>): SQL => {\n    const hasVersions = ids.some((d) => d._version !== undefined);\n\n    if (hasVersions) {\n      const values = SQL.merge(\n        ids.map((d) => SQL`(${d._id}, ${d._version ?? 0n})`),\n        ',',\n      );\n\n      return SQL`\n        WITH targets(_id, expected_version) AS (\n          VALUES ${values}\n        )\n        DELETE FROM ${SQL.identifier(collectionName)}\n        WHERE _id IN (SELECT _id FROM targets)\n          AND _version = (SELECT expected_version FROM targets WHERE targets._id = ${SQL.identifier(collectionName)}._id)\n        RETURNING _id;`;\n    }\n\n    const idList = SQL.merge(\n      ids.map((d) => SQL`${d._id}`),\n      ',',\n    );\n\n    return SQL`\n      DELETE FROM ${SQL.identifier(collectionName)}\n      WHERE _id IN (${idList})\n      RETURNING _id;`;\n  },\n  findOne: <T>(filter: PongoFilter<T> | SQL): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`SELECT data, _id, _version FROM ${SQL.identifier(collectionName)} ${where(filterQuery)} LIMIT 1;`;\n  },\n  find: <T>(filter: PongoFilter<T> | SQL, options?: FindOptions): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    const query: SQL[] = [];\n\n    query.push(\n      SQL`SELECT data, _id, _version FROM ${SQL.identifier(collectionName)}`,\n    );\n\n    query.push(where(filterQuery));\n\n    if (options?.sort && Object.keys(options.sort).length > 0) {\n      const clauses = Object.entries(options.sort).map(([field, dir]) => {\n        // _id and _version are native columns, not JSON fields.\n        const isMetadata = field === '_id' || field === '_version';\n        const accessor = isMetadata\n          ? SQL`${SQL.identifier(field)}`\n          : SQL`json_extract(data, ${SQLiteJSON.path(field)})`;\n        return dir === 1 ? SQL`${accessor} ASC` : SQL`${accessor} DESC`;\n      });\n      query.push(SQL`ORDER BY ${SQL.merge(clauses, ',')}`);\n    }\n\n    if (options?.limit) {\n      query.push(SQL`LIMIT ${options.limit}`);\n    }\n\n    if (options?.skip) {\n      query.push(SQL`OFFSET ${options.skip}`);\n    }\n\n    return SQL.merge([...query, SQL`;`]);\n  },\n  countDocuments: <T>(filter: PongoFilter<T> | SQL): SQL => {\n    const filterQuery = SQL.check.isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    return SQL`SELECT COUNT(1) as count FROM ${SQL.identifier(collectionName)} ${where(filterQuery)};`;\n  },\n  rename: (newName: string): SQL =>\n    SQL`ALTER TABLE ${SQL.identifier(collectionName)} RENAME TO ${SQL.identifier(newName)};`,\n  drop: (targetName: string = collectionName): SQL =>\n    SQL`DROP TABLE IF EXISTS ${SQL.identifier(targetName)}`,\n});\n\nconst where = (filterQuery: SQL): SQL =>\n  SQL.check.isEmpty(filterQuery)\n    ? SQL.EMPTY\n    : SQL.merge([SQL`WHERE `, filterQuery]);\n"],"mappings":"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"}

package/dist/{core-CkmE5dkK.cjs → core-q2eF-VHQ.cjs}

@@ -1,19 +1,20 @@
 const require_core = require('./core-C9SB3XMx.cjs');
 const require_cli = require('./cli.cjs');
 let _event_driven_io_dumbo = require("@event-driven-io/dumbo");
+let _event_driven_io_dumbo_sqlite = require("@event-driven-io/dumbo/sqlite");
 
 //#region src/storage/sqlite/core/sqlBuilder/filter/queryOperators.ts
 const handleOperator = (path, operator, value, serializer) => {
 	if (path === "_id" || path === "_version") return handleMetadataOperator(path, operator, value);
 	switch (operator) {
 		case "$eq": {
-			const jsonPath = buildJsonPath(path);
+			const jsonPath = _event_driven_io_dumbo_sqlite.SQLiteJSON.path(path);
 			return _event_driven_io_dumbo.SQL`(
-        json_extract(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}') = ${value}
+        json_extract(data, ${jsonPath}) = ${value}
         OR (
-          json_type(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}') = 'array'
+          json_type(data, ${jsonPath}) = 'array'
           AND EXISTS(
-            SELECT 1 FROM json_each(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}')
+            SELECT 1 FROM json_each(data, ${jsonPath})
             WHERE json_each.value = ${value}
           )
         )
@@ -23,37 +24,26 @@ const handleOperator = (path, operator, value, serializer) => {
 		case "$gte":
 		case "$lt":
 		case "$lte":
-		case "$ne": {
-			const jsonPath = buildJsonPath(path);
-			return _event_driven_io_dumbo.SQL`json_extract(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}') ${_event_driven_io_dumbo.SQL.plain(require_core.OperatorMap[operator])} ${value}`;
-		}
+		case "$ne": return _event_driven_io_dumbo.SQL`json_extract(data, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(path)}) ${_event_driven_io_dumbo.SQL.plain(require_core.OperatorMap[operator])} ${value}`;
 		case "$in": {
-			const jsonPath = buildJsonPath(path);
+			const jsonPath = _event_driven_io_dumbo_sqlite.SQLiteJSON.path(path);
 			const values = value;
-			const inClause = _event_driven_io_dumbo.SQL.merge(values.map((v) => _event_driven_io_dumbo.SQL`${v}`), ", ");
-			return _event_driven_io_dumbo.SQL`json_extract(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}') IN (${inClause})`;
+			return _event_driven_io_dumbo.SQL`json_extract(data, ${jsonPath}) IN (${_event_driven_io_dumbo.SQL.merge(values.map((v) => _event_driven_io_dumbo.SQL`${v}`), ", ")})`;
 		}
 		case "$nin": {
-			const jsonPath = buildJsonPath(path);
+			const jsonPath = _event_driven_io_dumbo_sqlite.SQLiteJSON.path(path);
 			const values = value;
-			const inClause = _event_driven_io_dumbo.SQL.merge(values.map((v) => _event_driven_io_dumbo.SQL`${v}`), ", ");
-			return _event_driven_io_dumbo.SQL`json_extract(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}') NOT IN (${inClause})`;
+			return _event_driven_io_dumbo.SQL`json_extract(data, ${jsonPath}) NOT IN (${_event_driven_io_dumbo.SQL.merge(values.map((v) => _event_driven_io_dumbo.SQL`${v}`), ", ")})`;
 		}
 		case "$elemMatch": {
-			const subConditions = require_core.objectEntries(value).map(([subKey, subValue]) => {
-				return `json_extract(value, '$.${subKey}') = json('${serializer.serialize(subValue)}')`;
-			}).join(" AND ");
-			const jsonPath = buildJsonPath(path);
-			return _event_driven_io_dumbo.SQL`EXISTS(SELECT 1 FROM json_each(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}') WHERE ${_event_driven_io_dumbo.SQL.plain(subConditions)})`;
+			const subConditions = require_core.objectEntries(value).map(([subKey, subValue]) => _event_driven_io_dumbo.SQL`json_extract(value, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(subKey)}) = json(${_event_driven_io_dumbo.JSONParam.value(subValue, serializer)})`);
+			return _event_driven_io_dumbo.SQL`EXISTS(SELECT 1 FROM json_each(data, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(path)}) WHERE ${_event_driven_io_dumbo.SQL.merge(subConditions, " AND ")})`;
 		}
 		case "$all": {
-			const jsonPath = buildJsonPath(path);
-			return _event_driven_io_dumbo.SQL`(SELECT COUNT(*) FROM json_each(json(${serializer.serialize(value)})) WHERE json_each.value NOT IN (SELECT value FROM json_each(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}'))) = 0`;
-		}
-		case "$size": {
-			const jsonPath = buildJsonPath(path);
-			return _event_driven_io_dumbo.SQL`json_array_length(json_extract(data, '${_event_driven_io_dumbo.SQL.plain(jsonPath)}')) = ${value}`;
+			const jsonPath = _event_driven_io_dumbo_sqlite.SQLiteJSON.path(path);
+			return _event_driven_io_dumbo.SQL`(SELECT COUNT(*) FROM json_each(json(${_event_driven_io_dumbo.JSONParam.value(value, serializer)})) WHERE json_each.value NOT IN (SELECT value FROM json_each(data, ${jsonPath}))) = 0`;
 		}
+		case "$size": return _event_driven_io_dumbo.SQL`json_array_length(json_extract(data, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(path)})) = ${value}`;
 		default: throw new Error(`Unsupported operator: ${operator}`);
 	}
 };
@@ -78,9 +68,6 @@ const handleMetadataOperator = (fieldName, operator, value) => {
 		default: throw new Error(`Unsupported operator: ${operator}`);
 	}
 };
-const buildJsonPath = (path) => {
-	return `$.${path}`;
-};
 
 //#endregion
 //#region src/storage/sqlite/core/sqlBuilder/filter/index.ts
@@ -143,24 +130,24 @@ const buildUpdateQuery = (update, serializer) => require_core.objectEntries(upda
 		default: return currentUpdateQuery;
 	}
 }, _event_driven_io_dumbo.SQL`data`);
-const buildSetQuery = (set, currentUpdateQuery, serializer) => _event_driven_io_dumbo.SQL`json_patch(${currentUpdateQuery}, ${serializer.serialize(set)})`;
+const buildSetQuery = (set, currentUpdateQuery, serializer) => _event_driven_io_dumbo.SQL`json_patch(${currentUpdateQuery}, ${_event_driven_io_dumbo.JSONParam.value(set, serializer)})`;
 const buildUnsetQuery = (unset, currentUpdateQuery) => {
 	const keys = Object.keys(unset);
 	let query = currentUpdateQuery;
-	for (const key of keys) query = _event_driven_io_dumbo.SQL`json_remove(${query}, '$.${_event_driven_io_dumbo.SQL.plain(key)}')`;
+	for (const key of keys) query = _event_driven_io_dumbo.SQL`json_remove(${query}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)})`;
 	return query;
 };
 const buildIncQuery = (inc, currentUpdateQuery) => {
-	for (const [key, value] of Object.entries(inc)) currentUpdateQuery = typeof value === "bigint" ? _event_driven_io_dumbo.SQL`json_set(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}', CAST((COALESCE(json_extract(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}'), 0) + ${value}) AS TEXT))` : _event_driven_io_dumbo.SQL`json_set(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}', COALESCE(json_extract(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}'), 0) + ${value})`;
+	for (const [key, value] of Object.entries(inc)) currentUpdateQuery = typeof value === "bigint" ? _event_driven_io_dumbo.SQL`json_set(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)}, CAST((COALESCE(json_extract(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)}), 0) + ${value}) AS TEXT))` : _event_driven_io_dumbo.SQL`json_set(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)}, COALESCE(json_extract(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)}), 0) + ${value})`;
 	return currentUpdateQuery;
 };
 const buildPushQuery = (push, currentUpdateQuery, serializer) => {
 	for (const [key, value] of Object.entries(push)) {
-		const serializedValue = serializer.serialize(value);
-		currentUpdateQuery = _event_driven_io_dumbo.SQL`json_set(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}', CASE
-      WHEN json_type(json_extract(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}')) = 'array'
-      THEN json_insert(json_extract(${currentUpdateQuery}, '$.${_event_driven_io_dumbo.SQL.plain(key)}'), '$[#]', json(${serializedValue}))
-      ELSE json_array(json(${serializedValue}))
+		const serializedValue = _event_driven_io_dumbo.JSONParam.value(value, serializer);
+		currentUpdateQuery = _event_driven_io_dumbo.SQL`json_set(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)}, CASE
+      WHEN json_type(json_extract(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)})) = 'array'
+      THEN json_insert(json_extract(${currentUpdateQuery}, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(key)}), '$[#]', json(${serializedValue}))
+      ELSE json(${_event_driven_io_dumbo.JSONParam.arrayContaining(value, serializer)})
     END)`;
 	}
 	return currentUpdateQuery;
@@ -187,7 +174,7 @@ const pongoCollectionSQLiteMigrations = (collectionName) => [(0, _event_driven_i
 const sqliteSQLBuilder = (collectionName, serializer) => ({
 	createCollection: () => createCollection(collectionName),
 	insertOne: (document) => {
-		const serialized = document;
+		const serialized = _event_driven_io_dumbo.JSONParam.document(document, serializer);
 		const id = document._id;
 		const version = document._version ?? 1n;
 		return _event_driven_io_dumbo.SQL`
@@ -196,7 +183,7 @@ const sqliteSQLBuilder = (collectionName, serializer) => ({
       RETURNING _id;`;
 	},
 	insertMany: (documents) => {
-		const values = _event_driven_io_dumbo.SQL.merge(documents.map((doc) => _event_driven_io_dumbo.SQL`(${doc._id}, ${serializer.serialize(doc)}, ${doc._version ?? 1n})`), ",");
+		const values = _event_driven_io_dumbo.SQL.merge(documents.map((doc) => _event_driven_io_dumbo.SQL`(${doc._id}, ${_event_driven_io_dumbo.JSONParam.document(doc, serializer)}, ${doc._version ?? 1n})`), ",");
 		return _event_driven_io_dumbo.SQL`
       INSERT OR IGNORE INTO ${_event_driven_io_dumbo.SQL.identifier(collectionName)} (_id, data, _version) VALUES ${values}
       RETURNING _id;`;
@@ -205,7 +192,7 @@ const sqliteSQLBuilder = (collectionName, serializer) => ({
 		const col = _event_driven_io_dumbo.SQL.identifier(collectionName);
 		return _event_driven_io_dumbo.SQL`
       INSERT INTO ${col} (_id, data, _version)
-      VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}, json_patch(${serializer.serialize(d)}, json_object('_id', ${d._id}, '_version', '1')), 1)`), ",")}
+      VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}, json_patch(${_event_driven_io_dumbo.JSONParam.document(d, serializer)}, json_object('_id', ${d._id}, '_version', '1')), 1)`), ",")}
       ON CONFLICT(_id) DO UPDATE SET
         data = json_patch(excluded.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),
         _version = ${col}._version + 1
@@ -238,7 +225,7 @@ const sqliteSQLBuilder = (collectionName, serializer) => ({
 		return _event_driven_io_dumbo.SQL`
       UPDATE ${_event_driven_io_dumbo.SQL.identifier(collectionName)}
       SET
-        data = json_patch(${serializer.serialize(document)}, json_object('_id', _id, '_version', cast(_version + 1 as TEXT))),
+        data = json_patch(${_event_driven_io_dumbo.JSONParam.document(document, serializer)}, json_object('_id', _id, '_version', cast(_version + 1 as TEXT))),
         _version = _version + 1,
         _updated = datetime('now')
       WHERE _id = (
@@ -289,7 +276,7 @@ const sqliteSQLBuilder = (collectionName, serializer) => ({
         WITH replacements(_id, data, expected_version) AS (
           VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => {
 			const expectedVersion = d._version;
-			return expectedVersion !== void 0 ? _event_driven_io_dumbo.SQL`(${d._id}, ${serializer.serialize(d)}, ${expectedVersion})` : _event_driven_io_dumbo.SQL`(${d._id}, ${serializer.serialize(d)}, NULL)`;
+			return expectedVersion !== void 0 ? _event_driven_io_dumbo.SQL`(${d._id}, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)}, ${expectedVersion})` : _event_driven_io_dumbo.SQL`(${d._id}, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)}, NULL)`;
 		}), ",")}
         )
         UPDATE ${col}
@@ -302,7 +289,7 @@ const sqliteSQLBuilder = (collectionName, serializer) => ({
         RETURNING ${col}._id, cast(${col}._version as TEXT) as version;`;
 		return _event_driven_io_dumbo.SQL`
       WITH replacements(_id, data) AS (
-        VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}, ${serializer.serialize(d)})`), ",")}
+        VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)})`), ",")}
       )
       UPDATE ${col}
       SET
@@ -339,7 +326,7 @@ const sqliteSQLBuilder = (collectionName, serializer) => ({
 		query.push(where(filterQuery));
 		if (options?.sort && Object.keys(options.sort).length > 0) {
 			const clauses = Object.entries(options.sort).map(([field, dir]) => {
-				const accessor = field === "_id" || field === "_version" ? _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo.SQL.plain(field)}` : _event_driven_io_dumbo.SQL`json_extract(data, '${_event_driven_io_dumbo.SQL.plain(`$.${field}`)}')`;
+				const accessor = field === "_id" || field === "_version" ? _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo.SQL.identifier(field)}` : _event_driven_io_dumbo.SQL`json_extract(data, ${_event_driven_io_dumbo_sqlite.SQLiteJSON.path(field)})`;
 				return dir === 1 ? _event_driven_io_dumbo.SQL`${accessor} ASC` : _event_driven_io_dumbo.SQL`${accessor} DESC`;
 			});
 			query.push(_event_driven_io_dumbo.SQL`ORDER BY ${_event_driven_io_dumbo.SQL.merge(clauses, ",")}`);
@@ -370,4 +357,4 @@ Object.defineProperty(exports, 'sqliteSQLBuilder', {
     return sqliteSQLBuilder;
   }
 });
-//# sourceMappingURL=core-CkmE5dkK.cjs.map
+//# sourceMappingURL=core-q2eF-VHQ.cjs.map

package/dist/core-q2eF-VHQ.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"core-q2eF-VHQ.cjs","names":["SQLiteJSON","SQL","OperatorMap","objectEntries","JSONParam","SQL","objectEntries","QueryOperators","hasOperators","objectEntries","JSONParam","SQLiteJSON","expectedVersionPredicate","SQL","JSONParam","SQLiteJSON"],"sources":["../src/storage/sqlite/core/sqlBuilder/filter/queryOperators.ts","../src/storage/sqlite/core/sqlBuilder/filter/index.ts","../src/storage/sqlite/core/sqlBuilder/update/index.ts","../src/storage/sqlite/core/sqlBuilder/index.ts"],"sourcesContent":["import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { JSONParam, SQL } from '@event-driven-io/dumbo';\nimport { SQLiteJSON } from '@event-driven-io/dumbo/sqlite';\nimport { objectEntries, OperatorMap } from '../../../../../core';\n\nexport const handleOperator = (\n  path: string,\n  operator: string,\n  value: unknown,\n  serializer: JSONSerializer,\n): SQL => {\n  if (path === '_id' || path === '_version') {\n    return handleMetadataOperator(path, operator, value);\n  }\n\n  switch (operator) {\n    case '$eq': {\n      const jsonPath = SQLiteJSON.path(path);\n\n      return SQL`(\n        json_extract(data, ${jsonPath}) = ${value}\n        OR (\n          json_type(data, ${jsonPath}) = 'array'\n          AND EXISTS(\n            SELECT 1 FROM json_each(data, ${jsonPath})\n            WHERE json_each.value = ${value}\n          )\n        )\n      )`;\n    }\n    case '$gt':\n    case '$gte':\n    case '$lt':\n    case '$lte':\n    case '$ne': {\n      const jsonPath = SQLiteJSON.path(path);\n\n      return SQL`json_extract(data, ${jsonPath}) ${SQL.plain(OperatorMap[operator])} ${value}`;\n    }\n    case '$in': {\n      const jsonPath = SQLiteJSON.path(path);\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n\n      return SQL`json_extract(data, ${jsonPath}) IN (${inClause})`;\n    }\n    case '$nin': {\n      const jsonPath = SQLiteJSON.path(path);\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n\n      return SQL`json_extract(data, ${jsonPath}) NOT IN (${inClause})`;\n    }\n    case '$elemMatch': {\n      const subConditions = objectEntries(value as Record<string, unknown>).map(\n        ([subKey, subValue]) =>\n          SQL`json_extract(value, ${SQLiteJSON.path(subKey)}) = json(${JSONParam.value(subValue, serializer)})`,\n      );\n\n      const jsonPath = SQLiteJSON.path(path);\n      return SQL`EXISTS(SELECT 1 FROM json_each(data, ${jsonPath}) WHERE ${SQL.merge(subConditions, ' AND ')})`;\n    }\n    case '$all': {\n      const jsonPath = SQLiteJSON.path(path);\n      const serializedValue = JSONParam.value(value, serializer);\n\n      return SQL`(SELECT COUNT(*) FROM json_each(json(${serializedValue})) WHERE json_each.value NOT IN (SELECT value FROM json_each(data, ${jsonPath}))) = 0`;\n    }\n    case '$size': {\n      const jsonPath = SQLiteJSON.path(path);\n\n      return SQL`json_array_length(json_extract(data, ${jsonPath})) = ${value}`;\n    }\n    default:\n      throw new Error(`Unsupported operator: ${operator}`);\n  }\n};\n\nconst handleMetadataOperator = (\n  fieldName: string,\n  operator: string,\n  value: unknown,\n): SQL => {\n  switch (operator) {\n    case '$eq':\n      return SQL`${SQL.plain(fieldName)} = ${value}`;\n    case '$gt':\n    case '$gte':\n    case '$lt':\n    case '$lte':\n    case '$ne':\n      return SQL`${SQL.plain(fieldName)} ${SQL.plain(OperatorMap[operator])} ${value}`;\n    case '$in': {\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n      return SQL`${SQL.plain(fieldName)} IN (${inClause})`;\n    }\n    case '$nin': {\n      const values = value as unknown[];\n      const inClause = SQL.merge(\n        values.map((v) => SQL`${v}`),\n        ', ',\n      );\n      return SQL`${SQL.plain(fieldName)} NOT IN (${inClause})`;\n    }\n    default:\n      throw new Error(`Unsupported operator: ${operator}`);\n  }\n};\n","import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { SQL } from '@event-driven-io/dumbo';\nimport {\n  hasOperators,\n  objectEntries,\n  QueryOperators,\n  type PongoFilter,\n} from '../../../../../core';\nimport { handleOperator } from './queryOperators';\n\nexport * from './queryOperators';\n\nconst AND = 'AND';\nconst OR = 'OR';\n\nconst unsupportedRootOperators = ['$text', '$where', '$comment'] as const;\n\nexport const constructFilterQuery = <T>(\n  filter: PongoFilter<T>,\n  serializer: JSONSerializer,\n): SQL => {\n  ensureSupportedRootOperators(filter);\n  const parts: SQL[] = [];\n\n  const fieldFilterQuery = constructFieldFilterQuery(filter, serializer);\n  if (!SQL.check.isEmpty(fieldFilterQuery)) {\n    parts.push(fieldFilterQuery);\n  }\n\n  const orFilterQuery = constructLogicalFilterQuery(filter.$or, OR, serializer);\n  if (!SQL.check.isEmpty(orFilterQuery)) {\n    parts.push(orFilterQuery);\n  }\n\n  const andFilterQuery = constructLogicalFilterQuery(\n    filter.$and,\n    AND,\n    serializer,\n  );\n  if (!SQL.check.isEmpty(andFilterQuery)) {\n    parts.push(andFilterQuery);\n  }\n\n  const norFilterQuery = constructNorFilterQuery(filter.$nor, serializer);\n  if (!SQL.check.isEmpty(norFilterQuery)) {\n    parts.push(norFilterQuery);\n  }\n\n  return SQL.merge(parts, ` ${AND} `);\n};\n\nconst constructFieldFilterQuery = <T>(\n  filter: PongoFilter<T>,\n  serializer: JSONSerializer,\n): SQL =>\n  SQL.merge(\n    objectEntries(filter).flatMap(([key, value]) =>\n      isLogicalRootOperator(key)\n        ? []\n        : [\n            isRecord(value)\n              ? constructComplexFilterQuery(key, value, serializer)\n              : handleOperator(key, QueryOperators.$eq, value, serializer),\n          ],\n    ),\n    ` ${AND} `,\n  );\n\nconst constructLogicalFilterQuery = <T>(\n  filters: PongoFilter<T>[] | undefined,\n  joinOperator: typeof AND | typeof OR,\n  serializer: JSONSerializer,\n): SQL => {\n  if (!filters?.length) {\n    return SQL.EMPTY;\n  }\n\n  const subFilterQueries = filters.reduce<SQL[]>((queries, filter) => {\n    const query = constructFilterQuery(filter, serializer);\n    if (!SQL.check.isEmpty(query)) {\n      queries.push(query);\n    }\n\n    return queries;\n  }, []);\n\n  if (subFilterQueries.length === 0) {\n    return SQL.EMPTY;\n  }\n\n  if (subFilterQueries.length === 1) {\n    return wrapFilterQuery(subFilterQueries[0]!);\n  }\n\n  return SQL`(${SQL.merge(subFilterQueries.map(wrapFilterQuery), ` ${joinOperator} `)})`;\n};\n\nconst constructNorFilterQuery = <T>(\n  filters: PongoFilter<T>[] | undefined,\n  serializer: JSONSerializer,\n): SQL => {\n  if (!filters?.length) {\n    return SQL.EMPTY;\n  }\n\n  const logicalFilterQuery = constructLogicalFilterQuery(\n    filters,\n    OR,\n    serializer,\n  );\n  return SQL.check.isEmpty(logicalFilterQuery)\n    ? SQL.EMPTY\n    : SQL`NOT ${logicalFilterQuery}`;\n};\n\nconst constructComplexFilterQuery = (\n  key: string,\n  value: Record<string, unknown>,\n  serializer: JSONSerializer,\n): SQL => {\n  const isEquality = !hasOperators(value);\n\n  return SQL.merge(\n    objectEntries(value).map(([nestedKey, val]) =>\n      isEquality\n        ? handleOperator(\n            `${key}.${nestedKey}`,\n            QueryOperators.$eq,\n            val,\n            serializer,\n          )\n        : handleOperator(key, nestedKey, val, serializer),\n    ),\n    ` ${AND} `,\n  );\n};\n\nconst wrapFilterQuery = (filterQuery: SQL): SQL => SQL`(${filterQuery})`;\n\nconst ensureSupportedRootOperators = (filter: object): void => {\n  for (const operator of unsupportedRootOperators) {\n    if (operator in filter) {\n      throw new Error(`Unsupported root operator: ${operator}`);\n    }\n  }\n};\n\nconst isLogicalRootOperator = (key: string): key is '$and' | '$nor' | '$or' =>\n  key === '$and' || key === '$nor' || key === '$or';\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  value !== null && typeof value === 'object' && !Array.isArray(value);\n","import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { JSONParam, SQL } from '@event-driven-io/dumbo';\nimport { SQLiteJSON } from '@event-driven-io/dumbo/sqlite';\nimport {\n  objectEntries,\n  type $inc,\n  type $push,\n  type $set,\n  type $unset,\n  type PongoUpdate,\n} from '../../../../../core';\n\nexport const buildUpdateQuery = <T>(\n  update: PongoUpdate<T>,\n  serializer: JSONSerializer,\n): SQL =>\n  objectEntries(update).reduce(\n    (currentUpdateQuery, [op, value]) => {\n      switch (op) {\n        case '$set':\n          return buildSetQuery(value, currentUpdateQuery, serializer);\n        case '$unset':\n          return buildUnsetQuery(value, currentUpdateQuery);\n        case '$inc':\n          return buildIncQuery(value, currentUpdateQuery);\n        case '$push':\n          return buildPushQuery(value, currentUpdateQuery, serializer);\n        default:\n          return currentUpdateQuery;\n      }\n    },\n    SQL`data`,\n  );\n\nexport const buildSetQuery = <T>(\n  set: $set<T>,\n  currentUpdateQuery: SQL,\n  serializer: JSONSerializer,\n): SQL =>\n  SQL`json_patch(${currentUpdateQuery}, ${JSONParam.value(set, serializer)})`;\n\nexport const buildUnsetQuery = <T>(\n  unset: $unset<T>,\n  currentUpdateQuery: SQL,\n): SQL => {\n  const keys = Object.keys(unset);\n  let query = currentUpdateQuery;\n  for (const key of keys) {\n    query = SQL`json_remove(${query}, ${SQLiteJSON.path(key)})`;\n  }\n  return query;\n};\n\nexport const buildIncQuery = <T>(\n  inc: $inc<T>,\n  currentUpdateQuery: SQL,\n): SQL => {\n  for (const [key, value] of Object.entries(inc)) {\n    currentUpdateQuery =\n      typeof value === 'bigint'\n        ? SQL`json_set(${currentUpdateQuery}, ${SQLiteJSON.path(key)}, CAST((COALESCE(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)}), 0) + ${value}) AS TEXT))`\n        : SQL`json_set(${currentUpdateQuery}, ${SQLiteJSON.path(key)}, COALESCE(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)}), 0) + ${value})`;\n  }\n  return currentUpdateQuery;\n};\n\nexport const buildPushQuery = <T>(\n  push: $push<T>,\n  currentUpdateQuery: SQL,\n  serializer: JSONSerializer,\n): SQL => {\n  for (const [key, value] of Object.entries(push)) {\n    const serializedValue = JSONParam.value(value, serializer);\n    currentUpdateQuery = SQL`json_set(${currentUpdateQuery}, ${SQLiteJSON.path(key)}, CASE\n      WHEN json_type(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)})) = 'array'\n      THEN json_insert(json_extract(${currentUpdateQuery}, ${SQLiteJSON.path(key)}), '$[#]', json(${serializedValue}))\n      ELSE json(${JSONParam.arrayContaining(value, serializer)})\n    END)`;\n  }\n  return currentUpdateQuery;\n};\n","import type { JSONSerializer } from '@event-driven-io/dumbo';\nimport { isSQL, JSONParam, SQL, sqlMigration } from '@event-driven-io/dumbo';\nimport { SQLiteJSON } from '@event-driven-io/dumbo/sqlite';\nimport {\n  expectedVersionPredicate,\n  type DeleteOneOptions,\n  type ExpectedDocumentVersion,\n  type FindOptions,\n  type OptionalUnlessRequiredIdAndVersion,\n  type PongoCollectionSQLBuilder,\n  type PongoFilter,\n  type PongoUpdate,\n  type ReplaceOneOptions,\n  type UpdateOneOptions,\n  type WithId,\n  type WithIdAndVersion,\n  type WithoutId,\n} from '../../../../core';\nimport { constructFilterQuery } from './filter';\nimport { buildUpdateQuery } from './update';\n\nconst versionCheckClause = (\n  expectedVersion: ExpectedDocumentVersion | undefined,\n): SQL => {\n  const predicate = expectedVersionPredicate(expectedVersion);\n  return predicate.operator === 'none'\n    ? SQL.EMPTY\n    : SQL`AND _version = ${predicate.value}`;\n};\n\nconst createCollection = (collectionName: string): SQL =>\n  SQL`\n    CREATE TABLE IF NOT EXISTS ${SQL.identifier(collectionName)} (\n      _id           TEXT           PRIMARY KEY,\n      data          JSON           NOT NULL,\n      metadata      JSON           NOT NULL     DEFAULT '{}',\n      _version      INTEGER        NOT NULL     DEFAULT 1,\n      _partition    TEXT           NOT NULL     DEFAULT 'png_global',\n      _archived     INTEGER        NOT NULL     DEFAULT 0,\n      _created      TEXT           NOT NULL     DEFAULT (datetime('now')),\n      _updated      TEXT           NOT NULL     DEFAULT (datetime('now'))\n  )`;\n\nexport const pongoCollectionSQLiteMigrations = (collectionName: string) => [\n  sqlMigration(`pongoCollection:${collectionName}:001:createtable`, [\n    createCollection(collectionName),\n  ]),\n];\n\nexport const sqliteSQLBuilder = (\n  collectionName: string,\n  serializer: JSONSerializer,\n): PongoCollectionSQLBuilder => ({\n  createCollection: (): SQL => createCollection(collectionName),\n  insertOne: <T>(document: OptionalUnlessRequiredIdAndVersion<T>): SQL => {\n    const serialized = JSONParam.document(document, serializer);\n    const id = document._id;\n    const version = document._version ?? 1n;\n\n    return SQL`\n      INSERT OR IGNORE INTO ${SQL.identifier(collectionName)} (_id, data, _version)\n      VALUES (${id}, ${serialized}, ${version})\n      RETURNING _id;`;\n  },\n  insertMany: <T>(documents: OptionalUnlessRequiredIdAndVersion<T>[]): SQL => {\n    const values = SQL.merge(\n      documents.map(\n        (doc) =>\n          SQL`(${doc._id}, ${JSONParam.document(doc, serializer)}, ${doc._version ?? 1n})`,\n      ),\n      ',',\n    );\n\n    return SQL`\n      INSERT OR IGNORE INTO ${SQL.identifier(collectionName)} (_id, data, _version) VALUES ${values}\n      RETURNING _id;`;\n  },\n  insertOrReplace: <T>(documents: Array<WithId<T>>): SQL => {\n    const col = SQL.identifier(collectionName);\n    const values = SQL.merge(\n      documents.map(\n        (d) =>\n          SQL`(${d._id}, json_patch(${JSONParam.document(d, serializer)}, json_object('_id', ${d._id}, '_version', '1')), 1)`,\n      ),\n      ',',\n    );\n\n    return SQL`\n      INSERT INTO ${col} (_id, data, _version)\n      VALUES ${values}\n      ON CONFLICT(_id) DO UPDATE SET\n        data = json_patch(excluded.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),\n        _version = ${col}._version + 1\n      RETURNING _id, cast(_version as TEXT) as version;`;\n  },\n  updateOne: <T>(\n    filter: PongoFilter<T> | SQL,\n    update: PongoUpdate<T> | SQL,\n    options?: UpdateOneOptions,\n  ): SQL => {\n    const expectedVersionCheck = versionCheckClause(options?.expectedVersion);\n\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    const updateQuery = isSQL(update)\n      ? update\n      : buildUpdateQuery(update, serializer);\n\n    return SQL`\n      UPDATE ${SQL.identifier(collectionName)}\n      SET\n        data = json_patch(${updateQuery}, json_object('_id', _id, '_version', cast(_version + 1 as TEXT))),\n        _version = _version + 1,\n        _updated = datetime('now')\n      WHERE _id = (\n        SELECT _id FROM ${SQL.identifier(collectionName)}\n        ${where(filterQuery)}\n        LIMIT 1\n      ) ${expectedVersionCheck}\n      RETURNING\n        _id,\n        cast(_version as TEXT) as version,\n        1 as matched,\n        1 as modified;`;\n  },\n  replaceOne: <T>(\n    filter: PongoFilter<T> | SQL,\n    document: WithoutId<T>,\n    options?: ReplaceOneOptions,\n  ): SQL => {\n    const expectedVersionCheck = versionCheckClause(options?.expectedVersion);\n\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`\n      UPDATE ${SQL.identifier(collectionName)}\n      SET\n        data = json_patch(${JSONParam.document(document, serializer)}, json_object('_id', _id, '_version', cast(_version + 1 as TEXT))),\n        _version = _version + 1,\n        _updated = datetime('now')\n      WHERE _id = (\n        SELECT _id FROM ${SQL.identifier(collectionName)}\n        ${where(filterQuery)}\n        LIMIT 1\n      ) ${expectedVersionCheck}\n      RETURNING\n        _id,\n        cast(_version as TEXT) AS version,\n        1 AS matched,\n        1 AS modified;`;\n  },\n  updateMany: <T>(\n    filter: PongoFilter<T> | SQL,\n    update: PongoUpdate<T> | SQL,\n  ): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    const updateQuery = isSQL(update)\n      ? update\n      : buildUpdateQuery(update, serializer);\n\n    return SQL`\n      UPDATE ${SQL.identifier(collectionName)}\n      SET\n        data = json_patch(${updateQuery}, json_object('_version', cast(_version + 1 as TEXT))),\n        _version = _version + 1,\n        _updated = datetime('now')\n      ${where(filterQuery)}\n      RETURNING _id;`;\n  },\n  deleteOne: <T>(\n    filter: PongoFilter<T> | SQL,\n    options?: DeleteOneOptions,\n  ): SQL => {\n    const expectedVersionCheck = versionCheckClause(options?.expectedVersion);\n\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`\n      DELETE FROM ${SQL.identifier(collectionName)}\n      WHERE _id = (\n        SELECT _id FROM ${SQL.identifier(collectionName)}\n        ${where(filterQuery)}\n        LIMIT 1\n      ) ${expectedVersionCheck}\n      RETURNING\n        _id,\n        1 AS matched,\n        1 AS deleted;`;\n  },\n  deleteMany: <T>(filter: PongoFilter<T> | SQL): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`DELETE FROM ${SQL.identifier(collectionName)} ${where(filterQuery)} RETURNING _id`;\n  },\n  replaceMany: <T>(\n    documents: Array<WithIdAndVersion<T>> | Array<WithId<T>>,\n  ): SQL => {\n    const col = SQL.identifier(collectionName);\n    const hasVersions = documents.some(\n      (d) => '_version' in d && d._version !== undefined,\n    );\n\n    if (hasVersions) {\n      const values = SQL.merge(\n        documents.map((d) => {\n          const expectedVersion = (d as WithIdAndVersion<T>)._version;\n          return expectedVersion !== undefined\n            ? SQL`(${d._id}, ${JSONParam.document(d, serializer)}, ${expectedVersion})`\n            : SQL`(${d._id}, ${JSONParam.document(d, serializer)}, NULL)`;\n        }),\n        ',',\n      );\n      return SQL`\n        WITH replacements(_id, data, expected_version) AS (\n          VALUES ${values}\n        )\n        UPDATE ${col}\n        SET\n          data = json_patch(r.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),\n          _version = ${col}._version + 1,\n          _updated = datetime('now')\n        FROM replacements r\n        WHERE ${col}._id = r._id AND (r.expected_version IS NULL OR ${col}._version = r.expected_version)\n        RETURNING ${col}._id, cast(${col}._version as TEXT) as version;`;\n    }\n\n    const values = SQL.merge(\n      documents.map(\n        (d) => SQL`(${d._id}, ${JSONParam.document(d, serializer)})`,\n      ),\n      ',',\n    );\n    return SQL`\n      WITH replacements(_id, data) AS (\n        VALUES ${values}\n      )\n      UPDATE ${col}\n      SET\n        data = json_patch(r.data, json_object('_id', ${col}._id, '_version', cast(${col}._version + 1 as TEXT))),\n        _version = ${col}._version + 1,\n        _updated = datetime('now')\n      FROM replacements r\n      WHERE ${col}._id = r._id\n      RETURNING ${col}._id, cast(${col}._version as TEXT) as version;`;\n  },\n  deleteManyByIds: (ids: Array<{ _id: string; _version?: bigint }>): SQL => {\n    const hasVersions = ids.some((d) => d._version !== undefined);\n\n    if (hasVersions) {\n      const values = SQL.merge(\n        ids.map((d) => SQL`(${d._id}, ${d._version ?? 0n})`),\n        ',',\n      );\n\n      return SQL`\n        WITH targets(_id, expected_version) AS (\n          VALUES ${values}\n        )\n        DELETE FROM ${SQL.identifier(collectionName)}\n        WHERE _id IN (SELECT _id FROM targets)\n          AND _version = (SELECT expected_version FROM targets WHERE targets._id = ${SQL.identifier(collectionName)}._id)\n        RETURNING _id;`;\n    }\n\n    const idList = SQL.merge(\n      ids.map((d) => SQL`${d._id}`),\n      ',',\n    );\n\n    return SQL`\n      DELETE FROM ${SQL.identifier(collectionName)}\n      WHERE _id IN (${idList})\n      RETURNING _id;`;\n  },\n  findOne: <T>(filter: PongoFilter<T> | SQL): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n\n    return SQL`SELECT data, _id, _version FROM ${SQL.identifier(collectionName)} ${where(filterQuery)} LIMIT 1;`;\n  },\n  find: <T>(filter: PongoFilter<T> | SQL, options?: FindOptions): SQL => {\n    const filterQuery = isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    const query: SQL[] = [];\n\n    query.push(\n      SQL`SELECT data, _id, _version FROM ${SQL.identifier(collectionName)}`,\n    );\n\n    query.push(where(filterQuery));\n\n    if (options?.sort && Object.keys(options.sort).length > 0) {\n      const clauses = Object.entries(options.sort).map(([field, dir]) => {\n        // _id and _version are native columns, not JSON fields.\n        const isMetadata = field === '_id' || field === '_version';\n        const accessor = isMetadata\n          ? SQL`${SQL.identifier(field)}`\n          : SQL`json_extract(data, ${SQLiteJSON.path(field)})`;\n        return dir === 1 ? SQL`${accessor} ASC` : SQL`${accessor} DESC`;\n      });\n      query.push(SQL`ORDER BY ${SQL.merge(clauses, ',')}`);\n    }\n\n    if (options?.limit) {\n      query.push(SQL`LIMIT ${options.limit}`);\n    }\n\n    if (options?.skip) {\n      query.push(SQL`OFFSET ${options.skip}`);\n    }\n\n    return SQL.merge([...query, SQL`;`]);\n  },\n  countDocuments: <T>(filter: PongoFilter<T> | SQL): SQL => {\n    const filterQuery = SQL.check.isSQL(filter)\n      ? filter\n      : constructFilterQuery(filter, serializer);\n    return SQL`SELECT COUNT(1) as count FROM ${SQL.identifier(collectionName)} ${where(filterQuery)};`;\n  },\n  rename: (newName: string): SQL =>\n    SQL`ALTER TABLE ${SQL.identifier(collectionName)} RENAME TO ${SQL.identifier(newName)};`,\n  drop: (targetName: string = collectionName): SQL =>\n    SQL`DROP TABLE IF EXISTS ${SQL.identifier(targetName)}`,\n});\n\nconst where = (filterQuery: SQL): SQL =>\n  SQL.check.isEmpty(filterQuery)\n    ? SQL.EMPTY\n    : SQL.merge([SQL`WHERE `, filterQuery]);\n"],"mappings":"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"}

package/dist/pg.cjs

@@ -3,29 +3,36 @@ const require_core = require('./core-C9SB3XMx.cjs');
 const require_cli = require('./cli.cjs');
 let _event_driven_io_dumbo = require("@event-driven-io/dumbo");
 let _event_driven_io_dumbo_pg = require("@event-driven-io/dumbo/pg");
+let _event_driven_io_dumbo_postgresql = require("@event-driven-io/dumbo/postgresql");
 
 //#region src/storage/postgresql/core/sqlBuilder/filter/queryOperators.ts
 const handleOperator = (path, operator, value, serializer) => {
 	if (path === "_id" || path === "_version") return handleMetadataOperator(path, operator, value);
 	switch (operator) {
 		case "$eq": {
-			const nestedPath = serializer.serialize(buildNestedObject(path, value));
-			const serializedValue = serializer.serialize(value);
-			return _event_driven_io_dumbo.SQL`(data @> ${nestedPath}::jsonb OR jsonb_path_exists(data, '$.${_event_driven_io_dumbo.SQL.plain(path)}[*] ? (@ == ${_event_driven_io_dumbo.SQL.plain(serializedValue)})'))`;
+			const field = _event_driven_io_dumbo_postgresql.PostgreSQLJSON.field(_event_driven_io_dumbo.SQL`data`, path);
+			return _event_driven_io_dumbo.SQL`(${field} = ${_event_driven_io_dumbo.JSONParam.value(value, serializer)}::jsonb OR ${field} @> ${_event_driven_io_dumbo.JSONParam.arrayContaining(value, serializer)}::jsonb)`;
 		}
 		case "$gt":
 		case "$gte":
 		case "$lt":
 		case "$lte":
-		case "$ne": return _event_driven_io_dumbo.SQL`data ->> '${_event_driven_io_dumbo.SQL.plain(path.split(".").join(","))}' ${_event_driven_io_dumbo.SQL.plain(require_core.OperatorMap[operator])} ${value}`;
-		case "$in": return _event_driven_io_dumbo.SQL`data #>> ${`{${path.split(".").join(",")}}`} = ANY (${value})`;
-		case "$nin": return _event_driven_io_dumbo.SQL`data #>> ${`{${path.split(".").join(",")}}`} != ALL (${value})`;
+		case "$ne": return _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.textField(_event_driven_io_dumbo.SQL`data`, path)} ${_event_driven_io_dumbo.SQL.plain(require_core.OperatorMap[operator])} ${value}`;
+		case "$in": return _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.textField(_event_driven_io_dumbo.SQL`data`, path)} = ANY (${value})`;
+		case "$nin": return _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.textField(_event_driven_io_dumbo.SQL`data`, path)} != ALL (${value})`;
 		case "$elemMatch": {
-			const subQuery = require_core.objectEntries(value).map(([subKey, subValue]) => `@."${subKey}" == ${serializer.serialize(subValue)}`).join(" && ");
-			return _event_driven_io_dumbo.SQL`jsonb_path_exists(data, '$.${_event_driven_io_dumbo.SQL.plain(path)}[*] ? (${_event_driven_io_dumbo.SQL.plain(subQuery)})')`;
+			const field = _event_driven_io_dumbo_postgresql.PostgreSQLJSON.field(_event_driven_io_dumbo.SQL`data`, path);
+			return _event_driven_io_dumbo.SQL`EXISTS (
+        SELECT 1
+        FROM jsonb_array_elements(${_event_driven_io_dumbo.SQL`CASE WHEN jsonb_typeof(${field}) = 'array' THEN ${field} ELSE '[]'::jsonb END`}) AS elem(value)
+        WHERE elem.value @> ${_event_driven_io_dumbo.JSONParam.value(value, serializer)}::jsonb
+      )`;
 		}
-		case "$all": return _event_driven_io_dumbo.SQL`data @> ${serializer.serialize(buildNestedObject(path, value))}::jsonb`;
-		case "$size": return _event_driven_io_dumbo.SQL`jsonb_array_length(data #> ${`{${path.split(".").join(",")}}`}) = ${value}`;
+		case "$all": {
+			const serializedValue = _event_driven_io_dumbo.JSONParam.value(value, serializer);
+			return _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.field(_event_driven_io_dumbo.SQL`data`, path)} @> ${serializedValue}::jsonb`;
+		}
+		case "$size": return _event_driven_io_dumbo.SQL`jsonb_array_length(${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.field(_event_driven_io_dumbo.SQL`data`, path)}) = ${value}`;
 		default: throw new Error(`Unsupported operator: ${operator}`);
 	}
 };
@@ -42,7 +49,6 @@ const handleMetadataOperator = (fieldName, operator, value) => {
 		default: throw new Error(`Unsupported operator: ${operator}`);
 	}
 };
-const buildNestedObject = (path, value) => path.split(".").reverse().reduce((acc, key) => ({ [key]: acc }), value);
 
 //#endregion
 //#region src/storage/postgresql/core/sqlBuilder/filter/index.ts
@@ -105,16 +111,20 @@ const buildUpdateQuery = (update, serializer) => require_core.objectEntries(upda
 		default: return currentUpdateQuery;
 	}
 }, _event_driven_io_dumbo.SQL`data`);
-const buildSetQuery = (set, currentUpdateQuery, serializer) => _event_driven_io_dumbo.SQL`${currentUpdateQuery} || ${serializer.serialize(set)}::jsonb`;
-const buildUnsetQuery = (unset, currentUpdateQuery) => _event_driven_io_dumbo.SQL`${currentUpdateQuery} - ${Object.keys(unset).map((k) => `{${k}}`).join(", ")}`;
+const buildSetQuery = (set, currentUpdateQuery, serializer) => _event_driven_io_dumbo.SQL`${currentUpdateQuery} || ${_event_driven_io_dumbo.JSONParam.value(set, serializer)}::jsonb`;
+const buildUnsetQuery = (unset, currentUpdateQuery) => {
+	let query = currentUpdateQuery;
+	for (const key of Object.keys(unset)) query = _event_driven_io_dumbo.SQL`${query} - ${key}`;
+	return query;
+};
 const buildIncQuery = (inc, currentUpdateQuery) => {
-	for (const [key, value] of Object.entries(inc)) currentUpdateQuery = typeof value === "bigint" ? _event_driven_io_dumbo.SQL`jsonb_set(${currentUpdateQuery}, '{${_event_driven_io_dumbo.SQL.plain(key)}}', to_jsonb((COALESCE((data->>'${_event_driven_io_dumbo.SQL.plain(key)}')::BIGINT, 0) + ${value})::TEXT), true)` : _event_driven_io_dumbo.SQL`jsonb_set(${currentUpdateQuery}, '{${_event_driven_io_dumbo.SQL.plain(key)}}', to_jsonb(COALESCE((data->>'${_event_driven_io_dumbo.SQL.plain(key)}')::NUMERIC, 0) + ${value}), true)`;
+	for (const [key, value] of Object.entries(inc)) currentUpdateQuery = typeof value === "bigint" ? _event_driven_io_dumbo.SQL`jsonb_set(${currentUpdateQuery}, ${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.path(key)}, to_jsonb((COALESCE((${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.textField(_event_driven_io_dumbo.SQL`data`, key)})::BIGINT, 0) + ${value})::TEXT), true)` : _event_driven_io_dumbo.SQL`jsonb_set(${currentUpdateQuery}, ${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.path(key)}, to_jsonb(COALESCE((${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.textField(_event_driven_io_dumbo.SQL`data`, key)})::NUMERIC, 0) + ${value}), true)`;
 	return currentUpdateQuery;
 };
 const buildPushQuery = (push, currentUpdateQuery, serializer) => {
 	for (const [key, value] of Object.entries(push)) {
-		const serializedValue = serializer.serialize([value]);
-		currentUpdateQuery = _event_driven_io_dumbo.SQL`jsonb_set(${currentUpdateQuery}, '{${_event_driven_io_dumbo.SQL.plain(key)}}', (coalesce(data->'${_event_driven_io_dumbo.SQL.plain(key)}', '[]'::jsonb) || ${serializedValue}::jsonb), true)`;
+		const serializedValue = _event_driven_io_dumbo.JSONParam.arrayContaining(value, serializer);
+		currentUpdateQuery = _event_driven_io_dumbo.SQL`jsonb_set(${currentUpdateQuery}, ${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.path(key)}, (coalesce(${_event_driven_io_dumbo_postgresql.PostgreSQLJSON.field(_event_driven_io_dumbo.SQL`data`, key)}, '[]'::jsonb) || ${serializedValue}::jsonb), true)`;
 	}
 	return currentUpdateQuery;
 };
@@ -141,7 +151,7 @@ const pongoCollectionPostgreSQLMigrations = (collectionName) => [(0, _event_driv
 const postgresSQLBuilder = (collectionName, serializer) => ({
 	createCollection: () => createCollection(collectionName),
 	insertOne: (document) => {
-		const serialized = serializer.serialize(document);
+		const serialized = _event_driven_io_dumbo.JSONParam.document(document, serializer);
 		const id = document._id;
 		const version = document._version ?? 1n;
 		return _event_driven_io_dumbo.SQL`
@@ -149,7 +159,7 @@ const postgresSQLBuilder = (collectionName, serializer) => ({
       VALUES (${id}, ${serialized}, ${version}) ON CONFLICT(_id) DO NOTHING;`;
 	},
 	insertMany: (documents) => {
-		const values = _event_driven_io_dumbo.SQL.merge(documents.map((doc) => _event_driven_io_dumbo.SQL`(${doc._id}, ${serializer.serialize(doc)}, ${doc._version ?? 1n})`), ",");
+		const values = _event_driven_io_dumbo.SQL.merge(documents.map((doc) => _event_driven_io_dumbo.SQL`(${doc._id}, ${_event_driven_io_dumbo.JSONParam.document(doc, serializer)}, ${doc._version ?? 1n})`), ",");
 		return _event_driven_io_dumbo.SQL`
       INSERT INTO ${_event_driven_io_dumbo.SQL.identifier(collectionName)} (_id, data, _version) VALUES ${values}
       ON CONFLICT(_id) DO NOTHING
@@ -159,7 +169,7 @@ const postgresSQLBuilder = (collectionName, serializer) => ({
 		const col = _event_driven_io_dumbo.SQL.identifier(collectionName);
 		return _event_driven_io_dumbo.SQL`
       INSERT INTO ${col} (_id, data, _version)
-      VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}::text, ${serializer.serialize(d)}::jsonb || jsonb_build_object('_id', ${d._id}::text) || jsonb_build_object('_version', '1'::text), 1::bigint)`), ",")}
+      VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}::text, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)}::jsonb || jsonb_build_object('_id', ${d._id}::text) || jsonb_build_object('_version', '1'::text), 1::bigint)`), ",")}
       ON CONFLICT(_id) DO UPDATE SET
         data = EXCLUDED.data
           || jsonb_build_object('_id', ${col}._id)
@@ -207,7 +217,7 @@ const postgresSQLBuilder = (collectionName, serializer) => ({
       updated AS (
         UPDATE ${_event_driven_io_dumbo.SQL.identifier(collectionName)}        
         SET 
-          data = ${serializer.serialize(document)} || jsonb_build_object('_id', ${_event_driven_io_dumbo.SQL.identifier(collectionName)}._id) || jsonb_build_object('_version', (_version + 1)::text),
+          data = ${_event_driven_io_dumbo.JSONParam.document(document, serializer)} || jsonb_build_object('_id', ${_event_driven_io_dumbo.SQL.identifier(collectionName)}._id) || jsonb_build_object('_version', (_version + 1)::text),
           _version = _version + 1
         FROM existing 
         WHERE ${_event_driven_io_dumbo.SQL.identifier(collectionName)}._id = existing._id ${expectedVersionUpdate}
@@ -264,7 +274,7 @@ const postgresSQLBuilder = (collectionName, serializer) => ({
         WITH replacements(_id, data, expected_version) AS (
           VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => {
 			const expectedVersion = d._version;
-			return expectedVersion !== void 0 ? _event_driven_io_dumbo.SQL`(${d._id}::text, ${serializer.serialize(d)}::jsonb, ${expectedVersion}::bigint)` : _event_driven_io_dumbo.SQL`(${d._id}::text, ${serializer.serialize(d)}::jsonb, NULL::bigint)`;
+			return expectedVersion !== void 0 ? _event_driven_io_dumbo.SQL`(${d._id}::text, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)}::jsonb, ${expectedVersion}::bigint)` : _event_driven_io_dumbo.SQL`(${d._id}::text, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)}::jsonb, NULL::bigint)`;
 		}), ",")}
         )
         UPDATE ${_event_driven_io_dumbo.SQL.identifier(collectionName)} t
@@ -278,7 +288,7 @@ const postgresSQLBuilder = (collectionName, serializer) => ({
         RETURNING t._id, t._version AS version;`;
 		return _event_driven_io_dumbo.SQL`
       WITH replacements(_id, data) AS (
-        VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}::text, ${serializer.serialize(d)}::jsonb)`), ",")}
+        VALUES ${_event_driven_io_dumbo.SQL.merge(documents.map((d) => _event_driven_io_dumbo.SQL`(${d._id}::text, ${_event_driven_io_dumbo.JSONParam.document(d, serializer)}::jsonb)`), ",")}
       )
       UPDATE ${_event_driven_io_dumbo.SQL.identifier(collectionName)} t
       SET
@@ -331,9 +341,7 @@ const postgresSQLBuilder = (collectionName, serializer) => ({
 		query.push(where(filterQuery));
 		if (options?.sort && Object.keys(options.sort).length > 0) {
 			const clauses = Object.entries(options.sort).map(([field, dir]) => {
-				const isMetadata = field === "_id" || field === "_version";
-				const isNested = !isMetadata && field.includes(".");
-				const accessor = isMetadata ? _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo.SQL.plain(field)}` : isNested ? _event_driven_io_dumbo.SQL`data #> '${_event_driven_io_dumbo.SQL.plain(`{${field.split(".").join(",")}}`)}'` : _event_driven_io_dumbo.SQL`data -> '${_event_driven_io_dumbo.SQL.plain(field)}'`;
+				const accessor = field === "_id" || field === "_version" ? _event_driven_io_dumbo.SQL`${_event_driven_io_dumbo.SQL.plain(field)}` : _event_driven_io_dumbo_postgresql.PostgreSQLJSON.field(_event_driven_io_dumbo.SQL`data`, field);
 				return dir === 1 ? _event_driven_io_dumbo.SQL`${accessor} ASC NULLS FIRST` : _event_driven_io_dumbo.SQL`${accessor} DESC NULLS LAST`;
 			});
 			query.push(_event_driven_io_dumbo.SQL`ORDER BY ${_event_driven_io_dumbo.SQL.merge(clauses, ",")}`);