Merge branch 'main' into fix/packages-readme

freistli · Mar 27, 2023 · 3ae40d1 · 3ae40d1
2 parents 96d5a31 + 6b6b0cd
commit 3ae40d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Composer/packages/lib/indexers/src/validations/expressionValidation/index.ts b/Composer/packages/lib/indexers/src/validations/expressionValidation/index.ts
@@ -49,8 +49,12 @@ export const validateExpressions: ValidateFunc = (
     let errorMessage = '';
     let warningMessage = '';
     try {
-      newCache[value] = cache?.[value] ? cache[value] : checkExpression(value, required, types);
-      errorMessage = checkReturnType(newCache[value], types);
+      const valueToValidate = cache?.[path] ? cache[path] : checkExpression(value, required, types);
+      errorMessage = checkReturnType(valueToValidate, types);
+      if (!errorMessage) {
+        //First validate that the types of the value match and then store the type value in newCache using the path as key to avoid overwriting.
+        newCache[path] = valueToValidate;
+      }
     } catch (error) {
       //change the missing custom function error to warning
       warningMessage = filterCustomFunctionError(error.message, customFunctions);

diff --git a/extensions/azurePublish/yarn-berry.lock b/extensions/azurePublish/yarn-berry.lock
@@ -1896,7 +1896,7 @@ __metadata:
 
 "@bfc/indexers@file:../../Composer/packages/lib/indexers::locator=azurePublish%40workspace%3A.":
   version: 0.0.0
-  resolution: "@bfc/indexers@file:../../Composer/packages/lib/indexers#../../Composer/packages/lib/indexers::hash=07822c&locator=azurePublish%40workspace%3A."
+  resolution: "@bfc/indexers@file:../../Composer/packages/lib/indexers#../../Composer/packages/lib/indexers::hash=8e5fca&locator=azurePublish%40workspace%3A."
   dependencies:
     "@microsoft/bf-lu": 4.15.0-dev.20210702.cbf708d
     adaptive-expressions: ^4.18.0
@@ -1905,7 +1905,7 @@ __metadata:
     tslib: 2.4.0
   peerDependencies:
     "@bfc/shared": "*"
-  checksum: e75d94610a3de51ff52b7ec165e028d9a9ebaceff8db361acbdacc83fdd8d15ee4320bf0771ddf7d163bcb295ed31523a0c3fa1e49bb68a68d4aebbce85b2470
+  checksum: 31d8a809464f7fa700f4baef1ace105d62f8586d249ad56f6b02edeb4cb5be4a97d4109e589fa8e331378f6e8616c7c976dba70b29c71fa7bc32138a73dda91b
   languageName: node
   linkType: hard
 

diff --git a/extensions/azurePublishNew/yarn-berry.lock b/extensions/azurePublishNew/yarn-berry.lock
@@ -1936,7 +1936,7 @@ __metadata:
 
 "@bfc/indexers@file:../../Composer/packages/lib/indexers::locator=azure-publish-new%40workspace%3A.":
   version: 0.0.0
-  resolution: "@bfc/indexers@file:../../Composer/packages/lib/indexers#../../Composer/packages/lib/indexers::hash=07822c&locator=azure-publish-new%40workspace%3A."
+  resolution: "@bfc/indexers@file:../../Composer/packages/lib/indexers#../../Composer/packages/lib/indexers::hash=8e5fca&locator=azure-publish-new%40workspace%3A."
   dependencies:
     "@microsoft/bf-lu": 4.15.0-dev.20210702.cbf708d
     adaptive-expressions: ^4.18.0
@@ -1945,7 +1945,7 @@ __metadata:
     tslib: 2.4.0
   peerDependencies:
     "@bfc/shared": "*"
-  checksum: e75d94610a3de51ff52b7ec165e028d9a9ebaceff8db361acbdacc83fdd8d15ee4320bf0771ddf7d163bcb295ed31523a0c3fa1e49bb68a68d4aebbce85b2470
+  checksum: 31d8a809464f7fa700f4baef1ace105d62f8586d249ad56f6b02edeb4cb5be4a97d4109e589fa8e331378f6e8616c7c976dba70b29c71fa7bc32138a73dda91b
   languageName: node
   linkType: hard