npm - @microsoft/teamsfx-core - Versions diffs - 1.2.2-alpha.7b2fe9ea.0 → 1.2.2-alpha.dc2b9a55.0 - Mend

@microsoft/teamsfx-core 1.2.2-alpha.7b2fe9ea.0 → 1.2.2-alpha.dc2b9a55.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (96) hide show

package/build/common/deps-checker/constant/message.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 export declare const Messages: {
     learnMoreButtonText: string;
-    continueButtonText: string;
     defaultErrorMessage: string;
     startInstallFunctionCoreTool: string;
     finishInstallFunctionCoreTool: string;

package/build/common/deps-checker/constant/message.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ~~;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DpB~~,CAAC"}
1	+ {"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDpB,CAAC"}

package/build/common/deps-checker/constant/message.js CHANGED Viewed

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Messages = void 0;
 exports.Messages = {
     learnMoreButtonText: "Learn more",
-    continueButtonText: "Continue anyway",
     defaultErrorMessage: "Install the required dependencies manually.",
     startInstallFunctionCoreTool: `Downloading and installing @NameVersion.`,
     finishInstallFunctionCoreTool: `Successfully installed @NameVersion.`,
@@ -34,7 +33,6 @@ Click "Learn more" to learn how to install the Node.js.
     NodeNotSupported: `Node.js (@CurrentVersion) is not in the supported version list (@SupportedVersions).
 Click "Learn more" to learn more about the supported Node.js versions.
-Click "Continue anyway" to continue local debugging.
 (If you just installed Node.js (@SupportedVersions), restart Visual Studio Code for the change to take effect.)`,
     dotnetNotFound: `Cannot find @NameVersion. For the details why .NET SDK is needed, refer to @HelpLink`,
@@ -47,8 +45,6 @@ Click "Install" to install @InstallPackages.`,
 Teams Toolkit requires these dependencies.
-Click "Continue anyway" to continue.
 (If you just installed @SupportedPackages, restart Visual Studio Code for the change to take effect.)`,
     linuxDepsNotFoundHelpLinkMessage: `Cannot find @SupportedPackages.

package/build/common/deps-checker/constant/message.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,QAAQ,GAAG;IACtB,mBAAmB,EAAE,YAAY;IACjC,~~kBAAkB,EAAE,iBAAiB;IAErC,~~mBAAmB,EAAE,6CAA6C;IAElE,4BAA4B,EAAE,0CAA0C;IACxE,6BAA6B,EAAE,sCAAsC;IACrE,6BAA6B,EAAE,gEAAgE;IAC/F,uBAAuB,EAAE,qEAAqE;IAC9F,yBAAyB,EAAE,gEAAgE;IAC3F,0BAA0B,EAAE,qDAAqD;IAEjF,iBAAiB,EAAE,0CAA0C;IAC7D,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,+DAA+D;IACjF,kBAAkB,EAAE,gEAAgE;IACpF,mBAAmB,EAAE,qDAAqD;IAE1E,cAAc,EAAE,+IAA+I;IAC/J,mBAAmB,EAAE,sCAAsC;IAC3D,eAAe,EAAE,yBAAyB;IAC1C,mBAAmB,EAAE,0FAA0F;IAC/G,sBAAsB,EAAE,gCAAgC;IACxD,mBAAmB,EAAE,+FAA+F;IAEpH,YAAY,EAAE;;;;;;2FAM2E;IACzF,gBAAgB,EAAE~~;;;;;gHAK4F~~;IAE9G,cAAc,EAAE,sFAAsF;IACtG,YAAY,EAAE;;;;6CAI6B;IAE3C,iBAAiB,EAAE~~;;;;;;sGAMiF~~;IAEpG,gCAAgC,EAAE;;2CAEO;CAC1C,CAAC"}
1	+ {"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,QAAQ,GAAG;IACtB,mBAAmB,EAAE,YAAY;IACjC,mBAAmB,EAAE,6CAA6C;IAElE,4BAA4B,EAAE,0CAA0C;IACxE,6BAA6B,EAAE,sCAAsC;IACrE,6BAA6B,EAAE,gEAAgE;IAC/F,uBAAuB,EAAE,qEAAqE;IAC9F,yBAAyB,EAAE,gEAAgE;IAC3F,0BAA0B,EAAE,qDAAqD;IAEjF,iBAAiB,EAAE,0CAA0C;IAC7D,kBAAkB,EAAE,sCAAsC;IAC1D,gBAAgB,EAAE,+DAA+D;IACjF,kBAAkB,EAAE,gEAAgE;IACpF,mBAAmB,EAAE,qDAAqD;IAE1E,cAAc,EAAE,+IAA+I;IAC/J,mBAAmB,EAAE,sCAAsC;IAC3D,eAAe,EAAE,yBAAyB;IAC1C,mBAAmB,EAAE,0FAA0F;IAC/G,sBAAsB,EAAE,gCAAgC;IACxD,mBAAmB,EAAE,+FAA+F;IAEpH,YAAY,EAAE;;;;;;2FAM2E;IACzF,gBAAgB,EAAE;;;;gHAI4F;IAE9G,cAAc,EAAE,sFAAsF;IACtG,YAAY,EAAE;;;;6CAI6B;IAE3C,iBAAiB,EAAE;;;;sGAIiF;IAEpG,gCAAgC,EAAE;;2CAEO;CAC1C,CAAC"}

package/build/common/local/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export * from "./localEnvManager";
+export * from "./packageJsonHelper";
 export * from "./projectSettingsHelper";
 export * from "./taskDefinition";
 export * from "./constants";

package/build/common/local/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAIA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}

package/build/common/local/index.js CHANGED Viewed

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./localEnvManager"), exports);
+tslib_1.__exportStar(require("./packageJsonHelper"), exports);
 tslib_1.__exportStar(require("./projectSettingsHelper"), exports);
 tslib_1.__exportStar(require("./taskDefinition"), exports);
 tslib_1.__exportStar(require("./constants"), exports);

package/build/common/local/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,4DAAkC;AAClC,kEAAwC;AACxC,2DAAiC;AACjC,sDAA4B"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/local/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,4DAAkC;AAClC,8DAAoC;AACpC,kEAAwC;AACxC,2DAAiC;AACjC,sDAA4B"}

package/build/common/local/packageJsonHelper.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { LogProvider } from "@microsoft/teamsfx-api";
 export declare function loadPackageJson(path: string, logger?: LogProvider): Promise<any>;
 export declare function loadTeamsFxDevScript(componentRoot: string): Promise<string | undefined>;
+export declare function checkNpmDependencies(folder: string): Promise<boolean>;
 //# sourceMappingURL=packageJsonHelper.d.ts.map

package/build/common/local/packageJsonHelper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"packageJsonHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;~~AAMrD~~,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAatF;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7F"}
1	+ {"version":3,"file":"packageJsonHelper.d.ts","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAOrD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAatF;AAED,wBAAsB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7F;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B3E"}

package/build/common/local/packageJsonHelper.js CHANGED Viewed

@@ -2,10 +2,11 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTeamsFxDevScript = exports.loadPackageJson = void 0;
+exports.checkNpmDependencies = exports.loadTeamsFxDevScript = exports.loadPackageJson = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
+const Arborist = require("@npmcli/arborist");
 const npmRunDevRegex = /npm[\s]+run[\s]+dev/im;
 async function loadPackageJson(path, logger) {
     if (!(await fs.pathExists(path))) {
@@ -33,4 +34,31 @@ async function loadTeamsFxDevScript(componentRoot) {
     }
 }
 exports.loadTeamsFxDevScript = loadTeamsFxDevScript;
+async function checkNpmDependencies(folder) {
+    var _a;
+    if (await fs.pathExists(folder)) {
+        const packageJson = await loadPackageJson(path.join(folder, "package.json"));
+        if (((packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) && Object.keys(packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies).length > 0) ||
+            ((packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) && Object.keys(packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies).length > 0)) {
+            // load deps from node_modules
+            const arb = new Arborist({ path: folder });
+            try {
+                await arb.loadActual();
+            }
+            catch (error) {
+                return false;
+            }
+            // check if any missing dependency
+            const dependencies = ((_a = arb.actualTree) === null || _a === void 0 ? void 0 : _a.edgesOut) === undefined ? [] : [...arb.actualTree.edgesOut.values()];
+            return !dependencies.some((dependency) => dependency.error === "MISSING");
+        }
+        else {
+            // treat no deps as npm installed
+            return true;
+        }
+    }
+    // treat missing folder as npm installed
+    return true;
+}
+exports.checkNpmDependencies = checkNpmDependencies;
 //# sourceMappingURL=packageJsonHelper.js.map

package/build/common/local/packageJsonHelper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"packageJsonHelper.js","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,qDAA+B;AAC/B,mDAA6B;AAE7B,MAAM,cAAc,GAAG,uBAAuB,CAAC;AAExC,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,MAAoB;IACtE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE;QAChC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iCAAiC,IAAI,mBAAmB,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC9C,IAAI;QACF,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC;KACxB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,iCAAiC,IAAI,YAAY,KAAK,EAAE,CAAC,CAAC;QACxE,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAbD,0CAaC;AAEM,KAAK,UAAU,oBAAoB,CAAC,aAAqB;IAC9D,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IACpF,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC5E,MAAM,UAAU,GAAW,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9D,OAAO,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;KAClF;SAAM;QACL,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AARD,oDAQC"}
1	+ {"version":3,"file":"packageJsonHelper.js","sourceRoot":"","sources":["../../../src/common/local/packageJsonHelper.ts"],"names":[],"mappings":"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"}

package/build/common/local/portChecker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;~~AA4DzD~~,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB"}
1	+ {"version":3,"file":"portChecker.d.ts","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA6BzD,wBAAsB,aAAa,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB"}

package/build/common/local/portChecker.js CHANGED Viewed

@@ -4,60 +4,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortsInUse = void 0;
 const tslib_1 = require("tslib");
-const net = tslib_1.__importStar(require("net"));
 const path = tslib_1.__importStar(require("path"));
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const constants_1 = require("./constants");
 const packageJsonHelper_1 = require("./packageJsonHelper");
 const projectSettingsHelper_1 = require("./projectSettingsHelper");
-const allAddressIPv4 = "0.0.0.0";
-const allAddressIPv6 = "::";
-const loopbackAddressIPv4 = "127.0.0.1";
-const loopbackAddressIPv6 = "::1";
-const hosts = [allAddressIPv4, loopbackAddressIPv4, allAddressIPv6, loopbackAddressIPv6];
-const frontendPortsV1 = [[3000, hosts]];
-const frontendPorts = [[53000, hosts]];
-const simpleAuthPorts = [[55000, hosts]];
+const frontendPortsV1 = [3000];
+const frontendPorts = [53000];
+const simpleAuthPorts = [55000];
 const backendDebugPortRegex = /--inspect[\s]*=[\s"']*9229/im;
-const backendDebugPorts = [[9229, hosts]];
+const backendDebugPorts = [9229];
 const backendServicePortRegex = /--port[\s"']*7071/im;
-const backendServicePorts = [[7071, hosts]];
+const backendServicePorts = [7071];
 const botDebugPortRegex = /--inspect[\s]*=[\s"']*9239/im;
-const botDebugPorts = [[9239, hosts]];
-const botServicePorts = [[3978, hosts]];
-async function detectPortListeningOnHosts(port, hosts) {
-    for (const host of hosts) {
-        if (await detectPortListening(port, host)) {
-            return true;
-        }
+const botDebugPorts = [9239];
+const botServicePorts = [3978];
+async function detectPortListening(port) {
+    try {
+        const portChosen = await detect_port_1.default(port);
+        return portChosen !== port;
+    }
+    catch (_a) {
+        // ignore any error to not block debugging
+        return false;
     }
-    return false;
-}
-async function detectPortListening(port, host) {
-    return new Promise((resolve, _reject) => {
-        try {
-            const server = net.createServer();
-            server
-                .once("error", (err) => {
-                if (err.message.includes("EADDRINUSE")) {
-                    resolve(true);
-                }
-                else {
-                    resolve(false);
-                }
-            })
-                .once("listening", () => {
-                server.close();
-            })
-                .once("close", () => {
-                resolve(false);
-            })
-                .listen(port, host);
-        }
-        catch (err) {
-            // ignore any error to not block debugging
-            resolve(false);
-        }
-    });
 }
 async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
     const ports = [];
@@ -94,8 +64,8 @@ async function getPortsInUse(projectPath, projectSettings, ignoreDebugPort) {
     }
     const portsInUse = [];
     for (const port of ports) {
-        if (await detectPortListeningOnHosts(port[0], port[1])) {
-            portsInUse.push(port[0]);
+        if (await detectPortListening(port)) {
+            portsInUse.push(port);
         }
     }
     return portsInUse;

package/build/common/local/portChecker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,~~iDAA2B~~;~~AAC3B~~,~~mDAA6B~~;~~AAE7B~~,2CAAyC;AACzC,2DAA2D;AAC3D,mEAAgE;AAEhE,MAAM,~~cAAc~~,GAAG,~~SAAS,~~CAAC~~;AACjC~~,~~MAAM,cAAc,GAAG,~~IAAI,CAAC~~;AAC5B~~,~~MAAM,mBAAmB,GAAG,WAAW,~~CAAC;~~AACxC~~,MAAM,~~mBAAmB~~,GAAG,~~KAAK,~~CAAC~~;AAClC~~,~~MAAM,~~KAAK,~~GAAG,~~CAAC,~~cAAc,EAAE,mBAAmB,EAAE,cAAc,EAAE,mBAAmB,~~CAAC~~,CAAC~~;~~AAEzF~~,MAAM,eAAe,~~GAAyB~~,CAAC,~~CAAC,IAAI,EAAE,~~KAAK,CAAC,CAAC~~,CAAC~~;~~AAC9D~~,MAAM,~~aAAa,GAAyB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AAC7D,MAAM,eAAe,GAAyB,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/D,MAAM,~~qBAAqB,GAAG,8BAA8B,CAAC;AAC7D,MAAM,iBAAiB,~~GAAyB~~,CAAC,~~CAAC,~~IAAI,~~EAAE,KAAK,~~CAAC,CAAC~~,CAAC~~;~~AAChE~~,MAAM,uBAAuB,GAAG,qBAAqB,CAAC;AACtD,MAAM,mBAAmB,~~GAAyB~~,CAAC,~~CAAC,~~IAAI,~~EAAE,KAAK,~~CAAC,CAAC~~,CAAC~~;~~AAClE~~,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AACzD,MAAM,aAAa,~~GAAyB~~,CAAC,~~CAAC,~~IAAI,~~EAAE,KAAK,~~CAAC,CAAC~~,CAAC~~;~~AAC5D~~,MAAM,eAAe,~~GAAyB~~,CAAC,~~CAAC,~~IAAI,~~EAAE,KAAK,~~CAAC,CAAC~~,CAAC~~;~~AAE9D~~,KAAK,UAAU,~~0BAA0B~~,CAAC,IAAY~~,EAAE,KAAe~~;~~IACrE~~,~~KAAK,MAAM,~~IAAI~~,IAAI,KAAK,EAAE~~;~~QACxB~~,~~IAAI,~~MAAM,~~mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,~~UAAU,~~mBAAmB,CAAC,IAAY,EAAE,IAAY;IAC3D,OAAO,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;QAC/C,IAAI;YACF,MAAM,MAAM,~~GAAG,~~GAAG,CAAC,YAAY,EAAE,CAAC;YAClC,~~MAAM~~;iBACH~~,~~IAAI~~,CAAC,~~OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACrB,~~IAAI,~~GAAG,~~CAAC,~~OAAO,~~CAAC~~,QAAQ,CAAC,YAAY,CAAC,EAAE~~;~~oBACtC~~,OAAO,~~CAAC~~,~~IAAI,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,~~KAAK,~~CAAC,CAAC;iBAChB;YACH,CAAC,CAAC;iBACD,~~IAAI,CAAC~~,WAAW,EAAE,GAAG,EAAE~~;~~gBACtB,MAAM,CAAC,KAAK,EAAE,CAAC~~;~~YACjB~~,~~CAAC,CAAC~~;~~iBACD~~,~~IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;gBAClB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,CAAC;iBACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACvB;QAAC,OAAO,GAAG,EAAE;YACZ,~~0CAA0C;~~YAC1C~~,OAAO,~~CAAC,~~KAAK,CAAC~~,CAAC~~;~~SAChB~~;~~IACH~~,CAAC~~,CAAC,CAAC~~;~~AACL,CAAC;~~AAEM,KAAK,UAAU,aAAa,CACjC,WAAmB,EACnB,eAAgC,EAChC,eAAyB;IAEzB,MAAM,KAAK,~~GAAyB~~,EAAE,CAAC;~~IAEvC~~,MAAM,eAAe,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC/E,IAAI,eAAe,EAAE;QACnB,MAAM,aAAa,GAAG,6CAAqB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC7E,IAAI,CAAC,aAAa,EAAE;YAClB,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;SAChC;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;SAChC;KACF;IAED,MAAM,cAAc,GAAG,6CAAqB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAC7E,IAAI,cAAc,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE;YAC/B,MAAM,gBAAgB,GAAG,MAAM,wCAAoB,CACjD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,QAAQ,CAAC,CAC5C,CAAC;YACF,IAAI,gBAAgB,KAAK,SAAS,IAAI,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBAClF,KAAK,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;aAClC;SACF;KACF;IACD,MAAM,UAAU,GAAG,6CAAqB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACrE,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC;QAC/B,IAAI,CAAC,CAAC,eAAe,KAAK,IAAI,CAAC,EAAE;YAC/B,MAAM,YAAY,GAAG,MAAM,wCAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACxF,IAAI,YAAY,KAAK,SAAS,IAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBACtE,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;aAC9B;SACF;KACF;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,MAAM,~~0BAA0B~~,CAAC,IAAI,CAAC,~~CAAC,CAAC,~~EAAE~~,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE~~;~~YACtD~~,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC~~,CAAC,CAAC,CAAC~~;~~SAC1B~~;KACF;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAhDD,sCAgDC"}
1	+ {"version":3,"file":"portChecker.js","sourceRoot":"","sources":["../../../src/common/local/portChecker.ts"],"names":[],"mappings":"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"}

package/build/common/local/taskDefinition.js CHANGED Viewed

@@ -131,7 +131,7 @@ class TaskDefinition {
             name: "ngrok start",
             command: skipNgrok
                 ? "echo 'Skip starting ngrok, and will use predefined bot endpoint.'"
-                : "npx ngrok http 3978 --log=stdout",
+                : "ngrok http 3978 --log=stdout",
             env: ngrokBinFolders
                 ? {
                     PATH: `${ngrokBinFolders.join(path_1.default.delimiter)}${path_1.default.delimiter}${(_a = process.env.PATH) !== null && _a !== void 0 ? _a : ""}`,

package/build/common/local/taskDefinition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"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~~kCAAkC~~;~~YACtC~~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"}
1	+ {"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"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"}

package/build/common/projectSettingsValidator.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { ProjectSettings } from "@microsoft/teamsfx-api";
+export declare function validateProjectSettings(projectSettings: ProjectSettings): string | undefined;
+export declare function validateProjectSettingsV3(projectSettings: ProjectSettings): string | undefined;
+//# sourceMappingURL=projectSettingsValidator.d.ts.map

package/build/common/projectSettingsValidator.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"projectSettingsValidator.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAM,MAAM,wBAAwB,CAAC;AAO7D,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAsB5F;AAED,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAW9F"}

package/build/common/projectSettingsValidator.js ADDED Viewed

@@ -0,0 +1,65 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateProjectSettingsV3 = exports.validateProjectSettings = void 0;
+const question_1 = require("../plugins/solution/fx-solution/question");
+function validateProjectSettings(projectSettings) {
+    if (!projectSettings)
+        return "empty projectSettings";
+    if (!projectSettings.solutionSettings)
+        return "empty solutionSettings";
+    const solutionSettings = projectSettings.solutionSettings;
+    if (solutionSettings.hostType === undefined)
+        return "empty solutionSettings.hostType";
+    let validateRes = validateStringArray(solutionSettings.azureResources);
+    if (validateRes) {
+        return `solutionSettings.azureResources validation failed: ${validateRes}`;
+    }
+    validateRes = validateStringArray(solutionSettings.capabilities, [
+        question_1.TabOptionItem.id,
+        question_1.BotOptionItem.id,
+        question_1.MessageExtensionItem.id,
+    ]);
+    if (validateRes) {
+        return `solutionSettings.capabilities validation failed: ${validateRes}`;
+    }
+    validateRes = validateStringArray(solutionSettings.activeResourcePlugins);
+    if (validateRes) {
+        return `solutionSettings.activeResourcePlugins validation failed: ${validateRes}`;
+    }
+    return undefined;
+}
+exports.validateProjectSettings = validateProjectSettings;
+function validateProjectSettingsV3(projectSettings) {
+    const res = validateProjectSettings(projectSettings);
+    if (res)
+        return res;
+    const solutionSettings = projectSettings.solutionSettings;
+    if (!solutionSettings.modules) {
+        return "solutionSettings.modules is undefined";
+    }
+    if (!Array.isArray(solutionSettings.modules)) {
+        return "solutionSettings.modules is not array";
+    }
+    return undefined;
+}
+exports.validateProjectSettingsV3 = validateProjectSettingsV3;
+function validateStringArray(arr, enums) {
+    if (!arr) {
+        return "is undefined";
+    }
+    if (!Array.isArray(arr)) {
+        return "is not array";
+    }
+    for (const element of arr) {
+        if (typeof element !== "string") {
+            return "array elements is not string type";
+        }
+        if (enums && !enums.includes(element)) {
+            return `array elements is out of scope: ${enums}`;
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=projectSettingsValidator.js.map

package/build/common/projectSettingsValidator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"projectSettingsValidator.js","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,uEAIkD;AAElD,SAAgB,uBAAuB,CAAC,eAAgC;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,gBAAgB;QAAE,OAAO,wBAAwB,CAAC;IACvE,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAA8C,CAAC;IACxF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,iCAAiC,CAAC;IACtF,IAAI,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE;QACf,OAAO,sDAAsD,WAAW,EAAE,CAAC;KAC5E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAC/D,wBAAa,CAAC,EAAE;QAChB,wBAAa,CAAC,EAAE;QAChB,+BAAoB,CAAC,EAAE;KACxB,CAAC,CAAC;IACH,IAAI,WAAW,EAAE;QACf,OAAO,oDAAoD,WAAW,EAAE,CAAC;KAC1E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC1E,IAAI,WAAW,EAAE;QACf,OAAO,6DAA6D,WAAW,EAAE,CAAC;KACnF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAtBD,0DAsBC;AAED,SAAgB,yBAAyB,CAAC,eAAgC;IACxE,MAAM,GAAG,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACrD,IAAI,GAAG;QAAE,OAAO,GAAG,CAAC;IACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAA8C,CAAC;IACxF,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;QAC7B,OAAO,uCAAuC,CAAC;KAChD;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC5C,OAAO,uCAAuC,CAAC;KAChD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,8DAWC;AAED,SAAS,mBAAmB,CAAC,GAAS,EAAE,KAAgB;IACtD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,cAAc,CAAC;KACvB;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,cAAc,CAAC;KACvB;IACD,KAAK,MAAM,OAAO,IAAI,GAAY,EAAE;QAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,mCAAmC,CAAC;SAC5C;QACD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,mCAAmC,KAAK,EAAE,CAAC;SACnD;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/build/common/templates-config.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-    "version": "0.1.*",
+    "version": "^0.1.0",
     "tagPrefix": "templates@",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download"

package/build/core/error.js CHANGED Viewed

@@ -72,7 +72,7 @@ function InvalidProjectError(msg) {
 }
 exports.InvalidProjectError = InvalidProjectError;
 function InvalidProjectSettingsFileError(msg) {
-    return new teamsfx_api_1.UserError("InvalidProjectSettingsFile", `The projectSettings.json file is corrupted.`, exports.CoreSource);
+    return new teamsfx_api_1.UserError("InvalidProjectSettingsFile", `The projectSettings.json file is invalid ${msg}`, exports.CoreSource);
 }
 exports.InvalidProjectSettingsFileError = InvalidProjectSettingsFileError;
 class TaskNotSupportError extends teamsfx_api_1.SystemError {

package/build/core/error.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,wDAUgC;AAEnB,QAAA,UAAU,GAAG,MAAM,CAAC;AAEjC,SAAgB,uBAAuB,CAAC,IAAY;IAClD,OAAO,IAAI,uBAAS,CAClB,yBAAyB,EACzB,QAAQ,IAAI,6CAA6C,EACzD,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,0DAMC;AAED,SAAgB,0BAA0B,CAAC,IAAY;IACrD,OAAO,IAAI,uBAAS,CAClB,4BAA4B,EAC5B,QAAQ,IAAI,6CAA6C,EACzD,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,gEAMC;AAED,SAAgB,yBAAyB,CAAC,IAAY;IACpD,OAAO,IAAI,uBAAS,CAClB,2BAA2B,EAC3B,QAAQ,IAAI,mIAAmI,EAC/I,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,8DAMC;AAED,SAAgB,oBAAoB,CAAC,IAAY,EAAE,MAAc;IAC/D,OAAO,IAAI,uBAAS,CAClB,sBAAsB,EACtB,2BAA2B,IAAI,MAAM,MAAM,gGAAgG,EAC3I,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,oDAMC;AAED,SAAgB,mBAAmB,CAAC,MAAc;IAChD,OAAO,IAAI,uBAAS,CAClB,qBAAqB,EACrB,kCAAkC,MAAM,gGAAgG,EACxI,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,kDAMC;AAED,SAAgB,uBAAuB;IACrC,OAAO,IAAI,yBAAW,CAAC,yBAAyB,EAAE,uBAAuB,EAAE,kBAAU,CAAC,CAAC;AACzF,CAAC;AAFD,0DAEC;AAED,SAAgB,wBAAwB,CAAC,IAAY;IACnD,OAAO,IAAI,yBAAW,CACpB,uBAAuB,EACvB,wCAAwC,EACxC,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,4DAMC;AAED,SAAgB,cAAc,CAAC,CAAQ;IACrC,OAAO,IAAI,yBAAW,CAAC,CAAC,EAAE,kBAAU,EAAE,gBAAgB,CAAC,CAAC;AAC1D,CAAC;AAFD,wCAEC;AAED,SAAgB,aAAa,CAAC,CAAQ;IACpC,OAAO,IAAI,yBAAW,CAAC,CAAC,EAAE,kBAAU,EAAE,eAAe,CAAC,CAAC;AACzD,CAAC;AAFD,sCAEC;AAED,SAAgB,aAAa,CAAC,CAAQ;IACpC,OAAO,IAAI,yBAAW,CAAC,CAAC,EAAE,kBAAU,EAAE,eAAe,CAAC,CAAC;AACzD,CAAC;AAFD,sCAEC;AAED,SAAgB,WAAW,CAAC,CAAM;IAChC,MAAM,GAAG,GAAG,2BAAa,CAAC,CAAC,CAAC,CAAC;IAC7B,GAAG,CAAC,IAAI,GAAG,aAAa,CAAC;IACzB,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,kCAIC;AAED,SAAgB,oBAAoB;IAClC,OAAO,IAAI,uBAAS,CAClB,iBAAiB,EACjB,0EAA0E,EAC1E,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,oDAMC;AAED,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,OAAO,IAAI,uBAAS,CAClB,kBAAkB,EAClB,wDAAwD,OAAO,EAAE,EACjE,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,0BAA0B,CAAC,OAAgB;IACzD,OAAO,IAAI,uBAAS,CAClB,uBAAuB,EACvB,wEAAwE,EACxE,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,gEAMC;AAED,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,uBAAS,CAAC,cAAc,EAAE,uBAAuB,IAAI,EAAE,EAAE,kBAAU,CAAC,CAAC;AAClF,CAAC;AAFD,8CAEC;AAED,SAAgB,mBAAmB,CAAC,GAAY;IAC9C,OAAO,IAAI,uBAAS,CAClB,gBAAgB,EAChB,gEAAgE,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EACvF,kBAAU,CACX,CAAC;AACJ,CAAC;AAND,kDAMC;AAED,SAAgB,+BAA+B,CAAC,GAAY;IAC1D,OAAO,IAAI,uBAAS,CAClB,4BAA4B,EAC5B,~~6CAA6C~~,~~EAC7C~~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"}
1	+ {"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"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"}

package/build/core/index.js CHANGED Viewed

@@ -1406,7 +1406,7 @@ function undefinedName(objs, names) {
 }
 exports.undefinedName = undefinedName;
 function getProjectSettingsVersion() {
-    return "2.0.0";
+    return "2.1.0";
 }
 exports.getProjectSettingsVersion = getProjectSettingsVersion;
 tslib_1.__exportStar(require("./error"), exports);

package/build/core/middleware/CommonErrorHandlerMW.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+import { HookContext, Middleware } from "@feathersjs/hooks";
+import { FxError, Result } from "@microsoft/teamsfx-api";
+export interface ErrorHandleOption {
+    error?: FxError;
+    startFn?: (ctx: HookContext) => Promise<Result<any, FxError>>;
+    endFn?: (ctx: HookContext) => Promise<Result<any, FxError>>;
+    telemetry?: {
+        component: string;
+        eventName?: string;
+        properties?: Record<string, string>;
+    };
+}
+export declare function CommonErrorHandlerMW(option?: ErrorHandleOption): Middleware;
+//# sourceMappingURL=CommonErrorHandlerMW.d.ts.map

package/build/core/middleware/CommonErrorHandlerMW.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"CommonErrorHandlerMW.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/CommonErrorHandlerMW.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAsB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAS7E,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9D,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,SAAS,CAAC,EAAE;QACV,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACrC,CAAC;CACH;AAED,wBAAgB,oBAAoB,CAAC,MAAM,CAAC,EAAE,iBAAiB,GAAG,UAAU,CAgD3E"}

package/build/core/middleware/CommonErrorHandlerMW.js ADDED Viewed

@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommonErrorHandlerMW = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
+const telemetry_1 = require("../../common/telemetry");
+function CommonErrorHandlerMW(option) {
+    return async (ctx, next) => {
+        try {
+            if (option === null || option === void 0 ? void 0 : option.startFn) {
+                await (option === null || option === void 0 ? void 0 : option.startFn(ctx));
+            }
+            if (option === null || option === void 0 ? void 0 : option.telemetry) {
+                const event = option.telemetry.eventName
+                    ? option.telemetry.eventName + "-start"
+                    : lodash_1.kebabCase(ctx.method) + "-start";
+                if (!option.telemetry.properties) {
+                    option.telemetry.properties = {};
+                    ctx.arguments.push(option.telemetry.properties);
+                }
+                telemetry_1.sendTelemetryEvent(option.telemetry.component, event, option.telemetry.properties);
+            }
+            await next();
+            if (option === null || option === void 0 ? void 0 : option.endFn) {
+                await (option === null || option === void 0 ? void 0 : option.endFn(ctx));
+            }
+            if (option === null || option === void 0 ? void 0 : option.telemetry) {
+                const event = option.telemetry.eventName
+                    ? option.telemetry.eventName
+                    : lodash_1.kebabCase(ctx.method);
+                option.telemetry.properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.Yes;
+                telemetry_1.sendTelemetryEvent(option.telemetry.component, event, option.telemetry.properties);
+            }
+        }
+        catch (e) {
+            const error = (option === null || option === void 0 ? void 0 : option.error) ? option.error : teamsfx_api_1.assembleError(e);
+            ctx.error = error;
+            if (option === null || option === void 0 ? void 0 : option.endFn) {
+                await (option === null || option === void 0 ? void 0 : option.endFn(ctx));
+            }
+            ctx.result = teamsfx_api_1.err(error);
+            if (option === null || option === void 0 ? void 0 : option.telemetry) {
+                const event = option.telemetry.eventName
+                    ? option.telemetry.eventName
+                    : lodash_1.kebabCase(ctx.method);
+                option.telemetry.properties[telemetry_1.TelemetryProperty.Success] = telemetry_1.TelemetrySuccess.No;
+                telemetry_1.sendTelemetryErrorEvent(option.telemetry.component, event, error, option.telemetry.properties);
+            }
+        }
+    };
+}
+exports.CommonErrorHandlerMW = CommonErrorHandlerMW;
+//# sourceMappingURL=CommonErrorHandlerMW.js.map

package/build/core/middleware/CommonErrorHandlerMW.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"CommonErrorHandlerMW.js","sourceRoot":"","sources":["../../../src/core/middleware/CommonErrorHandlerMW.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/errorHandler.js CHANGED Viewed

@@ -40,11 +40,12 @@ const Reg8 = /Invalid resource group location '.+'. The Resource group already e
 const Reg9 = /The access token is from the wrong issuer '.+'\./;
 const Reg10 = /Entry not found in cache\./;
 const Reg11 = /request to .+ failed, reason: .+/;
+const Reg12 = /.+no space left on device.+/;
 // const Reg12 = /ENOENT: no such file or directory/;
 // const Reg13 = /EBUSY: resource busy or locked/;
 // const Reg14 = /Lock is not .+ by you/;
 // const Reg15 = /EPERM: operation not permitted/;
-const Regs = [Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7, Reg8, Reg9, Reg10, Reg11];
+const Regs = [Reg1, Reg2, Reg3, Reg4, Reg5, Reg6, Reg7, Reg8, Reg9, Reg10, Reg11, Reg12];
 async function tryConvertToUserError(err) {
     const msg = err.message;
     if (!msg)

package/build/core/middleware/errorHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAkG;AAClG,0BAAyC;AAEzC;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;IACvF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAc,CAAC;IAChC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,MAAM,IAC5B,GAAG,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,CAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EACzE,EAAE,CAAC;IACH,IAAI;QACF,MAAA,SAAK,aAAL,SAAK,uBAAL,SAAK,CAAE,WAAW,0CAAE,IAAI,CAAC,qBAAqB,QAAQ,aAAa,QAAI,EAAE,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,EAAE,CAAC;QACb,MAAA,SAAK,aAAL,SAAK,uBAAL,SAAK,CAAE,WAAW,0CAAE,IAAI,CACtB,sBAAsB,QAAQ,WAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,KAAK,CAC1E,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,OAAO,GAAG,2BAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,OAAO,YAAY,yBAAW,EAAE;YAClC,OAAO,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;SAChD;QACD,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AApBW,QAAA,cAAc,kBAoBzB;AAEF,MAAM,IAAI,GACR,mMAAmM,CAAC;AACtM,MAAM,IAAI,GAAG,6EAA6E,CAAC;AAC3F,MAAM,IAAI,GAAG,yCAAyC,CAAC;AACvD,MAAM,IAAI,GACR,yJAAyJ,CAAC;AAC5J,MAAM,IAAI,GACR,uIAAuI,CAAC;AAC1I,MAAM,IAAI,GACR,sGAAsG,CAAC;AACzG,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAC1D,MAAM,IAAI,GACR,4FAA4F,CAAC;AAC/F,MAAM,IAAI,GAAG,kDAAkD,CAAC;AAChE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,KAAK,GAAG,kCAAkC,CAAC;~~AAEjD~~,qDAAqD;AACrD,kDAAkD;AAClD,yCAAyC;AACzC,kDAAkD;AAElD,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;~~AAElF~~,KAAK,UAAU,qBAAqB,CAAC,GAAgB;IACnD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,uBAAS,CAC7B,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,MAAM,EACV,SAAS,EACT,SAAS,EACT,GAAG,CAAC,UAAU,CACf,CAAC;YACF,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAC5B,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAkG;AAClG,0BAAyC;AAEzC;;;GAGG;AACI,MAAM,cAAc,GAAe,KAAK,EAAE,GAAgB,EAAE,IAAkB,EAAE,EAAE;;IACvF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAc,CAAC;IAChC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,MAAM,IAC5B,GAAG,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,CAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EACzE,EAAE,CAAC;IACH,IAAI;QACF,MAAA,SAAK,aAAL,SAAK,uBAAL,SAAK,CAAE,WAAW,0CAAE,IAAI,CAAC,qBAAqB,QAAQ,aAAa,QAAI,EAAE,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,IAAI,EAAE,CAAC;QACb,MAAA,SAAK,aAAL,SAAK,uBAAL,SAAK,CAAE,WAAW,0CAAE,IAAI,CACtB,sBAAsB,QAAQ,WAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,KAAK,CAC1E,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,OAAO,GAAG,2BAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,OAAO,YAAY,yBAAW,EAAE;YAClC,OAAO,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;SAChD;QACD,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AApBW,QAAA,cAAc,kBAoBzB;AAEF,MAAM,IAAI,GACR,mMAAmM,CAAC;AACtM,MAAM,IAAI,GAAG,6EAA6E,CAAC;AAC3F,MAAM,IAAI,GAAG,yCAAyC,CAAC;AACvD,MAAM,IAAI,GACR,yJAAyJ,CAAC;AAC5J,MAAM,IAAI,GACR,uIAAuI,CAAC;AAC1I,MAAM,IAAI,GACR,sGAAsG,CAAC;AACzG,MAAM,IAAI,GAAG,4CAA4C,CAAC;AAC1D,MAAM,IAAI,GACR,4FAA4F,CAAC;AAC/F,MAAM,IAAI,GAAG,kDAAkD,CAAC;AAChE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,KAAK,GAAG,kCAAkC,CAAC;AACjD,MAAM,KAAK,GAAG,6BAA6B,CAAC;AAC5C,qDAAqD;AACrD,kDAAkD;AAClD,yCAAyC;AACzC,kDAAkD;AAElD,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEzF,KAAK,UAAU,qBAAqB,CAAC,GAAgB;IACnD,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;IACxB,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC;IACrB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,SAAS,GAAG,IAAI,uBAAS,CAC7B,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,MAAM,EACV,SAAS,EACT,SAAS,EACT,GAAG,CAAC,UAAU,CACf,CAAC;YACF,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;YAC5B,OAAO,SAAS,CAAC;SAClB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/build/core/middleware/projectSettingsLoader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"projectSettingsLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAGL,OAAO,EAEP,MAAM,EAEN,eAAe,EAEf,MAAM,EACN,eAAe,EAGf,KAAK,EACN,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,eAAe,EAAU,MAAM,OAAO,CAAC;AAahD,eAAO,MAAM,uBAAuB,EAAE,~~UAqCrC~~,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CA0B3C;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB/F;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAW3D"}
1	+ {"version":3,"file":"projectSettingsLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAGL,OAAO,EAEP,MAAM,EAEN,eAAe,EAEf,MAAM,EACN,eAAe,EAGf,KAAK,EACN,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,eAAe,EAAU,MAAM,OAAO,CAAC;AAahD,eAAO,MAAM,uBAAuB,EAAE,UAyCrC,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CA0B3C;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB/F;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAW3D"}

package/build/core/middleware/projectSettingsLoader.js CHANGED Viewed

@@ -35,7 +35,7 @@ const ProjectSettingsLoaderMW = async (ctx, next) => {
         const projectSettings = loadRes.value;
         const validRes = tools_1.validateSettings(projectSettings);
         if (validRes) {
-            ctx.result = teamsfx_api_1.err(error_1.InvalidProjectError(validRes));
+            ctx.result = teamsfx_api_1.err(error_1.InvalidProjectSettingsFileError(`reason: ${validRes}, projectSettings: ${JSON.stringify(projectSettings)}`));
             return;
         }
         ctx.projectSettings = projectSettings;

package/build/core/middleware/projectSettingsLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,wDAcgC;AAChC,qDAA+B;AAC/B,mDAA6B;AAC7B,mDAA6B;AAC7B,~~0BAAqC~~;~~AAErC~~,sDAAkD;AAClD,4EAA2E;AAC3E,sCAAwC;AACxC,oCAKkB;AAClB,4DAAqE;AACrE,oCAAwD;AAEjD,MAAM,uBAAuB,GAAe,KAAK,EACtD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;QACvB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,4BAAoB,EAAE,CAAC,CAAC;YACzC,OAAO;SACR;QACD,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,EAAE;YACrB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,yBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YACxD,OAAO;SACR;QACD,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;YACnB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAChC,OAAO;SACR;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;QAEtC,MAAM,QAAQ,GAAG,wBAAgB,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,QAAQ,EAAE;YACZ,GAAG,CAAC,MAAM,GAAG,iBAAG,~~CAAC~~,~~2BAAmB~~,~~CAAC~~,QAAQ,CAAC,CAAC,CAAC;~~YAChD~~,OAAO;SACR;QAED,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;QACrC,GAAG,CAAC,IAAe,CAAC,YAAY,GAAG,eAAe,CAAC,YAAY,KAAK,IAAI,CAAC;QACzE,GAAG,CAAC,IAAe,CAAC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC;QAC9D,GAAG,CAAC,IAAe,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACvF,GAAG,CAAC,SAAS,GAAG,mBAAe,CAAC,eAAe,CAAC,CAAC;KAClD;IAED,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;~~AArCW~~,QAAA,uBAAuB,~~2BAqClC~~;AAEK,KAAK,UAAU,mBAAmB,CACvC,MAAc,EACd,iBAAiB,GAAG,KAAK;IAEzB,IAAI;QACF,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,OAAO,iBAAG,CAAC,4BAAoB,EAAE,CAAC,CAAC;SACpC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,8BAAgB,EAAE,CAAC,CAAC;QAChF,MAAM,YAAY,GAAG,iBAAiB;YACpC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,oCAAsB,EAAE,qCAAuB,CAAC;YAC/E,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAClD,MAAM,eAAe,GAAoB,MAAM,oBAAQ,CAAC,YAAY,CAAC,CAAC;QACtE,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;YAC9B,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;SACvC;QACD,IACE,eAAe,CAAC,gBAAgB;YAChC,eAAe,CAAC,gBAAgB,CAAC,qBAAqB;YACtD,CAAC,eAAe,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,uBAAW,CAAC,KAAK,CAAC,EACnF;YACA,eAAe,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,uBAAW,CAAC,KAAK,CAAC,CAAC;SAChF;QAED,OAAO,gBAAE,CAAC,eAAe,CAAC,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,iBAAG,CAAC,qBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;KAC9B;AACH,CAAC;AA7BD,kDA6BC;AAEM,KAAK,UAAU,kBAAkB,CAAC,KAAY,EAAE,MAAc;IACnE,MAAM,eAAe,GAAoB;QACvC,OAAO,EAAE,EAAE;QACX,mBAAmB,EAAE,EAAE;QACvB,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;QACpB,gBAAgB,EAAE;YAChB,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,OAAO;SACjB;KACF,CAAC;IACF,MAAM,eAAe,+CACnB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,kBAAU,EAAE,EACrB,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,IAC3B,KAAK,GACL,KAAK,CAAC,aAAa,KACtB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,EAC1D,yBAAyB,EAAE,MAAM,CAAC,WAAW;YAC3C,CAAC,CAAC,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC;YACvD,CAAC,CAAC,SAAS,GACd,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAvBD,gDAuBC;AAED,SAAgB,aAAa,CAAC,GAAoB;IAChD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE1B,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,MAAM,KAAK,cAAc,EAAE;QAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAU,CAAC;QACvC,QAAQ,GAAG,IAAI,KAAK,mBAAK,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC;AAC/D,CAAC;AAXD,sCAWC"}
1	+ {"version":3,"file":"projectSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"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"}

package/build/core/tools.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/core/tools.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAML~~,SAAS,EACT,OAAO,EACP,IAAI,EAEJ,eAAe,EAEf,eAAe,EAEf,EAAE,EACH,MAAM,wBAAwB,CAAC;~~AAShC~~,wBAAgB,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAGpF;AAED,wBAAgB,gBAAgB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,~~CAMtF~~;AAED,wBAAgB,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAW9D;AAGD,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA6C7B;AAED,wBAAsB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAWrF;AAED,wBAAgB,UAAU,CACxB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,SAAS,EAClB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GACvB,OAAO,CAYT;AAED,wBAAgB,YAAY,CAC1B,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,SAAS,EAClB,KAAK,CAAC,EAAE,EAAE,CAAC,cAAc,GACxB,EAAE,CAAC,SAAS,CAYd;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAKzD;AAKD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,IAAI,GAAG,IAAI,CAkBxD"}
1	+ {"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/core/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACT,OAAO,EACP,IAAI,EAEJ,eAAe,EAEf,eAAe,EAEf,EAAE,EACH,MAAM,wBAAwB,CAAC;AAUhC,wBAAgB,eAAe,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAGpF;AAED,wBAAgB,gBAAgB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAGtF;AAED,wBAAgB,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAW9D;AAGD,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA6C7B;AAED,wBAAsB,sBAAsB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAWrF;AAED,wBAAgB,UAAU,CACxB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,SAAS,EAClB,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GACvB,OAAO,CAYT;AAED,wBAAgB,YAAY,CAC1B,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,SAAS,EAClB,KAAK,CAAC,EAAE,EAAE,CAAC,cAAc,GACxB,EAAE,CAAC,SAAS,CAYd;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAKzD;AAKD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,IAAI,GAAG,IAAI,CAkBxD"}