@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.42a29d71b.0

package/build/plugins/resource/apiconnector/errors.d.ts

@@ -1,35 +1,57 @@
+import { ApiConnectionMsg } from "./result";
 export declare class ErrorMessage {
+    static getMessages(key: string, ...params: any[]): ApiConnectionMsg;
     static readonly InvalidProjectError: {
         name: string;
-        message: () => string;
+        message: () => ApiConnectionMsg;
     };
     static readonly ApiConnectorInputError: {
         name: string;
-        message: () => string;
+        message: (key: string) => ApiConnectionMsg;
     };
     static readonly ApiConnectorPathError: {
         name: string;
-        message: (pathName: string) => string;
+        message: (pathName: string) => ApiConnectionMsg;
     };
     static readonly ApiConnectorFileCreateFailError: {
         name: string;
-        message: (pathName: string) => string;
+        message: (pathName: string) => ApiConnectionMsg;
     };
     static readonly ApiConnectorRouteError: {
         name: string;
-        message: (funcName: string) => string;
+        message: (funcName: string) => ApiConnectionMsg;
     };
     static readonly SampleCodeCreateFailError: {
         name: string;
-        message: (pathName: string, reason: string) => string;
+        message: (pathName: string, reason: string) => ApiConnectionMsg;
     };
     static readonly NoValidCompoentExistError: {
         name: string;
-        message: () => string;
+        message: () => ApiConnectionMsg;
     };
     static readonly NoActivePluginsExistError: {
         name: string;
-        message: () => string;
+        message: () => ApiConnectionMsg;
+    };
+    static readonly generateApiConFilesError: {
+        name: string;
+        message: (reason: string) => ApiConnectionMsg;
+    };
+    static readonly sdkVersionImcompatibleError: {
+        name: string;
+        message: (component: string, localVersion: string, targetVersion: string) => ApiConnectionMsg;
+    };
+    static readonly localPkgFileNotExistError: {
+        name: string;
+        message: (component: string) => ApiConnectionMsg;
+    };
+    static readonly componentNotExistError: {
+        name: string;
+        message: (component: string) => ApiConnectionMsg;
+    };
+    static readonly envVarExistError: {
+        name: string;
+        message: (varName: string) => ApiConnectionMsg;
     };
 }
 //# sourceMappingURL=errors.d.ts.map

package/build/plugins/resource/apiconnector/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAKA,qBAAa,YAAY;IACvB,gBAAuB,mBAAmB;;;MAMxC;IACF,gBAAuB,sBAAsB;;;MAM3C;IAEF,gBAAuB,qBAAqB;;4BAEtB,MAAM;MAK1B;IAEF,gBAAuB,+BAA+B;;4BAEhC,MAAM;MAK1B;IAEF,gBAAuB,sBAAsB;;4BAEvB,MAAM;MAK1B;IAEF,gBAAuB,yBAAyB;;4BAE1B,MAAM,UAAU,MAAM;MAM1C;IAEF,gBAAuB,yBAAyB;;;MAM9C;IAEF,gBAAuB,yBAAyB;;;MAM9C;CACH"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,qBAAa,YAAY;WACT,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,gBAAgB;IAM1E,gBAAuB,mBAAmB;;uBAE3B,gBAAgB;MAE7B;IACF,gBAAuB,sBAAsB;;uBAE5B,MAAM,KAAG,gBAAgB;MAKxC;IAEF,gBAAuB,qBAAqB;;4BAEtB,MAAM,KAAG,gBAAgB;MAK7C;IAEF,gBAAuB,+BAA+B;;4BAEhC,MAAM,KAAG,gBAAgB;MAK7C;IAEF,gBAAuB,sBAAsB;;4BAEvB,MAAM,KAAG,gBAAgB;MAK7C;IAEF,gBAAuB,yBAAyB;;4BAE1B,MAAM,UAAU,MAAM,KAAG,gBAAgB;MAM7D;IAEF,gBAAuB,yBAAyB;;uBAEjC,gBAAgB;MAE7B;IAEF,gBAAuB,yBAAyB;;uBAEjC,gBAAgB;MAE7B;IAEF,gBAAuB,wBAAwB;;0BAE3B,MAAM,KAAG,gBAAgB;MAK3C;IAEF,gBAAuB,2BAA2B;;6BAE3B,MAAM,gBAAgB,MAAM,iBAAiB,MAAM,KAAG,gBAAgB;MAO3F;IAEF,gBAAuB,yBAAyB;;6BAEzB,MAAM,KAAG,gBAAgB;MAK9C;IAEF,gBAAuB,sBAAsB;;6BAEtB,MAAM,KAAG,gBAAgB;MAK9C;IAEF,gBAAuB,gBAAgB;;2BAElB,MAAM,KAAG,gBAAgB;MAE5C;CACH"}

