@microsoft/teamsfx-core 2.0.4-alpha.a2e05e20c.0 → 2.0.4-alpha.a70ab7bdd.0

package/build/ui/validationUtils.js

@@ -2,9 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validationUtils = void 0;
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+exports.validate = exports.getValidationFunction = exports.validationUtils = void 0;
+const tslib_1 = require("tslib");
 const common_1 = require("../error/common");
+const jsonschema = tslib_1.__importStar(require("jsonschema"));
 class ValidationUtils {
     async validateInputForSingleSelectQuestion(question, value, inputs) {
         let options = question.staticOptions;
@@ -76,26 +77,13 @@ class ValidationUtils {
         }
         else {
             if (question.validation) {
-                const vFunc = teamsfx_api_1.getValidationFunction(question.validation, inputs);
+                const vFunc = getValidationFunction(question.validation, inputs);
                 const res = await vFunc(value);
                 if (res)
                     return res;
             }
             if (question.type === "text" && question.additionalValidationOnAccept) {
-                const vFunc = teamsfx_api_1.getValidationFunction(question.additionalValidationOnAccept, inputs);
-                const res = await vFunc(value);
-                if (res)
-                    return res;
-            }
-            if (question.type === "singleFileOrText" && question.inputBoxConfig.validation) {
-                const vFunc = teamsfx_api_1.getValidationFunction(question.inputBoxConfig.validation, inputs);
-                const res = await vFunc(value);
-                if (res)
-                    return res;
-            }
-            if (question.type === "singleFileOrText" &&
-                question.inputBoxConfig.additionalValidationOnAccept) {
-                const vFunc = teamsfx_api_1.getValidationFunction(question.inputBoxConfig.additionalValidationOnAccept, inputs);
+                const vFunc = getValidationFunction(question.additionalValidationOnAccept, inputs);
                 const res = await vFunc(value);
                 if (res)
                     return res;
@@ -105,4 +93,205 @@ class ValidationUtils {
     }
 }
 exports.validationUtils = new ValidationUtils();
+/**
+ * A function to return a validation function according the validation schema
+ * @param validation validation schema
+ * @param inputs object to carry all user inputs
+ * @returns a validation function
+ */
+function getValidationFunction(validation, inputs) {
+    return function (input) {
+        return validate(validation, input, inputs);
+    };
+}
+exports.getValidationFunction = getValidationFunction;
+/**
+ * Implementation of validation function
+ * @param validSchema validation schema
+ * @param value value to validate
+ * @param inputs user inputs object, which works as the context of the validation
+ * @returns A human-readable string which is presented as diagnostic message.
+ * Return `undefined` when 'value' is valid.
+ */
+async function validate(validSchema, value, inputs) {
+    {
+        //FuncValidation
+        const funcValidation = validSchema;
+        if (funcValidation.validFunc) {
+            const res = await funcValidation.validFunc(value, inputs);
+            return res;
+        }
+        else if (typeof funcValidation === "function") {
+            const res = await funcValidation(inputs);
+            if (res)
+                return undefined;
+            return "condition function is not met.";
+        }
+    }
+    if (!value) {
+        if (validSchema.required === true)
+            return `input value is required.`;
+    }
+    const noneEmptyKeyNum = Object.keys(validSchema).filter((key) => validSchema[key] !== undefined).length;
+    if (noneEmptyKeyNum === 0) {
+        return undefined;
+    }
+    if (value === undefined &&
+        (validSchema.required ||
+            validSchema.equals ||
+            validSchema.maxLength ||
+            validSchema.minLength ||
+            validSchema.pattern ||
+            validSchema.enum ||
+            validSchema.startsWith ||
+            validSchema.endsWith ||
+            validSchema.includes ||
+            validSchema.maxItems ||
+            validSchema.minItems ||
+            validSchema.uniqueItems ||
+            validSchema.contains ||
+            validSchema.containsAll ||
+            validSchema.containsAny)) {
+        return `'undefined' does not meet condition:'${JSON.stringify(validSchema)}'`;
+    }
+    const jsonValue = JSON.stringify(value);
+    {
+        // StringValidation
+        const stringValidation = validSchema;
+        const strToValidate = value;
+        if (strToValidate === undefined || typeof strToValidate === "string") {
+            const schema = {};
+            if (stringValidation.equals && typeof stringValidation.equals === "string") {
+                if (strToValidate === undefined) {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `${jsonValue} does not meet equals:'${stringValidation.equals}'`;
+                }
+                schema.const = stringValidation.equals;
+            }
+            if (stringValidation.enum &&
+                stringValidation.enum.length > 0 &&
+                typeof stringValidation.enum[0] === "string")
+                schema.enum = stringValidation.enum;
+            if (stringValidation.minLength)
+                schema.minLength = stringValidation.minLength;
+            if (stringValidation.maxLength)
+                schema.maxLength = stringValidation.maxLength;
+            if (stringValidation.pattern)
+                schema.pattern = stringValidation.pattern;
+            if (Object.keys(schema).length > 0) {
+                const validateResult = jsonschema.validate(strToValidate, schema);
+                if (validateResult.errors && validateResult.errors.length > 0) {
+                    return `${jsonValue} ${validateResult.errors[0].message}`;
+                }
+            }
+            if (stringValidation.startsWith) {
+                if (!strToValidate.startsWith(stringValidation.startsWith)) {
+                    return `${jsonValue} does not meet startsWith:'${stringValidation.startsWith}'`;
+                }
+            }
+            if (stringValidation.endsWith) {
+                if (!strToValidate.endsWith(stringValidation.endsWith)) {
+                    return `${jsonValue} does not meet endsWith:'${stringValidation.endsWith}'`;
+                }
+            }
+            if (stringValidation.includes) {
+                if (!strToValidate.includes(stringValidation.includes)) {
+                    return `${jsonValue} does not meet includes:'${stringValidation.includes}'`;
+                }
+            }
+            if (stringValidation.notEquals) {
+                if (strToValidate === stringValidation.notEquals) {
+                    return `${jsonValue} does not meet notEquals:'${stringValidation.notEquals}'`;
+                }
+            }
+            if (stringValidation.excludesEnum) {
+                if (stringValidation.excludesEnum.includes(strToValidate)) {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `${jsonValue} does not meet excludesEnum:'${stringValidation.excludesEnum}'`;
+                }
+            }
+        }
+    }
+    //StringArrayValidation
+    {
+        const stringArrayValidation = validSchema;
+        const arrayToValidate = value;
+        if (arrayToValidate === undefined || arrayToValidate instanceof Array) {
+            const schema = {};
+            if (stringArrayValidation.maxItems)
+                schema.maxItems = stringArrayValidation.maxItems;
+            if (stringArrayValidation.minItems)
+                schema.minItems = stringArrayValidation.minItems;
+            if (stringArrayValidation.uniqueItems)
+                schema.uniqueItems = stringArrayValidation.uniqueItems;
+            if (Object.keys(schema).length > 0) {
+                const validateResult = jsonschema.validate(arrayToValidate, schema);
+                if (validateResult.errors && validateResult.errors.length > 0) {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `${jsonValue} ${validateResult.errors[0].message}`;
+                }
+            }
+            if (stringArrayValidation.equals) {
+                if (stringArrayValidation.equals instanceof Array) {
+                    stringArrayValidation.enum = stringArrayValidation.equals;
+                    stringArrayValidation.containsAll = stringArrayValidation.equals;
+                }
+                else {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `${jsonValue} does not equals to:'${stringArrayValidation.equals}'`;
+                }
+            }
+            if (stringArrayValidation.enum && arrayToValidate) {
+                for (const item of arrayToValidate) {
+                    if (!stringArrayValidation.enum.includes(item)) {
+                        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                        return `${jsonValue} does not meet with enum:'${stringArrayValidation.enum}'`;
+                    }
+                }
+            }
+            if (stringArrayValidation.excludes) {
+                if (arrayToValidate && arrayToValidate.includes(stringArrayValidation.excludes)) {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `${jsonValue} does not meet with excludes:'${stringArrayValidation.excludes}'`;
+                }
+            }
+            if (stringArrayValidation.contains) {
+                if (arrayToValidate && !arrayToValidate.includes(stringArrayValidation.contains)) {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `${jsonValue} does not meet with contains:'${stringArrayValidation.contains}'`;
+                }
+            }
+            if (stringArrayValidation.containsAll) {
+                const containsAll = stringArrayValidation.containsAll;
+                if (containsAll.length > 0) {
+                    for (const i of containsAll) {
+                        if (arrayToValidate && !arrayToValidate.includes(i)) {
+                            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                            return `${jsonValue} does not meet with containsAll:'${containsAll}'`;
+                        }
+                    }
+                }
+            }
+            if (stringArrayValidation.containsAny) {
+                const containsAny = stringArrayValidation.containsAny;
+                if (containsAny.length > 0) {
+                    // let array = valueToValidate as string[];
+                    let found = false;
+                    for (const i of containsAny) {
+                        if (arrayToValidate && arrayToValidate.includes(i)) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                        return `${jsonValue} does not meet containsAny:'${containsAny}'`;
+                    }
+                }
+            }
+        }
+    }
+    return undefined;
+}
+exports.validate = validate;
 //# sourceMappingURL=validationUtils.js.map

package/build/ui/validationUtils.js.map

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

package/build/ui/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../src/ui/visitor.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,UAAU,EACV,WAAW,EACX,MAAM,EACN,mBAAmB,EAGnB,QAAQ,EACR,MAAM,EACN,oBAAoB,EACpB,aAAa,EAGb,iBAAiB,EAEjB,eAAe,EACf,IAAI,EAKL,MAAM,wBAAwB,CAAC;AAYhC,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,CAQrD;AAED,wBAAgB,eAAe,CAC7B,CAAC,EAAE,oBAAoB,GAAG,mBAAmB,EAC7C,MAAM,CAAC,EAAE,aAAa,GACrB,GAAG,CAWL;AASD,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,oBAAoB,GAAG,mBAAmB,EACpD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CAMxB;AAED,oBAAY,mBAAmB,GAAG,CAChC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,eAAe,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,KAChB,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,eAAe,EAAE,mBA2O7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU,EAAE,EAClB,SAAS,EAAE,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,GACrC,IAAI,CAUN;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,eAAe,EACnB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,OAAO,GAAE,mBAAqC,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmGhC"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../src/ui/visitor.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,UAAU,EACV,WAAW,EACX,MAAM,EACN,mBAAmB,EAEnB,QAAQ,EACR,MAAM,EACN,oBAAoB,EACpB,aAAa,EAGb,iBAAiB,EAEjB,eAAe,EACf,IAAI,EAGL,MAAM,wBAAwB,CAAC;AAYhC,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,GAAG,OAAO,CAQrD;AAED,wBAAgB,eAAe,CAC7B,CAAC,EAAE,oBAAoB,GAAG,mBAAmB,EAC7C,MAAM,CAAC,EAAE,aAAa,GACrB,GAAG,CAWL;AASD,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,oBAAoB,GAAG,mBAAmB,EACpD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,aAAa,CAAC,CAMxB;AAED,oBAAY,mBAAmB,GAAG,CAChC,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,eAAe,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,MAAM,KAChB,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,eAAe,EAAE,mBA0O7B,CAAC;AAEF;;GAEG;AACH,wBAAgB,OAAO,CACrB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,UAAU,EAAE,EAClB,SAAS,EAAE,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,GACrC,IAAI,CAUN;AAED,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,eAAe,EACnB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,OAAO,GAAE,mBAAqC,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmGhC"}

package/build/ui/visitor.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.traverse = exports.collect = exports.questionVisitor = exports.loadOptions = exports.getSingleOption = exports.isAutoSkipSelect = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lodash_1 = require("lodash");
+const featureFlags_1 = require("../common/featureFlags");
 const error_1 = require("../error");
 const validationUtils_1 = require("./validationUtils");
-const featureFlags_1 = require("../common/featureFlags");
 function isAutoSkipSelect(q) {
     if (q.type === "singleSelect" || q.type === "multiSelect") {
         const select = q;
@@ -96,7 +96,10 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
                 }
             }
         }
-        return teamsfx_api_1.err(new error_1.MissingRequiredInputError(question.name, "questionVisitor"));
+        if (question.required)
+            return teamsfx_api_1.err(new error_1.MissingRequiredInputError(question.name, "questionVisitor"));
+        else
+            return teamsfx_api_1.ok({ type: "skip", result: undefined });
     }
     // interactive mode
     const title = (await getCallFuncValue(inputs, question.title));
