fix: 🐛 update imports

streamich · streamich · commit ddc9a46c5582 · 2024-10-06T15:57:00.000+02:00
diff --git a/src/__demos__/json-crdt-server/routes/block/methods/get.ts b/src/__demos__/json-crdt-server/routes/block/methods/get.ts
@@ -1,4 +1,4 @@
-import type {ResolveType} from 'json-joy/lib/json-type';
+import type {ResolveType} from '@jsonjoy.com/json-type';
 import {BlockIdRef, BlockRef} from '../schema';
 import type {RouteDeps, Router, RouterBase} from '../../types';
 
diff --git a/src/__demos__/json-crdt-server/routes/block/methods/upd.ts b/src/__demos__/json-crdt-server/routes/block/methods/upd.ts
@@ -1,4 +1,4 @@
-import type {ResolveType} from 'json-joy/lib/json-type';
+import type {ResolveType} from '@jsonjoy.com/json-type';
 import {
   BlockBatchPartialRef,
   BlockBatchPartialReturnRef,
diff --git a/src/__demos__/json-crdt-server/routes/block/methods/view.ts b/src/__demos__/json-crdt-server/routes/block/methods/view.ts
@@ -1,4 +1,4 @@
-import type {ResolveType} from 'json-joy/lib/json-type';
+import type {ResolveType} from '@jsonjoy.com/json-type';
 import {BlockIdRef} from '../schema';
 import type {RouteDeps, Router, RouterBase} from '../../types';
 
diff --git a/src/__demos__/json-crdt-server/routes/block/schema.ts b/src/__demos__/json-crdt-server/routes/block/schema.ts
@@ -1,5 +1,5 @@
 import {t} from '../system';
-import type {ResolveType} from 'json-joy/lib/json-type';
+import type {ResolveType} from '@jsonjoy.com/json-type';
 
 export const BlockId = t.str.options({
   title: 'Block ID',
diff --git a/src/__demos__/json-crdt-server/routes/index.ts b/src/__demos__/json-crdt-server/routes/index.ts
@@ -3,7 +3,7 @@ import {RpcError} from '../../../common/rpc/caller';
 import {RpcValue} from '../../../common/messages/Value';
 import {ObjectValueCaller} from '../../../common/rpc/caller/ObjectValueCaller';
 import {system} from './system';
-import {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
+import {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
 import {Services} from '../services/Services';
 import {MemoryStore} from '../services/blocks/store/MemoryStore';
 import {LevelStore} from '../services/blocks/store/level/LevelStore';
diff --git a/src/__demos__/json-crdt-server/routes/presence/methods/update.ts b/src/__demos__/json-crdt-server/routes/presence/methods/update.ts
@@ -1,4 +1,4 @@
-import type {ResolveType} from 'json-joy/lib/json-type';
+import type {ResolveType} from '@jsonjoy.com/json-type';
 import type {PresenceEntry} from '../schema';
 import type {RouteDeps, Router, RouterBase} from '../../types';
 
diff --git a/src/__demos__/json-crdt-server/routes/presence/schema.ts b/src/__demos__/json-crdt-server/routes/presence/schema.ts
@@ -1,4 +1,4 @@
-import type {ResolveType} from 'json-joy/lib/json-type';
+import type {ResolveType} from '@jsonjoy.com/json-type';
 import {t} from '../system';
 
 export const PresenceEntry = t.Object(
diff --git a/src/__demos__/json-crdt-server/routes/routes.ts b/src/__demos__/json-crdt-server/routes/routes.ts
@@ -3,8 +3,8 @@ import {pubsub} from './pubsub';
 import {presence} from './presence';
 import {block} from './block';
 import type {RouteDeps} from './types';
-import type {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
-import type {ObjectType} from 'json-joy/lib/json-type';
+import type {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
+import type {ObjectType} from '@jsonjoy.com/json-type';
 
 // biome-ignore format: each on its own line
 export const routes = (d: RouteDeps) => <R extends ObjectType<any>>(r: ObjectValue<R>) =>
diff --git a/src/__demos__/json-crdt-server/routes/system.ts b/src/__demos__/json-crdt-server/routes/system.ts
@@ -1,4 +1,4 @@
-import {TypeSystem} from 'json-joy/lib/json-type';
+import {TypeSystem} from '@jsonjoy.com/json-type';
 
 export const system = new TypeSystem();
 export const t = system.t;
diff --git a/src/__demos__/json-crdt-server/routes/types.ts b/src/__demos__/json-crdt-server/routes/types.ts
@@ -1,6 +1,6 @@
-import type {ObjectType, TypeSystem} from 'json-joy/lib/json-type';
-import type {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
-import type {TypeBuilder} from 'json-joy/lib/json-type/type/TypeBuilder';
+import type {ObjectType, TypeSystem} from '@jsonjoy.com/json-type';
+import type {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
+import type {TypeBuilder} from '@jsonjoy.com/json-type/lib/type/TypeBuilder';
 import type {Services} from '../services/Services';
 
 export interface RouteDeps {
diff --git a/src/common/codec/json-rpc-2/schema.ts b/src/common/codec/json-rpc-2/schema.ts
@@ -1,4 +1,4 @@
-import {type ResolveType, TypeSystem} from 'json-joy/lib/json-type';
+import {type ResolveType, TypeSystem} from '@jsonjoy.com/json-type';
 
 export const system = new TypeSystem();
 const t = system.t;
diff --git a/src/common/messages/Value.ts b/src/common/messages/Value.ts
@@ -1,5 +1,5 @@
-import {Value as V} from 'json-joy/lib/json-type-value/Value';
-import type {Type} from 'json-joy/lib/json-type';
+import {Value as V} from '@jsonjoy.com/json-type/lib/value/Value';
+import type {Type} from '@jsonjoy.com/json-type';
 
 /**
  * @deprecated Use `Value` directly.
diff --git a/src/common/rpc/__tests__/RpcMessageStreamProcessor.spec.ts b/src/common/rpc/__tests__/RpcMessageStreamProcessor.spec.ts
@@ -14,7 +14,7 @@ import {
 } from '../../messages';
 import {until} from 'thingies';
 import {RpcValue} from '../../messages/Value';
-import {t} from 'json-joy/lib/json-type';
+import {t} from '@jsonjoy.com/json-type';
 import {Defer} from '../../../util/Defer';
 
 const setup = (
diff --git a/src/common/rpc/__tests__/sample-api.ts b/src/common/rpc/__tests__/sample-api.ts
@@ -1,7 +1,7 @@
 import {timer, from, Observable} from 'rxjs';
 import {map, switchMap, take} from 'rxjs/operators';
 import type {IStaticRpcMethod, IStreamingRpcMethod} from '../types';
-import {t} from 'json-joy/lib/json-type';
+import {t} from '@jsonjoy.com/json-type';
 import {RpcError} from '../caller';
 import {ApiRpcCaller} from '../caller/ApiRpcCaller';
 
diff --git a/src/common/rpc/caller/ObjectValueCaller.ts b/src/common/rpc/caller/ObjectValueCaller.ts
@@ -1,13 +1,13 @@
 import {RpcError} from './error/RpcError';
 import {RpcCaller, type RpcApiCallerOptions} from './RpcCaller';
-import {type AbstractType, FunctionStreamingType, FunctionType} from 'json-joy/lib/json-type/type/classes';
+import {type AbstractType, FunctionStreamingType, FunctionType} from '@jsonjoy.com/json-type/lib/type/classes';
 import {printTree} from 'sonic-forest/lib/print/printTree';
 import {StaticRpcMethod, type StaticRpcMethodOptions} from '../methods/StaticRpcMethod';
 import {StreamingRpcMethod, type StreamingRpcMethodOptions} from '../methods/StreamingRpcMethod';
-import type {ObjectType, Schema, TypeSystem, ObjectFieldType, TypeOf, SchemaOf, Type} from 'json-joy/lib/json-type';
+import type {ObjectType, Schema, TypeSystem, ObjectFieldType, TypeOf, SchemaOf, Type} from '@jsonjoy.com/json-type';
 import type {Printable} from 'sonic-forest/lib/print/types';
-import type {ObjectValue, UnObjectType, UnObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
-import type {Value} from 'json-joy/lib/json-type-value/Value';
+import type {ObjectValue, UnObjectType, UnObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
+import type {Value} from '@jsonjoy.com/json-type/lib/value/Value';
 import type {Observable} from 'rxjs';
 import type {RpcValue} from '../../messages/Value';
 
diff --git a/src/common/rpc/caller/TypeRouterCaller.ts b/src/common/rpc/caller/TypeRouterCaller.ts
@@ -1,11 +1,11 @@
 import {RpcError} from './error/RpcError';
 import {RpcCaller, type RpcApiCallerOptions} from './RpcCaller';
-import {type AbstractType, FunctionStreamingType, FunctionType} from 'json-joy/lib/json-type/type/classes';
+import {type AbstractType, FunctionStreamingType, FunctionType} from '@jsonjoy.com/json-type/lib/type/classes';
 import {StaticRpcMethod, type StaticRpcMethodOptions} from '../methods/StaticRpcMethod';
 import {StreamingRpcMethod, type StreamingRpcMethodOptions} from '../methods/StreamingRpcMethod';
 import {TypedRpcError} from './error/typed';
-import type {Schema, SchemaOf, TypeOf, TypeSystem} from 'json-joy/lib/json-type';
-import type {TypeRouter} from 'json-joy/lib/json-type/system/TypeRouter';
+import type {Schema, SchemaOf, TypeOf, TypeSystem} from '@jsonjoy.com/json-type';
+import type {TypeRouter} from '@jsonjoy.com/json-type/lib/system/TypeRouter';
 import type {RpcValue} from '../../messages/Value';
 import type {Observable} from 'rxjs';
 
diff --git a/src/common/rpc/caller/TypedApiCaller.ts b/src/common/rpc/caller/TypedApiCaller.ts
@@ -1,10 +1,10 @@
 import {RpcErrorCodes} from './error/RpcError';
 import {TypedRpcError} from './error/typed';
 import {RpcCaller, type RpcApiCallerOptions} from './RpcCaller';
-import {FunctionStreamingType, FunctionType} from 'json-joy/lib/json-type/type/classes';
+import {FunctionStreamingType, FunctionType} from '@jsonjoy.com/json-type/lib/type/classes';
 import {StaticRpcMethod, type StaticRpcMethodOptions} from '../methods/StaticRpcMethod';
 import {StreamingRpcMethod, type StreamingRpcMethodOptions} from '../methods/StreamingRpcMethod';
-import type {SchemaOf, TypeMap, TypeOf, TypeSystem} from 'json-joy/lib/json-type';
+import type {SchemaOf, TypeMap, TypeOf, TypeSystem} from '@jsonjoy.com/json-type';
 
 export interface TypedApiCallerOptions<Ctx = unknown> extends Omit<RpcApiCallerOptions<Ctx>, 'getMethod'> {
   system: TypeSystem;
diff --git a/src/common/rpc/caller/__tests__/ObjectValueCaller.spec.ts b/src/common/rpc/caller/__tests__/ObjectValueCaller.spec.ts
@@ -1,5 +1,5 @@
-import {TypeSystem} from 'json-joy/lib/json-type';
-import {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
+import {TypeSystem} from '@jsonjoy.com/json-type';
+import {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
 import {ObjectValueCaller} from '../ObjectValueCaller';
 
 test('can execute simple calls', async () => {
diff --git a/src/common/rpc/caller/error/RpcErrorType.ts b/src/common/rpc/caller/error/RpcErrorType.ts
@@ -1,4 +1,4 @@
-import {type ResolveType, t} from 'json-joy/lib/json-type';
+import {type ResolveType, t} from '@jsonjoy.com/json-type';
 
 /**
  * @protected
diff --git a/src/common/rpc/methods/StaticRpcMethod.ts b/src/common/rpc/methods/StaticRpcMethod.ts
@@ -1,6 +1,6 @@
 import {firstValueFrom, from} from 'rxjs';
 import type {IRpcMethodBase, IStaticRpcMethod} from './types';
-import type {ConstSchema} from 'json-joy/lib/json-type';
+import type {ConstSchema} from '@jsonjoy.com/json-type';
 
 export interface StaticRpcMethodOptions<Ctx = unknown, Req = unknown, Res = unknown>
   extends Omit<IRpcMethodBase<Ctx, Req, Res>, 'isStreaming' | 'call$'> {}
diff --git a/src/common/rpc/methods/types.ts b/src/common/rpc/methods/types.ts
@@ -1,5 +1,5 @@
 import type {Observable} from 'rxjs';
-import type {Type} from 'json-joy/lib/json-type';
+import type {Type} from '@jsonjoy.com/json-type';
 
 export interface IRpcMethodBase<Ctx = unknown, Req = unknown, Res = unknown> {
   /**
diff --git a/src/common/types.ts b/src/common/types.ts
@@ -1,7 +1,7 @@
 import type {Observable} from 'rxjs';
-import type {FunctionStreamingType, FunctionType, ResolveType} from 'json-joy/lib/json-type';
-import type {ObjectValue, ObjectValueToTypeMap, UnObjectType} from 'json-joy/lib/json-type-value/ObjectValue';
-import type {TypeRouter} from 'json-joy/lib/json-type/system/TypeRouter';
+import type {FunctionStreamingType, FunctionType, ResolveType} from '@jsonjoy.com/json-type';
+import type {ObjectValue, ObjectValueToTypeMap, UnObjectType} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
+import type {TypeRouter} from '@jsonjoy.com/json-type/lib/system/TypeRouter';
 import type {ObjectValueCaller} from './rpc/caller/ObjectValueCaller';
 import type {RpcCaller} from './rpc/caller/RpcCaller';
 import type {TypeRouterCaller} from './rpc/caller/TypeRouterCaller';
diff --git a/src/server/http1/RpcServer.ts b/src/server/http1/RpcServer.ts
@@ -15,8 +15,8 @@ import type {RpcCaller} from '../../common/rpc/caller/RpcCaller';
 import type {ServerLogger} from './types';
 import type {ConnectionContext} from '../types';
 import {ObjectValueCaller} from '../../common/rpc/caller/ObjectValueCaller';
-import type {ObjectValue} from 'json-joy/lib/json-type-value/ObjectValue';
-import type {ObjectType} from 'json-joy/lib/json-type/type/classes';
+import type {ObjectValue} from '@jsonjoy.com/json-type/lib/value/ObjectValue';
+import type {ObjectType} from '@jsonjoy.com/json-type/lib/type/classes';
 import {gzip} from '@jsonjoy.com/util/lib/compression/gzip';
 
 const DEFAULT_MAX_PAYLOAD = 4 * 1024 * 1024;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type {ResolveType} from 'json-joy/lib/json-type';`
	`1`	`+import type {ResolveType} from '@jsonjoy.com/json-type';`
`2`	`2`	`import {BlockIdRef, BlockRef} from '../schema';`
`3`	`3`	`import type {RouteDeps, Router, RouterBase} from '../../types';`
`4`	`4`