Code cleanup

Author: rmraya

sonar-project.properties

@@ -2,7 +2,7 @@
 sonar.projectKey=TypesXML
 # this is the name displayed in the SonarQube UI
 sonar.projectName=TypesXML
-sonar.projectVersion=1.10.0
+sonar.projectVersion=2.0.0
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # Since SonarQube 4.2, this property is optional if sonar.modules is set. 

ts/DOMBuilder.ts

@@ -257,6 +257,7 @@ export class DOMBuilder implements ContentHandler {
     }
 
     endElement(name: string): void {
+        XMLUtils.ignoreUnused(name);
         this.stack.pop();
     }
 

ts/SAXParser.ts

@@ -339,7 +339,6 @@ export class SAXParser {
             !this.inComment && !this.inDoctype && !this.inProcessingInstruction) {
             throw new Error('Entity reference not allowed in this context');
         }
-        const textForValidation: string = this.characterRun ? this.normalizeCharacterRun(this.characterRun) : '';
         this.cleanCharacterRun();
         this.pointer++; // skip '&'
         let name: string = '';
@@ -942,6 +941,7 @@ export class SAXParser {
     }
 
     parseRelaxNG(href: string) {
+        XMLUtils.ignoreUnused(href);
         // TODO Silently ignored, not implemented yet
     }
 

ts/XMLCanonicalizer.ts

@@ -18,18 +18,13 @@ import { XMLDocument } from "./XMLDocument";
 import { XMLElement } from "./XMLElement";
 import { CData } from "./CData";
 import { Grammar } from "./grammar/Grammar";
