Skip to content

Commit

Permalink
Merge branch 'release/2.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
msqr committed May 13, 2024
2 parents 244a7c5 + 568a973 commit 3ac0849
Show file tree
Hide file tree
Showing 21 changed files with 89 additions and 43 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up Node 17
uses: actions/setup-node@v3
uses: actions/checkout@v4
- name: Set up Node 20
uses: actions/setup-node@v4
with:
node-version: 17
node-version: 20
- name: Install dependencies
run: npm install
- name: Run tests and collect coverage
run: npm run coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: unittests
Expand Down
7 changes: 0 additions & 7 deletions lib/net/datumMetadataUrlHelperMixin.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@ declare const DatumMetadataUrlHelperMixin: <T extends UrlHelperConstructor>(supe
env(key: string, newValue: any): import("./environment.js").EnvironmentConfig & import("./environment.js").HostConfig;
parameter(key: string): any;
parameter(key: string, newValue: any): import("../util/configuration.js").default;
/**
* Generate a URL for deleting datum metadata via a `DELETE` request.
*
* @param nodeId - a specific node ID to use; if not provided the `nodeId` parameter of this instance will be used
* @param sourceId - a specific source ID to use; if not provided the `sourceId` parameter of this instance will be used
* @returns the URL
*/
param<T_1>(key: string): T_1 | undefined;
hostUrl(): string;
hostRequestUrl(): string;
Expand Down
2 changes: 1 addition & 1 deletion lib/net/datumMetadataUrlHelperMixin.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 22 additions & 3 deletions lib/net/environment.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
import Configuration from "../util/configuration.js";
/**
* Network environment configuration.
*/
interface HostConfigInfo {
/** The hostname. */
host: string;
/** The protocol. */
protocol: string;
/**
* The port number.
*
* Can be a number or string, to support a browser `Location` object.
*/
port?: number | string;
/** An optional proxy URL prefix, for example `https://query.solarnetwork.net/1m`. */
proxyUrlPrefix?: string;
/** Arbitrary additional properties. */
[k: string]: any;
}
/**
* Network environment configuration.
*/
Expand Down Expand Up @@ -43,7 +62,7 @@ declare class EnvironmentConfig extends Configuration {
*
* @param config - an optional set of properties to start with
*/
constructor(config?: Partial<HostConfig>);
constructor(config?: Partial<HostConfigInfo>);
/**
* Check if TLS is in use via the `https` protocol.
*
Expand All @@ -57,9 +76,9 @@ interface EnvironmentConstructor {
* Constructor.
* @param config - an optional set of properties to start with
*/
new (config?: Partial<HostConfig>): EnvironmentConfig & HostConfig;
new (config?: Partial<HostConfigInfo>): EnvironmentConfig & HostConfig;
}
declare const _default: EnvironmentConfig & HostConfig & EnvironmentConstructor;
export default _default;
export { EnvironmentConfig, type HostConfig, type EnvironmentConstructor };
export { EnvironmentConfig, type HostConfig, type HostConfigInfo, type EnvironmentConstructor, };
//# sourceMappingURL=environment.d.ts.map
2 changes: 1 addition & 1 deletion lib/net/environment.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions lib/net/environment.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/net/environment.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/net/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export { default as AuthTokenUrlHelperMixin } from "./authTokenUrlHelperMixin.js
export { default as AuthorizationV2Builder } from "./authV2.js";
export { default as DatumUrlHelperMixin } from "./datumUrlHelperMixin.js";
export { default as DatumMetadataUrlHelperMixin } from "./datumMetadataUrlHelperMixin.js";
export { default as Environment, EnvironmentConfig, type HostConfig, type EnvironmentConstructor, } from "./environment.js";
export { default as Environment, EnvironmentConfig, type HostConfig, type HostConfigInfo, type EnvironmentConstructor, } from "./environment.js";
export { default as HttpHeaders, HttpContentType, HttpMethod, } from "./httpHeaders.js";
export { default as InstructionUrlHelperMixin, type QueueInstructionRequest, type QueueInstructionSimpleRequest, } from "./instructionUrlHelperMixin.js";
export { default as NodesUrlHelperMixin } from "./nodesUrlHelperMixin.js";
Expand Down
2 changes: 1 addition & 1 deletion lib/net/index.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/net/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions lib/net/urlHelper.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Configuration from "../util/configuration.js";
import { EnvironmentConfig, HostConfig } from "./environment.js";
import { EnvironmentConfig, HostConfig, HostConfigInfo } from "./environment.js";
import { Constructor } from "../util/objects.js";
import { default as DatumFilter } from "../domain/datumFilter.js";
/**
Expand All @@ -22,11 +22,11 @@ declare class UrlHelper {
/**
* Constructor.
*
* @param environment - the optional initial environment to use;
* @param environment the optional initial environment to use;
* if a non-`Environment` object is passed then the properties of that object will
* be used to construct a new `Environment` instance
*/
constructor(environment?: HostConfig);
constructor(environment?: HostConfigInfo);
/**
* Get the environment configuration.
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/net/urlHelper.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/net/urlHelper.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3ac0849

Please sign in to comment.