@@ -107,7 +110,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
         if (question.default) {
             if (typeof question.default === "function") {
                 defaultValue = async () => {
-                    return question.default(inputs);
+                    return await question.default(inputs);
                 };
             }
             else {
@@ -119,10 +122,10 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
     const prompt = (await getCallFuncValue(inputs, question.prompt));
     if (question.type === "text") {
         const validationFunc = question.validation
-            ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+            ? validationUtils_1.getValidationFunction(question.validation, inputs)
             : undefined;
         const additionalValidationOnAcceptFunc = question.additionalValidationOnAccept
-            ? teamsfx_api_1.getValidationFunction(question.additionalValidationOnAccept, inputs)
+            ? validationUtils_1.getValidationFunction(question.additionalValidationOnAccept, inputs)
             : undefined;
         return await ui.inputText({
             name: question.name,
@@ -156,7 +159,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
         }
         if (question.type === "singleSelect") {
             const validationFunc = question.validation
-                ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+                ? validationUtils_1.getValidationFunction(question.validation, inputs)
                 : undefined;
             return await ui.selectOption({
                 name: question.name,
@@ -175,7 +178,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
         }
         else {
             const validationFunc = question.validation
-                ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+                ? validationUtils_1.getValidationFunction(question.validation, inputs)
                 : undefined;
             return await ui.selectOptions({
                 name: question.name,
@@ -195,7 +198,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
     }
     else if (question.type === "multiFile") {
         const validationFunc = question.validation
-            ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+            ? validationUtils_1.getValidationFunction(question.validation, inputs)
             : undefined;
         return await ui.selectFiles({
             name: question.name,
@@ -210,7 +213,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
     }
     else if (question.type === "singleFile") {
         const validationFunc = question.validation
-            ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+            ? validationUtils_1.getValidationFunction(question.validation, inputs)
             : undefined;
         return await ui.selectFile({
             name: question.name,
@@ -226,7 +229,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
     }
     else if (question.type === "folder") {
         const validationFunc = question.validation
-            ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+            ? validationUtils_1.getValidationFunction(question.validation, inputs)
             : undefined;
         return await ui.selectFolder({
             name: question.name,
@@ -241,13 +244,10 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
     }
     else if (question.type === "singleFileOrText" && !!ui.selectFileOrInput) {
         const validationFunc = question.validation
-            ? teamsfx_api_1.getValidationFunction(question.validation, inputs)
+            ? validationUtils_1.getValidationFunction(question.validation, inputs)
             : undefined;
         const inputValidationFunc = question.inputBoxConfig.validation
-            ? teamsfx_api_1.getValidationFunction(question.inputBoxConfig.validation, inputs)
-            : undefined;
-        const additionalValidationOnAcceptFunc = question.inputBoxConfig.additionalValidationOnAccept
-            ? teamsfx_api_1.getValidationFunction(question.inputBoxConfig.additionalValidationOnAccept, inputs)
+            ? validationUtils_1.getValidationFunction(question.inputBoxConfig.validation, inputs)
             : undefined;
         const innerTitle = (await getCallFuncValue(inputs, question.inputBoxConfig.title));
         const innerPlaceholder = (await getCallFuncValue(inputs, question.inputBoxConfig.placeholder));
@@ -264,7 +264,7 @@ const questionVisitor = async function (question, ui, inputs, step, totalSteps)
                 placeholder: innerPlaceholder,
                 prompt: innerPrompt,
                 validation: inputValidationFunc,
-                additionalValidationOnAccept: additionalValidationOnAcceptFunc,
+                step: question.inputBoxConfig.step,
             },
             filters: question.filters,
             step: step,
@@ -317,7 +317,7 @@ async function traverse(root, inputs, ui, telemetryReporter, visitor = exports.q
             if (parent) {
                 parentValue = findValue(parent, parentMap);
             }
-            const validRes = await teamsfx_api_1.validate(node.condition, parentValue, clonedInputs);
+            const validRes = await validationUtils_1.validate(node.condition, parentValue, clonedInputs);
             if (validRes !== undefined) {
                 continue;
             }

package/build/ui/visitor.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "2.0.4-alpha.a2e05e20c.0",
+  "version": "2.0.4-alpha.a70ab7bdd.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -54,11 +54,7 @@
     "test:validUtils": "nyc mocha \"tests/ui/validationUtils.test.ts\"",
     "test:question": "nyc mocha \"tests/question/*.test.ts\"",
     "test:coll": "nyc mocha \"tests/core/collaborator.test.ts\"",
-    "test:specParser": "npx mocha \"tests/common/spec-parser/**/specParser.test.ts\"",
-    "test:specFilter": "npx mocha \"tests/common/spec-parser/**/specFilter.test.ts\"",
-    "test:specParserUtils": "npx mocha \"tests/common/spec-parser/**/utils.test.ts\"",
-    "test:manifestUpdater": "npx mocha \"tests/common/spec-parser/**/manifestUpdater.test.ts\"",
-    "test:adaptiveCardGenerator": "npx mocha \"tests/common/spec-parser/**/adaptiveCardGenerator.test.ts\"",
+    "test:specParser": "npx mocha \"tests/common/spec-parser/**/*.test.ts\"",
     "test:error": "nyc mocha \"tests/error/*.test.ts\"",
     "test:cutils": "nyc mocha \"tests/component/utils.test.ts\"",
     "test:globalVars": "nyc mocha \"tests/core/globalVars.test.ts\"",
@@ -92,9 +88,10 @@
     "@feathersjs/hooks": "^0.6.5",
     "@microsoft/dev-tunnels-contracts": "~1.0.7360",
     "@microsoft/dev-tunnels-management": "~1.0.7360",
-    "@microsoft/teamsfx-api": "0.22.4-alpha.a2e05e20c.0",
+    "@microsoft/teamsfx-api": "0.22.4-alpha.a70ab7bdd.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/proper-lockfile": "^4.1.1",
+    "@types/swagger2openapi": "^7.0.0",
     "adm-zip": "^0.5.5",
     "ajv": "^8.5.0",
     "axios": "^0.21.2",
@@ -119,7 +116,7 @@
     "md5": "^2.3.0",
     "mime": "^2.5.2",
     "mustache": "^4.2.0",
-    "node-forge": "^1.0.0",
+    "node-forge": "^1.3.1",
     "node-ts-uuid": "^1.0.8",
     "office-addin-manifest": "^1.12.4",
     "office-addin-project": "^0.7.0",
@@ -129,6 +126,7 @@
     "reflect-metadata": "^0.1.13",
     "semver": "^7.5.2",
     "strip-bom": "^4.0.0",
+    "swagger2openapi": "^7.0.8",
     "tedious": "^15.1.2",
     "typedi": "^0.10.0",
     "unzipper": "^0.10.11",
@@ -157,7 +155,7 @@
     "@types/md5": "^2.3.0",
     "@types/mime": "^2.0.3",
     "@types/mocha": "^8.2.1",
-    "@types/mock-fs": "^4.13.0",
+    "@types/mock-fs": "^4.13.1",
     "@types/mustache": "^4.1.1",
     "@types/node": "^14.14.21",
     "@types/node-forge": "^0.9.7",
@@ -175,6 +173,7 @@
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
     "ahocorasick": "^1.0.2",
+    "axios-mock-adapter": "^1.20.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
@@ -188,21 +187,23 @@
     "faker": "^5.5.2",
     "find-process": "^1.4.4",
     "lint-staged": "^10.5.4",
+    "lodash": "^4.17.21",
     "mocha": "^10.2.0",
-    "mock-fs": "^4.13.0",
+    "mock-fs": "5.2.0",
     "mocked-env": "^1.3.5",
-    "nock": "^13.2.9",
     "nyc": "^15.1.0",
     "prettier": "^2.4.1",
     "proxyquire": "^2.1.3",
     "rewire": "^6.0.0",
+    "rimraf": "^5.0.1",
     "sinon": "^9.2.2",
     "source-map-support": "^0.5.19",
     "tmp": "^0.2.1",
     "ts-loader": "^8.0.3",
     "ts-morph": "^19.0.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.2.3",
+    "tslib": "^2.3.1",
+    "typescript": "4.3.5",
     "webpack": "^5.61.0"
   },
   "files": [
@@ -210,7 +211,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "8686c9cdc1187d1a70d69e76bd655f3468f805a5",
+  "gitHead": "df4e2ca0f0ded1af451e82c90fe5dfdcd1fc3c94",
   "publishConfig": {
     "access": "public"
   },