Restored DTD validation

Author: rmraya

.gitignore

@@ -1,10 +1,7 @@
 .DS_Store
-package-lock.json
-/node_modules/
-/dist/
-/.vscode/
-/.scannerwork/
+node_modules/
+dist/
+.vscode/
+.scannerwork/
 ts/test.ts
-test.xml
-catalog/
-tests/
+test.xml

package-lock.json

@@ -1,14 +1,16 @@
 {
   "name": "typesxml",
   "productName": "TypesXML",
-  "version": "1.9.0",
+  "version": "1.12.0",
   "description": "Open source XML library written in TypeScript",
   "keywords": [
     "XML",
     "Parser",
     "DOM",
     "SAX",
-    "DTD"
+    "DTD",
+    "Default attributes",
+    "TypeScript"
   ],
   "scripts": {
     "build": "tsc"

package.json

@@ -317,6 +317,22 @@ export class Catalog {
         }
         return undefined;
     }
+
+    matchURI(uri: string): string | undefined {
+        if (uri) {
+            // Apply URI rewrites first
+            for (let pair of this.uriRewrites) {
+                if (uri.startsWith(pair[0])) {
+                    uri = pair[1] + uri.substring(pair[0].length);
+                }
+            }
+            // Look up in URI catalog
+            if (this.uriCatalog.has(uri)) {
+                return this.uriCatalog.get(uri);
+            }
+        }
+        return undefined;
+    }
 }
 
 

ts/Catalog.ts

@@ -30,4 +30,7 @@ export class Constants {
     static readonly ELEMENT_DECL_NODE: number = 12;
     static readonly INTERNAL_SUBSET_NODE: number = 13;
     static readonly NOTATION_DECL_NODE: number = 14;
+
+    // RelaxNG Namespace URI
+    static readonly RELAXNG_NS_URI: string = 'http://relaxng.org/ns/structure/1.0';
 }

ts/Constants.ts

@@ -11,6 +11,7 @@
  *******************************************************************************/
 
 import { Catalog } from "./Catalog";
+import { Grammar } from "./grammar/Grammar";
 import { XMLAttribute } from "./XMLAttribute";
 
 export interface ContentHandler {
@@ -40,4 +41,6 @@ export interface ContentHandler {
     endDTD(): void;
 
     skippedEntity(name: string): void;
+
+    getGrammar(): Grammar | undefined;
 }

ts/ContentHandler.ts

@@ -21,7 +21,6 @@ export class DOMBuilder implements ContentHandler {
     stack: Array<XMLElement> = [];
     catalog: Catalog | undefined;
     dtdParser: DTDParser | undefined;
-    grammarUrl: string | undefined;
     grammar: Grammar | undefined;
 
     initialize(): void {
@@ -34,10 +33,6 @@ export class DOMBuilder implements ContentHandler {
         this.catalog = catalog;
     }
 
-    setDTDParser(dtdParser: DTDParser): void {
-        this.dtdParser = dtdParser;
-    }
-
     getDocument(): XMLDocument | undefined {
         return this.document;
     }
@@ -117,14 +112,6 @@ export class DOMBuilder implements ContentHandler {
         } else {
             this.document?.addProcessingInstruction(pi);
         }
-        if (target === 'xml-model' && this.catalog) {
-            // TODO process the xml-model 
-            /*
-            let atts: Map<string, string> = this.parseXmlModel(data);
-            let href: string = atts.get('href');
-            let schematypens: string = atts.get('schematypens');
-            */
-        }
     }
 
     parseXmlModel(text: string): Map<string, string> {
@@ -187,13 +174,12 @@ export class DOMBuilder implements ContentHandler {
         if (this.catalog) {
             let url = this.catalog.resolveEntity(publicId, systemId);
             if (url) {
-                this.grammarUrl = url;
-                // TODO check grammar type (DTD, XSD or RelaxNG) and use the ritght parser
-                if (this.dtdParser && this.grammarUrl) {
-                    let dtdGrammar: Grammar = this.dtdParser.parseDTD(this.grammarUrl);
-                    if (dtdGrammar) {
-                        this.grammar = dtdGrammar;
-                    }
+                if (!this.dtdParser) {
+                    this.dtdParser = new DTDParser();
+                }
+                let dtdGrammar: Grammar = this.dtdParser.parseDTD(url);
+                if (dtdGrammar) {
+                    this.grammar = dtdGrammar;
                 }
             }
         }
@@ -203,6 +189,10 @@ export class DOMBuilder implements ContentHandler {
         // do nothing
     }
 
+    getGrammar(): Grammar | undefined {
+        return this.grammar;
+    }
+
     skippedEntity(name: string): void {
         // TODO
         throw new Error("Method not implemented.");