package/build/plugins/resource/apiconnector/errors.js

@@ -5,38 +5,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorMessage = void 0;
 const localizeUtils_1 = require("../../../common/localizeUtils");
 class ErrorMessage {
+    static getMessages(key, ...params) {
+        return {
+            defaultMsg: localizeUtils_1.getDefaultString(key, ...params),
+            localizedMsg: localizeUtils_1.getLocalizedString(key, ...params),
+        };
+    }
 }
 exports.ErrorMessage = ErrorMessage;
 ErrorMessage.InvalidProjectError = {
     name: "InvalidProjectError",
-    message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.InvalidProjectError.name}`),
+    message: () => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.InvalidProjectError.name}`),
 };
 ErrorMessage.ApiConnectorInputError = {
     name: "ApiConnectorInputError",
-    message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorInputError.name}`),
+    message: (key) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.ApiConnectorInputError.name}`, key),
 };
 ErrorMessage.ApiConnectorPathError = {
     name: "ApiConnectorPathNotExistError",
-    message: (pathName) => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorPathError.name}`, pathName),
+    message: (pathName) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.ApiConnectorPathError.name}`, pathName),
 };
 ErrorMessage.ApiConnectorFileCreateFailError = {
     name: "ApiConnectorCreateFileFail",
-    message: (pathName) => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorFileCreateFailError.name}`, pathName),
+    message: (pathName) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.ApiConnectorFileCreateFailError.name}`, pathName),
 };
 ErrorMessage.ApiConnectorRouteError = {
     name: "ApiConnectorFunctionRouteError",
-    message: (funcName) => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.ApiConnectorRouteError.name}`, funcName),
+    message: (funcName) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.ApiConnectorRouteError.name}`, funcName),
 };
 ErrorMessage.SampleCodeCreateFailError = {
     name: "SampleCodeCreateFailError",
-    message: (pathName, reason) => localizeUtils_1.getLocalizedString(`error.apiConnector.${ErrorMessage.SampleCodeCreateFailError.name}`, pathName, reason),
+    message: (pathName, reason) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.SampleCodeCreateFailError.name}`, pathName, reason),
 };
 ErrorMessage.NoValidCompoentExistError = {
-    name: "NoValidCompoentExistError",
-    message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.NoValidCompoentExistError.name}`),
+    name: "NoBotOrFunctionExistError",
+    message: () => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.NoValidCompoentExistError.name}`),
 };
 ErrorMessage.NoActivePluginsExistError = {
     name: "NoActivePluginsExistError",
-    message: () => localizeUtils_1.getLocalizedString(`plugins.apiConnector.errorMessage.${ErrorMessage.NoActivePluginsExistError.name}`),
+    message: () => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.NoActivePluginsExistError.name}`),
+};
+ErrorMessage.generateApiConFilesError = {
+    name: "ScaffoldApiFilesError",
+    message: (reason) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.generateApiConFilesError.name}`, reason),
+};
+ErrorMessage.sdkVersionImcompatibleError = {
+    name: "SDKVersionImcompatibleError",
+    message: (component, localVersion, targetVersion) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.sdkVersionImcompatibleError.name}`, component, localVersion, targetVersion),
+};
+ErrorMessage.localPkgFileNotExistError = {
+    name: "pkgFileNotExistError",
+    message: (component) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.localPkgFileNotExistError.name}`, component),
+};
+ErrorMessage.componentNotExistError = {
+    name: "componentNotExistError",
+    message: (component) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.componentNotExistError.name}`, component),
+};
+ErrorMessage.envVarExistError = {
+    name: "envVarExistError",
+    message: (varName) => ErrorMessage.getMessages(`error.apiConnector.${ErrorMessage.envVarExistError.name}`, varName),
 };
 //# sourceMappingURL=errors.js.map

