removed circular dependency

service/internal_mod.ts

@@ -1,3 +1,11 @@
+import {
+  NatsConnection,
+  RequestManyOptions,
+} from "../nats-base-client/core.ts";
+import { ServiceImpl } from "./service.ts";
+import { ServiceClientImpl } from "./serviceclient.ts";
+import { Service, ServiceClient, ServiceConfig } from "./types.ts";
+
 export type {
   Endpoint,
   EndpointInfo,
@@ -24,4 +32,23 @@ export {
   ServiceVerb,
 } from "./types.ts";
 
-export { Svc } from "./service.ts";
+export class Svc {
+  nc: NatsConnection;
+
+  constructor(nc: NatsConnection) {
+    this.nc = nc;
+  }
+
+  add(config: ServiceConfig): Promise<Service> {
+    try {
+      const s = new ServiceImpl(this.nc, config);
+      return s.start();
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  client(opts?: RequestManyOptions, prefix?: string): ServiceClient {
+    return new ServiceClientImpl(this.nc, opts, prefix);
+  }
+}

service/mod.ts

@@ -24,4 +24,4 @@ export {
   ServiceVerb,
 } from "./internal_mod.ts";
 
-export { Svc } from "./service.ts";
+export { Svc } from "./internal_mod.ts";

service/service.ts

@@ -29,18 +29,15 @@ import {
   Payload,
   PublishOptions,
   QueuedIterator,
-  RequestManyOptions,
   ReviverFn,
   Sub,
 } from "../nats-base-client/core.ts";
-import { ServiceClientImpl } from "./serviceclient.ts";
 import {
   Endpoint,
   EndpointInfo,
   EndpointOptions,
   NamedEndpointStats,
   Service,
-  ServiceClient,
   ServiceConfig,
   ServiceError,
   ServiceErrorCodeHeader,
@@ -66,26 +63,6 @@ import {
  */
 export const ServiceApiPrefix = "$SRV";
 
-export class Svc {
-  nc: NatsConnection;
-  constructor(nc: NatsConnection) {
-    this.nc = nc;
-  }
-
-  add(config: ServiceConfig): Promise<Service> {
-    try {
-      const s = new ServiceImpl(this.nc, config);
-      return s.start();
-    } catch (err) {
-      return Promise.reject(err);
-    }
-  }
-
-  client(opts?: RequestManyOptions, prefix?: string): ServiceClient {
-    return new ServiceClientImpl(this.nc, opts, prefix);
-  }
-}
-
 export class ServiceMsgImpl implements ServiceMsg {
   msg: Msg;
   constructor(msg: Msg) {

service/tests/service-check.ts

@@ -23,14 +23,14 @@ import {
   ServiceResponseType,
   ServiceStats,
   ServiceVerb,
+  Svc,
 } from "../mod.ts";
 
 import { collect } from "../../nats-base-client/util.ts";
 import { ServiceClientImpl } from "../serviceclient.ts";
 import Ajv, { JSONSchemaType, ValidateFunction } from "npm:ajv";
 
 import { parseSemVer } from "../../nats-base-client/semver.ts";
-import { Svc } from "../service.ts";
 
 const ajv = new Ajv();
 

service/tests/service_test.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import { cleanup, setup } from "../../tests/helpers/mod.ts";
-import { ServiceImpl, Svc } from "../service.ts";
+import { ServiceImpl } from "../service.ts";
 import {
   assert,
   assertArrayIncludes,
@@ -38,6 +38,7 @@ import {
   ServiceResponseType,
   ServiceStats,
   ServiceVerb,
+  Svc,
 } from "../types.ts";
 import {
   connect,