jsr dependencies

Author: aricart

service/deno.json

@@ -0,0 +1,19 @@
+{
+  "name": "@nats-io/services",
+  "version": "3.0.0-1",
+  "exports": {
+    ".": "./mod.ts",
+    "./internal": "./internal_mod.ts"
+  },
+  "publish": {
+    "include": [
+      "./**/*"
+    ],
+    "exclude": [
+      "./**/tests"
+    ]
+  },
+  "imports": {
+    "jsr:@nats-io/nats-core": "jsr:@nats-io/[email protected]"
+  }
+}

service/internal_mod.ts

@@ -1,10 +1,10 @@
-import {
+import type {
   NatsConnection,
   RequestManyOptions,
-} from "../nats-base-client/core.ts";
+} from "jsr:@nats-io/nats-core@3.0.0-14";
 import { ServiceImpl } from "./service.ts";
 import { ServiceClientImpl } from "./serviceclient.ts";
-import { Service, ServiceClient, ServiceConfig } from "./types.ts";
+import type { Service, ServiceClient, ServiceConfig } from "./types.ts";
 
 export type {
   Endpoint,

service/service.ts

@@ -12,16 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { deferred, nanos } from "../nats-base-client/util.ts";
-import type { Deferred } from "../nats-base-client/util.ts";
-import { headers } from "../nats-base-client/headers.ts";
-import { JSONCodec } from "../nats-base-client/codec.ts";
-import { nuid } from "../nats-base-client/nuid.ts";
-import { QueuedIteratorImpl } from "../nats-base-client/queued_iterator.ts";
-import { validateName } from "../jetstream/jsutil.ts";
-import { parseSemVer } from "../nats-base-client/semver.ts";
-import { Empty } from "../nats-base-client/encoders.ts";
 import {
+  deferred,
+  Empty,
+  headers,
+  JSONCodec,
+  nanos,
+  nuid,
+  parseSemVer,
+  QueuedIteratorImpl,
+} from "jsr:@nats-io/[email protected]/internal";
+import type {
+  Deferred,
   Msg,
   MsgHdrs,
   Nanos,
@@ -32,27 +34,58 @@ import {
   QueuedIterator,
   ReviverFn,
   Sub,
-} from "../nats-base-client/core.ts";
+} from "jsr:@nats-io/[email protected]/internal";
+
 import {
+  ServiceError,
+  ServiceErrorCodeHeader,
+  ServiceErrorHeader,
+  ServiceResponseType,
+  ServiceVerb,
+} from "./types.ts";
+
+import type {
   Endpoint,
   EndpointInfo,
   EndpointOptions,
   NamedEndpointStats,
   Service,
   ServiceConfig,
-  ServiceError,
-  ServiceErrorCodeHeader,
-  ServiceErrorHeader,
   ServiceGroup,
   ServiceHandler,
   ServiceIdentity,
   ServiceInfo,
   ServiceMsg,
-  ServiceResponseType,
   ServiceStats,
-  ServiceVerb,
 } from "./types.ts";
 
+function validateName(context: string, name = "") {
+  if (name === "") {
+    throw Error(`${context} name required`);
+  }
+  const m = validName(name);
+  if (m.length) {
+    throw new Error(`invalid ${context} name - ${context} name ${m}`);
+  }
+}
+
+function validName(name = ""): string {
+  if (name === "") {
+    throw Error(`name required`);
+  }
+  const RE = /^[-\w]+$/g;
+  const m = name.match(RE);
+  if (m === null) {
+    for (const c of name.split("")) {
+      const mm = c.match(RE);
+      if (mm === null) {
+        return `cannot contain '${c}'`;
+      }
+    }
+  }
+  return "";
+}
+
 /**
  * Services have common backplane subject pattern:
  *

service/serviceclient.ts

@@ -12,19 +12,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Empty } from "../nats-base-client/encoders.ts";
-import { JSONCodec } from "../nats-base-client/codec.ts";
-import { QueuedIteratorImpl } from "../nats-base-client/queued_iterator.ts";
-import { RequestStrategy } from "../nats-base-client/core.ts";
+import {
+  Empty,
+  JSONCodec,
+  QueuedIteratorImpl,
+  RequestStrategy,
+} from "jsr:@nats-io/[email protected]/internal";
 
 import type {
   NatsConnection,
   QueuedIterator,
   RequestManyOptions,
-} from "../nats-base-client/mod.ts";
+} from "jsr:@nats-io/nats-[email protected]/internal";
 
 import { ServiceImpl } from "./service.ts";
-
 import { ServiceVerb } from "./types.ts";
 
 import type {

service/tests/service-check.ts

@@ -14,20 +14,17 @@
  */
 
 import { cli } from "https://deno.land/x/[email protected]/mod.ts";
-import { connect, StringCodec } from "../../src/mod.ts";
-import type { NatsConnection } from "../../src/mod.ts";
+import { connect, StringCodec } from "jsr:@nats-io/[email protected]";
+import type { NatsConnection } from "jsr:@nats-io/[email protected]";
+import { collect, parseSemVer } from "jsr:@nats-io/[email protected]/internal";
 
 import type { ServiceIdentity, ServiceInfo, ServiceStats } from "../mod.ts";
-
 import { ServiceError, ServiceResponseType, ServiceVerb, Svc } from "../mod.ts";
 
-import { collect } from "../../nats-base-client/util.ts";
-import { ServiceClientImpl } from "../serviceclient.ts";
+import type { ServiceClientImpl } from "../serviceclient.ts";
 import Ajv from "npm:ajv";
 import type { JSONSchemaType, ValidateFunction } from "npm:ajv";
 
-import { parseSemVer } from "../../nats-base-client/semver.ts";
-
 const ajv = new Ajv();
 
 const root = cli({

service/tests/service_test.ts

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { cleanup, setup } from "../../tests/helpers/mod.ts";
+import { cleanup, setup } from "../../src/tests/helpers/mod.ts";
 import { ServiceImpl } from "../service.ts";
 import {
   assert,
@@ -22,10 +22,13 @@ import {
   assertRejects,
   assertThrows,
   fail,
-} from "https://deno.land/[email protected]/assert/mod.ts";
+} from "jsr:@std/assert";
 
-import { collect, delay } from "../../nats-base-client/util.ts";
-import { NatsConnectionImpl } from "../../nats-base-client/nats.ts";
+import { collect, delay } from "jsr:@nats-io/[email protected]/internal";
+import type {
+  NatsConnectionImpl,
+  SubscriptionImpl,
+} from "jsr:@nats-io/[email protected]/internal";
 import type {
   EndpointInfo,
   Service,
@@ -57,7 +60,6 @@ import type {
   NatsError,
   QueuedIterator,
 } from "../../src/mod.ts";
-import { SubscriptionImpl } from "../../nats-base-client/protocol.ts";
 
 Deno.test("service - control subject", () => {
   const test = (verb: ServiceVerb) => {

service/types.ts

@@ -4,7 +4,7 @@ import {
   NatsError,
   PublishOptions,
   QueuedIterator,
-} from "../nats-base-client/core.ts";
+} from "jsr:@nats-io/nats-core@3.0.0-14";
 
 export interface ServiceMsg extends Msg {
   respondError(