@progress/kendo-spreadsheet-common 1.2.10-develop.1 → 1.2.10-develop.3

package/dist/index-esm.js

@@ -2621,6 +2621,7 @@ function defineFunction(name, func) {
 }
 
 function defineBuiltinFunction$1(name, isAsync, x, impl) {
+    name = name.toLowerCase();
     FUNCS$1[name] = isAsync
         ? makeAsyncFunction(impl, x.resolve, x.check, x.arrayArgs)
         : makeSyncFunction(impl, x.resolve, x.check, x.arrayArgs);
@@ -20532,7 +20533,7 @@ function UCS2(out, code) {
     if (code > 0xFFFF) {
         code -= 0x10000;
         out.push(code >>> 10 & 0x3FF | 0xD800,
-                    0xDC00 | code & 0x3FF);
+                 0xDC00 | code & 0x3FF);
     } else {
         out.push(code);
     }
@@ -20559,7 +20560,7 @@ let UPPERCASE_X = CODE("X");
 
 let EXIT = {};
 
-function parse$1(data, callbacks) {
+function parse$1(data, options) {
     let index = 0;
     let stack = [];
     let object = {
@@ -20577,24 +20578,102 @@ function parse$1(data, callbacks) {
         },
         stack: stack
     };
+    let namespaces = null;
+
+    function nsPushFrame() {
+        namespaces = Object.create(namespaces);
+    }
+
+    function nsPopFrame() {
+        namespaces = Object.getPrototypeOf(namespaces);
+    }
+
+    function findNamespace(ns) {
+        let uri = namespaces?.[ns];
+        if (uri == null && ns !== "") {
+            croak(`Undefined namespace ${ns}`);
+        }
+        return uri;
+    }
+
+    function nsIntern(name, ns) {
+        let url = findNamespace(ns);
+        if (url != null) {
+            let prefix = options.namespaces[url];
+            if (prefix) {
+                name = `${prefix}:${name}`;
+            }
+        }
+        return name;
+    }
+
+    // This does two things if `options.namespaces` was specified: (1) it looks for `xmlns` or `xmlns:foo`
+    // attributes. If they are found, the `namespaces` environment is extended with the new definitions. (2) it
+    // qualifies attribute names and $tag with the prefixes specified by the caller in `options.namespaces`, which
+    // should map URL->prefix.
+    //
+    // For example if an XML would use:
+    //
+    //   <stuff:workbook xmlns:stuff="http://schemas.openxmlformats.org/spreadsheetml/2006/main">...</stuff:workbook>
+    //
+    // and caller specified an empty prefix for this URL in `options.namespaces`, then tag name sent to the callbacks
+    // will be just `workbook` (no prefix).
+    function nsMaybeExtend(tagName, attrs) {
+        if (!options.namespaces) {
+            return false;
+        }
+        let newFrame = false;
+        for (let [ attr, value ] of Object.entries(attrs)) {
+            if (attr === "xmlns") {
+                if (!newFrame) {
+                    nsPushFrame();
+                    newFrame = true;
+                }
+                namespaces[""] = value;
+            } else {
+                let m = /^([^:]+):(.*)$/.exec(attr);
+                if (m) {
+                    let attrNS = m[1];
+                    if (attrNS === "xmlns") {
+                        let newNS = m[2];
+                        if (!newFrame) {
+                            nsPushFrame();
+                            newFrame = true;
+                        }
+                        namespaces[newNS] = value || null;
+                    } else if (/^xml/i.test(attrNS)) ; else {
+                        attrs[nsIntern(m[2], attrNS)] = value;
+                    }
+                }
+            }
+        }
+        let m = /^([^:]+):(.*)$/.exec(tagName);
+        if (m) {
+            tagName = nsIntern(m[2], m[1]);
+        } else {
+            tagName = nsIntern(tagName, "");
+        }
+        attrs.$tag = tagName;
+        return newFrame;
+    }
 
     function readChar(body) {
         let code = data[index++];
         if (!(code & 0xF0 ^ 0xF0)) {// 4 bytes
             UCS2(body,
-                    ((code & 0x03) << 18) |
-                    ((data[index++] & 0x3F) << 12) |
-                    ((data[index++] & 0x3F) << 6) |
-                    (data[index++] & 0x3F));
+                 ((code & 0x03) << 18) |
+                 ((data[index++] & 0x3F) << 12) |
+                 ((data[index++] & 0x3F) << 6) |
+                 (data[index++] & 0x3F));
         } else if (!(code & 0xE0 ^ 0xE0)) {// 3 bytes
             UCS2(body,
-                    ((code & 0x0F) << 12) |
-                    ((data[index++] & 0x3F) << 6) |
-                    (data[index++] & 0x3F));
+                 ((code & 0x0F) << 12) |
+                 ((data[index++] & 0x3F) << 6) |
+                 (data[index++] & 0x3F));
         } else if (!(code & 0xC0 ^ 0xC0)) {// 2 bytes
             UCS2(body,
-                    ((code & 0x1F) << 6) |
-                    (data[index++] & 0x3F));
+                 ((code & 0x1F) << 6) |
+                 (data[index++] & 0x3F));
         } else {
             body.push(code);
         }
@@ -20647,19 +20726,19 @@ function parse$1(data, callbacks) {
 
     function isHexDigit(code) {
         return (code >= 48 && code <= 57) ||
-                ((code |= 32) >= 97 && code <= 102); // a..f or A..F
+            ((code |= 32) >= 97 && code <= 102); // a..f or A..F
     }
 
     function isNameStart(code) {
         return code === 58 ||                      // :
-                code === 95 ||                      // _
-                ((code |= 32) >= 97 && code <= 122); // a..z or A..Z
+            code === 95 ||                      // _
+            ((code |= 32) >= 97 && code <= 122); // a..z or A..Z
     }
 
     function isName(code) {
         return code === 45 ||                      // -
-                isDigit(code) ||
-                isNameStart(code);
+            isDigit(code) ||
+            isNameStart(code);
     }
 
     function xmlComment() {
@@ -20681,20 +20760,24 @@ function parse$1(data, callbacks) {
         } else {
             name = xmlName();
             attrs = xmlAttrs(name);
+            let nsframe = nsMaybeExtend(name, attrs);
             stack.push(attrs);
             if (eat(END_SHORT_TAG)) {
-                call("enter", name, attrs, true);
+                call("enter", attrs.$tag, attrs, true);
             } else {
                 skip(GREATER_THAN);
-                call("enter", name, attrs);
+                call("enter", attrs.$tag, attrs);
                 xmlContent(name);
                 if (name !== xmlName()) {
                     croak("Bad closing tag");
                 }
-                call("leave", name, attrs);
+                call("leave", attrs.$tag, attrs);
                 skipWhitespace();
                 skip(GREATER_THAN);
             }
+            if (nsframe) {
+                nsPopFrame();
+            }
             stack.pop();
         }
     }
@@ -20789,7 +20872,7 @@ function parse$1(data, callbacks) {
     }
 
     function call(what, thing, arg1, arg2) {
-        let f = callbacks && callbacks[what];
+        let f = options && options[what];
         if (f) {
             f.call(object, thing, arg1, arg2);
         }
@@ -20886,8 +20969,32 @@ class Deferred {
 /* eslint-disable complexity */
 
 
-// WARNING: removing the following jshint declaration and turning
-// == into === to make JSHint happy will break functionality.
+// This is a mapping of namespace URI -> prefix expected by our reader. If a
+// document uses different prefixes, `parseXML` will rename tags based on this
+// mapping, so our reader can still make sense of it.
+//
+// This list is based on what we have in kendo-ooxml. Not all of them are used
+// here.
+let NAMESPACES = {
+    "http://schemas.openxmlformats.org/package/2006/relationships": "",
+    "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties": "",
+    "http://schemas.openxmlformats.org/package/2006/content-types": "",
+    "http://schemas.openxmlformats.org/spreadsheetml/2006/main": "",
+    "http://schemas.openxmlformats.org/package/2006/metadata/core-properties": "cp",
+    "http://purl.org/dc/elements/1.1/": "dc",
+    "http://purl.org/dc/terms/": "dcterms",
+    "http://purl.org/dc/dcmitype/": "dcmitype",
+    "http://www.w3.org/2001/XMLSchema-instance": "xsi",
+    "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes": "vt",
+    "http://schemas.openxmlformats.org/officeDocument/2006/relationships": "r",
+    "http://schemas.openxmlformats.org/markup-compatibility/2006": "mc",
+    "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac": "x14ac",
+    "urn:schemas-microsoft-com:vml": "v",
+    "urn:schemas-microsoft-com:office:office": "o",
+    "urn:schemas-microsoft-com:office:excel": "x",
+    "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing": "xdr",
+    "http://schemas.openxmlformats.org/drawingml/2006/main": "a",
+};
 
 let MAP_EXCEL_OPERATOR = {
     // includes only what differs; key is Excel's operator, value
@@ -21135,6 +21242,7 @@ function sheetDimensions(bytes) {
         };
 
     parseXML(bytes, {
+        namespaces: NAMESPACES,
         enter: function(tag, attrs) {
             if (tag === "dimension") {
                 ref = calc.parseReference(attrs.ref);
@@ -21916,7 +22024,7 @@ function parse(zip, file, callbacks) {
         let obj = zip.file(file);
         if (obj) {
             obj.async("uint8array").then(bytes => {
-                parseXML(bytes, callbacks);
+                parseXML(bytes, { namespaces: NAMESPACES, ...callbacks });
                 resolve();
             });
         } else {

package/dist/index.js

@@ -2622,6 +2622,7 @@
     }
 
     function defineBuiltinFunction$1(name, isAsync, x, impl) {
+        name = name.toLowerCase();
         FUNCS$1[name] = isAsync
             ? makeAsyncFunction(impl, x.resolve, x.check, x.arrayArgs)
             : makeSyncFunction(impl, x.resolve, x.check, x.arrayArgs);
@@ -20533,7 +20534,7 @@
         if (code > 0xFFFF) {
             code -= 0x10000;
             out.push(code >>> 10 & 0x3FF | 0xD800,
-                        0xDC00 | code & 0x3FF);
+                     0xDC00 | code & 0x3FF);
         } else {
             out.push(code);
         }
@@ -20560,7 +20561,7 @@
 
     let EXIT = {};
 
-    function parse$1(data, callbacks) {
+    function parse$1(data, options) {
         let index = 0;
         let stack = [];
         let object = {
@@ -20578,24 +20579,102 @@
             },
             stack: stack
         };
+        let namespaces = null;
+
+        function nsPushFrame() {
+            namespaces = Object.create(namespaces);
+        }
+
+        function nsPopFrame() {
+            namespaces = Object.getPrototypeOf(namespaces);
+        }
+
+        function findNamespace(ns) {
+            let uri = namespaces?.[ns];
+            if (uri == null && ns !== "") {
+                croak(`Undefined namespace ${ns}`);
+            }
+            return uri;
+        }
+
+        function nsIntern(name, ns) {
+            let url = findNamespace(ns);
+            if (url != null) {
+                let prefix = options.namespaces[url];
+                if (prefix) {
+                    name = `${prefix}:${name}`;
+                }
+            }
+            return name;
+        }
+
+        // This does two things if `options.namespaces` was specified: (1) it looks for `xmlns` or `xmlns:foo`
+        // attributes. If they are found, the `namespaces` environment is extended with the new definitions. (2) it
+        // qualifies attribute names and $tag with the prefixes specified by the caller in `options.namespaces`, which
+        // should map URL->prefix.
+        //
+        // For example if an XML would use:
+        //
+        //   <stuff:workbook xmlns:stuff="http://schemas.openxmlformats.org/spreadsheetml/2006/main">...</stuff:workbook>
+        //
+        // and caller specified an empty prefix for this URL in `options.namespaces`, then tag name sent to the callbacks
+        // will be just `workbook` (no prefix).
+        function nsMaybeExtend(tagName, attrs) {
+            if (!options.namespaces) {
+                return false;
+            }
+            let newFrame = false;
+            for (let [ attr, value ] of Object.entries(attrs)) {
+                if (attr === "xmlns") {
+                    if (!newFrame) {
+                        nsPushFrame();
+                        newFrame = true;
+                    }
+                    namespaces[""] = value;
+                } else {
+                    let m = /^([^:]+):(.*)$/.exec(attr);
+                    if (m) {
+                        let attrNS = m[1];
+                        if (attrNS === "xmlns") {
+                            let newNS = m[2];
+                            if (!newFrame) {
+                                nsPushFrame();
+                                newFrame = true;
+                            }
+                            namespaces[newNS] = value || null;
+                        } else if (/^xml/i.test(attrNS)) ; else {
+                            attrs[nsIntern(m[2], attrNS)] = value;
+                        }
+                    }
+                }
+            }
+            let m = /^([^:]+):(.*)$/.exec(tagName);
+            if (m) {
+                tagName = nsIntern(m[2], m[1]);
+            } else {
+                tagName = nsIntern(tagName, "");
+            }
+            attrs.$tag = tagName;
+            return newFrame;
+        }
 
         function readChar(body) {
             let code = data[index++];
             if (!(code & 0xF0 ^ 0xF0)) {// 4 bytes
                 UCS2(body,
-                        ((code & 0x03) << 18) |
-                        ((data[index++] & 0x3F) << 12) |
-                        ((data[index++] & 0x3F) << 6) |
-                        (data[index++] & 0x3F));
+                     ((code & 0x03) << 18) |
+                     ((data[index++] & 0x3F) << 12) |
+                     ((data[index++] & 0x3F) << 6) |
+                     (data[index++] & 0x3F));
             } else if (!(code & 0xE0 ^ 0xE0)) {// 3 bytes
                 UCS2(body,
-                        ((code & 0x0F) << 12) |
-                        ((data[index++] & 0x3F) << 6) |
-                        (data[index++] & 0x3F));
+                     ((code & 0x0F) << 12) |
+                     ((data[index++] & 0x3F) << 6) |
+                     (data[index++] & 0x3F));
             } else if (!(code & 0xC0 ^ 0xC0)) {// 2 bytes
                 UCS2(body,
-                        ((code & 0x1F) << 6) |
-                        (data[index++] & 0x3F));
+                     ((code & 0x1F) << 6) |
+                     (data[index++] & 0x3F));
             } else {
                 body.push(code);
             }
@@ -20648,19 +20727,19 @@
 
         function isHexDigit(code) {
             return (code >= 48 && code <= 57) ||
-                    ((code |= 32) >= 97 && code <= 102); // a..f or A..F
+                ((code |= 32) >= 97 && code <= 102); // a..f or A..F
         }
 
         function isNameStart(code) {
             return code === 58 ||                      // :
-                    code === 95 ||                      // _
-                    ((code |= 32) >= 97 && code <= 122); // a..z or A..Z
+                code === 95 ||                      // _
+                ((code |= 32) >= 97 && code <= 122); // a..z or A..Z
         }
 
         function isName(code) {
             return code === 45 ||                      // -
-                    isDigit(code) ||
-                    isNameStart(code);
+                isDigit(code) ||
+                isNameStart(code);
         }
 
         function xmlComment() {
@@ -20682,20 +20761,24 @@
             } else {
                 name = xmlName();
                 attrs = xmlAttrs(name);
+                let nsframe = nsMaybeExtend(name, attrs);
                 stack.push(attrs);
                 if (eat(END_SHORT_TAG)) {
-                    call("enter", name, attrs, true);
+                    call("enter", attrs.$tag, attrs, true);
                 } else {
                     skip(GREATER_THAN);
-                    call("enter", name, attrs);
+                    call("enter", attrs.$tag, attrs);
                     xmlContent(name);
                     if (name !== xmlName()) {
                         croak("Bad closing tag");
                     }
-                    call("leave", name, attrs);
+                    call("leave", attrs.$tag, attrs);
                     skipWhitespace();
                     skip(GREATER_THAN);
                 }
+                if (nsframe) {
+                    nsPopFrame();
+                }
                 stack.pop();
             }
         }
@@ -20790,7 +20873,7 @@
         }
 
         function call(what, thing, arg1, arg2) {
-            let f = callbacks && callbacks[what];
+            let f = options && options[what];
             if (f) {
                 f.call(object, thing, arg1, arg2);
             }
@@ -20887,8 +20970,32 @@
     /* eslint-disable complexity */
 
 
-    // WARNING: removing the following jshint declaration and turning
-    // == into === to make JSHint happy will break functionality.
+    // This is a mapping of namespace URI -> prefix expected by our reader. If a
+    // document uses different prefixes, `parseXML` will rename tags based on this
+    // mapping, so our reader can still make sense of it.
+    //
+    // This list is based on what we have in kendo-ooxml. Not all of them are used
+    // here.
+    let NAMESPACES = {
+        "http://schemas.openxmlformats.org/package/2006/relationships": "",
+        "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties": "",
+        "http://schemas.openxmlformats.org/package/2006/content-types": "",
+        "http://schemas.openxmlformats.org/spreadsheetml/2006/main": "",
+        "http://schemas.openxmlformats.org/package/2006/metadata/core-properties": "cp",
+        "http://purl.org/dc/elements/1.1/": "dc",
+        "http://purl.org/dc/terms/": "dcterms",
+        "http://purl.org/dc/dcmitype/": "dcmitype",
+        "http://www.w3.org/2001/XMLSchema-instance": "xsi",
+        "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes": "vt",
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships": "r",
+        "http://schemas.openxmlformats.org/markup-compatibility/2006": "mc",
+        "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac": "x14ac",
+        "urn:schemas-microsoft-com:vml": "v",
+        "urn:schemas-microsoft-com:office:office": "o",
+        "urn:schemas-microsoft-com:office:excel": "x",
+        "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing": "xdr",
+        "http://schemas.openxmlformats.org/drawingml/2006/main": "a",
+    };
 
     let MAP_EXCEL_OPERATOR = {
         // includes only what differs; key is Excel's operator, value
@@ -21136,6 +21243,7 @@
             };
 
         parseXML(bytes, {
+            namespaces: NAMESPACES,
             enter: function(tag, attrs) {
                 if (tag === "dimension") {
                     ref = calc.parseReference(attrs.ref);
@@ -21917,7 +22025,7 @@
             let obj = zip.file(file);
             if (obj) {
                 obj.async("uint8array").then(bytes => {
-                    parseXML(bytes, callbacks);
+                    parseXML(bytes, { namespaces: NAMESPACES, ...callbacks });
                     resolve();
                 });
             } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-spreadsheet-common",
   "description": "Kendo UI platform-independent Spreadsheet library",
-  "version": "1.2.10-develop.1",
+  "version": "1.2.10-develop.3",
   "keywords": [
     "Kendo UI"
   ],