@plurnk/plurnk-mimetypes-application-xml 2.0.4 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/SPEC.md CHANGED
@@ -8,6 +8,6 @@
8
8
  | `parseIssues` | Each recoverable xmldom `error` (such as an entity declared only in the internal DTD subset) counts as 1 issue and channels project the recovered DOM. Content that is not a document (xmldom `fatalError`: template or truncated file) counts as 1 issue, yields `[]` symbols and `null` `deepJson`, and refuses XPath/JSONPath with `QueryParseFailureError` (regex/glob unaffected). Empty input reports 0 issues and `[]` symbols. |
9
9
  | `extractRaw` | Document shape: root element is a `module` symbol and each immediate child element is a `field` symbol named by `id`, else `name`, else tag name, with the root's tag name as `container` ({§mimetype-symbol}), each spanning its complete element. |
10
10
  | `deepJson` | DOM as nested `{ type, attrs, children }` objects via `projectDomToJson` with source coordinates; text-only elements collapse to `text`, mixed content keeps `#text` siblings, and comments/processing instructions are omitted ({§mimetype-channel-architecture}). |
11
- | JSONPath / XPath | XPath 1.0 runs over the real DOM and JSONPath over `deepJson`. Every node match selects its exact lexical source via the concrete syntax tree: elements without surrounding whitespace, attributes as `name = 'value'` as written, text with entity/character-reference/CDATA markup, and comments or processing instructions whole. XPath sees the XPath 1.0 logical text model (CDATA is text, adjacent text coalesces, empty text nodes do not exist, document node drops whitespace text and the XML declaration while keeping other processing instructions); `matched` is the logical string while the region is lexical source. Computed scalars are locator-only; malformed expressions throw `InvalidExpressionError` ({§mimetype-query}). |
11
+ | JSONPath / XPath | XPath 1.0 runs over the real DOM and JSONPath over `deepJson`. Every node match selects its exact lexical source via the concrete syntax tree: elements without surrounding whitespace, attributes as their lexical value inside the quotes (`old` in `id = 'old'`), text with entity/character-reference/CDATA markup, and comments or processing instructions whole. XPath sees the XPath 1.0 logical text model (CDATA is text, adjacent text coalesces, empty text nodes do not exist, document node drops whitespace text and the XML declaration while keeping other processing instructions); `matched` is the logical string while the region is lexical source. Computed scalars are locator-only; malformed expressions throw `InvalidExpressionError` ({§mimetype-query}). |
12
12
 
13
13
  Raw source remains unchanged; binary input is decoded as UTF-8.