package/build/plugins/resource/apiconnector/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AACb,iEAAmE;AAEnE,MAAa,YAAY;;AAAzB,oCAoEC;AAnEwB,gCAAmB,GAAG;IAC3C,IAAI,EAAE,qBAAqB;IAC3B,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAC7E;CACJ,CAAC;AACqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,wBAAwB;IAC9B,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAChF;CACJ,CAAC;AAEqB,kCAAqB,GAAG;IAC7C,IAAI,EAAE,+BAA+B;IACrC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,qBAAqB,CAAC,IAAI,EAAE,EAC9E,QAAQ,CACT;CACJ,CAAC;AAEqB,4CAA+B,GAAG;IACvD,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,+BAA+B,CAAC,IAAI,EAAE,EACxF,QAAQ,CACT;CACJ,CAAC;AAEqB,mCAAsB,GAAG;IAC9C,IAAI,EAAE,gCAAgC;IACtC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE,CAC5B,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAC/E,QAAQ,CACT;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,CAAC,QAAgB,EAAE,MAAc,EAAE,EAAE,CAC5C,kCAAkB,CAChB,sBAAsB,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,EACnE,QAAQ,EACR,MAAM,CACP;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CACnF;CACJ,CAAC;AAEqB,sCAAyB,GAAG;IACjD,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,GAAG,EAAE,CACZ,kCAAkB,CAChB,qCAAqC,YAAY,CAAC,yBAAyB,CAAC,IAAI,EAAE,CACnF;CACJ,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/errors.ts"],"names":[],"mappings":"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"}

package/build/plugins/resource/apiconnector/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,MAAM,EACN,IAAI,EACJ,eAAe,EAEf,EAAE,EAEF,IAAI,EAEJ,aAAa,EAEd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,qBACa,oBAAqB,YAAW,cAAc;IACzD,IAAI,SAA+B;IACnC,WAAW,SAA6B;IACxC,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAItC,uBAAuB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;IAaxB,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;CAU/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAG7D,qBACa,oBAAqB,YAAW,cAAc;IACzD,IAAI,SAA+B;IACnC,WAAW,SAA6B;IACxC,gBAAgB,EAAE,gBAAgB,CAA0B;IAE5D,QAAQ,CAAC,eAAe,EAAE,eAAe,GAAG,OAAO;IAItC,uBAAuB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACnC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;IAIxB,eAAe,CACnB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,kBAAkB,CAAC;CAU/B"}

package/build/plugins/resource/apiconnector/index.js

@@ -4,7 +4,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiConnectorPluginV2 = void 0;
 const tslib_1 = require("tslib");
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const typedi_1 = require("typedi");
 const ResourcePluginContainer_1 = require("../../solution/fx-solution/ResourcePluginContainer");
 const plugin_1 = require("./plugin");
@@ -20,13 +19,7 @@ let ApiConnectorPluginV2 = class ApiConnectorPluginV2 {
         return true;
     }
     async getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
