@naturalcycles/firestore-lib 1.1.10 → 1.1.11

package/dist/firestore.db.d.ts

@@ -1,10 +1,9 @@
-import { Query } from '@google-cloud/firestore';
+import { Firestore, Query } from '@google-cloud/firestore';
 import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, DBTransaction, RunQueryResult } from '@naturalcycles/db-lib';
 import { ObjectWithId, AnyObjectWithId } from '@naturalcycles/js-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import * as firebaseAdmin from 'firebase-admin';
 export interface FirestoreDBCfg {
-    firestore: firebaseAdmin.firestore.Firestore;
+    firestore: Firestore;
 }
 export interface FirestoreDBOptions extends CommonDBOptions {
 }

package/dist/index.d.ts

@@ -1,4 +1,5 @@
+import { Firestore } from '@google-cloud/firestore';
 import { FirestoreDB, FirestoreDBCfg, FirestoreDBOptions, FirestoreDBSaveOptions } from './firestore.db';
 import { dbQueryToFirestoreQuery } from './query.util';
 export type { FirestoreDBCfg, FirestoreDBOptions, FirestoreDBSaveOptions };
-export { FirestoreDB, dbQueryToFirestoreQuery };
+export { Firestore, FirestoreDB, dbQueryToFirestoreQuery };

package/dist/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dbQueryToFirestoreQuery = exports.FirestoreDB = void 0;
+exports.dbQueryToFirestoreQuery = exports.FirestoreDB = exports.Firestore = void 0;
+const firestore_1 = require("@google-cloud/firestore");
+Object.defineProperty(exports, "Firestore", { enumerable: true, get: function () { return firestore_1.Firestore; } });
 const firestore_db_1 = require("./firestore.db");
 Object.defineProperty(exports, "FirestoreDB", { enumerable: true, get: function () { return firestore_db_1.FirestoreDB; } });
 const query_util_1 = require("./query.util");

package/package.json

@@ -4,6 +4,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@google-cloud/firestore": "^4.5.0",
     "@naturalcycles/db-lib": "^8.2.0",
     "@naturalcycles/js-lib": "^14.6.0",
     "@naturalcycles/nodejs-lib": "^12.4.0",
@@ -12,8 +13,8 @@
   "devDependencies": {
     "@naturalcycles/dev-lib": "^12.1.2",
     "@naturalcycles/test-lib": "^1.0.3",
-    "@types/node": "^16.7.1",
-    "dotenv": "^10.0.0",
+    "@types/node": "^17.0.22",
+    "dotenv": "^16.0.0",
     "jest": "^27.0.6"
   },
   "files": [
@@ -36,7 +37,7 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/firestore.db.ts

@@ -1,4 +1,4 @@
-import { Query, QueryDocumentSnapshot, QuerySnapshot } from '@google-cloud/firestore'
+import { Firestore, Query, QueryDocumentSnapshot, QuerySnapshot } from '@google-cloud/firestore'
 import {
   BaseCommonDB,
   CommonDB,
@@ -19,12 +19,11 @@ import {
   AnyObjectWithId,
 } from '@naturalcycles/js-lib'
 import { ReadableTyped, transformMapSimple } from '@naturalcycles/nodejs-lib'
-import * as firebaseAdmin from 'firebase-admin'
 import { escapeDocId, unescapeDocId } from './firestore.util'
 import { dbQueryToFirestoreQuery } from './query.util'
 
 export interface FirestoreDBCfg {
-  firestore: firebaseAdmin.firestore.Firestore
+  firestore: Firestore
 }
 
 export interface FirestoreDBOptions extends CommonDBOptions {}

package/src/index.ts

@@ -1,3 +1,4 @@
+import { Firestore } from '@google-cloud/firestore'
 import {
   FirestoreDB,
   FirestoreDBCfg,
@@ -8,4 +9,4 @@ import { dbQueryToFirestoreQuery } from './query.util'
 
 export type { FirestoreDBCfg, FirestoreDBOptions, FirestoreDBSaveOptions }
 
-export { FirestoreDB, dbQueryToFirestoreQuery }
+export { Firestore, FirestoreDB, dbQueryToFirestoreQuery }