@microsoft/teamsfx-core 1.13.0 → 1.13.1-alpha.ae549cb45.0

package/build/common/deps-checker/internal/ngrokChecker.js

@@ -14,6 +14,7 @@ const progressIndicator_1 = require("../util/progressIndicator");
 const cpUtils_1 = require("../util/cpUtils");
 const system_1 = require("../util/system");
 const telemetry_1 = require("../constant/telemetry");
+const depsChecker_1 = require("../depsChecker");
 const message_1 = require("../constant/message");
 const ngrokName = "ngrok";
 const installPackageVersion = "4.2.2";
@@ -29,17 +30,22 @@ class NgrokChecker {
     async command() {
         return "ngrok";
     }
-    getDepsInfo() {
+    async getDepsInfo(isInstalled, error) {
         return Promise.resolve({
             name: ngrokName,
-            isLinuxSupported: true,
-            installVersion: installPackageVersion,
-            binFolders: [this.getNgrokBinFolder()],
-            supportedVersions: supportedPackageVersions,
-            details: new Map(),
+            type: depsChecker_1.DepsType.Ngrok,
+            isInstalled: isInstalled,
+            command: await this.command(),
+            details: {
+                isLinuxSupported: true,
+                installVersion: installPackageVersion,
+                binFolders: [this.getNgrokBinFolder()],
+                supportedVersions: supportedPackageVersions,
+            },
+            error: error,
         });
     }
-    async isInstalled() {
+    async getInstallationInfo() {
         let isVersionSupported = false, hasSentinel = false;
         try {
             const ngrokVersion = await this.queryNgrokBinVersion();
@@ -49,9 +55,9 @@ class NgrokChecker {
         }
         catch (error) {
             // do nothing
-            return false;
+            return await this.getDepsInfo(false);
         }
-        return isVersionSupported && hasSentinel;
+        return await this.getDepsInfo(isVersionSupported && hasSentinel);
     }
     async install() {
         if (!(await this.hasNPM())) {
@@ -70,23 +76,25 @@ class NgrokChecker {
     }
     async resolve() {
         try {
-            if (!(await this.isInstalled())) {
+            let installationInfo = await this.getInstallationInfo();
+            if (!installationInfo.isInstalled) {
                 // TODO: show output in extension
                 // this._adapter.showOutputChannel();
                 await this.install();
+                installationInfo = await this.getInstallationInfo();
                 this._logger.cleanup();
             }
+            return installationInfo;
         }
         catch (error) {
             await this._logger.printDetailLog();
             this._logger.cleanup();
             await this._logger.error(`Failed to install 'ngrok', error = '${error}'`);
             if (error instanceof depsError_1.DepsCheckerError) {
-                return teamsfx_api_1.err(error);
+                return await this.getDepsInfo(false, error);
             }
-            return teamsfx_api_1.err(new depsError_1.DepsCheckerError(error.message, helpLink_1.ngrokInstallHelpLink));
+            return await this.getDepsInfo(false, new depsError_1.DepsCheckerError(error.message, helpLink_1.ngrokInstallHelpLink));
         }
-        return teamsfx_api_1.ok(true);
     }
     async handleInstallNgrokFailed() {
         await this.cleanup();

package/build/common/deps-checker/internal/ngrokChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"ngrokChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/ngrokChecker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ngrokChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/ngrokChecker.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,qDAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,wDAA0D;AAE1D,mDAA4D;AAC5D,4CAAgD;AAChD,iEAAqE;AACrE,6CAA0C;AAC1C,2CAA2C;AAC3C,qDAA2E;AAG3E,gDAAyE;AACzE,iDAA+C;AAE/C,MAAM,SAAS,GAAG,OAAO,CAAC;AAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC;AACtC,MAAM,wBAAwB,GAAG,CAAC,SAAS,CAAC,CAAC;AAC7C,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,CAAC;AACrC,MAAM,gBAAgB,GAAG,GAAG,SAAS,IAAI,qBAAqB,EAAE,CAAC;AAEjE,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAa,YAAY;IAIvB,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,WAAoB,EACpB,KAAwB;QAExB,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,sBAAQ,CAAC,KAAK;YACpB,WAAW,EAAE,WAAW;YACxB,OAAO,EAAE,MAAM,IAAI,CAAC,OAAO,EAAE;YAC7B,OAAO,EAAE;gBACP,gBAAgB,EAAE,IAAI;gBACtB,cAAc,EAAE,qBAAqB;gBACrC,UAAU,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACtC,iBAAiB,EAAE,wBAAwB;aAC5C;YACD,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,mBAAmB;QAC9B,IAAI,kBAAkB,GAAG,KAAK,EAC5B,WAAW,GAAG,KAAK,CAAC;QACtB,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACvD,kBAAkB;gBAChB,YAAY,KAAK,SAAS,IAAI,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC5E,WAAW,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC3D;QAAC,OAAO,KAAK,EAAE;YACd,aAAa;YACb,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SACtC;QACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAC;IACnE,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;YAC1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAC1B;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAE1B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE;YAC5B,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;SACvC;QAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,qBAAqB,CAAC,CAAC;QAClE,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACjG,CAAC;IAEM,iBAAiB;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjF,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,IAAI;YACF,IAAI,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACxD,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;gBACjC,iCAAiC;gBACjC,qCAAqC;gBACrC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBACrB,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACpD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;aACxB;YACD,OAAO,gBAAgB,CAAC;SACzB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,uCAAuC,KAAK,GAAG,CAAC,CAAC;YAC1E,IAAI,KAAK,YAAY,4BAAgB,EAAE;gBACrC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aAC7C;YACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAC3B,KAAK,EACL,IAAI,4BAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,+BAAoB,CAAC,CAC1D,CAAC;SACH;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB;QACpC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAClC,4BAAgB,CAAC,iBAAiB,EAClC,4BAAgB,CAAC,oBAAoB,EACrC,kBAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,CACvE,CAAC;QACF,MAAM,IAAI,4BAAgB,CACxB,kBAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,EACxE,+BAAoB,CACrB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAC/B,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACrD,kBAAkB,GAAG,UAAU,KAAK,SAAS,IAAI,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3F,WAAW,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC3D;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAClC,4BAAgB,CAAC,oBAAoB,EACrC,4BAAgB,CAAC,qBAAqB,EACtC,GAAG,CACJ,CAAC;SACH;QAED,IAAI,CAAC,kBAAkB,IAAI,CAAC,WAAW,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,oBAAoB,EAAE;gBAC/D,SAAS,EAAE,MAAM,CAAC,kBAAkB,CAAC;gBACrC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC;aAC9B,CAAC,CAAC;SACJ;QACD,OAAO,kBAAkB,IAAI,WAAW,CAAC;IAC3C,CAAC;IAEO,iBAAiB;QACvB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;QACxD,MAAM,IAAI,4BAAgB,CACxB,kBAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,EACnE,+BAAoB,CACrB,CAAC;IACJ,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAEO,eAAe;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,IAAI,8BAAgB,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAC3E,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,cAAc,CACzC,SAAS,EACT,IAAI,CAAC,OAAO,EACZ;YACE,KAAK,EAAE,IAAI;YACX,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,EAAE;SACxC,EACD,SAAS,EACT,SAAS,CACV,CAAC;QAEF,MAAM,KAAK,GACT,sFAAsF,CAAC;QACzF,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEjC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAC3B,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,aAAa,IAAI,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IACvE,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,iBAAO,CAAC,cAAc,CAC7C,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,EAAE,KAAK,EAAE,IAAI,EAAE,EACf,KAAK,EACL,WAAW,CACZ,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,mBAAmB,EAAE;gBAC9D,aAAa,EAAE,UAAU;aAC1B,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;YACxD,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI;YACF,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;YAChD,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SACzC;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CACtB,4BAA4B,IAAI,CAAC,qBAAqB,EAAE,YAAY,GAAG,EAAE,CAC1E,CAAC;SACH;IACH,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CACzC,4BAAgB,CAAC,2BAA2B,EAC5C,KAAK,IAAI,EAAE;YACT,MAAM,4CAAwB,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxF,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAE9F,IAAI;YACF,MAAM,iBAAO,CAAC,cAAc,CAC1B,SAAS,EACT,IAAI,CAAC,OAAO,EACZ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAClC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAC1B,SAAS;YACT,sEAAsE;YACtE,GAAG,SAAS,IAAI,qBAAqB,EAAE,EACvC,UAAU,EACV,GAAG,IAAI,CAAC,qBAAqB,EAAE,EAAE,EACjC,YAAY,CACb,CAAC;YAEF,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;SAC7C;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAClC,4BAAgB,CAAC,uBAAuB,EACxC,4BAAgB,CAAC,oBAAoB,EACrC,KAAK,CACN,CAAC;SACH;IACH,CAAC;IAEO,cAAc,CAAC,OAAe;QACpC,OAAO,kBAAS,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAClD,CAAC;CACF;AA/OD,oCA+OC"}

package/build/common/deps-checker/internal/nodeChecker.d.ts

@@ -2,8 +2,7 @@ import { DepsCheckerError } from "../depsError";
 import { DepsCheckerEvent } from "../constant/telemetry";
 import { DepsLogger } from "../depsLogger";
 import { DepsTelemetry } from "../depsTelemetry";
-import { DepsInfo, DepsChecker } from "../depsChecker";
-import { Result } from "@microsoft/teamsfx-api";
+import { DependencyStatus, DepsChecker, DepsType } from "../depsChecker";
 declare class NodeVersion {
     readonly version: string;
     readonly majorVersion: string;
@@ -12,16 +11,16 @@ declare class NodeVersion {
 export declare abstract class NodeChecker implements DepsChecker {
     protected abstract readonly _nodeNotFoundHelpLink: string;
     protected abstract readonly _nodeNotSupportedEvent: DepsCheckerEvent;
+    protected abstract readonly _type: DepsType;
     protected abstract getSupportedVersions(): Promise<string[]>;
     protected abstract getNodeNotSupportedHelpLink(): Promise<string>;
     private readonly _telemetry;
     private readonly _logger;
     constructor(logger: DepsLogger, telemetry: DepsTelemetry);
-    isInstalled(): Promise<boolean>;
-    checkInstalled(): Promise<boolean>;
-    resolve(): Promise<Result<boolean, DepsCheckerError>>;
+    getInstallationInfo(): Promise<DependencyStatus>;
+    resolve(): Promise<DependencyStatus>;
     install(): Promise<void>;
-    getDepsInfo(): Promise<DepsInfo>;
+    getDepsInfo(isInstalled: boolean, installVersion?: string, error?: DepsCheckerError): Promise<DependencyStatus>;
     private static isVersionSupported;
     command(): Promise<string>;
 }
@@ -29,18 +28,21 @@ export declare function getInstalledNodeVersion(): Promise<NodeVersion | null>;
 export declare class SPFxNodeChecker extends NodeChecker {
     protected readonly _nodeNotFoundHelpLink: string;
     protected readonly _nodeNotSupportedEvent = DepsCheckerEvent.nodeNotSupportedForSPFx;
+    protected readonly _type = DepsType.SpfxNode;
     protected getNodeNotSupportedHelpLink(): Promise<string>;
     protected getSupportedVersions(): Promise<string[]>;
 }
 export declare class AzureNodeChecker extends NodeChecker {
     protected readonly _nodeNotFoundHelpLink: string;
     protected readonly _nodeNotSupportedEvent = DepsCheckerEvent.nodeNotSupportedForAzure;
+    protected readonly _type = DepsType.AzureNode;
     protected getNodeNotSupportedHelpLink(): Promise<string>;
     protected getSupportedVersions(): Promise<string[]>;
 }
 export declare class FunctionNodeChecker extends NodeChecker {
     protected readonly _nodeNotFoundHelpLink: string;
     protected readonly _nodeNotSupportedEvent = DepsCheckerEvent.nodeNotSupportedForAzure;
+    protected readonly _type = DepsType.FunctionNode;
     protected getNodeNotSupportedHelpLink(): Promise<string>;
     protected getSupportedVersions(): Promise<string[]>;
 }

package/build/common/deps-checker/internal/nodeChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAA4C,MAAM,cAAc,CAAC;AAE1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAUzD,cAAM,WAAW;IACf,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,YAAY,EAAE,MAAM,CAAC;gBAEzB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAIlD;AAED,8BAAsB,WAAY,YAAW,WAAW;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;IACrE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAC5D,SAAS,CAAC,QAAQ,CAAC,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;gBAEzB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAwClC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAmBrD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAU7C,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAIpB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAGxC;AAED,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAa3E;AAiBD,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,4CAA4C;cAErE,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG1D;AAED,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,6CAA6C;cAEtE,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG1D;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAClD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,6CAA6C;cAEtE,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG1D"}
+{"version":3,"file":"nodeChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAA4C,MAAM,cAAc,CAAC;AAE1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAWzE,cAAM,WAAW;IACf,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,YAAY,EAAE,MAAM,CAAC;gBAEzB,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAIlD;AAED,8BAAsB,WAAY,YAAW,WAAW;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,EAAE,gBAAgB,CAAC;IACrE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAC5D,SAAS,CAAC,QAAQ,CAAC,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IAEjE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;gBAEzB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAqDhD,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAYpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,WAAW,CACtB,WAAW,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,KAAK,CAAC,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAe5B,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAIpB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAGxC;AAED,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAa3E;AAiBD,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,4CAA4C;IACrF,SAAS,CAAC,QAAQ,CAAC,KAAK,qBAAqB;cAE7B,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG1D;AAED,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,6CAA6C;IACtF,SAAS,CAAC,QAAQ,CAAC,KAAK,sBAAsB;cAE9B,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG1D;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAClD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,SAAwB;IAChE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,6CAA6C;IACtF,SAAS,CAAC,QAAQ,CAAC,KAAK,yBAAyB;cAEjC,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;cAI9C,oBAAoB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG1D"}

package/build/common/deps-checker/internal/nodeChecker.js

@@ -6,8 +6,8 @@ exports.FunctionNodeChecker = exports.AzureNodeChecker = exports.SPFxNodeChecker
 const depsError_1 = require("../depsError");
 const cpUtils_1 = require("../util/cpUtils");
 const telemetry_1 = require("../constant/telemetry");
+const depsChecker_1 = require("../depsChecker");
 const message_1 = require("../constant/message");
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const helpLink_1 = require("../constant/helpLink");
 const NodeName = "Node.js";
 class NodeVersion {
@@ -21,66 +21,59 @@ class NodeChecker {
         this._logger = logger;
         this._telemetry = telemetry;
     }
-    async isInstalled() {
+    async getInstallationInfo() {
         try {
-            return await this.checkInstalled();
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    async checkInstalled() {
-        const supportedVersions = await this.getSupportedVersions();
-        this._logger.debug(`NodeChecker checking for supported versions: '${JSON.stringify(supportedVersions)}'`);
-        const currentVersion = await getInstalledNodeVersion();
-        if (currentVersion === null) {
-            this._telemetry.sendUserErrorEvent(telemetry_1.DepsCheckerEvent.nodeNotFound, "Node.js can't be found.");
-            throw new depsError_1.NodeNotFoundError(message_1.Messages.NodeNotFound.split("@NodeVersion").join(supportedVersions[supportedVersions.length - 1]), this._nodeNotFoundHelpLink);
+            const supportedVersions = await this.getSupportedVersions();
+            this._logger.debug(`NodeChecker checking for supported versions: '${JSON.stringify(supportedVersions)}'`);
+            const currentVersion = await getInstalledNodeVersion();
+            if (currentVersion === null) {
+                this._telemetry.sendUserErrorEvent(telemetry_1.DepsCheckerEvent.nodeNotFound, "Node.js can't be found.");
+                const error = new depsError_1.NodeNotFoundError(message_1.Messages.NodeNotFound.split("@NodeVersion").join(supportedVersions[supportedVersions.length - 1]), this._nodeNotFoundHelpLink);
+                return await this.getDepsInfo(false, undefined, error);
+            }
+            this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.nodeVersion, {
+                "global-version": `${currentVersion.version}`,
+                "global-major-version": `${currentVersion.majorVersion}`,
+            });
+            if (!NodeChecker.isVersionSupported(supportedVersions, currentVersion)) {
+                const supportedVersionsString = supportedVersions.map((v) => "v" + v).join(" ,");
+                this._telemetry.sendUserErrorEvent(this._nodeNotSupportedEvent, `Node.js ${currentVersion.version} is not supported.`);
+                const error = new depsError_1.NodeNotSupportedError(message_1.Messages.NodeNotSupported.split("@CurrentVersion")
+                    .join(currentVersion.version)
+                    .split("@SupportedVersions")
+                    .join(supportedVersionsString), await this.getNodeNotSupportedHelpLink());
+                return await this.getDepsInfo(false, currentVersion.version, error);
+            }
+            return await this.getDepsInfo(true, currentVersion.version);
         }
-        this._telemetry.sendEvent(telemetry_1.DepsCheckerEvent.nodeVersion, {
-            "global-version": `${currentVersion.version}`,
-            "global-major-version": `${currentVersion.majorVersion}`,
-        });
-        if (!NodeChecker.isVersionSupported(supportedVersions, currentVersion)) {
-            const supportedVersionsString = supportedVersions.map((v) => "v" + v).join(" ,");
-            this._telemetry.sendUserErrorEvent(this._nodeNotSupportedEvent, `Node.js ${currentVersion.version} is not supported.`);
-            throw new depsError_1.NodeNotSupportedError(message_1.Messages.NodeNotSupported.split("@CurrentVersion")
-                .join(currentVersion.version)
-                .split("@SupportedVersions")
-                .join(supportedVersionsString), await this.getNodeNotSupportedHelpLink());
+        catch (error) {
+            return await this.getDepsInfo(false, undefined, new depsError_1.DepsCheckerError(error.message, helpLink_1.nodeNotFoundHelpLink));
         }
-        return true;
     }
     async resolve() {
-        try {
-            if (!(await this.checkInstalled())) {
-                await this.install();
-            }
-        }
-        catch (error) {
+        const installationInfo = await this.getInstallationInfo();
+        if (installationInfo.error) {
             await this._logger.printDetailLog();
-            await this._logger.error(`${error.message}, error = '${error}'`);
-            if (error instanceof depsError_1.DepsCheckerError) {
-                return teamsfx_api_1.err(error);
-            }
-            return teamsfx_api_1.err(new depsError_1.DepsCheckerError(error.message, helpLink_1.nodeNotFoundHelpLink));
-        }
-        finally {
-            this._logger.cleanup();
+            await this._logger.error(`${installationInfo.error.message}, error = '${installationInfo.error}'`);
         }
-        return teamsfx_api_1.ok(true);
+        this._logger.cleanup();
+        return installationInfo;
     }
     async install() {
         return Promise.resolve();
     }
-    async getDepsInfo() {
-        var _a;
+    async getDepsInfo(isInstalled, installVersion, error) {
         return {
             name: NodeName,
-            isLinuxSupported: true,
-            installVersion: (_a = (await getInstalledNodeVersion())) === null || _a === void 0 ? void 0 : _a.version,
-            supportedVersions: await this.getSupportedVersions(),
-            details: new Map(),
+            type: this._type,
+            isInstalled: isInstalled,
+            command: await this.command(),
+            details: {
+                isLinuxSupported: true,
+                supportedVersions: await this.getSupportedVersions(),
+                installVersion: installVersion,
+            },
+            error: error,
         };
     }
     static isVersionSupported(supportedVersion, version) {
@@ -119,6 +112,7 @@ class SPFxNodeChecker extends NodeChecker {
         super(...arguments);
         this._nodeNotFoundHelpLink = helpLink_1.nodeNotFoundHelpLink;
         this._nodeNotSupportedEvent = telemetry_1.DepsCheckerEvent.nodeNotSupportedForSPFx;
+        this._type = depsChecker_1.DepsType.SpfxNode;
     }
     async getNodeNotSupportedHelpLink() {
         return helpLink_1.nodeNotSupportedForSPFxHelpLink;
@@ -133,6 +127,7 @@ class AzureNodeChecker extends NodeChecker {
         super(...arguments);
         this._nodeNotFoundHelpLink = helpLink_1.nodeNotFoundHelpLink;
         this._nodeNotSupportedEvent = telemetry_1.DepsCheckerEvent.nodeNotSupportedForAzure;
+        this._type = depsChecker_1.DepsType.AzureNode;
     }
     async getNodeNotSupportedHelpLink() {
         return helpLink_1.nodeNotSupportedForAzureHelpLink;
@@ -147,6 +142,7 @@ class FunctionNodeChecker extends NodeChecker {
         super(...arguments);
         this._nodeNotFoundHelpLink = helpLink_1.nodeNotFoundHelpLink;
         this._nodeNotSupportedEvent = telemetry_1.DepsCheckerEvent.nodeNotSupportedForAzure;
+        this._type = depsChecker_1.DepsType.FunctionNode;
     }
     async getNodeNotSupportedHelpLink() {
         return helpLink_1.nodeNotSupportedForFunctionsHelpLink;

package/build/common/deps-checker/internal/nodeChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodeChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nodeChecker.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/nodeChecker.ts"],"names":[],"mappings":"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"}

package/build/common/templates-config.json

@@ -1,6 +1,6 @@
 {
-    "version": "^1.0.0",
-    "tagPrefix": "templates@",
+    "version": "0.0.0-alpha",
+    "tagPrefix": "templates-",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download",
     "templateReleaseURL": "https://api.github.com/repos/OfficeDev/TeamsFx/releases/tags"

package/build/component/bicep.d.ts

@@ -1,8 +1,8 @@
-import { Action, ContextV3, MaybePromise, FxError, Result, InputsWithProjectPath } from "@microsoft/teamsfx-api";
+import { FxError, Result, InputsWithProjectPath, ProvisionContextV3 } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
-export declare class BicepProvider {
+export declare class BicepComponent {
     readonly name = "bicep";
-    init(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
-    deploy(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
+    init(projectPath: string): Promise<Result<undefined, FxError>>;
+    deploy(context: ProvisionContextV3, inputs: InputsWithProjectPath): Promise<Result<undefined, FxError>>;
 }
 //# sourceMappingURL=bicep.d.ts.map

package/build/component/bicep.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bicep.d.ts","sourceRoot":"","sources":["../../src/component/bicep.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,SAAS,EACT,YAAY,EACZ,OAAO,EAEP,MAAM,EACN,qBAAqB,EAItB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,kBAAkB,CAAC;AAM1B,qBACa,aAAa;IACxB,QAAQ,CAAC,IAAI,WAAW;IACxB,IAAI,CACF,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAgEpD,MAAM,CACJ,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAkCrD"}
+{"version":3,"file":"bicep.d.ts","sourceRoot":"","sources":["../../src/component/bicep.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,kBAAkB,CAAC;AAK1B,qBACa,cAAc;IACzB,QAAQ,CAAC,IAAI,WAAW;IAClB,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAgC9D,MAAM,CACV,OAAO,EAAE,kBAAkB,EAC3B,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CASvC"}

package/build/component/bicep.js

@@ -2,98 +2,48 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BicepProvider = void 0;
+exports.BicepComponent = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 require("reflect-metadata");
 const typedi_1 = require("typedi");
+const utils_1 = require("../common/utils");
 const folder_1 = require("../folder");
 const arm_1 = tslib_1.__importDefault(require("../plugins/solution/fx-solution/arm"));
-const utils_1 = require("./utils");
-let BicepProvider = class BicepProvider {
+let BicepComponent = class BicepComponent {
     constructor() {
         this.name = "bicep";
     }
-    init(context, inputs) {
-        const action = {
-            name: "bicep.init",
-            type: "function",
-            plan: async (context, inputs) => {
-                const targetFolder = path.join(inputs.projectPath, "templates", "azure");
-                return teamsfx_api_1.ok(utils_1.createFilesEffects([
-                    path.join(targetFolder, "main.bicep"),
-                    path.join(targetFolder, "provision.bicep"),
-                    path.join(targetFolder, "config.bicep"),
-                ], "skip"));
-            },
-            execute: async (context, inputs) => {
-                const sourceFolder = path.join(folder_1.getTemplatesFolder(), "bicep");
-                const targetFolder = path.join(inputs.projectPath, "templates", "azure");
-                if ((await fs_extra_1.default.pathExists(path.join(targetFolder, "main.bicep"))) &&
-                    (await fs_extra_1.default.pathExists(path.join(targetFolder, "provision.bicep"))) &&
-                    (await fs_extra_1.default.pathExists(path.join(targetFolder, "config.bicep"))))
-                    return teamsfx_api_1.ok([]);
-                await fs_extra_1.default.ensureDir(targetFolder);
-                await fs_extra_1.default.ensureDir(path.join(targetFolder, "provision"));
-                await fs_extra_1.default.ensureDir(path.join(targetFolder, "teamsFx"));
-                if (!(await fs_extra_1.default.pathExists(path.join(targetFolder, "main.bicep")))) {
-                    await fs_extra_1.default.copyFile(path.join(sourceFolder, "main.bicep"), path.join(targetFolder, "main.bicep"));
-                }
-                if (!(await fs_extra_1.default.pathExists(path.join(targetFolder, "provision.bicep")))) {
-                    await fs_extra_1.default.copyFile(path.join(sourceFolder, "provision.bicep"), path.join(targetFolder, "provision.bicep"));
-                }
-                if (!(await fs_extra_1.default.pathExists(path.join(targetFolder, "config.bicep")))) {
-                    await fs_extra_1.default.copyFile(path.join(sourceFolder, "config.bicep"), path.join(targetFolder, "config.bicep"));
-                }
-                const effect = {
-                    type: "file",
-                    operate: "create",
-                    filePath: [
-                        path.join(targetFolder, "main.bicep"),
-                        path.join(targetFolder, "provision.bicep"),
-                        path.join(targetFolder, "config.bicep"),
-                    ],
-                };
-                return teamsfx_api_1.ok([effect]);
-            },
-        };
-        return teamsfx_api_1.ok(action);
+    async init(projectPath) {
+        const sourceFolder = path.join(folder_1.getTemplatesFolder(), "bicep");
+        const targetFolder = path.join(await utils_1.getProjectTemplatesFolderPath(projectPath), "azure");
+        if ((await fs_extra_1.default.pathExists(path.join(targetFolder, "main.bicep"))) &&
+            (await fs_extra_1.default.pathExists(path.join(targetFolder, "provision.bicep"))) &&
+            (await fs_extra_1.default.pathExists(path.join(targetFolder, "config.bicep"))))
+            return teamsfx_api_1.ok(undefined);
+        await fs_extra_1.default.ensureDir(targetFolder);
+        await fs_extra_1.default.ensureDir(path.join(targetFolder, "provision"));
+        await fs_extra_1.default.ensureDir(path.join(targetFolder, "teamsFx"));
+        if (!(await fs_extra_1.default.pathExists(path.join(targetFolder, "main.bicep")))) {
+            await fs_extra_1.default.copyFile(path.join(sourceFolder, "main.bicep"), path.join(targetFolder, "main.bicep"));
+        }
+        if (!(await fs_extra_1.default.pathExists(path.join(targetFolder, "provision.bicep")))) {
+            await fs_extra_1.default.copyFile(path.join(sourceFolder, "provision.bicep"), path.join(targetFolder, "provision.bicep"));
+        }
+        if (!(await fs_extra_1.default.pathExists(path.join(targetFolder, "config.bicep")))) {
+            await fs_extra_1.default.copyFile(path.join(sourceFolder, "config.bicep"), path.join(targetFolder, "config.bicep"));
+        }
+        return teamsfx_api_1.ok(undefined);
     }
-    deploy(context, inputs) {
-        const action = {
-            type: "function",
-            name: "azure-bicep.deploy",
-            plan: (context, inputs) => {
-                const deployInputs = inputs["bicep"];
-                return teamsfx_api_1.ok([
-                    {
-                        type: "service",
-                        name: "azure",
-                        remarks: `deploy bicep, ${JSON.stringify(deployInputs)}`,
-                    },
-                ]);
-            },
-            execute: async (context, inputs) => {
-                const ctx = context;
-                const res = await arm_1.default.deployArmTemplates(ctx, inputs, ctx.envInfo, ctx.tokenProvider.azureAccountProvider);
-                if (res.isErr())
-                    return teamsfx_api_1.err(res.error);
-                return teamsfx_api_1.ok([
-                    {
-                        type: "service",
-                        name: "azure",
-                        remarks: "deploy bicep",
-                    },
-                ]);
-            },
-        };
-        return teamsfx_api_1.ok(action);
+    async deploy(context, inputs) {
+        const ctx = context;
+        return await arm_1.default.deployArmTemplates(ctx, inputs, ctx.envInfo, ctx.tokenProvider.azureAccountProvider);
     }
 };
-BicepProvider = tslib_1.__decorate([
+BicepComponent = tslib_1.__decorate([
     typedi_1.Service("bicep")
-], BicepProvider);
-exports.BicepProvider = BicepProvider;
+], BicepComponent);
+exports.BicepComponent = BicepComponent;
 //# sourceMappingURL=bicep.js.map

package/build/component/bicep.js.map

@@ -1 +1 @@
-{"version":3,"file":"bicep.js","sourceRoot":"","sources":["../../src/component/bicep.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bicep.js","sourceRoot":"","sources":["../../src/component/bicep.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAMgC;AAChC,gEAA0B;AAC1B,mDAA6B;AAC7B,4BAA0B;AAC1B,mCAAiC;AACjC,2CAAgE;AAChE,sCAA+C;AAC/C,sFAAsD;AAEtD,IAAa,cAAc,GAA3B,MAAa,cAAc;IAA3B;QACW,SAAI,GAAG,OAAO,CAAC;IA6C1B,CAAC;IA5CC,KAAK,CAAC,IAAI,CAAC,WAAmB;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,qCAA6B,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;QAC1F,IACE,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;YAC5D,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;YACjE,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;YAE9D,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,kBAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACjC,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;QACzD,MAAM,kBAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE;YACjE,MAAM,kBAAE,CAAC,QAAQ,CACf,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,EACrC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CACtC,CAAC;SACH;QACD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE;YACtE,MAAM,kBAAE,CAAC,QAAQ,CACf,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,EAC1C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAC3C,CAAC;SACH;QACD,IAAI,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE;YACnE,MAAM,kBAAE,CAAC,QAAQ,CACf,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,EACvC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,CACxC,CAAC;SACH;QACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,MAAM,CACV,OAA2B,EAC3B,MAA6B;QAE7B,MAAM,GAAG,GAAG,OAA6B,CAAC;QAC1C,OAAO,MAAM,aAAG,CAAC,kBAAkB,CACjC,GAAG,EACH,MAAM,EACN,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC,CAAC;IACJ,CAAC;CACF,CAAA;AA9CY,cAAc;IAD1B,gBAAO,CAAC,OAAO,CAAC;GACJ,cAAc,CA8C1B;AA9CY,wCAAc"}

package/build/component/code/apiCode.d.ts

@@ -1,11 +1,11 @@
-import { Action, ContextV3, FxError, InputsWithProjectPath, MaybePromise, Result, SourceCodeProvider } from "@microsoft/teamsfx-api";
+import { ActionContext, ContextV3, FxError, InputsWithProjectPath, Result } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
 /**
  * api scaffold
  */
-export declare class ApiCodeProvider implements SourceCodeProvider {
+export declare class ApiCodeProvider {
     name: string;
-    generate(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
-    build(context: ContextV3, inputs: InputsWithProjectPath): MaybePromise<Result<Action | undefined, FxError>>;
+    generate(context: ContextV3, inputs: InputsWithProjectPath, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
+    build(context: ContextV3, inputs: InputsWithProjectPath, actionContext?: ActionContext): Promise<Result<undefined, FxError>>;
 }
 //# sourceMappingURL=apiCode.d.ts.map

package/build/component/code/apiCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiCode.d.ts","sourceRoot":"","sources":["../../../src/component/code/apiCode.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,qBAAqB,EAErB,YAAY,EAGZ,MAAM,EACN,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAU1B;;GAEG;AACH,qBACa,eAAgB,YAAW,kBAAkB;IACxD,IAAI,SAAc;IAClB,QAAQ,CACN,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAoDpD,KAAK,CACH,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAsCrD"}
+{"version":3,"file":"apiCode.d.ts","sourceRoot":"","sources":["../../../src/component/code/apiCode.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,SAAS,EACT,OAAO,EACP,qBAAqB,EAGrB,MAAM,EACP,MAAM,wBAAwB,CAAC;AAEhC,OAAO,kBAAkB,CAAC;AAW1B;;GAEG;AACH,qBACa,eAAe;IAC1B,IAAI,SAAc;IAcZ,QAAQ,CACZ,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,EAC7B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA+BhC,KAAK,CACT,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,EAC7B,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAYvC"}