-        var _a;
-        const activeResourcePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
-        if (!activeResourcePlugins) {
-            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoActivePluginsExistError.name, errors_1.ErrorMessage.NoActivePluginsExistError.message());
-        }
-        const res = this.apiConnectorImpl.generateQuestion(activeResourcePlugins);
-        return teamsfx_api_1.ok(res);
+        return await this.apiConnectorImpl.generateQuestion(ctx, inputs);
     }
     async executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
         if (func.method != "connectExistingApi") {

package/build/plugins/resource/apiconnector/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AACb,wDAYgC;AAEhC,mCAAiC;AACjC,gGAAuF;AACvF,qCAA4C;AAG5C,qCAA6D;AAC7D,qCAAwC;AAGxC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAG,2BAA2B,CAAC;QACnC,gBAAW,GAAG,yBAAyB,CAAC;QACxC,qBAAgB,GAAqB,IAAI,yBAAgB,EAAE,CAAC;IA0C9D,CAAC;IAxCC,QAAQ,CAAC,eAAgC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,GAAY,EACZ,MAAc,EACd,IAAU,EACV,OAAmC,EACnC,aAA4B;;QAE5B,MAAM,qBAAqB,GAAG,MAAC,GAAG,CAAC,cAAc,CAAC,gBAA0C,0CACxF,qBAAqB,CAAC;QAC1B,IAAI,CAAC,qBAAqB,EAAE;YAC1B,MAAM,sBAAa,CAAC,SAAS,CAC3B,qBAAY,CAAC,yBAAyB,CAAC,IAAI,EAC3C,qBAAY,CAAC,yBAAyB,CAAC,OAAO,EAAE,CACjD,CAAC;SACH;QACD,MAAM,GAAG,GAAc,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;QAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,oBAAoB,EAAE;YACvC,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,sBAAsB,CAAC,IAAI,EACxC,qBAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CACzD,CAAC;SACH;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;CACF,CAAA;AA7CY,oBAAoB;IADhC,gBAAO,CAAC,2CAAiB,CAAC,kBAAkB,CAAC;GACjC,oBAAoB,CA6ChC;AA7CY,oDAAoB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,mCAAiC;AACjC,gGAAuF;AACvF,qCAA4C;AAE5C,qCAA6D;AAC7D,qCAAwC;AAGxC,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAAjC;QACE,SAAI,GAAG,2BAA2B,CAAC;QACnC,gBAAW,GAAG,yBAAyB,CAAC;QACxC,qBAAgB,GAAqB,IAAI,yBAAgB,EAAE,CAAC;IAiC9D,CAAC;IA/BC,QAAQ,CAAC,eAAgC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAClC,GAAY,EACZ,MAAc,EACd,IAAU,EACV,OAAmC,EACnC,aAA4B;QAE5B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,GAAY,EACZ,MAAc,EACd,IAAU,EACV,aAAmB,EACnB,OAAqB,EACrB,aAA4B;QAE5B,IAAI,IAAI,CAAC,MAAM,IAAI,oBAAoB,EAAE;YACvC,MAAM,sBAAa,CAAC,WAAW,CAC7B,qBAAY,CAAC,sBAAsB,CAAC,IAAI,EACxC,qBAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CACzD,CAAC;SACH;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,sBAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;CACF,CAAA;AApCY,oBAAoB;IADhC,gBAAO,CAAC,2CAAiB,CAAC,kBAAkB,CAAC;GACjC,oBAAoB,CAoChC;AApCY,oDAAoB"}

package/build/plugins/resource/apiconnector/plugin.d.ts

@@ -1,11 +1,25 @@
 import { Inputs, QTreeNode } from "@microsoft/teamsfx-api";
 import { Context } from "@microsoft/teamsfx-api/build/v2";
-import { ApiConnectorResult } from "./result";
+import { ApiConnectorConfiguration } from "./config";
+import { ApiConnectorResult, QesutionResult } from "./result";
 export declare class ApiConnectorImpl {
     scaffold(ctx: Context, inputs: Inputs): Promise<ApiConnectorResult>;
+    private sendErrorTelemetry;
+    private scaffoldInComponent;
+    private backupExistingFiles;
+    private removeSampleFilesWhenRestore;
+    private getAuthConfigFromInputs;
     private getUserDataFromInputs;
     private scaffoldEnvFileToComponent;
     private scaffoldSampleCodeToComponent;
-    generateQuestion(activePlugins: string[]): QTreeNode;
+    private addSDKDependency;
+    generateQuestion(ctx: Context, inputs: Inputs): Promise<QesutionResult>;
+    buildAuthTypeQuestion(ctx: Context, inputs: Inputs): QTreeNode;
+    buildBasicAuthQuestion(): QTreeNode;
+    buildAADAuthQuestion(ctx: Context, inputs: Inputs): QTreeNode;
+    buildAPIKeyAuthQuestion(): QTreeNode;
+    getTelemetryProperties(config: ApiConnectorConfiguration): {
+        [key: string]: string;
+    };
 }
 //# sourceMappingURL=plugin.d.ts.map

package/build/plugins/resource/apiconnector/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAiB,MAAM,UAAU,CAAC;AAkB7D,qBAAa,gBAAgB;IACd,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmBhF,OAAO,CAAC,qBAAqB;YAWf,0BAA0B;YAW1B,6BAA6B;IAWpC,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,SAAS;CAsD5D"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,MAAM,EACN,SAAS,EAMV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAS1D,OAAO,EACL,yBAAyB,EAK1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,kBAAkB,EAAiB,cAAc,EAAc,MAAM,UAAU,CAAC;AA+BzF,qBAAa,gBAAgB;IACd,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAiIhF,OAAO,CAAC,kBAAkB;YASZ,mBAAmB;YA2BnB,mBAAmB;YAgBnB,4BAA4B;IAW1C,OAAO,CAAC,uBAAuB;IAyD/B,OAAO,CAAC,qBAAqB;YAiBf,0BAA0B;YAU1B,6BAA6B;YAU7B,gBAAgB;IAQjB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAkD7E,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS;IAoB9D,sBAAsB,IAAI,SAAS;IAMnC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS;IAuB7D,uBAAuB,IAAI,SAAS;IAepC,sBAAsB,CAAC,MAAM,EAAE,yBAAyB,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;CAsB5F"}

package/build/plugins/resource/apiconnector/plugin.js

@@ -3,77 +3,242 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiConnectorImpl = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs = tslib_1.__importStar(require("fs-extra"));
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const constants_1 = require("./constants");
+const utils_1 = require("./utils");
 const result_1 = require("./result");
+const constants_1 = require("./constants");
 const envHandler_1 = require("./envHandler");
 const errors_1 = require("./errors");
 const constants_2 = require("../../../common/constants");
 const questions_1 = require("./questions");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const sampleHandler_1 = require("./sampleHandler");
