@strapi/database 5.49.0 → 5.50.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/connection.d.ts.map +1 -1
- package/dist/dialects/index.d.ts.map +1 -1
- package/dist/dialects/postgresql/index.d.ts +0 -1
- package/dist/dialects/postgresql/index.d.ts.map +1 -1
- package/dist/dialects/sqlite/index.d.ts +0 -1
- package/dist/dialects/sqlite/index.d.ts.map +1 -1
- package/dist/entity-manager/entity-repository.d.ts.map +1 -1
- package/dist/entity-manager/index.d.ts.map +1 -1
- package/dist/entity-manager/index.js +122 -3
- package/dist/entity-manager/index.js.map +1 -1
- package/dist/entity-manager/index.mjs +123 -4
- package/dist/entity-manager/index.mjs.map +1 -1
- package/dist/entity-manager/morph-relations.d.ts +0 -1
- package/dist/entity-manager/morph-relations.d.ts.map +1 -1
- package/dist/entity-manager/regular-relations.d.ts +1 -7
- package/dist/entity-manager/regular-relations.d.ts.map +1 -1
- package/dist/entity-manager/regular-relations.js +1 -1
- package/dist/entity-manager/regular-relations.js.map +1 -1
- package/dist/entity-manager/regular-relations.mjs +1 -1
- package/dist/entity-manager/regular-relations.mjs.map +1 -1
- package/dist/entity-manager/relations-orderer.d.ts +3 -3
- package/dist/entity-manager/relations-orderer.d.ts.map +1 -1
- package/dist/entity-manager/relations-orderer.js +4 -4
- package/dist/entity-manager/relations-orderer.js.map +1 -1
- package/dist/entity-manager/relations-orderer.mjs +4 -4
- package/dist/entity-manager/relations-orderer.mjs.map +1 -1
- package/dist/fields/index.d.ts.map +1 -1
- package/dist/fields/shared/parsers.d.ts.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs.map +1 -1
- package/dist/lifecycles/index.d.ts.map +1 -1
- package/dist/lifecycles/subscribers/index.d.ts +1 -1
- package/dist/lifecycles/subscribers/index.d.ts.map +1 -1
- package/dist/metadata/index.d.ts.map +1 -1
- package/dist/metadata/metadata.d.ts +1 -1
- package/dist/metadata/metadata.d.ts.map +1 -1
- package/dist/metadata/relations.d.ts +2 -2
- package/dist/metadata/relations.d.ts.map +1 -1
- package/dist/migrations/common.d.ts.map +1 -1
- package/dist/migrations/index.d.ts.map +1 -1
- package/dist/migrations/internal.d.ts.map +1 -1
- package/dist/migrations/logger.d.ts.map +1 -1
- package/dist/migrations/storage.d.ts.map +1 -1
- package/dist/migrations/users.d.ts.map +1 -1
- package/dist/query/helpers/join.d.ts.map +1 -1
- package/dist/query/helpers/order-by.d.ts.map +1 -1
- package/dist/query/helpers/order-by.js +1 -1
- package/dist/query/helpers/order-by.js.map +1 -1
- package/dist/query/helpers/order-by.mjs +1 -1
- package/dist/query/helpers/order-by.mjs.map +1 -1
- package/dist/query/helpers/populate/apply.d.ts.map +1 -1
- package/dist/query/helpers/populate/apply.js +3 -1
- package/dist/query/helpers/populate/apply.js.map +1 -1
- package/dist/query/helpers/populate/apply.mjs +3 -1
- package/dist/query/helpers/populate/apply.mjs.map +1 -1
- package/dist/query/helpers/populate/process.d.ts.map +1 -1
- package/dist/query/helpers/search.d.ts.map +1 -1
- package/dist/query/helpers/streams/readable.d.ts +0 -1
- package/dist/query/helpers/streams/readable.d.ts.map +1 -1
- package/dist/query/helpers/transform.d.ts.map +1 -1
- package/dist/query/helpers/where.d.ts.map +1 -1
- package/dist/query/query-builder.d.ts.map +1 -1
- package/dist/query/query-builder.js +3 -3
- package/dist/query/query-builder.js.map +1 -1
- package/dist/query/query-builder.mjs +3 -3
- package/dist/query/query-builder.mjs.map +1 -1
- package/dist/repairs/index.d.ts.map +1 -1
- package/dist/repairs/operations/process-unidirectional-join-tables.d.ts.map +1 -1
- package/dist/repairs/operations/remove-orphan-morph-types.d.ts.map +1 -1
- package/dist/schema/builder.d.ts +1 -1
- package/dist/schema/builder.d.ts.map +1 -1
- package/dist/schema/diff.d.ts.map +1 -1
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/schema.d.ts.map +1 -1
- package/dist/schema/storage.d.ts.map +1 -1
- package/dist/transaction-context.d.ts.map +1 -1
- package/dist/utils/async-curry.d.ts.map +1 -1
- package/dist/utils/identifiers/index.d.ts.map +1 -1
- package/dist/utils/knex.d.ts.map +1 -1
- package/dist/utils/types.d.ts +1 -1
- package/dist/utils/types.d.ts.map +1 -1
- package/dist/validations/relations/bidirectional.d.ts.map +1 -1
- package/dist/validations/relations/index.d.ts.map +1 -1
- package/package.json +8 -4
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport path from 'node:path';\n\nimport { Dialect, getDialect } from './dialects';\nimport { createSchemaProvider, SchemaProvider } from './schema';\nimport { createMetadata, Metadata } from './metadata';\nimport { createEntityManager, EntityManager } from './entity-manager';\nimport { createMigrationsProvider, MigrationProvider, type Migration } from './migrations';\nimport { createLifecyclesProvider, LifecycleProvider } from './lifecycles';\nimport { createConnection } from './connection';\nimport * as errors from './errors';\nimport { Callback, transactionCtx, TransactionObject } from './transaction-context';\nimport { validateDatabase } from './validations';\nimport type { Model, JoinTable } from './types';\nimport type { Identifiers } from './utils/identifiers';\nimport { createRepairManager, type RepairManager } from './repairs';\n\nexport { isKnexQuery } from './utils/knex';\n\ninterface Settings {\n forceMigration?: boolean;\n runMigrations?: boolean;\n migrations: {\n dir: string;\n };\n [key: string]: unknown;\n}\n\nexport type Logger = Record<\n 'info' | 'warn' | 'error' | 'debug',\n (message: string | Record<string, unknown>) => void\n>;\n\nexport interface DatabaseConfig {\n connection: Knex.Config;\n settings: Settings;\n logger?: Logger;\n}\n\nconst afterCreate =\n (db: Database) =>\n (\n nativeConnection: unknown,\n done: (error: Error | null, nativeConnection: unknown) => Promise<void>\n ) => {\n // run initialize for it since commands such as postgres SET and sqlite PRAGMA are per-connection\n db.dialect.initialize(nativeConnection).then(() => {\n return done(null, nativeConnection);\n });\n };\n\nclass Database {\n connection: Knex;\n\n dialect: Dialect;\n\n config: DatabaseConfig;\n\n metadata: Metadata;\n\n schema: SchemaProvider;\n\n migrations: MigrationProvider;\n\n lifecycles: LifecycleProvider;\n\n entityManager: EntityManager;\n\n repair: RepairManager;\n\n logger: Logger;\n\n constructor(config: DatabaseConfig) {\n this.config = {\n ...config,\n settings: {\n forceMigration: true,\n runMigrations: true,\n ...(config.settings ?? {}),\n },\n };\n\n this.logger = config.logger ?? console;\n\n this.dialect = getDialect(this);\n\n let knexConfig: Knex.Config = this.config.connection;\n\n // for object connections, we can configure the dialect synchronously\n if (typeof this.config.connection.connection !== 'function') {\n this.dialect.configure();\n }\n // for connection functions, we wrap it so that we can modify it with dialect configure before it reaches knex\n else {\n this.logger.warn(\n 'Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors.'\n );\n\n knexConfig = {\n ...this.config.connection,\n connection: async () => {\n // @ts-expect-error confirmed it was a function above\n const conn = await this.config.connection.connection();\n this.dialect.configure(conn);\n return conn;\n },\n };\n }\n\n this.metadata = createMetadata([]);\n\n this.connection = createConnection(knexConfig, {\n pool: { afterCreate: afterCreate(this) },\n });\n\n this.schema = createSchemaProvider(this);\n\n this.migrations = createMigrationsProvider(this);\n this.lifecycles = createLifecyclesProvider(this);\n\n this.entityManager = createEntityManager(this);\n\n this.repair = createRepairManager(this);\n }\n\n async init({ models }: { models: Model[] }) {\n if (typeof this.config.connection.connection === 'function') {\n /*\n * User code needs to be able to access `connection.connection` directly as if\n * it were always an object. For a connection function, that doesn't happen\n * until the pool is created, so we need to do that here\n *\n * TODO: In the next major version, we need to replace all internal code that\n * directly references `connection.connection` prior to init, and make a breaking\n * change that it cannot be relied on to exist before init so that we can call\n * this feature stable.\n */\n this.logger.debug('Forcing Knex to make real connection to db');\n\n // sqlite does not support connection pooling so acquireConnection doesn't work\n if (this.config.connection.client === 'sqlite') {\n await this.connection.raw('SELECT 1');\n } else {\n await this.connection.client.acquireConnection();\n }\n }\n\n this.metadata.loadModels(models);\n await validateDatabase(this);\n return this;\n }\n\n query(uid: string) {\n if (!this.metadata.has(uid)) {\n throw new Error(`Model ${uid} not found`);\n }\n\n return this.entityManager.getRepository(uid);\n }\n\n inTransaction() {\n return !!transactionCtx.get();\n }\n\n /**\n * Run work inside a DB transaction. On a fulfilled callback, the transaction\n * is committed; on rejection, it is rolled back. The callback receives Knex\n * `commit` and `rollback` helpers: if you call `rollback` and return without\n * throwing, the implementation avoids attempting a second `commit` on an\n * already-finalised transactor.\n */\n transaction(): Promise<TransactionObject>;\n transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;\n async transaction<TCallback extends Callback>(\n cb?: TCallback\n ): Promise<ReturnType<TCallback> | TransactionObject> {\n const notNestedTransaction = !transactionCtx.get();\n const trx = notNestedTransaction\n ? await this.connection.transaction()\n : (transactionCtx.get() as Knex.Transaction);\n\n async function commit() {\n if (notNestedTransaction) {\n await transactionCtx.commit(trx);\n }\n }\n\n async function rollback() {\n if (notNestedTransaction) {\n await transactionCtx.rollback(trx);\n }\n }\n\n if (!cb) {\n return { commit, rollback, get: () => trx };\n }\n\n return transactionCtx.run(trx, async () => {\n try {\n const callbackParams = {\n trx,\n commit,\n rollback,\n onCommit: transactionCtx.onCommit,\n onRollback: transactionCtx.onRollback,\n };\n const res = await cb(callbackParams);\n await commit();\n return res;\n } catch (error) {\n await rollback();\n throw error;\n }\n });\n }\n\n getSchemaName(): string | undefined {\n return this.connection.client.connectionSettings.schema;\n }\n\n getConnection(): Knex;\n getConnection(tableName?: string): Knex.QueryBuilder;\n getConnection(tableName?: string): Knex | Knex.QueryBuilder {\n const schema = this.getSchemaName();\n const connection = tableName ? this.connection(tableName) : this.connection;\n return schema ? connection.withSchema(schema) : connection;\n }\n\n // Returns basic info about the database connection\n getInfo() {\n const connectionSettings = this.connection?.client?.connectionSettings || {};\n const client = this.dialect?.client || '';\n\n let displayName = '';\n let schema;\n\n // For SQLite, get the relative filename\n if (client === 'sqlite') {\n const absolutePath = connectionSettings?.filename;\n if (absolutePath) {\n displayName = path.relative(process.cwd(), absolutePath);\n }\n }\n // For other dialects, get the database name\n else {\n displayName = connectionSettings?.database;\n schema = connectionSettings?.schema;\n }\n\n return {\n displayName,\n schema,\n client,\n };\n }\n\n getSchemaConnection(trx = this.connection) {\n const schema = this.getSchemaName();\n return schema ? trx.schema.withSchema(schema) : trx.schema;\n }\n\n queryBuilder(uid: string) {\n return this.entityManager.createQueryBuilder(uid);\n }\n\n async destroy() {\n await this.lifecycles.clear();\n await this.connection.destroy();\n }\n}\n\nexport { Database, errors };\nexport type { Model, JoinTable, Identifiers, Migration };\n"],"names":["afterCreate","db","nativeConnection","done","dialect","initialize","then","Database","init","models","config","connection","logger","debug","client","raw","acquireConnection","metadata","loadModels","validateDatabase","query","uid","has","Error","entityManager","getRepository","inTransaction","transactionCtx","get","transaction","cb","notNestedTransaction","trx","commit","rollback","run","callbackParams","onCommit","onRollback","res","error","getSchemaName","connectionSettings","schema","getConnection","tableName","withSchema","getInfo","displayName","absolutePath","filename","path","relative","process","cwd","database","getSchemaConnection","queryBuilder","createQueryBuilder","destroy","lifecycles","clear","settings","forceMigration","runMigrations","console","getDialect","knexConfig","configure","warn","conn","createMetadata","createConnection","pool","createSchemaProvider","migrations","createMigrationsProvider","createLifecyclesProvider","createEntityManager","repair","createRepairManager"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import type { Knex } from 'knex';\n\nimport path from 'node:path';\n\nimport { Dialect, getDialect } from './dialects';\nimport { createSchemaProvider, SchemaProvider } from './schema';\nimport { createMetadata, Metadata } from './metadata';\nimport { createEntityManager, EntityManager } from './entity-manager';\nimport { createMigrationsProvider, MigrationProvider, type Migration } from './migrations';\nimport { createLifecyclesProvider, LifecycleProvider } from './lifecycles';\nimport type { Event } from './lifecycles';\nimport { createConnection } from './connection';\nimport * as errors from './errors';\nimport { Callback, transactionCtx, TransactionObject } from './transaction-context';\nimport { validateDatabase } from './validations';\nimport type { Model, JoinTable } from './types';\nimport type { Identifiers } from './utils/identifiers';\nimport { createRepairManager, type RepairManager } from './repairs';\n\nexport { isKnexQuery } from './utils/knex';\n\ninterface Settings {\n forceMigration?: boolean;\n runMigrations?: boolean;\n migrations: {\n dir: string;\n };\n [key: string]: unknown;\n}\n\nexport type Logger = Record<\n 'info' | 'warn' | 'error' | 'debug',\n (message: string | Record<string, unknown>) => void\n>;\n\nexport interface DatabaseConfig {\n connection: Knex.Config;\n settings: Settings;\n logger?: Logger;\n}\n\nconst afterCreate =\n (db: Database) =>\n (\n nativeConnection: unknown,\n done: (error: Error | null, nativeConnection: unknown) => Promise<void>\n ) => {\n // run initialize for it since commands such as postgres SET and sqlite PRAGMA are per-connection\n db.dialect.initialize(nativeConnection).then(() => {\n return done(null, nativeConnection);\n });\n };\n\nclass Database {\n connection: Knex;\n\n dialect: Dialect;\n\n config: DatabaseConfig;\n\n metadata: Metadata;\n\n schema: SchemaProvider;\n\n migrations: MigrationProvider;\n\n lifecycles: LifecycleProvider;\n\n entityManager: EntityManager;\n\n repair: RepairManager;\n\n logger: Logger;\n\n constructor(config: DatabaseConfig) {\n this.config = {\n ...config,\n settings: {\n forceMigration: true,\n runMigrations: true,\n ...(config.settings ?? {}),\n },\n };\n\n this.logger = config.logger ?? console;\n\n this.dialect = getDialect(this);\n\n let knexConfig: Knex.Config = this.config.connection;\n\n // for object connections, we can configure the dialect synchronously\n if (typeof this.config.connection.connection !== 'function') {\n this.dialect.configure();\n }\n // for connection functions, we wrap it so that we can modify it with dialect configure before it reaches knex\n else {\n this.logger.warn(\n 'Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors.'\n );\n\n knexConfig = {\n ...this.config.connection,\n connection: async () => {\n // @ts-expect-error confirmed it was a function above\n const conn = await this.config.connection.connection();\n this.dialect.configure(conn);\n return conn;\n },\n };\n }\n\n this.metadata = createMetadata([]);\n\n this.connection = createConnection(knexConfig, {\n pool: { afterCreate: afterCreate(this) },\n });\n\n this.schema = createSchemaProvider(this);\n\n this.migrations = createMigrationsProvider(this);\n this.lifecycles = createLifecyclesProvider(this);\n\n this.entityManager = createEntityManager(this);\n\n this.repair = createRepairManager(this);\n }\n\n async init({ models }: { models: Model[] }) {\n if (typeof this.config.connection.connection === 'function') {\n /*\n * User code needs to be able to access `connection.connection` directly as if\n * it were always an object. For a connection function, that doesn't happen\n * until the pool is created, so we need to do that here\n *\n * TODO: In the next major version, we need to replace all internal code that\n * directly references `connection.connection` prior to init, and make a breaking\n * change that it cannot be relied on to exist before init so that we can call\n * this feature stable.\n */\n this.logger.debug('Forcing Knex to make real connection to db');\n\n // sqlite does not support connection pooling so acquireConnection doesn't work\n if (this.config.connection.client === 'sqlite') {\n await this.connection.raw('SELECT 1');\n } else {\n await this.connection.client.acquireConnection();\n }\n }\n\n this.metadata.loadModels(models);\n await validateDatabase(this);\n return this;\n }\n\n query(uid: string) {\n if (!this.metadata.has(uid)) {\n throw new Error(`Model ${uid} not found`);\n }\n\n return this.entityManager.getRepository(uid);\n }\n\n inTransaction() {\n return !!transactionCtx.get();\n }\n\n /**\n * Run work inside a DB transaction. On a fulfilled callback, the transaction\n * is committed; on rejection, it is rolled back. The callback receives Knex\n * `commit` and `rollback` helpers: if you call `rollback` and return without\n * throwing, the implementation avoids attempting a second `commit` on an\n * already-finalised transactor.\n */\n transaction(): Promise<TransactionObject>;\n transaction<TCallback extends Callback>(c: TCallback): Promise<ReturnType<TCallback>>;\n async transaction<TCallback extends Callback>(\n cb?: TCallback\n ): Promise<ReturnType<TCallback> | TransactionObject> {\n const notNestedTransaction = !transactionCtx.get();\n const trx = notNestedTransaction\n ? await this.connection.transaction()\n : (transactionCtx.get() as Knex.Transaction);\n\n async function commit() {\n if (notNestedTransaction) {\n await transactionCtx.commit(trx);\n }\n }\n\n async function rollback() {\n if (notNestedTransaction) {\n await transactionCtx.rollback(trx);\n }\n }\n\n if (!cb) {\n return { commit, rollback, get: () => trx };\n }\n\n return transactionCtx.run(trx, async () => {\n try {\n const callbackParams = {\n trx,\n commit,\n rollback,\n onCommit: transactionCtx.onCommit,\n onRollback: transactionCtx.onRollback,\n };\n const res = await cb(callbackParams);\n await commit();\n return res;\n } catch (error) {\n await rollback();\n throw error;\n }\n });\n }\n\n getSchemaName(): string | undefined {\n return this.connection.client.connectionSettings.schema;\n }\n\n getConnection(): Knex;\n getConnection(tableName?: string): Knex.QueryBuilder;\n getConnection(tableName?: string): Knex | Knex.QueryBuilder {\n const schema = this.getSchemaName();\n const connection = tableName ? this.connection(tableName) : this.connection;\n return schema ? connection.withSchema(schema) : connection;\n }\n\n // Returns basic info about the database connection\n getInfo() {\n const connectionSettings = this.connection?.client?.connectionSettings || {};\n const client = this.dialect?.client || '';\n\n let displayName = '';\n let schema;\n\n // For SQLite, get the relative filename\n if (client === 'sqlite') {\n const absolutePath = connectionSettings?.filename;\n if (absolutePath) {\n displayName = path.relative(process.cwd(), absolutePath);\n }\n }\n // For other dialects, get the database name\n else {\n displayName = connectionSettings?.database;\n schema = connectionSettings?.schema;\n }\n\n return {\n displayName,\n schema,\n client,\n };\n }\n\n getSchemaConnection(trx = this.connection) {\n const schema = this.getSchemaName();\n return schema ? trx.schema.withSchema(schema) : trx.schema;\n }\n\n queryBuilder(uid: string) {\n return this.entityManager.createQueryBuilder(uid);\n }\n\n async destroy() {\n await this.lifecycles.clear();\n await this.connection.destroy();\n }\n}\n\nexport { Database, errors };\nexport type { Model, JoinTable, Identifiers, Migration, Event };\n"],"names":["afterCreate","db","nativeConnection","done","dialect","initialize","then","Database","init","models","config","connection","logger","debug","client","raw","acquireConnection","metadata","loadModels","validateDatabase","query","uid","has","Error","entityManager","getRepository","inTransaction","transactionCtx","get","transaction","cb","notNestedTransaction","trx","commit","rollback","run","callbackParams","onCommit","onRollback","res","error","getSchemaName","connectionSettings","schema","getConnection","tableName","withSchema","getInfo","displayName","absolutePath","filename","path","relative","process","cwd","database","getSchemaConnection","queryBuilder","createQueryBuilder","destroy","lifecycles","clear","settings","forceMigration","runMigrations","console","getDialect","knexConfig","configure","warn","conn","createMetadata","createConnection","pool","createSchemaProvider","migrations","createMigrationsProvider","createLifecyclesProvider","createEntityManager","repair","createRepairManager"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lifecycles/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,mBAAmB,SAAS,CAAC;AAE7B,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC5C,MAAM,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,IAAI,CAAC;IAC9C,KAAK,IAAI,IAAI,CAAC;IACd,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3F,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC;IACtF,OAAO,IAAI,IAAI,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lifecycles/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,mBAAmB,SAAS,CAAC;AAE7B,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC5C,MAAM,MAAM,MAAM,GAAG,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAE5C,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,IAAI,CAAC;IAC9C,KAAK,IAAI,IAAI,CAAC;IACd,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3F,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC;IACtF,OAAO,IAAI,IAAI,CAAC;IAChB,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,eAAO,MAAM,wBAAwB,GAAI,IAAI,QAAQ,KAAG,iBAgFvD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Subscriber } from '../types';
|
|
2
|
-
export declare const isValidSubscriber: (subscriber: Subscriber) =>
|
|
2
|
+
export declare const isValidSubscriber: (subscriber: Subscriber) => subscriber is import("..").SubscriberFn | import("..").SubscriberMap;
|
|
3
3
|
export { modelsLifecyclesSubscriber } from './models-lifecycles';
|
|
4
4
|
export { timestampsLifecyclesSubscriber } from './timestamps';
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lifecycles/subscribers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lifecycles/subscribers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,iBAAiB,GAAI,YAAY,UAAU,yEAIvD,CAAC;AAEF,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/metadata/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,EACV,UAAU,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEtC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,EACV,UAAU,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,GACZ,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/metadata/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,EACV,UAAU,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEtC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAC/B,OAAO,EACL,aAAa,EACb,eAAe,EACf,UAAU,EACV,UAAU,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,GACZ,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,KAAK,EAAE,KAAG,QAQhD,CAAC"}
|
|
@@ -8,7 +8,7 @@ export interface Meta extends Model {
|
|
|
8
8
|
lifecycles: Partial<Record<Action, SubscriberFn>>;
|
|
9
9
|
}
|
|
10
10
|
export declare class Metadata extends Map<string, Meta> {
|
|
11
|
-
get identifiers(): import("
|
|
11
|
+
get identifiers(): import("..").Identifiers;
|
|
12
12
|
get(key: string): Meta;
|
|
13
13
|
add(meta: Meta): this;
|
|
14
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/metadata/metadata.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,WAAW,IAAK,SAAQ,KAAK;IACjC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;CACnD;AAED,qBAAa,QAAS,SAAQ,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;IAI7C,IAAI,WAAW
|
|
1
|
+
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/metadata/metadata.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,WAAW,IAAK,SAAQ,KAAK;IACjC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;CACnD;AAED,qBAAa,QAAS,SAAQ,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC;IAI7C,IAAI,WAAW,6BAEd;IAED,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtB,GAAG,CAAC,IAAI,EAAE,IAAI;IAId;;OAEG;IACH,QAAQ;IAYR,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE;CAwD3B"}
|
|
@@ -6,8 +6,8 @@ export declare const isManyToAny: (attribute: RelationalAttribute) => attribute
|
|
|
6
6
|
export declare const isAnyToOne: (attribute: RelationalAttribute) => attribute is Relation.OneToOne | Relation.ManyToOne;
|
|
7
7
|
export declare const isAnyToMany: (attribute: RelationalAttribute) => attribute is Relation.OneToMany | Relation.ManyToMany;
|
|
8
8
|
export declare const isBidirectional: (attribute: RelationalAttribute) => attribute is Relation.Bidirectional;
|
|
9
|
-
export declare const hasOrderColumn: (attribute: RelationalAttribute) =>
|
|
10
|
-
export declare const hasInverseOrderColumn: (attribute: RelationalAttribute) =>
|
|
9
|
+
export declare const hasOrderColumn: (attribute: RelationalAttribute) => attribute is Relation.OneToMany | Relation.ManyToMany;
|
|
10
|
+
export declare const hasInverseOrderColumn: (attribute: RelationalAttribute) => attribute is Relation.ManyToOne | Relation.ManyToMany;
|
|
11
11
|
/**
|
|
12
12
|
* Creates a relation metadata
|
|
13
13
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../src/metadata/relations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAkB,MAAM,UAAU,CAAC;AA0B9E,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"relations.d.ts","sourceRoot":"","sources":["../../src/metadata/relations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAkB,MAAM,UAAU,CAAC;AA0B9E,eAAO,MAAM,aAAa,GAAI,WAAW,mBAAmB,KAAG,SAAS,IAAI,QAAQ,CAAC,KACA,CAAC;AAEtF,eAAO,MAAM,UAAU,GACrB,WAAW,mBAAmB,KAC7B,SAAS,IAAI,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,SACW,CAAC;AAEzD,eAAO,MAAM,WAAW,GACtB,WAAW,mBAAmB,KAC7B,SAAS,IAAI,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,UACY,CAAC;AAE3D,eAAO,MAAM,UAAU,GACrB,WAAW,mBAAmB,KAC7B,SAAS,IAAI,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,SACW,CAAC;AAEzD,eAAO,MAAM,WAAW,GACtB,WAAW,mBAAmB,KAC7B,SAAS,IAAI,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,UACY,CAAC;AAE3D,eAAO,MAAM,eAAe,GAC1B,WAAW,mBAAmB,KAC7B,SAAS,IAAI,QAAQ,CAAC,aAAmE,CAAC;AAU7F,eAAO,MAAM,cAAc,GAAI,WAAW,mBAAmB,0DAA2B,CAAC;AACzF,eAAO,MAAM,qBAAqB,GAAI,WAAW,mBAAmB,0DACd,CAAC;AAuiBvD;;GAEG;AACH,eAAO,MAAM,cAAc,GACzB,eAAe,MAAM,EACrB,WAAW,mBAAmB,EAC9B,MAAM,IAAI,EACV,UAAU,QAAQ,SAuBnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/migrations/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,MAAM,WAAW,qBAAqB;IACpC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACrC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AACD,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE;QAAE,QAAQ,EAAE,yBAAyB,CAAA;KAAE,CAAC;IACnD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,MAAM,OAAO,GAAG;IAAE,EAAE,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,WAAW,CAAC;IAChB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/migrations/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,MAAM,WAAW,qBAAqB;IACpC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACrC,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AACD,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE;QAAE,QAAQ,EAAE,yBAAyB,CAAA;KAAE,CAAC;IACnD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAED,MAAM,MAAM,OAAO,GAAG;IAAE,EAAE,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEvC,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAElF,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,WAAW,CAAC;IAChB,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,IAAI,QAAQ,MAAM,IAAI,WAAW,iCAEhE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,YAAY,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC;AAE7C,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,YAAY,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC;AAE7C,eAAO,MAAM,wBAAwB,GAAI,IAAI,QAAQ,KAAG,iBA+BvD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/migrations/internal.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,yBAAyB,EAAa,MAAM,UAAU,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,eAAO,MAAM,+BAA+B,
|
|
1
|
+
{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/migrations/internal.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,yBAAyB,EAAa,MAAM,UAAU,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,eAAO,MAAM,+BAA+B,GAAI,IAAI,QAAQ,KAAG,yBAuD9D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/migrations/logger.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/migrations/logger.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,EAAE,SAAS,OAAO;;;;;;;;CAiBlE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/migrations/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,QAAQ,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/migrations/storage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAEnC,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,QAAQ,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,OAAO;2BAcV;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;6BAUd;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;;CAelD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/migrations/users.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAqB,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAiCnC,eAAO,MAAM,2BAA2B,
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/migrations/users.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAqB,qBAAqB,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAiCnC,eAAO,MAAM,2BAA2B,GAAI,IAAI,QAAQ,KAAG,qBAmD1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;CAC1C;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;CACjB;AAED,QAAA,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/join.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC;CAC1C;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;CACjB;AAED,QAAA,MAAM,eAAe,GACnB,KAAK,GAAG,EACR,4CAA4C,gBAAgB,WAuB7D,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,KAAK,GAAG,EAAE,+CAA+C,WAAW,WAoFvF,CAAC;AAGF,QAAA,MAAM,SAAS,GAAI,IAAI,IAAI,CAAC,YAAY,EAAE,MAAM,IAAI,SA6BnD,CAAC;AAEF,QAAA,MAAM,UAAU,GAAI,IAAI,IAAI,CAAC,YAAY,EAAE,OAAO,IAAI,EAAE,SAEvD,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-by.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/order-by.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,KAAK,UAAU,GAAG,GAAG,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3C,KAAK,OAAO,GAAG,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAA;CAAE,GAAG,OAAO,EAAE,CAAC;AACtE,KAAK,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AACrE,KAAK,eAAe,GAAG;IAAE,aAAa,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAKhE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"order-by.d.ts","sourceRoot":"","sources":["../../../src/query/helpers/order-by.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,KAAK,UAAU,GAAG,GAAG,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAC3C,KAAK,OAAO,GAAG,MAAM,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAA;CAAE,GAAG,OAAO,EAAE,CAAC;AACtE,KAAK,kBAAkB,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AACrE,KAAK,eAAe,GAAG;IAAE,aAAa,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC;AAC7F,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAKhE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,yBAAyB,GACpC,IAAI;IAAE,UAAU,EAAE;QAAE,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;KAAE,CAAA;CAAE,EACjF,WAAW,MAAM,EACjB,YAAY,MAAM,EAClB,gBAAc,KACb,IAAI,CAAC,IAAI,CAAC,GAOZ,CAAC;AAEF,+DAA+D;AAC/D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpE;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAClC,IAAI,YAAY,EAChB,WAAW,MAAM,EACjB,gBAAgB,MAAM,EACtB,OAAO,YAAY,KAClB,2BASF,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS,OAAO,EAAE,KAAK,UAAU,KAAG,YAAY,EA6E9E,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,QAAQ,MAAM,WAIvD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,UAAU,qCAoJtF,CAAC"}
|
|
@@ -194,7 +194,7 @@ const getStrapiOrderColumnAlias = (column)=>{
|
|
|
194
194
|
// Notes:
|
|
195
195
|
// - Only select the first row for each partition
|
|
196
196
|
// - Since we're applying the "where" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows
|
|
197
|
-
.innerJoin(selectRowsAsNumberedPartitions, function() {
|
|
197
|
+
.innerJoin(selectRowsAsNumberedPartitions, function joinPartitionedRows() {
|
|
198
198
|
this// Only select rows that are returned by T
|
|
199
199
|
.on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)// By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that
|
|
200
200
|
// we're selecting rows in the correct order amongst the groups created by the "partition by"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-by.js","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByColumnValue = { column: string; order?: 'asc' | 'desc' };\ntype OrderByRawValue = { rawExpression: 'status'; isI18n?: boolean; order?: 'asc' | 'desc' };\nexport type OrderByValue = OrderByColumnValue | OrderByRawValue;\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\n/**\n * Builds a SQL CASE expression that maps each row to a numeric status rank:\n * 0 = draft/created (no published sibling with same documentId [+ locale])\n * 1 = modified (draft updated_at > published updated_at for same documentId [+ locale])\n * 2 = published\n *\n * @param db - Database instance (used to access knex raw)\n * @param tableName - Actual DB table name (used in correlated subqueries)\n * @param tableAlias - Alias of the table in the outer query (e.g. \"t0\")\n * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination\n */\nexport const buildStatusSortExpression = (\n db: { connection: { raw: (sql: string, bindings?: unknown[]) => knex.Knex.Raw } },\n tableName: string,\n tableAlias: string,\n isI18n = false\n): knex.Knex.Raw => {\n const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';\n\n return db.connection.raw(\n `CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`,\n [tableName, tableName]\n );\n};\n\n/** DB handle accepted by {@link buildStatusSortExpression}. */\ntype StatusSortDb = Parameters<typeof buildStatusSortExpression>[0];\n\n/**\n * Shape passed to Knex `orderBy` for compound ordering. Knex accepts `Knex.Raw` in the column\n * position at runtime; generated typings sometimes only list string.\n */\nexport type KnexOrderByColumnDescriptor = {\n column: string | knex.Knex.Raw;\n order?: 'asc' | 'desc';\n};\n\n/**\n * Maps processed {@link OrderByValue} entries to descriptors Knex can consume. Translates the\n * virtual `status` sort into a parameterized raw SQL expression.\n */\nexport const toKnexOrderByDescriptor = (\n db: StatusSortDb,\n tableName: string,\n rootTableAlias: string,\n entry: OrderByValue\n): KnexOrderByColumnDescriptor => {\n if ('rawExpression' in entry) {\n return {\n column: buildStatusSortExpression(db, tableName, rootTableAlias, entry.isI18n),\n order: entry.order,\n };\n }\n\n return { column: entry.column, order: entry.order };\n};\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n const { db, uid, qb, alias } = ctx;\n const meta = db.metadata.get(uid);\n const { attributes } = meta;\n\n if (typeof orderBy === 'string') {\n if (orderBy === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: undefined }];\n }\n\n const attribute = attributes[orderBy];\n\n if (!attribute) {\n throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n }\n\n const columnName = toColumnName(meta, orderBy);\n\n return [{ column: qb.aliasColumn(columnName, alias) }];\n }\n\n if (Array.isArray(orderBy)) {\n return orderBy.flatMap((value) => processOrderBy(value, ctx));\n }\n\n if (_.isPlainObject(orderBy)) {\n return Object.entries(orderBy).flatMap(([key, direction]) => {\n const value = orderBy[key];\n\n if (key === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: direction as 'asc' | 'desc' }];\n }\n\n const attribute = attributes[key];\n\n if (!attribute) {\n throw new Error(`Attribute ${key} not found on model ${uid}`);\n }\n\n if (types.isScalar(attribute.type)) {\n const columnName = toColumnName(meta, key);\n\n return { column: qb.aliasColumn(columnName, alias), order: direction };\n }\n\n if (attribute.type === 'relation' && 'target' in attribute) {\n const subAlias = createJoin(ctx, {\n alias: alias || qb.alias,\n attributeName: key,\n attribute,\n });\n\n return processOrderBy(value, {\n db,\n qb,\n alias: subAlias,\n uid: attribute.target,\n });\n }\n\n throw new Error(`You cannot order on ${attribute.type} types`);\n });\n }\n\n throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n const trimmedColumnName = column.replaceAll('.', '_');\n\n return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n /**\n * Notes:\n * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n */\n\n const { db, qb, uid } = ctx;\n\n const { tableName } = db.metadata.get(uid);\n\n // The orderBy is cloned to avoid unwanted mutations of the original object\n const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n // Separate column-based entries from raw-expression entries (e.g. status)\n const columnOrderBy = orderBy.filter((ob): ob is OrderByColumnValue => 'column' in ob);\n const rawExpressionOrderBy = orderBy.filter((ob): ob is OrderByRawValue => 'rawExpression' in ob);\n\n // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n // The connection reuse the original table name (aliased if needed)\n const resultQueryAlias = qb.getAlias();\n const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n const resultQuery = db.getConnection(aliasedTableName);\n\n // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n const baseQuery = originalQuery.clone();\n const baseQueryAlias = qb.getAlias();\n\n // Clear unwanted statements from the sub-query 'baseQuery'\n // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n // Note: Those statements will be re-applied when duplicates are removed from the final selection\n baseQuery\n // Columns selection\n .clear('select')\n // Pagination and sorting\n .clear('order')\n .clear('limit')\n .clear('offset');\n\n // Override the initial select and return only the columns needed for the partitioning.\n // Only column-based orderBy entries are included here; raw expressions are applied later.\n baseQuery.select(\n // Always select the row id for future manipulation\n prefix(qb.alias, 'id'),\n // Select every column used in an order by clause, but alias it for future reference\n // i.e. if t2.name is present in an order by clause:\n // Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n ...columnOrderBy.map((orderByClause) =>\n alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n )\n );\n\n // 2. Create a sub-query callback to extract and sort the partitions using row number\n const partitionedQueryAlias = qb.getAlias();\n\n const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n // Transform order by clause to their alias to reference them from baseQuery\n const prefixedOrderBy = columnOrderBy.map((orderByClause) => ({\n column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n }));\n\n // partitionedQuery select must contain every column used for sorting\n const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n partitionedQuery\n .select(\n // Always select baseQuery.id\n prefix(baseQueryAlias, 'id'),\n // Sort columns\n ...orderByColumns\n )\n // The row number is used to assign an index to every row in every partition\n .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n for (const orderByClause of prefixedOrderBy) {\n subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n }\n\n // And each partition/group is created based on baseQuery.id\n subQuery.partitionBy(`${baseQueryAlias}.id`);\n })\n .from(baseQuery.as(baseQueryAlias))\n .as(partitionedQueryAlias);\n };\n\n // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)\n const stringSelect = qb.state.select.filter((s): s is string => typeof s === 'string');\n const originalSelect = _.difference(\n stringSelect,\n // Remove column-based order by columns from the initial select (raw expressions are not in select)\n columnOrderBy.map(_.prop('column'))\n )\n // Alias everything in resultQuery\n .map((col) => `${resultQueryAlias}.${col}`);\n\n resultQuery\n .select(originalSelect)\n // Join T to resultQuery to access sorted data\n // Notes:\n // - Only select the first row for each partition\n // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n .innerJoin(selectRowsAsNumberedPartitions, function () {\n this\n // Only select rows that are returned by T\n .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n });\n\n // Re-apply pagination params\n\n if (qb.state.limit) {\n resultQuery.limit(qb.state.limit);\n }\n\n if (qb.state.offset) {\n resultQuery.offset(qb.state.offset);\n }\n\n if (qb.state.first) {\n resultQuery.first();\n }\n\n // Re-apply the sort using T values (column-based), then append raw expression sorts.\n // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,\n // even though Knex supports it at runtime.\n resultQuery.orderBy([\n // Transform column-based \"order by\" clause to their T alias and prefix them with T alias\n ...columnOrderBy.map((orderByClause) => ({\n column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n })),\n // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)\n ...rawExpressionOrderBy.map((entry) => ({\n column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),\n order: entry.order,\n })),\n // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n ] as any);\n\n return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","buildStatusSortExpression","db","tableName","tableAlias","isI18n","localeCondition","connection","raw","toKnexOrderByDescriptor","rootTableAlias","entry","column","order","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","undefined","attribute","columnName","toColumnName","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","cloneDeep","state","columnOrderBy","filter","ob","rawExpressionOrderBy","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","stringSelect","s","originalSelect","difference","col","innerJoin","on","andOnVal","limit","offset","first","curry"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"order-by.js","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByColumnValue = { column: string; order?: 'asc' | 'desc' };\ntype OrderByRawValue = { rawExpression: 'status'; isI18n?: boolean; order?: 'asc' | 'desc' };\nexport type OrderByValue = OrderByColumnValue | OrderByRawValue;\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\n/**\n * Builds a SQL CASE expression that maps each row to a numeric status rank:\n * 0 = draft/created (no published sibling with same documentId [+ locale])\n * 1 = modified (draft updated_at > published updated_at for same documentId [+ locale])\n * 2 = published\n *\n * @param db - Database instance (used to access knex raw)\n * @param tableName - Actual DB table name (used in correlated subqueries)\n * @param tableAlias - Alias of the table in the outer query (e.g. \"t0\")\n * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination\n */\nexport const buildStatusSortExpression = (\n db: { connection: { raw: (sql: string, bindings?: unknown[]) => knex.Knex.Raw } },\n tableName: string,\n tableAlias: string,\n isI18n = false\n): knex.Knex.Raw => {\n const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';\n\n return db.connection.raw(\n `CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`,\n [tableName, tableName]\n );\n};\n\n/** DB handle accepted by {@link buildStatusSortExpression}. */\ntype StatusSortDb = Parameters<typeof buildStatusSortExpression>[0];\n\n/**\n * Shape passed to Knex `orderBy` for compound ordering. Knex accepts `Knex.Raw` in the column\n * position at runtime; generated typings sometimes only list string.\n */\nexport type KnexOrderByColumnDescriptor = {\n column: string | knex.Knex.Raw;\n order?: 'asc' | 'desc';\n};\n\n/**\n * Maps processed {@link OrderByValue} entries to descriptors Knex can consume. Translates the\n * virtual `status` sort into a parameterized raw SQL expression.\n */\nexport const toKnexOrderByDescriptor = (\n db: StatusSortDb,\n tableName: string,\n rootTableAlias: string,\n entry: OrderByValue\n): KnexOrderByColumnDescriptor => {\n if ('rawExpression' in entry) {\n return {\n column: buildStatusSortExpression(db, tableName, rootTableAlias, entry.isI18n),\n order: entry.order,\n };\n }\n\n return { column: entry.column, order: entry.order };\n};\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n const { db, uid, qb, alias } = ctx;\n const meta = db.metadata.get(uid);\n const { attributes } = meta;\n\n if (typeof orderBy === 'string') {\n if (orderBy === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: undefined }];\n }\n\n const attribute = attributes[orderBy];\n\n if (!attribute) {\n throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n }\n\n const columnName = toColumnName(meta, orderBy);\n\n return [{ column: qb.aliasColumn(columnName, alias) }];\n }\n\n if (Array.isArray(orderBy)) {\n return orderBy.flatMap((value) => processOrderBy(value, ctx));\n }\n\n if (_.isPlainObject(orderBy)) {\n return Object.entries(orderBy).flatMap(([key, direction]) => {\n const value = orderBy[key];\n\n if (key === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: direction as 'asc' | 'desc' }];\n }\n\n const attribute = attributes[key];\n\n if (!attribute) {\n throw new Error(`Attribute ${key} not found on model ${uid}`);\n }\n\n if (types.isScalar(attribute.type)) {\n const columnName = toColumnName(meta, key);\n\n return { column: qb.aliasColumn(columnName, alias), order: direction };\n }\n\n if (attribute.type === 'relation' && 'target' in attribute) {\n const subAlias = createJoin(ctx, {\n alias: alias || qb.alias,\n attributeName: key,\n attribute,\n });\n\n return processOrderBy(value, {\n db,\n qb,\n alias: subAlias,\n uid: attribute.target,\n });\n }\n\n throw new Error(`You cannot order on ${attribute.type} types`);\n });\n }\n\n throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n const trimmedColumnName = column.replaceAll('.', '_');\n\n return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n /**\n * Notes:\n * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n */\n\n const { db, qb, uid } = ctx;\n\n const { tableName } = db.metadata.get(uid);\n\n // The orderBy is cloned to avoid unwanted mutations of the original object\n const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n // Separate column-based entries from raw-expression entries (e.g. status)\n const columnOrderBy = orderBy.filter((ob): ob is OrderByColumnValue => 'column' in ob);\n const rawExpressionOrderBy = orderBy.filter((ob): ob is OrderByRawValue => 'rawExpression' in ob);\n\n // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n // The connection reuse the original table name (aliased if needed)\n const resultQueryAlias = qb.getAlias();\n const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n const resultQuery = db.getConnection(aliasedTableName);\n\n // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n const baseQuery = originalQuery.clone();\n const baseQueryAlias = qb.getAlias();\n\n // Clear unwanted statements from the sub-query 'baseQuery'\n // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n // Note: Those statements will be re-applied when duplicates are removed from the final selection\n baseQuery\n // Columns selection\n .clear('select')\n // Pagination and sorting\n .clear('order')\n .clear('limit')\n .clear('offset');\n\n // Override the initial select and return only the columns needed for the partitioning.\n // Only column-based orderBy entries are included here; raw expressions are applied later.\n baseQuery.select(\n // Always select the row id for future manipulation\n prefix(qb.alias, 'id'),\n // Select every column used in an order by clause, but alias it for future reference\n // i.e. if t2.name is present in an order by clause:\n // Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n ...columnOrderBy.map((orderByClause) =>\n alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n )\n );\n\n // 2. Create a sub-query callback to extract and sort the partitions using row number\n const partitionedQueryAlias = qb.getAlias();\n\n const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n // Transform order by clause to their alias to reference them from baseQuery\n const prefixedOrderBy = columnOrderBy.map((orderByClause) => ({\n column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n }));\n\n // partitionedQuery select must contain every column used for sorting\n const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n partitionedQuery\n .select(\n // Always select baseQuery.id\n prefix(baseQueryAlias, 'id'),\n // Sort columns\n ...orderByColumns\n )\n // The row number is used to assign an index to every row in every partition\n .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n for (const orderByClause of prefixedOrderBy) {\n subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n }\n\n // And each partition/group is created based on baseQuery.id\n subQuery.partitionBy(`${baseQueryAlias}.id`);\n })\n .from(baseQuery.as(baseQueryAlias))\n .as(partitionedQueryAlias);\n };\n\n // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)\n const stringSelect = qb.state.select.filter((s): s is string => typeof s === 'string');\n const originalSelect = _.difference(\n stringSelect,\n // Remove column-based order by columns from the initial select (raw expressions are not in select)\n columnOrderBy.map(_.prop('column'))\n )\n // Alias everything in resultQuery\n .map((col) => `${resultQueryAlias}.${col}`);\n\n resultQuery\n .select(originalSelect)\n // Join T to resultQuery to access sorted data\n // Notes:\n // - Only select the first row for each partition\n // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n .innerJoin(selectRowsAsNumberedPartitions, function joinPartitionedRows() {\n this\n // Only select rows that are returned by T\n .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n });\n\n // Re-apply pagination params\n\n if (qb.state.limit) {\n resultQuery.limit(qb.state.limit);\n }\n\n if (qb.state.offset) {\n resultQuery.offset(qb.state.offset);\n }\n\n if (qb.state.first) {\n resultQuery.first();\n }\n\n // Re-apply the sort using T values (column-based), then append raw expression sorts.\n // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,\n // even though Knex supports it at runtime.\n resultQuery.orderBy([\n // Transform column-based \"order by\" clause to their T alias and prefix them with T alias\n ...columnOrderBy.map((orderByClause) => ({\n column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n })),\n // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)\n ...rawExpressionOrderBy.map((entry) => ({\n column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),\n order: entry.order,\n })),\n // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n ] as any);\n\n return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","buildStatusSortExpression","db","tableName","tableAlias","isI18n","localeCondition","connection","raw","toKnexOrderByDescriptor","rootTableAlias","entry","column","order","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","undefined","attribute","columnName","toColumnName","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","cloneDeep","state","columnOrderBy","filter","ob","rawExpressionOrderBy","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","stringSelect","s","originalSelect","difference","col","innerJoin","joinPartitionedRows","on","andOnVal","limit","offset","first","curry"],"mappings":"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"}
|
|
@@ -188,7 +188,7 @@ const getStrapiOrderColumnAlias = (column)=>{
|
|
|
188
188
|
// Notes:
|
|
189
189
|
// - Only select the first row for each partition
|
|
190
190
|
// - Since we're applying the "where" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows
|
|
191
|
-
.innerJoin(selectRowsAsNumberedPartitions, function() {
|
|
191
|
+
.innerJoin(selectRowsAsNumberedPartitions, function joinPartitionedRows() {
|
|
192
192
|
this// Only select rows that are returned by T
|
|
193
193
|
.on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)// By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that
|
|
194
194
|
// we're selecting rows in the correct order amongst the groups created by the "partition by"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-by.mjs","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByColumnValue = { column: string; order?: 'asc' | 'desc' };\ntype OrderByRawValue = { rawExpression: 'status'; isI18n?: boolean; order?: 'asc' | 'desc' };\nexport type OrderByValue = OrderByColumnValue | OrderByRawValue;\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\n/**\n * Builds a SQL CASE expression that maps each row to a numeric status rank:\n * 0 = draft/created (no published sibling with same documentId [+ locale])\n * 1 = modified (draft updated_at > published updated_at for same documentId [+ locale])\n * 2 = published\n *\n * @param db - Database instance (used to access knex raw)\n * @param tableName - Actual DB table name (used in correlated subqueries)\n * @param tableAlias - Alias of the table in the outer query (e.g. \"t0\")\n * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination\n */\nexport const buildStatusSortExpression = (\n db: { connection: { raw: (sql: string, bindings?: unknown[]) => knex.Knex.Raw } },\n tableName: string,\n tableAlias: string,\n isI18n = false\n): knex.Knex.Raw => {\n const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';\n\n return db.connection.raw(\n `CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`,\n [tableName, tableName]\n );\n};\n\n/** DB handle accepted by {@link buildStatusSortExpression}. */\ntype StatusSortDb = Parameters<typeof buildStatusSortExpression>[0];\n\n/**\n * Shape passed to Knex `orderBy` for compound ordering. Knex accepts `Knex.Raw` in the column\n * position at runtime; generated typings sometimes only list string.\n */\nexport type KnexOrderByColumnDescriptor = {\n column: string | knex.Knex.Raw;\n order?: 'asc' | 'desc';\n};\n\n/**\n * Maps processed {@link OrderByValue} entries to descriptors Knex can consume. Translates the\n * virtual `status` sort into a parameterized raw SQL expression.\n */\nexport const toKnexOrderByDescriptor = (\n db: StatusSortDb,\n tableName: string,\n rootTableAlias: string,\n entry: OrderByValue\n): KnexOrderByColumnDescriptor => {\n if ('rawExpression' in entry) {\n return {\n column: buildStatusSortExpression(db, tableName, rootTableAlias, entry.isI18n),\n order: entry.order,\n };\n }\n\n return { column: entry.column, order: entry.order };\n};\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n const { db, uid, qb, alias } = ctx;\n const meta = db.metadata.get(uid);\n const { attributes } = meta;\n\n if (typeof orderBy === 'string') {\n if (orderBy === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: undefined }];\n }\n\n const attribute = attributes[orderBy];\n\n if (!attribute) {\n throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n }\n\n const columnName = toColumnName(meta, orderBy);\n\n return [{ column: qb.aliasColumn(columnName, alias) }];\n }\n\n if (Array.isArray(orderBy)) {\n return orderBy.flatMap((value) => processOrderBy(value, ctx));\n }\n\n if (_.isPlainObject(orderBy)) {\n return Object.entries(orderBy).flatMap(([key, direction]) => {\n const value = orderBy[key];\n\n if (key === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: direction as 'asc' | 'desc' }];\n }\n\n const attribute = attributes[key];\n\n if (!attribute) {\n throw new Error(`Attribute ${key} not found on model ${uid}`);\n }\n\n if (types.isScalar(attribute.type)) {\n const columnName = toColumnName(meta, key);\n\n return { column: qb.aliasColumn(columnName, alias), order: direction };\n }\n\n if (attribute.type === 'relation' && 'target' in attribute) {\n const subAlias = createJoin(ctx, {\n alias: alias || qb.alias,\n attributeName: key,\n attribute,\n });\n\n return processOrderBy(value, {\n db,\n qb,\n alias: subAlias,\n uid: attribute.target,\n });\n }\n\n throw new Error(`You cannot order on ${attribute.type} types`);\n });\n }\n\n throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n const trimmedColumnName = column.replaceAll('.', '_');\n\n return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n /**\n * Notes:\n * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n */\n\n const { db, qb, uid } = ctx;\n\n const { tableName } = db.metadata.get(uid);\n\n // The orderBy is cloned to avoid unwanted mutations of the original object\n const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n // Separate column-based entries from raw-expression entries (e.g. status)\n const columnOrderBy = orderBy.filter((ob): ob is OrderByColumnValue => 'column' in ob);\n const rawExpressionOrderBy = orderBy.filter((ob): ob is OrderByRawValue => 'rawExpression' in ob);\n\n // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n // The connection reuse the original table name (aliased if needed)\n const resultQueryAlias = qb.getAlias();\n const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n const resultQuery = db.getConnection(aliasedTableName);\n\n // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n const baseQuery = originalQuery.clone();\n const baseQueryAlias = qb.getAlias();\n\n // Clear unwanted statements from the sub-query 'baseQuery'\n // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n // Note: Those statements will be re-applied when duplicates are removed from the final selection\n baseQuery\n // Columns selection\n .clear('select')\n // Pagination and sorting\n .clear('order')\n .clear('limit')\n .clear('offset');\n\n // Override the initial select and return only the columns needed for the partitioning.\n // Only column-based orderBy entries are included here; raw expressions are applied later.\n baseQuery.select(\n // Always select the row id for future manipulation\n prefix(qb.alias, 'id'),\n // Select every column used in an order by clause, but alias it for future reference\n // i.e. if t2.name is present in an order by clause:\n // Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n ...columnOrderBy.map((orderByClause) =>\n alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n )\n );\n\n // 2. Create a sub-query callback to extract and sort the partitions using row number\n const partitionedQueryAlias = qb.getAlias();\n\n const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n // Transform order by clause to their alias to reference them from baseQuery\n const prefixedOrderBy = columnOrderBy.map((orderByClause) => ({\n column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n }));\n\n // partitionedQuery select must contain every column used for sorting\n const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n partitionedQuery\n .select(\n // Always select baseQuery.id\n prefix(baseQueryAlias, 'id'),\n // Sort columns\n ...orderByColumns\n )\n // The row number is used to assign an index to every row in every partition\n .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n for (const orderByClause of prefixedOrderBy) {\n subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n }\n\n // And each partition/group is created based on baseQuery.id\n subQuery.partitionBy(`${baseQueryAlias}.id`);\n })\n .from(baseQuery.as(baseQueryAlias))\n .as(partitionedQueryAlias);\n };\n\n // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)\n const stringSelect = qb.state.select.filter((s): s is string => typeof s === 'string');\n const originalSelect = _.difference(\n stringSelect,\n // Remove column-based order by columns from the initial select (raw expressions are not in select)\n columnOrderBy.map(_.prop('column'))\n )\n // Alias everything in resultQuery\n .map((col) => `${resultQueryAlias}.${col}`);\n\n resultQuery\n .select(originalSelect)\n // Join T to resultQuery to access sorted data\n // Notes:\n // - Only select the first row for each partition\n // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n .innerJoin(selectRowsAsNumberedPartitions, function () {\n this\n // Only select rows that are returned by T\n .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n });\n\n // Re-apply pagination params\n\n if (qb.state.limit) {\n resultQuery.limit(qb.state.limit);\n }\n\n if (qb.state.offset) {\n resultQuery.offset(qb.state.offset);\n }\n\n if (qb.state.first) {\n resultQuery.first();\n }\n\n // Re-apply the sort using T values (column-based), then append raw expression sorts.\n // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,\n // even though Knex supports it at runtime.\n resultQuery.orderBy([\n // Transform column-based \"order by\" clause to their T alias and prefix them with T alias\n ...columnOrderBy.map((orderByClause) => ({\n column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n })),\n // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)\n ...rawExpressionOrderBy.map((entry) => ({\n column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),\n order: entry.order,\n })),\n // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n ] as any);\n\n return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","buildStatusSortExpression","db","tableName","tableAlias","isI18n","localeCondition","connection","raw","toKnexOrderByDescriptor","rootTableAlias","entry","column","order","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","undefined","attribute","columnName","toColumnName","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","cloneDeep","state","columnOrderBy","filter","ob","rawExpressionOrderBy","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","stringSelect","s","originalSelect","difference","col","innerJoin","on","andOnVal","limit","offset","first","curry"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"order-by.mjs","sources":["../../../src/query/helpers/order-by.ts"],"sourcesContent":["import _ from 'lodash/fp';\nimport knex from 'knex';\n\nimport * as types from '../../utils/types';\nimport { createJoin } from './join';\nimport { toColumnName } from './transform';\n\nimport type { Ctx } from '../types';\n\ntype OrderByCtx = Ctx & { alias?: string };\ntype OrderBy = string | { [key: string]: 'asc' | 'desc' } | OrderBy[];\ntype OrderByColumnValue = { column: string; order?: 'asc' | 'desc' };\ntype OrderByRawValue = { rawExpression: 'status'; isI18n?: boolean; order?: 'asc' | 'desc' };\nexport type OrderByValue = OrderByColumnValue | OrderByRawValue;\n\nconst COL_STRAPI_ROW_NUMBER = '__strapi_row_number';\nconst COL_STRAPI_ORDER_BY_PREFIX = '__strapi_order_by';\n\n/**\n * Builds a SQL CASE expression that maps each row to a numeric status rank:\n * 0 = draft/created (no published sibling with same documentId [+ locale])\n * 1 = modified (draft updated_at > published updated_at for same documentId [+ locale])\n * 2 = published\n *\n * @param db - Database instance (used to access knex raw)\n * @param tableName - Actual DB table name (used in correlated subqueries)\n * @param tableAlias - Alias of the table in the outer query (e.g. \"t0\")\n * @param isI18n - When true, adds a locale condition to avoid cross-locale contamination\n */\nexport const buildStatusSortExpression = (\n db: { connection: { raw: (sql: string, bindings?: unknown[]) => knex.Knex.Raw } },\n tableName: string,\n tableAlias: string,\n isI18n = false\n): knex.Knex.Raw => {\n const localeCondition = isI18n ? ` AND sub.locale = ${tableAlias}.locale` : '';\n\n return db.connection.raw(\n `CASE WHEN NOT EXISTS(SELECT 1 FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 0 WHEN ${tableAlias}.updated_at > (SELECT MAX(sub.updated_at) FROM ?? sub WHERE sub.document_id = ${tableAlias}.document_id AND sub.published_at IS NOT NULL${localeCondition}) THEN 1 ELSE 2 END`,\n [tableName, tableName]\n );\n};\n\n/** DB handle accepted by {@link buildStatusSortExpression}. */\ntype StatusSortDb = Parameters<typeof buildStatusSortExpression>[0];\n\n/**\n * Shape passed to Knex `orderBy` for compound ordering. Knex accepts `Knex.Raw` in the column\n * position at runtime; generated typings sometimes only list string.\n */\nexport type KnexOrderByColumnDescriptor = {\n column: string | knex.Knex.Raw;\n order?: 'asc' | 'desc';\n};\n\n/**\n * Maps processed {@link OrderByValue} entries to descriptors Knex can consume. Translates the\n * virtual `status` sort into a parameterized raw SQL expression.\n */\nexport const toKnexOrderByDescriptor = (\n db: StatusSortDb,\n tableName: string,\n rootTableAlias: string,\n entry: OrderByValue\n): KnexOrderByColumnDescriptor => {\n if ('rawExpression' in entry) {\n return {\n column: buildStatusSortExpression(db, tableName, rootTableAlias, entry.isI18n),\n order: entry.order,\n };\n }\n\n return { column: entry.column, order: entry.order };\n};\n\nexport const processOrderBy = (orderBy: OrderBy, ctx: OrderByCtx): OrderByValue[] => {\n const { db, uid, qb, alias } = ctx;\n const meta = db.metadata.get(uid);\n const { attributes } = meta;\n\n if (typeof orderBy === 'string') {\n if (orderBy === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: undefined }];\n }\n\n const attribute = attributes[orderBy];\n\n if (!attribute) {\n throw new Error(`Attribute ${orderBy} not found on model ${uid}`);\n }\n\n const columnName = toColumnName(meta, orderBy);\n\n return [{ column: qb.aliasColumn(columnName, alias) }];\n }\n\n if (Array.isArray(orderBy)) {\n return orderBy.flatMap((value) => processOrderBy(value, ctx));\n }\n\n if (_.isPlainObject(orderBy)) {\n return Object.entries(orderBy).flatMap(([key, direction]) => {\n const value = orderBy[key];\n\n if (key === 'status') {\n if (!attributes.publishedAt || !attributes.documentId) {\n throw new Error(\n `Cannot order by status on model ${uid}: missing publishedAt or documentId`\n );\n }\n const isI18n = 'locale' in attributes;\n return [{ rawExpression: 'status' as const, isI18n, order: direction as 'asc' | 'desc' }];\n }\n\n const attribute = attributes[key];\n\n if (!attribute) {\n throw new Error(`Attribute ${key} not found on model ${uid}`);\n }\n\n if (types.isScalar(attribute.type)) {\n const columnName = toColumnName(meta, key);\n\n return { column: qb.aliasColumn(columnName, alias), order: direction };\n }\n\n if (attribute.type === 'relation' && 'target' in attribute) {\n const subAlias = createJoin(ctx, {\n alias: alias || qb.alias,\n attributeName: key,\n attribute,\n });\n\n return processOrderBy(value, {\n db,\n qb,\n alias: subAlias,\n uid: attribute.target,\n });\n }\n\n throw new Error(`You cannot order on ${attribute.type} types`);\n });\n }\n\n throw new Error('Invalid orderBy syntax');\n};\n\nexport const getStrapiOrderColumnAlias = (column: string) => {\n const trimmedColumnName = column.replaceAll('.', '_');\n\n return `${COL_STRAPI_ORDER_BY_PREFIX}__${trimmedColumnName}`;\n};\n\n/**\n * Wraps the original Knex query with deep sorting functionality.\n *\n * The function takes an original query and an OrderByCtx object as parameters and returns a new Knex query with deep sorting applied.\n */\nexport const wrapWithDeepSort = (originalQuery: knex.Knex.QueryBuilder, ctx: OrderByCtx) => {\n /**\n * Notes:\n * - The generated query has the following flow: baseQuery (filtered unsorted data) -> T (partitioned/sorted data) --> resultQuery (distinct, paginated, sorted data)\n * - Pagination and selection are transferred from the original query to the outer one to avoid pruning rows too early\n * - Filtering (where) has to be done in the deepest sub query possible to avoid processing invalid rows and corrupting the final results\n * - We assume that all necessary joins are done in the original query (`originalQuery`), and every needed column is available with the right name and alias.\n */\n\n const { db, qb, uid } = ctx;\n\n const { tableName } = db.metadata.get(uid);\n\n // The orderBy is cloned to avoid unwanted mutations of the original object\n const orderBy = _.cloneDeep<OrderByValue[]>(qb.state.orderBy);\n\n // Separate column-based entries from raw-expression entries (e.g. status)\n const columnOrderBy = orderBy.filter((ob): ob is OrderByColumnValue => 'column' in ob);\n const rawExpressionOrderBy = orderBy.filter((ob): ob is OrderByRawValue => 'rawExpression' in ob);\n\n // 0. Init a new Knex query instance (referenced as resultQuery) using the DB connection\n // The connection reuse the original table name (aliased if needed)\n const resultQueryAlias = qb.getAlias();\n const aliasedTableName = qb.mustUseAlias() ? alias(resultQueryAlias, tableName) : tableName;\n\n const resultQuery = db.getConnection(aliasedTableName);\n\n // 1. Clone the original query to create the sub-query (referenced as baseQuery) and avoid any mutation on the initial object\n const baseQuery = originalQuery.clone();\n const baseQueryAlias = qb.getAlias();\n\n // Clear unwanted statements from the sub-query 'baseQuery'\n // Note: `first()` is cleared through the combination of `baseQuery.clear('limit')` and calling `baseQuery.select(...)` again\n // Note: Those statements will be re-applied when duplicates are removed from the final selection\n baseQuery\n // Columns selection\n .clear('select')\n // Pagination and sorting\n .clear('order')\n .clear('limit')\n .clear('offset');\n\n // Override the initial select and return only the columns needed for the partitioning.\n // Only column-based orderBy entries are included here; raw expressions are applied later.\n baseQuery.select(\n // Always select the row id for future manipulation\n prefix(qb.alias, 'id'),\n // Select every column used in an order by clause, but alias it for future reference\n // i.e. if t2.name is present in an order by clause:\n // Then, \"t2.name\" will become \"t2.name as __strapi_order_by__t2_name\"\n ...columnOrderBy.map((orderByClause) =>\n alias(getStrapiOrderColumnAlias(orderByClause.column), orderByClause.column)\n )\n );\n\n // 2. Create a sub-query callback to extract and sort the partitions using row number\n const partitionedQueryAlias = qb.getAlias();\n\n const selectRowsAsNumberedPartitions = (partitionedQuery: knex.Knex.QueryBuilder) => {\n // Transform order by clause to their alias to reference them from baseQuery\n const prefixedOrderBy = columnOrderBy.map((orderByClause) => ({\n column: prefix(baseQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n }));\n\n // partitionedQuery select must contain every column used for sorting\n const orderByColumns = prefixedOrderBy.map<string>(_.prop('column'));\n\n partitionedQuery\n .select(\n // Always select baseQuery.id\n prefix(baseQueryAlias, 'id'),\n // Sort columns\n ...orderByColumns\n )\n // The row number is used to assign an index to every row in every partition\n .rowNumber(COL_STRAPI_ROW_NUMBER, (subQuery) => {\n for (const orderByClause of prefixedOrderBy) {\n subQuery.orderBy(orderByClause.column, orderByClause.order, 'last');\n }\n\n // And each partition/group is created based on baseQuery.id\n subQuery.partitionBy(`${baseQueryAlias}.id`);\n })\n .from(baseQuery.as(baseQueryAlias))\n .as(partitionedQueryAlias);\n };\n\n // 3. Create the final resultQuery query, that select and sort the wanted data using T\n\n // Filter to string-only select items before diffing (Knex.Raw items are passed through as-is)\n const stringSelect = qb.state.select.filter((s): s is string => typeof s === 'string');\n const originalSelect = _.difference(\n stringSelect,\n // Remove column-based order by columns from the initial select (raw expressions are not in select)\n columnOrderBy.map(_.prop('column'))\n )\n // Alias everything in resultQuery\n .map((col) => `${resultQueryAlias}.${col}`);\n\n resultQuery\n .select(originalSelect)\n // Join T to resultQuery to access sorted data\n // Notes:\n // - Only select the first row for each partition\n // - Since we're applying the \"where\" statement directly on baseQuery (and not on resultQuery), we're using an inner join to avoid unwanted rows\n .innerJoin(selectRowsAsNumberedPartitions, function joinPartitionedRows() {\n this\n // Only select rows that are returned by T\n .on(`${partitionedQueryAlias}.id`, `${resultQueryAlias}.id`)\n // By only selecting the rows number equal to 1, we make sure we don't have duplicate, and that\n // we're selecting rows in the correct order amongst the groups created by the \"partition by\"\n .andOnVal(`${partitionedQueryAlias}.${COL_STRAPI_ROW_NUMBER}`, '=', 1);\n });\n\n // Re-apply pagination params\n\n if (qb.state.limit) {\n resultQuery.limit(qb.state.limit);\n }\n\n if (qb.state.offset) {\n resultQuery.offset(qb.state.offset);\n }\n\n if (qb.state.first) {\n resultQuery.first();\n }\n\n // Re-apply the sort using T values (column-based), then append raw expression sorts.\n // Cast to any[] because Knex's TS types don't accept Knex.Raw in the column position,\n // even though Knex supports it at runtime.\n resultQuery.orderBy([\n // Transform column-based \"order by\" clause to their T alias and prefix them with T alias\n ...columnOrderBy.map((orderByClause) => ({\n column: prefix(partitionedQueryAlias, getStrapiOrderColumnAlias(orderByClause.column)),\n order: orderByClause.order,\n })),\n // Rebuild raw expression entries with the correct outer alias (resultQueryAlias)\n ...rawExpressionOrderBy.map((entry) => ({\n column: buildStatusSortExpression(db, tableName, resultQueryAlias, entry.isI18n),\n order: entry.order,\n })),\n // Add T.id to the order by clause to get consistent results in case several rows have the exact same order\n { column: `${partitionedQueryAlias}.id`, order: 'asc' },\n ] as any);\n\n return resultQuery;\n};\n\n// Utils\nconst alias = _.curry((alias: string, value: string) => `${value} as ${alias}`);\nconst prefix = _.curry((prefix: string, value: string) => `${prefix}.${value}`);\n"],"names":["COL_STRAPI_ROW_NUMBER","COL_STRAPI_ORDER_BY_PREFIX","buildStatusSortExpression","db","tableName","tableAlias","isI18n","localeCondition","connection","raw","toKnexOrderByDescriptor","rootTableAlias","entry","column","order","processOrderBy","orderBy","ctx","uid","qb","alias","meta","metadata","get","attributes","publishedAt","documentId","Error","rawExpression","undefined","attribute","columnName","toColumnName","aliasColumn","Array","isArray","flatMap","value","_","isPlainObject","Object","entries","key","direction","types","type","subAlias","createJoin","attributeName","target","getStrapiOrderColumnAlias","trimmedColumnName","replaceAll","wrapWithDeepSort","originalQuery","cloneDeep","state","columnOrderBy","filter","ob","rawExpressionOrderBy","resultQueryAlias","getAlias","aliasedTableName","mustUseAlias","resultQuery","getConnection","baseQuery","clone","baseQueryAlias","clear","select","prefix","map","orderByClause","partitionedQueryAlias","selectRowsAsNumberedPartitions","partitionedQuery","prefixedOrderBy","orderByColumns","prop","rowNumber","subQuery","partitionBy","from","as","stringSelect","s","originalSelect","difference","col","innerJoin","joinPartitionedRows","on","andOnVal","limit","offset","first","curry"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/query/helpers/populate/apply.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../../src/query/helpers/populate/apply.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AA2BzC,KAAK,OAAO,GAAG;IACb,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAoBF,KAAK,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAspBnC,QAAA,MAAM,aAAa,GAAU,SAAS,GAAG,EAAE,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,OAAO,+BA+DvF,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var _ = require('lodash/fp');
|
|
4
|
+
var utils = require('@strapi/utils');
|
|
4
5
|
var transform = require('../transform.js');
|
|
5
6
|
|
|
6
7
|
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
@@ -16,7 +17,8 @@ const joinColPrefix = '__strapi';
|
|
|
16
17
|
* When `populateValue.orderBy` is present, join-table ordering must not take precedence
|
|
17
18
|
* over the target attribute sort (see query-builder join vs root orderBy ordering).
|
|
18
19
|
*/ const getJoinTableOrderBy = (populateValue, joinTable)=>{
|
|
19
|
-
|
|
20
|
+
const explicitSort = populateValue.orderBy ?? populateValue.sort;
|
|
21
|
+
if (utils.hasSort(explicitSort) || !joinTable.orderBy) {
|
|
20
22
|
return undefined;
|
|
21
23
|
}
|
|
22
24
|
return ___default.default.mapValues((v)=>populateValue.ordering || v, joinTable.orderBy);
|