@microsoft/teamsfx-core 3.1.0 → 3.1.1

package/build/component/generator/declarativeAgent/generator.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeclarativeAgentGenerator = void 0;
+exports.DeclarativeAgentGenerator = exports.declarativeAgentGeneratorDeps = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author yuqzho@microsoft.com
@@ -13,13 +13,19 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const featureFlags_1 = require("../../../common/featureFlags");
 const stringUtils_1 = require("../../../common/stringUtils");
 const question_1 = require("../../../question");
+const developerPortalScaffoldUtils_1 = require("../../developerPortalScaffoldUtils");
 const CopilotGptManifestUtils_1 = require("../../driver/teamsApp/utils/CopilotGptManifestUtils");
 const common_1 = require("../../utils/common");
 const defaultGenerator_1 = require("../defaultGenerator");
 const generator_1 = require("../generator");
 const templateNames_1 = require("../templates/templateNames");
-const utils_1 = require("../utils");
-const helper_1 = require("./helper");
+const declarativeAgentHelper = tslib_1.__importStar(require("./helper"));
+exports.declarativeAgentGeneratorDeps = {
+    deriveMCPServerNameFromUrl: declarativeAgentHelper.deriveMCPServerNameFromUrl,
+    setGeneralSensitivityLabel: declarativeAgentHelper.setGeneralSensitivityLabel,
+    generateForMCPForDA: declarativeAgentHelper.generateForMCPForDA,
+    addExistingPlugin: declarativeAgentHelper.addExistingPlugin,
+};
 /**
  * Generator for copilot extensions including declarative copilot with no plugin,
  * declarative copilot with API plugin from scratch, declarative copilot with existing plugin,
@@ -36,6 +42,7 @@ class DeclarativeAgentGenerator extends defaultGenerator_1.DefaultTemplateGenera
             templateNames_1.TemplateNames.DeclarativeAgentWithExistingAction,
             templateNames_1.TemplateNames.DeclarativeAgentWithTypeSpec,
             templateNames_1.TemplateNames.DeclarativeAgentWithActionFromMCP,
+            templateNames_1.TemplateNames.DeclarativeAgentWithSkill,
         ].includes(inputs[question_1.QuestionNames.TemplateName]);
     }
     async getTemplateInfos(context, inputs, destinationPath, actionContext) {
@@ -60,9 +67,7 @@ class DeclarativeAgentGenerator extends defaultGenerator_1.DefaultTemplateGenera
                     : MCPForDAServerUrl
                         ? {
                             MCPForDAServerUrl,
-                            ServerName: new URL(MCPForDAServerUrl).host
-                                .replace(/[^a-zA-Z0-9]/g, "")
-                                .substring(0, 10),
+                            ServerName: exports.declarativeAgentGeneratorDeps.deriveMCPServerNameFromUrl(MCPForDAServerUrl),
                         }
                         : {}),
             };
@@ -96,17 +101,14 @@ class DeclarativeAgentGenerator extends defaultGenerator_1.DefaultTemplateGenera
         }
         if (featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.SensitivityLabelEnabled)) {
             // best-effort
-            await (0, utils_1.setGeneralSensitivityLabel)(context, declarativeCopilotManifestPathRes.value);
+            await exports.declarativeAgentGeneratorDeps.setGeneralSensitivityLabel(context, declarativeCopilotManifestPathRes.value);
+        }
+        if (templateNames_1.TemplateNames.DeclarativeAgentWithActionFromMCP === inputs[question_1.QuestionNames.TemplateName]) {
+            const result = await exports.declarativeAgentGeneratorDeps.generateForMCPForDA(destinationPath, inputs);
+            return result;
         }
-        // if (
-        //   featureFlagManager.getBooleanValue(FeatureFlags.MCPForDA) &&
-        //   TemplateNames.DeclarativeAgentWithActionFromMCP === inputs[QuestionNames.TemplateName]
-        // ) {
-        //   const result = await generateForMCPForDA(destinationPath, inputs);
-        //   return result;
-        // }
         if (templateNames_1.TemplateNames.DeclarativeAgentWithExistingAction === inputs[question_1.QuestionNames.TemplateName]) {
-            const addPluginRes = await (0, helper_1.addExistingPlugin)(declarativeCopilotManifestPathRes.value, inputs[question_1.QuestionNames.PluginManifestFilePath], inputs[question_1.QuestionNames.PluginOpenApiSpecFilePath], "action_1", context, this.componentName);
+            const addPluginRes = await exports.declarativeAgentGeneratorDeps.addExistingPlugin(declarativeCopilotManifestPathRes.value, inputs[question_1.QuestionNames.PluginManifestFilePath], inputs[question_1.QuestionNames.PluginOpenApiSpecFilePath], "action_1", context, this.componentName);
             if (addPluginRes.isErr()) {
                 return (0, teamsfx_api_1.err)(addPluginRes.error);
             }
@@ -121,6 +123,12 @@ class DeclarativeAgentGenerator extends defaultGenerator_1.DefaultTemplateGenera
             }
         }
         else {
+            if (inputs.teamsAppFromTdp) {
+                const res = await developerPortalScaffoldUtils_1.developerPortalScaffoldUtils.updateFilesForTdp(context, inputs.teamsAppFromTdp, inputs);
+                if (res.isErr()) {
+                    return (0, teamsfx_api_1.err)(res.error);
+                }
+            }
             return (0, teamsfx_api_1.ok)({});
         }
     }

package/build/component/generator/declarativeAgent/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AAEH,wDAcgC;AAChC,mCAA+B;AAC/B,wDAAwB;AACxB,+DAAgF;AAChF,6DAAwE;AACxE,gDAK2B;AAC3B,qFAAkF;AAClF,iGAA8F;AAE9F,+CAAqE;AACrE,0DAA+D;AAC/D,4CAAyC;AAEzC,8DAA2D;AAC3D,yEAAmD;AAEtC,QAAA,6BAA6B,GAAG;IAC3C,0BAA0B,EAAE,sBAAsB,CAAC,0BAA0B;IAC7E,0BAA0B,EAAE,sBAAsB,CAAC,0BAA0B;IAC7E,mBAAmB,EAAE,sBAAsB,CAAC,mBAAmB;IAC/D,iBAAiB,EAAE,sBAAsB,CAAC,iBAAiB;CAC5D,CAAC;AASF;;;;GAIG;AACH,MAAa,yBAA0B,SAAQ,2CAAwB;IACrE,aAAa,GAAG,0CAA0C,CAAC;IAC3C,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,OAAO;YACL,6BAAa,CAAC,qBAAqB;YACnC,6BAAa,CAAC,qCAAqC;YACnD,6BAAa,CAAC,2CAA2C;YACzD,6BAAa,CAAC,0CAA0C;YACxD,6BAAa,CAAC,kCAAkC;YAChD,6BAAa,CAAC,4BAA4B;YAC1C,6BAAa,CAAC,iCAAiC;YAC/C,6BAAa,CAAC,yBAAyB;SACxC,CAAC,QAAQ,CAAC,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC,CAAC;IACjD,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,IAAI,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,wBAAa,CAAC,mBAAmB,CAAwB,CAAC;QAClF,MAAM,qBAAqB,GACzB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAa,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,MAAM,kBAAkB,GACtB,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEzE,MAAM,aAAa,GAAG,MAAM,CAAC,wBAAa,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,aAAa,KAAK,OAAO,CAAC;QAC7C,MAAM,iBAAiB,GAAG,MAAM,CAAC,wBAAa,CAAC,iBAAiB,CAAC,CAAC;QAElE,IAAI,CAAC;YACH,MAAM,UAAU,GAAG;gBACjB,GAAG,qBAAS,CAAC,mBAAmB,CAC9B,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,KAAK,6BAAa,CAAC,4BAA4B;oBAC/E,CAAC,CAAC,IAAA,uCAAyB,EAAC,OAAO,CAAC;oBACpC,CAAC,CAAC,OAAO,EACX,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,6BAA6B,KAAK,MAAM,CAChD;gBACD,kBAAkB,EAAE,MAAM;gBAC1B,cAAc,EAAE,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBACzE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBACpC,GAAG,CAAC,UAAU;oBACZ,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;oBACrC,CAAC,CAAC,iBAAiB;wBACjB,CAAC,CAAC;4BACE,iBAAiB;4BACjB,UAAU,EACR,qCAA6B,CAAC,0BAA0B,CAAC,iBAAiB,CAAC;yBAC9E;wBACH,CAAC,CAAC,EAAE,CAAC;aACV,CAAC;YACF,MAAM,YAAY,GAAG,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC;YAExD,IAAA,cAAK,EAAC,aAAa,EAAE,cAAc,EAAE;gBACnC,wDAAkC,EAAE,YAAY;gBAChD,iEAAsC,EACpC,IAAI,KAAK,yBAAc,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBAC3D,qFAA+C,EAC7C,MAAM,CAAC,wBAAa,CAAC,UAAU,CAAC,KAAK,6BAAkB,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE;aACzF,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;gBACD;oBACE,YAAY;oBACZ,QAAQ,EAAE,QAAQ;oBAClB,UAAU;iBACX;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,IAAA,iBAAG,EAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CACjC,eAAe,EACf,kCAAoB,EACpB,sCAAwB,CACzB,CAAC;QACF,MAAM,iCAAiC,GACrC,MAAM,iDAAuB,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;QACnE,IAAI,iCAAiC,CAAC,KAAK,EAAE,EAAE,CAAC;YAC9C,+CAA+C;YAC/C,IAAI,6BAAa,CAAC,kCAAkC,KAAK,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC5F,OAAO,IAAA,iBAAG,EAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;YACtD,CAAC;YACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;QAChB,CAAC;QAED,IAAI,iCAAkB,CAAC,eAAe,CAAC,2BAAY,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAC7E,cAAc;YACd,MAAM,qCAA6B,CAAC,0BAA0B,CAC5D,OAAO,EACP,iCAAiC,CAAC,KAAK,CACxC,CAAC;QACJ,CAAC;QAED,IAAI,6BAAa,CAAC,iCAAiC,KAAK,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3F,MAAM,MAAM,GAAG,MAAM,qCAA6B,CAAC,mBAAmB,CACpE,eAAe,EACf,MAAM,CACP,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,6BAAa,CAAC,kCAAkC,KAAK,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAC5F,MAAM,YAAY,GAAG,MAAM,qCAA6B,CAAC,iBAAiB,CACxE,iCAAiC,CAAC,KAAK,EACvC,MAAM,CAAC,wBAAa,CAAC,sBAAsB,CAAC,EAC5C,MAAM,CAAC,wBAAa,CAAC,yBAAyB,CAAC,EAC/C,UAAU,EACV,OAAO,EACP,IAAI,CAAC,aAAa,CACnB,CAAC;YAEF,IAAI,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC;gBACzB,OAAO,IAAA,iBAAG,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,EAAE,EAAE,CAAC;oBACxE,MAAM,cAAc,GAAG,IAAA,wCAA+B,EAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBACpF,IAAI,cAAc,EAAE,CAAC;wBACnB,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBAC3C,CAAC;gBACH,CAAC;gBACD,OAAO,IAAA,gBAAE,EAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,MAAM,2DAA4B,CAAC,iBAAiB,CAC9D,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CACP,CAAC;gBACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;oBAChB,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;YACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;QAChB,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,sBAAsB,CAAC,MAAc;QAS3C,MAAM,eAAe,GAAG,MAAM,CAAC,wBAAa,CAAC,cAAc,CAA6B,CAAC;QAEzF,IAAI,eAAe,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,yBAAW,CACnB,IAAI,CAAC,aAAa,EAClB,wBAAwB,EACxB,8CAA8C,CAC/C,CAAC;QACJ,CAAC;QAED,iCAAiC;QACjC,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO;gBACL,eAAe,EAAE,EAAE;aACpB,CAAC;QACJ,CAAC;QAED,yCAAyC;QACzC,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACpD,4BAA4B;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpD,MAAM,IAAI,yBAAW,CACnB,IAAI,CAAC,aAAa,EAClB,wBAAwB,EACxB,+BAA+B,CAChC,CAAC;YACJ,CAAC;YAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE3C,uBAAuB;YACvB,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,yBAAW,CACnB,IAAI,CAAC,aAAa,EAClB,wBAAwB,EACxB,4BAA4B,CAC7B,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAClE,MAAM,IAAI,uBAAS,CACjB,IAAI,CAAC,aAAa,EAClB,wBAAwB,EACxB,2CAA2C,CAC5C,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,MAAM,CAAC,EAAE;gBACf,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBACjE,OAAO,EAAE,KAAK,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC;aAC5C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,eAAe,EAAE,OAAO;SACzB,CAAC;IACJ,CAAC;CACF;AAnOD,8DAmOC"}

package/build/component/generator/declarativeAgent/helper.d.ts

@@ -1,11 +1,63 @@
 import { Context, FxError, GeneratorResult, Inputs, PluginManifestSchema, Result, UserError, Warning } from "@microsoft/teamsfx-api";
+import * as oneDriveSharePointHandler from "./oneDriveSharePointHandler";
 import { ItemMetadata } from "./oneDriveSharePointHandler";
+/**
+ * Derives a server entry name for an MCP server from its URL. Used by both the
+ * "DA with MCP" scaffolding (to render `.vscode/mcp.json.tpl`) and the
+ * "Add Action with MCP" flow (to append a new entry into `.vscode/mcp.json`).
+ *
+ * Strips non-alphanumeric characters from the host and truncates to 10 chars.
+ * Falls back to `"mcpServer"` when the URL is missing or invalid.
+ */
+export declare function deriveMCPServerNameFromUrl(mcpServerUrl: string | undefined): string;
+/**
+ * Derives the env-var name that holds the `oauth/register` configurationId for
+ * the given MCP server URL. Format: `MCP_DA_AUTH_ID_<UPPERCASED>` where
+ * `<UPPERCASED>` is `deriveMCPServerNameFromUrl(url).toUpperCase()`. Reused
+ * across multiple actions that target the same MCP server so they share one
+ * registration. Used by the Dynamic Tool Discovery (DT) DA-with-MCP flow.
+ */
+export declare function deriveMCPRegistrationIdFromUrl(mcpServerUrl: string | undefined): string;
+/**
+ * Derives the `ai-plugin.json` `namespace` (and the matching `oauth/register`
+ * action `name`) for an MCP-backed action from the MCP server URL. Format:
+ * `deriveMCPServerNameFromUrl(url).toLowerCase()` — a schema-valid
+ * (alphanumeric, lowercase) token unique per MCP server host. Shared by both
+ * the create flow and the add-action flow so actions targeting different MCP
+ * servers get distinct namespaces while actions sharing one server stay aligned
+ * with the single registration they share.
+ */
+export declare function deriveMCPNamespaceFromUrl(mcpServerUrl: string | undefined): string;
+/**
+ * Creates a brand-new empty action plugin manifest (`ai-plugin.json`) under the
+ * project's `appPackage` folder and registers it as a new action in the
+ * declarative agent manifest.
+ *
+ * Used by the "Add MCP Action" flow when the user opts to create a new
+ * action manifest rather than reuse an existing one.
+ *
+ * @param projectPath Absolute project root.
+ * @param desiredFileName File name (no path) for the new plugin manifest, e.g. "ai-plugin.json".
+ *                       If a file with this name already exists, an incrementing suffix is added.
+ * @param declarativeAgentManifestPath Absolute path to the declarative agent manifest file
+ *                       (e.g. `appPackage/declarativeAgent.json`).
+ * @returns The absolute path to the newly-created plugin manifest and the action id used to register it.
+ */
+export declare function createNewActionPluginManifest(projectPath: string, desiredFileName: string, declarativeAgentManifestPath: string): Promise<Result<{
+    pluginManifestPath: string;
+    actionId: string;
+}, FxError>>;
 export interface AddExistingPluginResult {
     warnings: Warning[];
     destinationPluginManifestPath: string;
 }
 export declare function addExistingPlugin(declarativeCopilotManifestPath: string, fromPluginManifestPath: string, fromApiSpecPath: string, actionId: string, context: Context, source: string): Promise<Result<AddExistingPluginResult, FxError>>;
 export declare function validateSourcePluginManifest(manifest: PluginManifestSchema, source: string): Result<undefined, UserError>;