+const common_1 = require("../../../common");
+const utils_2 = require("../../solution/fx-solution/v2/utils");
+const depsHandler_1 = require("./depsHandler");
+const checker_1 = require("./checker");
+const telemetry_1 = require("./telemetry");
 class ApiConnectorImpl {
     async scaffold(ctx, inputs) {
+        var _a, _b, _c;
         if (!inputs.projectPath) {
             throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.InvalidProjectError.name, errors_1.ErrorMessage.InvalidProjectError.message());
         }
         const projectPath = inputs.projectPath;
         const languageType = ctx.projectSetting.programmingLanguage;
         const config = this.getUserDataFromInputs(inputs);
-        for (const componentItem of config.ComponentPath) {
-            await this.scaffoldEnvFileToComponent(projectPath, config, componentItem);
-            await this.scaffoldSampleCodeToComponent(projectPath, config, componentItem, languageType);
-            // await this.addSDKDependency(ComponentPath);
+        const telemetryProperties = this.getTelemetryProperties(config);
+        telemetry_1.TelemetryUtils.init(ctx.telemetryReporter);
+        telemetry_1.TelemetryUtils.sendEvent(telemetry_1.Telemetry.stage.scaffold + telemetry_1.Telemetry.startSuffix, undefined, telemetryProperties);
+        // CLI checker
+        const activePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
+        if (!activePlugins.includes(constants_2.ResourcePlugins.Bot) &&
+            config.ComponentType.includes(constants_1.ComponentType.BOT)) {
+            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.componentNotExistError.name, errors_1.ErrorMessage.componentNotExistError.message(constants_1.ComponentType.BOT));
+        }
+        if (!activePlugins.includes(constants_2.ResourcePlugins.Function) &&
+            config.ComponentType.includes(constants_1.ComponentType.API)) {
+            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.componentNotExistError.name, errors_1.ErrorMessage.componentNotExistError.message(constants_1.ComponentType.API));
+        }
+        // backup relative files.
+        const backupFolderName = utils_1.generateTempFolder();
+        await Promise.all(config.ComponentType.map(async (component) => {
+            await this.backupExistingFiles(path.join(projectPath, component), backupFolderName);
+        }));
+        try {
+            let filesChanged = [];
+            await Promise.all(config.ComponentType.map(async (component) => {
+                const changes = await this.scaffoldInComponent(projectPath, component, config, languageType);
+                filesChanged = filesChanged.concat(changes);
+            }));
+            const msg = utils_1.Notification.getNotificationMsg(config, languageType);
+            const logMessage = localizeUtils_1.getLocalizedString("plugins.apiConnector.Log.CommandSuccess", filesChanged.reduce((previousValue, currentValue) => previousValue +
+                `[${currentValue.changeType}] ${path.relative(inputs.projectPath, currentValue.filePath)}` +
+                "\n", ""));
+            (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(logMessage); // Print generated/updated files for users
+            if (inputs.platform != teamsfx_api_1.Platform.CLI) {
+                (_c = ctx.userInteraction) === null || _c === void 0 ? void 0 : _c.showMessage("info", msg, false, "OK", utils_1.Notification.READ_MORE).then((result) => {
+                    var _a;
+                    const userSelected = result.isOk() ? result.value : undefined;
+                    if (userSelected === utils_1.Notification.READ_MORE) {
+                        (_a = ctx.userInteraction) === null || _a === void 0 ? void 0 : _a.openUrl(utils_1.Notification.READ_MORE_URL);
+                    }
+                });
+            }
+            else {
+                ctx.userInteraction.showMessage("info", msg + ` ${utils_1.Notification.GetLinkNotification()}`, false);
+            }
+        }
+        catch (err) {
+            await Promise.all(config.ComponentType.map(async (component) => {
+                await fs.copy(path.join(projectPath, component, backupFolderName), path.join(projectPath, component), { overwrite: true });
+                await this.removeSampleFilesWhenRestore(projectPath, component, config.APIName, languageType);
+            }));
+            if (!(err instanceof teamsfx_api_1.SystemError) && !(err instanceof teamsfx_api_1.UserError)) {
+                err = result_1.ResultFactory.SystemError(errors_1.ErrorMessage.generateApiConFilesError.name, errors_1.ErrorMessage.generateApiConFilesError.message(err.message));
+            }
+            this.sendErrorTelemetry(err);
+            throw err;
         }
+        finally {
+            await Promise.all(config.ComponentType.map(async (component) => {
+                await utils_1.removeFileIfExist(path.join(projectPath, component, backupFolderName));
+            }));
+        }
+        telemetry_1.TelemetryUtils.sendEvent(telemetry_1.Telemetry.stage.scaffold, true, telemetryProperties);
         return result_1.ResultFactory.Success();
     }
