cantian-mongodb 0.0.32 → 0.0.34
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/migration.d.ts +3 -3
- package/dist/migration.js +20 -6
- package/dist/migration.js.map +1 -1
- package/package.json +1 -1
package/dist/migration.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { CreateIndexesOptions, Db
|
|
2
|
-
import { Model } from './mongoClient.js';
|
|
1
|
+
import { CreateIndexesOptions, Db } from 'mongodb';
|
|
2
|
+
import { Index, Model } from './mongoClient.js';
|
|
3
3
|
export type Indexes = {
|
|
4
4
|
key: any;
|
|
5
5
|
options?: CreateIndexesOptions;
|
|
6
6
|
vectorOptions?: Record<string, any>;
|
|
7
7
|
}[];
|
|
8
|
-
export declare function generateIndexName(
|
|
8
|
+
export declare function generateIndexName(index: Index): string;
|
|
9
9
|
export declare const migrate: (db: Db, model: Model) => Promise<void>;
|
|
10
10
|
export type MigrateRemoteEvent = {
|
|
11
11
|
dbName: string;
|
package/dist/migration.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import assert from 'node:assert';
|
|
2
2
|
import { mongoClient } from './mongoClient.js';
|
|
3
|
-
export function generateIndexName(
|
|
3
|
+
export function generateIndexName(index) {
|
|
4
|
+
if (index.options?.name) {
|
|
5
|
+
return index.options.name;
|
|
6
|
+
}
|
|
7
|
+
const key = index.key;
|
|
4
8
|
return Object.entries(key)
|
|
5
9
|
.map(([k, v]) => `${k}_${v}`)
|
|
6
10
|
.join('_');
|
|
@@ -31,19 +35,29 @@ async function migrateSearch(collection, indexes) {
|
|
|
31
35
|
for await (const existingIndex of existingIndexes) {
|
|
32
36
|
remoteIndexMap[existingIndex.name] = existingIndex;
|
|
33
37
|
}
|
|
38
|
+
const localIndexMap = {};
|
|
34
39
|
for (const localIndex of indexes) {
|
|
35
40
|
if (!localIndex.name) {
|
|
36
41
|
throw new Error(`Index name is required when migrating search indexes for ${collection.collectionName}.`);
|
|
37
42
|
}
|
|
43
|
+
localIndexMap[localIndex.name] = localIndex;
|
|
44
|
+
}
|
|
45
|
+
// Remove remote indexes that are not in the local indexes
|
|
46
|
+
for (const remoteIndex of Object.values(remoteIndexMap)) {
|
|
47
|
+
if (!localIndexMap[remoteIndex.name]) {
|
|
48
|
+
await collection.dropSearchIndex(remoteIndex.name);
|
|
49
|
+
console.info(`Remove the search index ${remoteIndex.name} for ${collection.collectionName} successfully.`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
// Create local indexes that are not in the remote indexes
|
|
53
|
+
for (const localIndex of indexes) {
|
|
38
54
|
const remoteIndex = remoteIndexMap[localIndex.name];
|
|
39
55
|
if (!remoteIndex) {
|
|
40
56
|
await collection.createSearchIndex(localIndex);
|
|
41
57
|
console.info(`Create the search index ${localIndex.name} for ${collection.collectionName} successfully.`, localIndex);
|
|
42
58
|
}
|
|
43
59
|
else if (!isSameDefinition(remoteIndex.latestDefinition, localIndex.definition)) {
|
|
44
|
-
|
|
45
|
-
await collection.createSearchIndex(localIndex);
|
|
46
|
-
console.info(`Update the search index ${localIndex.name} for ${collection.collectionName} successfully.`, localIndex);
|
|
60
|
+
throw new Error(`Give a new name to the search index ${localIndex.name} for ${collection.collectionName} to avoid conflict.`);
|
|
47
61
|
}
|
|
48
62
|
else {
|
|
49
63
|
console.info(`The search index ${localIndex.name} for ${collection.collectionName} is already up to date.`);
|
|
@@ -55,7 +69,7 @@ export const migrate = async (db, model) => {
|
|
|
55
69
|
await migrateSchema(db, collectionName, model.schema);
|
|
56
70
|
if (model.indexes?.length) {
|
|
57
71
|
for (const index of model.indexes) {
|
|
58
|
-
const indexOption = { ...index.options, name: generateIndexName(index
|
|
72
|
+
const indexOption = { ...index.options, name: generateIndexName(index) };
|
|
59
73
|
await model.collection.createIndex(index.key, indexOption);
|
|
60
74
|
console.info(`Create a general index for ${collectionName} successfully.`, indexOption);
|
|
61
75
|
}
|
|
@@ -70,7 +84,7 @@ export const migrate = async (db, model) => {
|
|
|
70
84
|
continue;
|
|
71
85
|
}
|
|
72
86
|
const inUsed = model.indexes?.find((v) => {
|
|
73
|
-
return existingIndex.name === generateIndexName(v
|
|
87
|
+
return existingIndex.name === generateIndexName(v);
|
|
74
88
|
});
|
|
75
89
|
if (!inUsed) {
|
|
76
90
|
await model.collection.dropIndex(existingIndex.name);
|
package/dist/migration.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../src/migration.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../src/migration.ts"],"names":[],"mappings":"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"}
|