core packaging for cjs

Author: aricart

bin/cjs-fix-imports.ts

@@ -7,25 +7,19 @@ import {
 } from "https://deno.land/std@0.136.0/path/mod.ts";
 
 const argv = parseArgs(
-  Deno.args,
-  {
-    alias: {
-      o: ["out"],
+    Deno.args,
+    {
+      alias: {
+        o: ["out"],
+      },
+      boolean: true,
+      string: ["out"],
+      default: {
+        o: "lib",
+      },
     },
-    boolean: true,
-    string: ["out"],
-    default: {
-      o: "lib",
-    },
-  },
 );
 
-const libs = {
-  "jsr:@nats-io/nkeys": "@nats-io/nkeys",
-  "jsr:@nats-io/nuid": "@nats-io/nuid"
-}
-
-
 
 
 // resolve the specified directories to fq
@@ -57,22 +51,23 @@ if (argv.debug) {
 
 if (!dirs.length || argv.h || argv.help) {
   console.log(
-    `deno run --allow-all cjs-fix-imports [--debug] [--out build/] dir/ dir2/`,
+      `deno run --allow-all cjs-fix-imports [--debug] [--out build/] dir/ dir2/`,
   );
   Deno.exit(1);
 }
 
 // create out if not exist
 await Deno.lstat(out)
-  .catch(async () => {
-    await Deno.mkdir(out);
-  });
+    .catch(async () => {
+      await Deno.mkdir(out);
+    });
 
 // process each file - remove extensions from requires/import
 for (const fn of files) {
   const data = await Deno.readFile(fn);
   let txt = new TextDecoder().decode(data);
 
+
   let mod = txt.replace(/jsr:@nats-io\/nkeys/gim, "nkeys.js");
   mod = mod.replace(/jsr:@nats-io\/nuid/gim, "nuid");
   if(!fn.endsWith("nkeys.ts") && !fn.endsWith("nuid.ts")) {

nats-base-client/package.json

@@ -1,33 +1,30 @@
 {
-  "name": "nats-core",
-  "version": "3.0.0-14",
+  "name": "@nats-io/nats-core",
+  "version": "3.0.0-16",
   "files": [
     "lib/",
     "esm/"
   ],
   "types": "./lib/mod.d.js",
   "exports": {
-    ".": {
-      "require": "./lib/mod.js",
-      "module": "./esm/mod.mjs"
-    },
-    "./internal": {
-      "require": "./lib/internal_mod.js",
-      "module": "./esm/internal_mod.mjs"
-    }
+    ".": "./lib/mod.js",
+    "./internal": "./lib/internal_mod.js"
   },
+  "license": "Apache-2.0",
+  "private": false,
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "shx rm -Rf ./lib ./cjs ./esm && shx mkdir esm",
-    "pre-process": "npm run clean && deno run -A ../bin/cjs-fix-imports.ts -o ./cjs .",
+    "pre-process": "npm run clean && deno run -A bin/cjs-fix-imports.ts -o ./cjs ./src",
     "build-cjs": "npm run pre-process && tsc",
-    "build-esm": "deno bundle mod.ts esm/mod.mjs && deno bundle internal_mod.ts esm/internal_mod.mjs",
-    "build": "npm run build-cjs && npm run build-esm"
+    "build": "npm run build-cjs",
+    "prepack": "npm run build"
   },
   "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
+  "author": {
+    "name": "The NATS Authors"
+  },
+  "description": "nats-core library - this library implements all the base functionality for NATS javascript clients",
   "dependencies": {
     "nkeys.js": "^1.1.0",
     "nuid": "^2.0.0",

nats-base-client/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "module": "Node16",
+    "module": "nodenext",
     "outDir": "lib/",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "sourceMap": true,
     "declaration": true,
     "allowJs": true,
@@ -12,4 +12,4 @@
   "include": [
     "cjs/**/*"
   ]
-}
+}

test_helpers/connect.ts

@@ -0,0 +1 @@
+export {connect} from "jsr:@nats-io/nats-transport-deno@3.0.0-2";

test_helpers/mod.ts

@@ -25,7 +25,8 @@ import {
 
 import { NatsServer } from "./launcher.ts";
 import { red, yellow } from "jsr:@std/fmt/colors";
-import { connect } from "../src/mod.ts";
+import { connect } from "./connect.ts";
+export { connect } from "./connect.ts";
 import {ConnectFn} from "../nats-base-client/core.ts";
 export { check } from "./check.ts";
 export { Lock } from "./lock.ts";
@@ -57,8 +58,8 @@ export function jsopts() {
 }
 
 export function jetstreamExportServerConf(
-  opts: unknown = {},
-  prefix = "IPA.>",
+    opts: unknown = {},
+    prefix = "IPA.>",
 ): Record<string, unknown> {
   const template = {
     "no_auth_user": "a",
@@ -87,7 +88,7 @@ export function jetstreamExportServerConf(
 }
 
 export function jetstreamServerConf(
-  opts: unknown = {},
+    opts: unknown = {},
 ): Record<string, unknown> {
   const conf = Object.assign(jsopts(), opts);
   if (typeof conf.jetstream.store_dir !== "string") {
@@ -107,15 +108,15 @@ export async function _setup(fn: ConnectFn, serverConf?: Record<string, unknown>
 }
 
 export function setup(
-  serverConf?: Record<string, unknown>,
-  clientOpts?: Partial<ConnectionOptions>,
+    serverConf?: Record<string, unknown>,
+    clientOpts?: Partial<ConnectionOptions>,
 ): Promise<{ ns: NatsServer; nc: NatsConnection }> {
   return _setup(connect, serverConf, clientOpts);
 }
 
 export async function cleanup(
-  ns: NatsServer,
-  ...nc: NatsConnection[]
+    ns: NatsServer,
+    ...nc: NatsConnection[]
 ): Promise<void> {
   const conns: Promise<void>[] = [];
   nc.forEach((v) => {
@@ -126,16 +127,16 @@ export async function cleanup(
 }
 
 export async function notCompatible(
-  ns: NatsServer,
-  nc: NatsConnection,
-  version?: string,
+    ns: NatsServer,
+    nc: NatsConnection,
+    version?: string,
 ): Promise<boolean> {
   version = version ?? "2.3.3";
   const varz = await ns.varz() as unknown as Record<string, string>;
   const sv = parseSemVer(varz.version);
   if (compare(sv, parseSemVer(version)) < 0) {
     const m = new TextEncoder().encode(yellow(
-      `skipping test as server (${varz.version}) doesn't implement required feature from ${version} `,
+        `skipping test as server (${varz.version}) doesn't implement required feature from ${version} `,
     ));
     await Deno.stdout.write(m);
     await cleanup(ns, nc);