@semiont/graph 0.3.1 → 0.3.2

package/dist/index.d.ts

@@ -81,6 +81,7 @@ type ResourceDescriptor$3 = components['schemas']['ResourceDescriptor'];
 type Annotation$3 = components['schemas']['Annotation'];
 declare class Neo4jGraphDatabase implements GraphDatabase {
     private driver;
+    private neo4j;
     private connected;
     private logger?;
     private config;

package/dist/index.js

@@ -211,17 +211,17 @@ var NeptuneGraphDatabase = class {
     await this.discoverNeptuneEndpoint();
     try {
       await loadDependencies();
-      const traversal2 = gremlin.process.AnonymousTraversalSource.traversal;
-      const DriverRemoteConnection2 = gremlin.driver.DriverRemoteConnection;
+      const traversal = gremlin.process.AnonymousTraversalSource.traversal;
+      const DriverRemoteConnection = gremlin.driver.DriverRemoteConnection;
       const connectionUrl = `wss://${this.neptuneEndpoint}:${this.neptunePort}/gremlin`;
       this.logger?.info("Connecting to Neptune", { connectionUrl });
-      this.connection = new DriverRemoteConnection2(connectionUrl, {
+      this.connection = new DriverRemoteConnection(connectionUrl, {
         authenticator: null,
         // Neptune uses IAM authentication via task role
         rejectUnauthorized: true,
         traversalSource: "g"
       });
-      this.g = traversal2().withRemote(this.connection);
+      this.g = traversal().withRemote(this.connection);
       const count = await this.g.V().limit(1).count().next();
       this.logger?.info("Connected to Neptune", { vertexCountTest: count.value });
       this.connected = true;
@@ -301,9 +301,9 @@ var NeptuneGraphDatabase = class {
   }
   async listResources(filter) {
     try {
-      let traversal2 = this.g.V().hasLabel("Resource");
+      let traversal = this.g.V().hasLabel("Resource");
       if (filter.entityTypes && filter.entityTypes.length > 0) {
-        traversal2 = traversal2.filter(
+        traversal = traversal.filter(
           process2.statics.or(
             ...filter.entityTypes.map(
               (type) => process2.statics.has("entityTypes", TextP.containing(`"${type}"`))
@@ -312,13 +312,13 @@ var NeptuneGraphDatabase = class {
         );
       }
       if (filter.search) {
-        traversal2 = traversal2.has("name", TextP.containing(filter.search));
+        traversal = traversal.has("name", TextP.containing(filter.search));
       }
-      const totalResult = await traversal2.clone().count().next();
+      const totalResult = await traversal.clone().count().next();
       const total = totalResult.value || 0;
       const offset = filter.offset || 0;
       const limit = filter.limit || 20;
-      const results = await traversal2.order().by("created", order.desc).range(offset, offset + limit).elementMap().toList();
+      const results = await traversal.order().by("created", order.desc).range(offset, offset + limit).elementMap().toList();
       const resources = results.map(vertexToResource);
       return { resources, total };
     } catch (error) {
@@ -391,17 +391,17 @@ var NeptuneGraphDatabase = class {
   }
   async updateAnnotation(id, updates) {
     try {
-      let traversal2 = this.g.V().hasLabel("Annotation").has("id", id);
+      let traversal = this.g.V().hasLabel("Annotation").has("id", id);
       if (updates.target !== void 0 && typeof updates.target !== "string") {
         if (updates.target.selector !== void 0) {
-          traversal2 = traversal2.property("text", getExactText(updates.target.selector));
+          traversal = traversal.property("text", getExactText(updates.target.selector));
         }
       }
       if (updates.body !== void 0) {
         const bodySource = getBodySource(updates.body);
         const entityTypes2 = getEntityTypes({ body: updates.body });
         if (bodySource) {
-          traversal2 = traversal2.property("source", bodySource);
+          traversal = traversal.property("source", bodySource);
         }
         if (entityTypes2.length >= 0) {
           await this.g.V().hasLabel("Annotation").has("id", id).outE("TAGGED_AS").drop().iterate();
@@ -415,12 +415,12 @@ var NeptuneGraphDatabase = class {
         }
       }
       if (updates.modified !== void 0) {
-        traversal2 = traversal2.property("modified", updates.modified);
+        traversal = traversal.property("modified", updates.modified);
       }
       if (updates.generator !== void 0) {
-        traversal2 = traversal2.property("generator", JSON.stringify(updates.generator));
+        traversal = traversal.property("generator", JSON.stringify(updates.generator));
       }
-      const result = await traversal2.elementMap().next();
+      const result = await traversal.elementMap().next();
       if (!result.value) {
         throw new Error("Annotation not found");
       }
@@ -443,15 +443,15 @@ var NeptuneGraphDatabase = class {
   }
   async listAnnotations(filter) {
     try {
-      let traversal2 = this.g.V().hasLabel("Annotation");
+      let traversal = this.g.V().hasLabel("Annotation");
       if (filter.resourceId) {
-        traversal2 = traversal2.has("resourceId", filter.resourceId);
+        traversal = traversal.has("resourceId", filter.resourceId);
       }
       if (filter.type) {
         const w3cType = filter.type === "highlight" ? "TextualBody" : "SpecificResource";
-        traversal2 = traversal2.has("type", w3cType);
+        traversal = traversal.has("type", w3cType);
       }
-      const results = await traversal2.elementMap().toList();
+      const results = await traversal.elementMap().toList();
       const annotations = await this.fetchAnnotationsWithEntityTypes(results);
       return { annotations, total: annotations.length };
     } catch (error) {
@@ -472,8 +472,8 @@ var NeptuneGraphDatabase = class {
     try {
       const targetDocResult = await this.g.V().hasLabel("Resource").has("id", source).elementMap().next();
       const targetDoc = targetDocResult.value ? vertexToResource(targetDocResult.value) : null;
-      const traversal2 = this.g.V().hasLabel("Annotation").has("id", annotationId).property("source", source).property("resolvedResourceName", targetDoc?.name).property("resolvedAt", (/* @__PURE__ */ new Date()).toISOString());
-      const result = await traversal2.elementMap().next();
+      const traversal = this.g.V().hasLabel("Annotation").has("id", annotationId).property("source", source).property("resolvedResourceName", targetDoc?.name).property("resolvedAt", (/* @__PURE__ */ new Date()).toISOString());
+      const result = await traversal.elementMap().next();
       if (!result.value) {
         throw new Error("Annotation not found");
       }
@@ -498,9 +498,9 @@ var NeptuneGraphDatabase = class {
   }
   async getEntityReferences(resourceId, entityTypes) {
     try {
-      let traversal2 = this.g.V().hasLabel("Annotation").has("resourceId", resourceId).has("resolvedResourceId").has("entityTypes");
+      let traversal = this.g.V().hasLabel("Annotation").has("resourceId", resourceId).has("resolvedResourceId").has("entityTypes");
       if (entityTypes && entityTypes.length > 0) {
-        traversal2 = traversal2.filter(
+        traversal = traversal.filter(
           process2.statics.or(
             ...entityTypes.map(
               (type) => process2.statics.has("entityTypes", TextP.containing(`"${type}"`))
@@ -508,7 +508,7 @@ var NeptuneGraphDatabase = class {
           )
         );
       }
-      const results = await traversal2.elementMap().toList();
+      const results = await traversal.elementMap().toList();
       return await this.fetchAnnotationsWithEntityTypes(results);
     } catch (error) {
       this.logger?.error("Failed to get entity references from Neptune", { error });
@@ -771,7 +771,6 @@ var NeptuneGraphDatabase = class {
 };
 
 // src/implementations/neo4j.ts
-import neo4j from "neo4j-driver";
 import { v4 as uuidv42 } from "uuid";
 import {
   getExactText as getExactText2,
@@ -786,6 +785,7 @@ function motivationToLabel(motivation) {
 }
 var Neo4jGraphDatabase = class {
   driver = null;
+  neo4j;
   connected = false;
   logger;
   config;
@@ -814,9 +814,10 @@ var Neo4jGraphDatabase = class {
         throw new Error("Neo4j database not configured! Pass database in config.");
       }
       this.logger?.info("Connecting to Neo4j", { uri });
-      this.driver = neo4j.driver(
+      this.neo4j = await import("neo4j-driver");
+      this.driver = this.neo4j.driver(
         uri,
-        neo4j.auth.basic(username, password),
+        this.neo4j.auth.basic(username, password),
         {
           maxConnectionPoolSize: 50,
           connectionAcquisitionTimeout: 6e4
@@ -1000,8 +1001,8 @@ var Neo4jGraphDatabase = class {
         params
       );
       const total = countResult.records[0].get("total").toNumber();
-      params.skip = neo4j.int(filter.offset || 0);
-      params.limit = neo4j.int(filter.limit || 20);
+      params.skip = this.neo4j.int(filter.offset || 0);
+      params.limit = this.neo4j.int(filter.limit || 20);
       const result = await session.run(
         `MATCH (d:Resource) ${whereClause}
          RETURN d
@@ -1024,7 +1025,7 @@ var Neo4jGraphDatabase = class {
          RETURN d
          ORDER BY d.updatedAt DESC
          LIMIT $limit`,
-        { query, limit: neo4j.int(limit) }
+        { query, limit: this.neo4j.int(limit) }
       );
       return result.records.map((record) => this.parseResourceNode(record.get("d")));
     } finally {
@@ -1775,7 +1776,6 @@ var Neo4jGraphDatabase = class {
 };
 
 // src/implementations/janusgraph.ts
-import gremlin2 from "gremlin";
 import { resourceId as makeResourceId } from "@semiont/core";
 import {
   getBodySource as getBodySource3,
@@ -1785,8 +1785,6 @@ import {
 } from "@semiont/api-client";
 import { getEntityTypes as getEntityTypes3 } from "@semiont/ontology";
 import { v4 as uuidv43 } from "uuid";
-var traversal = gremlin2.process.AnonymousTraversalSource.traversal;
-var DriverRemoteConnection = gremlin2.driver.DriverRemoteConnection;
 var JanusGraphDatabase = class {
   constructor(graphConfig) {
     this.graphConfig = graphConfig;
@@ -1808,6 +1806,9 @@ var JanusGraphDatabase = class {
       throw new Error("JanusGraph port is required: provide in config");
     }
     this.logger?.info("Connecting to JanusGraph", { host, port });
+    const gremlin2 = await import("gremlin");
+    const DriverRemoteConnection = gremlin2.driver.DriverRemoteConnection;
+    const traversal = gremlin2.process.AnonymousTraversalSource.traversal;
     this.connection = new DriverRemoteConnection(
       `ws://${host}:${port}/gremlin`,
       {}
@@ -1976,7 +1977,8 @@ var JanusGraphDatabase = class {
   async listResources(filter) {
     let traversalQuery = this.g.V().hasLabel("Resource");
     if (filter.search) {
-      traversalQuery = traversalQuery.has("name", gremlin2.process.TextP.containing(filter.search));
+      const { process: gremlinProcess } = await import("gremlin");
+      traversalQuery = traversalQuery.has("name", gremlinProcess.TextP.containing(filter.search));
     }
     const docs = await traversalQuery.toList();
     let resources = docs.map((v) => this.vertexToResource(v));