@kelviq/cli 0.1.3 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -13
- package/dist/commands/env.js +8 -0
- package/dist/commands/env.js.map +1 -1
- package/dist/commands/logout.js +3 -2
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/promote.js +2 -2
- package/dist/commands/promote.js.map +1 -1
- package/dist/commands/pull.js +1 -1
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.js +1 -1
- package/dist/commands/push.js.map +1 -1
- package/dist/config-format/index.d.ts +2 -2
- package/dist/config-format/index.js +1 -1
- package/dist/config-format/index.js.map +1 -1
- package/dist/config-format/load.js +29 -1
- package/dist/config-format/load.js.map +1 -1
- package/dist/config-format/schema.d.ts +146 -1
- package/dist/config-format/schema.js +27 -0
- package/dist/config-format/schema.js.map +1 -1
- package/dist/core/config.d.ts +35 -7
- package/dist/core/config.js +78 -25
- package/dist/core/config.js.map +1 -1
- package/dist/generated/openapi.json +7411 -2648
- package/dist/sync/diff.d.ts +5 -1
- package/dist/sync/diff.js +13 -0
- package/dist/sync/diff.js.map +1 -1
- package/dist/sync/to-config.js +7 -2
- package/dist/sync/to-config.js.map +1 -1
- package/package.json +1 -1
|
@@ -83,6 +83,13 @@ export const taxBehaviorSchema = z.union([z.enum(KNOWN_TAX_BEHAVIORS), z.string(
|
|
|
83
83
|
// (also PlanPriceCreateRequest.priceType — agrees; see drift-guard)
|
|
84
84
|
export const KNOWN_PRICE_TYPES = ['FREE', 'PAID', 'CUSTOM'];
|
|
85
85
|
export const priceTypeSchema = z.union([z.enum(KNOWN_PRICE_TYPES), z.string()]);
|
|
86
|
+
// Sourced from src/generated/openapi.json:
|
|
87
|
+
// components.schemas.LicenseConfig.properties.durationUnit.enum
|
|
88
|
+
// (LicenseConfig is $ref'd by both PlanCreateRequest.license and
|
|
89
|
+
// PlanUpdateRequest.license — see the drift-guard in
|
|
90
|
+
// test/sync-price-filter.test.ts)
|
|
91
|
+
export const KNOWN_DURATION_UNITS = ['DAY', 'MONTH', 'YEAR'];
|
|
92
|
+
export const durationUnitSchema = z.union([z.enum(KNOWN_DURATION_UNITS), z.string()]);
|
|
86
93
|
export const featureDefSchema = z.object({
|
|
87
94
|
identifier: identifierSchema,
|
|
88
95
|
name: z.string().min(1),
|
|
@@ -138,12 +145,32 @@ const priceDefShape = z.object({
|
|
|
138
145
|
chargeCatalogPrice: z.array(z.record(z.unknown())).optional(),
|
|
139
146
|
});
|
|
140
147
|
export const priceDefSchema = priceDefShape.passthrough();
|
|
148
|
+
// Plan-level license-key configuration — the spec's `LicenseConfig`, the
|
|
149
|
+
// shape both `PlanCreateRequest.license` and `PlanUpdateRequest.license`
|
|
150
|
+
// take. It describes how keys are ISSUED for orders on this plan (activation
|
|
151
|
+
// limit, expiry); individual issued keys are per-customer runtime state and
|
|
152
|
+
// deliberately out of scope for a catalog format. Same shape-then-passthrough
|
|
153
|
+
// split as entitlementDefShape above (and for the same reasons): the six
|
|
154
|
+
// documented fields are typed, and anything the server adds later passes
|
|
155
|
+
// through rather than hard-failing `pull` the way a closed shape would.
|
|
156
|
+
const licenseDefShape = z.object({
|
|
157
|
+
enabled: z.boolean().optional(),
|
|
158
|
+
// `minimum: 1` per the spec's LicenseConfig — matches the dashboard's own
|
|
159
|
+
// 1..N activation-limit control.
|
|
160
|
+
activationLimit: z.number().int().min(1).optional(),
|
|
161
|
+
activationLimitEnabled: z.boolean().optional(),
|
|
162
|
+
durationUnit: durationUnitSchema.optional(),
|
|
163
|
+
durationValue: z.number().int().min(1).optional(),
|
|
164
|
+
hasExpiry: z.boolean().optional(),
|
|
165
|
+
});
|
|
166
|
+
export const licenseDefSchema = licenseDefShape.passthrough();
|
|
141
167
|
export const planDefSchema = z.object({
|
|
142
168
|
identifier: identifierSchema,
|
|
143
169
|
name: z.string().min(1),
|
|
144
170
|
product: identifierSchema,
|
|
145
171
|
description: z.string().optional(),
|
|
146
172
|
isVisible: z.boolean().optional(),
|
|
173
|
+
license: licenseDefSchema.optional(),
|
|
147
174
|
entitlements: z.array(entitlementDefSchema).optional(),
|
|
148
175
|
prices: z.array(priceDefSchema).optional(),
|
|
149
176
|
metadata: z.record(z.unknown()).optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config-format/schema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config-format/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/core/config.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export type EnvName = 'sandbox' | 'production';
|
|
1
2
|
export interface CliConfig {
|
|
2
3
|
prodServerApiKey?: string;
|
|
3
4
|
sandboxServerApiKey?: string;
|
|
@@ -5,7 +6,16 @@ export interface CliConfig {
|
|
|
5
6
|
baseUrl: string;
|
|
6
7
|
/** Sandbox API host (`https://sandboxapi.kelviq.com/api/v1` by default). */
|
|
7
8
|
sandboxBaseUrl: string;
|
|
9
|
+
/** Production edge host (`https://edge.api.kelviq.com/api/v1` by default). */
|
|
8
10
|
edgeUrl: string;
|
|
11
|
+
/** Sandbox edge host (`https://edge.sandboxapi.kelviq.com/api/v1` by default). */
|
|
12
|
+
sandboxEdgeUrl: string;
|
|
13
|
+
/** The environment unprefixed `KELVIQ_*` vars apply to. `undefined` when KELVIQ_ENV holds an unrecognized value — resolveEnv refuses to run then. */
|
|
14
|
+
activeEnv: EnvName | undefined;
|
|
15
|
+
/** KELVIQ_ENV as given (trimmed; `''` when unset), for error messages. */
|
|
16
|
+
rawKelviqEnv: string;
|
|
17
|
+
/** Whether the unprefixed KELVIQ_SERVER_API_KEY is set at all — lets resolveEnv explain a key that applies to the other environment. */
|
|
18
|
+
hasUnprefixedServerApiKey: boolean;
|
|
9
19
|
userAgent: string;
|
|
10
20
|
}
|
|
11
21
|
/** Shape of the on-disk user config file (~/.config/kelviq/config.json). */
|
|
@@ -18,6 +28,9 @@ export interface UserConfigFile {
|
|
|
18
28
|
* Command-line flag overrides are applied by callers on top of this result
|
|
19
29
|
* (flags are the highest-priority layer but aren't known here).
|
|
20
30
|
*
|
|
31
|
+
* Never throws for a bad KELVIQ_ENV — `kelviq env` still needs to report it;
|
|
32
|
+
* resolveEnv is where an invalid value stops a command.
|
|
33
|
+
*
|
|
21
34
|
* `env` and `configDir` are injectable for tests; `process.env` is never
|
|
22
35
|
* mutated.
|
|
23
36
|
*/
|
|
@@ -33,16 +46,31 @@ export declare function deleteUserConfigKey(key: keyof UserConfigFile, configDir
|
|
|
33
46
|
export interface ResolvedEnv {
|
|
34
47
|
key: string;
|
|
35
48
|
baseUrl: string;
|
|
36
|
-
|
|
49
|
+
edgeUrl: string;
|
|
50
|
+
envName: EnvName;
|
|
37
51
|
}
|
|
38
52
|
/**
|
|
39
|
-
* Picks the sandbox key by default;
|
|
40
|
-
* Throws when the relevant key isn't
|
|
41
|
-
* the dashboard URL, and
|
|
53
|
+
* Picks the sandbox key and hosts by default; production's when `prod` is
|
|
54
|
+
* true. Throws when KELVIQ_ENV is invalid, or when the relevant key isn't
|
|
55
|
+
* configured — naming the env vars, the dashboard URL, and (when an
|
|
56
|
+
* unprefixed key exists but KELVIQ_ENV points it at the other environment)
|
|
57
|
+
* why that key wasn't used.
|
|
42
58
|
*/
|
|
43
59
|
export declare function resolveEnv(config: CliConfig, prod: boolean): ResolvedEnv;
|
|
60
|
+
/** Where an unprefixed KELVIQ_SERVER_API_KEY went instead: the other environment, and whether KELVIQ_ENV said so explicitly or defaulted. */
|
|
61
|
+
export interface UnprefixedKeyInfo {
|
|
62
|
+
env: EnvName;
|
|
63
|
+
kelviqEnvSet: boolean;
|
|
64
|
+
}
|
|
44
65
|
export declare class MissingKeyError extends Error {
|
|
45
|
-
readonly
|
|
46
|
-
|
|
47
|
-
|
|
66
|
+
readonly envName: EnvName;
|
|
67
|
+
/** Set when KELVIQ_SERVER_API_KEY exists but applies to the other environment. */
|
|
68
|
+
readonly unprefixedKey?: UnprefixedKeyInfo | undefined;
|
|
69
|
+
constructor(envName: EnvName,
|
|
70
|
+
/** Set when KELVIQ_SERVER_API_KEY exists but applies to the other environment. */
|
|
71
|
+
unprefixedKey?: UnprefixedKeyInfo | undefined);
|
|
72
|
+
}
|
|
73
|
+
export declare class InvalidEnvError extends Error {
|
|
74
|
+
readonly value: string;
|
|
75
|
+
constructor(value: string);
|
|
48
76
|
}
|
package/dist/core/config.js
CHANGED
|
@@ -7,10 +7,18 @@
|
|
|
7
7
|
// Kelviq org has a sandbox environment, and the CLI targets it unless
|
|
8
8
|
// `--prod` is passed.
|
|
9
9
|
//
|
|
10
|
-
//
|
|
11
|
-
//
|
|
12
|
-
//
|
|
13
|
-
//
|
|
10
|
+
// Env var naming, shared with the MCP server and the SDK docs:
|
|
11
|
+
// - Unprefixed vars (KELVIQ_SERVER_API_KEY, KELVIQ_BASE_URL,
|
|
12
|
+
// KELVIQ_EDGE_URL) apply to the environment KELVIQ_ENV names —
|
|
13
|
+
// sandbox when unset, the same default as the MCP server (1.0.0+).
|
|
14
|
+
// Before CLI 0.3.0, KELVIQ_SERVER_API_KEY always meant the production
|
|
15
|
+
// key; that setup now needs KELVIQ_ENV=production.
|
|
16
|
+
// KELVIQ_ENV never changes which environment a command targets; only
|
|
17
|
+
// `--prod` does, so no env var can make an unqualified command write to
|
|
18
|
+
// production.
|
|
19
|
+
// - Environment-named vars (KELVIQ_SANDBOX_* / KELVIQ_PRODUCTION_*) always
|
|
20
|
+
// apply to that environment and win over the unprefixed ones. `promote`,
|
|
21
|
+
// and CI that touches both environments, uses these.
|
|
14
22
|
import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
15
23
|
import { homedir } from 'node:os';
|
|
16
24
|
import { join } from 'node:path';
|
|
@@ -18,6 +26,7 @@ import { getPackageVersion } from './version.js';
|
|
|
18
26
|
const DEFAULT_BASE_URL = 'https://api.kelviq.com/api/v1';
|
|
19
27
|
const DEFAULT_SANDBOX_BASE_URL = 'https://sandboxapi.kelviq.com/api/v1';
|
|
20
28
|
const DEFAULT_EDGE_URL = 'https://edge.api.kelviq.com/api/v1';
|
|
29
|
+
const DEFAULT_SANDBOX_EDGE_URL = 'https://edge.sandboxapi.kelviq.com/api/v1';
|
|
21
30
|
const CONFIG_FILE_NAME = 'config.json';
|
|
22
31
|
function defaultConfigDir(env) {
|
|
23
32
|
const xdg = env.XDG_CONFIG_HOME?.trim();
|
|
@@ -40,11 +49,19 @@ function readUserConfig(dir) {
|
|
|
40
49
|
return {};
|
|
41
50
|
}
|
|
42
51
|
}
|
|
52
|
+
function parseKelviqEnv(raw) {
|
|
53
|
+
if (raw === '')
|
|
54
|
+
return 'sandbox';
|
|
55
|
+
return raw === 'sandbox' || raw === 'production' ? raw : undefined;
|
|
56
|
+
}
|
|
43
57
|
/**
|
|
44
58
|
* Loads the layered CLI config: env vars win over the user config file.
|
|
45
59
|
* Command-line flag overrides are applied by callers on top of this result
|
|
46
60
|
* (flags are the highest-priority layer but aren't known here).
|
|
47
61
|
*
|
|
62
|
+
* Never throws for a bad KELVIQ_ENV — `kelviq env` still needs to report it;
|
|
63
|
+
* resolveEnv is where an invalid value stops a command.
|
|
64
|
+
*
|
|
48
65
|
* `env` and `configDir` are injectable for tests; `process.env` is never
|
|
49
66
|
* mutated.
|
|
50
67
|
*/
|
|
@@ -52,17 +69,23 @@ export function loadCliConfig(env = process.env, configDir) {
|
|
|
52
69
|
const stripSlash = (u) => u.replace(/\/+$/, '');
|
|
53
70
|
const dir = configDir ?? defaultConfigDir(env);
|
|
54
71
|
const fileConfig = readUserConfig(dir);
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
72
|
+
const rawKelviqEnv = env.KELVIQ_ENV?.trim() ?? '';
|
|
73
|
+
const activeEnv = parseKelviqEnv(rawKelviqEnv);
|
|
74
|
+
const read = (name) => env[name]?.trim() || undefined;
|
|
75
|
+
// Environment-named var first; the unprefixed one only when KELVIQ_ENV
|
|
76
|
+
// points at this environment.
|
|
77
|
+
const pick = (target, suffix) => read(`KELVIQ_${target === 'production' ? 'PRODUCTION' : 'SANDBOX'}_${suffix}`) ??
|
|
78
|
+
(activeEnv === target ? read(`KELVIQ_${suffix}`) : undefined);
|
|
60
79
|
return {
|
|
61
|
-
prodServerApiKey,
|
|
62
|
-
sandboxServerApiKey,
|
|
63
|
-
baseUrl,
|
|
64
|
-
sandboxBaseUrl,
|
|
65
|
-
edgeUrl,
|
|
80
|
+
prodServerApiKey: pick('production', 'SERVER_API_KEY') || fileConfig.prodServerApiKey || undefined,
|
|
81
|
+
sandboxServerApiKey: pick('sandbox', 'SERVER_API_KEY') || fileConfig.sandboxServerApiKey || undefined,
|
|
82
|
+
baseUrl: stripSlash(pick('production', 'BASE_URL') ?? DEFAULT_BASE_URL),
|
|
83
|
+
sandboxBaseUrl: stripSlash(pick('sandbox', 'BASE_URL') ?? DEFAULT_SANDBOX_BASE_URL),
|
|
84
|
+
edgeUrl: stripSlash(pick('production', 'EDGE_URL') ?? DEFAULT_EDGE_URL),
|
|
85
|
+
sandboxEdgeUrl: stripSlash(pick('sandbox', 'EDGE_URL') ?? DEFAULT_SANDBOX_EDGE_URL),
|
|
86
|
+
activeEnv,
|
|
87
|
+
rawKelviqEnv,
|
|
88
|
+
hasUnprefixedServerApiKey: read('KELVIQ_SERVER_API_KEY') !== undefined,
|
|
66
89
|
userAgent: `kelviq-cli/${getPackageVersion()} (+https://kelviq.com)`,
|
|
67
90
|
};
|
|
68
91
|
}
|
|
@@ -96,33 +119,63 @@ export function deleteUserConfigKey(key, configDir) {
|
|
|
96
119
|
chmodSync(path, 0o600);
|
|
97
120
|
}
|
|
98
121
|
/**
|
|
99
|
-
* Picks the sandbox key by default;
|
|
100
|
-
* Throws when the relevant key isn't
|
|
101
|
-
* the dashboard URL, and
|
|
122
|
+
* Picks the sandbox key and hosts by default; production's when `prod` is
|
|
123
|
+
* true. Throws when KELVIQ_ENV is invalid, or when the relevant key isn't
|
|
124
|
+
* configured — naming the env vars, the dashboard URL, and (when an
|
|
125
|
+
* unprefixed key exists but KELVIQ_ENV points it at the other environment)
|
|
126
|
+
* why that key wasn't used.
|
|
102
127
|
*/
|
|
103
128
|
export function resolveEnv(config, prod) {
|
|
129
|
+
if (!config.activeEnv)
|
|
130
|
+
throw new InvalidEnvError(config.rawKelviqEnv);
|
|
104
131
|
const envName = prod ? 'production' : 'sandbox';
|
|
105
132
|
const key = prod ? config.prodServerApiKey : config.sandboxServerApiKey;
|
|
106
133
|
if (!key) {
|
|
107
|
-
|
|
108
|
-
|
|
134
|
+
// Only reachable with an unprefixed key when it applies to the other
|
|
135
|
+
// environment — an unprefixed key for this one would have been picked.
|
|
136
|
+
throw new MissingKeyError(envName, config.hasUnprefixedServerApiKey ? { env: config.activeEnv, kelviqEnvSet: config.rawKelviqEnv !== '' } : undefined);
|
|
109
137
|
}
|
|
110
|
-
|
|
111
|
-
|
|
138
|
+
return prod
|
|
139
|
+
? { key, baseUrl: config.baseUrl, edgeUrl: config.edgeUrl, envName }
|
|
140
|
+
: { key, baseUrl: config.sandboxBaseUrl, edgeUrl: config.sandboxEdgeUrl, envName };
|
|
112
141
|
}
|
|
113
142
|
export class MissingKeyError extends Error {
|
|
114
|
-
envVar;
|
|
115
143
|
envName;
|
|
116
|
-
|
|
144
|
+
unprefixedKey;
|
|
145
|
+
constructor(envName,
|
|
146
|
+
/** Set when KELVIQ_SERVER_API_KEY exists but applies to the other environment. */
|
|
147
|
+
unprefixedKey) {
|
|
117
148
|
// Naming asymmetry: the CLI/API call this "production", but the
|
|
118
149
|
// dashboard's query param calls it `live` — that spelling stays
|
|
119
150
|
// confined to the URL and never leaks into this message's wording.
|
|
120
151
|
const mode = envName === 'production' ? 'live' : 'sandbox';
|
|
121
|
-
|
|
152
|
+
const namedVar = envName === 'production' ? 'KELVIQ_PRODUCTION_SERVER_API_KEY' : 'KELVIQ_SANDBOX_SERVER_API_KEY';
|
|
153
|
+
const login = envName === 'production' ? 'kelviq login --prod' : 'kelviq login';
|
|
154
|
+
let mismatch = '';
|
|
155
|
+
if (unprefixedKey) {
|
|
156
|
+
const why = unprefixedKey.kelviqEnvSet
|
|
157
|
+
? `KELVIQ_ENV=${unprefixedKey.env}`
|
|
158
|
+
: `KELVIQ_ENV is unset, which means ${unprefixedKey.env}`;
|
|
159
|
+
// Never just "pass --prod": the key may really be a sandbox key.
|
|
160
|
+
const fix = unprefixedKey.env === 'production'
|
|
161
|
+
? ' If it is a sandbox key, set KELVIQ_ENV=sandbox; to target production, pass --prod.'
|
|
162
|
+
: ' To use it for production, set KELVIQ_ENV=production.';
|
|
163
|
+
mismatch = ` KELVIQ_SERVER_API_KEY is set, but it applies to ${unprefixedKey.env} (${why}).${fix}`;
|
|
164
|
+
}
|
|
165
|
+
super(`Missing ${envName} API key. Run \`${login}\`, or set ${namedVar} ` +
|
|
166
|
+
`(or KELVIQ_SERVER_API_KEY with KELVIQ_ENV=${envName}).${mismatch} ` +
|
|
122
167
|
`Get keys at https://app.kelviq.com/settings/api-keys?mode=${mode}.`);
|
|
123
|
-
this.envVar = envVar;
|
|
124
168
|
this.envName = envName;
|
|
169
|
+
this.unprefixedKey = unprefixedKey;
|
|
125
170
|
this.name = 'MissingKeyError';
|
|
126
171
|
}
|
|
127
172
|
}
|
|
173
|
+
export class InvalidEnvError extends Error {
|
|
174
|
+
value;
|
|
175
|
+
constructor(value) {
|
|
176
|
+
super(`Invalid KELVIQ_ENV "${value}". Use "sandbox" or "production".`);
|
|
177
|
+
this.value = value;
|
|
178
|
+
this.name = 'InvalidEnvError';
|
|
179
|
+
}
|
|
180
|
+
}
|
|
128
181
|
//# sourceMappingURL=config.js.map
|
package/dist/core/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,4EAA4E;AAC5E,kEAAkE;AAClE,yEAAyE;AACzE,yEAAyE;AACzE,wEAAwE;AACxE,sEAAsE;AACtE,sBAAsB;AACtB,EAAE;AACF,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/core/config.ts"],"names":[],"mappings":"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"}
|