+    sendErrorTelemetry(thrownErr) {
+        const errorCode = thrownErr.source + "." + thrownErr.name;
+        const errorType = thrownErr instanceof teamsfx_api_1.SystemError ? telemetry_1.Telemetry.systemError : telemetry_1.Telemetry.userError;
+        const errorMessage = thrownErr.message;
+        telemetry_1.TelemetryUtils.sendErrorEvent(telemetry_1.Telemetry.stage.scaffold, errorCode, errorType, errorMessage);
+        return thrownErr;
+    }
+    async scaffoldInComponent(projectPath, componentItem, config, languageType) {
+        const updatedPackageFile = await this.addSDKDependency(projectPath, componentItem);
+        const updatedEnvFile = await this.scaffoldEnvFileToComponent(projectPath, config, componentItem);
+        const generatedSampleFile = await this.scaffoldSampleCodeToComponent(projectPath, config, componentItem, languageType);
+        const fileChanges = [updatedEnvFile, generatedSampleFile];
+        if (updatedPackageFile) {
+            // if we didn't update package.json, the result will be undefined
+            fileChanges.push(updatedPackageFile);
+        }
+        return fileChanges;
+    }
+    async backupExistingFiles(folderPath, backupFolder) {
+        await fs.ensureDir(path.join(folderPath, backupFolder));
+        await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.envFileName), path.join(folderPath, backupFolder, constants_1.Constants.envFileName));
+        await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.pkgJsonFile), path.join(folderPath, backupFolder, constants_1.Constants.pkgJsonFile));
+        await utils_1.copyFileIfExist(path.join(folderPath, constants_1.Constants.pkgLockFile), path.join(folderPath, backupFolder, constants_1.Constants.pkgLockFile));
+    }
+    async removeSampleFilesWhenRestore(projectPath, component, apiName, languageType) {
+        const apiFileName = utils_1.getSampleFileName(apiName, languageType);
+        const sampleFilePath = path.join(projectPath, component, apiFileName);
+        await utils_1.removeFileIfExist(sampleFilePath);
+    }
+    getAuthConfigFromInputs(inputs) {
+        let config;
+        const apiType = inputs[constants_1.Constants.questionKey.apiType];
+        switch (apiType) {
+            case constants_1.AuthType.BASIC:
+                utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiUserName);
+                config = {
+                    AuthType: constants_1.AuthType.BASIC,
+                    UserName: inputs[constants_1.Constants.questionKey.apiUserName],
+                };
+                break;
+            case constants_1.AuthType.AAD:
+                const AADConfig = {
+                    AuthType: constants_1.AuthType.AAD,
+                };
+                if (inputs[constants_1.Constants.questionKey.apiAppType] === questions_1.reuseAppOption.id) {
+                    AADConfig.ReuseTeamsApp = true;
+                }
+                else {
+                    AADConfig.ReuseTeamsApp = false;
+                    utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiAppTenentId, constants_1.Constants.questionKey.apiAppId);
+                    AADConfig.TenantId = inputs[constants_1.Constants.questionKey.apiAppTenentId];
+                    AADConfig.ClientId = inputs[constants_1.Constants.questionKey.apiAppId];
+                }
+                config = AADConfig;
+                break;
+            case constants_1.AuthType.APIKEY:
+                const APIKeyConfig = {
+                    AuthType: constants_1.AuthType.APIKEY,
+                };
+                if (inputs[constants_1.Constants.questionKey.apiAPIKeyLocation] === questions_1.requestHeaderOption.id) {
+                    APIKeyConfig.Location = constants_1.KeyLocation.Header;
+                }
+                else {
+                    APIKeyConfig.Location = constants_1.KeyLocation.QueryParams;
+                }
+                utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.apiAPIKeyName);
+                APIKeyConfig.Name = inputs[constants_1.Constants.questionKey.apiAPIKeyName];
+                config = APIKeyConfig;
+                break;
+            case constants_1.AuthType.CUSTOM:
+            case constants_1.AuthType.CERT:
+                config = {
+                    AuthType: apiType,
+                };
+                break;
+            default:
+                throw result_1.ResultFactory.SystemError(errors_1.ErrorMessage.ApiConnectorInputError.name, errors_1.ErrorMessage.ApiConnectorInputError.message(inputs[constants_1.Constants.questionKey.apiAppType]));
+        }
+        return config;
+    }
     getUserDataFromInputs(inputs) {
+        utils_1.checkInputEmpty(inputs, constants_1.Constants.questionKey.componentsSelect, constants_1.Constants.questionKey.apiName, constants_1.Constants.questionKey.endpoint);
+        const authConfig = this.getAuthConfigFromInputs(inputs);
         const config = {
-            ComponentPath: inputs[constants_1.Constants.questionKey.componentsSelect],
+            ComponentType: inputs[constants_1.Constants.questionKey.componentsSelect],
             APIName: inputs[constants_1.Constants.questionKey.apiName],
-            ApiAuthType: inputs[constants_1.Constants.questionKey.apiType],
+            AuthConfig: authConfig,
             EndPoint: inputs[constants_1.Constants.questionKey.endpoint],
-            ApiUserName: inputs[constants_1.Constants.questionKey.apiUserName],
         };
         return config;
     }
     async scaffoldEnvFileToComponent(projectPath, config, component) {
         const envHander = new envHandler_1.EnvHandler(projectPath, component);
         envHander.updateEnvs(config);
-        await envHander.saveLocalEnvFile();
-        return result_1.ResultFactory.Success();
+        return await envHander.saveLocalEnvFile();
     }
     async scaffoldSampleCodeToComponent(projectPath, config, component, languageType) {
         const sampleHandler = new sampleHandler_1.SampleHandler(projectPath, languageType, component);
-        await sampleHandler.generateSampleCode(config);
-        return result_1.ResultFactory.Success();
+        return await sampleHandler.generateSampleCode(config);
     }
