@graphty/graph-io 0.3.4 → 0.3.5

package/dist/neo4j.js

@@ -1,7 +1,7 @@
 import { X as ROLE_TAKEN_CODE$1, o as ID_MERGED_CODE$1, k as DUPLICATE_NODE_CODE$1, M as MISSING_ENDPOINT_CODE$1, y as MISSING_ID_CODE$1, aF as resolveImportOptions, I as ImportReportBuilder, aC as reportSinkOptions, aD as reportUnusedOptions, a as throwIfAborted, v as IdCoercer, l as DirectionResolver, w as ImportError, aO as declareAttribute, b1 as declareOn, aL as uniqueColumnName, U as RENAMED_CODE, aA as parseWeightText, aP as parseDeclaredTemporal, aQ as parseDeclaredValue, aR as losesPrecision, ah as declareCompanion, T as PRECISION_CODE, aT as splitListText, au as isImportInput, b0 as takenIn, ar as inputLength, ac as capabilities, p as ID_TEXT_COLLISION_CODE, q as ID_TEXT_TYPE_CODE, ax as joinText, ak as encodeChunks, aE as resolveExportOptions, ad as checkCapabilities, az as pairFolding, L as LOSS, aX as mapDeclaredType, al as explicitWeights, at as isCanonicalIntegerText, aZ as formatTemporal, ao as formatF64, an as formatF32, aq as formatInteger, Y as SINK_OPTION_CODE, P as OPTION_IGNORED_CODE, C as COLUMN_RENAMED_CODE, a3 as UNKNOWN_ATTR_TYPE_CODE, a5 as UNKNOWN_ENCODING_CODE, n as ENCODING_FALLBACK_CODE, s as INVALID_ENCODING_CODE, u as INVALID_UTF8_CODE, a8 as WEIGHT_KEY_CLASH_CODE, W as ROLE_DROPPED_CODE, J as MUTUAL_EXPANDED_CODE } from "./chunks/writer-BdMak4_J.js";
 import { c as checkRecordSyntax, R as RecordReader, B as BAD_QUOTE_CODE, U as UNCLOSED_QUOTE_CODE } from "./chunks/records-BKSMowhR.js";
 import { GraphFormatError, INVALID_INDEX } from "@graphty/graph-format";
