fix: import path fixes

dereekb · Jun 9, 2022 · 0b72558 · 0b72558
1 parent 376af8c
commit 0b72558
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/packages/date/src/lib/date/date.time.ts b/packages/date/src/lib/date/date.time.ts
@@ -1,9 +1,9 @@
-import { guessCurrentTimezone } from '@dereekb/date';
 import { parse, differenceInMinutes, isValid, addHours, startOfDay } from 'date-fns';
 import { formatInTimeZone } from 'date-fns-tz';
 import { isLogicalDateStringCode, LogicalDateStringCode, Maybe, ReadableTimeString, TimeAM, TimezoneString, UTC_TIMEZONE_STRING, dateFromLogicalDate } from '@dereekb/util';
 import { LimitDateTimeConfig, LimitDateTimeInstance } from './date.time.limit';
 import { DateTimezoneConversionConfig, DateTimezoneUtcNormalInstance, isSameDateTimezoneConversionConfig, systemNormalDateToBaseDate } from './date.timezone';
+import { guessCurrentTimezone } from './date';
 
 export interface ParsedTimeString {
   /**

diff --git a/packages/date/src/lib/expires/expires.rxjs.ts b/packages/date/src/lib/expires/expires.rxjs.ts
@@ -1,7 +1,6 @@
-import { timeHasExpired } from '@dereekb/date';
 import { Milliseconds, DateOrUnixDateTimeNumber } from '@dereekb/util';
 import { filter, map, MonoTypeOperatorFunction, Observable, OperatorFunction, skipWhile, switchMap, takeWhile } from 'rxjs';
-import { hasExpired, toExpires, Expires } from './expires';
+import { hasExpired, toExpires, Expires, timeHasExpired } from './expires';
 
 /**
  * Creates a new Expires object at the current time on emission that will expire in the set amount of time.

diff --git a/packages/rxjs/src/lib/rxjs/map.ts b/packages/rxjs/src/lib/rxjs/map.ts
@@ -1,7 +1,6 @@
-import { asObservable } from '@dereekb/rxjs';
 import { map, OperatorFunction, switchMap, shareReplay } from 'rxjs';
 import { MapKeysIntersectionObject, mapKeysIntersectionObjectToArray } from '@dereekb/util';
-import { ObservableOrValue } from './getter';
+import { asObservable, ObservableOrValue } from './getter';
 
 /**
  * OperatorFunction that pipes the input from the object with a keys observable to produce the result of mapKeysIntersectionObjectToArray.

diff --git a/packages/rxjs/src/lib/work/work.instance.ts b/packages/rxjs/src/lib/work/work.instance.ts
@@ -1,8 +1,7 @@
-import { loadingStateHasFinishedLoading, filterMaybe } from '@dereekb/rxjs';
 import { Maybe, Destroyable, ReadableError, ErrorInput } from '@dereekb/util';
 import { filter, map, BehaviorSubject, Observable, of, first, shareReplay, switchMap, delay } from 'rxjs';
-import { beginLoading, errorResult, LoadingState, loadingStateIsLoading, successResult } from '../loading';
-import { preventComplete } from '../rxjs';
+import { beginLoading, errorResult, LoadingState, loadingStateHasFinishedLoading, loadingStateIsLoading, successResult } from '../loading';
+import { filterMaybe, preventComplete } from '../rxjs';
 import { SubscriptionObject } from '../subscription';
 
 /**

diff --git a/packages/util/src/lib/model/model.modify.ts b/packages/util/src/lib/model/model.modify.ts
@@ -1,7 +1,6 @@
-import { MaybeMap } from '@dereekb/util';
 import { ArrayOrValue, asArray } from '../array/array';
 import { filterMaybeValues } from '../array/array.value';
-import { Maybe } from '../value/maybe.type';
+import { Maybe, MaybeMap } from '../value/maybe.type';
 import { maybeMergeModifiers, ModifierFunction } from '../value/modifier';
 import { ModelConversionOptions, ModelMapFunction, ModelMapFunctions } from './model.conversion';
 

diff --git a/packages/util/src/lib/number/factory.ts b/packages/util/src/lib/number/factory.ts
@@ -1,5 +1,4 @@
-import { asGetter, GetterOrValue } from '@dereekb/util';
-import { Factory } from './../getter/getter';
+import { asGetter, Factory, GetterOrValue } from './../getter/getter';
 
 /**
  * incrementingNumberFactory() configuration.

diff --git a/packages/util/src/lib/promise/poll.ts b/packages/util/src/lib/promise/poll.ts
@@ -1,4 +1,4 @@
-import { performTaskLoop } from '@dereekb/util';
+import { performTaskLoop } from './promise.loop';
 import { waitForMs } from './wait';
 
 export interface PollConfig {

diff --git a/packages/util/src/lib/service/handler.ts b/packages/util/src/lib/service/handler.ts
@@ -1,6 +1,9 @@
 import { PrimativeKey, ReadKeyFunction } from './../key';
 import { ArrayOrValue } from './../array/array';
-import { Maybe, PromiseOrValue, setKeysOnMap, build } from '@dereekb/util';
+import { build } from '../value/build';
+import { Maybe } from '../value/maybe.type';
+import { PromiseOrValue } from '../promise/promise';
+import { setKeysOnMap } from '../map/map';
 
 /**
  * Key used to signify