fixing imports wip

tanderson-ld · tanderson-ld · commit 47b6b7066c1d · 2024-09-27T10:12:59.000-05:00
diff --git a/packages/shared/common/src/datasource/DataSourceErrorKinds.ts b/packages/shared/common/src/datasource/DataSourceErrorKinds.ts
diff --git a/packages/shared/common/src/datasource/errors.ts b/packages/shared/common/src/datasource/errors.ts
@@ -35,5 +35,3 @@ export class LDStreamingError extends Error {
     this.recoverable = recoverable;
   }
 }
-
-export type StreamingErrorHandler = (err: LDStreamingError) => void;
diff --git a/packages/shared/common/src/datasource/index.ts b/packages/shared/common/src/datasource/index.ts
@@ -0,0 +1,4 @@
+import { DataSourceErrorKind } from './DataSourceErrorKinds';
+import { LDFileDataSourceError, LDPollingError, LDStreamingError } from './errors';
+
+export { DataSourceErrorKind, LDFileDataSourceError, LDPollingError, LDStreamingError };
diff --git a/packages/shared/common/src/index.ts b/packages/shared/common/src/index.ts
@@ -1,6 +1,7 @@
 import AttributeReference from './AttributeReference';
 import Context from './Context';
 import ContextFilter from './ContextFilter';
+import { DataSourceErrorKind, LDPollingError, LDStreamingError } from './datasource';
 
 export * from './api';
 export * from './validators';
@@ -11,4 +12,11 @@ export * from './utils';
 export * as internal from './internal';
 export * from './errors';
 
-export { AttributeReference, Context, ContextFilter };
+export {
+  AttributeReference,
+  Context,
+  ContextFilter,
+  DataSourceErrorKind,
+  LDPollingError,
+  LDStreamingError,
+};
diff --git a/packages/shared/common/src/internal/datasource/index.ts b/packages/shared/common/src/internal/datasource/index.ts
diff --git a/packages/shared/common/src/internal/index.ts b/packages/shared/common/src/internal/index.ts
@@ -1,5 +1,4 @@
 export * from './context';
-export * from './datasource';
 export * from './diagnostics';
 export * from './evaluation';
 export * from './events';
diff --git a/packages/shared/common/src/internal/stream/StreamingProcessor.test.ts b/packages/shared/common/src/internal/stream/StreamingProcessor.test.ts
@@ -2,9 +2,9 @@ import { createBasicPlatform, createLogger } from '@launchdarkly/private-js-mock
 
 import { EventName, Info, LDLogger, ProcessStreamResponse } from '../../api';
 import { LDStreamProcessor } from '../../api/subsystem';
+import { DataSourceErrorKind } from '../../datasource/DataSourceErrorKinds';
+import { LDStreamingError } from '../../datasource/errors';
 import { defaultHeaders } from '../../utils';
-import { DataSourceErrorKind } from '../datasource/DataSourceErrorKinds';
-import { LDStreamingError } from '../datasource/errors';
 import { DiagnosticsManager } from '../diagnostics';
 import StreamingProcessor from './StreamingProcessor';
 
diff --git a/packages/shared/common/src/internal/stream/StreamingProcessor.ts b/packages/shared/common/src/internal/stream/StreamingProcessor.ts
@@ -7,12 +7,13 @@ import {
   Requests,
 } from '../../api';
 import { LDStreamProcessor } from '../../api/subsystem';
+import { DataSourceErrorKind } from '../../datasource/DataSourceErrorKinds';
+import { LDStreamingError } from '../../datasource/errors';
 import { ClientContext } from '../../options';
 import { getStreamingUri } from '../../options/ServiceEndpoints';
 import { httpErrorMessage, LDHeaders, shouldRetry } from '../../utils';
-import { DataSourceErrorKind } from '../datasource/DataSourceErrorKinds';
-import { LDStreamingError, StreamingErrorHandler } from '../datasource/errors';
 import { DiagnosticsManager } from '../diagnostics';