-    generateQuestion(activePlugins) {
-        const options = [];
-        if (activePlugins.includes(constants_2.ResourcePlugins.Bot)) {
-            options.push(questions_1.botOption);
-        }
-        if (activePlugins.includes(constants_2.ResourcePlugins.Function)) {
-            options.push(questions_1.functionOption);
+    async addSDKDependency(projectPath, component) {
+        const depsHandler = new depsHandler_1.DepsHandler(projectPath, component);
+        return await depsHandler.addPkgDeps();
+    }
+    async generateQuestion(ctx, inputs) {
+        var _a;
+        const componentOptions = [];
+        if (inputs.platform === teamsfx_api_1.Platform.CLI_HELP) {
+            componentOptions.push(questions_1.botOption);
+            componentOptions.push(questions_1.functionOption);
         }
-        if (options.length === 0) {
-            throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoValidCompoentExistError.name, errors_1.ErrorMessage.NoValidCompoentExistError.message());
+        else {
+            const activePlugins = (_a = ctx.projectSetting.solutionSettings) === null || _a === void 0 ? void 0 : _a.activeResourcePlugins;
+            if (!activePlugins) {
+                throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoActivePluginsExistError.name, errors_1.ErrorMessage.NoActivePluginsExistError.message());
+            }
+            if (activePlugins.includes(constants_2.ResourcePlugins.Bot)) {
+                componentOptions.push(questions_1.botOption);
+            }
+            if (activePlugins.includes(constants_2.ResourcePlugins.Function)) {
+                componentOptions.push(questions_1.functionOption);
+            }
+            if (componentOptions.length === 0) {
+                throw result_1.ResultFactory.UserError(errors_1.ErrorMessage.NoValidCompoentExistError.name, errors_1.ErrorMessage.NoValidCompoentExistError.message());
+            }
         }
         const whichComponent = new teamsfx_api_1.QTreeNode({
             name: constants_1.Constants.questionKey.componentsSelect,
             type: "multiSelect",
-            staticOptions: options,
+            staticOptions: componentOptions,
             title: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichService.title"),
             validation: {
-                validFunc: async (input) => {
-                    const name = input;
-                    if (name.length === 0) {
-                        return localizeUtils_1.getLocalizedString("plugins.apiConnector.questionComponentSelect.emptySelection");
-                    }
-                    return undefined;
-                },
+                validFunc: checker_1.checkEmptySelect,
             },
+            placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichService.placeholder"), // Use the placeholder to display some description
         });
+        const apiNameQuestion = new questions_1.ApiNameQuestion(ctx);
+        const whichAuthType = this.buildAuthTypeQuestion(ctx, inputs);
+        const question = new teamsfx_api_1.QTreeNode({
+            type: "group",
+        });
+        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiEndpointQuestion));
+        question.addChild(whichComponent);
+        question.addChild(new teamsfx_api_1.QTreeNode(apiNameQuestion.getQuestion()));
+        question.addChild(whichAuthType);
+        return teamsfx_api_1.ok(question);
+    }
+    buildAuthTypeQuestion(ctx, inputs) {
         const whichAuthType = new teamsfx_api_1.QTreeNode({
             name: constants_1.Constants.questionKey.apiType,
             type: "singleSelect",
@@ -85,16 +250,73 @@ class ApiConnectorImpl {
                 questions_1.ImplementMyselfOption,
             ],
             title: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichAuthType.title"),
+            placeholder: localizeUtils_1.getLocalizedString("plugins.apiConnector.whichAuthType.placeholder"), // Use the placeholder to display some description
         });
-        const question = new teamsfx_api_1.QTreeNode({
-            type: "group",
+        whichAuthType.addChild(this.buildAADAuthQuestion(ctx, inputs));
+        whichAuthType.addChild(this.buildBasicAuthQuestion());
+        whichAuthType.addChild(this.buildAPIKeyAuthQuestion());
+        return whichAuthType;
+    }
+    buildBasicAuthQuestion() {
+        const node = new teamsfx_api_1.QTreeNode(questions_1.basicAuthUsernameQuestion);
+        node.condition = { equals: questions_1.BasicAuthOption.id };
+        return node;
+    }
+    buildAADAuthQuestion(ctx, inputs) {
+        const solutionSettings = utils_2.getAzureSolutionSettings(ctx);
+        let node;
+        if (common_1.isAADEnabled(solutionSettings) || inputs.platform === teamsfx_api_1.Platform.CLI_HELP) {
+            node = new teamsfx_api_1.QTreeNode({
+                name: constants_1.Constants.questionKey.apiAppType,
+                type: "singleSelect",
+                staticOptions: [questions_1.reuseAppOption, questions_1.anotherAppOption],
+                title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestion.appType.title"),
+            });
+            node.condition = { equals: questions_1.AADAuthOption.id };
+            const tenentQuestionNode = new teamsfx_api_1.QTreeNode(questions_1.appTenantIdQuestion);
+            tenentQuestionNode.condition = { equals: questions_1.anotherAppOption.id };
+            tenentQuestionNode.addChild(new teamsfx_api_1.QTreeNode(questions_1.appIdQuestion));
+            node.addChild(tenentQuestionNode);
+        }
+        else {
+            node = new teamsfx_api_1.QTreeNode(questions_1.appTenantIdQuestion);
+            node.condition = { equals: questions_1.AADAuthOption.id };
+            node.addChild(new teamsfx_api_1.QTreeNode(questions_1.appIdQuestion));
+        }
+        return node;
+    }
+    buildAPIKeyAuthQuestion() {
+        const node = new teamsfx_api_1.QTreeNode({
+            name: constants_1.Constants.questionKey.apiAPIKeyLocation,
+            type: "singleSelect",
+            staticOptions: [questions_1.requestHeaderOption, questions_1.queryParamsOption],
+            title: localizeUtils_1.getLocalizedString("plugins.apiConnector.getQuestion.apiKeyLocation.title"),
         });
-        question.addChild(whichComponent);
-        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiNameQuestion));
-        question.addChild(whichAuthType);
-        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiEndpointQuestion));
-        question.addChild(new teamsfx_api_1.QTreeNode(questions_1.apiLoginUserNameQuestion));
-        return question;
+        node.condition = { equals: questions_1.APIKeyAuthOption.id };
+        const keyNameQuestionNode = new teamsfx_api_1.QTreeNode(questions_1.buildAPIKeyNameQuestion());
+        node.addChild(keyNameQuestionNode);
+        return node;
+    }
+    getTelemetryProperties(config) {
+        const properties = {
+            [telemetry_1.Telemetry.properties.authType]: config.AuthConfig.AuthType.toString(),
+            [telemetry_1.Telemetry.properties.componentType]: config.ComponentType.join(","),
+        };
+        switch (config.AuthConfig.AuthType) {
+            case constants_1.AuthType.AAD:
+                const aadAuthConfig = config.AuthConfig;
+                properties[telemetry_1.Telemetry.properties.reuseTeamsApp] = aadAuthConfig.ReuseTeamsApp
+                    ? telemetry_1.Telemetry.valueYes
+                    : telemetry_1.Telemetry.valueNo;
+                break;
+            case constants_1.AuthType.APIKEY:
+                const authConfig = config.AuthConfig;
+                properties[telemetry_1.Telemetry.properties.keyLocation] = authConfig.Location;
+                break;
+            default:
+                break;
+        }
+        return properties;
     }
 }
 exports.ApiConnectorImpl = ApiConnectorImpl;

package/build/plugins/resource/apiconnector/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../src/plugins/resource/apiconnector/plugin.ts"],"names":[],"mappings":"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"}