From bfc4560a6891336e358270dbb883cfb1b8feb8dc Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 16:20:24 -0500 Subject: [PATCH 01/15] [CI] yml engineering run tests that isolate current deno.json dependencies [CHORE] fmt [FIX] service test that is sensitive to cwd --- .github/workflows/core.yml | 2 +- .github/workflows/jetstream.yml | 2 +- .github/workflows/kv.yml | 2 +- .github/workflows/obj.yml | 2 +- .github/workflows/services.yml | 2 +- .github/workflows/test.yml | 2 +- README.md | 8 +++----- core/deno.json | 3 ++- core/import_map.json | 8 ++++++++ jetstream/deno.json | 12 ++++++++++-- jetstream/import_map.json | 9 +++++++++ jetstream/tests/jscluster_test.ts | 22 ---------------------- kv/deno.json | 8 ++++++-- kv/import_map.json | 12 ++++++++++++ kv/tests/kv_test.ts | 21 +++++++++++++++++++++ obj/deno.json | 7 +++++-- obj/import_map.json | 12 ++++++++++++ services/deno.json | 3 +++ services/import_map.json | 10 ++++++++++ services/tests/service_test.ts | 7 ++++++- 20 files changed, 113 insertions(+), 41 deletions(-) create mode 100644 core/import_map.json create mode 100644 jetstream/import_map.json create mode 100644 kv/import_map.json create mode 100644 obj/import_map.json create mode 100644 services/import_map.json diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index af8ef311..324c4be7 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -1,4 +1,4 @@ -name: core release +name: @nats-io/nats-core release on: push: diff --git a/.github/workflows/jetstream.yml b/.github/workflows/jetstream.yml index 24670ed8..ee751b4e 100644 --- a/.github/workflows/jetstream.yml +++ b/.github/workflows/jetstream.yml @@ -1,4 +1,4 @@ -name: core release +name: @nats-io/jetstream release on: push: diff --git a/.github/workflows/kv.yml b/.github/workflows/kv.yml index d8492471..11b361bf 100644 --- a/.github/workflows/kv.yml +++ b/.github/workflows/kv.yml @@ -1,4 +1,4 @@ -name: core release +name: @nats-io/kv release on: push: diff --git a/.github/workflows/obj.yml b/.github/workflows/obj.yml index f87668ea..38aa1812 100644 --- a/.github/workflows/obj.yml +++ b/.github/workflows/obj.yml @@ -1,4 +1,4 @@ -name: core release +name: @nats-io/obj release on: push: diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index 4b731fd6..f69f1544 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -1,4 +1,4 @@ -name: core release +name: @nats-io/services release on: push: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ee460c2c..7c3dfbbd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: NATS.deno +name: Test nats.js on: push: diff --git a/README.md b/README.md index 77e1caa3..b9ef4ae7 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,13 @@ ![Test NATS.deno](https://github.com/nats-io/nats.deno/workflows/NATS.deno/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/nats-io/nats.deno/badge.svg?branch=main)](https://coveralls.io/github/nats-io/nats.deno?branch=main) - -> [!CAUTION] -> This project is still working in progress and not yet released. Currently supported Javascript are +> [!CAUTION] This project is still working in progress and not yet released. +> Currently supported Javascript are +> > - [nats.deno](https://github.com/nats-io/nats.deno) > - [nats.js](https://github.com/nats-io/nats.js) > - [nats.ws](https://github.com/nats-io/nats.ws) - - Welcome to the new NATS.js repository! Beginning with the v3 release of the JavaScript clients, the NATS.js repository reorganizes the NATS JavaScript client libraries into a formal mono-repo. diff --git a/core/deno.json b/core/deno.json index 5f224c5a..d848ed8d 100644 --- a/core/deno.json +++ b/core/deno.json @@ -12,7 +12,8 @@ ] }, "tasks": { - "clean": "rm -rf ./lib ./cjs ./esm" + "clean": "rm -rf ./lib ./cjs ./esm", + "test": "deno test -A --parallel --reload --quiet tests/ --import-map=./import_map.json" }, "imports": { "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", diff --git a/core/import_map.json b/core/import_map.json new file mode 100644 index 00000000..217cf47b --- /dev/null +++ b/core/import_map.json @@ -0,0 +1,8 @@ +{ + "imports": { + "test_helpers": "../test_helpers/mod.ts", + "@nats-io/nats-core": "./src/mod.ts", + "@nats-io/nats-core/internal": "./src/internal_mod.ts", + "@std/io": "jsr:@std/io@0.224.0" + } +} diff --git a/jetstream/deno.json b/jetstream/deno.json index 1d222efe..05a07bd4 100644 --- a/jetstream/deno.json +++ b/jetstream/deno.json @@ -7,12 +7,20 @@ }, "publish": { "include": [ - "./**/*" + "./src" ], "exclude": [ - "./**/tests" + "./tests", + "./examples", + "./import_map.json", + "./package.json", + "./package.lock", + "./tsconfig.json" ] }, + "tasks": { + "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" + }, "imports": { "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17" } diff --git a/jetstream/import_map.json b/jetstream/import_map.json new file mode 100644 index 00000000..0c384b0d --- /dev/null +++ b/jetstream/import_map.json @@ -0,0 +1,9 @@ +{ + "imports": { + "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", + "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@nats-io/jetstream/internal": "./src/internal_mod.ts", + "test_helpers": "../test_helpers/mod.ts", + "@std/io": "jsr:@std/io@0.224.0" + } +} diff --git a/jetstream/tests/jscluster_test.ts b/jetstream/tests/jscluster_test.ts index 3ce865b5..98dca190 100644 --- a/jetstream/tests/jscluster_test.ts +++ b/jetstream/tests/jscluster_test.ts @@ -8,7 +8,6 @@ import { StreamUpdateConfig, } from "../src/jsapi_types.ts"; import { nanos } from "@nats-io/nats-core/internal"; -import { Kvm } from "../../kv/src/kv.ts"; import { assertArrayIncludes, @@ -173,24 +172,3 @@ Deno.test("streams - mirrors", async () => { await nc.close(); await NatsServer.stopAll(cluster, true); }); - -Deno.test("kv - replicas", async () => { - const servers = await NatsServer.jetstreamCluster(3); - const nc = await connect({ port: servers[0].port }); - const js = jetstream(nc); - - const b = await new Kvm(js).create("a", { replicas: 3 }); - const status = await b.status(); - - const jsm = await jetstreamManager(nc); - let si = await jsm.streams.info(status.streamInfo.config.name); - assertEquals(si.config.num_replicas, 3); - - si = await jsm.streams.update(status.streamInfo.config.name, { - num_replicas: 1, - }); - assertEquals(si.config.num_replicas, 1); - - await nc.close(); - await NatsServer.stopAll(servers, true); -}); diff --git a/kv/deno.json b/kv/deno.json index d56d8e6a..66a073c9 100644 --- a/kv/deno.json +++ b/kv/deno.json @@ -7,12 +7,16 @@ }, "publish": { "include": [ - "./src/*" + "./src" ], "exclude": [ - "./**/tests" + "./tests", + "./import_map.json" ] }, + "tasks": { + "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" + }, "imports": { "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17", "@nats-io/jetstream": "jsr:@nats-io/jetstream@3.0.0-3" diff --git a/kv/import_map.json b/kv/import_map.json new file mode 100644 index 00000000..7d49bdf0 --- /dev/null +++ b/kv/import_map.json @@ -0,0 +1,12 @@ +{ + "imports": { + "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@3.0.0-17/internal", + "@nats-io/jetstream": "jsr:@nats-io/jetstream@3.0.0-3", + "@nats-io/jetstream/internal": "jsr:@nats-io/jetstream@3.0.0-3/internal", + "test_helpers": "../test_helpers/mod.ts", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", + "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@std/io": "jsr:@std/io@0.224.0" + } +} diff --git a/kv/tests/kv_test.ts b/kv/tests/kv_test.ts index 2e957e1c..220d149a 100644 --- a/kv/tests/kv_test.ts +++ b/kv/tests/kv_test.ts @@ -2248,3 +2248,24 @@ Deno.test("kv - keys filter", async () => { await cleanup(ns, nc); }); + +Deno.test("kv - replicas", async () => { + const servers = await NatsServer.jetstreamCluster(3); + const nc = await connect({ port: servers[0].port }); + const js = jetstream(nc); + + const b = await new Kvm(js).create("a", { replicas: 3 }); + const status = await b.status(); + + const jsm = await jetstreamManager(nc); + let si = await jsm.streams.info(status.streamInfo.config.name); + assertEquals(si.config.num_replicas, 3); + + si = await jsm.streams.update(status.streamInfo.config.name, { + num_replicas: 1, + }); + assertEquals(si.config.num_replicas, 1); + + await nc.close(); + await NatsServer.stopAll(servers, true); +}); diff --git a/obj/deno.json b/obj/deno.json index 41168a0b..5ae59bc1 100644 --- a/obj/deno.json +++ b/obj/deno.json @@ -7,12 +7,15 @@ }, "publish": { "include": [ - "./src/*" + "./src" ], "exclude": [ - "./**/tests" + "./tests" ] }, + "tasks": { + "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" + }, "imports": { "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17", "@nats-io/jetstream": "jsr:@nats-io/jetstream@3.0.0-3" diff --git a/obj/import_map.json b/obj/import_map.json new file mode 100644 index 00000000..7d49bdf0 --- /dev/null +++ b/obj/import_map.json @@ -0,0 +1,12 @@ +{ + "imports": { + "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@3.0.0-17/internal", + "@nats-io/jetstream": "jsr:@nats-io/jetstream@3.0.0-3", + "@nats-io/jetstream/internal": "jsr:@nats-io/jetstream@3.0.0-3/internal", + "test_helpers": "../test_helpers/mod.ts", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", + "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@std/io": "jsr:@std/io@0.224.0" + } +} diff --git a/services/deno.json b/services/deno.json index 0047855d..01baaaa5 100644 --- a/services/deno.json +++ b/services/deno.json @@ -13,6 +13,9 @@ "./tests" ] }, + "tasks": { + "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" + }, "imports": { "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17" } diff --git a/services/import_map.json b/services/import_map.json new file mode 100644 index 00000000..ba1cd488 --- /dev/null +++ b/services/import_map.json @@ -0,0 +1,10 @@ +{ + "imports": { + "@nats-io/nats-core": "jsr:@nats-io/nats-core@3.0.0-17", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@3.0.0-17/internal", + "test_helpers": "../test_helpers/mod.ts", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", + "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@std/io": "jsr:@std/io@0.224.0" + } +} diff --git a/services/tests/service_test.ts b/services/tests/service_test.ts index beab78d6..61570c20 100644 --- a/services/tests/service_test.ts +++ b/services/tests/service_test.ts @@ -700,10 +700,15 @@ Deno.test("service - cross platform service test", async () => { }, }); + // running from root? + const scheck = Deno.cwd().endsWith("nats.js") + ? "./services/tests/service-check.ts" + : "./tests/service-check.ts"; + const args = [ "run", "-A", - "./services/tests/service-check.ts", + scheck, "--name", name, "--server", From 2534ed0883234abaad4b5752ea4783d3177e7b95 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 16:22:38 -0500 Subject: [PATCH 02/15] fix workflow names --- .github/workflows/core.yml | 2 +- .github/workflows/jetstream.yml | 2 +- .github/workflows/kv.yml | 2 +- .github/workflows/obj.yml | 2 +- .github/workflows/services.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 324c4be7..2687ccde 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -1,4 +1,4 @@ -name: @nats-io/nats-core release +name: nats-core release on: push: diff --git a/.github/workflows/jetstream.yml b/.github/workflows/jetstream.yml index ee751b4e..bd283b28 100644 --- a/.github/workflows/jetstream.yml +++ b/.github/workflows/jetstream.yml @@ -1,4 +1,4 @@ -name: @nats-io/jetstream release +name: jetstream release on: push: diff --git a/.github/workflows/kv.yml b/.github/workflows/kv.yml index 11b361bf..9ea431a0 100644 --- a/.github/workflows/kv.yml +++ b/.github/workflows/kv.yml @@ -1,4 +1,4 @@ -name: @nats-io/kv release +name: kv release on: push: diff --git a/.github/workflows/obj.yml b/.github/workflows/obj.yml index 38aa1812..e4b44a52 100644 --- a/.github/workflows/obj.yml +++ b/.github/workflows/obj.yml @@ -1,4 +1,4 @@ -name: @nats-io/obj release +name: obj release on: push: diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index f69f1544..ea8abc3e 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -1,4 +1,4 @@ -name: @nats-io/services release +name: services release on: push: From 9d2df764bec66200f75ce72e904bd0279f50fcf1 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 16:29:14 -0500 Subject: [PATCH 03/15] build missing ngs_ci_user --- core/tests/basics_test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tests/basics_test.ts b/core/tests/basics_test.ts index b83119d3..f5ed63f4 100644 --- a/core/tests/basics_test.ts +++ b/core/tests/basics_test.ts @@ -958,7 +958,7 @@ Deno.test("basics - subscription cb with timeout cancels on message", async () = Deno.test("basics - resolve", async () => { const token = Deno.env.get("NGS_CI_USER"); - if (token === undefined) { + if (!token) { disabled( `skipping: NGS_CI_USER is not available in the environment`, ); From c139b0dc9327c9dd7fa44425c0598859e611e92c Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 16:36:45 -0500 Subject: [PATCH 04/15] fmt/import type --- core/src/queued_iterator.ts | 3 ++- core/tests/auth_test.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/queued_iterator.ts b/core/src/queued_iterator.ts index c9b7fa5b..59a05e8a 100644 --- a/core/src/queued_iterator.ts +++ b/core/src/queued_iterator.ts @@ -15,7 +15,8 @@ import type { Deferred } from "./util.ts"; import { deferred } from "./util.ts"; import type { QueuedIterator } from "./core.ts"; -import { CallbackFn, Dispatcher, ErrorCode, NatsError } from "./core.ts"; +import { ErrorCode, NatsError } from "./core.ts"; +import type { CallbackFn, Dispatcher } from "./core.ts"; export type IngestionFilterFnResult = { ingest: boolean; protocol: boolean }; diff --git a/core/tests/auth_test.ts b/core/tests/auth_test.ts index d5503b75..f8910668 100644 --- a/core/tests/auth_test.ts +++ b/core/tests/auth_test.ts @@ -28,7 +28,7 @@ import { encodeOperator, encodeUser, } from "jsr:@nats-io/jwt@0.0.9-3"; -import { +import type { MsgImpl, NatsConnection, NatsConnectionImpl, From d6e90a5328ed66adf4c8d2aa6c78ae021535fdd7 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 16:50:07 -0500 Subject: [PATCH 05/15] [CI] download server on module checks [TEST] simplified tests --- .github/workflows/core.yml | 10 ++++++++++ .github/workflows/jetstream.yml | 10 ++++++++++ .github/workflows/kv.yml | 10 ++++++++++ .github/workflows/obj.yml | 10 ++++++++++ .github/workflows/services.yml | 10 ++++++++++ core/tests/basics_test.ts | 24 +++--------------------- 6 files changed, 53 insertions(+), 21 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 2687ccde..aac884a1 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -30,6 +30,16 @@ jobs: with: deno-version: ${{ matrix.deno-version }} + - name: Set NATS Server Version + run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV + + - name: Get nats-server + run: | + wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip + unzip tmp.zip + mv nats-server-$NATS_VERSION-linux-amd64 nats-server + rm nats-server/README.md LICENSE + - name: Lint Deno Module working-directory: core run: | diff --git a/.github/workflows/jetstream.yml b/.github/workflows/jetstream.yml index bd283b28..fdc2ff58 100644 --- a/.github/workflows/jetstream.yml +++ b/.github/workflows/jetstream.yml @@ -27,6 +27,16 @@ jobs: with: deno-version: ${{ matrix.deno-version }} + - name: Set NATS Server Version + run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV + + - name: Get nats-server + run: | + wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip + unzip tmp.zip + mv nats-server-$NATS_VERSION-linux-amd64 nats-server + rm nats-server/README.md LICENSE + - name: Lint Deno Module working-directory: jetstream run: | diff --git a/.github/workflows/kv.yml b/.github/workflows/kv.yml index 9ea431a0..181888e8 100644 --- a/.github/workflows/kv.yml +++ b/.github/workflows/kv.yml @@ -27,6 +27,16 @@ jobs: with: deno-version: ${{ matrix.deno-version }} + - name: Set NATS Server Version + run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV + + - name: Get nats-server + run: | + wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip + unzip tmp.zip + mv nats-server-$NATS_VERSION-linux-amd64 nats-server + rm nats-server/README.md LICENSE + - name: Lint Deno Module working-directory: kv run: | diff --git a/.github/workflows/obj.yml b/.github/workflows/obj.yml index e4b44a52..4414fc29 100644 --- a/.github/workflows/obj.yml +++ b/.github/workflows/obj.yml @@ -27,6 +27,16 @@ jobs: with: deno-version: ${{ matrix.deno-version }} + - name: Set NATS Server Version + run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV + + - name: Get nats-server + run: | + wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip + unzip tmp.zip + mv nats-server-$NATS_VERSION-linux-amd64 nats-server + rm nats-server/README.md LICENSE + - name: Lint Deno Module working-directory: obj run: | diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index ea8abc3e..a4df4e39 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -27,6 +27,16 @@ jobs: with: deno-version: ${{ matrix.deno-version }} + - name: Set NATS Server Version + run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV + + - name: Get nats-server + run: | + wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip + unzip tmp.zip + mv nats-server-$NATS_VERSION-linux-amd64 nats-server + rm nats-server/README.md LICENSE + - name: Lint Deno Module working-directory: services run: | diff --git a/core/tests/basics_test.ts b/core/tests/basics_test.ts index f5ed63f4..ff6465f7 100644 --- a/core/tests/basics_test.ts +++ b/core/tests/basics_test.ts @@ -957,17 +957,8 @@ Deno.test("basics - subscription cb with timeout cancels on message", async () = }); Deno.test("basics - resolve", async () => { - const token = Deno.env.get("NGS_CI_USER"); - if (!token) { - disabled( - `skipping: NGS_CI_USER is not available in the environment`, - ); - return; - } - const nci = await connect({ - servers: "connect.ngs.global", - authenticator: jwtAuthenticator(token), + servers: "demo.nats.io", }) as NatsConnectionImpl; await nci.flush(); @@ -1502,18 +1493,9 @@ Deno.test("basics - respond message", async () => { await cleanup(ns, nc); }); -Deno.test("basics - resolve", async () => { - const token = Deno.env.get("NGS_CI_USER"); - if (token === undefined) { - disabled( - `skipping: NGS_CI_USER is not available in the environment`, - ); - return; - } - +Deno.test("basics - resolve false", async () => { const nci = await connect({ - servers: "connect.ngs.global", - authenticator: jwtAuthenticator(token), + servers: "demo.nats.io", resolve: false, }) as NatsConnectionImpl; From e45f2bec73a66041e572443556cfad7d012b7422 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 16:52:37 -0500 Subject: [PATCH 06/15] [LINT] removed unused import --- core/tests/basics_test.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/tests/basics_test.ts b/core/tests/basics_test.ts index ff6465f7..bc68d547 100644 --- a/core/tests/basics_test.ts +++ b/core/tests/basics_test.ts @@ -35,7 +35,6 @@ import { headers, isIP, JSONCodec, - jwtAuthenticator, nuid, RequestStrategy, StringCodec, @@ -55,7 +54,6 @@ import { _setup, assertErrorCode, cleanup, - disabled, Lock, NatsServer, } from "test_helpers"; From b4bdb69d41e1d18c8e49bb1fe733e6837da2f45e Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 17:04:24 -0500 Subject: [PATCH 07/15] [CI] install nats-server binary in path --- .github/workflows/core.yml | 13 ++++--------- test_helpers/launcher.ts | 3 ++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index aac884a1..69e4b721 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -30,15 +30,10 @@ jobs: with: deno-version: ${{ matrix.deno-version }} - - name: Set NATS Server Version - run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV - - - name: Get nats-server - run: | - wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip - unzip tmp.zip - mv nats-server-$NATS_VERSION-linux-amd64 nats-server - rm nats-server/README.md LICENSE + - name: Install nats-server + uses: sigoden/install-binary@v1 + with: + repo: nats-io/nats-server - name: Lint Deno Module working-directory: core diff --git a/test_helpers/launcher.ts b/test_helpers/launcher.ts index 2df836c8..05ac86f4 100644 --- a/test_helpers/launcher.ts +++ b/test_helpers/launcher.ts @@ -678,7 +678,8 @@ export class NatsServer implements PortInfo { } static async start(conf?: any, debug = false): Promise { - const exe = Deno.env.get("CI") ? "nats-server/nats-server" : "nats-server"; + // const exe = Deno.env.get("CI") ? "nats-server/nats-server" : "nats-server"; + const exe = "nats-server"; const tmp = resolve(Deno.env.get("TMPDIR") || "."); conf = NatsServer.confDefaults(conf); conf.ports_file_dir = tmp; From a5dd3546e91be72cc69b3d0d79a565cbced77ddc Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 17:25:48 -0500 Subject: [PATCH 08/15] [CI] install nats-server binary in path --- .github/workflows/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 69e4b721..7c1c3197 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -4,6 +4,7 @@ on: push: paths: - 'core/**' + - '.github/workflows/core.yml' tags: [ 'core/*' ] branches: - '*' From 01273c55032b0731e3e8782e54ef529d65ba8ddd Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 17:28:10 -0500 Subject: [PATCH 09/15] [CI] install nats-server binary in path --- .github/workflows/core.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 7c1c3197..059bad7e 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -35,6 +35,7 @@ jobs: uses: sigoden/install-binary@v1 with: repo: nats-io/nats-server + name: nats-server-*-linux-amd64.zip - name: Lint Deno Module working-directory: core From c6956728de799e097a901b1d0261b9548fe31463 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Tue, 2 Jul 2024 18:19:08 -0500 Subject: [PATCH 10/15] binname --- .github/workflows/core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 059bad7e..e434ac75 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -35,7 +35,7 @@ jobs: uses: sigoden/install-binary@v1 with: repo: nats-io/nats-server - name: nats-server-*-linux-amd64.zip + name: nats-server - name: Lint Deno Module working-directory: core From b0522609d4bcae886f3c7676a4af7693d7ffb892 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Wed, 3 Jul 2024 08:34:43 -0500 Subject: [PATCH 11/15] [CI] install nats-server binary in path --- .github/workflows/core.yml | 4 +++- .github/workflows/jetstream.yml | 15 ++++++--------- .github/workflows/kv.yml | 15 ++++++--------- .github/workflows/obj.yml | 15 ++++++--------- .github/workflows/services.yml | 7 +++++++ .github/workflows/test.yml | 16 +++++++--------- 6 files changed, 35 insertions(+), 37 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index e434ac75..b09e9306 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -32,16 +32,18 @@ jobs: deno-version: ${{ matrix.deno-version }} - name: Install nats-server - uses: sigoden/install-binary@v1 + uses: aricart/install-binary@v1.0.0 with: repo: nats-io/nats-server name: nats-server + cache: true - name: Lint Deno Module working-directory: core run: | deno fmt --check deno lint + - name: Test Deno Module working-directory: core env: diff --git a/.github/workflows/jetstream.yml b/.github/workflows/jetstream.yml index fdc2ff58..3ed6bdb0 100644 --- a/.github/workflows/jetstream.yml +++ b/.github/workflows/jetstream.yml @@ -27,15 +27,12 @@ jobs: with: deno-version: ${{ matrix.deno-version }} - - name: Set NATS Server Version - run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV - - - name: Get nats-server - run: | - wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip - unzip tmp.zip - mv nats-server-$NATS_VERSION-linux-amd64 nats-server - rm nats-server/README.md LICENSE + - name: Install nats-server + uses: aricart/install-binary@v1.0.0 + with: + repo: nats-io/nats-server + name: nats-server + cache: true - name: Lint Deno Module working-directory: jetstream diff --git a/.github/workflows/kv.yml b/.github/workflows/kv.yml index 181888e8..40be3906 100644 --- a/.github/workflows/kv.yml +++ b/.github/workflows/kv.yml @@ -27,15 +27,12 @@ jobs: with: deno-version: ${{ matrix.deno-version }} - - name: Set NATS Server Version - run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV - - - name: Get nats-server - run: | - wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip - unzip tmp.zip - mv nats-server-$NATS_VERSION-linux-amd64 nats-server - rm nats-server/README.md LICENSE + - name: Install nats-server + uses: aricart/install-binary@v1.0.0 + with: + repo: nats-io/nats-server + name: nats-server + cache: true - name: Lint Deno Module working-directory: kv diff --git a/.github/workflows/obj.yml b/.github/workflows/obj.yml index 4414fc29..256a9635 100644 --- a/.github/workflows/obj.yml +++ b/.github/workflows/obj.yml @@ -27,15 +27,12 @@ jobs: with: deno-version: ${{ matrix.deno-version }} - - name: Set NATS Server Version - run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV - - - name: Get nats-server - run: | - wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip - unzip tmp.zip - mv nats-server-$NATS_VERSION-linux-amd64 nats-server - rm nats-server/README.md LICENSE + - name: Install nats-server + uses: aricart/install-binary@v1.0.0 + with: + repo: nats-io/nats-server + name: nats-server + cache: true - name: Lint Deno Module working-directory: obj diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index a4df4e39..9f186ac2 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -27,6 +27,13 @@ jobs: with: deno-version: ${{ matrix.deno-version }} + - name: Install nats-server + uses: aricart/install-binary@v1.0.0 + with: + repo: nats-io/nats-server + name: nats-server + cache: true + - name: Set NATS Server Version run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7c3dfbbd..64ed40ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,20 +29,18 @@ jobs: with: deno-version: ${{ matrix.deno-version }} - - name: Set NATS Server Version - run: echo "NATS_VERSION=v2.10.17" >> $GITHUB_ENV - # this here because dns seems to be wedged on gha # - name: Add hosts to /etc/hosts # run: | # sudo echo "145.40.102.131 demo.nats.io" | sudo tee -a /etc/hosts - - name: Get nats-server - run: | - wget "https://github.com/nats-io/nats-server/releases/download/$NATS_VERSION/nats-server-$NATS_VERSION-linux-amd64.zip" -O tmp.zip - unzip tmp.zip - mv nats-server-$NATS_VERSION-linux-amd64 nats-server - rm nats-server/README.md LICENSE + + - name: Install nats-server + uses: aricart/install-binary@v1.0.0 + with: + repo: nats-io/nats-server + name: nats-server + cache: true - name: Lint Deno Module run: | From 7b4505554fb90d4444c7532c0c09052989b67e89 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Wed, 3 Jul 2024 09:07:38 -0500 Subject: [PATCH 12/15] [CI] run modules tests in matrix --- .github/workflows/core.yml | 6 ++--- .github/workflows/jetstream.yml | 6 ++--- .github/workflows/kv.yml | 6 ++--- .github/workflows/obj.yml | 6 ++--- .github/workflows/services.yml | 6 ++--- .github/workflows/test.yml | 40 +++++++++++++++++---------------- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index b09e9306..27b0495f 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -10,19 +10,19 @@ on: - '*' jobs: test: - name: ${{ matrix.config.kind }} ${{ matrix.config.os }} + name: test core with released dependencies runs-on: ubuntu-latest-4-cores environment: CI strategy: matrix: - deno-version: [1.44.4] + deno-version: [1.x.x] permissions: contents: read id-token: write steps: - name: Git Checkout Core - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/jetstream.yml b/.github/workflows/jetstream.yml index 3ed6bdb0..7c08c2a2 100644 --- a/.github/workflows/jetstream.yml +++ b/.github/workflows/jetstream.yml @@ -9,16 +9,16 @@ on: - '*' jobs: test: - name: ${{ matrix.config.kind }} ${{ matrix.config.os }} + name: test jetstream with released dependencies runs-on: ubuntu-latest-4-cores environment: CI strategy: matrix: - deno-version: [1.44.4] + deno-version: [1.x.x] steps: - name: Git Checkout JetStream - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/kv.yml b/.github/workflows/kv.yml index 40be3906..c8c562d5 100644 --- a/.github/workflows/kv.yml +++ b/.github/workflows/kv.yml @@ -9,16 +9,16 @@ on: - '*' jobs: test: - name: ${{ matrix.config.kind }} ${{ matrix.config.os }} + name: test kv with released dependencies runs-on: ubuntu-latest-4-cores environment: CI strategy: matrix: - deno-version: [1.44.4] + deno-version: [1.x.x] steps: - name: Git Checkout Kv - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/obj.yml b/.github/workflows/obj.yml index 256a9635..f1ed1f73 100644 --- a/.github/workflows/obj.yml +++ b/.github/workflows/obj.yml @@ -9,16 +9,16 @@ on: - '*' jobs: test: - name: ${{ matrix.config.kind }} ${{ matrix.config.os }} + name: test obj with released dependencies runs-on: ubuntu-latest-4-cores environment: CI strategy: matrix: - deno-version: [1.44.4] + deno-version: [1.x.x] steps: - name: Git Checkout Obj - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index 9f186ac2..27fea9c4 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -9,16 +9,16 @@ on: - '*' jobs: test: - name: ${{ matrix.config.kind }} ${{ matrix.config.os }} + name: test services with released dependencies runs-on: ubuntu-latest-4-cores environment: CI strategy: matrix: - deno-version: [1.44.4] + deno-version: [1.x.x] steps: - name: Git Checkout Services - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 64ed40ff..d20710cf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,19 +8,22 @@ on: - '*' pull_request: branches: [main] + types: [opened, edited, reopened] jobs: test: - name: ${{ matrix.config.kind }} ${{ matrix.config.os }} - runs-on: ubuntu-latest-4-cores - environment: CI strategy: matrix: - deno-version: [1.44.4] + deno-version: [ 1.44.4 ] + module: [ core, jetstream, kv, obj, services ] + + name: test ${{matrix.module}} with local dependencies + runs-on: ubuntu-latest-4-cores + environment: CI steps: - name: Git Checkout Deno Module - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -34,7 +37,6 @@ jobs: # run: | # sudo echo "145.40.102.131 demo.nats.io" | sudo tee -a /etc/hosts - - name: Install nats-server uses: aricart/install-binary@v1.0.0 with: @@ -47,23 +49,23 @@ jobs: deno fmt --check deno lint - - name: Test Deno Module + - name: Test ${{matrix.module}} Module env: TMPDIR: ${{ runner.temp }} CI: true NGS_CI_USER: ${{ secrets.NGS_CI_USER }} run: | - deno task test - - - name: Build nats.js - run: deno bundle --unstable transport-deno/src/connect.ts nats.js + deno task test-${{ matrix.module }} - - name: Generate lcov - run: deno coverage --unstable --lcov ./coverage > cov.lcov - - - name: Upload coverage - uses: coverallsapp/github-action@1.1.3 - with: - github-token: ${{ secrets.github_token }} - path-to-lcov: ./cov.lcov +# - name: Build nats.js +# run: deno bundle --unstable transport-deno/src/connect.ts nats.js +# +# - name: Generate lcov +# run: deno coverage --unstable --lcov ./coverage > cov.lcov +# +# - name: Upload coverage +# uses: coverallsapp/github-action@1.1.3 +# with: +# github-token: ${{ secrets.github_token }} +# path-to-lcov: ./cov.lcov From 4b1872580e7d8520d039ea97a2fa52c4509270ae Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Wed, 3 Jul 2024 10:26:47 -0500 Subject: [PATCH 13/15] [CI] prevent rerun on comment updates --- .github/workflows/jetstream.yml | 1 + .github/workflows/kv.yml | 1 + .github/workflows/obj.yml | 1 + .github/workflows/services.yml | 1 + .github/workflows/test.yml | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jetstream.yml b/.github/workflows/jetstream.yml index 7c08c2a2..ec9921b7 100644 --- a/.github/workflows/jetstream.yml +++ b/.github/workflows/jetstream.yml @@ -4,6 +4,7 @@ on: push: paths: - 'jetstream/**' + - '.github/workflows/jetstream.yml' tags: [ 'jetstream/*' ] branches: - '*' diff --git a/.github/workflows/kv.yml b/.github/workflows/kv.yml index c8c562d5..b0de62c6 100644 --- a/.github/workflows/kv.yml +++ b/.github/workflows/kv.yml @@ -4,6 +4,7 @@ on: push: paths: - 'kv/**' + - '.github/workflows/kv.yml' tags: [ 'kv/*' ] branches: - '*' diff --git a/.github/workflows/obj.yml b/.github/workflows/obj.yml index f1ed1f73..92d8ff84 100644 --- a/.github/workflows/obj.yml +++ b/.github/workflows/obj.yml @@ -4,6 +4,7 @@ on: push: paths: - 'obj/**' + - '.github/workflows/obj.yml' tags: [ 'obj/*' ] branches: - '*' diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index 27fea9c4..762fe1b1 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -4,6 +4,7 @@ on: push: paths: - 'services/**' + - '.github/workflows/services.yml' tags: [ 'services/*' ] branches: - '*' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d20710cf..31a5c724 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: - '*' pull_request: branches: [main] - types: [opened, edited, reopened] + types: [opened] jobs: test: From bb2df9a9023e9fede958f980eba4137b8ee20956 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Wed, 3 Jul 2024 10:41:22 -0500 Subject: [PATCH 14/15] [FIX] linter warnings --- deno.json | 11 +++++++-- jetstream/examples/07_consume_jobs.ts | 3 ++- .../examples/js_readme_publish_examples.ts | 3 ++- jetstream/examples/util.ts | 3 ++- jetstream/tests/jscluster_test.ts | 3 +-- obj/src/objectstore.ts | 24 ++++++++++++------- obj/src/types.ts | 4 ++-- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/deno.json b/deno.json index a3a86927..ebfe377f 100644 --- a/deno.json +++ b/deno.json @@ -14,13 +14,20 @@ "test-kv": "deno test -A --parallel --reload --quiet --coverage=coverage kv/tests", "test-obj": "deno test -A --parallel --reload --quiet --coverage=coverage obj/tests", "test-services": "deno test -A --parallel --reload --quiet --coverage=coverage services/tests", - "cover": "deno coverage --unstable ./coverage --lcov > ./coverage/out.lcov && genhtml -o ./coverage/html ./coverage/out.lcov && open ./coverage/html/index.html" + "cover": "deno coverage --unstable ./coverage --lcov > ./coverage/out.lcov && genhtml -o ./coverage/html ./coverage/out.lcov && open ./coverage/html/index.html", + "lint": "deno task lint-core && deno task lint-jetstream && deno task lint-kv && deno task lint-obj && deno task lint-services && deno task lint-test_helpers", + "lint-core": "cd core && deno lint", + "lint-jetstream": "cd jetstream && deno lint", + "lint-kv": "cd kv && deno lint", + "lint-obj": "cd obj && deno lint", + "lint-services": "cd services && deno lint", + "lint-test_helpers": "cd test_helpers && deno lint" }, "fmt": { "include": ["src/", "doc/", "bin/", "core/", "debug/", "jetstream/", "kv/", "obj/", "services/", "*.md"] }, "lint": { - "include": ["src/", "doc/", "bin/", "core/", "jetstream/", "kv/", "obj/", "services/", "*.md"] + "exclude": ["docs/"] }, "scopes": { "*": { diff --git a/jetstream/examples/07_consume_jobs.ts b/jetstream/examples/07_consume_jobs.ts index 0dbe2d43..f6dc5e53 100644 --- a/jetstream/examples/07_consume_jobs.ts +++ b/jetstream/examples/07_consume_jobs.ts @@ -15,7 +15,8 @@ import { connect, delay } from "jsr:@nats-io/nats-transport-deno@3.0.0-5"; import { SimpleMutex } from "jsr:@nats-io/nats-core@3.0.0-17/internal"; -import { jetstream, JsMsg } from "../src/mod.ts"; +import { jetstream } from "../src/mod.ts"; +import type { JsMsg } from "../src/mod.ts"; import { setupStreamAndConsumer } from "./util.ts"; // create a connection diff --git a/jetstream/examples/js_readme_publish_examples.ts b/jetstream/examples/js_readme_publish_examples.ts index 38b0ab50..c36725d8 100644 --- a/jetstream/examples/js_readme_publish_examples.ts +++ b/jetstream/examples/js_readme_publish_examples.ts @@ -1,5 +1,6 @@ import { connect, Empty } from "jsr:@nats-io/nats-transport-deno@3.0.0-5"; -import { jetstream, jetstreamManager, PubAck } from "../src/mod.ts"; +import { jetstream, jetstreamManager } from "../src/mod.ts"; +import type { PubAck } from "../src/mod.ts"; const nc = await connect(); const jsm = await jetstreamManager(nc); diff --git a/jetstream/examples/util.ts b/jetstream/examples/util.ts index 491f5710..67b29c8d 100644 --- a/jetstream/examples/util.ts +++ b/jetstream/examples/util.ts @@ -14,7 +14,8 @@ */ import { createConsumer, fill, initStream } from "../tests/jstest_util.ts"; -import { NatsConnection, nuid } from "jsr:@nats-io/nats-core@3.0.0-17"; +import type { NatsConnection } from "jsr:@nats-io/nats-core@3.0.0-17"; +import { nuid } from "jsr:@nats-io/nats-core@3.0.0-17"; export async function setupStreamAndConsumer( nc: NatsConnection, diff --git a/jetstream/tests/jscluster_test.ts b/jetstream/tests/jscluster_test.ts index 98dca190..ecb9899a 100644 --- a/jetstream/tests/jscluster_test.ts +++ b/jetstream/tests/jscluster_test.ts @@ -4,9 +4,8 @@ import { DiscardPolicy, RetentionPolicy, StorageType, - StreamConfig, - StreamUpdateConfig, } from "../src/jsapi_types.ts"; +import type { StreamConfig, StreamUpdateConfig } from "../src/jsapi_types.ts"; import { nanos } from "@nats-io/nats-core/internal"; import { diff --git a/obj/src/objectstore.ts b/obj/src/objectstore.ts index 5059c31d..ce08d3ec 100644 --- a/obj/src/objectstore.ts +++ b/obj/src/objectstore.ts @@ -20,40 +20,46 @@ import { Feature, headers, JSONCodec, + nuid, + QueuedIteratorImpl, + SHA256, +} from "@nats-io/nats-core/internal"; + +import type { MsgHdrs, MsgHdrsImpl, NatsConnection, NatsError, - nuid, QueuedIterator, - QueuedIteratorImpl, - SHA256, } from "@nats-io/nats-core/internal"; import { consumerOpts, DiscardPolicy, + JsHeaders, + ListerImpl, + PubHeaders, + StoreCompression, + toJetStreamClient, +} from "@nats-io/jetstream/internal"; + +import type { JetStreamClient, JetStreamClientImpl, JetStreamManager, - JsHeaders, JsMsg, Lister, ListerFieldFilter, - ListerImpl, PubAck, - PubHeaders, PurgeResponse, StorageType, - StoreCompression, StreamConfig, StreamInfo, StreamInfoRequestOptions, StreamListResponse, - toJetStreamClient, } from "@nats-io/jetstream/internal"; -import { +import type { ObjectInfo, ObjectResult, ObjectStore, diff --git a/obj/src/types.ts b/obj/src/types.ts index c1864c1d..14efccb9 100644 --- a/obj/src/types.ts +++ b/obj/src/types.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { +import type { Placement, PubAck, PurgeResponse, @@ -20,7 +20,7 @@ import { StreamInfo, StreamInfoRequestOptions, } from "@nats-io/jetstream"; -import { MsgHdrs, Nanos, QueuedIterator } from "@nats-io/nats-core"; +import type { MsgHdrs, Nanos, QueuedIterator } from "@nats-io/nats-core"; export type ObjectStoreLink = { /** From 67ee054a85e922bb0f3b89e3a23c0b61a3907fde Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Wed, 3 Jul 2024 10:44:44 -0500 Subject: [PATCH 15/15] made makefile use deno tasks --- Makefile | 17 +++++------------ deno.json | 2 +- obj/src/objectstore.ts | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 80b1372c..46a234d4 100644 --- a/Makefile +++ b/Makefile @@ -3,23 +3,16 @@ build: test lint: - deno lint --ignore=docs/,debug/ + deno lint test: clean - deno test --allow-all --parallel --reload --quiet --coverage=coverage core/tests/ jetstream/tests kv/tests/ obj/tests/ services/tests/ - deno test --allow-all --parallel --reload --quiet --unsafely-ignore-certificate-errors --coverage=coverage core/unsafe_tests/ - - -testw: clean - deno test --allow-all --unstable --reload --parallel --watch --fail-fast tests/ jetstream/ kv/tests/ obj/tests/ services/tests/ + deno task test cover: - deno coverage --unstable ./coverage --lcov > ./coverage/out.lcov - genhtml -o ./coverage/html ./coverage/out.lcov - open ./coverage/html/index.html + deno task cover clean: - rm -rf ./coverage + deno task clean bundle: deno bundle --log-level info --unstable src/mod.ts ./nats.js @@ -30,4 +23,4 @@ bundle: fmt: - deno fmt transport-deno/ doc/ bin/ core/ examples/ tests/ debug/ unsafe_tests/ jetstream/ kv/ obj/ services/ test_helpers/ jetstream.md README.md migration.md services.md + deno fmt \ No newline at end of file diff --git a/deno.json b/deno.json index ebfe377f..8d77635b 100644 --- a/deno.json +++ b/deno.json @@ -14,7 +14,7 @@ "test-kv": "deno test -A --parallel --reload --quiet --coverage=coverage kv/tests", "test-obj": "deno test -A --parallel --reload --quiet --coverage=coverage obj/tests", "test-services": "deno test -A --parallel --reload --quiet --coverage=coverage services/tests", - "cover": "deno coverage --unstable ./coverage --lcov > ./coverage/out.lcov && genhtml -o ./coverage/html ./coverage/out.lcov && open ./coverage/html/index.html", + "cover": "deno coverage ./coverage --lcov > ./coverage/out.lcov && genhtml -o ./coverage/html ./coverage/out.lcov && open ./coverage/html/index.html", "lint": "deno task lint-core && deno task lint-jetstream && deno task lint-kv && deno task lint-obj && deno task lint-services && deno task lint-test_helpers", "lint-core": "cd core && deno lint", "lint-jetstream": "cd jetstream && deno lint", diff --git a/obj/src/objectstore.ts b/obj/src/objectstore.ts index ce08d3ec..ee235118 100644 --- a/obj/src/objectstore.ts +++ b/obj/src/objectstore.ts @@ -20,6 +20,7 @@ import { Feature, headers, JSONCodec, + MsgHdrsImpl, nuid, QueuedIteratorImpl, SHA256, @@ -27,7 +28,6 @@ import { import type { MsgHdrs, - MsgHdrsImpl, NatsConnection, NatsError, QueuedIterator,