refactor: use geofirestore-core

MichaelSolati · Jun 22, 2020 · 4fa8603 · 4fa8603
1 parent a31b11c
commit 4fa8603
Show file tree

Hide file tree

Showing 26 changed files with 469 additions and 2,750 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,13 +51,15 @@
     "postinstall.js",
     "README.md"
   ],
+  "dependencies": {
+    "geofirestore-core": "^4.0.0"
+  },
   "optionalDependencies": {
     "@google-cloud/firestore": ">= 2.0.0",
     "@types/node": ">= 8.0.0",
     "firebase": ">= 6.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^13.0.0",
     "@rollup/plugin-node-resolve": "^8.0.1",
     "@types/chai": "^4.2.11",
     "@types/mocha": "^7.0.2",
@@ -66,6 +68,7 @@
     "coveralls": "^3.1.0",
     "firebase-tools": "^8.4.2",
     "generate-changelog": "^1.8.0",
+    "geokit": "^1.1.0",
     "gts": "^2.0.2",
     "jsdom": "^16.2.2",
     "jsdom-global": "^3.0.2",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,4 +1,3 @@
-import commonjs from '@rollup/plugin-commonjs';
 import resolve from '@rollup/plugin-node-resolve';
 import {terser} from 'rollup-plugin-terser';
 import typescript from 'rollup-plugin-typescript2';
@@ -11,17 +10,13 @@ const onwarn = (warning, rollupWarn) => {
   }
 };
 
-const plugins = [
-  typescript({
-    tsconfigOverride: {
-      compilerOptions: {
-        module: 'ESNext',
-      },
+const ts = typescript({
+  tsconfigOverride: {
+    compilerOptions: {
+      module: 'ESNext',
     },
-  }),
-  resolve(),
-  commonjs(),
-];
+  },
+});
 
 export default [
   {
@@ -36,8 +31,8 @@ export default [
         format: 'es',
       },
     ],
-    external: ['@types/node'],
-    plugins,
+    external: ['@types/node', 'geofirestore-core'],
+    plugins: [ts],
     onwarn,
   },
   {
@@ -49,7 +44,7 @@ export default [
       extend: true,
     },
     external: ['@types/node'],
-    plugins: [...plugins, terser()],
+    plugins: [ts, resolve(), terser()],
     onwarn,
   },
 ];
diff --git a/src/GeoCollectionReference.ts b/src/GeoCollectionReference.ts
@@ -1,7 +1,7 @@
-import {GeoFirestoreTypes} from './GeoFirestoreTypes';
+import {GeoFirestoreTypes, encodeDocumentAdd} from 'geofirestore-core';
+
 import {GeoDocumentReference} from './GeoDocumentReference';
 import {GeoQuery} from './GeoQuery';
-import {encodeAddDocument} from './utils';
 
 /**
  * A `GeoCollectionReference` object can be used for adding documents, getting document references, and querying for documents (using the
@@ -61,7 +61,7 @@ export class GeoCollectionReference extends GeoQuery {
     customKey?: string
   ): Promise<GeoDocumentReference> {
     return (this._collection as GeoFirestoreTypes.cloud.CollectionReference)
-      .add(encodeAddDocument(documentData, customKey))
+      .add(encodeDocumentAdd(documentData, customKey))
       .then(doc => new GeoDocumentReference(doc));
   }
 

diff --git a/src/GeoDocumentReference.ts b/src/GeoDocumentReference.ts
@@ -1,9 +1,10 @@
-import {GeoFirestoreTypes} from './GeoFirestoreTypes';
 import {
-  encodeSetDocument,
-  encodeUpdateDocument,
-  sanitizeSetOptions,
-} from './utils';
+  GeoFirestoreTypes,
+  encodeDocumentSet,
+  encodeDocumentUpdate,
+} from 'geofirestore-core';
+
+import {sanitizeSetOptions} from './utils';
 import {GeoCollectionReference} from './GeoCollectionReference';
 import {GeoDocumentSnapshot} from './GeoDocumentSnapshot';
 import {GeoFirestore} from './GeoFirestore';
@@ -165,7 +166,7 @@ export class GeoDocumentReference {
   ): Promise<void> {
     return (this._document as GeoFirestoreTypes.web.DocumentReference)
       .set(
-        encodeSetDocument(documentData, options),
+        encodeDocumentSet(documentData, options),
         sanitizeSetOptions(options)
       )
       .then(() => null);
@@ -185,7 +186,7 @@ export class GeoDocumentReference {
     customKey?: string
   ): Promise<void> {
     return (this._document as GeoFirestoreTypes.web.DocumentReference)
-      .update(encodeUpdateDocument(data, customKey))
+      .update(encodeDocumentUpdate(data, customKey))
       .then(() => null);
   }
 }
diff --git a/src/GeoDocumentSnapshot.ts b/src/GeoDocumentSnapshot.ts
@@ -1,4 +1,5 @@
-import {GeoFirestoreTypes} from './GeoFirestoreTypes';
+import {GeoFirestoreTypes} from 'geofirestore-core';
+
 import {GeoDocumentReference} from './GeoDocumentReference';
 
 /**

diff --git a/src/GeoFirestore.ts b/src/GeoFirestore.ts
@@ -1,4 +1,5 @@
-import {GeoFirestoreTypes} from './GeoFirestoreTypes';
+import {GeoFirestoreTypes} from 'geofirestore-core';
+
 import {GeoCollectionReference} from './GeoCollectionReference';
 import {GeoWriteBatch} from './GeoWriteBatch';
 

diff --git a/src/GeoFirestoreTypes.ts b/src/GeoFirestoreTypes.ts
diff --git a/src/GeoJoinerGet.ts b/src/GeoJoinerGet.ts