+import { XMLUtils } from "./XMLUtils";
 
 export class XMLCanonicalizer {
 
-    private grammar: Grammar | undefined;
-
     public static canonicalize(document: XMLDocument, grammar?: Grammar): string {
         const canonicalizer = new XMLCanonicalizer();
-        if (grammar) {
-            canonicalizer.grammar = grammar;
-        } else if (document.getGrammar) {
-            canonicalizer.grammar = document.getGrammar();
-        }
+        XMLUtils.ignoreUnused(grammar);
         return canonicalizer.canonicalizeDocument(document);
     }
 

ts/XMLUtils.ts

@@ -59,6 +59,12 @@ export class XMLUtils {
         return String(text).split(search).join(replacement);
     }
 
+    static ignoreUnused(...args: unknown[]): void {
+        if (args.length > 0) {
+            void args[0];
+        }
+    }
+
     static escapeRegExpChars(text: string): string {
         let result: string = '';
         let length: number = text.length;

ts/dtd/DTDGrammar.ts

@@ -213,6 +213,7 @@ export class DTDGrammar implements Grammar {
     }
 
     validateElement(element: string, content: ValidationContext): ValidationResult {
+        XMLUtils.ignoreUnused(content);
         const colonIndex = element.indexOf(':');
         const elementName = colonIndex !== -1 ? element.substring(colonIndex + 1) : element;
         const elementDecl = this.elementDeclMap.get(elementName);
@@ -228,6 +229,7 @@ export class DTDGrammar implements Grammar {
     }
 
     validateAttributes(element: string, attributes: Map<string, string>, context: ValidationContext): ValidationResult {
+        XMLUtils.ignoreUnused(element, attributes, context);
         // DTD attribute validation - simplified for now
         return ValidationResult.success();
     }

ts/dtd/dtdName.ts

@@ -10,6 +10,7 @@
  *     Maxprograms - initial API and implementation
  *******************************************************************************/
 
+import { XMLUtils } from "../XMLUtils";
 import { Cardinality } from "./ContentModel";
 import { ContentParticle, ContentParticleType } from "./contentParticle";
 
@@ -32,7 +33,7 @@ export class DTDName implements ContentParticle {
     }
 
     public addParticle(particle: ContentParticle) {
-        // Do nothing
+        XMLUtils.ignoreUnused(particle);
     }
 
     getParticles(): Array<ContentParticle> {

ts/dtd/dtdPCData.ts

@@ -10,6 +10,7 @@
  *     Maxprograms - initial API and implementation
  *******************************************************************************/
 
+import { XMLUtils } from "../XMLUtils";
 import { Cardinality } from "./ContentModel";
 import { ContentParticle, ContentParticleType } from "./contentParticle";
 
@@ -20,11 +21,11 @@ export class DTDPCData implements ContentParticle {
     }
 
     addParticle(particle: ContentParticle): void {
-        // do nothing
+        XMLUtils.ignoreUnused(particle);
     }
 
     setCardinality(cardinality: (typeof Cardinality)[keyof typeof Cardinality]): void {
-        // do nothing
+        XMLUtils.ignoreUnused(cardinality);
     }
 
     getCardinality(): (typeof Cardinality)[keyof typeof Cardinality] {

ts/grammar/CompositeGrammar.ts

@@ -12,6 +12,7 @@
 
 import { existsSync, readFileSync } from 'fs';
 import { resolve } from 'path';
+import { XMLUtils } from '../XMLUtils';
 import { AttributeGroup } from '../schema/AttributeGroup';
 import { BuiltinTypes } from '../schema/BuiltinTypes';
 import { ContentModel } from '../schema/ContentModel';
@@ -340,6 +341,7 @@ export class CompositeGrammar implements Grammar {
     resolveCrossSchemaGroup(qualifiedName: string): ContentModel | undefined {
         // Try to find the group in all loaded XMLSchemaGrammar instances
         for (const [namespace, grammar] of this.grammars.entries()) {
+            XMLUtils.ignoreUnused(namespace);
             if (grammar instanceof XMLSchemaGrammar) {
                 const group = grammar.getGroupDefinition(qualifiedName);
                 if (group) {
@@ -354,6 +356,7 @@ export class CompositeGrammar implements Grammar {
     resolveAllGroupReferences(): void {
         // Go through all XMLSchemaGrammar instances and try to resolve any unresolved group references
         for (const [namespace, grammar] of this.grammars.entries()) {
+            XMLUtils.ignoreUnused(namespace);
             if (grammar instanceof XMLSchemaGrammar) {
                 // For now, this would need access to unresolved group references
                 // This is a placeholder for post-loading resolution
@@ -564,6 +567,7 @@ export class CompositeGrammar implements Grammar {
         context: ValidationContext,
         grammar: any
     ): ValidationResult {
+        XMLUtils.ignoreUnused(context);
         // Get element declaration and its complex type
         const elementAttrs = grammar.getElementAttributes(elementName);
         if (!elementAttrs || elementAttrs.size === 0) {
@@ -620,16 +624,6 @@ export class CompositeGrammar implements Grammar {
         return errors.length > 0 ? new ValidationResult(false, errors) : ValidationResult.success();
     }
 
-    private performAttributeValidation(grammar: Grammar, elementName: string, attributes: Map<string, string>, context: ValidationContext): ValidationResult {
-        // For XMLSchemaGrammar, we handle the validation here in CompositeGrammar
-        if (grammar.getGrammarType().toString() === 'xmlschema') {
-            return (grammar as any).validateAttributes(elementName, attributes, context);
-        }
-
-        // For other grammar types, delegate to the grammar
-        return grammar.validateAttributes(elementName, attributes, context);
-    }
-
     private performValidation(grammar: Grammar, elementName: string, context: ValidationContext): ValidationResult {
         // For XMLSchemaGrammar, we handle the validation here in CompositeGrammar
         if (grammar.getGrammarType().toString() === 'xmlschema') {
@@ -837,6 +831,7 @@ export class CompositeGrammar implements Grammar {
     resolveAttributeGroup(attributeGroupName: string): AttributeGroup | undefined {
         // First try to resolve in all XMLSchema grammars
         for (const [namespace, grammar] of this.grammars) {
+            XMLUtils.ignoreUnused(namespace);
             if (grammar instanceof XMLSchemaGrammar) {
                 const attributeGroup = grammar.getAttributeGroupDefinition(attributeGroupName);
                 if (attributeGroup) {
@@ -871,6 +866,7 @@ export class CompositeGrammar implements Grammar {
 
         // Finally, try unqualified name in all grammars
         for (const [namespace, grammar] of this.grammars) {
+            XMLUtils.ignoreUnused(namespace);
             if (grammar instanceof XMLSchemaGrammar) {
                 const attributeGroup = grammar.getAttributeGroupDefinition(attributeGroupName);
                 if (attributeGroup) {
@@ -1062,6 +1058,7 @@ export class CompositeGrammar implements Grammar {
     }
 
     private validateComplexType(elementName: string, context: ValidationContext, complexType: any, grammar: any): ValidationResult {
+        XMLUtils.ignoreUnused(elementName);
         // Attributes are already validated during startElement by SAXParser.validateAttributes()
         // No need to validate them again during content validation (endElement)
 

ts/grammar/DTDComposite.ts

@@ -10,6 +10,7 @@
  *     Maxprograms - initial API and implementation
  *******************************************************************************/
 
+import { XMLUtils } from '../XMLUtils';
 import { AttDecl } from '../dtd/AttDecl';
 import { DTDGrammar } from '../dtd/DTDGrammar';
 import { ElementDecl } from '../dtd/ElementDecl';
@@ -20,7 +21,6 @@ import { AttributeInfo, Grammar, GrammarType, ValidationContext, ValidationResul
 export class DTDComposite implements Grammar {
 
     private static instance: DTDComposite | undefined;
-    private validating: boolean = false;
     private internalDTD: DTDGrammar | undefined;
     private externalDTDs: DTDGrammar[] = [];
     private sharedParameterEntities: Map<string, EntityDecl> = new Map();
@@ -43,7 +43,6 @@ export class DTDComposite implements Grammar {
     }
 
     reset(): void {
-        this.validating = false;
         this.internalDTD = undefined;
         this.externalDTDs = [];
         this.sharedParameterEntities.clear();
@@ -59,7 +58,7 @@ export class DTDComposite implements Grammar {
     }
 
     setValidating(validating: boolean): void {
-        this.validating = validating;
+        XMLUtils.ignoreUnused(validating);
     }
 
     setIncludeDefaultAttributes(include: boolean): void {
@@ -80,7 +79,7 @@ export class DTDComposite implements Grammar {
         const sharedGrammar = new DTDGrammar();
 
         // Add all shared parameter entities to the new grammar
-        this.sharedParameterEntities.forEach((entity, name) => {
+        this.sharedParameterEntities.forEach((entity) => {
             sharedGrammar.addEntity(entity);
         });
 
@@ -119,6 +118,7 @@ export class DTDComposite implements Grammar {
     }
 
     validateAttributes(element: string, attributes: Map<string, string>, context: ValidationContext): ValidationResult {
+        XMLUtils.ignoreUnused(context);
         // Use merged attribute information for validation
         const declaredAttributes = this.getElementAttributes(element);