fix: pnp context value support both array and string (#920)

microsoft · Feb 18, 2020 · b307b3e · b307b3e
1 parent eeefd39
commit b307b3e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/DigitalTwin/pnp/src/intelliSense/digitalTwinConstants.ts b/src/DigitalTwin/pnp/src/intelliSense/digitalTwinConstants.ts
@@ -56,6 +56,5 @@ export class DigitalTwinConstants {
   static readonly REQUIRED_PROPERTY_LABEL = "(required)";
   static readonly IOT_MODEL_LABEL = "IoTModel";
   static readonly CONTEXT_TEMPLATE = "http://azureiot.com/v1/contexts/IoTModel.json";
-  static readonly CONTEXT_REGEX = new RegExp("^http://azureiot.com/v[0-9]+/contexts/IoTModel.json$");
   static readonly SUPPORT_SEMANTIC_TYPES = new Set<string>(["Telemetry", "Property"]);
 }
diff --git a/src/DigitalTwin/pnp/src/intelliSense/intelliSenseUtility.ts b/src/DigitalTwin/pnp/src/intelliSense/intelliSenseUtility.ts
@@ -88,9 +88,15 @@ export class IntelliSenseUtility {
    * @param node json node
    */
   static isDigitalTwinContext(node: parser.Node): boolean {
-    // assume @context is string node
+    // @context accept both array and string
     if (node.type === JsonNodeType.String) {
-      return DigitalTwinConstants.CONTEXT_REGEX.test(node.value as string);
+      return (node.value as string) === DigitalTwinConstants.CONTEXT_TEMPLATE;
+    } else if (node.type === JsonNodeType.Array && node.children) {
+      for (const child of node.children) {
+        if (child.type === JsonNodeType.String && (child.value as string) === DigitalTwinConstants.CONTEXT_TEMPLATE) {
+          return true;
+        }
+      }
     }
     return false;
   }