@loaders.gl/graphs 5.0.0-beta.1 → 5.0.0-beta.10

package/src/lib/parse-gexf.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {XMLParser, XMLValidator} from 'fast-xml-parser';
+import {parseXMLSync, validateXML} from '@loaders.gl/documents/xml-parser';
 import type {GraphNode, GraphEdge, GraphShape, GraphAttributeType} from '../graph-types';
 import type {GEXFOutput} from '../gexf-types';
 import {buildGraphTables} from './build-graph-tables';
@@ -20,12 +20,14 @@ type AttributeDefinition = {
   defaultValue?: unknown;
 };
 
-const parser = new XMLParser({
+const XML_OPTIONS = {
   ignoreAttributes: false,
   parseAttributeValue: false,
   parseTagValue: false,
-  trimValues: false
-});
+  trimValues: false,
+  attributeNamePrefix: '@_',
+  textNodeName: '#text'
+};
 const GEXF_NAMESPACE = /^https?:\/\/(?:www\.)?gexf.net\/1\.(?:2(?:draft)?|3)(\/viz)?$/;
 const TEMPORAL_ATTRIBUTES = [
   'start',
@@ -40,14 +42,14 @@ const TEMPORAL_ATTRIBUTES = [
 /** Parses a static GEXF document directly into the selected graph representation. */
 export function parseGEXF(
   input: string | ArrayBuffer | Uint8Array,
-  shape: GraphShape = 'arrow-table'
+  shape: GraphShape = 'arrow'
 ): GEXFOutput {
   const text = typeof input === 'string' ? input : new TextDecoder().decode(input);
-  const validation = XMLValidator.validate(text);
-  if (validation !== true) throw new Error(`Invalid GEXF XML: ${validation.err.msg}`);
+  const validation = validateXML(text);
+  if (validation !== true) throw new Error(`Invalid GEXF XML: ${validation.message}`);
   // External and custom entity declarations are outside the supported format subset.
   if (/<!DOCTYPE\s/i.test(text)) throw new Error('GEXF document types are unsupported.');
-  const document = normalizeNamespaces(parser.parse(text) as XMLElement, {});
+  const document = normalizeNamespaces(parseXMLSync(text, XML_OPTIONS) as XMLElement, {});
   const root = getElement(document.gexf, 'gexf');
   const version = root['@_version'] as string | undefined;
   if (version && !['1.2', '1.2draft', '1.3'].includes(version)) {

package/src/lib/parse-graphml.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {XMLParser} from 'fast-xml-parser';
+import {parseXMLSync} from '@loaders.gl/documents/xml-parser';
 
 import type {
   GraphData,
@@ -37,13 +37,13 @@ type GraphMLKeyDefinition = {
   lossless: boolean;
 };
 
-/** XML element representation emitted by fast-xml-parser. */
+/** XML element representation emitted by the documents XML parser. */
 type GraphMLObject = Record<string, unknown> & {
   /** Element text content. */
   [XML_TEXT_KEY]?: string;
 };
 
-const graphmlParser = new XMLParser({
+const GRAPHML_XML_OPTIONS = {
   ignoreAttributes: false,
   attributeNamePrefix: XML_ATTRIBUTE_PREFIX,
   textNodeName: XML_TEXT_KEY,
@@ -51,7 +51,7 @@ const graphmlParser = new XMLParser({
   parseAttributeValue: false,
   parseTagValue: false,
   removeNSPrefix: true
-});
+};
 
 /** Accepted GraphML document inputs. */
 export type GraphMLInput = string | ArrayBuffer | Uint8Array;
@@ -64,7 +64,7 @@ export function parseGraphML(
   shape: GraphShape = 'plain-graph-data'
 ): GraphOutput {
   const xmlText = decodeGraphML(graphml);
-  const document = graphmlParser.parse(xmlText) as GraphMLObject;
+  const document = parseXMLSync(xmlText, GRAPHML_XML_OPTIONS) as GraphMLObject;
   const graphmlRoot = getGraphMLRoot(document);
   if (!graphmlRoot) {
     throw new Error('GraphML document does not contain a <graphml> element.');