@microsoft/teamsfx-core 3.1.3-alpha.7411a90106.0 → 3.1.3-alpha.9bfa94a5bf.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/build/common/templates-config.json +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +1 -18
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/generator/openPlugin/authResolver.d.ts +2 -2
- package/build/component/generator/openPlugin/authResolver.d.ts.map +1 -1
- package/build/component/generator/openPlugin/authResolver.js +17 -7
- package/build/component/generator/openPlugin/authResolver.js.map +1 -1
- package/build/component/generator/openPlugin/errors.d.ts +4 -0
- package/build/component/generator/openPlugin/errors.d.ts.map +1 -0
- package/build/component/generator/openPlugin/errors.js +13 -0
- package/build/component/generator/openPlugin/errors.js.map +1 -0
- package/build/component/generator/openPlugin/exporter.d.ts +9 -6
- package/build/component/generator/openPlugin/exporter.d.ts.map +1 -1
- package/build/component/generator/openPlugin/exporter.js +502 -53
- package/build/component/generator/openPlugin/exporter.js.map +1 -1
- package/build/component/generator/openPlugin/fileSystem.d.ts +28 -0
- package/build/component/generator/openPlugin/fileSystem.d.ts.map +1 -0
- package/build/component/generator/openPlugin/fileSystem.js +181 -0
- package/build/component/generator/openPlugin/fileSystem.js.map +1 -0
- package/build/component/generator/openPlugin/iconStrategy.d.ts.map +1 -1
- package/build/component/generator/openPlugin/iconStrategy.js +30 -14
- package/build/component/generator/openPlugin/iconStrategy.js.map +1 -1
- package/build/component/generator/openPlugin/importer.d.ts.map +1 -1
- package/build/component/generator/openPlugin/importer.js +75 -12
- package/build/component/generator/openPlugin/importer.js.map +1 -1
- package/build/component/generator/openPlugin/mapper.d.ts +3 -2
- package/build/component/generator/openPlugin/mapper.d.ts.map +1 -1
- package/build/component/generator/openPlugin/mapper.js +188 -29
- package/build/component/generator/openPlugin/mapper.js.map +1 -1
- package/build/component/generator/openPlugin/parser.d.ts.map +1 -1
- package/build/component/generator/openPlugin/parser.js +264 -70
- package/build/component/generator/openPlugin/parser.js.map +1 -1
- package/build/component/generator/openPlugin/skillValidation.d.ts +2 -0
- package/build/component/generator/openPlugin/skillValidation.d.ts.map +1 -0
- package/build/component/generator/openPlugin/skillValidation.js +63 -0
- package/build/component/generator/openPlugin/skillValidation.js.map +1 -0
- package/build/component/generator/openPlugin/spec.d.ts +67 -0
- package/build/component/generator/openPlugin/spec.d.ts.map +1 -0
- package/build/component/generator/openPlugin/spec.js +157 -0
- package/build/component/generator/openPlugin/spec.js.map +1 -0
- package/build/component/generator/openPlugin/textUtils.d.ts +1 -1
- package/build/component/generator/openPlugin/textUtils.d.ts.map +1 -1
- package/build/component/generator/openPlugin/textUtils.js +8 -7
- package/build/component/generator/openPlugin/textUtils.js.map +1 -1
- package/build/component/generator/openPlugin/types.d.ts +76 -14
- package/build/component/generator/openPlugin/types.d.ts.map +1 -1
- package/build/component/generator/openPlugin/validation.d.ts +17 -0
- package/build/component/generator/openPlugin/validation.d.ts.map +1 -0
- package/build/component/generator/openPlugin/validation.js +563 -0
- package/build/component/generator/openPlugin/validation.js.map +1 -0
- package/build/component/utils/common.d.ts +1 -9
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +7 -37
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +3 -8
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
- package/build/component/utils/envFunctionUtils.js +46 -131
- package/build/component/utils/envFunctionUtils.js.map +1 -1
- package/build/core/FxCore.openPlugin.d.ts +7 -6
- package/build/core/FxCore.openPlugin.d.ts.map +1 -1
- package/build/core/FxCore.openPlugin.js +7 -6
- package/build/core/FxCore.openPlugin.js.map +1 -1
- package/build/question/options/ExportOpenPluginOptions.js +2 -2
- package/build/question/options/ExportOpenPluginOptions.js.map +1 -1
- package/build/question/options/ImportOpenPluginOptions.js +4 -4
- package/build/question/options/ImportOpenPluginOptions.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.json +16 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/metadata.zip +0 -0
- package/templates/v4/templates-metadata.zip +0 -0
- package/templates/v4/templates.zip +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAI3E,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAI3E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAA8B,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMtF;AACD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAE5E;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAyBlC"}
|
|
@@ -24,8 +24,6 @@ const lodash_1 = require("lodash");
|
|
|
24
24
|
const mustache_1 = tslib_1.__importDefault(require("mustache"));
|
|
25
25
|
const common_1 = require("../../../utils/common");
|
|
26
26
|
const wrapUtil_1 = require("../../util/wrapUtil");
|
|
27
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
28
|
-
const error_1 = require("../../../../error");
|
|
29
27
|
const telemetry_1 = require("./telemetry");
|
|
30
28
|
const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
|
|
31
29
|
var retryHandler_1 = require("../../../../common/retryHandler");
|
|
@@ -199,21 +197,6 @@ async function getResolvedManifest(content, path, manifestType, ctx) {
|
|
|
199
197
|
[telemetryKey]: vars.join(";"),
|
|
200
198
|
});
|
|
201
199
|
}
|
|
202
|
-
|
|
203
|
-
if (manifestType !== envFunctionUtils_1.ManifestType.ApiSpec) {
|
|
204
|
-
const processedFunctionRes = await (0, envFunctionUtils_1.expandVariableWithFunction)(content, ctx, undefined, true, manifestType, path);
|
|
205
|
-
if (processedFunctionRes.isErr()) {
|
|
206
|
-
return processedFunctionRes;
|
|
207
|
-
}
|
|
208
|
-
value = (0, common_1.expandEnvironmentVariable)(processedFunctionRes.value);
|
|
209
|
-
}
|
|
210
|
-
else {
|
|
211
|
-
value = (0, common_1.expandEnvironmentVariable)(value);
|
|
212
|
-
}
|
|
213
|
-
const notExpandedVars = (0, common_1.getEnvironmentVariables)(value);
|
|
214
|
-
if (notExpandedVars.length > 0) {
|
|
215
|
-
return (0, teamsfx_api_1.err)(new error_1.MissingEnvironmentVariablesError("manifest", notExpandedVars.join(","), path));
|
|
216
|
-
}
|
|
217
|
-
return (0, teamsfx_api_1.ok)(value);
|
|
200
|
+
return (0, envFunctionUtils_1.resolveManifestWithContext)(content, ctx, manifestType, path);
|
|
218
201
|
}
|
|
219
202
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { FxError } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { Result } from "neverthrow";
|
|
3
|
-
import {
|
|
3
|
+
import { ConnectorAuthorizationType, DefaultAuthOption, ParsedOpenPlugin } from "./types";
|
|
4
4
|
export interface OpenPluginMcpAuthResolution {
|
|
5
|
-
authTypes: Readonly<Record<string,
|
|
5
|
+
authTypes: Readonly<Record<string, ConnectorAuthorizationType>>;
|
|
6
6
|
warnings: string[];
|
|
7
7
|
}
|
|
8
8
|
/** Resolve every connector auth type before the pure manifest mapper runs. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authResolver.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/authResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAa,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"authResolver.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/authResolver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAa,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAW,MAAM,EAAE,MAAM,YAAY,CAAC;AAI7C,OAAO,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAI1F,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC,CAAC;IAChE,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA0CD,8EAA8E;AAC9E,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,MAAM,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC,CA+DvD"}
|
|
@@ -8,6 +8,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
|
8
8
|
const neverthrow_1 = require("neverthrow");
|
|
9
9
|
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
10
10
|
const mcpToolFetcher = tslib_1.__importStar(require("../../../common/mcpToolFetcher"));
|
|
11
|
+
const spec_1 = require("./spec");
|
|
11
12
|
const SOURCE = "OpenPluginImport";
|
|
12
13
|
function isLocalHostname(hostname) {
|
|
13
14
|
if (hostname === "localhost" ||
|
|
@@ -22,8 +23,11 @@ function isLocalHostname(hostname) {
|
|
|
22
23
|
function classifyAuthProbeTarget(serverUrl) {
|
|
23
24
|
try {
|
|
24
25
|
const parsed = new URL(serverUrl);
|
|
26
|
+
if (parsed.protocol !== "https:") {
|
|
27
|
+
return "unsupported";
|
|
28
|
+
}
|
|
25
29
|
const hostname = parsed.hostname.toLowerCase().replace(/\.$/, "");
|
|
26
|
-
return
|
|
30
|
+
return isLocalHostname(hostname) ? "noProbe" : "remote";
|
|
27
31
|
}
|
|
28
32
|
catch {
|
|
29
33
|
return "invalid";
|
|
@@ -43,6 +47,9 @@ function unresolvedAuth(serverName, error) {
|
|
|
43
47
|
async function resolveOpenPluginMcpAuth(parsed, defaultAuth) {
|
|
44
48
|
const authTypes = {};
|
|
45
49
|
const warnings = [];
|
|
50
|
+
if (defaultAuth === "Auto" && parsed.invalidRemoteMcpServers?.length) {
|
|
51
|
+
return (0, neverthrow_1.err)(unresolvedAuth([...parsed.invalidRemoteMcpServers].sort()[0]));
|
|
52
|
+
}
|
|
46
53
|
for (const serverName of Object.keys(parsed.mcpServers).sort()) {
|
|
47
54
|
const server = parsed.mcpServers[serverName];
|
|
48
55
|
const serverUrl = typeof server.url === "string" ? server.url.trim() : "";
|
|
@@ -51,19 +58,22 @@ async function resolveOpenPluginMcpAuth(parsed, defaultAuth) {
|
|
|
51
58
|
}
|
|
52
59
|
const override = parsed.atkExtension?.agentConnectors?.[serverName]?.authorization?.type;
|
|
53
60
|
if (override) {
|
|
54
|
-
authTypes
|
|
61
|
+
(0, spec_1.setRecordValue)(authTypes, serverName, override);
|
|
55
62
|
continue;
|
|
56
63
|
}
|
|
57
64
|
if (defaultAuth !== "Auto") {
|
|
58
|
-
authTypes
|
|
65
|
+
(0, spec_1.setRecordValue)(authTypes, serverName, defaultAuth);
|
|
59
66
|
continue;
|
|
60
67
|
}
|
|
61
68
|
const probeTarget = classifyAuthProbeTarget(serverUrl);
|
|
62
69
|
if (probeTarget === "invalid") {
|
|
63
70
|
return (0, neverthrow_1.err)(unresolvedAuth(serverName));
|
|
64
71
|
}
|
|
72
|
+
if (probeTarget === "unsupported") {
|
|
73
|
+
continue;
|
|
74
|
+
}
|
|
65
75
|
if (probeTarget === "noProbe") {
|
|
66
|
-
authTypes
|
|
76
|
+
(0, spec_1.setRecordValue)(authTypes, serverName, "None");
|
|
67
77
|
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.autoAuthNone", serverName));
|
|
68
78
|
continue;
|
|
69
79
|
}
|
|
@@ -79,16 +89,16 @@ async function resolveOpenPluginMcpAuth(parsed, defaultAuth) {
|
|
|
79
89
|
}
|
|
80
90
|
try {
|
|
81
91
|
await mcpToolFetcher.resolveMCPOAuthMetadata(probe.authMetadataUrl, undefined, serverUrl);
|
|
82
|
-
authTypes
|
|
92
|
+
(0, spec_1.setRecordValue)(authTypes, serverName, "OAuthPluginVault");
|
|
83
93
|
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.autoAuthOAuth", serverName));
|
|
84
94
|
}
|
|
85
95
|
catch {
|
|
86
96
|
if (probe.requiresAuth) {
|
|
87
|
-
authTypes
|
|
97
|
+
(0, spec_1.setRecordValue)(authTypes, serverName, "OAuthPluginVault");
|
|
88
98
|
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.authFallback", serverName));
|
|
89
99
|
continue;
|
|
90
100
|
}
|
|
91
|
-
authTypes
|
|
101
|
+
(0, spec_1.setRecordValue)(authTypes, serverName, "None");
|
|
92
102
|
warnings.push((0, localizeUtils_1.getLocalizedString)("core.openPluginImport.autoAuthNone", serverName));
|
|
93
103
|
}
|
|
94
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authResolver.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/authResolver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;
|
|
1
|
+
{"version":3,"file":"authResolver.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/authResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/errors.ts"],"names":[],"mappings":"AAGA,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;CAI5B"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.OpenPluginInputError = void 0;
|
|
6
|
+
class OpenPluginInputError extends Error {
|
|
7
|
+
constructor(message) {
|
|
8
|
+
super(message);
|
|
9
|
+
this.name = "OpenPluginInputError";
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.OpenPluginInputError = OpenPluginInputError;
|
|
13
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/errors.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACrC,CAAC;CACF;AALD,oDAKC"}
|
|
@@ -2,17 +2,20 @@ import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
|
2
2
|
import { ExportInputs } from "./types";
|
|
3
3
|
export declare const OPEN_PLUGIN_EXPORT_SOURCE = "OpenPluginExport";
|
|
4
4
|
export interface ExportResult {
|
|
5
|
-
/** Absolute path to the generated
|
|
5
|
+
/** Absolute path to the generated Agent Plugin directory. */
|
|
6
6
|
outputPath: string;
|
|
7
7
|
warnings: string[];
|
|
8
8
|
}
|
|
9
9
|
/**
|
|
10
10
|
* Export an ATK project (folder containing appPackage/manifest.json plus the
|
|
11
|
-
* usual agentSkills/agentConnectors layout) into an
|
|
12
|
-
* directory. The output is structured so that
|
|
13
|
-
* <output>` reconstructs an equivalent ATK
|
|
14
|
-
*
|
|
15
|
-
* `
|
|
11
|
+
* usual agentSkills/agentConnectors layout) into an Agent Plugins v1.0.0
|
|
12
|
+
* directory (https://agent-plugins.org/). The output is structured so that
|
|
13
|
+
* `atk import agentplugin --path <output>` reconstructs an equivalent ATK
|
|
14
|
+
* project; fields with no native Agent Plugins equivalent are preserved
|
|
15
|
+
* verbatim under `extensions["com.microsoft.agents-toolkit"]` in plugin.json.
|
|
16
|
+
*
|
|
17
|
+
* Output is always spec-compliant 1.0.0: plugin.json in the plugin root, and
|
|
18
|
+
* mcp.json (not .mcp.json) for MCP servers.
|
|
16
19
|
*/
|
|
17
20
|
export declare function exportOpenPlugin(inputs: ExportInputs): Promise<Result<ExportResult, FxError>>;
|
|
18
21
|
//# sourceMappingURL=exporter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exporter.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/exporter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA0B,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"exporter.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openPlugin/exporter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AA0B1F,OAAO,EAIL,YAAY,EACb,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,yBAAyB,qBAAqB,CAAC;AAE5D,MAAM,WAAW,YAAY;IAC3B,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAkBD;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAqLxC"}
|