lib: be explicit about what gets exported from ./src/index.ts

lance · lance · commit 584ee826b707 · 2020-06-24T17:17:43.000-04:00
Signed-off-by: Lance Ball &lt;lball@redhat.com&gt;
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,31 @@
-export * from "./event";
-export * from "./transport";
-export * from "./event/v1";
-export * from "./event/v03";
+import {
+  CloudEvent,
+  CloudEventV03,
+  CloudEventV03Attributes,
+  CloudEventV1,
+  CloudEventV1Attributes,
+  ValidationError,
+  Version,
+} from "./event";
+
+import { Emitter, Receiver, Mode, Protocol, TransportOptions } from "./transport";
+import { Headers, headersFor } from "./transport/http/headers";
+
+export {
+  // From event
+  CloudEvent,
+  CloudEventV03,
+  CloudEventV03Attributes,
+  CloudEventV1,
+  CloudEventV1Attributes,
+  Version,
+  ValidationError,
+  // From transport
+  Emitter,
+  Receiver,
+  Mode,
+  Protocol,
+  TransportOptions,
+  Headers,
+  headersFor,
+};
diff --git a/test/http_emitter_test.ts b/test/http_emitter_test.ts
@@ -5,7 +5,7 @@ import CONSTANTS from "../src/constants";
 
 const DEFAULT_CE_CONTENT_TYPE = CONSTANTS.DEFAULT_CE_CONTENT_TYPE;
 
-import { CloudEvent, Version, Emitter, Protocol, http } from "../src";
+import { CloudEvent, Version, Emitter, Protocol, headersFor } from "../src";
 import { AxiosResponse } from "axios";
 
 const receiver = "https://cloudevents.io/";
@@ -64,7 +64,7 @@ describe("HTTP Transport Binding Emitter for CloudEvents", () => {
     });
 
     it("Provides the HTTP headers for a binary event", () => {
-      const headers = http.headersFor(event);
+      const headers = headersFor(event);
       expect(headers[CONSTANTS.CE_HEADERS.TYPE]).to.equal(event.type);
       expect(headers[CONSTANTS.CE_HEADERS.SPEC_VERSION]).to.equal(event.specversion);
       expect(headers[CONSTANTS.CE_HEADERS.SOURCE]).to.equal(event.source);
@@ -161,7 +161,7 @@ describe("HTTP Transport Binding Emitter for CloudEvents", () => {
     });
 
     it("Provides the HTTP headers for a binary event", () => {
-      const headers = http.headersFor(event);
+      const headers = headersFor(event);
       expect(headers[CONSTANTS.CE_HEADERS.TYPE]).to.equal(event.type);
       expect(headers[CONSTANTS.CE_HEADERS.SPEC_VERSION]).to.equal(event.specversion);
       expect(headers[CONSTANTS.CE_HEADERS.SOURCE]).to.equal(event.source);
diff --git a/test/receiver_binary_1_tests.ts b/test/receiver_binary_1_tests.ts
@@ -1,7 +1,8 @@
 import "mocha";
 import { expect } from "chai";
 
-import { CloudEvent, ValidationError, Version, asBase64 } from "../src";
+import { CloudEvent, ValidationError, Version } from "../src";
+import { asBase64 } from "../src/event/validation";
 import { BinaryHTTPReceiver } from "../src/transport/http/binary_receiver";
 import CONSTANTS from "../src/constants";
 
diff --git a/test/receiver_structured_1_test.ts b/test/receiver_structured_1_test.ts
@@ -1,7 +1,8 @@
 import "mocha";
 import { expect } from "chai";
 
-import { CloudEvent, ValidationError, Version, asBase64 } from "../src";
+import { CloudEvent, ValidationError, Version } from "../src";
+import { asBase64 } from "../src/event/validation";
 import { StructuredHTTPReceiver } from "../src/transport/http/structured_receiver";
 
 const receiver = new StructuredHTTPReceiver(Version.V1);
diff --git a/test/spec_1_tests.ts b/test/spec_1_tests.ts
@@ -1,6 +1,7 @@
 import "mocha";
 import { expect } from "chai";
-import { CloudEvent, Version, ValidationError, asBase64 } from "../src";
+import { CloudEvent, Version, ValidationError } from "../src";
+import { asBase64 } from "../src/event/validation";
 import Constants from "../src/constants";
 
 const id = "97699ec2-a8d9-47c1-bfa0-ff7aa526f838";
