Renamed class and fixed typos

Author: rmraya

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "typesxml",
   "productName": "TypesXML",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "Open source XML library written in TypeScript",
   "keywords": [
     "XML",
@@ -47,7 +47,7 @@
     "url": "https://github.com/rmraya/TypesXML.git"
   },
   "devDependencies": {
-    "@types/node": "^24.12.0",
+    "@types/node": "^24.12.2",
     "typescript": "^6.0.2"
   }
 }

package.json

@@ -32,7 +32,7 @@ export class XMLAttribute implements XMLNode {
         return this.value;
     }
 
-    setvalue(value: string): void {
+    setValue(value: string): void {
         this.value = value;
     }
 

ts/XMLAttribute.ts

@@ -14,7 +14,7 @@ import { ContentParticle } from "./contentParticle.js";
 import { DTDChoice } from "./dtdChoice.js";
 import { DTDName } from "./dtdName.js";
 import { DTDPCData } from "./dtdPCData.js";
-import { DTDSecuence } from "./dtdSecuence.js";
+import { DTDSequence } from "./dtdSequence.js";
 
 export const Cardinality = {
     NONE: 0, // (exactly one)
@@ -174,7 +174,7 @@ export class ContentModel {
     }
 
     isContentParticle(obj: any): boolean {
-        return obj instanceof DTDName || obj instanceof DTDChoice || obj instanceof DTDSecuence || obj instanceof DTDPCData;
+        return obj instanceof DTDName || obj instanceof DTDChoice || obj instanceof DTDSequence || obj instanceof DTDPCData;
     }
 
     processGroup(group: Array<any>): ContentParticle {
@@ -189,8 +189,8 @@ export class ContentModel {
             if (obj instanceof DTDChoice) {
                 return obj as DTDChoice;
             }
-            if (obj instanceof DTDSecuence) {
-                return obj as DTDSecuence;
+            if (obj instanceof DTDSequence) {
+                return obj as DTDSequence;
             }
             if (obj instanceof DTDName) {
                 return obj as DTDName;
@@ -212,7 +212,7 @@ export class ContentModel {
         if (sep === null) {
             throw new Error('No separator found when parsing group');
         }
-        let result: ContentParticle = sep === "|" ? new DTDChoice() : new DTDSecuence();
+        let result: ContentParticle = sep === "|" ? new DTDChoice() : new DTDSequence();
         for (let obj of group) {
             if (obj === "|" || obj === ",") {
                 continue;
@@ -221,7 +221,7 @@ export class ContentModel {
                 result.addParticle(new DTDName(obj));
             } else if (obj instanceof DTDChoice) {
                 result.addParticle(obj);
-            } else if (obj instanceof DTDSecuence) {
+            } else if (obj instanceof DTDSequence) {
                 result.addParticle(obj);
             } else if (obj instanceof DTDName) {
                 result.addParticle(obj);
@@ -292,8 +292,8 @@ export class ContentModel {
                     children.add(child);
                 }
             }
-            if (particle instanceof DTDSecuence) {
-                const sequence = particle as DTDSecuence;
+            if (particle instanceof DTDSequence) {
+                const sequence = particle as DTDSequence;
                 for (const child of sequence.getChildren()) {
                     children.add(child);
                 }
@@ -336,7 +336,7 @@ export class ContentModel {
         if (particle instanceof DTDName) {
             return this.matchNameParticle(particle, children, start);
         }
-        if (particle instanceof DTDSecuence) {
+        if (particle instanceof DTDSequence) {
             return this.matchSequenceParticle(particle, children, start);
         }
         if (particle instanceof DTDChoice) {
@@ -363,7 +363,7 @@ export class ContentModel {
         return index;
     }
 
-    private matchSequenceParticle(sequence: DTDSecuence, children: string[], start: number): number {
+    private matchSequenceParticle(sequence: DTDSequence, children: string[], start: number): number {
         const min:number = this.getMinOccurs(sequence.getCardinality());
         const max: number = this.getMaxOccurs(sequence.getCardinality());
         let index: number = start;
@@ -416,7 +416,7 @@ export class ContentModel {
         return index;
     }
 
-    private matchSequenceOnce(sequence: DTDSecuence, children: string[], start: number): number {
+    private matchSequenceOnce(sequence: DTDSequence, children: string[], start: number): number {
         let index:number = start;
         for (const subParticle of sequence.getParticles()) {
             const nextIndex: number = this.matchParticle(subParticle, children, index);

ts/dtd/ContentModel.ts

@@ -13,7 +13,7 @@
 import { Cardinality } from "./ContentModel.js";
 import { ContentParticle, ContentParticleType } from "./contentParticle.js";
 import { DTDName } from "./dtdName.js";
-import { DTDSecuence } from "./dtdSecuence.js";
+import { DTDSequence } from "./dtdSequence.js";
 
 export class DTDChoice implements ContentParticle {
 
@@ -83,8 +83,8 @@ export class DTDChoice implements ContentParticle {
                     children.add(child);
                 }
             }
-            if (particle instanceof DTDSecuence) {
-                let sequence = particle as DTDSecuence;
+            if (particle instanceof DTDSequence) {
+                let sequence = particle as DTDSequence;
                 // add all the children of the sequence
                 for (const child of sequence.getChildren()) {
                     children.add(child);

ts/dtd/dtdChoice.ts

@@ -15,7 +15,7 @@ import { ContentParticle, ContentParticleType } from "./contentParticle.js";
 import { DTDChoice } from "./dtdChoice.js";
 import { DTDName } from "./dtdName.js";
 
-export class DTDSecuence implements ContentParticle {
+export class DTDSequence implements ContentParticle {
 
     private cardinality: typeof Cardinality[keyof typeof Cardinality];
     private content: Array<ContentParticle>;
@@ -83,8 +83,8 @@ export class DTDSecuence implements ContentParticle {
                     children.add(child);
                 }
             }
-            if (particle instanceof DTDSecuence) {
-                let sequence = particle as DTDSecuence;
+            if (particle instanceof DTDSequence) {
+                let sequence = particle as DTDSequence;
                 // add all the children of the sequence
                 for (const child of sequence.getChildren()) {
                     children.add(child);

ts/dtd/dtdSecuence.ts

@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2023-2026 Maxprograms.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 1.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-v10.html
+ *
+ * Contributors:
+ *     Maxprograms - initial API and implementation
+ *******************************************************************************/
+
+import { Cardinality } from "./ContentModel.js";
+import { ContentParticle, ContentParticleType } from "./contentParticle.js";
+import { DTDChoice } from "./dtdChoice.js";
+import { DTDName } from "./dtdName.js";
+
+export class DTDSequence implements ContentParticle {
+
+    private cardinality: typeof Cardinality[keyof typeof Cardinality];
+    private content: Array<ContentParticle>;
+
+    constructor() {
+        this.content = new Array<ContentParticle>();
+        this.cardinality = Cardinality.NONE;
+    }
+
+    public addParticle(particle: ContentParticle) {
+        this.content.push(particle);
+    }
+
+    getType(): typeof ContentParticleType[keyof typeof ContentParticleType] {
+        return ContentParticleType.SEQUENCE;
+    }
+
+    setCardinality(cardinality: typeof Cardinality[keyof typeof Cardinality]) {
+        this.cardinality = cardinality;
+    }
+
+    getCardinality(): typeof Cardinality[keyof typeof Cardinality] {
+        return this.cardinality;
+    }
+
+    toString() {
+        let sb: string = '(';
+        for (let i: number = 0; i < this.content.length; i++) {
+            let particle = this.content[i];
+            sb = sb + particle.toString();
+            if (i < this.content.length - 1) {
+                sb = sb + ',';
+            }
+        }
+        sb = sb + ')';
+        switch (this.cardinality) {
+            case Cardinality.NONE:
+                return sb.toString();
+            case Cardinality.OPTIONAL:
+                return sb + "?";
+            case Cardinality.ONEMANY:
+                return sb + "+";
+            case Cardinality.ZEROMANY:
+                return sb + "*";
+            default:
+            // ignore
+        }
+        return sb.toString();
+    }
+
+    getParticles(): Array<ContentParticle> {
+        return this.content;
+    }
+
+    getChildren(): Set<string> {
+        const children: Set<string> = new Set<string>();
+        for (const particle of this.content) {
+            if (particle instanceof DTDName) {
+                children.add(particle.getName());
+            }
+            if (particle instanceof DTDChoice) {
+                let choice = particle as DTDChoice;
+                // add all the children of the choice
+                for (const child of choice.getChildren()) {
+                    children.add(child);
+                }
+            }
+            if (particle instanceof DTDSequence) {
+                let sequence = particle as DTDSequence;
+                // add all the children of the sequence
+                for (const child of sequence.getChildren()) {
+                    children.add(child);
+                }
+            }
+        }
+        return children;
+    }
+}

ts/dtd/dtdSequence.ts

@@ -50,7 +50,7 @@ export { DTDGrammar } from "./dtd/DTDGrammar.js";
 export { DTDName } from "./dtd/dtdName.js";
 export { DTDPCData } from "./dtd/dtdPCData.js";
 export { DTDSequenceModel } from "./dtd/DTDSequenceModel.js";
-export { DTDSecuence } from "./dtd/dtdSecuence.js";
+export { DTDSequence } from "./dtd/dtdSequence.js";
 export { ElementDecl } from "./dtd/ElementDecl.js";
 export { EntityDecl } from "./dtd/EntityDecl.js";
 export { NotationDecl } from "./dtd/NotationDecl.js";