moving connection classes to the bolt-connection package

Author: bigmontz

bolt-connection/package.json

@@ -17,6 +17,9 @@
     "neo4j",
     "driver"
   ],
+  "browser": {
+    "./lib/channel/node/index.js": "./lib/channel/browser/index.js"
+  },
   "author": "Neo4j",
   "license": "Apache-2.0",
   "bugs": {

src/internal/bolt/bolt-protocol-util.js renamed to bolt-connection/src/bolt/bolt-protocol-util.js

@@ -20,20 +20,23 @@ import {
   assertDatabaseIsEmpty,
   assertTxConfigIsEmpty
 } from './bolt-protocol-util'
-import Bookmark from '../bookmark'
 import { Chunker } from '../chunking'
-import { ACCESS_MODE_WRITE, BOLT_PROTOCOL_V1 } from '../constants'
-import Logger from '../logger'
-import * as v1 from '../packstream-v1'
-import { Packer } from '../packstream-v1'
+import { v1 } from '../packstream'
 import RequestMessage from './request-message'
 import {
   LoginObserver,
   ResetObserver,
   ResultStreamObserver,
   StreamObserver
 } from './stream-observers'
-import TxConfig from '../tx-config'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  bookmark: { Bookmark },
+  constants: { ACCESS_MODE_WRITE, BOLT_PROTOCOL_V1 },
+  logger: { Logger },
+  txConfig: { TxConfig }
+} = internal
 
 export default class BoltProtocol {
   /**

src/internal/bolt/bolt-protocol-v1.js renamed to bolt-connection/src/bolt/bolt-protocol-v1.js

@@ -17,8 +17,12 @@
  * limitations under the License.
  */
 import BoltProtocolV1 from './bolt-protocol-v1'
-import * as v2 from '../packstream-v2'
-import { BOLT_PROTOCOL_V2 } from '../constants'
+import v2 from '../packstream'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  constants: { BOLT_PROTOCOL_V2 }
+} = internal
 
 export default class BoltProtocol extends BoltProtocolV1 {
   _createPacker (chunker) {

src/internal/bolt/bolt-protocol-v2.js renamed to bolt-connection/src/bolt/bolt-protocol-v2.js

@@ -25,9 +25,14 @@ import {
   ResultStreamObserver,
   ProcedureRouteObserver
 } from './stream-observers'
-import { BOLT_PROTOCOL_V3 } from '../constants'
-import Bookmark from '../bookmark'
-import TxConfig from '../tx-config'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  bookmark: { Bookmark },
+  constants: { BOLT_PROTOCOL_V3 },
+  txConfig: { TxConfig }
+} = internal
+
 const CONTEXT = 'context'
 const CALL_GET_ROUTING_TABLE = `CALL dbms.cluster.routing.getRoutingTable($${CONTEXT})`
 

src/internal/bolt/bolt-protocol-v3.js renamed to bolt-connection/src/bolt/bolt-protocol-v3.js

@@ -22,9 +22,14 @@ import {
   ResultStreamObserver,
   ProcedureRouteObserver
 } from './stream-observers'
-import { BOLT_PROTOCOL_V4_0 } from '../constants'
-import Bookmark from '../bookmark'
-import TxConfig from '../tx-config'
+
+import { internal } from 'neo4j-driver-core'
+
+const {
+  bookmark: { Bookmark },
+  constants: { BOLT_PROTOCOL_V4_0 },
+  txConfig: { TxConfig }
+} = internal
 
 const CONTEXT = 'context'
 const DATABASE = 'database'

src/internal/bolt/bolt-protocol-v4x0.js renamed to bolt-connection/src/bolt/bolt-protocol-v4x0.js

@@ -18,8 +18,12 @@
  */
 import BoltProtocolV4 from './bolt-protocol-v4x0'
 import RequestMessage, { ALL } from './request-message'
-import { BOLT_PROTOCOL_V4_1 } from '../constants'
 import { LoginObserver } from './stream-observers'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  constants: { BOLT_PROTOCOL_V4_1 }
+} = internal
 
 export default class BoltProtocol extends BoltProtocolV4 {
   /**

src/internal/bolt/bolt-protocol-v4x1.js renamed to bolt-connection/src/bolt/bolt-protocol-v4x1.js

@@ -17,7 +17,12 @@
  * limitations under the License.
  */
 import BoltProtocolV41 from './bolt-protocol-v4x1'
-import { BOLT_PROTOCOL_V4_2 } from '../constants'
+
+import { internal } from 'neo4j-driver-core'
+
+const {
+  constants: { BOLT_PROTOCOL_V4_2 }
+} = internal
 
 export default class BoltProtocol extends BoltProtocolV41 {
   get version () {

src/internal/bolt/bolt-protocol-v4x2.js renamed to bolt-connection/src/bolt/bolt-protocol-v4x2.js

@@ -17,10 +17,15 @@
  * limitations under the License.
  */
 import BoltProtocolV42 from './bolt-protocol-v4x2'
-import { BOLT_PROTOCOL_V4_3 } from '../constants'
 import RequestMessage from './request-message'
 import { RouteObserver } from './stream-observers'
 
+import { internal } from 'neo4j-driver-core'
+
+const {
+  constants: { BOLT_PROTOCOL_V4_3 }
+} = internal
+
 export default class BoltProtocol extends BoltProtocolV42 {
   get version () {
     return BOLT_PROTOCOL_V4_3

src/internal/bolt/bolt-protocol-v4x3.js renamed to bolt-connection/src/bolt/bolt-protocol-v4x3.js

@@ -25,7 +25,7 @@ import BoltProtocolV4x0 from './bolt-protocol-v4x0'
 import BoltProtocolV4x1 from './bolt-protocol-v4x1'
 import BoltProtocolV4x2 from './bolt-protocol-v4x2'
 import BoltProtocolV4x3 from './bolt-protocol-v4x3'
-import { Chunker, Dechunker } from '../chunking'
+import { Chunker, Dechunker } from '../channel'
 import ResponseHandler from './response-handler'
 
 /**

src/internal/bolt/create.js renamed to bolt-connection/src/bolt/create.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import { alloc } from '../node'
+import { alloc } from '../channel'
 import { newError } from 'neo4j-driver-core'
 
 const BOLT_MAGIC_PREAMBLE = 0x6060b017

src/internal/bolt/handshake.js renamed to bolt-connection/src/bolt/handshake.js

@@ -17,9 +17,12 @@
  * limitations under the License.
  */
 
-import { ACCESS_MODE_READ, FETCH_ALL } from '../constants'
-import { int } from 'neo4j-driver-core'
-import { assertString } from '../util'
+import { int, internal } from 'neo4j-driver-core'
+
+const {
+  constants: { ACCESS_MODE_READ, FETCH_ALL },
+  util: { assertString }
+} = internal
 
 /* eslint-disable no-unused-vars */
 // Signature bytes for each request message type

src/internal/bolt/index.js renamed to bolt-connection/src/bolt/index.js

@@ -18,7 +18,7 @@
  */
 
 import BaseBuffer from './base-buf'
-import { alloc } from '../node'
+import { alloc } from '../channel'
 
 /**
  * Buffer that combines multiple buffers, exposing them as one single buffer.

src/internal/bolt/request-message.js renamed to bolt-connection/src/bolt/request-message.js

@@ -1,5 +1,3 @@
-import Bookmark from './bookmark'
-
 /**
  * Copyright (c) "Neo4j"
  * Neo4j Sweden AB [http://neo4j.com]
@@ -19,6 +17,8 @@ import Bookmark from './bookmark'
  * limitations under the License.
  */
 
-import { ConnectionProvider } from 'neo4j-driver-core'
+import BaseBuffer from './base-buf'
+import CombinedBuffer from './combined-buf'
 
-export default ConnectionProvider
+export default BaseBuffer
+export { BaseBuffer, CombinedBuffer }

src/internal/bolt/response-handler.js renamed to bolt-connection/src/bolt/response-handler.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import BaseBuffer from '../buf/base-buf'
+import BaseBuffer from '../../buf'
 
 export default class HeapBuffer extends BaseBuffer {
   constructor (arg) {

src/internal/bolt/routing-table-raw.js renamed to bolt-connection/src/bolt/routing-table-raw.js

@@ -18,8 +18,11 @@
  */
 
 import HeapBuffer from './browser-buf'
-import { newError } from 'neo4j-driver-core'
-import { ENCRYPTION_OFF, ENCRYPTION_ON } from '../util'
+import { newError, internal } from 'neo4j-driver-core'
+
+const {
+  util: { ENCRYPTION_OFF, ENCRYPTION_ON }
+} = internal
 
 // Just to be sure that these values are with us even after WebSocket is injected
 // for tests.

src/internal/bolt/stream-observers.js renamed to bolt-connection/src/bolt/stream-observers.js

@@ -17,7 +17,11 @@
  * limitations under the License.
  */
 
-import BaseHostNameResolver from '../resolver/base-host-name-resolver'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  resolver: { BaseHostNameResolver }
+} = internal
 
 export default class BrowserHostNameResolver extends BaseHostNameResolver {
   resolve (address) {

src/internal/buf/base-buf.js renamed to bolt-connection/src/buf/base-buf.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import HeapBuffer from '../browser/browser-buf'
+import HeapBuffer from './browser-buf'
 import { TextEncoder, TextDecoder } from 'text-encoding-utf-8'
 
 const encoder = new TextEncoder('utf-8')

src/internal/buf/combined-buf.js renamed to bolt-connection/src/buf/combined-buf.js

@@ -17,8 +17,11 @@
  * limitations under the License.
  */
 
-import { newError, error } from 'neo4j-driver-core'
-import { ENCRYPTION_OFF, ENCRYPTION_ON } from './util'
+import { newError, error, internal } from 'neo4j-driver-core'
+
+const {
+  util: { ENCRYPTION_OFF, ENCRYPTION_ON }
+} = internal
 
 const { SERVICE_UNAVAILABLE } = error
 

src/internal/connection-provider.js renamed to bolt-connection/src/buf/index.js

@@ -17,9 +17,9 @@
  * limitations under the License.
  */
 
-import BaseBuffer from './buf/base-buf'
+import BaseBuffer from '../buf/base-buf'
 import { alloc } from './node'
-import CombinedBuffer from './buf/combined-buf'
+import CombinedBuffer from '../buf/combined-buf'
 
 const _CHUNK_HEADER_SIZE = 2
 const _MESSAGE_BOUNDARY = 0x00

src/internal/browser/browser-buf.js renamed to bolt-connection/src/channel/browser/browser-buf.js

@@ -0,0 +1,23 @@
+import ChannelConfig from './channel-config'
+
+/**
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export * from './node'
+export * from './chunking'
+export { default as ChannelConfig } from './channel-config'

src/internal/browser/browser-channel.js renamed to bolt-connection/src/channel/browser/browser-channel.js

@@ -18,7 +18,7 @@
  */
 
 import node from 'buffer'
-import BaseBuffer from '../buf/base-buf'
+import BaseBuffer from '../../buf'
 
 export default class NodeBuffer extends BaseBuffer {
   constructor (arg) {

src/internal/browser/browser-host-name-resolver.js renamed to bolt-connection/src/channel/browser/browser-host-name-resolver.js

@@ -20,8 +20,11 @@ import net from 'net'
 import tls from 'tls'
 import fs from 'fs'
 import NodeBuffer from './node-buf'
-import { ENCRYPTION_OFF, ENCRYPTION_ON, isEmptyObjectOrNull } from '../util'
-import { newError } from 'neo4j-driver-core'
+import { newError, internal } from 'neo4j-driver-core'
+
+const {
+  util: { ENCRYPTION_OFF, ENCRYPTION_ON, isEmptyObjectOrNull }
+} = internal
 
 let _CONNECTION_IDGEN = 0
 

src/internal/browser/browser-utf8.js renamed to bolt-connection/src/channel/browser/browser-utf8.js

@@ -17,8 +17,12 @@
  * limitations under the License.
  */
 
-import BaseHostNameResolver from '../resolver/base-host-name-resolver'
 import nodeDns from 'dns'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  resolver: { BaseHostNameResolver }
+} = internal
 
 export default class NodeHostNameResolver extends BaseHostNameResolver {
   resolve (address) {

src/internal/browser/index.js renamed to bolt-connection/src/channel/browser/index.js

@@ -18,9 +18,12 @@
  */
 
 import PooledConnectionProvider from './connection-provider-pooled'
-import DelegateConnection from './connection-delegate'
-import { createChannelConnection } from './connection-channel'
-import { BOLT_PROTOCOL_V4_0, BOLT_PROTOCOL_V3 } from './constants'
+import { createChannelConnection, DelegateConnection } from '../connection'
+import { internal } from 'neo4j-driver-core'
+
+const {
+  constants: { BOLT_PROTOCOL_V4_0, BOLT_PROTOCOL_V3 }
+} = internal
 
 export default class DirectConnectionProvider extends PooledConnectionProvider {
   constructor ({ id, config, log, address, userAgent, authToken }) {

src/internal/channel-config.js renamed to bolt-connection/src/channel/channel-config.js

@@ -17,12 +17,9 @@
  * limitations under the License.
  */
 
-import { createChannelConnection } from './connection-channel'
-import Pool from './pool'
-import PoolConfig from './pool-config'
-import ConnectionErrorHandler from './connection-error-handler'
-import { error } from 'neo4j-driver-core'
-import ConnectionProvider from './connection-provider'
+import { createChannelConnection, ConnectionErrorHandler } from '../connection'
+import Pool, { PoolConfig } from '../pool'
+import { error, ConnectionProvider } from 'neo4j-driver-core'
 
 const { SERVICE_UNAVAILABLE } = error
 export default class PooledConnectionProvider extends ConnectionProvider {