@@ -1 +1 @@
1
- {"version":3,"file":"ApplicationXml.js","sourceRoot":"","sources":["../src/ApplicationXml.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,OAAO,EACH,WAAW,EACX,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,GACrB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,UAAU,EAAsC,MAAM,gBAAgB,CAAC;AAChF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,SAAS,MAAM,gBAAgB,CAAC;AAEvC,2EAA2E;AAC3E,MAAM,aAAa,GAAG,CAAC,IAAa,EAAmB,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,WAAW;IAC1C,UAAU,CAAC,OAAuB;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;QAC7C,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAiB,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,IAAY,EAAE,IAAwB,EAAE,SAAkB,EAAQ,EAAE;YAClG,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtC,IAAI,MAAM,KAAK,SAAS;gBAAE,OAAO;YACjC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QACrG,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,KAAK,IAAI,EAAE,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YAC1E,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;gBAAE,SAAS;YACpC,MAAM,OAAO,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1H,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAEQ,QAAQ,CAAC,OAAuB;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACnC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3G,CAAC;IAED,2GAA2G;IAClG,WAAW,CAAC,OAAuB;QACxC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QAChC,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;IAC9C,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,OAAuB,EAAE,OAAqB,EAAE,OAAe,EAAE,KAAc;QAChG,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,KAAK,UAAU;YAAE,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACxG,IAAI,MAAiB,CAAC;QACtB,IAAI,CAAC;YAAC,MAAM,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAAC,CAAC;QAChD,OAAO,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC;gBAAE,MAAM,KAAK,CAAC;YAChD,MAAM,IAAI,sBAAsB,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YACzB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5F,OAAO,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,MAA8B,CAAC;QACnC,sJAAsJ;QACtJ,IAAI,CAAC;YAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAA2B,CAAC,CAAC;QAAC,CAAC;QAC3E,OAAO,KAAK,EAAE,CAAC;YAAC,MAAM,IAAI,sBAAsB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAAC,CAAC;QAC5F,mJAAmJ;QACnJ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACnI,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC9B,oHAAoH;YACpH,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAA0B,CAAC,CAAC;YACzD,OAAO;gBACH,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC;gBACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,GAAG,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO;gBAChF,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;aACzD,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAED,SAAS,MAAM,CAAC,OAAuB;IACnC,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,IAAI,CAAC,MAAkB;IAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;AACxH,CAAC"}
1
+ {"version":3,"file":"ApplicationXml.js","sourceRoot":"","sources":["../src/ApplicationXml.ts"],"names":[],"mappings":"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","sourcesContent":["// {§xml-shape}\nimport {\n BaseHandler,\n InvalidExpressionError,\n QueryParseFailureError,\n queryJsonpathObject,\n projectDomToJson,\n serializeXpathNode,\n} from \"@plurnk/plurnk-mimetypes\";\nimport type { HandlerContent, MimeSymbol, QueryDialect, QueryMatch, TextRegion } from \"@plurnk/plurnk-mimetypes\";\nimport { ParseError, type Element, type Node as XmlNode } from \"@xmldom/xmldom\";\nimport * as xpath from \"xpath\";\nimport XmlSource from \"./XmlSource.ts\";\n\n// A node whose type is ELEMENT_NODE is an element: the DOM's own contract.\nconst isElementNode = (node: XmlNode): node is Element => node.nodeType === 1;\n\nexport default class ApplicationXml extends BaseHandler {\n override extractRaw(content: HandlerContent): MimeSymbol[] {\n const text = textOf(content);\n if (text.length === 0) return [];\n const source = XmlSource.parse(text);\n if (source === null) return [];\n const root = source.document.documentElement;\n if (root === null) return [];\n const symbols: MimeSymbol[] = [];\n const append = (element: Element, name: string, kind: MimeSymbol[\"kind\"], container?: string): void => {\n const region = source.region(element);\n if (region === undefined) return;\n symbols.push({ name, kind, ...span(region), ...(container === undefined ? {} : { container }) });\n };\n append(root, root.tagName, \"module\");\n for (let child = root.firstChild; child !== null; child = child.nextSibling) {\n if (!isElementNode(child)) continue;\n const element = child;\n append(element, element.getAttribute(\"id\") || element.getAttribute(\"name\") || element.tagName, \"field\", root.tagName);\n }\n return symbols;\n }\n\n override deepJson(content: HandlerContent): unknown {\n const text = textOf(content);\n if (text.length === 0) return null;\n const source = XmlSource.parse(text);\n return source === null ? null : projectDomToJson(source.document, (node) => source.region(node)).value;\n }\n\n // {§mimetype-channel-selection} — xmldom's recoverable reports, or one for content that is not a document.\n override parseIssues(content: HandlerContent): number {\n const text = textOf(content);\n if (text.length === 0) return 0;\n return XmlSource.parse(text)?.issues ?? 1;\n }\n\n override async query(content: HandlerContent, dialect: QueryDialect, pattern: string, flags?: string): Promise<QueryMatch[]> {\n if (dialect !== \"xpath\" && dialect !== \"jsonpath\") return super.query(content, dialect, pattern, flags);\n let source: XmlSource;\n try { source = new XmlSource(textOf(content)); }\n catch (cause) {\n if (!(cause instanceof ParseError)) throw cause;\n throw new QueryParseFailureError({ mimetype: this.mimetype, cause });\n }\n if (dialect === \"jsonpath\") {\n const { value, regions } = projectDomToJson(source.document, (node) => source.region(node));\n return queryJsonpathObject(value, pattern, (pointer) => regions.get(pointer));\n }\n let result: xpath.SelectReturnType;\n // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- xpath types its nodes by the browser's DOM; the parsed document walks the same tree\n try { result = xpath.select(pattern, source.document as unknown as Node); }\n catch (cause) { throw new InvalidExpressionError({ dialect, expression: pattern, cause }); }\n // oxlint-disable-next-line typescript/no-base-to-string -- a scalar XPath value is a string, number or boolean; a node renders by its own toString\n if (!Array.isArray(result)) return result === null || result === undefined ? [] : [{ matched: String(result), matching: pattern }];\n return result.map((node, index) => {\n // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- an xpath result node is a node of the parsed tree\n const region = source.region(node as unknown as XmlNode);\n return {\n matched: serializeXpathNode(node),\n matching: result.length > 1 ? \"(\" + pattern + \")[\" + (index + 1) + \"]\" : pattern,\n ...(region === undefined ? {} : { regions: [region] }),\n };\n });\n }\n}\n\nfunction textOf(content: HandlerContent): string {\n return typeof content === \"string\" ? content : new TextDecoder(\"utf-8\").decode(content);\n}\n\nfunction span(region: TextRegion): { line: number; endLine: number; column: number; endColumn: number } {\n return { line: region.startLine, column: region.startColumn, endLine: region.endLine, endColumn: region.endColumn };\n}\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"XmlSource.d.ts","sourceRoot":"","sources":["../src/XmlSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAI5E,MAAM,CAAC,OAAO,OAAO,SAAS;;IAC1B,QAAQ,CAAC,QAAQ,oCAAC;IAGlB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAMxB,YAAY,OAAO,EAAE,MAAM,EAwC1B;IAID,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAM9C;IAED,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,GAAG,SAAS,CA2BzC;CACJ"}
1
+ {"version":3,"file":"XmlSource.d.ts","sourceRoot":"","sources":["../src/XmlSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAI5E,MAAM,CAAC,OAAO,OAAO,SAAS;;IAC1B,QAAQ,CAAC,QAAQ,oCAAC;IAGlB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAMxB,YAAY,OAAO,EAAE,MAAM,EAwC1B;IAID,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAM9C;IAED,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,GAAG,SAAS,CAgCzC;CACJ"}
package/dist/XmlSource.js CHANGED
@@ -91,9 +91,16 @@ export default class XmlSource {
91
91
  return undefined;
92
92
  syntax = syntax.parent;
93
93
  }
94
- const from = syntax.from;
94
+ let from = syntax.from;
95
95
  let to = syntax.to;
96
- if (node.nodeType === 3) {
96
+ if (node.nodeType === 2) {
97
+ const value = syntax.getChild("AttributeValue");
98
+ if (value === null || value.to - value.from < 2)
99
+ return undefined;
100
+ from = value.from + 1;
101
+ to = value.to - 1;
102
+ }
103
+ else if (node.nodeType === 3) {
97
104
  while (syntax.nextSibling !== null && syntax.nextSibling.from === to && text(syntax.nextSibling.name)) {
98
105
  syntax = syntax.nextSibling;
99
106
  to = syntax.to;
@@ -1 +1 @@
1
- {"version":3,"file":"XmlSource.js","sourceRoot":"","sources":["../src/XmlSource.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"XmlSource.js","sourceRoot":"","sources":["../src/XmlSource.ts"],"names":[],"mappings":"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","sourcesContent":["import { parser } from \"@lezer/xml\";\nimport { DOMParser, ParseError, type Node } from \"@xmldom/xmldom\";\nimport { TextCoordinates, type TextRegion } from \"@plurnk/plurnk-mimetypes\";\n\n// {§mimetype-query} — XPath owns node identity; the concrete syntax tree owns\n// source extents. DOM serialization cannot recover lexical quotes or entities.\nexport default class XmlSource {\n readonly document;\n // {§mimetype-channel-selection} — xmldom keeps building past an `error` report (an entity declared\n // only in the internal DTD subset, which it does not process); each one is a recovery site.\n readonly issues: number;\n readonly #tree;\n readonly #coordinates: TextCoordinates;\n readonly #lineStarts: number[];\n readonly #length: number;\n\n constructor(content: string) {\n let issues = 0;\n // A `fatalError` still throws xmldom's ParseError: no document exists ({@link XmlSource.parse}).\n this.document = new DOMParser({ onError: (level) => {\n if (level === \"error\") issues += 1;\n } }).parseFromString(content, \"text/xml\");\n this.issues = issues;\n this.#tree = parser.parse(content);\n this.#coordinates = new TextCoordinates(content);\n this.#length = content.length;\n // xmldom's XML line normalization; its columns count UTF-16 code units.\n // Convert its locator back to original offsets before applying Plurnk coordinates.\n this.#lineStarts = [0, ...[...content.matchAll(/\\r[\\n\\u0085]|[\\r\\n\\u0085\\u2028\\u2029]/g)].map((match) => match.index + match[0].length)];\n // XPath 1.0 §5.7 has logical text nodes, not separate CDATA nodes.\n const pending: Node[] = [this.document];\n while (pending.length > 0) {\n const parent = pending.pop()!;\n for (let child = parent.firstChild; child !== null;) {\n const next = child.nextSibling;\n if (child.nodeType === 4) {\n const text = this.document.createTextNode(child.nodeValue ?? \"\");\n text.lineNumber = child.lineNumber;\n text.columnNumber = child.columnNumber;\n parent.replaceChild(text, child);\n } else if (child.nodeType === 1) pending.push(child);\n child = next;\n }\n }\n this.document.normalize();\n pending.push(this.document);\n while (pending.length > 0) {\n const parent = pending.pop()!;\n for (let child = parent.firstChild; child !== null;) {\n const next = child.nextSibling;\n if ((child.nodeType === 3 && (parent === this.document || child.nodeValue === \"\"))\n || (child.nodeType === 7 && child.nodeName === \"xml\")) parent.removeChild(child);\n else if (child.nodeType === 1) pending.push(child);\n child = next;\n }\n }\n }\n\n // {§mimetype-channel-selection} — content that is not a document (a template, a truncated file) has\n // no source: null, never a throw. Anything but xmldom's ParseError is a defect and keeps its identity.\n static parse(content: string): XmlSource | null {\n try { return new XmlSource(content); }\n catch (cause) {\n if (cause instanceof ParseError) return null;\n throw cause;\n }\n }\n\n region(node: Node): TextRegion | undefined {\n if (node.nodeType === 9) return this.#coordinates.regionFromOffsets(0, this.#length) ?? undefined;\n const { lineNumber, columnNumber } = node;\n const start = lineNumber === undefined ? undefined : this.#lineStarts[lineNumber - 1];\n if (start === undefined || columnNumber === undefined) return undefined;\n const offset = start + columnNumber - 1;\n const kind = node.nodeType === 1 ? \"Element\"\n : node.nodeType === 2 ? \"Attribute\"\n : node.nodeType === 4 ? \"Cdata\"\n : node.nodeType === 7 ? \"ProcessingInst\"\n : node.nodeType === 8 ? \"Comment\"\n : node.nodeType === 10 ? \"DoctypeDecl\" : undefined;\n let syntax = this.#tree.resolveInner(offset, 1);\n const text = (name: string): boolean => name === \"Text\" || name === \"EntityReference\" || name === \"CharacterReference\" || name === \"Cdata\";\n while (kind === undefined ? node.nodeType !== 3 || !text(syntax.name) : syntax.name !== kind) {\n if (syntax.parent === null) return undefined;\n syntax = syntax.parent;\n }\n let from = syntax.from;\n let to = syntax.to;\n if (node.nodeType === 2) {\n const value = syntax.getChild(\"AttributeValue\");\n if (value === null || value.to - value.from < 2) return undefined;\n from = value.from + 1;\n to = value.to - 1;\n } else if (node.nodeType === 3) {\n while (syntax.nextSibling !== null && syntax.nextSibling.from === to && text(syntax.nextSibling.name)) {\n syntax = syntax.nextSibling;\n to = syntax.to;\n }\n }\n return this.#coordinates.regionFromOffsets(from, to) ?? undefined;\n }\n}\n"]}
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC","sourcesContent":["export { default as ApplicationXml } from \"./ApplicationXml.ts\";\nexport { default } from \"./ApplicationXml.ts\";\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plurnk/plurnk-mimetypes-application-xml",
3
- "version": "2.0.4",
3
+ "version": "2.0.5",
4
4
  "description": "application/xml and text/xml mimetype handler for plurnk-service. DOM-tree extraction via @xmldom/xmldom; xpath via the xpath package; framework structural projections.",
5
5
  "keywords": [
6
6
  "plurnk",
@@ -66,12 +66,12 @@
66
66
  },
67
67
  "homepage": "https://github.com/plurnk/plurnk-service/tree/main/plurnk-mimetypes-application-xml#readme",
68
68
  "bugs": {
69
- "url": "https://repo.possumtech.com/plurnk/plurnk-service/issues"
69
+ "url": "https://github.com/plurnk/plurnk-service/issues"
70
70
  },
71
71
  "repository": {
72
72
  "type": "git",
73
73
  "url": "git+https://github.com/plurnk/plurnk-service.git",
74
74
  "directory": "plurnk-mimetypes-application-xml"
75
75
  },
76
- "gitHead": "db65532b51408a2014f7ff53a288d834ff6694f2"
76
+ "gitHead": "49f92d9351021ae0729d69e72ab9b1b95e3a974b"
77
77
  }