Merge

Author: schmidt-sebastian

packages/database/index.node.ts

@@ -28,9 +28,8 @@ import { Database } from './src/api/Database';
 import * as INTERNAL from './src/api/internal';
 import { DataSnapshot, Query, Reference } from './src/api/Reference';
 import * as TEST_ACCESS from './src/api/test_access';
-import { enableLogging } from './src/core/util/util';
 import { setSDKVersion } from './src/core/version';
-import { repoManagerDatabaseFromApp } from './src/exp/Database';
+import { enableLogging, repoManagerDatabaseFromApp } from './src/exp/Database';
 import { setWebSocketImpl } from './src/realtime/WebSocketConnection';
 
 setWebSocketImpl(Client);

packages/database/index.ts

@@ -28,9 +28,8 @@ import { Database } from './src/api/Database';
 import * as INTERNAL from './src/api/internal';
 import { DataSnapshot, Query, Reference } from './src/api/Reference';
 import * as TEST_ACCESS from './src/api/test_access';
-import { enableLogging } from './src/core/util/util';
 import { setSDKVersion } from './src/core/version';
-import { repoManagerDatabaseFromApp } from './src/exp/Database';
+import { enableLogging, repoManagerDatabaseFromApp } from './src/exp/Database';
 
 const ServerValue = Database.ServerValue;
 

packages/database/src/api/Database.ts

@@ -27,6 +27,7 @@ import {
   goOffline
 } from '../exp/Database';
 import { ref, refFromURL } from '../exp/Reference_impl';
+import { increment, serverTimestamp } from '../exp/ServerValue';
 
 import { Reference } from './Reference';
 
@@ -35,16 +36,8 @@ import { Reference } from './Reference';
  */
 export class Database implements FirebaseService, Compat<ExpDatabase> {
   static readonly ServerValue = {
-    TIMESTAMP: {
-      '.sv': 'timestamp'
-    },
-    increment: (delta: number) => {
-      return {
-        '.sv': {
-          'increment': delta
-        }
-      };
-    }
+    TIMESTAMP: serverTimestamp(),
+    increment: (delta: number) => increment(delta)
   };
 
   /**

packages/database/src/exp/Database.ts

@@ -30,7 +30,11 @@ import { Repo, repoInterrupt, repoResume, repoStart } from '../core/Repo';
 import { RepoInfo } from '../core/RepoInfo';
 import { parseRepoInfo } from '../core/util/libs/parser';
 import { newEmptyPath, pathIsEmpty } from '../core/util/Path';
-import { fatal, log } from '../core/util/util';
+import {
+  fatal,
+  log,
+  enableLogging as enableLoggingImpl
+} from '../core/util/util';
 import { validateUrl } from '../core/util/validation';
 
 import { ReferenceImpl } from './Reference_impl';
@@ -290,6 +294,5 @@ export function enableLogging(
   logger?: boolean | ((message: string) => unknown),
   persistent?: boolean
 ): void {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return {} as any;
+  enableLoggingImpl(logger, persistent);
 }

packages/database/src/exp/Reference_impl.ts

@@ -471,7 +471,6 @@ export function setWithPriority(
   validateWritablePath('setWithPriority', ref._path);
   validateFirebaseDataArg('setWithPriority', value, ref._path, false);
   validatePriority('setWithPriority', priority, false);
-
   if (ref.key === '.length' || ref.key === '.keys') {
     throw 'setWithPriority failed: ' + ref.key + ' is a read-only object.';
   }

packages/database/src/exp/ServerValue.ts

@@ -15,12 +15,18 @@
  * limitations under the License.
  */
 
+const SERVER_TIMESTAMP = {
+  '.sv': 'timestamp'
+};
+
 export function serverTimestamp(): object {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return {} as any;
+  return SERVER_TIMESTAMP;
 }
 
 export function increment(delta: number): object {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return {} as any;
+  return {
+    '.sv': {
+      'increment': delta
+    }
+  };
 }