@plurnk/plurnk-providers 3.0.3 → 5.0.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/.env.defaults +2 -4
- package/README.md +2 -2
- package/SPEC.md +190 -82
- package/dist/AiSdkProvider.d.ts +1 -3
- package/dist/AiSdkProvider.d.ts.map +1 -1
- package/dist/AiSdkProvider.js +20 -41
- package/dist/AiSdkProvider.js.map +1 -1
- package/dist/AiSdkRequestBody.d.ts.map +1 -1
- package/dist/AiSdkRequestBody.js +3 -1
- package/dist/AiSdkRequestBody.js.map +1 -1
- package/dist/LeadingReasoning.js +3 -3
- package/dist/LeadingReasoning.js.map +1 -1
- package/dist/Mock.d.ts +3 -3
- package/dist/Mock.d.ts.map +1 -1
- package/dist/Mock.js.map +1 -1
- package/dist/Pool.d.ts +1 -2
- package/dist/Pool.d.ts.map +1 -1
- package/dist/Pool.js +7 -8
- package/dist/Pool.js.map +1 -1
- package/dist/ProviderRegistry.d.ts.map +1 -1
- package/dist/ProviderRegistry.js +8 -4
- package/dist/ProviderRegistry.js.map +1 -1
- package/dist/RequestFields.d.ts.map +1 -1
- package/dist/RequestFields.js +15 -7
- package/dist/RequestFields.js.map +1 -1
- package/dist/accounting.d.ts.map +1 -1
- package/dist/accounting.js +8 -5
- package/dist/accounting.js.map +1 -1
- package/dist/aiSdkTransport.d.ts.map +1 -1
- package/dist/aiSdkTransport.js +41 -61
- package/dist/aiSdkTransport.js.map +1 -1
- package/dist/catalogProvider.d.ts +2 -3
- package/dist/catalogProvider.d.ts.map +1 -1
- package/dist/catalogProvider.js +9 -9
- package/dist/catalogProvider.js.map +1 -1
- package/dist/compatibleProvider.d.ts +1 -1
- package/dist/compatibleProvider.d.ts.map +1 -1
- package/dist/compatibleProvider.js +22 -10
- package/dist/compatibleProvider.js.map +1 -1
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +18 -8
- package/dist/cost.js.map +1 -1
- package/dist/env.d.ts +9 -8
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +4 -4
- package/dist/env.js.map +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +7 -7
- package/dist/errors.js.map +1 -1
- package/dist/model-options.d.ts.map +1 -1
- package/dist/model-options.js +1 -1
- package/dist/model-options.js.map +1 -1
- package/dist/native-tools.d.ts.map +1 -1
- package/dist/native-tools.js +3 -0
- package/dist/native-tools.js.map +1 -1
- package/dist/ollama.d.ts.map +1 -1
- package/dist/ollama.js +3 -1
- package/dist/ollama.js.map +1 -1
- package/dist/promptTokens.d.ts.map +1 -1
- package/dist/promptTokens.js +11 -5
- package/dist/promptTokens.js.map +1 -1
- package/dist/providerError.d.ts +1 -1
- package/dist/providerError.d.ts.map +1 -1
- package/dist/providerError.js +2 -3
- package/dist/providerError.js.map +1 -1
- package/dist/sdkModels.d.ts.map +1 -1
- package/dist/sdkModels.js +9 -3
- package/dist/sdkModels.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/usage.d.ts +1 -1
- package/dist/usage.d.ts.map +1 -1
- package/dist/usage.js +18 -5
- package/dist/usage.js.map +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProviderRegistry.d.ts","sourceRoot":"","sources":["../src/ProviderRegistry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ProviderRegistry.d.ts","sourceRoot":"","sources":["../src/ProviderRegistry.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAA0B,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEnE,OAAO,EAAY,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAmB/E,KAAK,YAAY,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE5D,KAAK,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,qBAAqB,CAAC,GAAG;IAC3D,mBAAmB,CAAC,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC;CAC1D,CAAC;AACF,KAAK,UAAU,GAAG,CAAC,OAAO,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;AAczE,eAAO,MAAM,mBAAmB,SACtB,MAAM,OACP,MAAM,CAAC,UAAU,SACf,MAAM,eACD,YAAY,eACZ,UAAU,YACZ,MAAM,EAAE,+EAA+E;QACzF,MAAM,KACf,OAAO,CAAC,QAAQ,CAkDlB,CAAC;AAGF,eAAO,MAAM,mBAAmB,QAAO,IAAmC,CAAC;AAG3E,eAAO,MAAM,kBAAkB,SACtB,MAAM,CAAC,UAAU,eACV,YAAY,eACZ,UAAU,KACvB,OAAO,CAAC,QAAQ,CAclB,CAAC"}
|
package/dist/ProviderRegistry.js
CHANGED
|
@@ -15,15 +15,18 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
|
|
|
15
15
|
}
|
|
16
16
|
return path;
|
|
17
17
|
};
|
|
18
|
+
import { isRecord } from "@plurnk/plurnk-contracts";
|
|
18
19
|
import { catalogProviderFromEnv, providerFromSdkModel } from "./catalogProvider.js";
|
|
19
20
|
import { discover } from "./discover.js";
|
|
20
21
|
import { resolveActiveRoute } from "@plurnk/plurnk-aliases";
|
|
21
|
-
import { scopeEnvToAlias } from "./env.js";
|
|
22
|
+
import { scopeEnvToAlias, contextWindowFromEnv } from "./env.js";
|
|
22
23
|
import { ollamaProviderFromEnv } from "./ollama.js";
|
|
23
24
|
import { compatibleProviderFromEnv } from "./compatibleProvider.js";
|
|
24
|
-
import { contextWindowFromEnv } from "./env.js";
|
|
25
25
|
import { withProviderDefaults } from "./defaults.js";
|
|
26
26
|
import Meta, {} from "@plurnk/plurnk-meta";
|
|
27
|
+
// An AI SDK provider: an object or a callable that constructs language models by name.
|
|
28
|
+
const isAiSdkProvider = (value) => (typeof value === "object" || typeof value === "function") && value !== null
|
|
29
|
+
&& "languageModel" in value && typeof value.languageModel === "function";
|
|
27
30
|
const importModule = (specifier) => import(__rewriteRelativeImportExtension(specifier));
|
|
28
31
|
// The node_modules scan is filesystem work that never changes within a process,
|
|
29
32
|
// so it runs once and the result is memoized. A long-lived daemon pays one scan
|
|
@@ -50,6 +53,7 @@ alias) => {
|
|
|
50
53
|
return ollamaProviderFromEnv(env, model, baseUrl === undefined ? undefined : { baseUrl });
|
|
51
54
|
if (name === "openai")
|
|
52
55
|
return compatibleProviderFromEnv(env, model, baseUrl);
|
|
56
|
+
// oxlint-disable-next-line typescript/no-useless-default-assignment -- tsc reads both fields as optional; the defaults are the contract
|
|
53
57
|
const { registry, skipped, packageAttributions = new Map(), grammarStyles = new Map() } = await providerPackages(discoverFn, env);
|
|
54
58
|
const specifier = registry.get(name);
|
|
55
59
|
if (specifier === undefined) {
|
|
@@ -66,8 +70,8 @@ alias) => {
|
|
|
66
70
|
catch (cause) {
|
|
67
71
|
throw new Error(`provider "${name}" resolves to ${specifier}, but importing it failed`, { cause });
|
|
68
72
|
}
|
|
69
|
-
const sdkProvider = mod.default;
|
|
70
|
-
if (sdkProvider
|
|
73
|
+
const sdkProvider = isRecord(mod) ? mod.default : undefined;
|
|
74
|
+
if (!isAiSdkProvider(sdkProvider)) {
|
|
71
75
|
throw new Error(`${specifier} default export is not an AI SDK provider (missing languageModel)`);
|
|
72
76
|
}
|
|
73
77
|
if (baseUrl !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProviderRegistry.js","sourceRoot":"","sources":["../src/ProviderRegistry.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,2EAA2E;AAC3E,8EAA8E;AAC9E,yCAAyC;AACzC,EAAE;AACF,0EAA0E;AAC1E,yFAAyF;AACzF,+EAA+E;AAC/E,gEAAgE;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ProviderRegistry.js","sourceRoot":"","sources":["../src/ProviderRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestFields.d.ts","sourceRoot":"","sources":["../src/RequestFields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAKlE,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC3C,KAAK,KAAK,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,oBAAoB,EAAE,CAAA;CAAE,CAAC;AAC1G,QAAA,MAAM,WAAW,YAAI,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAU,CAAC;AAClF,KAAK,UAAU,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestFields.d.ts","sourceRoot":"","sources":["../src/RequestFields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAKlE,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC3C,KAAK,KAAK,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,oBAAoB,EAAE,CAAA;CAAE,CAAC;AAC1G,QAAA,MAAM,WAAW,YAAI,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAU,CAAC;AAClF,KAAK,UAAU,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAyDtD,MAAM,CAAC,OAAO,OAAO,aAAa;;IAC9B,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAkD;IAEzF,MAAM,CAAC,QAAQ,CAAC,KAAK,oBAI4B;IAEjD,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,SAAS,CAKzE;IAWD,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,UAAU,EAAE,CAElF;IAED,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAQ9D;IAED,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACjD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAc1C,YAAY,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,KAAK,EAoE9D;IAED,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,WAAW,CA+B5E;CACJ"}
|
package/dist/RequestFields.js
CHANGED
|
@@ -3,6 +3,8 @@ import { UnsupportedEffortError } from "./types.js";
|
|
|
3
3
|
import { providerSetting } from "./provider-env.js";
|
|
4
4
|
import { adaptiveEffortFromEnv } from "./reasoning-effort.js";
|
|
5
5
|
const wireEfforts = ["minimal", "low", "medium", "high", "xhigh", "max"];
|
|
6
|
+
const declarableEfforts = new Set([...wireEfforts, "none"]);
|
|
7
|
+
const isWireEffort = (value) => declarableEfforts.has(value);
|
|
6
8
|
const unsafe = new Set(["__proto__", "constructor", "prototype"]);
|
|
7
9
|
const managed = new Set([
|
|
8
10
|
"model", "messages", "stream", "stream_options", "max_tokens", "max_completion_tokens",
|
|
@@ -27,11 +29,17 @@ const set = (body, path, value) => {
|
|
|
27
29
|
let parent = body;
|
|
28
30
|
for (const part of path.slice(0, -1)) {
|
|
29
31
|
const existing = parent[part];
|
|
30
|
-
if (existing === undefined)
|
|
31
|
-
|
|
32
|
-
|
|
32
|
+
if (existing === undefined) {
|
|
33
|
+
const next = {};
|
|
34
|
+
parent[part] = next;
|
|
35
|
+
parent = next;
|
|
36
|
+
}
|
|
37
|
+
else if (!object(existing)) {
|
|
33
38
|
throw new TypeError(`request fields overlap at ${part}`);
|
|
34
|
-
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
parent = existing;
|
|
42
|
+
}
|
|
35
43
|
}
|
|
36
44
|
parent[path.at(-1)] = value;
|
|
37
45
|
};
|
|
@@ -41,7 +49,7 @@ const leaves = (body, parent = []) => Object.entries(body).flatMap(([key, value]
|
|
|
41
49
|
const merge = (left, right) => {
|
|
42
50
|
const result = structuredClone(left);
|
|
43
51
|
for (const path of leaves(right)) {
|
|
44
|
-
const value = path.reduce((at, key) => at[key], right);
|
|
52
|
+
const value = path.reduce((at, key) => object(at) ? at[key] : undefined, right);
|
|
45
53
|
set(result, path, structuredClone(value));
|
|
46
54
|
}
|
|
47
55
|
return result;
|
|
@@ -68,10 +76,10 @@ export default class RequestFields {
|
|
|
68
76
|
if (raw === undefined)
|
|
69
77
|
return undefined;
|
|
70
78
|
const values = raw.split(",").map((value) => value.trim()).filter(Boolean);
|
|
71
|
-
const invalid = values.find((value) =>
|
|
79
|
+
const invalid = values.find((value) => !isWireEffort(value));
|
|
72
80
|
if (invalid !== undefined)
|
|
73
81
|
throw new TypeError(`${key} has invalid value "${invalid}"; declarable efforts: none, ${wireEfforts.join(", ")}`);
|
|
74
|
-
return [...new Set(values)];
|
|
82
|
+
return [...new Set(values.filter(isWireEffort))];
|
|
75
83
|
}
|
|
76
84
|
static declaredEfforts(name, env) {
|
|
77
85
|
return RequestFields.#effortValues(name, env, "REASONING_EFFORTS") ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestFields.js","sourceRoot":"","sources":["../src/RequestFields.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RequestFields.js","sourceRoot":"","sources":["../src/RequestFields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAU,CAAC;AAElF,MAAM,iBAAiB,GAAwB,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;AACjF,MAAM,YAAY,GAAG,CAAC,KAAa,EAAuB,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC1F,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC;AAClE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC;IACpB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,gBAAgB,EAAE,YAAY,EAAE,uBAAuB;IACtF,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM;IACxF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG;IAChF,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc;CACtE,CAAC,CAAC;AACH,MAAM,MAAM,GAAG,CAAC,KAAc,EAAwB,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9H,MAAM,QAAQ,GAAG,CAAC,IAAuB,EAAE,KAAwB,EAAW,EAAE,CAC5E,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAEtF,MAAM,OAAO,GAAG,CAAC,GAAuB,EAAE,GAAW,EAAE,MAAM,GAAG,KAAK,EAAiC,EAAE;IACpG,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IACtD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,4CAA4C,CAAC,CAAC;IAC5H,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACrG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/J,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,yCAAyC,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,GAAG,GAAG,CAAC,IAAiB,EAAE,IAAuB,EAAE,KAAc,EAAQ,EAAE;IAC7E,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,GAAgB,EAAE,CAAC;YAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YACpB,MAAM,GAAG,IAAI,CAAC;QAClB,CAAC;aAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,SAAS,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACJ,MAAM,GAAG,QAAQ,CAAC;QACtB,CAAC;IACL,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,GAAG,KAAK,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,IAAiB,EAAE,MAAM,GAAsB,EAAE,EAAyB,EAAE,CACxF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;IACzF,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAE9B,MAAM,KAAK,GAAG,CAAC,IAAiB,EAAE,KAAkB,EAAe,EAAE;IACjE,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAU,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACzF,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,oFAAoF;AACpF,6EAA6E;AAC7E,MAAM,CAAC,OAAO,OAAO,aAAa;IAC9B,MAAM,CAAC,SAAS,CAAC,IAAY,IAAa,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzF,MAAM,CAAU,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;QAClC,aAAa,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,mBAAmB;QACpF,oBAAoB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,uBAAuB;QACnH,mBAAmB,EAAE,6BAA6B;KACrD,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC,CAAC;IAEjD,MAAM,CAAC,SAAS,CAAC,IAAY,EAAE,GAAsB;QACjD,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,mBAAmB,CAAC,CAAC;QACrE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,SAAS,CAAC;QAC1D,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,+CAA+C,CAAC,CAAC;QAC9I,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,GAAsB,EAAE,MAAc;QACrE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtD,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACxC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,IAAI,OAAO,KAAK,SAAS;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,uBAAuB,OAAO,gCAAgC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7I,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,IAAY,EAAE,GAAsB;QACvD,OAAO,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAC7E,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,IAAY,EAAE,GAAsB;QACpD,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,KAAK,EAAE,CAAC;YACpC,IAAI,GAAG,KAAK,oCAAoC;gBAAE,SAAS;YAC3D,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9F,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACtC,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,cAAc,UAAU,4DAA4D,CAAC,CAAC;YACrH,CAAC;QACL,CAAC;IACL,CAAC;IAEQ,OAAO,CAAiC;IACxC,SAAS,CAAqB;IAC9B,WAAW,CAAsB;IACjC,KAAK,CAAS;IACd,OAAO,CAAoB;IAC3B,WAAW,CAAgC;IAC3C,OAAO,CAAgC;IACvC,GAAG,CAAc;IACjB,IAAI,CAA0B;IAC9B,SAAS,CAA0B;IACnC,OAAO,CAA0B;IACjC,SAAS,CAAU;IACnB,YAAY,CAAoB;IAChC,mBAAmB,CAAqB;IACxC,MAAM,CAAoB;IAEnC,YAAY,IAAY,EAAE,GAAsB,EAAE,KAAa;QAC3D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACpD,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,gGAAgG,CAAC,CAAC;QACzL,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,MAAM,GAAG,KAAK,EAAE,EAAE;YAChD,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,oEAAoE;QACpE,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;QAClG,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1C,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gBACzF,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,2FAA2F,CAAC,CAAC;YAC5H,CAAC;QACL,CAAC;QACD,MAAM,QAAQ,GAAG,CAAC,MAAc,EAA2B,EAAE;YACzD,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;gBAAE,OAAO,SAAS,CAAC;YACtD,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAAC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAAC,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,wBAAwB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAAC,CAAC;YACjH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,wBAAwB,CAAC,CAAC;YACvE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,0CAA0C,CAAC,CAAC;gBACzI,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,WAAW,IAAI,MAAM,KAAK,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpJ,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,qCAAqC,CAAC,CAAC;gBACrE,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QACF,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QACjD,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC;YACvB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACpG,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC1D,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;YACnG,MAAM,IAAI,SAAS,CAAC,GAAG,UAAU,gCAAgC,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,EAAE,CAAC,EAAE,CAAC;YAC9G,MAAM,IAAI,SAAS,CAAC,GAAG,UAAU,mEAAmE,CAAC,CAAC;QAC1G,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,QAAQ,KAAK,UAAU,CAAC;QACzC,MAAM,QAAQ,GAAG,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,EAAE,6BAA6B,CAAC,CAAC;QACxF,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;gBAC5B,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;gBACxJ,GAAG,QAAQ;aACd,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,mBAAmB,GAAG,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,KAAK,EAAE,SAAS,KAAK,KAAK;YACvC,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAU;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,UAAU;mBAC3C,MAAM,KAAK,KAAK,IAAI,CACnB,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;uBACzJ,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC1E;mBACE,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC;QAClC,IAAI,KAAK,KAAK,SAAS;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,uCAAuC,CAAC,CAAC;QAC7F,IAAI,CAAC,OAAO,GAAG,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,IAAY,EAAE,MAAqB,EAAE,MAAqB;QAC3D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,sBAAsB,CAAC,YAAY,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjH,IAAI,IAAI,CAAC,MAAM,EAAE,SAAS,KAAK,KAAK,IAAI,MAAM,KAAK,IAAI;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,mCAAmC,CAAC,CAAC;QAC/H,MAAM,MAAM,GAAG,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,SAAS,KAAK,KAAK,CAAC;QAClE,IAAI,IAAI,GAAgB,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,IAAI,IAAI,CAAC,MAAM,EAAE,SAAS,KAAK,KAAK,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC7I,CAAC;iBAAM,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;oBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,0DAA0D,CAAC,CAAC;gBAC7H,IAAI,IAAI,KAAK,UAAU,IAAI,CAAC,IAAI,CAAC,SAAS;oBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,0EAA0E,CAAC,CAAC;gBACzJ,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,gBAAgB,IAAI,EAAE,EAAE,CAAC;oBACvD,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe;wBAAE,SAAS;oBAC9C,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,GAAG,MAAM,CAAC,GAAG;wBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,+BAA+B,MAAM,6BAA6B,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;oBACtK,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,GAAG,MAAM,CAAC,GAAG;wBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,+BAA+B,MAAM,4BAA4B,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACzK,CAAC;gBACD,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAChC,IAAI,IAAI,KAAK,UAAU;oBAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAY,EAAE,IAAI,CAAC,CAAC;YAChE,CAAC;iBAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAY,EAAE,IAAI,CAAC,CAAC;YACvC,CAAC;iBAAM,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACtC,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;gBAClF,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC1D,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC;gBACjH,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QACD,IAAI,MAAM,KAAK,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS;YAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACrF,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
|
package/dist/accounting.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounting.d.ts","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accounting.d.ts","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,kBAAkB,EAClB,sBAAsB,EACtB,yBAAyB,EAE5B,MAAM,YAAY,CAAC;AAgFpB,eAAO,MAAM,sBAAsB,eACnB,MAAM,KACnB,sBAAsB,GAAG,SAM3B,CAAC;AAuBF,eAAO,MAAM,iCAAiC,UAAW,OAAO,KAAG,yBAGlE,CAAC;AA6DF,eAAO,MAAM,2BAA2B,WAC5B,SAAS,yBAAyB,EAAE,KAC7C,kBAWF,CAAC"}
|
package/dist/accounting.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
+
import { isRecord, isSafeInteger } from "@plurnk/plurnk-contracts";
|
|
1
2
|
import { addDecimals, providerCostUsd, sumProviderCostsUsd, validateProviderCost, } from "./cost.js";
|
|
2
3
|
import { validateProviderUsage } from "./usage.js";
|
|
3
|
-
const recordOf = (value) =>
|
|
4
|
-
? value
|
|
5
|
-
: null;
|
|
4
|
+
const recordOf = (value) => isRecord(value) ? value : null;
|
|
6
5
|
const decimalFromNumber = (value, subject) => {
|
|
7
6
|
if (!Number.isFinite(value) || value < 0) {
|
|
8
7
|
throw new TypeError(`${subject} must be a finite non-negative number`);
|
|
@@ -85,7 +84,8 @@ export const providerCostNormalizer = (sdkPackage) => {
|
|
|
85
84
|
default: return undefined;
|
|
86
85
|
}
|
|
87
86
|
};
|
|
88
|
-
|
|
87
|
+
// Every field a request's accounting names is checked here; the accounting is the value that passed.
|
|
88
|
+
function checkProviderRequestAccounting(value) {
|
|
89
89
|
const request = recordOf(value);
|
|
90
90
|
if (request === null)
|
|
91
91
|
throw new TypeError("provider request accounting must be an object");
|
|
@@ -99,12 +99,15 @@ export const validateProviderRequestAccounting = (value) => {
|
|
|
99
99
|
throw new TypeError("provider request accounting.outcome must be response or error");
|
|
100
100
|
}
|
|
101
101
|
if (request.status !== undefined
|
|
102
|
-
&& (!
|
|
102
|
+
&& (!isSafeInteger(request.status) || request.status < 100 || request.status > 599)) {
|
|
103
103
|
throw new TypeError("provider request accounting.status must be an HTTP status");
|
|
104
104
|
}
|
|
105
105
|
if (request.usage !== undefined)
|
|
106
106
|
validateProviderUsage(request.usage);
|
|
107
107
|
validateProviderCost(request.cost);
|
|
108
|
+
}
|
|
109
|
+
export const validateProviderRequestAccounting = (value) => {
|
|
110
|
+
checkProviderRequestAccounting(value);
|
|
108
111
|
return value;
|
|
109
112
|
};
|
|
110
113
|
const projectUsage = (requests, complete) => {
|
package/dist/accounting.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounting.js","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accounting.js","sourceRoot":"","sources":["../src/accounting.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aiSdkTransport.d.ts","sourceRoot":"","sources":["../src/aiSdkTransport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"aiSdkTransport.d.ts","sourceRoot":"","sources":["../src/aiSdkTransport.ts"],"names":[],"mappings":"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"}
|
package/dist/aiSdkTransport.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { isRecord, isSafeInteger } from "@plurnk/plurnk-contracts";
|
|
1
2
|
import { chatMessageText } from "./types.js";
|
|
2
3
|
import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
|
|
3
4
|
import { APICallError, generateText, streamText } from "ai";
|
|
4
5
|
import { z } from "zod";
|
|
5
6
|
import { normalizeUsage, UsageDetailError } from "./usage.js";
|
|
6
|
-
import { emitWarningOnce } from "./warnings.js";
|
|
7
7
|
import { withoutNativeTools } from "./native-tools.js";
|
|
8
8
|
const errorSchema = z.object({
|
|
9
9
|
error: z.object({
|
|
@@ -11,8 +11,8 @@ const errorSchema = z.object({
|
|
|
11
11
|
type: z.string().nullish(),
|
|
12
12
|
param: z.unknown().nullish(),
|
|
13
13
|
code: z.union([z.string(), z.number()]).nullish(),
|
|
14
|
-
}).
|
|
15
|
-
}).
|
|
14
|
+
}).loose(),
|
|
15
|
+
}).loose();
|
|
16
16
|
const retryDirective = (status, headers) => {
|
|
17
17
|
const raw = headers instanceof Headers
|
|
18
18
|
? headers.get("x-should-retry")
|
|
@@ -109,38 +109,22 @@ const wireChargeEvidenceOf = (values) => {
|
|
|
109
109
|
}
|
|
110
110
|
return undefined;
|
|
111
111
|
};
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
case "length":
|
|
121
|
-
case "
|
|
122
|
-
case "
|
|
123
|
-
case "
|
|
124
|
-
|
|
125
|
-
case "tool_calls":
|
|
126
|
-
case "tool_use":
|
|
127
|
-
return "tool_calls";
|
|
128
|
-
case "content_filter":
|
|
129
|
-
case "safety":
|
|
130
|
-
case "recitation":
|
|
131
|
-
return "content_filter";
|
|
132
|
-
case "insufficient_system_resource":
|
|
133
|
-
return "resource_interrupted";
|
|
134
|
-
default:
|
|
135
|
-
if (reason !== undefined && reason.length > 0) {
|
|
136
|
-
emitWarningOnce(`unrecognized finish_reason "${reason}"; treated as no-signal (finishReason=null). If it denotes a token-cap hit, core's length-cap detection will miss it.`, "PLURNK_FINISH_REASON_UNKNOWN");
|
|
137
|
-
}
|
|
138
|
-
return null;
|
|
112
|
+
// {§provider-finish-reason} The AI SDK's unified classification is the finish reason; the raw vendor
|
|
113
|
+
// value is evidence beside it. One upstream semantic the SDK folds into `other` stays distinct: an exact
|
|
114
|
+
// `insufficient_system_resource` is a resource interruption ({§provider-interrupted-attempt}).
|
|
115
|
+
const finishReasonOf = (unified, raw) => {
|
|
116
|
+
if (raw === "insufficient_system_resource")
|
|
117
|
+
return "resource_interrupted";
|
|
118
|
+
switch (unified) {
|
|
119
|
+
case "stop": return "stop";
|
|
120
|
+
case "length": return "length";
|
|
121
|
+
case "tool-calls": return "tool_calls";
|
|
122
|
+
case "content-filter": return "content_filter";
|
|
123
|
+
case "error": return "error";
|
|
124
|
+
default: return null;
|
|
139
125
|
}
|
|
140
126
|
};
|
|
141
|
-
const recordOf = (value) => value
|
|
142
|
-
? value
|
|
143
|
-
: null;
|
|
127
|
+
const recordOf = (value) => isRecord(value) ? value : null;
|
|
144
128
|
const metadataOf = (values) => {
|
|
145
129
|
const metadata = {};
|
|
146
130
|
for (const value of values) {
|
|
@@ -306,19 +290,20 @@ const executeModelOnce = async (request) => {
|
|
|
306
290
|
...common,
|
|
307
291
|
include: { responseBody: true },
|
|
308
292
|
});
|
|
309
|
-
const
|
|
293
|
+
const { finalStep } = result;
|
|
294
|
+
const rawBody = finalStep.response.body;
|
|
310
295
|
const values = [rawBody];
|
|
311
296
|
const evidence = extractEvidence(values);
|
|
312
297
|
const accountingUsage = wireUsageEvidenceOf(values);
|
|
313
|
-
const reasoningText = evidence.reasoning ||
|
|
298
|
+
const reasoningText = evidence.reasoning || finalStep.reasoningText || "";
|
|
314
299
|
const rawFinishReason = result.rawFinishReason;
|
|
315
300
|
return {
|
|
316
|
-
model:
|
|
301
|
+
model: finalStep.response.modelId,
|
|
317
302
|
content: result.text,
|
|
318
303
|
reasoning: reasoningText,
|
|
319
304
|
reasoningProjected: evidence.reasoningProjected,
|
|
320
305
|
wire: wireEmissionOf(values),
|
|
321
|
-
finishReason: finishReasonOf(rawFinishReason),
|
|
306
|
+
finishReason: finishReasonOf(result.finishReason, rawFinishReason),
|
|
322
307
|
...(rawFinishReason === undefined ? {} : { rawFinishReason }),
|
|
323
308
|
...settledUsage(values, result.usage),
|
|
324
309
|
metadata: metadataOf(values),
|
|
@@ -328,14 +313,14 @@ const executeModelOnce = async (request) => {
|
|
|
328
313
|
? {}
|
|
329
314
|
: { charge: wireChargeEvidenceOf(values) }),
|
|
330
315
|
...(accountingUsage === undefined ? {} : { usage: accountingUsage }),
|
|
331
|
-
...(
|
|
316
|
+
...(finalStep.providerMetadata === undefined
|
|
332
317
|
? {}
|
|
333
|
-
: { providerMetadata:
|
|
318
|
+
: { providerMetadata: finalStep.providerMetadata }),
|
|
334
319
|
response: {
|
|
335
|
-
id:
|
|
336
|
-
...(
|
|
320
|
+
id: finalStep.response.id,
|
|
321
|
+
...(finalStep.response.headers === undefined
|
|
337
322
|
? {}
|
|
338
|
-
: { headers:
|
|
323
|
+
: { headers: finalStep.response.headers }),
|
|
339
324
|
},
|
|
340
325
|
},
|
|
341
326
|
...(request.captureRawBody ? { rawBody } : {}),
|
|
@@ -344,7 +329,7 @@ const executeModelOnce = async (request) => {
|
|
|
344
329
|
}
|
|
345
330
|
const result = streamText({
|
|
346
331
|
...common,
|
|
347
|
-
|
|
332
|
+
include: { rawChunks: true },
|
|
348
333
|
onError: () => { },
|
|
349
334
|
});
|
|
350
335
|
const rawChunks = [];
|
|
@@ -354,7 +339,7 @@ const executeModelOnce = async (request) => {
|
|
|
354
339
|
let partialReasoning = "";
|
|
355
340
|
let partialResponse;
|
|
356
341
|
try {
|
|
357
|
-
for await (const part of result.
|
|
342
|
+
for await (const part of result.stream) {
|
|
358
343
|
if (part.type === "raw") {
|
|
359
344
|
rawChunks.push(part.rawValue);
|
|
360
345
|
}
|
|
@@ -379,20 +364,18 @@ const executeModelOnce = async (request) => {
|
|
|
379
364
|
const evidence = extractEvidence(rawChunks);
|
|
380
365
|
const accountingUsage = wireUsageEvidenceOf(rawChunks);
|
|
381
366
|
const content = await result.text;
|
|
382
|
-
const
|
|
367
|
+
const [finalStep, warnings] = await Promise.all([result.finalStep, result.warnings]);
|
|
368
|
+
const { response, providerMetadata } = finalStep;
|
|
369
|
+
const reasoningText = evidence.reasoning || finalStep.reasoningText || "";
|
|
383
370
|
const rawFinishReason = await result.rawFinishReason;
|
|
384
|
-
const
|
|
385
|
-
result.response,
|
|
386
|
-
result.providerMetadata,
|
|
387
|
-
result.warnings,
|
|
388
|
-
]);
|
|
371
|
+
const unifiedFinishReason = await result.finishReason;
|
|
389
372
|
return {
|
|
390
373
|
model: response.modelId,
|
|
391
374
|
content,
|
|
392
375
|
reasoning: reasoningText,
|
|
393
376
|
reasoningProjected: evidence.reasoningProjected,
|
|
394
377
|
wire: wireEmissionOf(rawChunks),
|
|
395
|
-
finishReason: finishReasonOf(rawFinishReason),
|
|
378
|
+
finishReason: finishReasonOf(unifiedFinishReason, rawFinishReason),
|
|
396
379
|
...(rawFinishReason === undefined ? {} : { rawFinishReason }),
|
|
397
380
|
...settledUsage(rawChunks, await result.usage),
|
|
398
381
|
metadata: metadataOf(rawChunks),
|
|
@@ -488,11 +471,8 @@ export const transportFailureEvidence = (error) => {
|
|
|
488
471
|
.map(recordOf)
|
|
489
472
|
.find((record) => Number.isInteger(record?.status))?.status;
|
|
490
473
|
const apiStatus = apiError?.statusCode;
|
|
491
|
-
const
|
|
492
|
-
|
|
493
|
-
: Number.isInteger(wireStatus) && wireStatus >= 100 && wireStatus <= 599
|
|
494
|
-
? wireStatus
|
|
495
|
-
: undefined;
|
|
474
|
+
const httpStatus = (value) => isSafeInteger(value) && value >= 100 && value <= 599 ? value : undefined;
|
|
475
|
+
const status = httpStatus(apiStatus) ?? httpStatus(wireStatus);
|
|
496
476
|
return {
|
|
497
477
|
content: emission.content || partial?.content || "",
|
|
498
478
|
reasoning: emission.reasoning || partial?.reasoning || "",
|
|
@@ -583,7 +563,7 @@ const wireEmissionOf = (values) => {
|
|
|
583
563
|
emptyChunks,
|
|
584
564
|
fields,
|
|
585
565
|
channels,
|
|
586
|
-
toolCalls: [...toolCalls.values()].
|
|
566
|
+
toolCalls: [...toolCalls.values()].toSorted((a, b) => a.index - b.index),
|
|
587
567
|
finishReasons: [...finishReasons],
|
|
588
568
|
...(unmappedChunks.length === 0 ? {} : { unmappedChunks }),
|
|
589
569
|
};
|
|
@@ -603,13 +583,13 @@ const extractEvidence = (values) => {
|
|
|
603
583
|
const logprobRecord = recordOf(choice.logprobs);
|
|
604
584
|
const entries = logprobRecord?.content;
|
|
605
585
|
if (Array.isArray(entries)) {
|
|
606
|
-
for (const
|
|
607
|
-
const entry = recordOf(
|
|
586
|
+
for (const entryValue of entries) {
|
|
587
|
+
const entry = recordOf(entryValue);
|
|
608
588
|
if (typeof entry?.token !== "string" || typeof entry.logprob !== "number")
|
|
609
589
|
continue;
|
|
610
590
|
const top = Array.isArray(entry.top_logprobs)
|
|
611
|
-
? entry.top_logprobs.flatMap((
|
|
612
|
-
const item = recordOf(
|
|
591
|
+
? entry.top_logprobs.flatMap((candidate) => {
|
|
592
|
+
const item = recordOf(candidate);
|
|
613
593
|
return typeof item?.token === "string" && typeof item.logprob === "number"
|
|
614
594
|
? [{ token: item.token, logprob: item.logprob }]
|
|
615
595
|
: [];
|