@slkiser/opencode-quota 3.8.0 → 3.8.2
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/dist/lib/api-key-resolver.d.ts +30 -0
- package/dist/lib/api-key-resolver.d.ts.map +1 -1
- package/dist/lib/api-key-resolver.js +32 -0
- package/dist/lib/api-key-resolver.js.map +1 -1
- package/dist/lib/chutes-config.d.ts +0 -27
- package/dist/lib/chutes-config.d.ts.map +1 -1
- package/dist/lib/chutes-config.js +16 -46
- package/dist/lib/chutes-config.js.map +1 -1
- package/dist/lib/crof-config.d.ts +0 -7
- package/dist/lib/crof-config.d.ts.map +1 -1
- package/dist/lib/crof-config.js +15 -28
- package/dist/lib/crof-config.js.map +1 -1
- package/dist/lib/google-antigravity-companion.d.ts.map +1 -1
- package/dist/lib/google-antigravity-companion.js +235 -66
- package/dist/lib/google-antigravity-companion.js.map +1 -1
- package/dist/lib/google-gemini-cli-companion.d.ts.map +1 -1
- package/dist/lib/google-gemini-cli-companion.js +36 -21
- package/dist/lib/google-gemini-cli-companion.js.map +1 -1
- package/dist/lib/nanogpt-config.d.ts +0 -11
- package/dist/lib/nanogpt-config.d.ts.map +1 -1
- package/dist/lib/nanogpt-config.js +20 -36
- package/dist/lib/nanogpt-config.js.map +1 -1
- package/dist/lib/quota-runtime-context.d.ts +1 -1
- package/dist/lib/quota-runtime-context.d.ts.map +1 -1
- package/dist/lib/quota-runtime-context.js +2 -0
- package/dist/lib/quota-runtime-context.js.map +1 -1
- package/dist/lib/synthetic-config.d.ts +0 -27
- package/dist/lib/synthetic-config.d.ts.map +1 -1
- package/dist/lib/synthetic-config.js +16 -46
- package/dist/lib/synthetic-config.js.map +1 -1
- package/dist/providers/chutes.d.ts.map +1 -1
- package/dist/providers/chutes.js +11 -14
- package/dist/providers/chutes.js.map +1 -1
- package/dist/providers/crof.d.ts.map +1 -1
- package/dist/providers/crof.js +22 -23
- package/dist/providers/crof.js.map +1 -1
- package/dist/providers/nanogpt.d.ts.map +1 -1
- package/dist/providers/nanogpt.js +56 -56
- package/dist/providers/nanogpt.js.map +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +13 -44
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/result-helpers.d.ts +21 -0
- package/dist/providers/result-helpers.d.ts.map +1 -1
- package/dist/providers/result-helpers.js +27 -0
- package/dist/providers/result-helpers.js.map +1 -1
- package/dist/providers/synthetic.d.ts.map +1 -1
- package/dist/providers/synthetic.js +17 -20
- package/dist/providers/synthetic.js.map +1 -1
- package/dist/providers/zai.d.ts.map +1 -1
- package/dist/providers/zai.js +13 -44
- package/dist/providers/zai.js.map +1 -1
- package/dist/providers/zhipu.d.ts.map +1 -1
- package/dist/providers/zhipu.js +13 -44
- package/dist/providers/zhipu.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,8 +1,23 @@
|
|
|
1
|
+
import { readFile } from "fs/promises";
|
|
2
|
+
import { readdirSync } from "node:fs";
|
|
1
3
|
import { createRequire } from "node:module";
|
|
4
|
+
import { dirname, join } from "node:path";
|
|
2
5
|
import { pathToFileURL } from "node:url";
|
|
6
|
+
import { getOpencodeRuntimeDirCandidates } from "./opencode-runtime-paths.js";
|
|
3
7
|
const require = createRequire(import.meta.url);
|
|
4
8
|
const COMPANION_PACKAGE_NAME = "opencode-antigravity-auth";
|
|
5
|
-
const
|
|
9
|
+
const COMPANION_JS_IMPORT_SPECIFIERS = [
|
|
10
|
+
`${COMPANION_PACKAGE_NAME}/dist/src/constants.js`,
|
|
11
|
+
`${COMPANION_PACKAGE_NAME}/src/constants.js`,
|
|
12
|
+
];
|
|
13
|
+
const COMPANION_SOURCE_IMPORT_SPECIFIER = `${COMPANION_PACKAGE_NAME}/src/constants.ts`;
|
|
14
|
+
const COMPANION_PACKAGE_JSON_SPECIFIER = `${COMPANION_PACKAGE_NAME}/package.json`;
|
|
15
|
+
const COMPANION_DIRECT_CANDIDATE_PATHS = [
|
|
16
|
+
["dist", "src", "constants.js"],
|
|
17
|
+
["src", "constants.ts"],
|
|
18
|
+
["src", "constants.js"],
|
|
19
|
+
["dist", "index.js"],
|
|
20
|
+
];
|
|
6
21
|
const COMPANION_MISSING_ERROR = `Install ${COMPANION_PACKAGE_NAME} separately to enable Google Antigravity quota`;
|
|
7
22
|
const COMPANION_INVALID_ERROR = `Installed ${COMPANION_PACKAGE_NAME} package is incompatible`;
|
|
8
23
|
let resolvedCompanionStatePromise = null;
|
|
@@ -17,88 +32,242 @@ function isModuleNotFoundError(error) {
|
|
|
17
32
|
const message = error instanceof Error ? error.message : "";
|
|
18
33
|
return message.includes("Cannot find module");
|
|
19
34
|
}
|
|
20
|
-
|
|
35
|
+
function isPackagePathNotExportedError(error) {
|
|
36
|
+
if (!error || typeof error !== "object") {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
return "code" in error && error.code === "ERR_PACKAGE_PATH_NOT_EXPORTED";
|
|
40
|
+
}
|
|
41
|
+
function isFallthroughResolutionError(error) {
|
|
42
|
+
return isModuleNotFoundError(error) || isPackagePathNotExportedError(error);
|
|
43
|
+
}
|
|
44
|
+
function normalizeCredential(value) {
|
|
45
|
+
return typeof value === "string" ? value.trim() : "";
|
|
46
|
+
}
|
|
47
|
+
function getCompanionResolvePaths() {
|
|
48
|
+
const cacheDirs = getOpencodeRuntimeDirCandidates().cacheDirs;
|
|
49
|
+
const resolvePaths = [...cacheDirs];
|
|
50
|
+
for (const cacheDir of cacheDirs) {
|
|
51
|
+
try {
|
|
52
|
+
const packagesDir = join(cacheDir, "packages");
|
|
53
|
+
const entries = readdirSync(packagesDir, { withFileTypes: true });
|
|
54
|
+
for (const entry of entries) {
|
|
55
|
+
if (entry.isDirectory() && entry.name.startsWith(COMPANION_PACKAGE_NAME)) {
|
|
56
|
+
resolvePaths.push(join(packagesDir, entry.name));
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
// Ignore if packages dir doesn't exist
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return resolvePaths;
|
|
65
|
+
}
|
|
66
|
+
function markPackageFoundForExportBlock(error, context) {
|
|
67
|
+
if (isPackagePathNotExportedError(error)) {
|
|
68
|
+
context.packageFound = true;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
function resolveCompanionSpecifier(specifier, context) {
|
|
72
|
+
try {
|
|
73
|
+
return require.resolve(specifier);
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
markPackageFoundForExportBlock(error, context);
|
|
77
|
+
if (!isFallthroughResolutionError(error)) {
|
|
78
|
+
throw error;
|
|
79
|
+
}
|
|
80
|
+
try {
|
|
81
|
+
return require.resolve(specifier, { paths: getCompanionResolvePaths() });
|
|
82
|
+
}
|
|
83
|
+
catch (resolvePathsError) {
|
|
84
|
+
markPackageFoundForExportBlock(resolvePathsError, context);
|
|
85
|
+
throw resolvePathsError;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
function buildConfiguredState(params) {
|
|
90
|
+
return {
|
|
91
|
+
presence: {
|
|
92
|
+
state: "present",
|
|
93
|
+
importSpecifier: params.importSpecifier,
|
|
94
|
+
resolvedPath: params.resolvedPath,
|
|
95
|
+
},
|
|
96
|
+
credentials: {
|
|
97
|
+
state: "configured",
|
|
98
|
+
clientId: params.clientId,
|
|
99
|
+
clientSecret: params.clientSecret,
|
|
100
|
+
resolvedPath: params.resolvedPath,
|
|
101
|
+
},
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
function buildInvalidState(importSpecifier, resolvedPath) {
|
|
105
|
+
return {
|
|
106
|
+
presence: {
|
|
107
|
+
state: "invalid",
|
|
108
|
+
importSpecifier,
|
|
109
|
+
...(resolvedPath ? { resolvedPath } : {}),
|
|
110
|
+
error: COMPANION_INVALID_ERROR,
|
|
111
|
+
},
|
|
112
|
+
credentials: {
|
|
113
|
+
state: "invalid",
|
|
114
|
+
...(resolvedPath ? { resolvedPath } : {}),
|
|
115
|
+
error: COMPANION_INVALID_ERROR,
|
|
116
|
+
},
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
function parseSourceCredentials(content) {
|
|
120
|
+
const clientId = content.match(/(?:export\s+const|const|var)\s+ANTIGRAVITY_CLIENT_ID\s*=\s*["']([^"']+)["']/)?.[1]?.trim() ?? "";
|
|
121
|
+
const clientSecret = content.match(/(?:export\s+const|const|var)\s+ANTIGRAVITY_CLIENT_SECRET\s*=\s*["']([^"']+)["']/)?.[1]?.trim() ?? "";
|
|
122
|
+
return clientId && clientSecret ? { clientId, clientSecret } : null;
|
|
123
|
+
}
|
|
124
|
+
function getPackageCredentialPaths(packageRoot) {
|
|
125
|
+
return COMPANION_DIRECT_CANDIDATE_PATHS.map((parts) => join(packageRoot, ...parts));
|
|
126
|
+
}
|
|
127
|
+
function getRuntimeCredentialPaths() {
|
|
128
|
+
return getCompanionResolvePaths().flatMap((cacheDir) => getPackageCredentialPaths(join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME)));
|
|
129
|
+
}
|
|
130
|
+
function isMissingFileError(error) {
|
|
131
|
+
if (!error || typeof error !== "object") {
|
|
132
|
+
return false;
|
|
133
|
+
}
|
|
134
|
+
const code = "code" in error ? error.code : undefined;
|
|
135
|
+
return code === "ENOENT" || code === "ENOTDIR";
|
|
136
|
+
}
|
|
137
|
+
async function tryReadCredentialsPath(importSpecifier, resolvedPath) {
|
|
138
|
+
let content;
|
|
139
|
+
try {
|
|
140
|
+
content = await readFile(resolvedPath, "utf8");
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
return isMissingFileError(error) ? null : buildInvalidState(importSpecifier, resolvedPath);
|
|
144
|
+
}
|
|
145
|
+
const credentials = parseSourceCredentials(content);
|
|
146
|
+
if (!credentials) {
|
|
147
|
+
return buildInvalidState(importSpecifier, resolvedPath);
|
|
148
|
+
}
|
|
149
|
+
return buildConfiguredState({
|
|
150
|
+
importSpecifier,
|
|
151
|
+
resolvedPath,
|
|
152
|
+
clientId: credentials.clientId,
|
|
153
|
+
clientSecret: credentials.clientSecret,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
async function tryResolveJsConstants(importSpecifier, context) {
|
|
21
157
|
let resolvedPath;
|
|
22
158
|
try {
|
|
23
|
-
resolvedPath =
|
|
159
|
+
resolvedPath = resolveCompanionSpecifier(importSpecifier, context);
|
|
24
160
|
}
|
|
25
161
|
catch (error) {
|
|
26
|
-
if (
|
|
27
|
-
return
|
|
28
|
-
presence: {
|
|
29
|
-
state: "missing",
|
|
30
|
-
importSpecifier: COMPANION_IMPORT_SPECIFIER,
|
|
31
|
-
error: COMPANION_MISSING_ERROR,
|
|
32
|
-
},
|
|
33
|
-
credentials: {
|
|
34
|
-
state: "missing",
|
|
35
|
-
error: COMPANION_MISSING_ERROR,
|
|
36
|
-
},
|
|
37
|
-
};
|
|
162
|
+
if (isFallthroughResolutionError(error)) {
|
|
163
|
+
return null;
|
|
38
164
|
}
|
|
39
|
-
return
|
|
40
|
-
presence: {
|
|
41
|
-
state: "invalid",
|
|
42
|
-
importSpecifier: COMPANION_IMPORT_SPECIFIER,
|
|
43
|
-
error: COMPANION_INVALID_ERROR,
|
|
44
|
-
},
|
|
45
|
-
credentials: {
|
|
46
|
-
state: "invalid",
|
|
47
|
-
error: COMPANION_INVALID_ERROR,
|
|
48
|
-
},
|
|
49
|
-
};
|
|
165
|
+
return buildInvalidState(importSpecifier);
|
|
50
166
|
}
|
|
51
167
|
let companionModule;
|
|
52
168
|
try {
|
|
53
169
|
companionModule = (await import(pathToFileURL(resolvedPath).href));
|
|
54
170
|
}
|
|
55
171
|
catch {
|
|
56
|
-
return
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
resolvedPath,
|
|
61
|
-
error: COMPANION_INVALID_ERROR,
|
|
62
|
-
},
|
|
63
|
-
credentials: {
|
|
64
|
-
state: "invalid",
|
|
65
|
-
resolvedPath,
|
|
66
|
-
error: COMPANION_INVALID_ERROR,
|
|
67
|
-
},
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
const clientId = typeof companionModule.ANTIGRAVITY_CLIENT_ID === "string"
|
|
71
|
-
? companionModule.ANTIGRAVITY_CLIENT_ID.trim()
|
|
72
|
-
: "";
|
|
73
|
-
const clientSecret = typeof companionModule.ANTIGRAVITY_CLIENT_SECRET === "string"
|
|
74
|
-
? companionModule.ANTIGRAVITY_CLIENT_SECRET.trim()
|
|
75
|
-
: "";
|
|
172
|
+
return buildInvalidState(importSpecifier, resolvedPath);
|
|
173
|
+
}
|
|
174
|
+
const clientId = normalizeCredential(companionModule.ANTIGRAVITY_CLIENT_ID);
|
|
175
|
+
const clientSecret = normalizeCredential(companionModule.ANTIGRAVITY_CLIENT_SECRET);
|
|
76
176
|
if (!clientId || !clientSecret) {
|
|
77
|
-
return
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
177
|
+
return buildInvalidState(importSpecifier, resolvedPath);
|
|
178
|
+
}
|
|
179
|
+
return buildConfiguredState({ importSpecifier, resolvedPath, clientId, clientSecret });
|
|
180
|
+
}
|
|
181
|
+
async function tryRuntimeCredentialPaths() {
|
|
182
|
+
for (const candidatePath of getRuntimeCredentialPaths()) {
|
|
183
|
+
const resolved = await tryReadCredentialsPath(COMPANION_SOURCE_IMPORT_SPECIFIER, candidatePath);
|
|
184
|
+
if (resolved) {
|
|
185
|
+
return resolved;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
return null;
|
|
189
|
+
}
|
|
190
|
+
async function tryResolveSourceConstants(context) {
|
|
191
|
+
let resolvedPath;
|
|
192
|
+
try {
|
|
193
|
+
resolvedPath = resolveCompanionSpecifier(COMPANION_SOURCE_IMPORT_SPECIFIER, context);
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
return isFallthroughResolutionError(error)
|
|
197
|
+
? null
|
|
198
|
+
: buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER);
|
|
199
|
+
}
|
|
200
|
+
return ((await tryReadCredentialsPath(COMPANION_SOURCE_IMPORT_SPECIFIER, resolvedPath)) ??
|
|
201
|
+
buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER, resolvedPath));
|
|
202
|
+
}
|
|
203
|
+
async function tryResolvePackageJson(context) {
|
|
204
|
+
let packageJsonPath;
|
|
205
|
+
try {
|
|
206
|
+
packageJsonPath = resolveCompanionSpecifier(COMPANION_PACKAGE_JSON_SPECIFIER, context);
|
|
207
|
+
}
|
|
208
|
+
catch (error) {
|
|
209
|
+
return isFallthroughResolutionError(error)
|
|
210
|
+
? null
|
|
211
|
+
: buildInvalidState(COMPANION_PACKAGE_JSON_SPECIFIER);
|
|
212
|
+
}
|
|
213
|
+
const packageRoot = dirname(packageJsonPath);
|
|
214
|
+
for (const candidatePath of getPackageCredentialPaths(packageRoot)) {
|
|
215
|
+
const resolved = await tryReadCredentialsPath(COMPANION_PACKAGE_JSON_SPECIFIER, candidatePath);
|
|
216
|
+
if (resolved) {
|
|
217
|
+
return resolved;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
return buildInvalidState(COMPANION_PACKAGE_JSON_SPECIFIER, packageJsonPath);
|
|
221
|
+
}
|
|
222
|
+
async function tryResolvePackageEntry(context) {
|
|
223
|
+
let packageEntryPath;
|
|
224
|
+
try {
|
|
225
|
+
packageEntryPath = resolveCompanionSpecifier(COMPANION_PACKAGE_NAME, context);
|
|
226
|
+
}
|
|
227
|
+
catch (error) {
|
|
228
|
+
return isFallthroughResolutionError(error)
|
|
229
|
+
? null
|
|
230
|
+
: buildInvalidState(COMPANION_PACKAGE_NAME);
|
|
231
|
+
}
|
|
232
|
+
return ((await tryReadCredentialsPath(COMPANION_PACKAGE_NAME, packageEntryPath)) ??
|
|
233
|
+
buildInvalidState(COMPANION_PACKAGE_NAME, packageEntryPath));
|
|
234
|
+
}
|
|
235
|
+
async function resolveCompanionState() {
|
|
236
|
+
const context = { packageFound: false };
|
|
237
|
+
for (const importSpecifier of COMPANION_JS_IMPORT_SPECIFIERS) {
|
|
238
|
+
const resolved = await tryResolveJsConstants(importSpecifier, context);
|
|
239
|
+
if (resolved) {
|
|
240
|
+
return resolved;
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
const runtimeResolved = await tryRuntimeCredentialPaths();
|
|
244
|
+
if (runtimeResolved) {
|
|
245
|
+
return runtimeResolved;
|
|
246
|
+
}
|
|
247
|
+
const sourceResolved = await tryResolveSourceConstants(context);
|
|
248
|
+
if (sourceResolved) {
|
|
249
|
+
return sourceResolved;
|
|
250
|
+
}
|
|
251
|
+
const packageJsonResolved = await tryResolvePackageJson(context);
|
|
252
|
+
if (packageJsonResolved) {
|
|
253
|
+
return packageJsonResolved;
|
|
254
|
+
}
|
|
255
|
+
const packageEntryResolved = await tryResolvePackageEntry(context);
|
|
256
|
+
if (packageEntryResolved) {
|
|
257
|
+
return packageEntryResolved;
|
|
258
|
+
}
|
|
259
|
+
if (context.packageFound) {
|
|
260
|
+
return buildInvalidState(COMPANION_PACKAGE_NAME);
|
|
90
261
|
}
|
|
91
262
|
return {
|
|
92
263
|
presence: {
|
|
93
|
-
state: "
|
|
94
|
-
importSpecifier:
|
|
95
|
-
|
|
264
|
+
state: "missing",
|
|
265
|
+
importSpecifier: COMPANION_SOURCE_IMPORT_SPECIFIER,
|
|
266
|
+
error: COMPANION_MISSING_ERROR,
|
|
96
267
|
},
|
|
97
268
|
credentials: {
|
|
98
|
-
state: "
|
|
99
|
-
|
|
100
|
-
clientSecret,
|
|
101
|
-
resolvedPath,
|
|
269
|
+
state: "missing",
|
|
270
|
+
error: COMPANION_MISSING_ERROR,
|
|
102
271
|
},
|
|
103
272
|
};
|
|
104
273
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-antigravity-companion.js","sourceRoot":"","sources":["../../src/lib/google-antigravity-companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,sBAAsB,GAAG,2BAA2B,CAAC;AAC3D,MAAM,
|
|
1
|
+
{"version":3,"file":"google-antigravity-companion.js","sourceRoot":"","sources":["../../src/lib/google-antigravity-companion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-gemini-cli-companion.d.ts","sourceRoot":"","sources":["../../src/lib/google-gemini-cli-companion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"google-gemini-cli-companion.d.ts","sourceRoot":"","sources":["../../src/lib/google-gemini-cli-companion.ts"],"names":[],"mappings":"AAoBA,MAAM,MAAM,0BAA0B,GAClC;IACE,KAAK,EAAE,SAAS,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,GACD;IACE,KAAK,EAAE,SAAS,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf,GACD;IACE,KAAK,EAAE,SAAS,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,MAAM,8BAA8B,GAAG;IAC3C,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC,8BAA8B,GAC9B;IACE,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AA2QN,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,0BAA0B,CAAC,CAG7F;AAED,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,0BAA0B,CAAC,CAG7F;AAED,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { readFile } from "fs/promises";
|
|
2
|
+
import { readdirSync } from "node:fs";
|
|
2
3
|
import { createRequire } from "node:module";
|
|
3
4
|
import { dirname, join } from "node:path";
|
|
4
5
|
import { pathToFileURL } from "node:url";
|
|
@@ -38,14 +39,30 @@ function normalizeCredential(value) {
|
|
|
38
39
|
return typeof value === "string" ? value.trim() : "";
|
|
39
40
|
}
|
|
40
41
|
function getCompanionResolvePaths() {
|
|
41
|
-
|
|
42
|
+
const cacheDirs = getOpencodeRuntimeDirCandidates().cacheDirs;
|
|
43
|
+
const resolvePaths = [...cacheDirs];
|
|
44
|
+
for (const cacheDir of cacheDirs) {
|
|
45
|
+
try {
|
|
46
|
+
const packagesDir = join(cacheDir, "packages");
|
|
47
|
+
const entries = readdirSync(packagesDir, { withFileTypes: true });
|
|
48
|
+
for (const entry of entries) {
|
|
49
|
+
if (entry.isDirectory() && entry.name.startsWith(COMPANION_PACKAGE_NAME)) {
|
|
50
|
+
resolvePaths.push(join(packagesDir, entry.name));
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
// Ignore if packages dir doesn't exist
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return resolvePaths;
|
|
42
59
|
}
|
|
43
60
|
function resolveCompanionSpecifier(specifier) {
|
|
44
61
|
try {
|
|
45
62
|
return require.resolve(specifier);
|
|
46
63
|
}
|
|
47
64
|
catch (error) {
|
|
48
|
-
if (!
|
|
65
|
+
if (!isFallthroughResolutionError(error)) {
|
|
49
66
|
throw error;
|
|
50
67
|
}
|
|
51
68
|
return require.resolve(specifier, { paths: getCompanionResolvePaths() });
|
|
@@ -82,13 +99,15 @@ function buildInvalidState(importSpecifier, resolvedPath) {
|
|
|
82
99
|
};
|
|
83
100
|
}
|
|
84
101
|
function parseSourceCredentials(content) {
|
|
85
|
-
const clientId = content.match(/(?:export\s+const|var)\s+GEMINI_CLIENT_ID\s*=\s*["']([^"']+)["']/)?.[1]?.trim() ?? "";
|
|
86
|
-
const clientSecret = content.match(/(?:export\s+const|var)\s+GEMINI_CLIENT_SECRET\s*=\s*["']([^"']+)["']/)?.[1]?.trim() ?? "";
|
|
102
|
+
const clientId = content.match(/(?:export\s+const|const|var)\s+GEMINI_CLIENT_ID\s*=\s*["']([^"']+)["']/)?.[1]?.trim() ?? "";
|
|
103
|
+
const clientSecret = content.match(/(?:export\s+const|const|var)\s+GEMINI_CLIENT_SECRET\s*=\s*["']([^"']+)["']/)?.[1]?.trim() ?? "";
|
|
87
104
|
return clientId && clientSecret ? { clientId, clientSecret } : null;
|
|
88
105
|
}
|
|
89
106
|
function getRuntimeSourceConstantPaths() {
|
|
90
107
|
return getCompanionResolvePaths().flatMap((cacheDir) => [
|
|
91
108
|
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "src", "constants.ts"),
|
|
109
|
+
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "src", "constants.js"),
|
|
110
|
+
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "dist", "src", "constants.js"),
|
|
92
111
|
join(cacheDir, "node_modules", COMPANION_PACKAGE_NAME, "dist", "index.js"),
|
|
93
112
|
]);
|
|
94
113
|
}
|
|
@@ -135,6 +154,16 @@ async function tryResolveJsConstants(importSpecifier) {
|
|
|
135
154
|
}
|
|
136
155
|
return buildConfiguredState({ importSpecifier, resolvedPath, clientId, clientSecret });
|
|
137
156
|
}
|
|
157
|
+
async function tryResolvePackageEntry() {
|
|
158
|
+
try {
|
|
159
|
+
const packageEntryPath = resolveCompanionSpecifier(COMPANION_PACKAGE_NAME);
|
|
160
|
+
const packageEntryResolved = await tryReadSourceConstantsPath(packageEntryPath);
|
|
161
|
+
return packageEntryResolved ?? buildInvalidState(COMPANION_PACKAGE_NAME, packageEntryPath);
|
|
162
|
+
}
|
|
163
|
+
catch (error) {
|
|
164
|
+
return isFallthroughResolutionError(error) ? null : buildInvalidState(COMPANION_PACKAGE_NAME);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
138
167
|
async function tryResolveSourceConstants() {
|
|
139
168
|
let resolvedPath;
|
|
140
169
|
try {
|
|
@@ -165,24 +194,10 @@ async function tryResolveSourceConstants() {
|
|
|
165
194
|
resolvedPath = join(packageRoot, "src", "constants.ts");
|
|
166
195
|
}
|
|
167
196
|
catch (packageError) {
|
|
168
|
-
if (
|
|
169
|
-
|
|
170
|
-
const packageEntryPath = resolveCompanionSpecifier(COMPANION_PACKAGE_NAME);
|
|
171
|
-
const packageEntryResolved = await tryReadSourceConstantsPath(packageEntryPath);
|
|
172
|
-
if (packageEntryResolved) {
|
|
173
|
-
return packageEntryResolved;
|
|
174
|
-
}
|
|
175
|
-
return buildInvalidState(COMPANION_PACKAGE_NAME, packageEntryPath);
|
|
176
|
-
}
|
|
177
|
-
catch (packageEntryError) {
|
|
178
|
-
return isModuleNotFoundError(packageEntryError)
|
|
179
|
-
? null
|
|
180
|
-
: buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER);
|
|
181
|
-
}
|
|
197
|
+
if (isFallthroughResolutionError(packageError)) {
|
|
198
|
+
return tryResolvePackageEntry();
|
|
182
199
|
}
|
|
183
|
-
return
|
|
184
|
-
? null
|
|
185
|
-
: buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER);
|
|
200
|
+
return buildInvalidState(COMPANION_SOURCE_IMPORT_SPECIFIER);
|
|
186
201
|
}
|
|
187
202
|
}
|
|
188
203
|
return ((await tryReadSourceConstantsPath(resolvedPath)) ??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-gemini-cli-companion.js","sourceRoot":"","sources":["../../src/lib/google-gemini-cli-companion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AACtD,MAAM,8BAA8B,GAAG;IACrC,GAAG,sBAAsB,wBAAwB;IACjD,GAAG,sBAAsB,mBAAmB;CACpC,CAAC;AACX,MAAM,iCAAiC,GAAG,GAAG,sBAAsB,mBAAmB,CAAC;AACvF,MAAM,gCAAgC,GAAG,GAAG,sBAAsB,eAAe,CAAC;AAClF,MAAM,uBAAuB,GAAG,WAAW,sBAAsB,wCAAwC,CAAC;AAC1G,MAAM,uBAAuB,GAAG,aAAa,sBAAsB,0BAA0B,CAAC;AA6C9F,IAAI,6BAA6B,GAA2C,IAAI,CAAC;AAEjF,SAAS,qBAAqB,CAAC,KAAc;IAC3C,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5D,OAAO,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAc;IACnD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,+BAA+B,CAAC;AAC3E,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAc;IAClD,OAAO,qBAAqB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,wBAAwB;IAC/B,
|
|
1
|
+
{"version":3,"file":"google-gemini-cli-companion.js","sourceRoot":"","sources":["../../src/lib/google-gemini-cli-companion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,7 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* NanoGPT API key configuration resolver.
|
|
3
|
-
*
|
|
4
|
-
* Resolution priority (first wins):
|
|
5
|
-
* 1. Environment variable: NANOGPT_API_KEY or NANO_GPT_API_KEY
|
|
6
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.nanogpt.options.apiKey
|
|
7
|
-
* or provider["nano-gpt"].options.apiKey
|
|
8
|
-
* 3. auth.json: nanogpt.key or nano-gpt.key
|
|
9
|
-
*/
|
|
10
|
-
/** Result of NanoGPT API key resolution */
|
|
11
1
|
export interface NanoGptApiKeyResult {
|
|
12
2
|
key: string;
|
|
13
3
|
source: NanoGptKeySource;
|
|
14
4
|
}
|
|
15
|
-
/** Source of the resolved API key */
|
|
16
5
|
export type NanoGptKeySource = "env:NANOGPT_API_KEY" | "env:NANO_GPT_API_KEY" | "opencode.json" | "opencode.jsonc" | "auth.json";
|
|
17
6
|
export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
|
|
18
7
|
export declare function resolveNanoGptApiKey(): Promise<NanoGptApiKeyResult | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nanogpt-config.d.ts","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"nanogpt-config.d.ts","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAKD,MAAM,MAAM,gBAAgB,GACxB,qBAAqB,GACrB,sBAAsB,GACtB,eAAe,GACf,gBAAgB,GAChB,WAAW,CAAC;AAEhB,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAkBjH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAEhF;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAEzD;AAED,wBAAsB,wBAAwB,IAAI,OAAO,CAAC;IACxD,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC,CAKD"}
|
|
@@ -1,49 +1,33 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* NanoGPT API key configuration resolver.
|
|
3
|
-
*
|
|
4
|
-
* Resolution priority (first wins):
|
|
5
|
-
* 1. Environment variable: NANOGPT_API_KEY or NANO_GPT_API_KEY
|
|
6
|
-
* 2. User/global opencode.json/opencode.jsonc: provider.nanogpt.options.apiKey
|
|
7
|
-
* or provider["nano-gpt"].options.apiKey
|
|
8
|
-
* 3. auth.json: nanogpt.key or nano-gpt.key
|
|
9
|
-
*/
|
|
10
1
|
import { getAuthPaths, readAuthFile } from "./opencode-auth.js";
|
|
11
|
-
import {
|
|
2
|
+
import { createProviderApiKeyResolver, getGlobalOpencodeConfigCandidatePaths, } from "./api-key-resolver.js";
|
|
12
3
|
const ALLOWED_NANOGPT_ENV_VARS = ["NANOGPT_API_KEY", "NANO_GPT_API_KEY"];
|
|
13
4
|
const NANOGPT_PROVIDER_KEYS = ["nanogpt", "nano-gpt"];
|
|
14
|
-
// Re-export for consumers that need path info
|
|
15
5
|
export { getGlobalOpencodeConfigCandidatePaths as getOpencodeConfigCandidatePaths } from "./api-key-resolver.js";
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
extractFromAuth: (auth) => extractAuthApiKeyEntry(auth, NANOGPT_PROVIDER_KEYS),
|
|
6
|
+
const nanoGptApiKeyResolver = createProviderApiKeyResolver({
|
|
7
|
+
envVars: [
|
|
8
|
+
{ name: "NANOGPT_API_KEY", source: "env:NANOGPT_API_KEY" },
|
|
9
|
+
{ name: "NANO_GPT_API_KEY", source: "env:NANO_GPT_API_KEY" },
|
|
10
|
+
],
|
|
11
|
+
providerKeys: NANOGPT_PROVIDER_KEYS,
|
|
12
|
+
allowedEnvVars: ALLOWED_NANOGPT_ENV_VARS,
|
|
13
|
+
configJsonSource: "opencode.json",
|
|
14
|
+
configJsoncSource: "opencode.jsonc",
|
|
15
|
+
getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
|
|
16
|
+
auth: {
|
|
17
|
+
readAuth: readAuthFile,
|
|
29
18
|
authSource: "auth.json",
|
|
30
|
-
|
|
31
|
-
|
|
19
|
+
},
|
|
20
|
+
});
|
|
21
|
+
export async function resolveNanoGptApiKey() {
|
|
22
|
+
return nanoGptApiKeyResolver.resolve();
|
|
32
23
|
}
|
|
33
24
|
export async function hasNanoGptApiKey() {
|
|
34
|
-
|
|
35
|
-
return result !== null;
|
|
25
|
+
return nanoGptApiKeyResolver.has();
|
|
36
26
|
}
|
|
37
27
|
export async function getNanoGptKeyDiagnostics() {
|
|
38
|
-
const authPaths = getAuthPaths();
|
|
39
|
-
const diagnostics = await getApiKeyDiagnostics({
|
|
40
|
-
envVarNames: ["NANOGPT_API_KEY", "NANO_GPT_API_KEY"],
|
|
41
|
-
resolve: resolveNanoGptApiKey,
|
|
42
|
-
getConfigCandidates: getGlobalOpencodeConfigCandidatePaths,
|
|
43
|
-
});
|
|
44
28
|
return {
|
|
45
|
-
...diagnostics,
|
|
46
|
-
authPaths,
|
|
29
|
+
...(await nanoGptApiKeyResolver.diagnostics()),
|
|
30
|
+
authPaths: getAuthPaths(),
|
|
47
31
|
};
|
|
48
32
|
}
|
|
49
33
|
//# sourceMappingURL=nanogpt-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nanogpt-config.js","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"nanogpt-config.js","sourceRoot":"","sources":["../../src/lib/nanogpt-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,4BAA4B,EAC5B,qCAAqC,GACtC,MAAM,uBAAuB,CAAC;AAO/B,MAAM,wBAAwB,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAU,CAAC;AAClF,MAAM,qBAAqB,GAAG,CAAC,SAAS,EAAE,UAAU,CAAU,CAAC;AAS/D,OAAO,EAAE,qCAAqC,IAAI,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AAEjH,MAAM,qBAAqB,GAAG,4BAA4B,CAAmB;IAC3E,OAAO,EAAE;QACP,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,qBAAqB,EAAE;QAC1D,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,sBAAsB,EAAE;KAC7D;IACD,YAAY,EAAE,qBAAqB;IACnC,cAAc,EAAE,wBAAwB;IACxC,gBAAgB,EAAE,eAAe;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,mBAAmB,EAAE,qCAAqC;IAC1D,IAAI,EAAE;QACJ,QAAQ,EAAE,YAAY;QACtB,UAAU,EAAE,WAAW;KACxB;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,OAAO,qBAAqB,CAAC,OAAO,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,OAAO,qBAAqB,CAAC,GAAG,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB;IAM5C,OAAO;QACL,GAAG,CAAC,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,EAAE,YAAY,EAAE;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -39,5 +39,5 @@ export declare function createQuotaRuntimeRequestContext(runtime: Pick<QuotaRunt
|
|
|
39
39
|
sessionID?: string;
|
|
40
40
|
sessionMeta?: QuotaSessionModelContext;
|
|
41
41
|
};
|
|
42
|
-
export declare function createQuotaProviderRuntimeContext(runtime: Pick<QuotaRuntimeContext, "client" | "config" | "session">): QuotaProviderContext;
|
|
42
|
+
export declare function createQuotaProviderRuntimeContext(runtime: Pick<QuotaRuntimeContext, "client" | "config" | "session"> & Partial<Pick<QuotaRuntimeContext, "configMeta">>): QuotaProviderContext;
|
|
43
43
|
//# sourceMappingURL=quota-runtime-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-runtime-context.d.ts","sourceRoot":"","sources":["../../src/lib/quota-runtime-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAwB,UAAU,EAAE,MAAM,aAAa,CAAC;AAI/D,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAC5E,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AAEjC,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,uBAAuB,CAAC;IAC/B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9E,kBAAkB,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC;IACvE,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;KACxC,CAAC;CACH;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,gBAAgB,CAAC;IACzB,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;CAC7E,GAAG,OAAO,CAMV;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,mBAAmB,CAAC,CAiC9B;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAC5C;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;CACxC,CAKA;AAED,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"quota-runtime-context.d.ts","sourceRoot":"","sources":["../../src/lib/quota-runtime-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAwB,UAAU,EAAE,MAAM,aAAa,CAAC;AAI/D,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAC5E,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AAEjC,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,uBAAuB,CAAC;IAC/B,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9E,kBAAkB,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC;IACvE,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,mBAAmB,CAAC;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;IAC3B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;KACxC,CAAC;CACH;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,gBAAgB,CAAC;IACzB,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,oBAAoB,CAAC,CAAC;CAC7E,GAAG,OAAO,CAMV;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,mBAAmB,CAAC,CAiC9B;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAC5C;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,wBAAwB,CAAC;CACxC,CAKA;AAED,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,IAAI,CAAC,mBAAmB,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC,GACjE,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC,GACjD,oBAAoB,CAsBtB"}
|