@microsoft/teamsfx-core 2.0.4-alpha.a80a9a6b9.0 → 2.0.4-alpha.aa5ceceb5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/constants.d.ts +2 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +2 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +2 -0
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +2 -0
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +9 -1
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +8 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/depsChecker.d.ts +7 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +1 -0
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts +24 -0
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -0
- package/build/common/deps-checker/internal/testToolChecker.js +238 -0
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -0
- package/build/common/deps-checker/util/fileHelper.d.ts +1 -0
- package/build/common/deps-checker/util/fileHelper.d.ts.map +1 -1
- package/build/common/deps-checker/util/fileHelper.js +9 -1
- package/build/common/deps-checker/util/fileHelper.js.map +1 -1
- package/build/common/featureFlags.d.ts +2 -0
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +10 -1
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/jsonUtils.d.ts.map +1 -1
- package/build/common/jsonUtils.js +1 -5
- package/build/common/jsonUtils.js.map +1 -1
- package/build/common/samples.d.ts +3 -0
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts +3 -0
- package/build/common/spec-parser/adaptiveCardWrapper.d.ts.map +1 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js +21 -0
- package/build/common/spec-parser/adaptiveCardWrapper.js.map +1 -0
- package/build/common/spec-parser/constants.d.ts +8 -6
- package/build/common/spec-parser/constants.d.ts.map +1 -1
- package/build/common/spec-parser/constants.js +8 -8
- package/build/common/spec-parser/constants.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +16 -22
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/interfaces.js +2 -1
- package/build/common/spec-parser/interfaces.js.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +5 -4
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +18 -15
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts +1 -0
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +14 -12
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +1 -1
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +11 -6
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/versionMetadata.d.ts +1 -0
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +1 -0
- package/build/common/versionMetadata.js.map +1 -1
- package/build/component/configManager/validator.d.ts.map +1 -1
- package/build/component/configManager/validator.js +4 -3
- package/build/component/configManager/validator.js.map +1 -1
- package/build/component/coordinator/index.d.ts +1 -0
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +5 -6
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/create.d.ts.map +1 -1
- package/build/component/driver/aad/create.js +4 -0
- package/build/component/driver/aad/create.js.map +1 -1
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts +5 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.d.ts.map +1 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js +21 -0
- package/build/component/driver/aad/error/aadAppNameTooLongError.js.map +1 -0
- package/build/component/driver/arm/deployImpl.d.ts.map +1 -1
- package/build/component/driver/arm/deployImpl.js +4 -0
- package/build/component/driver/arm/deployImpl.js.map +1 -1
- package/build/component/driver/botAadApp/create.d.ts.map +1 -1
- package/build/component/driver/botAadApp/create.js +4 -0
- package/build/component/driver/botAadApp/create.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +10 -2
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/constant.d.ts +2 -0
- package/build/component/driver/devTool/constant.d.ts.map +1 -1
- package/build/component/driver/devTool/constant.js +4 -0
- package/build/component/driver/devTool/constant.js.map +1 -1
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts +5 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.d.ts.map +1 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js +24 -0
- package/build/component/driver/devTool/error/testToolInstallationUserError.js.map +1 -0
- package/build/component/driver/devTool/installDriver.d.ts +1 -0
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +47 -2
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts +8 -0
- package/build/component/driver/devTool/interfaces/InstallToolArgs.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +1 -1
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +9 -9
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts +6 -0
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +22 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/errors.d.ts +4 -0
- package/build/component/driver/teamsApp/errors.d.ts.map +1 -1
- package/build/component/driver/teamsApp/errors.js +7 -0
- package/build/component/driver/teamsApp/errors.js.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/ManifestUtils.js +15 -2
- package/build/component/driver/teamsApp/utils/ManifestUtils.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +2 -1
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +3 -0
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +21 -0
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts +3 -0
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +53 -17
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/middleware/envMW.js +2 -2
- package/build/component/middleware/envMW.js.map +1 -1
- package/build/component/utils/ResourceGroupHelper.d.ts.map +1 -1
- package/build/component/utils/ResourceGroupHelper.js +10 -5
- package/build/component/utils/ResourceGroupHelper.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +4 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/pathUtils.d.ts.map +1 -1
- package/build/component/utils/pathUtils.js +9 -4
- package/build/component/utils/pathUtils.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +17 -5
- package/build/core/FxCore.js.map +1 -1
- package/build/core/environment.d.ts +2 -9
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +17 -13
- package/build/core/environment.js.map +1 -1
- package/build/core/environmentName.d.ts +18 -0
- package/build/core/environmentName.d.ts.map +1 -0
- package/build/core/environmentName.js +35 -0
- package/build/core/environmentName.js.map +1 -0
- package/build/core/telemetry.d.ts +1 -0
- package/build/core/telemetry.d.ts.map +1 -1
- package/build/core/telemetry.js +3 -3
- package/build/core/telemetry.js.map +1 -1
- package/build/error/arm.d.ts.map +1 -1
- package/build/error/arm.js +10 -0
- package/build/error/arm.js.map +1 -1
- package/build/error/azure.d.ts +5 -5
- package/build/error/azure.d.ts.map +1 -1
- package/build/error/azure.js +21 -5
- package/build/error/azure.js.map +1 -1
- package/build/error/common.d.ts +1 -1
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +41 -19
- package/build/error/common.js.map +1 -1
- package/build/error/deploy.d.ts +1 -1
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +21 -2
- package/build/error/deploy.js.map +1 -1
- package/build/error/m365.d.ts.map +1 -1
- package/build/error/m365.js +4 -0
- package/build/error/m365.js.map +1 -1
- package/build/error/script.d.ts +2 -2
- package/build/error/script.d.ts.map +1 -1
- package/build/error/script.js +7 -2
- package/build/error/script.js.map +1 -1
- package/build/error/types.d.ts +6 -0
- package/build/error/types.d.ts.map +1 -0
- package/build/error/types.js +12 -0
- package/build/error/types.js.map +1 -0
- package/build/error/yml.d.ts.map +1 -1
- package/build/error/yml.js +6 -0
- package/build/error/yml.js.map +1 -1
- package/build/index.d.ts +2 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -1
- package/build/index.js.map +1 -1
- package/build/question/constants.d.ts +4 -2
- package/build/question/constants.d.ts.map +1 -1
- package/build/question/constants.js +9 -3
- package/build/question/constants.js.map +1 -1
- package/build/question/create.d.ts +13 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +63 -63
- package/build/question/create.js.map +1 -1
- package/build/question/index.d.ts +1 -0
- package/build/question/index.d.ts.map +1 -1
- package/build/question/index.js +1 -0
- package/build/question/index.js.map +1 -1
- package/build/question/inputs/CreateProjectInputs.d.ts +2 -4
- package/build/question/inputs/CreateProjectInputs.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateProjectOptions.js +6 -9
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +5 -5
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +0 -1
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +0 -1
- package/build/question/questionNames.js.map +1 -1
- package/package.json +5 -3
- package/resource/package.nls.cs.json +83 -23
- package/resource/package.nls.de.json +81 -21
- package/resource/package.nls.es.json +83 -23
- package/resource/package.nls.fr.json +82 -22
- package/resource/package.nls.it.json +82 -22
- package/resource/package.nls.ja.json +83 -23
- package/resource/package.nls.json +23 -8
- package/resource/package.nls.ko.json +82 -22
- package/resource/package.nls.pl.json +83 -23
- package/resource/package.nls.pt-BR.json +84 -24
- package/resource/package.nls.ru.json +84 -24
- package/resource/package.nls.tr.json +82 -22
- package/resource/package.nls.zh-Hans.json +82 -22
- package/resource/package.nls.zh-Hant.json +82 -22
- package/resource/package.nls.zh-cn.json +82 -22
- package/resource/package.nls.zh-tw.json +82 -22
- package/resource/yaml-schema/v1.3/yaml.schema.json +1500 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,0DAA0B;AAE1B,wDAAsF;AACtF,2CAA8C;AAC9C,iDAAsD;AAEtD,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,MAAM,iBAAiB,GAAG,WAAW,CAAC;AACtC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAC3C,MAAM,gBAAgB,GAAG,gCAAgC,CAAC;AAC7C,QAAA,eAAe,GAAG,QAAQ,CAAC;AACxC,6FAA6F;AAChF,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,+BAA+B,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adaptiveCardWrapper.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/adaptiveCardWrapper.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEjE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,mBAAmB,CAarB"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
// Copyright (c) Microsoft Corporation.
|
|
2
|
+
// Licensed under the MIT license.
|
|
3
|
+
"use strict";
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.wrapAdaptiveCard = void 0;
|
|
6
|
+
const constants_1 = require("./constants");
|
|
7
|
+
function wrapAdaptiveCard(card, title, subtitle) {
|
|
8
|
+
const result = {
|
|
9
|
+
version: constants_1.ConstantString.WrappedCardVersion,
|
|
10
|
+
$schema: constants_1.ConstantString.WrappedCardSchema,
|
|
11
|
+
responseLayout: constants_1.ConstantString.WrappedCardResponseLayout,
|
|
12
|
+
responseCardTemplate: card,
|
|
13
|
+
previewCardTemplate: {
|
|
14
|
+
title: title,
|
|
15
|
+
subtitle: subtitle,
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
return result;
|
|
19
|
+
}
|
|
20
|
+
exports.wrapAdaptiveCard = wrapAdaptiveCard;
|
|
21
|
+
//# sourceMappingURL=adaptiveCardWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adaptiveCardWrapper.js","sourceRoot":"","sources":["../../../src/common/spec-parser/adaptiveCardWrapper.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,2CAA6C;AAG7C,SAAgB,gBAAgB,CAC9B,IAAkB,EAClB,KAAa,EACb,QAAgB;IAEhB,MAAM,MAAM,GAAwB;QAClC,OAAO,EAAE,0BAAc,CAAC,kBAAkB;QAC1C,OAAO,EAAE,0BAAc,CAAC,iBAAiB;QACzC,cAAc,EAAE,0BAAc,CAAC,yBAAyB;QACxD,oBAAoB,EAAE,IAAI;QAC1B,mBAAmB,EAAE;YACnB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;SACnB;KACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,4CAiBC"}
|
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
export declare class ConstantString {
|
|
2
2
|
static readonly CancelledMessage: string;
|
|
3
|
-
static readonly SpecVersionNotSupported: string;
|
|
4
3
|
static readonly NoServerInformation: string;
|
|
5
|
-
static readonly MultipleServerInformation: string;
|
|
6
4
|
static readonly RemoteRefNotSupported: string;
|
|
7
5
|
static readonly MissingOperationId: string;
|
|
8
6
|
static readonly NoSupportedApi: string;
|
|
9
7
|
static readonly AdditionalPropertiesNotSupported: string;
|
|
10
8
|
static readonly SchemaNotSupported: string;
|
|
11
9
|
static readonly UnknownSchema: string;
|
|
12
|
-
static readonly UrlProtocolNotSupported
|
|
13
|
-
static readonly RelativeServerUrlNotSupported
|
|
14
|
-
static readonly ResolveServerUrlFailed
|
|
15
|
-
static readonly OperationOnlyContainsOptionalParam
|
|
10
|
+
static readonly UrlProtocolNotSupported: string;
|
|
11
|
+
static readonly RelativeServerUrlNotSupported: string;
|
|
12
|
+
static readonly ResolveServerUrlFailed: string;
|
|
13
|
+
static readonly OperationOnlyContainsOptionalParam: string;
|
|
14
|
+
static readonly ConvertSwaggerToOpenAPI: string;
|
|
15
|
+
static readonly WrappedCardVersion = "devPreview";
|
|
16
|
+
static readonly WrappedCardSchema = "<URL_REFERENCE_TO_SCHEMA>";
|
|
17
|
+
static readonly WrappedCardResponseLayout = "list";
|
|
16
18
|
static readonly GetMethod = "get";
|
|
17
19
|
static readonly PostMethod = "post";
|
|
18
20
|
static readonly AdaptiveCardVersion = "1.5";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/constants.ts"],"names":[],"mappings":"AAMA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAAsD;IACtF,MAAM,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/constants.ts"],"names":[],"mappings":"AAMA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SAAsD;IACtF,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAyD;IAC5F,MAAM,CAAC,QAAQ,CAAC,qBAAqB,SAA2D;IAChG,MAAM,CAAC,QAAQ,CAAC,kBAAkB,SAAwD;IAC1F,MAAM,CAAC,QAAQ,CAAC,cAAc,SAAoD;IAClF,MAAM,CAAC,QAAQ,CAAC,gCAAgC,SAE9C;IACF,MAAM,CAAC,QAAQ,CAAC,kBAAkB,SAAwD;IAC1F,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAmD;IAEhF,MAAM,CAAC,QAAQ,CAAC,uBAAuB,SAErC;IACF,MAAM,CAAC,QAAQ,CAAC,6BAA6B,SAE3C;IACF,MAAM,CAAC,QAAQ,CAAC,sBAAsB,SAA4D;IAClG,MAAM,CAAC,QAAQ,CAAC,kCAAkC,SAEhD;IACF,MAAM,CAAC,QAAQ,CAAC,uBAAuB,SAErC;IAEF,MAAM,CAAC,QAAQ,CAAC,kBAAkB,gBAAgB;IAClD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,+BAA+B;IAChE,MAAM,CAAC,QAAQ,CAAC,yBAAyB,UAAU;IAEnD,MAAM,CAAC,QAAQ,CAAC,SAAS,SAAS;IAClC,MAAM,CAAC,QAAQ,CAAC,UAAU,UAAU;IACpC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAS;IAC5C,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wDAAwD;IAC1F,MAAM,CAAC,QAAQ,CAAC,gBAAgB,kBAAkB;IAClD,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAe;IAC5C,MAAM,CAAC,QAAQ,CAAC,aAAa,eAAe;IAC5C,MAAM,CAAC,QAAQ,CAAC,kBAAkB,WAYhC;IACF,MAAM,CAAC,QAAQ,CAAC,mBAAmB,WASjC;CACH"}
|
|
@@ -8,21 +8,21 @@ class ConstantString {
|
|
|
8
8
|
}
|
|
9
9
|
exports.ConstantString = ConstantString;
|
|
10
10
|
ConstantString.CancelledMessage = localizeUtils_1.getLocalizedString("core.common.CancelledMessage");
|
|
11
|
-
ConstantString.SpecVersionNotSupported = localizeUtils_1.getLocalizedString("core.common.SpecVersionNotSupported");
|
|
12
11
|
ConstantString.NoServerInformation = localizeUtils_1.getLocalizedString("core.common.NoServerInformation");
|
|
13
|
-
// TODO: remove core.common.MultipleServerInformation message which is not used
|
|
14
|
-
ConstantString.MultipleServerInformation = localizeUtils_1.getLocalizedString("core.common.MultipleServerInformation");
|
|
15
12
|
ConstantString.RemoteRefNotSupported = localizeUtils_1.getLocalizedString("core.common.RemoteRefNotSupported");
|
|
16
13
|
ConstantString.MissingOperationId = localizeUtils_1.getLocalizedString("core.common.MissingOperationId");
|
|
17
14
|
ConstantString.NoSupportedApi = localizeUtils_1.getLocalizedString("core.common.NoSupportedApi");
|
|
18
15
|
ConstantString.AdditionalPropertiesNotSupported = localizeUtils_1.getLocalizedString("core.common.AdditionalPropertiesNotSupported");
|
|
19
16
|
ConstantString.SchemaNotSupported = localizeUtils_1.getLocalizedString("core.common.SchemaNotSupported");
|
|
20
17
|
ConstantString.UnknownSchema = localizeUtils_1.getLocalizedString("core.common.UnknownSchema");
|
|
21
|
-
|
|
22
|
-
ConstantString.
|
|
23
|
-
ConstantString.
|
|
24
|
-
ConstantString.
|
|
25
|
-
ConstantString.
|
|
18
|
+
ConstantString.UrlProtocolNotSupported = localizeUtils_1.getLocalizedString("core.common.UrlProtocolNotSupported");
|
|
19
|
+
ConstantString.RelativeServerUrlNotSupported = localizeUtils_1.getLocalizedString("core.common.RelativeServerUrlNotSupported");
|
|
20
|
+
ConstantString.ResolveServerUrlFailed = localizeUtils_1.getLocalizedString("core.common.ResolveServerUrlFailed");
|
|
21
|
+
ConstantString.OperationOnlyContainsOptionalParam = localizeUtils_1.getLocalizedString("core.common.OperationOnlyContainsOptionalParam");
|
|
22
|
+
ConstantString.ConvertSwaggerToOpenAPI = localizeUtils_1.getLocalizedString("core.common.ConvertSwaggerToOpenAPI");
|
|
23
|
+
ConstantString.WrappedCardVersion = "devPreview";
|
|
24
|
+
ConstantString.WrappedCardSchema = "<URL_REFERENCE_TO_SCHEMA>";
|
|
25
|
+
ConstantString.WrappedCardResponseLayout = "list";
|
|
26
26
|
ConstantString.GetMethod = "get";
|
|
27
27
|
ConstantString.PostMethod = "post";
|
|
28
28
|
ConstantString.AdaptiveCardVersion = "1.5";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/spec-parser/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,oDAAsD;AAEtD,MAAa,cAAc;;AAA3B,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/spec-parser/constants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEb,oDAAsD;AAEtD,MAAa,cAAc;;AAA3B,wCA4DC;AA3DiB,+BAAgB,GAAG,kCAAkB,CAAC,8BAA8B,CAAC,CAAC;AACtE,kCAAmB,GAAG,kCAAkB,CAAC,iCAAiC,CAAC,CAAC;AAC5E,oCAAqB,GAAG,kCAAkB,CAAC,mCAAmC,CAAC,CAAC;AAChF,iCAAkB,GAAG,kCAAkB,CAAC,gCAAgC,CAAC,CAAC;AAC1E,6BAAc,GAAG,kCAAkB,CAAC,4BAA4B,CAAC,CAAC;AAClE,+CAAgC,GAAG,kCAAkB,CACnE,8CAA8C,CAC/C,CAAC;AACc,iCAAkB,GAAG,kCAAkB,CAAC,gCAAgC,CAAC,CAAC;AAC1E,4BAAa,GAAG,kCAAkB,CAAC,2BAA2B,CAAC,CAAC;AAEhE,sCAAuB,GAAG,kCAAkB,CAC1D,qCAAqC,CACtC,CAAC;AACc,4CAA6B,GAAG,kCAAkB,CAChE,2CAA2C,CAC5C,CAAC;AACc,qCAAsB,GAAG,kCAAkB,CAAC,oCAAoC,CAAC,CAAC;AAClF,iDAAkC,GAAG,kCAAkB,CACrE,gDAAgD,CACjD,CAAC;AACc,sCAAuB,GAAG,kCAAkB,CAC1D,qCAAqC,CACtC,CAAC;AAEc,iCAAkB,GAAG,YAAY,CAAC;AAClC,gCAAiB,GAAG,2BAA2B,CAAC;AAChD,wCAAyB,GAAG,MAAM,CAAC;AAEnC,wBAAS,GAAG,KAAK,CAAC;AAClB,yBAAU,GAAG,MAAM,CAAC;AACpB,kCAAmB,GAAG,KAAK,CAAC;AAC5B,iCAAkB,GAAG,oDAAoD,CAAC;AAC1E,+BAAgB,GAAG,cAAc,CAAC;AAClC,4BAAa,GAAG,WAAW,CAAC;AAC5B,4BAAa,GAAG,WAAW,CAAC;AAC5B,iCAAkB,GAAG;IACnC,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,SAAS;CACV,CAAC;AACc,kCAAmB,GAAG;IACpC,KAAK;IACL,MAAM;IACN,KAAK;IACL,QAAQ;IACR,OAAO;IACP,MAAM;IACN,SAAS;IACT,OAAO;CACR,CAAC"}
|
|
@@ -58,12 +58,12 @@ export interface GenerateResult {
|
|
|
58
58
|
*/
|
|
59
59
|
export declare enum ErrorType {
|
|
60
60
|
SpecNotValid = "spec-not-valid",
|
|
61
|
-
VersionNotSupported = "version-not-supported",
|
|
62
61
|
RemoteRefNotSupported = "remote-ref-not-supported",
|
|
63
62
|
NoServerInformation = "no-server-information",
|
|
64
63
|
UrlProtocolNotSupported = "url-protocol-not-supported",
|
|
65
64
|
RelativeServerUrlNotSupported = "relative-server-url-not-supported",
|
|
66
65
|
NoSupportedApi = "no-supported-api",
|
|
66
|
+
NoExtraAPICanBeAdded = "no-extra-api-can-be-added",
|
|
67
67
|
ResolveServerUrlFailed = "resolve-server-url-failed",
|
|
68
68
|
ListFailed = "list-failed",
|
|
69
69
|
ListOperationMapFailed = "list-operation-map-failed",
|
|
@@ -84,6 +84,7 @@ export declare enum WarningType {
|
|
|
84
84
|
OperationIdMissing = "operationid-missing",
|
|
85
85
|
GenerateCardFailed = "generate-card-failed",
|
|
86
86
|
OperationOnlyContainsOptionalParam = "operation-only-contains-optional-param",
|
|
87
|
+
ConvertSwaggerToOpenAPI = "convert-swagger-to-openapi",
|
|
87
88
|
Unknown = "unknown"
|
|
88
89
|
}
|
|
89
90
|
/**
|
|
@@ -110,27 +111,20 @@ export interface AdaptiveCard {
|
|
|
110
111
|
version: string;
|
|
111
112
|
body: Array<TextBlockElement | ArrayElement>;
|
|
112
113
|
}
|
|
113
|
-
export interface
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
id: string;
|
|
128
|
-
type: string;
|
|
129
|
-
context: string[];
|
|
130
|
-
title: string;
|
|
131
|
-
description?: string;
|
|
132
|
-
parameters: Parameter[];
|
|
133
|
-
apiResponseRenderingTemplateFile?: string;
|
|
114
|
+
export interface WrappedAdaptiveCard {
|
|
115
|
+
version: string;
|
|
116
|
+
$schema?: string;
|
|
117
|
+
jsonPath?: string;
|
|
118
|
+
responseLayout: string;
|
|
119
|
+
responseCardTemplate: AdaptiveCard;
|
|
120
|
+
previewCardTemplate: {
|
|
121
|
+
title: string;
|
|
122
|
+
subtitle?: string;
|
|
123
|
+
image?: {
|
|
124
|
+
url: string;
|
|
125
|
+
alt?: string;
|
|
126
|
+
};
|
|
127
|
+
};
|
|
134
128
|
}
|
|
135
129
|
export interface Parameter {
|
|
136
130
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/interfaces.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAC;IAEzB;;OAEG;IACH,QAAQ,EAAE,aAAa,EAAE,CAAC;IAE1B;;OAEG;IACH,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,YAAY,mBAAmB;IAC/B,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/interfaces.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,MAAM,EAAE,gBAAgB,CAAC;IAEzB;;OAEG;IACH,QAAQ,EAAE,aAAa,EAAE,CAAC;IAE1B;;OAEG;IACH,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,YAAY,mBAAmB;IAC/B,qBAAqB,6BAA6B;IAClD,mBAAmB,0BAA0B;IAC7C,uBAAuB,+BAA+B;IACtD,6BAA6B,sCAAsC;IACnE,cAAc,qBAAqB;IACnC,oBAAoB,8BAA8B;IAClD,sBAAsB,8BAA8B;IAEpD,UAAU,gBAAgB;IAC1B,sBAAsB,8BAA8B;IACpD,gBAAgB,uBAAuB;IACvC,oBAAoB,2BAA2B;IAC/C,0BAA0B,kCAAkC;IAC5D,cAAc,oBAAoB;IAClC,cAAc,oBAAoB;IAElC,SAAS,cAAc;IACvB,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,oBAAY,WAAW;IACrB,gBAAgB,uBAAuB;IACvC,kBAAkB,yBAAyB;IAC3C,kBAAkB,wBAAwB;IAC1C,kBAAkB,yBAAyB;IAC3C,kCAAkC,2CAA2C;IAC7E,uBAAuB,+BAA+B;IACtD,OAAO,YAAY;CACpB;AAED;;GAEG;AACH,oBAAY,gBAAgB;IAC1B,KAAK,IAAA;IACL,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,CAAC,gBAAgB,GAAG,YAAY,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,YAAY,CAAC;IACnC,mBAAmB,EAAE;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,GAAG,CAAC,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CAClB"}
|
|
@@ -9,12 +9,12 @@ exports.ValidationStatus = exports.WarningType = exports.ErrorType = void 0;
|
|
|
9
9
|
var ErrorType;
|
|
10
10
|
(function (ErrorType) {
|
|
11
11
|
ErrorType["SpecNotValid"] = "spec-not-valid";
|
|
12
|
-
ErrorType["VersionNotSupported"] = "version-not-supported";
|
|
13
12
|
ErrorType["RemoteRefNotSupported"] = "remote-ref-not-supported";
|
|
14
13
|
ErrorType["NoServerInformation"] = "no-server-information";
|
|
15
14
|
ErrorType["UrlProtocolNotSupported"] = "url-protocol-not-supported";
|
|
16
15
|
ErrorType["RelativeServerUrlNotSupported"] = "relative-server-url-not-supported";
|
|
17
16
|
ErrorType["NoSupportedApi"] = "no-supported-api";
|
|
17
|
+
ErrorType["NoExtraAPICanBeAdded"] = "no-extra-api-can-be-added";
|
|
18
18
|
ErrorType["ResolveServerUrlFailed"] = "resolve-server-url-failed";
|
|
19
19
|
ErrorType["ListFailed"] = "list-failed";
|
|
20
20
|
ErrorType["ListOperationMapFailed"] = "list-operation-map-failed";
|
|
@@ -36,6 +36,7 @@ var WarningType;
|
|
|
36
36
|
WarningType["OperationIdMissing"] = "operationid-missing";
|
|
37
37
|
WarningType["GenerateCardFailed"] = "generate-card-failed";
|
|
38
38
|
WarningType["OperationOnlyContainsOptionalParam"] = "operation-only-contains-optional-param";
|
|
39
|
+
WarningType["ConvertSwaggerToOpenAPI"] = "convert-swagger-to-openapi";
|
|
39
40
|
WarningType["Unknown"] = "unknown";
|
|
40
41
|
})(WarningType = exports.WarningType || (exports.WarningType = {}));
|
|
41
42
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/common/spec-parser/interfaces.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAmEb;;GAEG;AACH,IAAY,SAoBX;AApBD,WAAY,SAAS;IACnB,4CAA+B,CAAA;IAC/B
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/common/spec-parser/interfaces.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAmEb;;GAEG;AACH,IAAY,SAoBX;AApBD,WAAY,SAAS;IACnB,4CAA+B,CAAA;IAC/B,+DAAkD,CAAA;IAClD,0DAA6C,CAAA;IAC7C,mEAAsD,CAAA;IACtD,gFAAmE,CAAA;IACnE,gDAAmC,CAAA;IACnC,+DAAkD,CAAA;IAClD,iEAAoD,CAAA;IAEpD,uCAA0B,CAAA;IAC1B,iEAAoD,CAAA;IACpD,oDAAuC,CAAA;IACvC,4DAA+C,CAAA;IAC/C,yEAA4D,CAAA;IAC5D,+CAAkC,CAAA;IAClC,+CAAkC,CAAA;IAElC,oCAAuB,CAAA;IACvB,gCAAmB,CAAA;AACrB,CAAC,EApBW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAoBpB;AAED;;GAEG;AACH,IAAY,WAQX;AARD,WAAY,WAAW;IACrB,sDAAuC,CAAA;IACvC,0DAA2C,CAAA;IAC3C,yDAA0C,CAAA;IAC1C,0DAA2C,CAAA;IAC3C,4FAA6E,CAAA;IAC7E,qEAAsD,CAAA;IACtD,kCAAmB,CAAA;AACrB,CAAC,EARW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAQtB;AAED;;GAEG;AACH,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,yDAAK,CAAA;IACL,6DAAO,CAAA;IACP,yDAAK,CAAA;AACP,CAAC,EAJW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAI3B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { OpenAPIV3 } from "openapi-types";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function
|
|
2
|
+
import { Parameter, WarningResult } from "./interfaces";
|
|
3
|
+
import { IMessagingExtensionCommand, TeamsAppManifest } from "@microsoft/teamsfx-api";
|
|
4
|
+
export declare function updateManifest(manifestPath: string, outputSpecPath: string, adaptiveCardFolder: string, spec: OpenAPIV3.Document): Promise<[TeamsAppManifest, WarningResult[]]>;
|
|
5
|
+
export declare function generateParametersFromSchema(schema: OpenAPIV3.SchemaObject, name: string, isRequired?: boolean): Parameter[];
|
|
6
|
+
export declare function generateCommands(spec: OpenAPIV3.Document, adaptiveCardFolder: string, manifestPath: string): Promise<[IMessagingExtensionCommand[], WarningResult[]]>;
|
|
6
7
|
//# sourceMappingURL=manifestUpdater.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifestUpdater.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/manifestUpdater.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,
|
|
1
|
+
{"version":3,"file":"manifestUpdater.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/manifestUpdater.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAa,aAAa,EAAe,MAAM,cAAc,CAAC;AAOhF,OAAO,EAEL,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAChC,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,IAAI,EAAE,SAAS,CAAC,QAAQ,GACvB,OAAO,CAAC,CAAC,gBAAgB,EAAE,aAAa,EAAE,CAAC,CAAC,CA0B9C;AAED,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,SAAS,CAAC,YAAY,EAC9B,IAAI,EAAE,MAAM,EACZ,UAAU,UAAQ,GACjB,SAAS,EAAE,CAkCb;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,SAAS,CAAC,QAAQ,EACxB,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,0BAA0B,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC,CA2E1D"}
|
|
@@ -37,14 +37,14 @@ async function updateManifest(manifestPath, outputSpecPath, adaptiveCardFolder,
|
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
exports.updateManifest = updateManifest;
|
|
40
|
-
function generateParametersFromSchema(schema, name) {
|
|
41
|
-
var _a;
|
|
40
|
+
function generateParametersFromSchema(schema, name, isRequired = false) {
|
|
41
|
+
var _a, _b;
|
|
42
42
|
const parameters = [];
|
|
43
43
|
if (schema.type === "string" ||
|
|
44
44
|
schema.type === "integer" ||
|
|
45
45
|
schema.type === "boolean" ||
|
|
46
46
|
schema.type === "number") {
|
|
47
|
-
if (
|
|
47
|
+
if (isRequired) {
|
|
48
48
|
parameters.push({
|
|
49
49
|
name: name,
|
|
50
50
|
title: utils_1.updateFirstLetter(name),
|
|
@@ -55,7 +55,11 @@ function generateParametersFromSchema(schema, name) {
|
|
|
55
55
|
else if (schema.type === "object") {
|
|
56
56
|
const { properties } = schema;
|
|
57
57
|
for (const property in properties) {
|
|
58
|
-
|
|
58
|
+
let isRequired = false;
|
|
59
|
+
if (schema.required && ((_b = schema.required) === null || _b === void 0 ? void 0 : _b.indexOf(property)) >= 0) {
|
|
60
|
+
isRequired = true;
|
|
61
|
+
}
|
|
62
|
+
const result = generateParametersFromSchema(properties[property], property, isRequired);
|
|
59
63
|
parameters.push(...result);
|
|
60
64
|
}
|
|
61
65
|
}
|
|
@@ -92,24 +96,16 @@ async function generateCommands(spec, adaptiveCardFolder, manifestPath) {
|
|
|
92
96
|
});
|
|
93
97
|
}
|
|
94
98
|
if (operationItem.requestBody) {
|
|
95
|
-
const
|
|
96
|
-
|
|
99
|
+
const requestBody = operationItem.requestBody;
|
|
100
|
+
const requestJson = requestBody.content["application/json"];
|
|
97
101
|
if (Object.keys(requestJson).length !== 0) {
|
|
98
102
|
const schema = requestJson.schema;
|
|
99
|
-
const result = generateParametersFromSchema(schema, "requestBody");
|
|
103
|
+
const result = generateParametersFromSchema(schema, "requestBody", requestBody.required);
|
|
100
104
|
parameters.push(...result);
|
|
101
105
|
}
|
|
102
106
|
}
|
|
103
107
|
const operationId = operationItem.operationId;
|
|
104
108
|
const adaptiveCardPath = path_1.default.join(adaptiveCardFolder, operationId + ".json");
|
|
105
|
-
if (parameters.length === 0) {
|
|
106
|
-
warnings.push({
|
|
107
|
-
type: interfaces_1.WarningType.OperationOnlyContainsOptionalParam,
|
|
108
|
-
content: util_1.format(constants_1.ConstantString.OperationOnlyContainsOptionalParam, operationId),
|
|
109
|
-
data: operationId,
|
|
110
|
-
});
|
|
111
|
-
continue;
|
|
112
|
-
}
|
|
113
109
|
const command = {
|
|
114
110
|
context: ["compose"],
|
|
115
111
|
type: "query",
|
|
@@ -121,6 +117,13 @@ async function generateCommands(spec, adaptiveCardFolder, manifestPath) {
|
|
|
121
117
|
: "",
|
|
122
118
|
};
|
|
123
119
|
commands.push(command);
|
|
120
|
+
if (parameters.length === 0) {
|
|
121
|
+
warnings.push({
|
|
122
|
+
type: interfaces_1.WarningType.OperationOnlyContainsOptionalParam,
|
|
123
|
+
content: util_1.format(constants_1.ConstantString.OperationOnlyContainsOptionalParam, operationId),
|
|
124
|
+
data: operationId,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
124
127
|
}
|
|
125
128
|
}
|
|
126
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifestUpdater.js","sourceRoot":"","sources":["../../../src/common/spec-parser/manifestUpdater.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,
|
|
1
|
+
{"version":3,"file":"manifestUpdater.js","sourceRoot":"","sources":["../../../src/common/spec-parser/manifestUpdater.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare class SpecParser {
|
|
|
9
9
|
private apiMap;
|
|
10
10
|
private spec;
|
|
11
11
|
private unResolveSpec;
|
|
12
|
+
private isSwaggerFile;
|
|
12
13
|
/**
|
|
13
14
|
* Creates a new instance of the SpecParser class.
|
|
14
15
|
* @param path The URL or file path of the OpenAPI specification file. The OpenAPI specification file must have a version of 3.0 or higher.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specParser.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/specParser.ts"],"names":[],"mappings":"AAKA,OAAO,aAAa,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"specParser.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/specParser.ts"],"names":[],"mappings":"AAKA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AAIxD,OAAO,EAIL,cAAc,EACd,cAAc,EAIf,MAAM,cAAc,CAAC;AAWtB;;GAEG;AACH,qBAAa,UAAU;IACrB,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAgB,MAAM,EAAE,aAAa,CAAC;IAEtC,OAAO,CAAC,MAAM,CAA0D;IACxE,OAAO,CAAC,IAAI,CAAiC;IAC7C,OAAO,CAAC,aAAa,CAAiC;IACtD,OAAO,CAAC,aAAa,CAAsB;IAE3C;;;OAGG;gBACS,IAAI,EAAE,MAAM;IAKxB;;;;OAIG;IACG,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAsFzC;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAU/B;;;OAGG;IACG,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqBtD;;;;;;OAMG;IACG,QAAQ,CACZ,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EAAE,EAChB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,EAC1B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,CAAC;YA+EZ,QAAQ;IAetB,OAAO,CAAC,kBAAkB;CAqB3B"}
|
|
@@ -7,6 +7,7 @@ const tslib_1 = require("tslib");
|
|
|
7
7
|
const util = tslib_1.__importStar(require("util"));
|
|
8
8
|
const swagger_parser_1 = tslib_1.__importDefault(require("@apidevtools/swagger-parser"));
|
|
9
9
|
const specParserError_1 = require("./specParserError");
|
|
10
|
+
const swagger2openapi_1 = tslib_1.__importDefault(require("swagger2openapi"));
|
|
10
11
|
const interfaces_1 = require("./interfaces");
|
|
11
12
|
const constants_1 = require("./constants");
|
|
12
13
|
const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
|
|
@@ -16,6 +17,7 @@ const utils_1 = require("./utils");
|
|
|
16
17
|
const manifestUpdater_1 = require("./manifestUpdater");
|
|
17
18
|
const adaptiveCardGenerator_1 = require("./adaptiveCardGenerator");
|
|
18
19
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
20
|
+
const adaptiveCardWrapper_1 = require("./adaptiveCardWrapper");
|
|
19
21
|
/**
|
|
20
22
|
* A class that parses an OpenAPI specification file and provides methods to validate, list, and generate artifacts.
|
|
21
23
|
*/
|
|
@@ -50,18 +52,11 @@ class SpecParser {
|
|
|
50
52
|
errors,
|
|
51
53
|
};
|
|
52
54
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
content: constants_1.ConstantString.SpecVersionNotSupported,
|
|
58
|
-
data: this.spec.openapi,
|
|
55
|
+
if (this.isSwaggerFile) {
|
|
56
|
+
warnings.push({
|
|
57
|
+
type: interfaces_1.WarningType.ConvertSwaggerToOpenAPI,
|
|
58
|
+
content: constants_1.ConstantString.ConvertSwaggerToOpenAPI,
|
|
59
59
|
});
|
|
60
|
-
return {
|
|
61
|
-
status: interfaces_1.ValidationStatus.Error,
|
|
62
|
-
warnings,
|
|
63
|
-
errors,
|
|
64
|
-
};
|
|
65
60
|
}
|
|
66
61
|
// Server validation
|
|
67
62
|
const serverErrors = utils_1.validateServer(this.spec);
|
|
@@ -196,7 +191,8 @@ class SpecParser {
|
|
|
196
191
|
try {
|
|
197
192
|
const card = adaptiveCardGenerator_1.generateAdaptiveCard(operation);
|
|
198
193
|
const fileName = path_1.default.join(adaptiveCardFolder, `${operation.operationId}.json`);
|
|
199
|
-
|
|
194
|
+
const wrappedCard = adaptiveCardWrapper_1.wrapAdaptiveCard(card, operation.operationId, method.toUpperCase() + " " + url);
|
|
195
|
+
await fs_extra_1.default.outputJSON(fileName, wrappedCard, { spaces: 2 });
|
|
200
196
|
}
|
|
201
197
|
catch (err) {
|
|
202
198
|
result.allSuccess = false;
|
|
@@ -227,6 +223,12 @@ class SpecParser {
|
|
|
227
223
|
async loadSpec() {
|
|
228
224
|
if (!this.spec) {
|
|
229
225
|
this.unResolveSpec = (await this.parser.parse(this.specPath));
|
|
226
|
+
// Convert swagger 2.0 to openapi 3.0
|
|
227
|
+
if (!this.unResolveSpec.openapi && this.unResolveSpec.swagger === "2.0") {
|
|
228
|
+
const specObj = await swagger2openapi_1.default.convert(this.unResolveSpec, {});
|
|
229
|
+
this.unResolveSpec = specObj.openapi;
|
|
230
|
+
this.isSwaggerFile = true;
|
|
231
|
+
}
|
|
230
232
|
const clonedUnResolveSpec = JSON.parse(JSON.stringify(this.unResolveSpec));
|
|
231
233
|
this.spec = (await this.parser.dereference(clonedUnResolveSpec));
|
|
232
234
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specParser.js","sourceRoot":"","sources":["../../../src/common/spec-parser/specParser.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,mDAA6B;AAC7B,yFAAwD;AAExD,uDAAoD;AACpD,6CASsB;AACtB,2CAA6C;AAC7C,8DAA6B;AAC7B,gEAA0B;AAC1B,6CAA0C;AAC1C,mCAAiF;AACjF,uDAAmD;AACnD,mEAA+D;AAC/D,wDAAwB;
|
|
1
|
+
{"version":3,"file":"specParser.js","sourceRoot":"","sources":["../../../src/common/spec-parser/specParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { OpenAPIV3 } from "openapi-types";
|
|
|
2
2
|
import { CheckParamResult, ErrorResult } from "./interfaces";
|
|
3
3
|
export declare function isYamlSpecFile(specPath: string): Promise<boolean>;
|
|
4
4
|
export declare function checkParameters(paramObject: OpenAPIV3.ParameterObject[]): CheckParamResult;
|
|
5
|
-
export declare function checkPostBody(schema: OpenAPIV3.SchemaObject): CheckParamResult;
|
|
5
|
+
export declare function checkPostBody(schema: OpenAPIV3.SchemaObject, isRequired?: boolean): CheckParamResult;
|
|
6
6
|
/**
|
|
7
7
|
* Checks if the given API is supported.
|
|
8
8
|
* @param {string} method - The HTTP method of the API.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAGxE,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBvE;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,eAAe,EAAE,GAAG,gBAAgB,CA2C1F;AAED,wBAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/spec-parser/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAGxE,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBvE;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,eAAe,EAAE,GAAG,gBAAgB,CA2C1F;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,SAAS,CAAC,YAAY,EAC9B,UAAU,UAAQ,GACjB,gBAAgB,CAwClB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,QAAQ,GAAG,OAAO,CA0D9F;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAGhE;AAED,wBAAgB,eAAe,CAC7B,eAAe,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,GACrD,SAAS,CAAC,eAAe,CAY3B;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU3D;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOpE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAepD;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,YAAY,EAAE,GAAG,WAAW,EAAE,CAiC/E;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,GAAG,WAAW,EAAE,CA2CtE"}
|
|
@@ -70,7 +70,8 @@ function checkParameters(paramObject) {
|
|
|
70
70
|
return paramResult;
|
|
71
71
|
}
|
|
72
72
|
exports.checkParameters = checkParameters;
|
|
73
|
-
function checkPostBody(schema) {
|
|
73
|
+
function checkPostBody(schema, isRequired = false) {
|
|
74
|
+
var _a;
|
|
74
75
|
const paramResult = {
|
|
75
76
|
requiredNum: 0,
|
|
76
77
|
optionalNum: 0,
|
|
@@ -83,7 +84,7 @@ function checkPostBody(schema) {
|
|
|
83
84
|
schema.type === "integer" ||
|
|
84
85
|
schema.type === "boolean" ||
|
|
85
86
|
schema.type === "number") {
|
|
86
|
-
if (
|
|
87
|
+
if (isRequired) {
|
|
87
88
|
paramResult.requiredNum = paramResult.requiredNum + 1;
|
|
88
89
|
}
|
|
89
90
|
else {
|
|
@@ -93,14 +94,18 @@ function checkPostBody(schema) {
|
|
|
93
94
|
else if (schema.type === "object") {
|
|
94
95
|
const { properties } = schema;
|
|
95
96
|
for (const property in properties) {
|
|
96
|
-
|
|
97
|
+
let isRequired = false;
|
|
98
|
+
if (schema.required && ((_a = schema.required) === null || _a === void 0 ? void 0 : _a.indexOf(property)) >= 0) {
|
|
99
|
+
isRequired = true;
|
|
100
|
+
}
|
|
101
|
+
const result = checkPostBody(properties[property], isRequired);
|
|
97
102
|
paramResult.requiredNum += result.requiredNum;
|
|
98
103
|
paramResult.optionalNum += result.optionalNum;
|
|
99
104
|
paramResult.isValid = paramResult.isValid && result.isValid;
|
|
100
105
|
}
|
|
101
106
|
}
|
|
102
107
|
else {
|
|
103
|
-
if (
|
|
108
|
+
if (isRequired) {
|
|
104
109
|
paramResult.isValid = false;
|
|
105
110
|
}
|
|
106
111
|
}
|
|
@@ -144,7 +149,7 @@ function isSupportedApi(method, path, spec) {
|
|
|
144
149
|
};
|
|
145
150
|
if (requestJsonBody) {
|
|
146
151
|
const requestBodySchema = requestJsonBody.schema;
|
|
147
|
-
requestBodyParamResult = checkPostBody(requestBodySchema);
|
|
152
|
+
requestBodyParamResult = checkPostBody(requestBodySchema, requestBody.required);
|
|
148
153
|
}
|
|
149
154
|
if (!requestBodyParamResult.isValid) {
|
|
150
155
|
return false;
|
|
@@ -260,7 +265,7 @@ function checkServerUrl(servers) {
|
|
|
260
265
|
// Http server url is not supported
|
|
261
266
|
errors.push({
|
|
262
267
|
type: interfaces_1.ErrorType.UrlProtocolNotSupported,
|
|
263
|
-
content: util.format(constants_1.ConstantString.UrlProtocolNotSupported, protocol),
|
|
268
|
+
content: util.format(constants_1.ConstantString.UrlProtocolNotSupported, protocol.slice(0, -1)),
|
|
264
269
|
data: servers,
|
|
265
270
|
});
|
|
266
271
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/spec-parser/utils.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,0DAA0B;AAC1B,gEAA0B;AAC1B,2CAA6C;AAE7C,wDAAwB;AACxB,mDAA6B;AAC7B,6CAAwE;AACxE,+BAA8B;AAEvB,KAAK,UAAU,cAAc,CAAC,QAAgB;IACnD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACnF,MAAM,WAAW,GAAG,YAAY;QAC9B,CAAC,CAAC,CAAC,MAAM,eAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QAClC,CAAC,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEzC,IAAI;QACF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACxB,OAAO,KAAK,CAAC;KACd;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAjBD,wCAiBC;AAED,SAAgB,eAAe,CAAC,WAAwC;IACtE,MAAM,WAAW,GAAG;QAClB,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;QACd,OAAO,EAAE,IAAI;KACd,CAAC;IAEF,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,WAAW,CAAC;KACpB;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,KAAK,CAAC,EAAE,KAAK,QAAQ,IAAI,KAAK,CAAC,EAAE,KAAK,QAAQ,EAAE;YAClD,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC;aAC7B;YACD,SAAS;SACV;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAgC,CAAC;QACtD,IACE,MAAM,CAAC,IAAI,KAAK,SAAS;YACzB,MAAM,CAAC,IAAI,KAAK,QAAQ;YACxB,MAAM,CAAC,IAAI,KAAK,QAAQ;YACxB,MAAM,CAAC,IAAI,KAAK,SAAS,EACzB;YACA,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,WAAW,CAAC,OAAO,GAAG,KAAK,CAAC;aAC7B;YACD,SAAS;SACV;QAED,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE;YAC/C,IAAI,KAAK,CAAC,QAAQ,EAAE;gBAClB,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,GAAG,CAAC,CAAC;aACvD;iBAAM;gBACL,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,GAAG,CAAC,CAAC;aACvD;SACF;KACF;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AA3CD,0CA2CC;AAED,SAAgB,aAAa,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/spec-parser/utils.ts"],"names":[],"mappings":"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"}
|