move FETCH_ALL to constants

Author: bigmontz

core/src/internal/constants.ts

@@ -17,6 +17,8 @@
  * limitations under the License.
  */
 
+const FETCH_ALL = -1
+
 const ACCESS_MODE_READ: string = 'READ'
 const ACCESS_MODE_WRITE: string = 'WRITE'
 
@@ -29,6 +31,7 @@ const BOLT_PROTOCOL_V4_2: number = 4.2
 const BOLT_PROTOCOL_V4_3: number = 4.3
 
 export {
+  FETCH_ALL,
   ACCESS_MODE_READ,
   ACCESS_MODE_WRITE,
   BOLT_PROTOCOL_V1,

src/driver.js

@@ -21,15 +21,18 @@ import ConnectionProvider from './internal/connection-provider'
 import Bookmark from './internal/bookmark'
 import DirectConnectionProvider from './internal/connection-provider-direct'
 import ConnectivityVerifier from './internal/connectivity-verifier'
-import { ACCESS_MODE_READ, ACCESS_MODE_WRITE } from './internal/constants'
+import {
+  ACCESS_MODE_READ,
+  ACCESS_MODE_WRITE,
+  FETCH_ALL
+} from './internal/constants'
 import Logger from './internal/logger'
 import {
   DEFAULT_ACQUISITION_TIMEOUT,
   DEFAULT_MAX_SIZE
 } from './internal/pool-config'
 import { Session } from 'neo4j-driver-core'
 import RxSession from './session-rx'
-import { FETCH_ALL } from './internal/bolt'
 import { ENCRYPTION_ON, ENCRYPTION_OFF } from './internal/util'
 
 const DEFAULT_MAX_CONNECTION_LIFETIME = 60 * 60 * 1000 // 1 hour

src/internal/bolt/index.js

@@ -22,7 +22,6 @@ import _BoltProtocol from './bolt-protocol-v4x3'
 import _RawRoutingTable from './routing-table-raw'
 
 export * from './stream-observers'
-export { ALL as FETCH_ALL } from './request-message'
 
 export const BoltProtocol = _BoltProtocol
 export const RawRoutingTable = _RawRoutingTable

src/internal/bolt/request-message.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import { ACCESS_MODE_READ } from '../constants'
+import { ACCESS_MODE_READ, FETCH_ALL } from '../constants'
 import { int } from 'neo4j-driver-core'
 import { assertString } from '../util'
 
@@ -44,7 +44,6 @@ const READ_MODE = 'r'
 /* eslint-enable no-unused-vars */
 
 const NO_STATEMENT_ID = -1
-export const ALL = -1
 
 export default class RequestMessage {
   constructor (signature, fields, toString) {
@@ -187,8 +186,11 @@ export default class RequestMessage {
    * @param {Integer|number} n
    * @return {RequestMessage} the PULL message.
    */
-  static pull ({ stmtId = NO_STATEMENT_ID, n = ALL } = {}) {
-    const metadata = buildStreamMetadata(stmtId || NO_STATEMENT_ID, n || ALL)
+  static pull ({ stmtId = NO_STATEMENT_ID, n = FETCH_ALL } = {}) {
+    const metadata = buildStreamMetadata(
+      stmtId || NO_STATEMENT_ID,
+      n || FETCH_ALL
+    )
     return new RequestMessage(
       PULL,
       [metadata],
@@ -202,8 +204,11 @@ export default class RequestMessage {
    * @param {Integer|number} n
    * @return {RequestMessage} the PULL message.
    */
-  static discard ({ stmtId = NO_STATEMENT_ID, n = ALL } = {}) {
-    const metadata = buildStreamMetadata(stmtId || NO_STATEMENT_ID, n || ALL)
+  static discard ({ stmtId = NO_STATEMENT_ID, n = FETCH_ALL } = {}) {
+    const metadata = buildStreamMetadata(
+      stmtId || NO_STATEMENT_ID,
+      n || FETCH_ALL
+    )
     return new RequestMessage(
       DISCARD,
       [metadata],

src/internal/constants.js

@@ -21,6 +21,7 @@ import { internal } from 'neo4j-driver-core'
 
 const {
   constants: {
+    FETCH_ALL,
     ACCESS_MODE_READ,
     ACCESS_MODE_WRITE,
     BOLT_PROTOCOL_V1,
@@ -34,6 +35,7 @@ const {
 } = internal
 
 export {
+  FETCH_ALL,
   ACCESS_MODE_READ,
   ACCESS_MODE_WRITE,
   BOLT_PROTOCOL_V1,