@oauth2-cli/sky-api 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.4.1](https://github.com/groton-school/myschoolapp-reporting/compare/oauth2-cli/sky-api/0.4.0...oauth2-cli/sky-api/0.4.1) (2026-01-15)
+
+
+### Bug Fixes
+
+* further reorg of internals ([adc4330](https://github.com/groton-school/myschoolapp-reporting/commit/adc4330a346c7547be2e702730e2bcb510873b4c))
+
 ## [0.4.0](https://github.com/groton-school/myschoolapp-reporting/compare/oauth2-cli/sky-api/0.3.2...oauth2-cli/sky-api/0.4.0) (2026-01-15)
 
 

package/dist/Client.d.ts

@@ -0,0 +1,9 @@
+import * as OAuth2 from '@oauth2-cli/qui-cli/dist/OAuth2.js';
+export type Credentials = OAuth2.Credentials & {
+    subscription_key: string;
+};
+export declare class Client extends OAuth2.Client {
+    private subscription_key;
+    constructor({ subscription_key, ...credentials }: Credentials);
+    request(...args: Parameters<OAuth2.Client['request']>): Promise<Response>;
+}

package/dist/Client.js

@@ -0,0 +1,13 @@
+import * as OAuth2 from '@oauth2-cli/qui-cli/dist/OAuth2.js';
+export class Client extends OAuth2.Client {
+    subscription_key;
+    constructor({ subscription_key, ...credentials }) {
+        super(credentials);
+        this.subscription_key = subscription_key;
+    }
+    request(...args) {
+        const [url, method, body, headers = new Headers(), dPoPOptions] = args;
+        headers.set('Bb-Api-Subscription-Key', this.subscription_key);
+        return super.request(url, method, body, headers, dPoPOptions);
+    }
+}

package/dist/Module.d.ts

@@ -1,10 +1,10 @@
-import { SkyAPI } from './SkyAPI.js';
-declare const sky: SkyAPI;
+import { SkyAPIPlugin } from './SkyAPI.js';
+export * from './SkyAPI.js';
+declare const sky: SkyAPIPlugin;
 export declare const name: string;
 export declare const configure: ({ subscription_key, subscriptionKeyEnvVar, ...proposal }?: import("./SkyAPI.js").ConfigurationProposal) => void;
 export declare const options: () => import("@qui-cli/plugin").Options;
 export declare const init: ({ values }: import("@qui-cli/plugin").ExpectedArguments<typeof this.options>) => Promise<void>;
-export * as school from './school/index.js';
 export declare const getToken: typeof sky.getToken;
 export declare const getClient: typeof sky.getClient;
 export declare const request: typeof sky.request;

package/dist/Module.js

@@ -1,10 +1,10 @@
-import { SkyAPI } from './SkyAPI.js';
-const sky = new SkyAPI();
+import { SkyAPIPlugin } from './SkyAPI.js';
+export * from './SkyAPI.js';
+const sky = new SkyAPIPlugin();
 export const name = sky.name;
 export const configure = sky.configure.bind(sky);
 export const options = sky.options.bind(sky);
 export const init = sky.init.bind(sky);
-export * as school from './school/index.js';
 export const getToken = sky.getToken.bind(sky);
 export const getClient = sky.getClient.bind(sky);
 export const request = sky.request.bind(sky);

package/dist/SkyAPI.d.ts

@@ -1,19 +1,20 @@
 import * as OAuth2 from '@oauth2-cli/qui-cli/dist/OAuth2.js';
 import * as Plugin from '@qui-cli/plugin';
+import { Client } from './Client.js';
+export { EnvironmentStorage, FileStorage, TokenStorage } from '@oauth2-cli/qui-cli/dist/OAuth2.js';
+export * from './Client.js';
+export * as school from './school/index.js';
 type SkyConfiguration = {
     subscription_key?: string;
     subscriptionKeyEnvVar: string;
 };
-export type Credentials = OAuth2.Credentials & {
-    subscription_key: string;
-};
 export type Configuration = OAuth2.Configuration & SkyConfiguration;
 export type ConfigurationProposal = OAuth2.ConfigurationProposal & Partial<SkyConfiguration>;
-export declare class SkyAPI extends OAuth2.OAuth2 {
+export declare class SkyAPIPlugin extends OAuth2.OAuth2Plugin<Client> {
     private skyConfig;
     constructor(name?: string);
     configure({ subscription_key, subscriptionKeyEnvVar, ...proposal }?: ConfigurationProposal): void;
     options(): Plugin.Options;
     init({ values }: Plugin.ExpectedArguments<typeof this.options>): Promise<void>;
+    protected instantiateClient(credentials: OAuth2.Credentials): Client;
 }
-export {};

package/dist/SkyAPI.js

@@ -1,7 +1,11 @@
 import * as OAuth2 from '@oauth2-cli/qui-cli/dist/OAuth2.js';
 import { Colors } from '@qui-cli/colors';
 import { Env } from '@qui-cli/env-1password';
-export class SkyAPI extends OAuth2.OAuth2 {
+import { Client } from './Client.js';
+export { EnvironmentStorage, FileStorage } from '@oauth2-cli/qui-cli/dist/OAuth2.js';
+export * from './Client.js';
+export * as school from './school/index.js';
+export class SkyAPIPlugin extends OAuth2.OAuth2Plugin {
     skyConfig = {
         subscriptionKeyEnvVar: 'SKY_SUBSCRIPTION_KEY'
     };
@@ -58,8 +62,16 @@ export class SkyAPI extends OAuth2.OAuth2 {
         }) } = values;
         this.configure({
             subscription_key,
-            ...values,
-            headers: { 'Bb-Api-Subscription-Key': this.skyConfig.subscription_key }
+            ...values
+        });
+    }
+    instantiateClient(credentials) {
+        if (!this.skyConfig.subscription_key) {
+            throw new Error('No subscription access key is defined.');
+        }
+        return new Client({
+            subscription_key: this.skyConfig.subscription_key,
+            ...credentials
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oauth2-cli/sky-api",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "keywords": [
     "blackbaud",
     "sky",
@@ -22,14 +22,14 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
+    "@oauth2-cli/qui-cli": "^0.5.6",
     "node-fetch": "^3.3.2",
     "oauth2-cli": "^0.2.3"
   },
   "devDependencies": {
     "@battis/descriptive-types": "^0.2.6",
     "@battis/typescript-tricks": "^0.7.6",
-    "@oauth2-cli/qui-cli": "^0.5.0",
-    "@qui-cli/colors": "^3.2.1",
+    "@qui-cli/colors": "^3.2.2",
     "@qui-cli/env-1password": "^1.2.6",
     "@qui-cli/plugin": "^4.0.0",
     "@tsconfig/node24": "^24.0.3",
@@ -39,7 +39,6 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@oauth2-cli/qui-cli": ">=0.5",
     "@qui-cli/plugin": ">=3"
   },
   "scripts": {
@@ -47,6 +46,6 @@
     "build": "run-s build:*",
     "build:clean": "run-s clean",
     "build:compile": "tsc",
-    "release": "commit-and-tag-version"
+    "version": "commit-and-tag-version"
   }
 }