+export declare function setGeneralSensitivityLabel(context: Context, manifestPath: string): Promise<void>;
+export declare function createGraphClientWithToken(context: Context): Promise<Result<import("axios").AxiosInstance, FxError>>;
+export declare function getSharePointSiteByRelativePath(graphClient: any, itemUrl: string): Promise<Result<oneDriveSharePointHandler.ItemMetadata, FxError>>;
+export declare function encodeSharePointUrl(itemUrl: string): string;
+export declare function getDriveItemInfo(graphClient: any, encodedUrl: string): Promise<oneDriveSharePointHandler.ItemMetadata>;
 export declare function getODSPItemInfo(context: Context, itemUrl: string | undefined): Promise<Result<ItemMetadata[], UserError>>;
 export interface GCItem {
     id: string;

package/build/component/generator/declarativeAgent/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAIP,OAAO,EACP,eAAe,EACf,MAAM,EAEN,oBAAoB,EACpB,MAAM,EAEN,SAAS,EACT,OAAO,EACR,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,EAKL,YAAY,EACb,MAAM,6BAA6B,CAAC;AASrC,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,6BAA6B,EAAE,MAAM,CAAC;CACvC;AAMD,wBAAsB,iBAAiB,CACrC,8BAA8B,EAAE,MAAM,EACtC,sBAAsB,EAAE,MAAM,EAC9B,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAiGnD;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CA6E9B;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC,CAgE5C;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AACD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAuC5D;AAED,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAiG3C"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/declarativeAgent/helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAIP,OAAO,EACP,eAAe,EACf,MAAM,EAEN,oBAAoB,EACpB,MAAM,EAEN,SAAS,EACT,OAAO,EACR,MAAM,wBAAwB,CAAC;AA4BhC,OAAO,KAAK,yBAAyB,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAY3D;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAWnF;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAEvF;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAElF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,4BAA4B,EAAE,MAAM,GACnC,OAAO,CAAC,MAAM,CAAC;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,CAAC,CA6C5E;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,6BAA6B,EAAE,MAAM,CAAC;CACvC;AAMD,wBAAsB,iBAAiB,CACrC,8BAA8B,EAAE,MAAM,EACtC,sBAAsB,EAAE,MAAM,EAC9B,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAiGnD;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CA6E9B;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE,OAAO,2DAEhE;AAED,wBAAsB,+BAA+B,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,oEAEtF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,mDAE1E;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC,CAmE5C;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AACD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAuC5D;AAED,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAqP3C"}