@oauth2-cli/qui-cli 0.7.0 → 0.7.1

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.7.1](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.7.0...qui-cli-plugin/0.7.1) (2026-02-18)
+
+
+### Features
+
+* provide parameterized credentials with simplified typing ([5a92c67](https://github.com/battis/oauth2-cli/commit/5a92c67dbd4ab52fa4f0b02a910e788f5ae67adb))
+
+
+### Bug Fixes
+
+* simplify dependency hierarchy ([0a72c5d](https://github.com/battis/oauth2-cli/commit/0a72c5df3c814e63ad001a2a15fa0bf7ab72b195))
+
 ## [0.7.0](https://github.com/battis/oauth2-cli/compare/qui-cli-plugin/0.6.6...qui-cli-plugin/0.7.0) (2026-02-17)
 
 ### ⚠ BREAKING CHANGES

package/dist/Client.d.ts

@@ -1,10 +1,11 @@
+import { JSONValue } from '@battis/typescript-tricks';
 import * as OAuth2CLI from 'oauth2-cli';
-import type { Configuration, DPoPOptions, FetchBody, JsonValue } from 'openid-client';
+import type * as OpenIDClient from 'openid-client';
 import * as requestish from 'requestish';
-export declare class Client extends OAuth2CLI.Client {
-    getConfiguration(): Promise<Configuration>;
+export declare class Client<C extends OAuth2CLI.Credentials = OAuth2CLI.Credentials> extends OAuth2CLI.Client<C> {
+    getConfiguration(): Promise<OpenIDClient.Configuration>;
     authorize(): Promise<OAuth2CLI.Token.Response>;
     protected refreshTokenGrant(token: OAuth2CLI.Token.Response): Promise<OAuth2CLI.Token.Response | undefined>;
-    request(url: requestish.URL.ish, method?: string, body?: FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: DPoPOptions): Promise<Response>;
-    requestJSON<T extends JsonValue = JsonValue>(url: requestish.URL.ish, method?: string, body?: FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: DPoPOptions): Promise<T>;
+    request(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<Response>;
+    requestJSON<J extends JSONValue = JSONValue>(url: requestish.URL.ish, method?: string, body?: OpenIDClient.FetchBody, headers?: requestish.Headers.ish, dPoPOptions?: OpenIDClient.DPoPOptions): Promise<J>;
 }

package/dist/OAuth2.d.ts

@@ -1,7 +1,7 @@
-export declare const configure: (proposal?: import("./OAuth2Plugin.js").Configuration) => void;
+export declare const configure: (proposal?: import("./OAuth2Plugin.js").Configuration<import("oauth2-cli").Credentials>) => void;
 export declare const options: () => import("@qui-cli/plugin").Options;
 export declare const init: () => import("@qui-cli/plugin").Options;
-export declare const client: () => import("./Client.js").Client;
+export declare const client: () => import("./Client.js").Client<import("oauth2-cli").Credentials>;
 export declare const request: (url: import("requestish/dist/URL.js").ish, method?: string | undefined, body?: import("openid-client").FetchBody, headers?: import("requestish/dist/Headers.js").ish | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<Response>;
 export declare const requestJSON: <T extends import("@battis/typescript-tricks").JSONValue>(url: import("requestish/dist/URL.js").ish, method?: string | undefined, body?: import("openid-client").FetchBody, headers?: import("requestish/dist/Headers.js").ish | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<T>;
 export declare const fetch: (input: import("requestish/dist/URL.js").ish, init?: RequestInit | undefined, dPoPOptions?: import("openid-client").DPoPOptions | undefined) => Promise<Response>;

package/dist/OAuth2Plugin.d.ts

@@ -13,9 +13,9 @@ type Usage = {
     heading: string;
     text?: string[];
 };
-export type Configuration = Plugin.Configuration & {
+export type Configuration<C extends OAuth2CLI.Credentials = OAuth2CLI.Credentials> = Plugin.Configuration & {
     /** OAuth 2.0/OpenID Connect credential set */
-    credentials?: Partial<OAuth2CLI.Credentials>;
+    credentials?: Partial<C>;
     /** Base URL for all non-absolute requests */
     base_url?: requestish.URL.ish;
     /** Request components to inject into server requests */
@@ -35,7 +35,7 @@ export type Configuration = Plugin.Configuration & {
     /** Optional absolute path to EJS view templates directory */
     views?: PathString;
 };
-export declare class OAuth2Plugin<C extends Client = Client> {
+export declare class OAuth2Plugin<C extends OAuth2CLI.Credentials = OAuth2CLI.Credentials, L extends Client<C> = Client<C>> {
     readonly name: string;
     [key: string]: unknown;
     private static names;
@@ -52,14 +52,14 @@ export declare class OAuth2Plugin<C extends Client = Client> {
     private views?;
     private storage?;
     private _client?;
-    configure(proposal?: Configuration): void;
+    configure(proposal?: Configuration<C>): void;
     options(): Plugin.Options;
     init(_: Plugin.ExpectedArguments<typeof this.options>): Promise<void>;
-    protected instantiateClient(options: OAuth2CLI.ClientOptions): C;
-    get client(): C;
-    request(...args: Parameters<OAuth2CLI.Client['request']>): Promise<Response>;
-    requestJSON<T extends JSONValue>(...args: Parameters<OAuth2CLI.Client['requestJSON']>): Promise<T>;
-    fetch(...args: Parameters<OAuth2CLI.Client['fetch']>): Promise<Response>;
-    fetchJSON<T extends JSONValue>(...args: Parameters<OAuth2CLI.Client['fetchJSON']>): Promise<T>;
+    protected instantiateClient(options: OAuth2CLI.ClientOptions<C>): L;
+    get client(): L;
+    request(...args: Parameters<OAuth2CLI.Client<C>['request']>): Promise<Response>;
+    requestJSON<T extends JSONValue>(...args: Parameters<OAuth2CLI.Client<C>['requestJSON']>): Promise<T>;
+    fetch(...args: Parameters<OAuth2CLI.Client<C>['fetch']>): Promise<Response>;
+    fetchJSON<T extends JSONValue>(...args: Parameters<OAuth2CLI.Client<C>['fetchJSON']>): Promise<T>;
 }
 export {};

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+export { ClientOptions, Credentials, Injection, Scope, WebServer } from 'oauth2-cli';
+export * from './Client.js';
 export * as OAuth2 from './OAuth2.js';
-export * from './Export.js';
-export * from './Extend.js';
+export * from './OAuth2Plugin.js';
+export * as Token from './Token/index.js';

package/dist/index.js

@@ -1,3 +1,5 @@
+export { Scope, WebServer } from 'oauth2-cli';
+export * from './Client.js';
 export * as OAuth2 from './OAuth2.js';
-export * from './Export.js';
-export * from './Extend.js';
+export * from './OAuth2Plugin.js';
+export * as Token from './Token/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oauth2-cli/qui-cli",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "@qui-cli/plugin wrapper for oauth2-cli",
   "homepage": "https://github.com/battis/oauth2-cli/tree/main/packages/qui-cli#readme",
   "repository": {
@@ -17,6 +17,7 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@qui-cli/colors": "^3.2.3",
+    "oauth2-cli": "0.8.1",
     "requestish": "0.1.1"
   },
   "devDependencies": {
@@ -30,14 +31,12 @@
     "del-cli": "^7.0.0",
     "npm-run-all": "^4.1.5",
     "openid-client": "^6.8.2",
-    "typescript": "^5.9.3",
-    "oauth2-cli": "0.8.0"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@qui-cli/env-1password": ">=1",
+    "@qui-cli/env": ">=5",
     "@qui-cli/log": ">=3",
-    "@qui-cli/plugin": ">=3",
-    "oauth2-cli": "0.8.x"
+    "@qui-cli/plugin": ">=3"
   },
   "scripts": {
     "clean": "del ./dist",

package/dist/Export.d.ts

@@ -1 +0,0 @@
-export { ClientOptions, Credentials, Injection, Scope, WebServer } from 'oauth2-cli';

package/dist/Export.js

@@ -1 +0,0 @@
-export { Scope, WebServer } from 'oauth2-cli';

package/dist/Extend.d.ts

@@ -1,3 +0,0 @@
-export * from './Client.js';
-export * from './OAuth2Plugin.js';
-export * as Token from './Token/index.js';

package/dist/Extend.js

@@ -1,3 +0,0 @@
-export * from './Client.js';
-export * from './OAuth2Plugin.js';
-export * as Token from './Token/index.js';