@strapi/database 5.56.0 → 5.57.0
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/dialects/dialect.d.ts +28 -0
- package/dist/dialects/dialect.d.ts.map +1 -1
- package/dist/dialects/dialect.js +29 -0
- package/dist/dialects/dialect.js.map +1 -1
- package/dist/dialects/dialect.mjs +29 -0
- package/dist/dialects/dialect.mjs.map +1 -1
- package/dist/dialects/mysql/index.d.ts +9 -0
- package/dist/dialects/mysql/index.d.ts.map +1 -1
- package/dist/dialects/mysql/index.js +37 -0
- package/dist/dialects/mysql/index.js.map +1 -1
- package/dist/dialects/mysql/index.mjs +37 -0
- package/dist/dialects/mysql/index.mjs.map +1 -1
- package/dist/dialects/postgresql/index.d.ts +7 -0
- package/dist/dialects/postgresql/index.d.ts.map +1 -1
- package/dist/dialects/postgresql/index.js +50 -0
- package/dist/dialects/postgresql/index.js.map +1 -1
- package/dist/dialects/postgresql/index.mjs +50 -0
- package/dist/dialects/postgresql/index.mjs.map +1 -1
- package/dist/dialects/sqlite/index.d.ts +9 -0
- package/dist/dialects/sqlite/index.d.ts.map +1 -1
- package/dist/dialects/sqlite/index.js +16 -0
- package/dist/dialects/sqlite/index.js.map +1 -1
- package/dist/dialects/sqlite/index.mjs +16 -0
- package/dist/dialects/sqlite/index.mjs.map +1 -1
- package/dist/entity-manager/entity-repository.js +1 -1
- package/dist/entity-manager/entity-repository.js.map +1 -1
- package/dist/entity-manager/entity-repository.mjs +1 -1
- package/dist/entity-manager/entity-repository.mjs.map +1 -1
- package/dist/entity-manager/index.d.ts.map +1 -1
- package/dist/entity-manager/index.js +38 -36
- package/dist/entity-manager/index.js.map +1 -1
- package/dist/entity-manager/index.mjs +38 -36
- package/dist/entity-manager/index.mjs.map +1 -1
- package/dist/entity-manager/morph-relations.d.ts.map +1 -1
- package/dist/entity-manager/morph-relations.js +3 -5
- package/dist/entity-manager/morph-relations.js.map +1 -1
- package/dist/entity-manager/morph-relations.mjs +3 -5
- package/dist/entity-manager/morph-relations.mjs.map +1 -1
- package/dist/entity-manager/regular-relations.js +3 -3
- package/dist/entity-manager/regular-relations.js.map +1 -1
- package/dist/entity-manager/regular-relations.mjs +3 -3
- package/dist/entity-manager/regular-relations.mjs.map +1 -1
- package/dist/entity-manager/relations-orderer.d.ts.map +1 -1
- package/dist/entity-manager/relations-orderer.js +4 -5
- package/dist/entity-manager/relations-orderer.js.map +1 -1
- package/dist/entity-manager/relations-orderer.mjs +2 -3
- package/dist/entity-manager/relations-orderer.mjs.map +1 -1
- package/dist/fields/biginteger.js +1 -1
- package/dist/fields/biginteger.js.map +1 -1
- package/dist/fields/biginteger.mjs +1 -1
- package/dist/fields/biginteger.mjs.map +1 -1
- package/dist/fields/boolean.js +1 -1
- package/dist/fields/boolean.js.map +1 -1
- package/dist/fields/boolean.mjs +1 -1
- package/dist/fields/boolean.mjs.map +1 -1
- package/dist/fields/number.js +1 -1
- package/dist/fields/number.js.map +1 -1
- package/dist/fields/number.mjs +1 -1
- package/dist/fields/number.mjs.map +1 -1
- package/dist/fields/shared/parsers.js +2 -2
- package/dist/fields/shared/parsers.js.map +1 -1
- package/dist/fields/shared/parsers.mjs +2 -2
- package/dist/fields/shared/parsers.mjs.map +1 -1
- package/dist/fields/string.js +1 -1
- package/dist/fields/string.js.map +1 -1
- package/dist/fields/string.mjs +1 -1
- package/dist/fields/string.mjs.map +1 -1
- package/dist/index.d.ts +9 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/metadata/attribute-naming.d.ts +31 -0
- package/dist/metadata/attribute-naming.d.ts.map +1 -0
- package/dist/metadata/attribute-naming.js +39 -0
- package/dist/metadata/attribute-naming.js.map +1 -0
- package/dist/metadata/attribute-naming.mjs +37 -0
- package/dist/metadata/attribute-naming.mjs.map +1 -0
- package/dist/metadata/index.d.ts +5 -2
- package/dist/metadata/index.d.ts.map +1 -1
- package/dist/metadata/index.js +3 -0
- package/dist/metadata/index.js.map +1 -1
- package/dist/metadata/index.mjs +3 -1
- package/dist/metadata/index.mjs.map +1 -1
- package/dist/metadata/metadata.d.ts +10 -0
- package/dist/metadata/metadata.d.ts.map +1 -1
- package/dist/metadata/metadata.js +10 -2
- package/dist/metadata/metadata.js.map +1 -1
- package/dist/metadata/metadata.mjs +10 -2
- package/dist/metadata/metadata.mjs.map +1 -1
- package/dist/metadata/relations.d.ts.map +1 -1
- package/dist/metadata/relations.js +6 -5
- package/dist/metadata/relations.js.map +1 -1
- package/dist/metadata/relations.mjs +6 -5
- package/dist/metadata/relations.mjs.map +1 -1
- package/dist/migrations/common.d.ts +2 -0
- package/dist/migrations/common.d.ts.map +1 -1
- package/dist/migrations/common.js.map +1 -1
- package/dist/migrations/common.mjs.map +1 -1
- package/dist/migrations/file-builder.d.ts +97 -0
- package/dist/migrations/file-builder.d.ts.map +1 -0
- package/dist/migrations/file-builder.js +251 -0
- package/dist/migrations/file-builder.js.map +1 -0
- package/dist/migrations/file-builder.mjs +240 -0
- package/dist/migrations/file-builder.mjs.map +1 -0
- package/dist/migrations/index.d.ts +3 -2
- package/dist/migrations/index.d.ts.map +1 -1
- package/dist/migrations/index.js +6 -0
- package/dist/migrations/index.js.map +1 -1
- package/dist/migrations/index.mjs +6 -0
- package/dist/migrations/index.mjs.map +1 -1
- package/dist/migrations/internal-migrations/5.0.0-02-document-id.js +1 -1
- package/dist/migrations/internal-migrations/5.0.0-02-document-id.js.map +1 -1
- package/dist/migrations/internal-migrations/5.0.0-02-document-id.mjs +1 -1
- package/dist/migrations/internal-migrations/5.0.0-02-document-id.mjs.map +1 -1
- package/dist/migrations/resolver.d.ts.map +1 -1
- package/dist/migrations/resolver.js +4 -1
- package/dist/migrations/resolver.js.map +1 -1
- package/dist/migrations/resolver.mjs +4 -1
- package/dist/migrations/resolver.mjs.map +1 -1
- package/dist/query/helpers/order-by.d.ts.map +1 -1
- package/dist/query/helpers/order-by.js +3 -4
- package/dist/query/helpers/order-by.js.map +1 -1
- package/dist/query/helpers/order-by.mjs +3 -4
- 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 +46 -30
- package/dist/query/helpers/populate/apply.js.map +1 -1
- package/dist/query/helpers/populate/apply.mjs +46 -30
- package/dist/query/helpers/populate/apply.mjs.map +1 -1
- package/dist/query/helpers/populate/process.js +3 -3
- package/dist/query/helpers/populate/process.js.map +1 -1
- package/dist/query/helpers/populate/process.mjs +3 -3
- package/dist/query/helpers/populate/process.mjs.map +1 -1
- package/dist/query/helpers/search.js +2 -2
- package/dist/query/helpers/search.js.map +1 -1
- package/dist/query/helpers/search.mjs +2 -2
- package/dist/query/helpers/search.mjs.map +1 -1
- package/dist/query/helpers/streams/readable.js +3 -3
- package/dist/query/helpers/streams/readable.js.map +1 -1
- package/dist/query/helpers/streams/readable.mjs +3 -3
- package/dist/query/helpers/streams/readable.mjs.map +1 -1
- package/dist/query/helpers/transform.d.ts.map +1 -1
- package/dist/query/helpers/transform.js +6 -13
- package/dist/query/helpers/transform.js.map +1 -1
- package/dist/query/helpers/transform.mjs +6 -9
- package/dist/query/helpers/transform.mjs.map +1 -1
- package/dist/query/helpers/where.js +13 -9
- package/dist/query/helpers/where.js.map +1 -1
- package/dist/query/helpers/where.mjs +13 -9
- package/dist/query/helpers/where.mjs.map +1 -1
- package/dist/query/query-builder.d.ts.map +1 -1
- package/dist/query/query-builder.js +35 -29
- package/dist/query/query-builder.js.map +1 -1
- package/dist/query/query-builder.mjs +35 -29
- package/dist/query/query-builder.mjs.map +1 -1
- package/dist/schema/builder.js +5 -5
- package/dist/schema/builder.js.map +1 -1
- package/dist/schema/builder.mjs +5 -5
- package/dist/schema/builder.mjs.map +1 -1
- package/dist/schema/diff.js +12 -12
- package/dist/schema/diff.js.map +1 -1
- package/dist/schema/diff.mjs +12 -12
- package/dist/schema/diff.mjs.map +1 -1
- package/dist/schema/index.d.ts +3 -1
- package/dist/schema/index.d.ts.map +1 -1
- package/dist/schema/index.js +6 -0
- package/dist/schema/index.js.map +1 -1
- package/dist/schema/index.mjs +6 -0
- package/dist/schema/index.mjs.map +1 -1
- package/dist/schema/rename-helpers.d.ts +78 -0
- package/dist/schema/rename-helpers.d.ts.map +1 -0
- package/dist/schema/rename-helpers.js +235 -0
- package/dist/schema/rename-helpers.js.map +1 -0
- package/dist/schema/rename-helpers.mjs +233 -0
- package/dist/schema/rename-helpers.mjs.map +1 -0
- package/dist/utils/async-curry.d.ts.map +1 -1
- package/dist/utils/async-curry.js +1 -2
- package/dist/utils/async-curry.js.map +1 -1
- package/dist/utils/async-curry.mjs +1 -2
- package/dist/utils/async-curry.mjs.map +1 -1
- package/dist/utils/identifiers/hash.d.ts.map +1 -1
- package/dist/utils/identifiers/hash.js +1 -2
- package/dist/utils/identifiers/hash.js.map +1 -1
- package/dist/utils/identifiers/hash.mjs +1 -2
- package/dist/utils/identifiers/hash.mjs.map +1 -1
- package/dist/utils/identifiers/index.js +8 -10
- package/dist/utils/identifiers/index.js.map +1 -1
- package/dist/utils/identifiers/index.mjs +8 -6
- package/dist/utils/identifiers/index.mjs.map +1 -1
- package/dist/validations/relations/bidirectional.js +1 -1
- package/dist/validations/relations/bidirectional.js.map +1 -1
- package/dist/validations/relations/bidirectional.mjs +1 -1
- package/dist/validations/relations/bidirectional.mjs.map +1 -1
- package/package.json +6 -5
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _ = require('lodash
|
|
3
|
+
var _ = require('lodash');
|
|
4
4
|
var queryBuilder = require('../query/query-builder.js');
|
|
5
5
|
|
|
6
6
|
/* eslint-disable @typescript-eslint/naming-convention */ // allow __type
|
|
@@ -20,9 +20,7 @@ const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (rows, { uid,
|
|
|
20
20
|
typeColumn,
|
|
21
21
|
db
|
|
22
22
|
});
|
|
23
|
-
const
|
|
24
|
-
const groupByField = _.groupBy('field');
|
|
25
|
-
const typeAndFieldIdsGrouped = _.pipe(groupByType, _.mapValues(groupByField))(morphOneRows);
|
|
23
|
+
const typeAndFieldIdsGrouped = _.mapValues(_.groupBy(morphOneRows, typeColumn.name), (typeRows)=>_.groupBy(typeRows, 'field'));
|
|
26
24
|
const orWhere = [];
|
|
27
25
|
for (const [type, v] of Object.entries(typeAndFieldIdsGrouped)){
|
|
28
26
|
for (const [field, arr] of Object.entries(v)){
|
|
@@ -30,7 +28,7 @@ const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (rows, { uid,
|
|
|
30
28
|
[typeColumn.name]: type,
|
|
31
29
|
field,
|
|
32
30
|
[idColumn.name]: {
|
|
33
|
-
$in: _.map(idColumn.name
|
|
31
|
+
$in: _.map(arr, idColumn.name)
|
|
34
32
|
}
|
|
35
33
|
});
|
|
36
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"morph-relations.js","sources":["../../src/entity-manager/morph-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */ // allow __type\nimport { curry, groupBy,
|
|
1
|
+
{"version":3,"file":"morph-relations.js","sources":["../../src/entity-manager/morph-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */ // allow __type\nimport { curry, groupBy, mapValues, map, isEmpty } from 'lodash';\nimport type { Knex } from 'knex';\n\nimport { createQueryBuilder } from '../query';\nimport type { Database } from '..';\nimport type { MorphJoinTable, Relation } from '../types';\n\ntype Rows = Record<string, unknown>[];\n\nconst getMorphToManyRowsLinkedToMorphOne = (\n rows: Rows,\n {\n uid,\n attributeName,\n typeColumn,\n db,\n }: {\n uid: string;\n attributeName: string;\n typeColumn: { name: string };\n db: Database;\n }\n) =>\n rows.filter((row) => {\n const relatedType = row[typeColumn.name] as string;\n const field = row.field as any;\n\n const targetAttribute = db.metadata.get(relatedType).attributes[field] as Relation.MorphOne;\n\n // ensure targeted field is the right one + check if it is a morphOne\n return (\n targetAttribute?.target === uid &&\n targetAttribute?.morphBy === attributeName &&\n targetAttribute?.relation === 'morphOne'\n );\n });\n\nexport const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (\n rows: Rows,\n {\n uid,\n attributeName,\n joinTable,\n db,\n transaction: trx,\n }: {\n uid: string;\n attributeName: string;\n joinTable: MorphJoinTable;\n db: Database;\n transaction?: Knex.Transaction;\n }\n) => {\n const { morphColumn } = joinTable;\n const { idColumn, typeColumn } = morphColumn;\n\n const morphOneRows = getMorphToManyRowsLinkedToMorphOne(rows, {\n uid,\n attributeName,\n typeColumn,\n db,\n });\n\n const typeAndFieldIdsGrouped = mapValues(groupBy(morphOneRows, typeColumn.name), (typeRows) =>\n groupBy(typeRows, 'field')\n );\n\n const orWhere: object[] = [];\n\n for (const [type, v] of Object.entries(typeAndFieldIdsGrouped)) {\n for (const [field, arr] of Object.entries(v)) {\n orWhere.push({\n [typeColumn.name]: type,\n field,\n [idColumn.name]: { $in: map(arr, idColumn.name) },\n });\n }\n }\n\n if (!isEmpty(orWhere)) {\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({ $or: orWhere })\n .transacting(trx)\n .execute();\n }\n};\n\n/**\n * Encoding utilities for polymorphic relations.\n *\n * In some scenarios is useful to encode both the id & __type of the relation\n * to have a unique identifier for the relation. (e.g. relations reordering)\n */\n\nexport const encodePolymorphicId = (id: number | string, __type: string) => {\n return `${id}:::${__type}`;\n};\n\nexport const encodePolymorphicRelation = curry(({ idColumn, typeColumn }, relation?: any): any => {\n // Encode the id of the relation and the positional argument if it exist\n const newRelation = {\n ...relation,\n [idColumn]: encodePolymorphicId(relation[idColumn], relation[typeColumn]),\n };\n\n if (relation.position) {\n const { before, after } = relation.position;\n const __type = relation.position.__type || relation.__type;\n\n newRelation.position = { ...relation.position };\n\n if (before) newRelation.position.before = encodePolymorphicId(before, __type);\n if (after) newRelation.position.after = encodePolymorphicId(after, __type);\n }\n\n return newRelation;\n});\n"],"names":["getMorphToManyRowsLinkedToMorphOne","rows","uid","attributeName","typeColumn","db","filter","row","relatedType","name","field","targetAttribute","metadata","get","attributes","target","morphBy","relation","deleteRelatedMorphOneRelationsAfterMorphToManyUpdate","joinTable","transaction","trx","morphColumn","idColumn","morphOneRows","typeAndFieldIdsGrouped","mapValues","groupBy","typeRows","orWhere","type","v","Object","entries","arr","push","$in","map","isEmpty","createQueryBuilder","delete","where","$or","transacting","execute","encodePolymorphicId","id","__type","encodePolymorphicRelation","curry","newRelation","position","before","after"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { curry,
|
|
1
|
+
import { curry, mapValues, groupBy, map, isEmpty } from 'lodash';
|
|
2
2
|
import createQueryBuilder from '../query/query-builder.mjs';
|
|
3
3
|
|
|
4
4
|
/* eslint-disable @typescript-eslint/naming-convention */ // allow __type
|
|
@@ -18,9 +18,7 @@ const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (rows, { uid,
|
|
|
18
18
|
typeColumn,
|
|
19
19
|
db
|
|
20
20
|
});
|
|
21
|
-
const
|
|
22
|
-
const groupByField = groupBy('field');
|
|
23
|
-
const typeAndFieldIdsGrouped = pipe(groupByType, mapValues(groupByField))(morphOneRows);
|
|
21
|
+
const typeAndFieldIdsGrouped = mapValues(groupBy(morphOneRows, typeColumn.name), (typeRows)=>groupBy(typeRows, 'field'));
|
|
24
22
|
const orWhere = [];
|
|
25
23
|
for (const [type, v] of Object.entries(typeAndFieldIdsGrouped)){
|
|
26
24
|
for (const [field, arr] of Object.entries(v)){
|
|
@@ -28,7 +26,7 @@ const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (rows, { uid,
|
|
|
28
26
|
[typeColumn.name]: type,
|
|
29
27
|
field,
|
|
30
28
|
[idColumn.name]: {
|
|
31
|
-
$in: map(idColumn.name
|
|
29
|
+
$in: map(arr, idColumn.name)
|
|
32
30
|
}
|
|
33
31
|
});
|
|
34
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"morph-relations.mjs","sources":["../../src/entity-manager/morph-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */ // allow __type\nimport { curry, groupBy,
|
|
1
|
+
{"version":3,"file":"morph-relations.mjs","sources":["../../src/entity-manager/morph-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/naming-convention */ // allow __type\nimport { curry, groupBy, mapValues, map, isEmpty } from 'lodash';\nimport type { Knex } from 'knex';\n\nimport { createQueryBuilder } from '../query';\nimport type { Database } from '..';\nimport type { MorphJoinTable, Relation } from '../types';\n\ntype Rows = Record<string, unknown>[];\n\nconst getMorphToManyRowsLinkedToMorphOne = (\n rows: Rows,\n {\n uid,\n attributeName,\n typeColumn,\n db,\n }: {\n uid: string;\n attributeName: string;\n typeColumn: { name: string };\n db: Database;\n }\n) =>\n rows.filter((row) => {\n const relatedType = row[typeColumn.name] as string;\n const field = row.field as any;\n\n const targetAttribute = db.metadata.get(relatedType).attributes[field] as Relation.MorphOne;\n\n // ensure targeted field is the right one + check if it is a morphOne\n return (\n targetAttribute?.target === uid &&\n targetAttribute?.morphBy === attributeName &&\n targetAttribute?.relation === 'morphOne'\n );\n });\n\nexport const deleteRelatedMorphOneRelationsAfterMorphToManyUpdate = async (\n rows: Rows,\n {\n uid,\n attributeName,\n joinTable,\n db,\n transaction: trx,\n }: {\n uid: string;\n attributeName: string;\n joinTable: MorphJoinTable;\n db: Database;\n transaction?: Knex.Transaction;\n }\n) => {\n const { morphColumn } = joinTable;\n const { idColumn, typeColumn } = morphColumn;\n\n const morphOneRows = getMorphToManyRowsLinkedToMorphOne(rows, {\n uid,\n attributeName,\n typeColumn,\n db,\n });\n\n const typeAndFieldIdsGrouped = mapValues(groupBy(morphOneRows, typeColumn.name), (typeRows) =>\n groupBy(typeRows, 'field')\n );\n\n const orWhere: object[] = [];\n\n for (const [type, v] of Object.entries(typeAndFieldIdsGrouped)) {\n for (const [field, arr] of Object.entries(v)) {\n orWhere.push({\n [typeColumn.name]: type,\n field,\n [idColumn.name]: { $in: map(arr, idColumn.name) },\n });\n }\n }\n\n if (!isEmpty(orWhere)) {\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({ $or: orWhere })\n .transacting(trx)\n .execute();\n }\n};\n\n/**\n * Encoding utilities for polymorphic relations.\n *\n * In some scenarios is useful to encode both the id & __type of the relation\n * to have a unique identifier for the relation. (e.g. relations reordering)\n */\n\nexport const encodePolymorphicId = (id: number | string, __type: string) => {\n return `${id}:::${__type}`;\n};\n\nexport const encodePolymorphicRelation = curry(({ idColumn, typeColumn }, relation?: any): any => {\n // Encode the id of the relation and the positional argument if it exist\n const newRelation = {\n ...relation,\n [idColumn]: encodePolymorphicId(relation[idColumn], relation[typeColumn]),\n };\n\n if (relation.position) {\n const { before, after } = relation.position;\n const __type = relation.position.__type || relation.__type;\n\n newRelation.position = { ...relation.position };\n\n if (before) newRelation.position.before = encodePolymorphicId(before, __type);\n if (after) newRelation.position.after = encodePolymorphicId(after, __type);\n }\n\n return newRelation;\n});\n"],"names":["getMorphToManyRowsLinkedToMorphOne","rows","uid","attributeName","typeColumn","db","filter","row","relatedType","name","field","targetAttribute","metadata","get","attributes","target","morphBy","relation","deleteRelatedMorphOneRelationsAfterMorphToManyUpdate","joinTable","transaction","trx","morphColumn","idColumn","morphOneRows","typeAndFieldIdsGrouped","mapValues","groupBy","typeRows","orWhere","type","v","Object","entries","arr","push","$in","map","isEmpty","createQueryBuilder","delete","where","$or","transacting","execute","encodePolymorphicId","id","__type","encodePolymorphicRelation","curry","newRelation","position","before","after"],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _ = require('lodash
|
|
3
|
+
var _ = require('lodash');
|
|
4
4
|
var relations = require('../metadata/relations.js');
|
|
5
5
|
require('../utils/identifiers/index.js');
|
|
6
6
|
var queryBuilder = require('../query/query-builder.js');
|
|
@@ -61,7 +61,7 @@ const getDocumentSiblingIdsQuery = (tableName, id)=>{
|
|
|
61
61
|
if (relations.isManyToAny(attribute)) {
|
|
62
62
|
// if the database integrity was not broken relsToDelete is supposed to be of length 1
|
|
63
63
|
const relsToDelete = await con.select(inverseJoinColumn.name).from(joinTable.name).where(joinColumn.name, id).whereNotIn(inverseJoinColumn.name, getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable, relIdToadd)).where(joinTable.on || {}).transacting(trx);
|
|
64
|
-
const relIdsToDelete = _.map(inverseJoinColumn.name
|
|
64
|
+
const relIdsToDelete = _.map(relsToDelete, inverseJoinColumn.name);
|
|
65
65
|
await queryBuilder(joinTable.name, db).delete().where({
|
|
66
66
|
[joinColumn.name]: id,
|
|
67
67
|
[inverseJoinColumn.name]: {
|
|
@@ -107,7 +107,7 @@ const getDocumentSiblingIdsQuery = (tableName, id)=>{
|
|
|
107
107
|
}).where(joinTable.on || {}).orderBy('id').limit(batchSize).transacting(trx).execute();
|
|
108
108
|
done = batchToDelete.length < batchSize;
|
|
109
109
|
lastId = batchToDelete[batchToDelete.length - 1]?.id || 0;
|
|
110
|
-
const batchIds = _.map(inverseJoinColumn.name
|
|
110
|
+
const batchIds = _.map(batchToDelete, inverseJoinColumn.name);
|
|
111
111
|
await queryBuilder(joinTable.name, db).delete().where({
|
|
112
112
|
[joinColumn.name]: id,
|
|
113
113
|
[inverseJoinColumn.name]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regular-relations.js","sources":["../../src/entity-manager/regular-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-namespace */\nimport { map, isEmpty } from 'lodash/fp';\nimport type { Knex } from 'knex';\n\nimport {\n isBidirectional,\n isOneToAny,\n isManyToAny,\n isAnyToOne,\n hasOrderColumn,\n hasInverseOrderColumn,\n} from '../metadata';\nimport { createQueryBuilder } from '../query';\nimport { addSchema } from '../utils/knex';\nimport type { Database } from '..';\nimport type { ID, Relation, Model } from '../types';\n\ndeclare module 'knex' {\n namespace Knex {\n interface ChainableInterface {\n transacting(trx?: Knex.Transaction): this;\n }\n }\n}\n\n// TODO: This is a short term solution, to not steal relations from the same document.\nconst getDocumentSiblingIdsQuery = (tableName: string, id: ID) => {\n // Find if the model is a content type or something else (e.g. component)\n // to only get the documentId if it's a content type\n const models: Model[] = Array.from(strapi.db.metadata.values());\n\n const isContentType = models.find((model) => {\n return model.tableName === tableName && model.attributes.documentId;\n });\n\n if (!isContentType) {\n return [id];\n }\n\n // NOTE: SubQueries are wrapped in a function to not reuse the same connection,\n // which causes infinite self references\n return function findDocumentSiblingIds(query) {\n query\n .select('id')\n .from(tableName)\n // Get all child ids of the document id\n .whereIn('document_id', (documentIDSubQuery) => {\n documentIDSubQuery\n .from(tableName)\n // get document id related to the current id\n .select('document_id')\n .where('id', id);\n });\n } satisfies Knex.QueryCallback;\n};\n\n/**\n * If some relations currently exist for this oneToX relation, on the one side, this function removes them and update the inverse order if needed.\n */\nconst deletePreviousOneToAnyRelations = async ({\n id,\n attribute,\n relIdsToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdsToadd: ID[];\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n if (!(isBidirectional(attribute) && isOneToAny(attribute))) {\n throw new Error(\n 'deletePreviousOneToAnyRelations can only be called for bidirectional oneToAny relations'\n );\n }\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n\n const con = db.getConnection();\n\n await con\n .delete()\n .from(joinTable.name)\n // Exclude the ids of the current document\n .whereNotIn(joinColumn.name, getDocumentSiblingIdsQuery(joinColumn.referencedTable!, id))\n // Include all the ids that are being connected\n .whereIn(inverseJoinColumn.name, relIdsToadd)\n .where(joinTable.on || {})\n .transacting(trx);\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToadd, transaction: trx });\n};\n\n/**\n * If a relation currently exists for this xToOne relations, this function removes it and update the inverse order if needed.\n */\nconst deletePreviousAnyToOneRelations = async ({\n id,\n attribute,\n relIdToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdToadd: ID;\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const con = db.getConnection();\n\n if (!isAnyToOne(attribute)) {\n throw new Error('deletePreviousAnyToOneRelations can only be called for anyToOne relations');\n }\n // handling manyToOne\n if (isManyToAny(attribute)) {\n // if the database integrity was not broken relsToDelete is supposed to be of length 1\n const relsToDelete = await con\n .select(inverseJoinColumn.name)\n .from(joinTable.name)\n .where(joinColumn.name, id)\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n\n const relIdsToDelete = map(inverseJoinColumn.name, relsToDelete);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: relIdsToDelete },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToDelete, transaction: trx });\n\n // handling oneToOne\n } else {\n await con\n .delete()\n .from(joinTable.name)\n .where(joinColumn.name, id)\n // Exclude the ids of the current document\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n }\n};\n\n/**\n * Delete all or some relations of entity field\n */\nconst deleteRelations = async ({\n id,\n attribute,\n db,\n relIdsToNotDelete = [],\n relIdsToDelete = [],\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n relIdsToNotDelete?: ID[];\n relIdsToDelete?: ID[] | 'all';\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const all = relIdsToDelete === 'all';\n\n if (hasOrderColumn(attribute) || hasInverseOrderColumn(attribute)) {\n let lastId: ID = 0;\n let done = false;\n const batchSize = 100;\n\n while (!done) {\n const batchToDelete: { id: ID }[] = await createQueryBuilder(joinTable.name, db)\n .select(inverseJoinColumn.name)\n .where({\n [joinColumn.name]: id,\n id: { $gt: lastId },\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .orderBy('id')\n .limit(batchSize)\n .transacting(trx)\n .execute();\n\n done = batchToDelete.length < batchSize;\n lastId = batchToDelete[batchToDelete.length - 1]?.id || 0;\n\n const batchIds = map(inverseJoinColumn.name, batchToDelete);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: batchIds },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, id, inverseRelIds: batchIds, transaction: trx });\n }\n } else {\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n }\n};\n\n/**\n * Clean the order columns by ensuring the order value are continuous (ex: 1, 2, 3 and not 1, 5, 10)\n */\nconst cleanOrderColumns = async ({\n id,\n attribute,\n db,\n inverseRelIds = [],\n transaction: trx,\n}: {\n id?: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n inverseRelIds?: ID[];\n transaction?: Knex.Transaction;\n}) => {\n if (\n !(hasOrderColumn(attribute) && id) &&\n !(hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds))\n ) {\n return;\n }\n\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,\n FROM :joinTable:\n WHERE :joinColumn: = :id\n ) AS b\n SET :orderColumn: = b.src_order\n WHERE b.id = a.id;\n */\n const updateOrderColumn = async () => {\n if (!hasOrderColumn(attribute) || !id) {\n return;\n }\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('src_order', orderColumnName, joinColumn.name)\n .where(joinColumn.name, id)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.src_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, orderColumnName]\n )\n .transacting(trx);\n\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.src_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, orderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order\n FROM :joinTable:\n WHERE :inverseJoinColumn: IN (:inverseRelIds)\n ) AS b\n SET :inverseOrderColumn: = b.inv_order\n WHERE b.id = a.id;\n */\n const updateInverseOrderColumn = async () => {\n if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)\n .where(inverseJoinColumn.name, 'in', inverseRelIds)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.inv_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, inverseOrderColumnName]\n )\n .transacting(trx);\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.inv_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, inverseOrderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n // Run updates in a deterministic order to avoid lock cycles on the same join table.\n await updateOrderColumn();\n await updateInverseOrderColumn();\n};\n\nexport {\n deletePreviousOneToAnyRelations,\n deletePreviousAnyToOneRelations,\n deleteRelations,\n cleanOrderColumns,\n};\n"],"names":["getDocumentSiblingIdsQuery","tableName","id","models","Array","from","strapi","db","metadata","values","isContentType","find","model","attributes","documentId","findDocumentSiblingIds","query","select","whereIn","documentIDSubQuery","where","deletePreviousOneToAnyRelations","attribute","relIdsToadd","transaction","trx","isBidirectional","isOneToAny","Error","joinTable","joinColumn","inverseJoinColumn","con","getConnection","delete","name","whereNotIn","referencedTable","on","transacting","cleanOrderColumns","inverseRelIds","deletePreviousAnyToOneRelations","relIdToadd","isAnyToOne","isManyToAny","relsToDelete","relIdsToDelete","map","createQueryBuilder","$in","execute","deleteRelations","relIdsToNotDelete","all","hasOrderColumn","hasInverseOrderColumn","lastId","done","batchSize","batchToDelete","$gt","$notIn","orderBy","limit","length","batchIds","isEmpty","orderColumnName","inverseOrderColumnName","updateOrderColumn","selectRowsToOrder","joinTableName","connection","rowNumber","toSQL","dialect","client","raw","sql","bindings","addSchema","updateInverseOrderColumn"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"regular-relations.js","sources":["../../src/entity-manager/regular-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-namespace */\nimport { map, isEmpty } from 'lodash';\nimport type { Knex } from 'knex';\n\nimport {\n isBidirectional,\n isOneToAny,\n isManyToAny,\n isAnyToOne,\n hasOrderColumn,\n hasInverseOrderColumn,\n} from '../metadata';\nimport { createQueryBuilder } from '../query';\nimport { addSchema } from '../utils/knex';\nimport type { Database } from '..';\nimport type { ID, Relation, Model } from '../types';\n\ndeclare module 'knex' {\n namespace Knex {\n interface ChainableInterface {\n transacting(trx?: Knex.Transaction): this;\n }\n }\n}\n\n// TODO: This is a short term solution, to not steal relations from the same document.\nconst getDocumentSiblingIdsQuery = (tableName: string, id: ID) => {\n // Find if the model is a content type or something else (e.g. component)\n // to only get the documentId if it's a content type\n const models: Model[] = Array.from(strapi.db.metadata.values());\n\n const isContentType = models.find((model) => {\n return model.tableName === tableName && model.attributes.documentId;\n });\n\n if (!isContentType) {\n return [id];\n }\n\n // NOTE: SubQueries are wrapped in a function to not reuse the same connection,\n // which causes infinite self references\n return function findDocumentSiblingIds(query) {\n query\n .select('id')\n .from(tableName)\n // Get all child ids of the document id\n .whereIn('document_id', (documentIDSubQuery) => {\n documentIDSubQuery\n .from(tableName)\n // get document id related to the current id\n .select('document_id')\n .where('id', id);\n });\n } satisfies Knex.QueryCallback;\n};\n\n/**\n * If some relations currently exist for this oneToX relation, on the one side, this function removes them and update the inverse order if needed.\n */\nconst deletePreviousOneToAnyRelations = async ({\n id,\n attribute,\n relIdsToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdsToadd: ID[];\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n if (!(isBidirectional(attribute) && isOneToAny(attribute))) {\n throw new Error(\n 'deletePreviousOneToAnyRelations can only be called for bidirectional oneToAny relations'\n );\n }\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n\n const con = db.getConnection();\n\n await con\n .delete()\n .from(joinTable.name)\n // Exclude the ids of the current document\n .whereNotIn(joinColumn.name, getDocumentSiblingIdsQuery(joinColumn.referencedTable!, id))\n // Include all the ids that are being connected\n .whereIn(inverseJoinColumn.name, relIdsToadd)\n .where(joinTable.on || {})\n .transacting(trx);\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToadd, transaction: trx });\n};\n\n/**\n * If a relation currently exists for this xToOne relations, this function removes it and update the inverse order if needed.\n */\nconst deletePreviousAnyToOneRelations = async ({\n id,\n attribute,\n relIdToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdToadd: ID;\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const con = db.getConnection();\n\n if (!isAnyToOne(attribute)) {\n throw new Error('deletePreviousAnyToOneRelations can only be called for anyToOne relations');\n }\n // handling manyToOne\n if (isManyToAny(attribute)) {\n // if the database integrity was not broken relsToDelete is supposed to be of length 1\n const relsToDelete = await con\n .select(inverseJoinColumn.name)\n .from(joinTable.name)\n .where(joinColumn.name, id)\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n\n const relIdsToDelete = map(relsToDelete, inverseJoinColumn.name);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: relIdsToDelete },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToDelete, transaction: trx });\n\n // handling oneToOne\n } else {\n await con\n .delete()\n .from(joinTable.name)\n .where(joinColumn.name, id)\n // Exclude the ids of the current document\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n }\n};\n\n/**\n * Delete all or some relations of entity field\n */\nconst deleteRelations = async ({\n id,\n attribute,\n db,\n relIdsToNotDelete = [],\n relIdsToDelete = [],\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n relIdsToNotDelete?: ID[];\n relIdsToDelete?: ID[] | 'all';\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const all = relIdsToDelete === 'all';\n\n if (hasOrderColumn(attribute) || hasInverseOrderColumn(attribute)) {\n let lastId: ID = 0;\n let done = false;\n const batchSize = 100;\n\n while (!done) {\n const batchToDelete: { id: ID }[] = await createQueryBuilder(joinTable.name, db)\n .select(inverseJoinColumn.name)\n .where({\n [joinColumn.name]: id,\n id: { $gt: lastId },\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .orderBy('id')\n .limit(batchSize)\n .transacting(trx)\n .execute();\n\n done = batchToDelete.length < batchSize;\n lastId = batchToDelete[batchToDelete.length - 1]?.id || 0;\n\n const batchIds = map(batchToDelete, inverseJoinColumn.name);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: batchIds },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, id, inverseRelIds: batchIds, transaction: trx });\n }\n } else {\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n }\n};\n\n/**\n * Clean the order columns by ensuring the order value are continuous (ex: 1, 2, 3 and not 1, 5, 10)\n */\nconst cleanOrderColumns = async ({\n id,\n attribute,\n db,\n inverseRelIds = [],\n transaction: trx,\n}: {\n id?: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n inverseRelIds?: ID[];\n transaction?: Knex.Transaction;\n}) => {\n if (\n !(hasOrderColumn(attribute) && id) &&\n !(hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds))\n ) {\n return;\n }\n\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,\n FROM :joinTable:\n WHERE :joinColumn: = :id\n ) AS b\n SET :orderColumn: = b.src_order\n WHERE b.id = a.id;\n */\n const updateOrderColumn = async () => {\n if (!hasOrderColumn(attribute) || !id) {\n return;\n }\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('src_order', orderColumnName, joinColumn.name)\n .where(joinColumn.name, id)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.src_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, orderColumnName]\n )\n .transacting(trx);\n\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.src_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, orderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order\n FROM :joinTable:\n WHERE :inverseJoinColumn: IN (:inverseRelIds)\n ) AS b\n SET :inverseOrderColumn: = b.inv_order\n WHERE b.id = a.id;\n */\n const updateInverseOrderColumn = async () => {\n if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)\n .where(inverseJoinColumn.name, 'in', inverseRelIds)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.inv_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, inverseOrderColumnName]\n )\n .transacting(trx);\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.inv_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, inverseOrderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n // Run updates in a deterministic order to avoid lock cycles on the same join table.\n await updateOrderColumn();\n await updateInverseOrderColumn();\n};\n\nexport {\n deletePreviousOneToAnyRelations,\n deletePreviousAnyToOneRelations,\n deleteRelations,\n cleanOrderColumns,\n};\n"],"names":["getDocumentSiblingIdsQuery","tableName","id","models","Array","from","strapi","db","metadata","values","isContentType","find","model","attributes","documentId","findDocumentSiblingIds","query","select","whereIn","documentIDSubQuery","where","deletePreviousOneToAnyRelations","attribute","relIdsToadd","transaction","trx","isBidirectional","isOneToAny","Error","joinTable","joinColumn","inverseJoinColumn","con","getConnection","delete","name","whereNotIn","referencedTable","on","transacting","cleanOrderColumns","inverseRelIds","deletePreviousAnyToOneRelations","relIdToadd","isAnyToOne","isManyToAny","relsToDelete","relIdsToDelete","map","createQueryBuilder","$in","execute","deleteRelations","relIdsToNotDelete","all","hasOrderColumn","hasInverseOrderColumn","lastId","done","batchSize","batchToDelete","$gt","$notIn","orderBy","limit","length","batchIds","isEmpty","orderColumnName","inverseOrderColumnName","updateOrderColumn","selectRowsToOrder","joinTableName","connection","rowNumber","toSQL","dialect","client","raw","sql","bindings","addSchema","updateInverseOrderColumn"],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { map, isEmpty } from 'lodash
|
|
1
|
+
import { map, isEmpty } from 'lodash';
|
|
2
2
|
import { hasOrderColumn, hasInverseOrderColumn, isBidirectional, isOneToAny, isAnyToOne, isManyToAny } from '../metadata/relations.mjs';
|
|
3
3
|
import '../utils/identifiers/index.mjs';
|
|
4
4
|
import createQueryBuilder from '../query/query-builder.mjs';
|
|
@@ -59,7 +59,7 @@ const getDocumentSiblingIdsQuery = (tableName, id)=>{
|
|
|
59
59
|
if (isManyToAny(attribute)) {
|
|
60
60
|
// if the database integrity was not broken relsToDelete is supposed to be of length 1
|
|
61
61
|
const relsToDelete = await con.select(inverseJoinColumn.name).from(joinTable.name).where(joinColumn.name, id).whereNotIn(inverseJoinColumn.name, getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable, relIdToadd)).where(joinTable.on || {}).transacting(trx);
|
|
62
|
-
const relIdsToDelete = map(inverseJoinColumn.name
|
|
62
|
+
const relIdsToDelete = map(relsToDelete, inverseJoinColumn.name);
|
|
63
63
|
await createQueryBuilder(joinTable.name, db).delete().where({
|
|
64
64
|
[joinColumn.name]: id,
|
|
65
65
|
[inverseJoinColumn.name]: {
|
|
@@ -105,7 +105,7 @@ const getDocumentSiblingIdsQuery = (tableName, id)=>{
|
|
|
105
105
|
}).where(joinTable.on || {}).orderBy('id').limit(batchSize).transacting(trx).execute();
|
|
106
106
|
done = batchToDelete.length < batchSize;
|
|
107
107
|
lastId = batchToDelete[batchToDelete.length - 1]?.id || 0;
|
|
108
|
-
const batchIds = map(inverseJoinColumn.name
|
|
108
|
+
const batchIds = map(batchToDelete, inverseJoinColumn.name);
|
|
109
109
|
await createQueryBuilder(joinTable.name, db).delete().where({
|
|
110
110
|
[joinColumn.name]: id,
|
|
111
111
|
[inverseJoinColumn.name]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regular-relations.mjs","sources":["../../src/entity-manager/regular-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-namespace */\nimport { map, isEmpty } from 'lodash/fp';\nimport type { Knex } from 'knex';\n\nimport {\n isBidirectional,\n isOneToAny,\n isManyToAny,\n isAnyToOne,\n hasOrderColumn,\n hasInverseOrderColumn,\n} from '../metadata';\nimport { createQueryBuilder } from '../query';\nimport { addSchema } from '../utils/knex';\nimport type { Database } from '..';\nimport type { ID, Relation, Model } from '../types';\n\ndeclare module 'knex' {\n namespace Knex {\n interface ChainableInterface {\n transacting(trx?: Knex.Transaction): this;\n }\n }\n}\n\n// TODO: This is a short term solution, to not steal relations from the same document.\nconst getDocumentSiblingIdsQuery = (tableName: string, id: ID) => {\n // Find if the model is a content type or something else (e.g. component)\n // to only get the documentId if it's a content type\n const models: Model[] = Array.from(strapi.db.metadata.values());\n\n const isContentType = models.find((model) => {\n return model.tableName === tableName && model.attributes.documentId;\n });\n\n if (!isContentType) {\n return [id];\n }\n\n // NOTE: SubQueries are wrapped in a function to not reuse the same connection,\n // which causes infinite self references\n return function findDocumentSiblingIds(query) {\n query\n .select('id')\n .from(tableName)\n // Get all child ids of the document id\n .whereIn('document_id', (documentIDSubQuery) => {\n documentIDSubQuery\n .from(tableName)\n // get document id related to the current id\n .select('document_id')\n .where('id', id);\n });\n } satisfies Knex.QueryCallback;\n};\n\n/**\n * If some relations currently exist for this oneToX relation, on the one side, this function removes them and update the inverse order if needed.\n */\nconst deletePreviousOneToAnyRelations = async ({\n id,\n attribute,\n relIdsToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdsToadd: ID[];\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n if (!(isBidirectional(attribute) && isOneToAny(attribute))) {\n throw new Error(\n 'deletePreviousOneToAnyRelations can only be called for bidirectional oneToAny relations'\n );\n }\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n\n const con = db.getConnection();\n\n await con\n .delete()\n .from(joinTable.name)\n // Exclude the ids of the current document\n .whereNotIn(joinColumn.name, getDocumentSiblingIdsQuery(joinColumn.referencedTable!, id))\n // Include all the ids that are being connected\n .whereIn(inverseJoinColumn.name, relIdsToadd)\n .where(joinTable.on || {})\n .transacting(trx);\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToadd, transaction: trx });\n};\n\n/**\n * If a relation currently exists for this xToOne relations, this function removes it and update the inverse order if needed.\n */\nconst deletePreviousAnyToOneRelations = async ({\n id,\n attribute,\n relIdToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdToadd: ID;\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const con = db.getConnection();\n\n if (!isAnyToOne(attribute)) {\n throw new Error('deletePreviousAnyToOneRelations can only be called for anyToOne relations');\n }\n // handling manyToOne\n if (isManyToAny(attribute)) {\n // if the database integrity was not broken relsToDelete is supposed to be of length 1\n const relsToDelete = await con\n .select(inverseJoinColumn.name)\n .from(joinTable.name)\n .where(joinColumn.name, id)\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n\n const relIdsToDelete = map(inverseJoinColumn.name, relsToDelete);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: relIdsToDelete },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToDelete, transaction: trx });\n\n // handling oneToOne\n } else {\n await con\n .delete()\n .from(joinTable.name)\n .where(joinColumn.name, id)\n // Exclude the ids of the current document\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n }\n};\n\n/**\n * Delete all or some relations of entity field\n */\nconst deleteRelations = async ({\n id,\n attribute,\n db,\n relIdsToNotDelete = [],\n relIdsToDelete = [],\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n relIdsToNotDelete?: ID[];\n relIdsToDelete?: ID[] | 'all';\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const all = relIdsToDelete === 'all';\n\n if (hasOrderColumn(attribute) || hasInverseOrderColumn(attribute)) {\n let lastId: ID = 0;\n let done = false;\n const batchSize = 100;\n\n while (!done) {\n const batchToDelete: { id: ID }[] = await createQueryBuilder(joinTable.name, db)\n .select(inverseJoinColumn.name)\n .where({\n [joinColumn.name]: id,\n id: { $gt: lastId },\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .orderBy('id')\n .limit(batchSize)\n .transacting(trx)\n .execute();\n\n done = batchToDelete.length < batchSize;\n lastId = batchToDelete[batchToDelete.length - 1]?.id || 0;\n\n const batchIds = map(inverseJoinColumn.name, batchToDelete);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: batchIds },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, id, inverseRelIds: batchIds, transaction: trx });\n }\n } else {\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n }\n};\n\n/**\n * Clean the order columns by ensuring the order value are continuous (ex: 1, 2, 3 and not 1, 5, 10)\n */\nconst cleanOrderColumns = async ({\n id,\n attribute,\n db,\n inverseRelIds = [],\n transaction: trx,\n}: {\n id?: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n inverseRelIds?: ID[];\n transaction?: Knex.Transaction;\n}) => {\n if (\n !(hasOrderColumn(attribute) && id) &&\n !(hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds))\n ) {\n return;\n }\n\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,\n FROM :joinTable:\n WHERE :joinColumn: = :id\n ) AS b\n SET :orderColumn: = b.src_order\n WHERE b.id = a.id;\n */\n const updateOrderColumn = async () => {\n if (!hasOrderColumn(attribute) || !id) {\n return;\n }\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('src_order', orderColumnName, joinColumn.name)\n .where(joinColumn.name, id)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.src_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, orderColumnName]\n )\n .transacting(trx);\n\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.src_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, orderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order\n FROM :joinTable:\n WHERE :inverseJoinColumn: IN (:inverseRelIds)\n ) AS b\n SET :inverseOrderColumn: = b.inv_order\n WHERE b.id = a.id;\n */\n const updateInverseOrderColumn = async () => {\n if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)\n .where(inverseJoinColumn.name, 'in', inverseRelIds)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.inv_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, inverseOrderColumnName]\n )\n .transacting(trx);\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.inv_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, inverseOrderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n // Run updates in a deterministic order to avoid lock cycles on the same join table.\n await updateOrderColumn();\n await updateInverseOrderColumn();\n};\n\nexport {\n deletePreviousOneToAnyRelations,\n deletePreviousAnyToOneRelations,\n deleteRelations,\n cleanOrderColumns,\n};\n"],"names":["getDocumentSiblingIdsQuery","tableName","id","models","Array","from","strapi","db","metadata","values","isContentType","find","model","attributes","documentId","findDocumentSiblingIds","query","select","whereIn","documentIDSubQuery","where","deletePreviousOneToAnyRelations","attribute","relIdsToadd","transaction","trx","isBidirectional","isOneToAny","Error","joinTable","joinColumn","inverseJoinColumn","con","getConnection","delete","name","whereNotIn","referencedTable","on","transacting","cleanOrderColumns","inverseRelIds","deletePreviousAnyToOneRelations","relIdToadd","isAnyToOne","isManyToAny","relsToDelete","relIdsToDelete","map","createQueryBuilder","$in","execute","deleteRelations","relIdsToNotDelete","all","hasOrderColumn","hasInverseOrderColumn","lastId","done","batchSize","batchToDelete","$gt","$notIn","orderBy","limit","length","batchIds","isEmpty","orderColumnName","inverseOrderColumnName","updateOrderColumn","selectRowsToOrder","joinTableName","connection","rowNumber","toSQL","dialect","client","raw","sql","bindings","addSchema","updateInverseOrderColumn"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"regular-relations.mjs","sources":["../../src/entity-manager/regular-relations.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-namespace */\nimport { map, isEmpty } from 'lodash';\nimport type { Knex } from 'knex';\n\nimport {\n isBidirectional,\n isOneToAny,\n isManyToAny,\n isAnyToOne,\n hasOrderColumn,\n hasInverseOrderColumn,\n} from '../metadata';\nimport { createQueryBuilder } from '../query';\nimport { addSchema } from '../utils/knex';\nimport type { Database } from '..';\nimport type { ID, Relation, Model } from '../types';\n\ndeclare module 'knex' {\n namespace Knex {\n interface ChainableInterface {\n transacting(trx?: Knex.Transaction): this;\n }\n }\n}\n\n// TODO: This is a short term solution, to not steal relations from the same document.\nconst getDocumentSiblingIdsQuery = (tableName: string, id: ID) => {\n // Find if the model is a content type or something else (e.g. component)\n // to only get the documentId if it's a content type\n const models: Model[] = Array.from(strapi.db.metadata.values());\n\n const isContentType = models.find((model) => {\n return model.tableName === tableName && model.attributes.documentId;\n });\n\n if (!isContentType) {\n return [id];\n }\n\n // NOTE: SubQueries are wrapped in a function to not reuse the same connection,\n // which causes infinite self references\n return function findDocumentSiblingIds(query) {\n query\n .select('id')\n .from(tableName)\n // Get all child ids of the document id\n .whereIn('document_id', (documentIDSubQuery) => {\n documentIDSubQuery\n .from(tableName)\n // get document id related to the current id\n .select('document_id')\n .where('id', id);\n });\n } satisfies Knex.QueryCallback;\n};\n\n/**\n * If some relations currently exist for this oneToX relation, on the one side, this function removes them and update the inverse order if needed.\n */\nconst deletePreviousOneToAnyRelations = async ({\n id,\n attribute,\n relIdsToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdsToadd: ID[];\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n if (!(isBidirectional(attribute) && isOneToAny(attribute))) {\n throw new Error(\n 'deletePreviousOneToAnyRelations can only be called for bidirectional oneToAny relations'\n );\n }\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n\n const con = db.getConnection();\n\n await con\n .delete()\n .from(joinTable.name)\n // Exclude the ids of the current document\n .whereNotIn(joinColumn.name, getDocumentSiblingIdsQuery(joinColumn.referencedTable!, id))\n // Include all the ids that are being connected\n .whereIn(inverseJoinColumn.name, relIdsToadd)\n .where(joinTable.on || {})\n .transacting(trx);\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToadd, transaction: trx });\n};\n\n/**\n * If a relation currently exists for this xToOne relations, this function removes it and update the inverse order if needed.\n */\nconst deletePreviousAnyToOneRelations = async ({\n id,\n attribute,\n relIdToadd,\n db,\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n relIdToadd: ID;\n db: Database;\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const con = db.getConnection();\n\n if (!isAnyToOne(attribute)) {\n throw new Error('deletePreviousAnyToOneRelations can only be called for anyToOne relations');\n }\n // handling manyToOne\n if (isManyToAny(attribute)) {\n // if the database integrity was not broken relsToDelete is supposed to be of length 1\n const relsToDelete = await con\n .select(inverseJoinColumn.name)\n .from(joinTable.name)\n .where(joinColumn.name, id)\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n\n const relIdsToDelete = map(relsToDelete, inverseJoinColumn.name);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: relIdsToDelete },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, inverseRelIds: relIdsToDelete, transaction: trx });\n\n // handling oneToOne\n } else {\n await con\n .delete()\n .from(joinTable.name)\n .where(joinColumn.name, id)\n // Exclude the ids of the current document\n .whereNotIn(\n inverseJoinColumn.name,\n getDocumentSiblingIdsQuery(inverseJoinColumn.referencedTable!, relIdToadd)\n )\n .where(joinTable.on || {})\n .transacting(trx);\n }\n};\n\n/**\n * Delete all or some relations of entity field\n */\nconst deleteRelations = async ({\n id,\n attribute,\n db,\n relIdsToNotDelete = [],\n relIdsToDelete = [],\n transaction: trx,\n}: {\n id: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n relIdsToNotDelete?: ID[];\n relIdsToDelete?: ID[] | 'all';\n transaction?: Knex.Transaction;\n}) => {\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn } = joinTable;\n const all = relIdsToDelete === 'all';\n\n if (hasOrderColumn(attribute) || hasInverseOrderColumn(attribute)) {\n let lastId: ID = 0;\n let done = false;\n const batchSize = 100;\n\n while (!done) {\n const batchToDelete: { id: ID }[] = await createQueryBuilder(joinTable.name, db)\n .select(inverseJoinColumn.name)\n .where({\n [joinColumn.name]: id,\n id: { $gt: lastId },\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .orderBy('id')\n .limit(batchSize)\n .transacting(trx)\n .execute();\n\n done = batchToDelete.length < batchSize;\n lastId = batchToDelete[batchToDelete.length - 1]?.id || 0;\n\n const batchIds = map(batchToDelete, inverseJoinColumn.name);\n\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $in: batchIds },\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n\n await cleanOrderColumns({ attribute, db, id, inverseRelIds: batchIds, transaction: trx });\n }\n } else {\n await createQueryBuilder(joinTable.name, db)\n .delete()\n .where({\n [joinColumn.name]: id,\n [inverseJoinColumn.name]: { $notIn: relIdsToNotDelete },\n ...(all ? {} : { [inverseJoinColumn.name]: { $in: relIdsToDelete } }),\n })\n .where(joinTable.on || {})\n .transacting(trx)\n .execute();\n }\n};\n\n/**\n * Clean the order columns by ensuring the order value are continuous (ex: 1, 2, 3 and not 1, 5, 10)\n */\nconst cleanOrderColumns = async ({\n id,\n attribute,\n db,\n inverseRelIds = [],\n transaction: trx,\n}: {\n id?: ID;\n attribute: Relation.Bidirectional;\n db: Database;\n inverseRelIds?: ID[];\n transaction?: Knex.Transaction;\n}) => {\n if (\n !(hasOrderColumn(attribute) && id) &&\n !(hasInverseOrderColumn(attribute) && !isEmpty(inverseRelIds))\n ) {\n return;\n }\n\n const { joinTable } = attribute;\n const { joinColumn, inverseJoinColumn, orderColumnName, inverseOrderColumnName } = joinTable;\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :joinColumn: ORDER BY :orderColumn:) AS src_order,\n FROM :joinTable:\n WHERE :joinColumn: = :id\n ) AS b\n SET :orderColumn: = b.src_order\n WHERE b.id = a.id;\n */\n const updateOrderColumn = async () => {\n if (!hasOrderColumn(attribute) || !id) {\n return;\n }\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('src_order', orderColumnName, joinColumn.name)\n .where(joinColumn.name, id)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.src_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, orderColumnName]\n )\n .transacting(trx);\n\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.src_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, orderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n /**\n UPDATE :joinTable: as a,\n (\n SELECT\n id,\n ROW_NUMBER() OVER ( PARTITION BY :inverseJoinColumn: ORDER BY :inverseOrderColumn:) AS inv_order\n FROM :joinTable:\n WHERE :inverseJoinColumn: IN (:inverseRelIds)\n ) AS b\n SET :inverseOrderColumn: = b.inv_order\n WHERE b.id = a.id;\n */\n const updateInverseOrderColumn = async () => {\n if (!hasInverseOrderColumn(attribute) || isEmpty(inverseRelIds)) return;\n\n const selectRowsToOrder = (joinTableName: string) =>\n db\n .connection(joinTableName)\n .select('id')\n .rowNumber('inv_order', inverseOrderColumnName, inverseJoinColumn.name)\n .where(inverseJoinColumn.name, 'in', inverseRelIds)\n .toSQL();\n\n switch (strapi.db.dialect.client) {\n case 'mysql': {\n // Here it's MariaDB and MySQL 8\n const select = selectRowsToOrder(joinTable.name);\n\n await db\n .getConnection()\n .raw(\n `UPDATE ?? as a, ( ${select.sql} ) AS b\n SET ?? = b.inv_order\n WHERE b.id = a.id`,\n [joinTable.name, ...select.bindings, inverseOrderColumnName]\n )\n .transacting(trx);\n break;\n }\n default: {\n const joinTableName = addSchema(db, joinTable.name);\n const select = selectRowsToOrder(joinTableName);\n\n // raw query as knex doesn't allow updating from a subquery\n await db.connection\n .raw(\n `UPDATE ?? as a\n SET ?? = b.inv_order\n FROM ( ${select.sql} ) AS b\n WHERE b.id = a.id`,\n [joinTableName, inverseOrderColumnName, ...select.bindings]\n )\n .transacting(trx);\n }\n }\n };\n\n // Run updates in a deterministic order to avoid lock cycles on the same join table.\n await updateOrderColumn();\n await updateInverseOrderColumn();\n};\n\nexport {\n deletePreviousOneToAnyRelations,\n deletePreviousAnyToOneRelations,\n deleteRelations,\n cleanOrderColumns,\n};\n"],"names":["getDocumentSiblingIdsQuery","tableName","id","models","Array","from","strapi","db","metadata","values","isContentType","find","model","attributes","documentId","findDocumentSiblingIds","query","select","whereIn","documentIDSubQuery","where","deletePreviousOneToAnyRelations","attribute","relIdsToadd","transaction","trx","isBidirectional","isOneToAny","Error","joinTable","joinColumn","inverseJoinColumn","con","getConnection","delete","name","whereNotIn","referencedTable","on","transacting","cleanOrderColumns","inverseRelIds","deletePreviousAnyToOneRelations","relIdToadd","isAnyToOne","isManyToAny","relsToDelete","relIdsToDelete","map","createQueryBuilder","$in","execute","deleteRelations","relIdsToNotDelete","all","hasOrderColumn","hasInverseOrderColumn","lastId","done","batchSize","batchToDelete","$gt","$notIn","orderBy","limit","length","batchIds","isEmpty","orderColumnName","inverseOrderColumnName","updateOrderColumn","selectRowsToOrder","joinTableName","connection","rowNumber","toSQL","dialect","client","raw","sql","bindings","addSchema","updateInverseOrderColumn"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations-orderer.d.ts","sourceRoot":"","sources":["../../src/entity-manager/relations-orderer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"relations-orderer.d.ts","sourceRoot":"","sources":["../../src/entity-manager/relations-orderer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAEnC,UAAU,IAAI;IACZ,EAAE,EAAE,EAAE,CAAC;IACP,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,IAAI,CAAC;QAAC,GAAG,CAAC,EAAE,IAAI,CAAA;KAAE,CAAC;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,WAAY,SAAQ,IAAI;IAChC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,QAAA,MAAM,gBAAgB,GAAI,YAAY,IAAI,EAAE,EAAE,aAAY,IAAI,EAAO,EAAE,oBAAiB,WA0GvF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,QAAA,MAAM,gBAAgB,GAAI,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,EAC5E,SAAS,SAAS,EAAE,EACpB,UAAU,MAAM,SAAS,EACzB,aAAa,MAAM,SAAS,EAC5B,SAAS,OAAO;0BA8DQ,IAAI,GAAG,IAAI,EAAE;uBAMhB,IAAI,GAAG,IAAI,EAAE;;IAqBhC;;OAEG;;CAoBN,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var _$1 = require('lodash/fp');
|
|
4
3
|
var _ = require('lodash');
|
|
5
4
|
var invalidRelation = require('../errors/invalid-relation.js');
|
|
6
5
|
|
|
@@ -143,12 +142,12 @@ var ___default = /*#__PURE__*/_interopDefault(_);
|
|
|
143
142
|
* another one that does not exist
|
|
144
143
|
* @return {*}
|
|
145
144
|
*/ const relationsOrderer = (initArr, idColumn, orderColumn, strict)=>{
|
|
146
|
-
const computedRelations = ___default.default.sortBy(_
|
|
145
|
+
const computedRelations = ___default.default.sortBy(_.castArray(initArr ?? []).map((r)=>({
|
|
147
146
|
init: true,
|
|
148
147
|
id: r[idColumn],
|
|
149
148
|
order: r[orderColumn] !== null && r[orderColumn] !== undefined ? Number(r[orderColumn]) : 1
|
|
150
149
|
})), 'order');
|
|
151
|
-
const maxOrder = _
|
|
150
|
+
const maxOrder = _.maxBy(computedRelations, 'order')?.order || 0;
|
|
152
151
|
const findRelation = (id)=>{
|
|
153
152
|
const idx = computedRelations.findIndex((r)=>r.id === id);
|
|
154
153
|
return {
|
|
@@ -197,13 +196,13 @@ var ___default = /*#__PURE__*/_interopDefault(_);
|
|
|
197
196
|
};
|
|
198
197
|
return {
|
|
199
198
|
disconnect (relations) {
|
|
200
|
-
_
|
|
199
|
+
_.castArray(relations).forEach((relation)=>{
|
|
201
200
|
removeRelation(relation);
|
|
202
201
|
});
|
|
203
202
|
return this;
|
|
204
203
|
},
|
|
205
204
|
connect (relations) {
|
|
206
|
-
sortConnectArray(_
|
|
205
|
+
sortConnectArray(_.castArray(relations), computedRelations, strict).forEach((relation)=>{
|
|
207
206
|
this.disconnect(relation);
|
|
208
207
|
try {
|
|
209
208
|
insertRelation(relation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relations-orderer.js","sources":["../../src/entity-manager/relations-orderer.ts"],"sourcesContent":["import { castArray, maxBy } from 'lodash/fp';\nimport _ from 'lodash';\n\nimport { InvalidRelationError } from '../errors';\nimport type { ID } from '../types';\n\ninterface Link {\n id: ID;\n position?: { before?: ID; after?: ID; start?: true; end?: true };\n order?: number;\n __component?: string;\n}\n\ninterface OrderedLink extends Link {\n init?: boolean;\n order: number;\n}\n\n/**\n * When connecting relations, the order you connect them matters.\n *\n * Example, if you connect the following relations:\n * { id: 5, position: { before: 1 } }\n * { id: 1, position: { before: 2 } }\n * { id: 2, position: { end: true } }\n *\n * Going through the connect array, id 5 has to be connected before id 1,\n * so the order of id5 = id1 - 1. But the order value of id 1 is unknown.\n * The only way to know the order of id 1 is to connect it first.\n *\n * This function makes sure the relations are connected in the right order:\n * { id: 2, position: { end: true } }\n * { id: 1, position: { before: 2 } }\n * { id: 5, position: { before: 1 } }\n *\n */\nconst sortConnectArray = (connectArr: Link[], initialArr: Link[] = [], strictSort = true) => {\n const sortedConnect: Link[] = [];\n // Boolean to know if we have to recalculate the order of the relations\n let needsSorting = false;\n // Map to validate if relation is already in sortedConnect or DB.\n const relationInInitialArray = initialArr.reduce(\n (acc, rel) => ({ ...acc, [rel.id]: true }),\n {} as Record<ID, boolean>\n );\n // Map to store the first index where a relation id is connected\n const mappedRelations = connectArr.reduce(\n (mapper, relation: Link) => {\n const adjacentRelId = relation.position?.before || relation.position?.after;\n\n if (!adjacentRelId || (!relationInInitialArray[adjacentRelId] && !mapper[adjacentRelId])) {\n needsSorting = true;\n }\n\n /**\n * We do not allow duplicate relations to be connected, so we need to check for uniqueness with components\n * Note that the id here includes the uid for polymorphic relations\n *\n * So for normal relations, the same id means the same relation\n * For component relations, it means the unique combo of (id, component name)\n */\n\n // Check if there's an existing relation with this id\n const existingRelation = mapper[relation.id];\n\n // Check if existing relation has a component or not\n const hasNoComponent = existingRelation && !('__component' in existingRelation);\n\n // Check if the existing relation has the same component as the new relation\n const hasSameComponent =\n existingRelation && existingRelation.__component === relation.__component;\n\n // If we have an existing relation that is not unique (no component or same component) we won't accept it\n if (existingRelation && (hasNoComponent || hasSameComponent)) {\n throw new InvalidRelationError(\n `The relation with id ${relation.id} is already connected. ` +\n 'You cannot connect the same relation twice.'\n );\n }\n\n return {\n [relation.id]: { ...relation, computed: false },\n ...mapper,\n };\n },\n {} as Record<ID, Link & { computed: boolean }>\n );\n\n // If we don't need to sort the connect array, we can return it as is\n if (!needsSorting) return connectArr;\n\n // Recursively compute in which order the relation should be connected\n const computeRelation = (relation: Link, relationsSeenInBranch: Record<ID, boolean>) => {\n const adjacentRelId = relation.position?.before || relation.position?.after;\n const adjacentRelation = mappedRelations[adjacentRelId as ID];\n\n // If the relation has already been seen in the current branch,\n // it means there is a circular reference\n if (adjacentRelId && relationsSeenInBranch[adjacentRelId]) {\n throw new InvalidRelationError(\n 'A circular reference was found in the connect array. ' +\n 'One relation is trying to connect before/after another one that is trying to connect before/after it'\n );\n }\n\n // This relation has already been computed\n if (mappedRelations[relation.id]?.computed) {\n return;\n }\n\n mappedRelations[relation.id].computed = true;\n\n // Relation does not have a before or after attribute or is in the initial array\n if (!adjacentRelId || relationInInitialArray[adjacentRelId]) {\n sortedConnect.push(relation);\n return;\n }\n\n // Look if id is referenced elsewhere in the array\n if (mappedRelations[adjacentRelId]) {\n computeRelation(adjacentRelation, { ...relationsSeenInBranch, [relation.id]: true });\n sortedConnect.push(relation);\n } else if (strictSort) {\n // If we reach this point, it means that the adjacent relation is not in the connect array\n // and it is not in the database.\n throw new InvalidRelationError(\n `There was a problem connecting relation with id ${\n relation.id\n } at position ${JSON.stringify(\n relation.position\n )}. The relation with id ${adjacentRelId} needs to be connected first.`\n );\n } else {\n // We are in non-strict mode so we can push the relation.\n sortedConnect.push({ id: relation.id, position: { end: true } });\n }\n };\n\n // Iterate over connectArr and populate sortedConnect\n connectArr.forEach((relation) => computeRelation(relation, {}));\n\n return sortedConnect;\n};\n\n/**\n * Responsible for calculating the relations order when connecting them.\n *\n * The connect method takes an array of relations with positional attributes:\n * - before: the id of the relation to connect before\n * - after: the id of the relation to connect after\n * - end: it should be at the end\n * - start: it should be at the start\n *\n * Example:\n * - Having a connect array like:\n * [ { id: 4, before: 2 }, { id: 4, before: 3}, {id: 5, before: 4} ]\n * - With the initial relations:\n * [ { id: 2, order: 4 }, { id: 3, order: 10 } ]\n * - Step by step, going through the connect array, the array of relations would be:\n * [ { id: 4, order: 3.5 }, { id: 2, order: 4 }, { id: 3, order: 10 } ]\n * [ { id: 2, order: 4 }, { id: 4, order: 3.5 }, { id: 3, order: 10 } ]\n * [ { id: 2, order: 4 }, { id: 5, order: 3.5 }, { id: 4, order: 3.5 }, { id: 3, order: 10 } ]\n * - The final step would be to recalculate fractional order values.\n * [ { id: 2, order: 4 }, { id: 5, order: 3.33 }, { id: 4, order: 3.66 }, { id: 3, order: 10 } ]\n *\n * `initArr` is not the full relation list. For an ordered connect, `updateRelations` loads only\n * the rows named as anchors by the payload plus the lowest- and highest-ordered rows, so entries\n * that are adjacent in `computedRelations` are not adjacent in the stored list. Placement must be\n * computed from the anchor's own order, never from its neighbours in this array.\n *\n * @param {Array<*>} initArr - array of relations to initialize the class with\n * @param {string} idColumn - the column name of the id\n * @param {string} orderColumn - the column name of the order\n * @param {boolean} strict - if true, will throw an error if a relation is connected adjacent to\n * another one that does not exist\n * @return {*}\n */\nconst relationsOrderer = <TRelation extends Record<string, ID | number | null>>(\n initArr: TRelation[],\n idColumn: keyof TRelation,\n orderColumn: keyof TRelation,\n strict?: boolean\n) => {\n const computedRelations: OrderedLink[] = _.sortBy(\n castArray(initArr ?? []).map((r) => ({\n init: true,\n id: r[idColumn] as ID,\n order: r[orderColumn] !== null && r[orderColumn] !== undefined ? Number(r[orderColumn]) : 1,\n })),\n 'order'\n );\n\n const maxOrder = maxBy('order', computedRelations)?.order || 0;\n\n const findRelation = (id: ID) => {\n const idx = computedRelations.findIndex((r) => r.id === id);\n return { idx, relation: computedRelations[idx] };\n };\n\n const removeRelation = (r: Link) => {\n const { idx } = findRelation(r.id);\n if (idx >= 0) {\n computedRelations.splice(idx, 1);\n }\n };\n\n const insertRelation = (r: Link) => {\n let idx;\n\n if (r.position?.before) {\n const { idx: beforeIdx, relation } = findRelation(r.position.before);\n if (relation.init) {\n r.order = relation.order - 0.5;\n } else {\n r.order = relation.order;\n }\n idx = beforeIdx;\n } else if (r.position?.after) {\n const { idx: afterIdx, relation } = findRelation(r.position.after);\n if (relation.init) {\n r.order = relation.order + 0.5;\n } else {\n r.order = relation.order;\n }\n idx = afterIdx + 1;\n } else if (r.position?.start) {\n if (computedRelations.length > 0) {\n const firstRelation = computedRelations[0];\n r.order = firstRelation.init ? firstRelation.order - 0.5 : firstRelation.order;\n } else {\n r.order = 0.5;\n }\n idx = 0;\n } else {\n r.order = maxOrder + 0.5;\n idx = computedRelations.length;\n }\n\n // Insert the relation in the array\n computedRelations.splice(idx, 0, r as OrderedLink);\n };\n\n return {\n disconnect(relations: Link | Link[]) {\n castArray(relations).forEach((relation) => {\n removeRelation(relation);\n });\n return this;\n },\n connect(relations: Link | Link[]) {\n sortConnectArray(castArray(relations), computedRelations, strict).forEach((relation) => {\n this.disconnect(relation);\n\n try {\n insertRelation(relation);\n } catch {\n throw new Error(\n `There was a problem connecting relation with id ${\n relation.id\n } at position ${JSON.stringify(\n relation.position\n )}. The list of connect relations is not valid`\n );\n }\n });\n return this;\n },\n get() {\n return computedRelations;\n },\n /**\n * Get a map between the relation id and its order\n */\n getOrderMap() {\n const map: Record<ID, number> = {};\n const chunks = _(computedRelations).groupBy('order').value();\n const sortedKeys = Object.keys(chunks).sort((a, b) => parseFloat(a) - parseFloat(b));\n\n for (const orderStr of sortedKeys) {\n const relations = chunks[orderStr];\n let offset = 1;\n relations.forEach((relation) => {\n if (!relation.init) {\n map[relation.id] = parseFloat(orderStr) + (offset / (relations.length + 1)) * 0.49;\n offset += 1;\n }\n });\n }\n\n return map;\n },\n };\n};\n\nexport { relationsOrderer, sortConnectArray };\n"],"names":["sortConnectArray","connectArr","initialArr","strictSort","sortedConnect","needsSorting","relationInInitialArray","reduce","acc","rel","id","mappedRelations","mapper","relation","adjacentRelId","position","before","after","existingRelation","hasNoComponent","hasSameComponent","__component","InvalidRelationError","computed","computeRelation","relationsSeenInBranch","adjacentRelation","push","JSON","stringify","end","forEach","relationsOrderer","initArr","idColumn","orderColumn","strict","computedRelations","_","sortBy","castArray","map","r","init","order","undefined","Number","maxOrder","maxBy","findRelation","idx","findIndex","removeRelation","splice","insertRelation","beforeIdx","afterIdx","start","length","firstRelation","disconnect","relations","connect","Error","get","getOrderMap","chunks","groupBy","value","sortedKeys","Object","keys","sort","a","b","parseFloat","orderStr","offset"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relations-orderer.js","sources":["../../src/entity-manager/relations-orderer.ts"],"sourcesContent":["import _, { castArray, maxBy } from 'lodash';\n\nimport { InvalidRelationError } from '../errors';\nimport type { ID } from '../types';\n\ninterface Link {\n id: ID;\n position?: { before?: ID; after?: ID; start?: true; end?: true };\n order?: number;\n __component?: string;\n}\n\ninterface OrderedLink extends Link {\n init?: boolean;\n order: number;\n}\n\n/**\n * When connecting relations, the order you connect them matters.\n *\n * Example, if you connect the following relations:\n * { id: 5, position: { before: 1 } }\n * { id: 1, position: { before: 2 } }\n * { id: 2, position: { end: true } }\n *\n * Going through the connect array, id 5 has to be connected before id 1,\n * so the order of id5 = id1 - 1. But the order value of id 1 is unknown.\n * The only way to know the order of id 1 is to connect it first.\n *\n * This function makes sure the relations are connected in the right order:\n * { id: 2, position: { end: true } }\n * { id: 1, position: { before: 2 } }\n * { id: 5, position: { before: 1 } }\n *\n */\nconst sortConnectArray = (connectArr: Link[], initialArr: Link[] = [], strictSort = true) => {\n const sortedConnect: Link[] = [];\n // Boolean to know if we have to recalculate the order of the relations\n let needsSorting = false;\n // Map to validate if relation is already in sortedConnect or DB.\n const relationInInitialArray = initialArr.reduce(\n (acc, rel) => ({ ...acc, [rel.id]: true }),\n {} as Record<ID, boolean>\n );\n // Map to store the first index where a relation id is connected\n const mappedRelations = connectArr.reduce(\n (mapper, relation: Link) => {\n const adjacentRelId = relation.position?.before || relation.position?.after;\n\n if (!adjacentRelId || (!relationInInitialArray[adjacentRelId] && !mapper[adjacentRelId])) {\n needsSorting = true;\n }\n\n /**\n * We do not allow duplicate relations to be connected, so we need to check for uniqueness with components\n * Note that the id here includes the uid for polymorphic relations\n *\n * So for normal relations, the same id means the same relation\n * For component relations, it means the unique combo of (id, component name)\n */\n\n // Check if there's an existing relation with this id\n const existingRelation = mapper[relation.id];\n\n // Check if existing relation has a component or not\n const hasNoComponent = existingRelation && !('__component' in existingRelation);\n\n // Check if the existing relation has the same component as the new relation\n const hasSameComponent =\n existingRelation && existingRelation.__component === relation.__component;\n\n // If we have an existing relation that is not unique (no component or same component) we won't accept it\n if (existingRelation && (hasNoComponent || hasSameComponent)) {\n throw new InvalidRelationError(\n `The relation with id ${relation.id} is already connected. ` +\n 'You cannot connect the same relation twice.'\n );\n }\n\n return {\n [relation.id]: { ...relation, computed: false },\n ...mapper,\n };\n },\n {} as Record<ID, Link & { computed: boolean }>\n );\n\n // If we don't need to sort the connect array, we can return it as is\n if (!needsSorting) return connectArr;\n\n // Recursively compute in which order the relation should be connected\n const computeRelation = (relation: Link, relationsSeenInBranch: Record<ID, boolean>) => {\n const adjacentRelId = relation.position?.before || relation.position?.after;\n const adjacentRelation = mappedRelations[adjacentRelId as ID];\n\n // If the relation has already been seen in the current branch,\n // it means there is a circular reference\n if (adjacentRelId && relationsSeenInBranch[adjacentRelId]) {\n throw new InvalidRelationError(\n 'A circular reference was found in the connect array. ' +\n 'One relation is trying to connect before/after another one that is trying to connect before/after it'\n );\n }\n\n // This relation has already been computed\n if (mappedRelations[relation.id]?.computed) {\n return;\n }\n\n mappedRelations[relation.id].computed = true;\n\n // Relation does not have a before or after attribute or is in the initial array\n if (!adjacentRelId || relationInInitialArray[adjacentRelId]) {\n sortedConnect.push(relation);\n return;\n }\n\n // Look if id is referenced elsewhere in the array\n if (mappedRelations[adjacentRelId]) {\n computeRelation(adjacentRelation, { ...relationsSeenInBranch, [relation.id]: true });\n sortedConnect.push(relation);\n } else if (strictSort) {\n // If we reach this point, it means that the adjacent relation is not in the connect array\n // and it is not in the database.\n throw new InvalidRelationError(\n `There was a problem connecting relation with id ${\n relation.id\n } at position ${JSON.stringify(\n relation.position\n )}. The relation with id ${adjacentRelId} needs to be connected first.`\n );\n } else {\n // We are in non-strict mode so we can push the relation.\n sortedConnect.push({ id: relation.id, position: { end: true } });\n }\n };\n\n // Iterate over connectArr and populate sortedConnect\n connectArr.forEach((relation) => computeRelation(relation, {}));\n\n return sortedConnect;\n};\n\n/**\n * Responsible for calculating the relations order when connecting them.\n *\n * The connect method takes an array of relations with positional attributes:\n * - before: the id of the relation to connect before\n * - after: the id of the relation to connect after\n * - end: it should be at the end\n * - start: it should be at the start\n *\n * Example:\n * - Having a connect array like:\n * [ { id: 4, before: 2 }, { id: 4, before: 3}, {id: 5, before: 4} ]\n * - With the initial relations:\n * [ { id: 2, order: 4 }, { id: 3, order: 10 } ]\n * - Step by step, going through the connect array, the array of relations would be:\n * [ { id: 4, order: 3.5 }, { id: 2, order: 4 }, { id: 3, order: 10 } ]\n * [ { id: 2, order: 4 }, { id: 4, order: 3.5 }, { id: 3, order: 10 } ]\n * [ { id: 2, order: 4 }, { id: 5, order: 3.5 }, { id: 4, order: 3.5 }, { id: 3, order: 10 } ]\n * - The final step would be to recalculate fractional order values.\n * [ { id: 2, order: 4 }, { id: 5, order: 3.33 }, { id: 4, order: 3.66 }, { id: 3, order: 10 } ]\n *\n * `initArr` is not the full relation list. For an ordered connect, `updateRelations` loads only\n * the rows named as anchors by the payload plus the lowest- and highest-ordered rows, so entries\n * that are adjacent in `computedRelations` are not adjacent in the stored list. Placement must be\n * computed from the anchor's own order, never from its neighbours in this array.\n *\n * @param {Array<*>} initArr - array of relations to initialize the class with\n * @param {string} idColumn - the column name of the id\n * @param {string} orderColumn - the column name of the order\n * @param {boolean} strict - if true, will throw an error if a relation is connected adjacent to\n * another one that does not exist\n * @return {*}\n */\nconst relationsOrderer = <TRelation extends Record<string, ID | number | null>>(\n initArr: TRelation[],\n idColumn: keyof TRelation,\n orderColumn: keyof TRelation,\n strict?: boolean\n) => {\n const computedRelations: OrderedLink[] = _.sortBy(\n castArray(initArr ?? []).map((r) => ({\n init: true,\n id: r[idColumn] as ID,\n order: r[orderColumn] !== null && r[orderColumn] !== undefined ? Number(r[orderColumn]) : 1,\n })),\n 'order'\n );\n\n const maxOrder = maxBy(computedRelations, 'order')?.order || 0;\n\n const findRelation = (id: ID) => {\n const idx = computedRelations.findIndex((r) => r.id === id);\n return { idx, relation: computedRelations[idx] };\n };\n\n const removeRelation = (r: Link) => {\n const { idx } = findRelation(r.id);\n if (idx >= 0) {\n computedRelations.splice(idx, 1);\n }\n };\n\n const insertRelation = (r: Link) => {\n let idx;\n\n if (r.position?.before) {\n const { idx: beforeIdx, relation } = findRelation(r.position.before);\n if (relation.init) {\n r.order = relation.order - 0.5;\n } else {\n r.order = relation.order;\n }\n idx = beforeIdx;\n } else if (r.position?.after) {\n const { idx: afterIdx, relation } = findRelation(r.position.after);\n if (relation.init) {\n r.order = relation.order + 0.5;\n } else {\n r.order = relation.order;\n }\n idx = afterIdx + 1;\n } else if (r.position?.start) {\n if (computedRelations.length > 0) {\n const firstRelation = computedRelations[0];\n r.order = firstRelation.init ? firstRelation.order - 0.5 : firstRelation.order;\n } else {\n r.order = 0.5;\n }\n idx = 0;\n } else {\n r.order = maxOrder + 0.5;\n idx = computedRelations.length;\n }\n\n // Insert the relation in the array\n computedRelations.splice(idx, 0, r as OrderedLink);\n };\n\n return {\n disconnect(relations: Link | Link[]) {\n castArray(relations).forEach((relation) => {\n removeRelation(relation);\n });\n return this;\n },\n connect(relations: Link | Link[]) {\n sortConnectArray(castArray(relations), computedRelations, strict).forEach((relation) => {\n this.disconnect(relation);\n\n try {\n insertRelation(relation);\n } catch {\n throw new Error(\n `There was a problem connecting relation with id ${\n relation.id\n } at position ${JSON.stringify(\n relation.position\n )}. The list of connect relations is not valid`\n );\n }\n });\n return this;\n },\n get() {\n return computedRelations;\n },\n /**\n * Get a map between the relation id and its order\n */\n getOrderMap() {\n const map: Record<ID, number> = {};\n const chunks = _(computedRelations).groupBy('order').value();\n const sortedKeys = Object.keys(chunks).sort((a, b) => parseFloat(a) - parseFloat(b));\n\n for (const orderStr of sortedKeys) {\n const relations = chunks[orderStr];\n let offset = 1;\n relations.forEach((relation) => {\n if (!relation.init) {\n map[relation.id] = parseFloat(orderStr) + (offset / (relations.length + 1)) * 0.49;\n offset += 1;\n }\n });\n }\n\n return map;\n },\n };\n};\n\nexport { relationsOrderer, sortConnectArray };\n"],"names":["sortConnectArray","connectArr","initialArr","strictSort","sortedConnect","needsSorting","relationInInitialArray","reduce","acc","rel","id","mappedRelations","mapper","relation","adjacentRelId","position","before","after","existingRelation","hasNoComponent","hasSameComponent","__component","InvalidRelationError","computed","computeRelation","relationsSeenInBranch","adjacentRelation","push","JSON","stringify","end","forEach","relationsOrderer","initArr","idColumn","orderColumn","strict","computedRelations","_","sortBy","castArray","map","r","init","order","undefined","Number","maxOrder","maxBy","findRelation","idx","findIndex","removeRelation","splice","insertRelation","beforeIdx","afterIdx","start","length","firstRelation","disconnect","relations","connect","Error","get","getOrderMap","chunks","groupBy","value","sortedKeys","Object","keys","sort","a","b","parseFloat","orderStr","offset"],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { castArray, maxBy } from 'lodash
|
|
2
|
-
import _ from 'lodash';
|
|
1
|
+
import _, { castArray, maxBy } from 'lodash';
|
|
3
2
|
import InvalidRelationError from '../errors/invalid-relation.mjs';
|
|
4
3
|
|
|
5
4
|
/**
|
|
@@ -142,7 +141,7 @@ import InvalidRelationError from '../errors/invalid-relation.mjs';
|
|
|
142
141
|
id: r[idColumn],
|
|
143
142
|
order: r[orderColumn] !== null && r[orderColumn] !== undefined ? Number(r[orderColumn]) : 1
|
|
144
143
|
})), 'order');
|
|
145
|
-
const maxOrder = maxBy('order'
|
|
144
|
+
const maxOrder = maxBy(computedRelations, 'order')?.order || 0;
|
|
146
145
|
const findRelation = (id)=>{
|
|
147
146
|
const idx = computedRelations.findIndex((r)=>r.id === id);
|
|
148
147
|
return {
|