@player-tools/json-language-service 0.9.0 → 0.9.1--canary.196.4186

package/dist/index.legacy-esm.js

@@ -934,6 +934,9 @@ import {
   DiagnosticSeverity as DiagnosticSeverity3,
   MarkupKind
 } from "vscode-languageserver-types";
+function isError(issue) {
+  return issue.severity === DiagnosticSeverity3.Error;
+}
 var findErrorNode = (rootNode, nodeToFind) => {
   const children = [rootNode];
   while (children.length > 0) {
@@ -947,6 +950,9 @@ var findErrorNode = (rootNode, nodeToFind) => {
   }
   return rootNode;
 };
+var translateSeverity = (severity) => {
+  return severity;
+};
 function createValidationVisitor(ctx, sdk) {
   const nodesWithErrors = /* @__PURE__ */ new Set();
   return {
@@ -965,13 +971,15 @@ function createValidationVisitor(ctx, sdk) {
         assetNode.jsonNode
       );
       validationIssues.forEach((issue) => {
-        if (!nodesWithErrors.has(issue.node) || issue.type === "missing") {
-          nodesWithErrors.add(issue.node);
+        if (!(nodesWithErrors.has(issue.node) && isError(issue))) {
           ctx.addViolation({
             node: findErrorNode(assetNode, issue.node),
-            message: `Asset Validation Error - ${issue.type}: ${issue.message}`,
-            severity: DiagnosticSeverity3.Error
+            message: isError(issue) ? `Asset Validation Error - ${issue.type}: ${issue.message}` : issue.message,
+            severity: translateSeverity(issue.severity)
           });
+          if (isError(issue)) {
+            nodesWithErrors.add(issue.node);
+          }
         }
       });
     },
@@ -990,13 +998,15 @@ function createValidationVisitor(ctx, sdk) {
         viewNode.jsonNode
       );
       validationIssues.forEach((issue) => {
-        if (!nodesWithErrors.has(issue.node) || issue.type === "missing") {
-          nodesWithErrors.add(issue.node);
+        if (!(nodesWithErrors.has(issue.node) && isError(issue))) {
           ctx.addViolation({
             node: findErrorNode(viewNode, issue.node),
-            message: `View Validation Error - ${issue.type}: ${issue.message}`,
-            severity: DiagnosticSeverity3.Error
+            message: isError(issue) ? `View Validation Error - ${issue.type}: ${issue.message}` : issue.message,
+            severity: translateSeverity(issue.severity)
           });
+          if (isError(issue)) {
+            nodesWithErrors.add(issue.node);
+          }
         }
       });
     },
@@ -1193,6 +1203,16 @@ var XLRPlugin = class {
 
 // ../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/language/json-language-service/src/plugins/duplicate-id-plugin.ts
 import { DiagnosticSeverity as DiagnosticSeverity4 } from "vscode-languageserver-types";
+var checkParentTemplate = (node, depth = 0) => {
+  if (node.parent) {
+    if (isPropertyNode(node.parent) && node.parent.keyNode.value === "template") {
+      depth += 1;
+      return checkParentTemplate(node.parent, depth);
+    }
+    return checkParentTemplate(node.parent, depth);
+  }
+  return depth;
+};
 var generateID = (node) => {
   if (!node || node.type === "view") {
     return "";
@@ -1243,6 +1263,25 @@ var createValidationVisitor2 = (ctx) => {
       }
       const assetIDMap = viewInfo.get(view);
       const idInfo = assetIDMap?.get(id);
+      const templateDepth = checkParentTemplate(assetNode);
+      if (templateDepth > 0) {
+        const expectedIndexElements = [];
+        for (let i = 0; i < templateDepth; i++) {
+          expectedIndexElements.push(`_index${i === 0 ? "" : i}_`);
+        }
+        const missingIndexSegments = expectedIndexElements.filter(
+          (e) => !id.includes(e)
+        );
+        if (missingIndexSegments.length !== 0) {
+          ctx.addViolation({
+            node: assetNode,
+            severity: DiagnosticSeverity4.Error,
+            message: `The id for this templated elements is missing the following index segments: ${missingIndexSegments.join(
+              ", "
+            )}`
+          });
+        }
+      }
       if (idInfo) {
         if (!idInfo.handled) {
           const origViolation = createViolation(idInfo.original);
@@ -1595,43 +1634,47 @@ var applyAssetWrapperOrSwitch = (node, capability) => {
   })(node, capability);
 };
 var applyValueRefs = (node, capability) => {
-  return simpleTransformGenerator("object", "Assets", (inputNode) => {
-    const xlrNode = { ...inputNode };
-    for (const key in xlrNode.properties) {
-      if (key === "id" || key === "type") {
-        continue;
-      }
-      const value = xlrNode.properties[key];
-      if (value.node.type === "or") {
-        value.node.or.push({
-          type: "ref",
-          ref: "ExpressionRef"
-        });
-        value.node.or.push({
-          type: "ref",
-          ref: "BindingRef"
-        });
-      } else if (isPrimitiveTypeNode(value.node)) {
-        const newUnionType = {
-          type: "or",
-          description: value.node.description,
-          or: [
-            value.node,
-            {
-              type: "ref",
-              ref: "ExpressionRef"
-            },
-            {
-              type: "ref",
-              ref: "BindingRef"
-            }
-          ]
-        };
-        value.node = newUnionType;
+  return simpleTransformGenerator(
+    "object",
+    ["Assets", "Views"],
+    (inputNode) => {
+      const xlrNode = { ...inputNode };
+      for (const key in xlrNode.properties) {
+        if (key === "id") {
+          continue;
+        }
+        const value = xlrNode.properties[key];
+        if (value.node.type === "or") {
+          value.node.or.push({
+            type: "ref",
+            ref: "ExpressionRef"
+          });
+          value.node.or.push({
+            type: "ref",
+            ref: "BindingRef"
+          });
+        } else if (isPrimitiveTypeNode(value.node)) {
+          const newUnionType = {
+            type: "or",
+            description: value.node.description,
+            or: [
+              value.node,
+              {
+                type: "ref",
+                ref: "ExpressionRef"
+              },
+              {
+                type: "ref",
+                ref: "BindingRef"
+              }
+            ]
+          };
+          value.node = newUnionType;
+        }
       }
+      return xlrNode;
     }
-    return xlrNode;
-  })(node, capability);
+  )(node, capability);
 };
 var applyTemplateProperty = (node, capability) => {
   return simpleTransformGenerator(

package/dist/index.mjs

@@ -934,6 +934,9 @@ import {
   DiagnosticSeverity as DiagnosticSeverity3,
   MarkupKind
 } from "vscode-languageserver-types";
+function isError(issue) {
+  return issue.severity === DiagnosticSeverity3.Error;
+}
 var findErrorNode = (rootNode, nodeToFind) => {
   const children = [rootNode];
   while (children.length > 0) {
@@ -947,6 +950,9 @@ var findErrorNode = (rootNode, nodeToFind) => {
   }
   return rootNode;
 };
+var translateSeverity = (severity) => {
+  return severity;
+};
 function createValidationVisitor(ctx, sdk) {
   const nodesWithErrors = /* @__PURE__ */ new Set();
   return {
@@ -965,13 +971,15 @@ function createValidationVisitor(ctx, sdk) {
         assetNode.jsonNode
       );
       validationIssues.forEach((issue) => {
-        if (!nodesWithErrors.has(issue.node) || issue.type === "missing") {
-          nodesWithErrors.add(issue.node);
+        if (!(nodesWithErrors.has(issue.node) && isError(issue))) {
           ctx.addViolation({
             node: findErrorNode(assetNode, issue.node),
-            message: `Asset Validation Error - ${issue.type}: ${issue.message}`,
-            severity: DiagnosticSeverity3.Error
+            message: isError(issue) ? `Asset Validation Error - ${issue.type}: ${issue.message}` : issue.message,
+            severity: translateSeverity(issue.severity)
           });
+          if (isError(issue)) {
+            nodesWithErrors.add(issue.node);
+          }
         }
       });
     },
@@ -990,13 +998,15 @@ function createValidationVisitor(ctx, sdk) {
         viewNode.jsonNode
       );
       validationIssues.forEach((issue) => {
-        if (!nodesWithErrors.has(issue.node) || issue.type === "missing") {
-          nodesWithErrors.add(issue.node);
+        if (!(nodesWithErrors.has(issue.node) && isError(issue))) {
           ctx.addViolation({
             node: findErrorNode(viewNode, issue.node),
-            message: `View Validation Error - ${issue.type}: ${issue.message}`,
-            severity: DiagnosticSeverity3.Error
+            message: isError(issue) ? `View Validation Error - ${issue.type}: ${issue.message}` : issue.message,
+            severity: translateSeverity(issue.severity)
           });
+          if (isError(issue)) {
+            nodesWithErrors.add(issue.node);
+          }
         }
       });
     },
@@ -1193,6 +1203,16 @@ var XLRPlugin = class {
 
 // ../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/language/json-language-service/src/plugins/duplicate-id-plugin.ts
 import { DiagnosticSeverity as DiagnosticSeverity4 } from "vscode-languageserver-types";
+var checkParentTemplate = (node, depth = 0) => {
+  if (node.parent) {
+    if (isPropertyNode(node.parent) && node.parent.keyNode.value === "template") {
+      depth += 1;
+      return checkParentTemplate(node.parent, depth);
+    }
+    return checkParentTemplate(node.parent, depth);
+  }
+  return depth;
+};
 var generateID = (node) => {
   if (!node || node.type === "view") {
     return "";
@@ -1243,6 +1263,25 @@ var createValidationVisitor2 = (ctx) => {
       }
       const assetIDMap = viewInfo.get(view);
       const idInfo = assetIDMap?.get(id);
+      const templateDepth = checkParentTemplate(assetNode);
+      if (templateDepth > 0) {
+        const expectedIndexElements = [];
+        for (let i = 0; i < templateDepth; i++) {
+          expectedIndexElements.push(`_index${i === 0 ? "" : i}_`);
+        }
+        const missingIndexSegments = expectedIndexElements.filter(
+          (e) => !id.includes(e)
+        );
+        if (missingIndexSegments.length !== 0) {
+          ctx.addViolation({
+            node: assetNode,
+            severity: DiagnosticSeverity4.Error,
+            message: `The id for this templated elements is missing the following index segments: ${missingIndexSegments.join(
+              ", "
+            )}`
+          });
+        }
+      }
       if (idInfo) {
         if (!idInfo.handled) {
           const origViolation = createViolation(idInfo.original);
@@ -1595,43 +1634,47 @@ var applyAssetWrapperOrSwitch = (node, capability) => {
   })(node, capability);
 };
 var applyValueRefs = (node, capability) => {
-  return simpleTransformGenerator("object", "Assets", (inputNode) => {
-    const xlrNode = { ...inputNode };
-    for (const key in xlrNode.properties) {
-      if (key === "id" || key === "type") {
-        continue;
-      }
-      const value = xlrNode.properties[key];
-      if (value.node.type === "or") {
-        value.node.or.push({
-          type: "ref",
-          ref: "ExpressionRef"
-        });
-        value.node.or.push({
-          type: "ref",
-          ref: "BindingRef"
-        });
-      } else if (isPrimitiveTypeNode(value.node)) {
-        const newUnionType = {
-          type: "or",
-          description: value.node.description,
-          or: [
-            value.node,
-            {
-              type: "ref",
-              ref: "ExpressionRef"
-            },
-            {
-              type: "ref",
-              ref: "BindingRef"
-            }
-          ]
-        };
-        value.node = newUnionType;
+  return simpleTransformGenerator(
+    "object",
+    ["Assets", "Views"],
+    (inputNode) => {
+      const xlrNode = { ...inputNode };
+      for (const key in xlrNode.properties) {
+        if (key === "id") {
+          continue;
+        }
+        const value = xlrNode.properties[key];
+        if (value.node.type === "or") {
+          value.node.or.push({
+            type: "ref",
+            ref: "ExpressionRef"
+          });
+          value.node.or.push({
+            type: "ref",
+            ref: "BindingRef"
+          });
+        } else if (isPrimitiveTypeNode(value.node)) {
+          const newUnionType = {
+            type: "or",
+            description: value.node.description,
+            or: [
+              value.node,
+              {
+                type: "ref",
+                ref: "ExpressionRef"
+              },
+              {
+                type: "ref",
+                ref: "BindingRef"
+              }
+            ]
+          };
+          value.node = newUnionType;
+        }
       }
+      return xlrNode;
     }
-    return xlrNode;
-  })(node, capability);
+  )(node, capability);
 };
 var applyTemplateProperty = (node, capability) => {
   return simpleTransformGenerator(