+import { StreamingErrorHandler } from './types';
 
 const reportJsonError = (
   type: string,
diff --git a/packages/shared/common/src/internal/stream/index.ts b/packages/shared/common/src/internal/stream/index.ts
@@ -1,3 +1,5 @@
 import StreamingProcessor from './StreamingProcessor';
+import type { StreamingErrorHandler } from './types';
 
 export { StreamingProcessor };
+export type { StreamingErrorHandler };
diff --git a/packages/shared/common/src/internal/stream/types.ts b/packages/shared/common/src/internal/stream/types.ts
@@ -0,0 +1,3 @@
+import { LDStreamingError } from '../../datasource/errors';
+
+export type StreamingErrorHandler = (err: LDStreamingError) => void;
diff --git a/packages/shared/mocks/src/streamingProcessor.ts b/packages/shared/mocks/src/streamingProcessor.ts
@@ -1,6 +1,11 @@
-import type { ClientContext, EventName, internal, LDHeaders, ProcessStreamResponse } from '@common';
-
-type LDStreamingError = internal.LDStreamingError;
+import type {
+  ClientContext,
+  EventName,
+  internal,
+  LDHeaders,
+  LDStreamingError,
+  ProcessStreamResponse,
+} from '@common';
 
 export const MockStreamingProcessor = jest.fn();
 
diff --git a/packages/shared/sdk-client/__tests__/datasource/DataSourceStatusManager.test.ts b/packages/shared/sdk-client/__tests__/datasource/DataSourceStatusManager.test.ts
@@ -1,4 +1,4 @@
-import { DataSourceErrorKind } from '@launchdarkly/js-sdk-common/dist/internal';
+import { DataSourceErrorKind } from '@launchdarkly/js-sdk-common';
 
 import { DataSourceState } from '../../src/datasource/DataSourceStatus';
 import DataSourceStatusManager from '../../src/datasource/DataSourceStatusManager';
diff --git a/packages/shared/sdk-client/src/LDEmitter.ts b/packages/shared/sdk-client/src/LDEmitter.ts
@@ -1,6 +1,5 @@
 import { LDLogger } from '@launchdarkly/js-sdk-common';
 
-// TODO: is one emitter with many event names what we want long term?
 export type EventName = 'error' | 'change' | 'dataSourceStatus';
 
 export default class LDEmitter {
diff --git a/packages/shared/sdk-client/src/datasource/DataSourceEventHandler.ts b/packages/shared/sdk-client/src/datasource/DataSourceEventHandler.ts
@@ -1,14 +1,11 @@
-import { Context, internal, LDLogger } from '@launchdarkly/js-sdk-common';
+import { Context, LDLogger, LDPollingError, LDStreamingError } from '@launchdarkly/js-sdk-common';
 
 import { FlagManager } from '../flag-manager/FlagManager';
 import { ItemDescriptor } from '../flag-manager/ItemDescriptor';
 import { DeleteFlag, Flags, PatchFlag } from '../types';
 import { DataSourceState } from './DataSourceStatus';
 import DataSourceStatusManager from './DataSourceStatusManager';
 
-type LDStreamingError = internal.LDStreamingError;
-type LDPollingError = internal.LDPollingError;
-
 export default class DataSourceEventHandler {
   constructor(
     private readonly flagManager: FlagManager,
diff --git a/packages/shared/sdk-client/src/datasource/DataSourceStatusErrorInfo.ts b/packages/shared/sdk-client/src/datasource/DataSourceStatusErrorInfo.ts
@@ -1,6 +1,4 @@
-import { internal } from '@launchdarkly/js-sdk-common';
-
-type DataSourceErrorKind = internal.DataSourceErrorKind;
+import { DataSourceErrorKind } from '@launchdarkly/js-sdk-common';
 
 /// A description of an error condition that the data source encountered.
 export default interface DataSourceStatusErrorInfo {
diff --git a/packages/shared/sdk-client/src/datasource/DataSourceStatusManager.ts b/packages/shared/sdk-client/src/datasource/DataSourceStatusManager.ts
@@ -1,13 +1,7 @@
-import { internal } from '@launchdarkly/js-sdk-common';
-
 import LDEmitter from '../LDEmitter';
 import DataSourceStatus, { DataSourceState } from './DataSourceStatus';
 import DataSourceStatusErrorInfo from './DataSourceStatusErrorInfo';
 
-type DataSourceErrorKind = internal.DataSourceErrorKind;
-
-export type DataSourceStatusCallback = (status: DataSourceStatus) => void;
-
 /**
  * Tracks the current data source status and emits updates when the status changes.
  */
diff --git a/packages/shared/sdk-client/src/index.ts b/packages/shared/sdk-client/src/index.ts
@@ -1,5 +1,6 @@
 import { LDClientInternalOptions } from './configuration/Configuration';
 import DataSourceStatus from './datasource/DataSourceStatus';
+import DataSourceStatusErrorInfo from './datasource/DataSourceStatusErrorInfo';
 import LDClientImpl from './LDClientImpl';
 import LDEmitter from './LDEmitter';
 import Requestor from './polling/Requestor';
@@ -31,4 +32,4 @@ export { DataSourcePaths } from './streaming';
 export { BaseDataManager } from './DataManager';
 export { Requestor };
 
-export { DataSourceStatus, LDClientImpl, LDClientInternalOptions };
+export { DataSourceStatus, DataSourceStatusErrorInfo, LDClientImpl, LDClientInternalOptions };

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,3 @@ export class LDStreamingError extends Error {`
`35`	`35`	`this.recoverable = recoverable;`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-`
`39`		`-export type StreamingErrorHandler = (err: LDStreamingError) => void;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`export * from './context';`
`2`		`-export * from './datasource';`
`3`	`2`	`export * from './diagnostics';`
`4`	`3`	`export * from './evaluation';`
`5`	`4`	`export * from './events';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { LDStreamingError } from '../../datasource/errors';`
	`2`	`+`
	`3`	`+export type StreamingErrorHandler = (err: LDStreamingError) => void;`