fix the error "TypeError: Cannot read properties of null (reading 'no…

…deType')" from the cache #1974
IBMa · Oct 24, 2024 · 712c8d2 · 712c8d2
1 parent a10faa0
commit 712c8d2
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 4 deletions.
diff --git a/accessibility-checker-engine/src/v4/rules/combobox_active_descendant.ts b/accessibility-checker-engine/src/v4/rules/combobox_active_descendant.ts
@@ -53,6 +53,7 @@ export const combobox_active_descendant: Rule = {
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         let cache = CacheUtil.getCache(ruleContext.ownerDocument, "combobox", {});
+        if (!cache) return null;
         let cachedElem = cache[context["dom"].rolePath];
         if (!cachedElem) return null;
         const { popupElement, popupId } = cachedElem;

diff --git a/accessibility-checker-engine/src/v4/rules/combobox_autocomplete_valid.ts b/accessibility-checker-engine/src/v4/rules/combobox_autocomplete_valid.ts
@@ -53,6 +53,7 @@ export const combobox_autocomplete_valid: Rule = {
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         let cache = CacheUtil.getCache(ruleContext.ownerDocument, "combobox", {});
+        if (!cache) return null;
         let cachedElem = cache[context["dom"].rolePath];
         if (!cachedElem) return null;
         const { popupId, popupElement } = cachedElem;

diff --git a/accessibility-checker-engine/src/v4/rules/combobox_design_valid.ts b/accessibility-checker-engine/src/v4/rules/combobox_design_valid.ts
@@ -87,6 +87,7 @@ export const combobox_design_valid: Rule = {
         let key = context["dom"].rolePath;
         if (key) {
             let cache = CacheUtil.getCache(ruleContext.ownerDocument, "combobox", {});
+            if (!cache) return null;
             cache[key] = {
                 "inputElement": editable ? ruleContext : null,
                 "pattern": pattern,

diff --git a/accessibility-checker-engine/src/v4/rules/combobox_focusable_elements.ts b/accessibility-checker-engine/src/v4/rules/combobox_focusable_elements.ts
@@ -49,6 +49,7 @@ export const combobox_focusable_elements: Rule = {
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         let cache = CacheUtil.getCache(ruleContext.ownerDocument, "combobox", {});
+        if (!cache) return null;
         let cachedElem = cache[context["dom"].rolePath];
         if (!cachedElem) return null;
         const { popupElement, expanded } = cachedElem;

diff --git a/accessibility-checker-engine/src/v4/rules/combobox_haspopup_valid.ts b/accessibility-checker-engine/src/v4/rules/combobox_haspopup_valid.ts
@@ -52,6 +52,7 @@ export const combobox_haspopup_valid: Rule = {
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         const cache = CacheUtil.getCache(ruleContext.ownerDocument, "combobox", {});
+        if (!cache) return null;
         const cacheKey = context["dom"].rolePath;
         const cachedElem = cache[cacheKey];
         if (!cachedElem) return null;

diff --git a/accessibility-checker-engine/src/v4/rules/combobox_popup_reference.ts b/accessibility-checker-engine/src/v4/rules/combobox_popup_reference.ts
@@ -74,6 +74,7 @@ export const combobox_popup_reference: Rule = {
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         const cache = CacheUtil.getCache(ruleContext.ownerDocument, "combobox", {});
+        if (!cache) return null;
         const cacheKey = context["dom"].rolePath;
         const cachedElem = cache[cacheKey];
         if (!cachedElem) return null;

diff --git a/accessibility-checker-engine/src/v4/rules/element_accesskey_unique.ts b/accessibility-checker-engine/src/v4/rules/element_accesskey_unique.ts
@@ -47,7 +47,7 @@ export const element_accesskey_unique: Rule = {
     run: (context: RuleContext, options?: {}, contextHierarchies?: RuleContextHierarchy): RuleResult | RuleResult[] => {
         const ruleContext = context["dom"].node as Element;
         let map = CacheUtil.getCache(ruleContext.ownerDocument, "element_accesskey_unique", {});
-
+  
         let key = ruleContext.getAttribute("accesskey");
 
         let passed = !(key in map);

diff --git a/accessibility-checker-engine/src/v4/rules/table_headers_related.ts b/accessibility-checker-engine/src/v4/rules/table_headers_related.ts
@@ -134,7 +134,7 @@ export const table_headers_related: Rule = {
 
         let rcInfo = CacheUtil.getCache(ruleContext, "table_headers_related", null);
         let tInfo = CacheUtil.getCache(parentTable, "table_headers_related", null);
-        let passed = rcInfo !== null && tInfo !== null && rcInfo in tInfo;
+        let passed = rcInfo && tInfo && rcInfo in tInfo;
 
         if (!passed && rcInfo === "0:0" &&
             CommonUtil.getInnerText(ruleContext).trim().length == 0) {

diff --git a/accessibility-checker-engine/src/v4/util/CSSUtil.ts b/accessibility-checker-engine/src/v4/util/CSSUtil.ts
@@ -127,7 +127,7 @@ export class CSSUtil {
         }
 
         let storedStyles = CacheUtil.getCache(elem, "RPTUtil_DefinedStyles", null);
-        if (!pseudoClass && storedStyles !== null) {
+        if (!pseudoClass && storedStyles) {
             definedStyles = storedStyles["definedStyles"];
             definedStylePseudo = storedStyles["definedStylePseudo"];
         } else {
@@ -868,7 +868,7 @@ export class CSSUtil {
         let walkNode = elem;
         while (walkNode !== null) {
             const node = CacheUtil.getCache(walkNode, "AriaUtil_AncestorWithStyles", null);
-            if (node !== null) return node;
+            if (node) return node;
 
             const styles = CSSUtil.getDefinedStyles(walkNode);
             for (const style in styleProps) {

diff --git a/accessibility-checker-engine/src/v4/util/CacheUtil.ts b/accessibility-checker-engine/src/v4/util/CacheUtil.ts
@@ -24,6 +24,7 @@ export class CacheUtil {
     /* Return a pointer to the given global variable
          * with its initial value as given */
     public static getCache(cacheSpot: Element | Document | DocumentFragment, keyName, initValue) {
+        if (!cacheSpot) return undefined;
         let cacheObj = (cacheSpot.nodeType === 9 /* Node.DOCUMENT_NODE */ || cacheSpot.nodeType === 11 /* Node.DOCUMENT_FRAGMENT_NODE */) ? cacheSpot as CacheDocument : cacheSpot as CacheElement;
         if (cacheObj.aceCache === undefined) {
             cacheObj.aceCache = {}
@@ -35,6 +36,7 @@ export class CacheUtil {
     }
 
     public static setCache(cacheSpot: Document | Element | DocumentFragment | ShadowRoot, globalName, value): any {
+        if (!cacheSpot) return undefined;
         let cacheObj = (cacheSpot.nodeType === 9 /* Node.DOCUMENT_NODE */ || cacheSpot.nodeType === 11 /* Node.DOCUMENT_FRAGMENT_NODE */) ? cacheSpot as CacheDocument : cacheSpot as CacheElement;
         if (cacheObj.aceCache === undefined) {
             cacheObj.aceCache = {}

diff --git a/accessibility-checker-engine/src/v4/util/VisUtil.ts b/accessibility-checker-engine/src/v4/util/VisUtil.ts
@@ -299,6 +299,7 @@ export class VisUtil {
      * @param node
      */
     public static isNodeHiddenFromAT(node: Element) : boolean {
+        if (!node) return false;
         const vis = CacheUtil.getCache(node, "PT_NODE_HiddenFromAT", undefined);
         if (vis !== undefined) return vis;