-import { n as quoteCsvCell } from "./chunks/escape-DXbOoLKl.js";
+import { n as quoteCsvCell } from "./chunks/escape-BjmIaFFo.js";
 const STRUCTURAL = /* @__PURE__ */ new Set(["ID", "LABEL", "START_ID", "END_ID", "TYPE", "IGNORE"]);
 const SPACE_KINDS = /* @__PURE__ */ new Set(["ID", "START_ID", "END_ID"]);
 const HEADER_MARKER = /^[^:{}()]*:\s*(ID|START_ID|END_ID)\s*(\(|\{|$)/i;
@@ -89,6 +89,7 @@ function formatHeaderField(name, type, space) {
 const LABELS_COLUMN = "labels";
 const TYPE_COLUMN = "type";
 const ID_SPACE_COLUMN = "idSpace";
+const ORIGINAL_ID_COLUMN = "originalId";
 const HEADER_CODE = "E_NEO4J_HEADER";
 const COLUMN_COUNT_CODE = "E_NEO4J_COLUMN_COUNT";
 const MISSING_ID_CODE = MISSING_ID_CODE$1;
@@ -137,6 +138,13 @@ const ID_SPACE_DECL = {
   role: "idSpace",
   origin: { format: NEO4J$1, id: ":ID", title: null, type: "ID", namespace: null }
 };
+const ORIGINAL_ID_DECL = {
+  name: ORIGINAL_ID_COLUMN,
+  dtype: "string",
+  nullable: true,
+  // origin.type stays null so the column is never mistaken for a stored id (`name:ID`)
+  origin: { format: NEO4J$1, id: ":ID", title: null, type: null, namespace: null }
+};
 const ARRAY_DELIMITERS = { ";": "semicolon", ",": "comma", "|": "pipe" };
 const NEO4J_DELIMITER_CANDIDATES = Object.freeze([",", "	"]);
 function resolveNeo4jOptions(options) {
@@ -291,6 +299,7 @@ class Neo4jImportSession {
     this.labelsHandle = INVALID_INDEX;
     this.typeHandle = INVALID_INDEX;
     this.idSpaceHandle = INVALID_INDEX;
+    this.originalIdHandle = INVALID_INDEX;
     this.ignoredColumns = 0;
     this.headerSet = false;
     this.values = [];
@@ -510,6 +519,8 @@ class Neo4jImportSession {
       width: fields.length,
       startCell,
       endCell,
+      startSpace,
+      endSpace,
       startSpaceCode: startSpace === null ? 0 : this.registry.codeOf(startSpace),
       endSpaceCode: endSpace === null ? 0 : this.registry.codeOf(endSpace),
       typeCell,
@@ -603,6 +614,7 @@ class Neo4jImportSession {
   ensureIdSpace() {
     if (this.idSpaceHandle === INVALID_INDEX) {
       this.idSpaceHandle = this.declareReserved("node", ID_SPACE_DECL);
+      this.originalIdHandle = this.declareReserved("node", ORIGINAL_ID_DECL);
     }
   }
   /**
@@ -672,11 +684,12 @@ class Neo4jImportSession {
       report.counts.skippedNodes++;
       return;
     }
-    const id = this.coerceId(idText2, line);
-    if (id === null || !this.parseProperties(section.properties, cells, quoted, line, idText2)) {
+    const coerced = this.coerceId(idText2, line);
+    if (coerced === null || !this.parseProperties(section.properties, cells, quoted, line, idText2)) {
       report.counts.skippedNodes++;
       return;
     }
+    const id = qualify(coerced, section.space);
     let labels;
     if (section.labelCells.length > 0 || section.extraLabels.length > 0) {
       labels = this.labelsOf(section, cells, quoted);
@@ -709,6 +722,7 @@ class Neo4jImportSession {
     }
     if (section.space !== null) {
       sink.setNodeValue(this.idSpaceHandle, index, section.space);
+      sink.setNodeValue(this.originalIdHandle, index, idText2);
     }
     if (labels !== void 0) {
       sink.setNodeValue(this.labelsHandle, index, labels);
@@ -756,12 +770,14 @@ class Neo4jImportSession {
       return;
     }
     const element = `${startText}->${endText}`;
-    const source = this.coerceId(startText, line);
-    const target = source === null ? null : this.coerceId(endText, line);
-    if (source === null || target === null) {
+    const start = this.coerceId(startText, line);
+    const end = start === null ? null : this.coerceId(endText, line);
+    if (start === null || end === null) {
       report.counts.skippedEdges++;
       return;
     }
+    const source = qualify(start, section.startSpace);
+    const target = qualify(end, section.endSpace);
     let wrongSpace = null;
     if (this.wrongSpace(source, section.startSpaceCode)) {
       wrongSpace = startText;
@@ -811,9 +827,9 @@ class Neo4jImportSession {
     report.counts.edges++;
   }
   /**
-   * Whether an endpoint id belongs to a node a node row declared in another id space than the
-   * endpoint's header declares. An endpoint without a declared space, or a node no row declared
-   * yet, is looked up by id alone.
+   * Whether a qualified endpoint id belongs to a node a node row declared in another id space than
+   * the endpoint's header declares (an unspaced node whose id text is `Space:id`). An endpoint
+   * without a declared space, or a node no row declared yet, is looked up by id alone.
    * @param id - the endpoint id
    * @param spaceCode - the endpoint's space code, 0 for none
    * @returns true when the endpoint resolves to a node of another space
@@ -972,6 +988,9 @@ class Neo4jImportSession {
     return labels;
   }
 }
+function qualify(id, space) {
+  return space === null ? id : `${space}:${String(id)}`;
+}
 function emptyValue(spec) {
   if (spec.list) {
     return [];
@@ -1163,6 +1182,7 @@ class ExportPlan {
     this.options = options;
     this.common = common;
     this.idSpace = snapshot.nodes.byRole("idSpace");
+    this.originalId = [...snapshot.nodes].find((column) => isIdText(column.meta)) ?? null;
     this.labels = snapshot.nodes.byRole("labels");
     this.kind = snapshot.edges.byRole("kind");
     for (const column of snapshot.nodes) {
@@ -1285,7 +1305,7 @@ class ExportPlan {
       if (companions.has(column) || role !== null && SKIPPED_ROLES.has(role)) {
         continue;
       }
-      if (domain === "node" && (isStoredId(meta) || column === this.idSpace || column === this.labels)) {
+      if (domain === "node" && (isStoredId(meta) || column === this.idSpace || column === this.labels || column === this.originalId)) {
         continue;
       }
       if (domain === "edge" && (role === "id" || column === this.kind)) {
@@ -1657,6 +1677,19 @@ class ExportPlan {
     const value = idSpace.value(index);
     return typeof value === "string" ? value : String(value);
   }
+  /**
+   * The `:ID` / `:START_ID` / `:END_ID` text of a node: its originalId value when it has an id
+   * space (the importer stored it as `Space:id`), its id otherwise.
+   * @param index - the node index
+   * @returns the id text
+   */
+  idTextOf(index) {
+    const { originalId } = this;
+    if (originalId !== null && originalId.isSet(index) && this.spaceOf(index) !== null) {
+      return textOf(originalId, index);
+    }
+    return idText(this.snapshot.ids.idOf(index));
+  }
   /**
    * The stored-id column of a node: the first one set in declaration order.
    * @param index - the node index
@@ -1694,7 +1727,6 @@ class ExportPlan {
    */
   *nodeLines() {
     const { snapshot, labels, nodeColumns } = this;
-    const { ids } = snapshot;
     const { delimiter } = this.options.syntax;
     const propertyHeaders = nodeColumns.map((plan2) => plan2.header).join(delimiter);
     let sections = 0;
@@ -1720,7 +1752,7 @@ class ExportPlan {
 `;
       }
       cells.length = 0;
-      cells.push(this.cell(idText(ids.idOf(i))));
+      cells.push(this.cell(this.idTextOf(i)));
       if (labels !== null) {
         cells.push(this.cell(this.labelsText(i)));
       }
@@ -1749,7 +1781,6 @@ class ExportPlan {
    */
   *relationshipLines() {
     const { snapshot, kind, weights, edgeColumns, folding } = this;
-    const { ids } = snapshot;
     const { delimiter } = this.options.syntax;
     const list = snapshot.edgeList();
     const propertyHeaders = edgeColumns.map((plan2) => plan2.header).join(delimiter);
@@ -1787,7 +1818,7 @@ class ExportPlan {
         yield headerOf(startSpace, endSpace);
       }
       cells.length = 0;
-      cells.push(this.cell(idText(ids.idOf(u))), this.cell(idText(ids.idOf(v))));
+      cells.push(this.cell(this.idTextOf(u)), this.cell(this.idTextOf(v)));
       if (kind !== null) {
         cells.push(this.cell(kind.isSet(e) ? textOf(kind, e) : null));
       }
@@ -1864,6 +1895,9 @@ class ExportPlan {
     return formatScalar(column.dtype === "json" ? column.values[row] : column.value(row), scalar, text);
   }
 }
+function isIdText(meta) {
+  return meta.role === null && meta.dtype === "string" && meta.origin !== null && meta.origin.format === NEO4J && meta.origin.id === ":ID" && meta.origin.type === null;
+}
 function isStoredId(meta) {
   return meta.role === null && meta.dtype === "string" && meta.origin !== null && meta.origin.format === NEO4J && meta.origin.type === ID_TYPE;
 }
@@ -2050,9 +2084,9 @@ const NEO4J_ISSUE = Object.freeze({
   MISSING_ENDPOINT: MISSING_ENDPOINT_CODE,
   /** A node id repeated in one id space (last write wins). */
   DUPLICATE_NODE: DUPLICATE_NODE_CODE,
-  /** A node id declared in two id spaces. */
+  /** A spaced node id `Space:id` that equals the text of an id declared without a space. */
   ID_SPACE_COLLISION: ID_SPACE_COLLISION_CODE,
-  /** A relationship endpoint whose id belongs to a node of another id space; the row is skipped. */
+  /** A spaced relationship endpoint `Space:id` that names a node declared without a space; the row is skipped. */
   ENDPOINT_SPACE: ENDPOINT_SPACE_CODE,
   /** Two id texts merged into one number under ids "number". */
   ID_MERGED: ID_MERGED_CODE,
@@ -2103,6 +2137,7 @@ export {
   NEO4J_CAPABILITIES,
   NEO4J_ISSUE,
   NEO4J_LOSS,
+  ORIGINAL_ID_COLUMN,
   TYPE_COLUMN,
   neo4jExporter,
   neo4jImporter