@poe-platform/safe-fs 0.1.814 → 0.1.815

package/dist/xml-ast/index.d.ts

@@ -54,6 +54,8 @@ export interface XmlStepLimits extends XmlLimits {
     readonly events?: (event: XmlStreamEvent) => void;
 }
 export interface XmlSourceLimits extends XmlStepLimits {
+    /** Keep normalized declaration fields instead of the complete source spelling. */
+    readonly compactDeclaration?: boolean;
     /** Emit content bodies in bounded fragments, marking continuations of the same logical
      * node. Requires retainTree: false; consumers must preserve fragment identity. */
     readonly fragmentContent?: boolean;

package/dist/xml-ast/index.js

@@ -176,11 +176,10 @@ function* entities(text, recover) {
     }
     return result;
 }
-function* validDeclaration(content, expectedEncoding) {
-    let offset = 0;
+function* readDeclaration(source, offset, end, expectedEncoding) {
     const whitespace = function* () {
         const start = offset;
-        while (offset < content.length && " \t\n\r".includes(content[offset])) {
+        while (offset < end && " \t\n\r".includes(yield* source.slice(offset, offset + 1))) {
             offset++;
             if ((offset - start) % 512 === 0)
                 yield 512;
@@ -189,53 +188,58 @@ function* validDeclaration(content, expectedEncoding) {
             yield (offset - start) % 512;
         return offset - start;
     };
-    const field = function* (name) {
-        if (content.slice(offset, offset + name.length) !== name)
+    const field = function* (name, maxLength) {
+        if ((yield* source.slice(offset, Math.min(end, offset + name.length))) !== name)
             return undefined;
         offset += name.length;
         yield name.length;
         yield* whitespace();
-        if (content[offset++] !== "=")
+        if (offset >= end || (yield* source.charCodeAt(offset++)) !== 61)
             return undefined;
         yield* whitespace();
-        const quote = content[offset++];
+        if (offset >= end)
+            return undefined;
+        const quote = yield* source.slice(offset++, offset);
         if (quote !== "'" && quote !== '"')
             return undefined;
         const start = offset;
-        while (offset < content.length && content[offset] !== quote) {
+        while (offset < end && (yield* source.slice(offset, offset + 1)) !== quote) {
             offset++;
             if ((offset - start) % 512 === 0)
                 yield 512;
         }
         if ((offset - start) % 512)
             yield (offset - start) % 512;
-        if (offset >= content.length)
+        if (offset >= end || offset - start > maxLength)
             return undefined;
-        return content.slice(start, offset++);
+        return yield* source.slice(start, offset++);
     };
-    if (!(yield* whitespace()) || (yield* field("version")) !== "1.0")
-        return false;
+    if (!(yield* whitespace()) || (yield* field("version", 3)) !== "1.0")
+        return undefined;
+    let result = '<?xml version="1.0"';
     let spacing = yield* whitespace();
-    if (content.slice(offset, offset + 8) === "encoding") {
+    if ((yield* source.slice(offset, Math.min(end, offset + 8))) === "encoding") {
         if (!spacing)
-            return false;
-        const encoding = yield* field("encoding");
-        if (encoding === undefined || encoding.length > 8 || !["utf-8", "utf-16", "utf-16le", "utf-16be"].includes(encoding.toLowerCase()))
-            return false;
+            return undefined;
+        const encoding = yield* field("encoding", 8);
+        if (encoding === undefined || !["utf-8", "utf-16", "utf-16le", "utf-16be"].includes(encoding.toLowerCase()))
+            return undefined;
         if (expectedEncoding !== undefined && encoding.toLowerCase() !== expectedEncoding.toLowerCase()
             && !(encoding.toLowerCase() === "utf-16" && (expectedEncoding === "UTF-16LE" || expectedEncoding === "UTF-16BE")))
-            return false;
+            return undefined;
+        result += ` encoding="${encoding}"`;
         spacing = yield* whitespace();
     }
-    if (content.slice(offset, offset + 10) === "standalone") {
+    if ((yield* source.slice(offset, Math.min(end, offset + 10))) === "standalone") {
         if (!spacing)
-            return false;
-        const standalone = yield* field("standalone");
-        if (standalone === undefined || standalone.length > 3 || !["yes", "no"].includes(standalone))
-            return false;
+            return undefined;
+        const standalone = yield* field("standalone", 3);
+        if (standalone === undefined || !["yes", "no"].includes(standalone))
+            return undefined;
+        result += ` standalone="${standalone}"`;
         yield* whitespace();
     }
-    return offset === content.length;
+    return offset === end ? result + "?>" : undefined;
 }
 function validateLimits(limits) {
     for (const limit of [limits.maxDepth, limits.maxNodes, limits.maxAttributes, limits.maxContentNodes, limits.maxAttributesPerElement, limits.maxNamespaces]) {
@@ -485,12 +489,13 @@ export function* parseXmlSourceSteps(length, limits = {}) {
             if (end < 0)
                 invalid("unterminated processing instruction");
             if (target.length === 3 && target.toLowerCase() === "xml") {
-                const content = yield* source.slice(offset, end);
-                if (start !== 0 || target !== "xml"
-                    || !(yield* validDeclaration(content, limits.expectedEncoding)))
+                if (start !== 0 || target !== "xml")
+                    invalid("unsupported XML declaration");
+                const parsed = yield* readDeclaration(source, offset, end, limits.expectedEncoding);
+                if (parsed === undefined)
                     invalid("unsupported XML declaration");
                 if (retainContent)
-                    declaration = yield* source.slice(start, end + 2);
+                    declaration = limits.compactDeclaration ? parsed : yield* source.slice(start, end + 2);
             }
             else {
                 if (offset < end && !" \t\n\r".includes(yield* source.slice(offset, offset + 1)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-fs",
-  "version": "0.1.814",
+  "version": "0.1.815",
   "description": "Composable filesystem with a portable core and explicit Node adapters",
   "type": "module",
   "license": "MIT",