@data-fair/lib-node 2.0.3 → 2.1.1

package/mongo.d.ts

@@ -1,6 +1,7 @@
-import type { IndexSpecification, CreateIndexesOptions, MongoClientOptions } from 'mongodb';
+import type { IndexSpecification, CreateIndexesOptions, MongoClientOptions, IndexDirection } from 'mongodb';
 import { MongoClient } from 'mongodb';
-export type IndexDefinitions = Record<string, Record<string, IndexSpecification | [IndexSpecification, CreateIndexesOptions]>>;
+type IndexDirections = Record<string, IndexDirection>;
+export type IndexDefinitions = Record<string, Record<string, null | IndexDirections | [IndexDirections, CreateIndexesOptions]>>;
 export declare class Mongo {
     private _client;
     get client(): MongoClient;

package/mongo.js

@@ -45,12 +45,16 @@ export class Mongo {
     for (const collectionName in indexDefinitions) {
       for (const indexName in indexDefinitions[collectionName]) {
         let key, options
-        if (Array.isArray(indexDefinitions[collectionName][indexName])) {
-          [key, options] = indexDefinitions[collectionName][indexName]
+        const indexDefinition = indexDefinitions[collectionName][indexName]
+        if (indexDefinition === null) {
+          await this.db.collection(collectionName).dropIndex(indexName)
+          continue
+        } else if (Array.isArray(indexDefinition)) {
+          [key, options] = indexDefinition
           if (options.name && options.name !== indexName) { throw new Error(`inconsistent index name ${indexName} or ${options.name}`) }
           options.name = indexName
         } else {
-          key = indexDefinitions[collectionName][indexName]
+          key = indexDefinition
           options = { name: indexName }
         }
         await this.ensureIndex(collectionName, key, options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [

package/upgrade-scripts.js

@@ -14,8 +14,11 @@ export default async function (db, locks, basePath = './') {
     // containers for the scripts that are running in only 1 (while loop on "acquire" ?) and a healthcheck
     // are not considered "up" and the previous versions keep running in the mean time
   } else {
-    await runScripts(db, basePath)
-    await locks.release('upgrade')
+    try {
+      await runScripts(db, basePath)
+    } finally {
+      await locks.release('upgrade')
+    }
   }
 }
 async function runScripts (db, basePath) {