@trustgraph/react-state 1.2.1 → 1.3.0

package/dist/index.cjs

@@ -697,36 +697,36 @@ const createDocId = () => {
 const prepareMetadata = (doc_id, params) => {
     let doc_meta = [
         {
-            s: { v: doc_id, e: true },
-            p: { v: RDF_TYPE, e: true },
-            o: { v: DIGITAL_DOCUMENT, e: true },
+            s: { t: "i", i: doc_id },
+            p: { t: "i", i: RDF_TYPE },
+            o: { t: "i", i: DIGITAL_DOCUMENT },
         },
     ];
     if (params.title != "")
         doc_meta = [
             ...doc_meta,
             {
-                s: { v: doc_id, e: true },
-                p: { v: RDFS_LABEL$1, e: true },
-                o: { v: params.title, e: false },
+                s: { t: "i", i: doc_id },
+                p: { t: "i", i: RDFS_LABEL$1 },
+                o: { t: "l", v: params.title ?? "" },
             },
         ];
     if (params.url != "")
         doc_meta = [
             ...doc_meta,
             {
-                s: { v: doc_id, e: true },
-                p: { v: SCHEMA_URL, e: true },
-                o: { v: params.url, e: true },
+                s: { t: "i", i: doc_id },
+                p: { t: "i", i: SCHEMA_URL },
+                o: { t: "i", i: params.url ?? "" },
             },
         ];
-    for (const keyword of params.keywords)
+    for (const keyword of params.keywords ?? [])
         doc_meta = [
             ...doc_meta,
             {
-                s: { v: doc_id, e: true },
-                p: { v: SCHEMA_KEYWORDS, e: true },
-                o: { v: keyword, e: false },
+                s: { t: "i", i: doc_id },
+                p: { t: "i", i: SCHEMA_KEYWORDS },
+                o: { t: "l", v: keyword },
             },
         ];
     return doc_meta;
@@ -970,6 +970,18 @@ const useTriples = ({ flow, s, p, o, limit, collection }) => {
     };
 };
 
+// Helper to get the string value from a Term (IRI or Literal)
+const getTermValue$2 = (term) => {
+    if (term.t === "i")
+        return term.i;
+    if (term.t === "l")
+        return term.v;
+    if (term.t === "b")
+        return term.d;
+    return "";
+};
+// Helper to check if a Term is an IRI
+const isIri$2 = (term) => term.t === "i";
 const RDFS_LABEL = "http://www.w3.org/2000/01/rdf-schema#label";
 const SKOS_DEFINITION = "http://www.w3.org/2004/02/skos/core#definition";
 const SCHEMAORG_SUBJECT_OF = "https://schema.org/subjectOf";
@@ -1001,7 +1013,7 @@ const queryS = (socket, uri, add, remove, limit, collection) => {
     const act = "Query S: " + uri;
     add(act);
     return socket
-        .triplesQuery({ v: uri, e: true }, undefined, undefined, limit ? limit : LIMIT, collection)
+        .triplesQuery({ t: "i", i: uri }, undefined, undefined, limit ? limit : LIMIT, collection)
         .then((x) => {
         remove(act);
         return x;
@@ -1016,7 +1028,7 @@ const queryP = (socket, uri, add, remove, limit, collection) => {
     const act = "Query P: " + uri;
     add(act);
     return socket
-        .triplesQuery(undefined, { v: uri, e: true }, undefined, limit ? limit : LIMIT, collection)
+        .triplesQuery(undefined, { t: "i", i: uri }, undefined, limit ? limit : LIMIT, collection)
         .then((x) => {
         remove(act);
         return x;
@@ -1031,7 +1043,7 @@ const queryO = (socket, uri, add, remove, limit, collection) => {
     const act = "Query O: " + uri;
     add(act);
     return socket
-        .triplesQuery(undefined, undefined, { v: uri, e: true }, limit ? limit : LIMIT, collection)
+        .triplesQuery(undefined, undefined, { t: "i", i: uri }, limit ? limit : LIMIT, collection)
         .then((x) => {
         remove(act);
         return x;
@@ -1073,12 +1085,12 @@ const queryLabel = (socket, uri, add, remove, collection) => {
     add(act);
     // Search tthe graph for the URI->label relationship
     return socket
-        .triplesQuery({ v: uri, e: true }, { v: RDFS_LABEL, e: true }, undefined, 1, collection)
+        .triplesQuery({ t: "i", i: uri }, { t: "i", i: RDFS_LABEL }, undefined, 1, collection)
         .then((triples) => {
         // If got a result, return the label, otherwise the URI
         // can be its own label
         if (triples.length > 0)
-            return triples[0].o.v;
+            return getTermValue$2(triples[0].o);
         else
             return uri;
     })
@@ -1095,7 +1107,7 @@ const queryLabel = (socket, uri, add, remove, collection) => {
 // Returns a promise
 const labelS = (socket, triples, add, remove, collection) => {
     return Promise.all(triples.map((t) => {
-        return queryLabel(socket, t.s.v, add, remove, collection).then((label) => {
+        return queryLabel(socket, getTermValue$2(t.s), add, remove, collection).then((label) => {
             return {
                 ...t,
                 s: {
@@ -1110,7 +1122,7 @@ const labelS = (socket, triples, add, remove, collection) => {
 // Returns a promise
 const labelP = (socket, triples, add, remove, collection) => {
     return Promise.all(triples.map((t) => {
-        return queryLabel(socket, t.p.v, add, remove, collection).then((label) => {
+        return queryLabel(socket, getTermValue$2(t.p), add, remove, collection).then((label) => {
             return {
                 ...t,
                 p: {
@@ -1125,10 +1137,10 @@ const labelP = (socket, triples, add, remove, collection) => {
 // Returns a promise
 const labelO = (socket, triples, add, remove, collection) => {
     return Promise.all(triples.map((t) => {
-        // If the 'o' element is a entity, do a label lookup, else
+        // If the 'o' element is an IRI, do a label lookup, else
         // just use the literal value for its label
-        if (t.o.e)
-            return queryLabel(socket, t.o.v, add, remove, collection).then((label) => {
+        if (isIri$2(t.o))
+            return queryLabel(socket, t.o.i, add, remove, collection).then((label) => {
                 return {
                     ...t,
                     o: {
@@ -1143,7 +1155,7 @@ const labelO = (socket, triples, add, remove, collection) => {
                     ...t,
                     o: {
                         ...t.o,
-                        label: t.o.v,
+                        label: getTermValue$2(t.o),
                     },
                 });
             });
@@ -1151,7 +1163,7 @@ const labelO = (socket, triples, add, remove, collection) => {
 };
 // Filter out 'structural' edges nobody needs to see
 const filterInternals = (triples) => triples.filter((t) => {
-    if (t.p.e && t.p.v == RDFS_LABEL)
+    if (isIri$2(t.p) && t.p.i == RDFS_LABEL)
         return false;
     return true;
 });
@@ -1178,6 +1190,18 @@ const getTriples = (socket, uri, add, remove, limit, collection) => {
 
 // Functionality here helps construct subgraphs for react-force-graph
 // visualisation
+// Helper to get the string value from a Term (IRI or Literal)
+const getTermValue$1 = (term) => {
+    if (term.t === "i")
+        return term.i;
+    if (term.t === "l")
+        return term.v;
+    if (term.t === "b")
+        return term.d;
+    return "";
+};
+// Helper to check if a Term is an IRI
+const isIri$1 = (term) => term.t === "i";
 const createSubgraph = () => {
     return {
         nodes: [],
@@ -1191,19 +1215,20 @@ const updateSubgraphTriples = (sg, triples) => {
     for (const t of triples) {
         // Skip triples where the object is a literal (property edges)
         // These are now shown in the node details drawer instead
-        if (!t.o.e) {
+        if (!isIri$1(t.o)) {
             continue;
         }
         // Source has a URI, that can be its unique ID
-        const sourceId = t.s.v;
+        const sourceId = getTermValue$1(t.s);
         // Target is always an entity now (we filtered out literals above)
-        const targetId = t.o.v;
+        const targetId = getTermValue$1(t.o);
         // Links have an ID so that this edge is unique
-        const linkId = t.s.v + "@@" + t.p.v + "@@" + t.o.v;
+        const linkId = getTermValue$1(t.s) + "@@" + getTermValue$1(t.p) + "@@" + getTermValue$1(t.o);
         if (!nodeIds.has(sourceId)) {
+            const sLabeled = t.s;
             const n = {
                 id: sourceId,
-                label: t.s.label ? t.s.label : "unknown",
+                label: sLabeled.label ? sLabeled.label : "unknown",
                 group: groupId,
             };
             nodeIds.add(sourceId);
@@ -1213,9 +1238,10 @@ const updateSubgraphTriples = (sg, triples) => {
             };
         }
         if (!nodeIds.has(targetId)) {
+            const oLabeled = t.o;
             const n = {
                 id: targetId,
-                label: t.o.label ? t.o.label : "unknown",
+                label: oLabeled.label ? oLabeled.label : "unknown",
                 group: groupId,
             };
             nodeIds.add(targetId);
@@ -1225,11 +1251,12 @@ const updateSubgraphTriples = (sg, triples) => {
             };
         }
         if (!linkIds.has(linkId)) {
+            const pLabeled = t.p;
             const l = {
                 source: sourceId,
                 target: targetId,
                 id: linkId,
-                label: t.p.label ? t.p.label : "unknown",
+                label: pLabeled.label ? pLabeled.label : "unknown",
                 value: 1,
             };
             linkIds.add(linkId);
@@ -1254,14 +1281,14 @@ const updateSubgraphByRelationship = (socket, selectedNodeId, relationshipUri, d
     add(activityName);
     // Build the query based on direction
     const queryPromise = direction === "outgoing"
-        ? socket.triplesQuery({ v: selectedNodeId, e: true }, // s = selectedNode
-        { v: relationshipUri, e: true }, // p = relationship
+        ? socket.triplesQuery({ t: "i", i: selectedNodeId }, // s = selectedNode
+        { t: "i", i: relationshipUri }, // p = relationship
         undefined, // o = ??? (what we want to find)
         20, // Limit results
         collection)
         : socket.triplesQuery(undefined, // s = ??? (what we want to find)
-        { v: relationshipUri, e: true }, // p = relationship
-        { v: selectedNodeId, e: true }, // o = selectedNode
+        { t: "i", i: relationshipUri }, // p = relationship
+        { t: "i", i: selectedNodeId }, // o = selectedNode
         20, // Limit results
         collection);
     return queryPromise
@@ -1434,8 +1461,10 @@ const getGraphEmbeddings = (socket, add, remove, limit, collection) => {
             .graphEmbeddingsQuery(vecs, limit , collection)
             .then((ents) => {
             remove(act);
-            return ents.map((ent) => {
-                return { uri: ent.v, target: vecs[0] };
+            return ents
+                .filter((ent) => ent.t === "i")
+                .map((ent) => {
+                return { uri: ent.i, target: vecs[0] };
             });
         })
             .catch((err) => {
@@ -1450,7 +1479,7 @@ const addRowLabels = (socket, add, remove, collection) => (entities) => {
         const act = "Label " + ent.uri;
         add(act);
         return socket
-            .triplesQuery({ v: ent.uri, e: true }, { v: RDFS_LABEL, e: true }, undefined, 1, collection)
+            .triplesQuery({ t: "i", i: ent.uri }, { t: "i", i: RDFS_LABEL }, undefined, 1, collection)
             .then((t) => {
             if (t.length < 1) {
                 remove(act);
@@ -1462,9 +1491,10 @@ const addRowLabels = (socket, add, remove, collection) => (entities) => {
             }
             else {
                 remove(act);
+                const obj = t[0].o;
                 return {
                     uri: ent.uri,
-                    label: t[0].o.v,
+                    label: obj.v,
                     target: ent.target,
                 };
             }
@@ -1483,7 +1513,7 @@ const addRowDefinitions = (socket, add, remove, collection) =>
         const act = "Description " + ent.uri;
         add(act);
         return socket
-            .triplesQuery({ v: ent.uri, e: true }, { v: SKOS_DEFINITION, e: true }, undefined, 1, collection)
+            .triplesQuery({ t: "i", i: ent.uri }, { t: "i", i: SKOS_DEFINITION }, undefined, 1, collection)
             .then((t) => {
             if (t.length < 1) {
                 remove(act);
@@ -1491,9 +1521,10 @@ const addRowDefinitions = (socket, add, remove, collection) =>
             }
             else {
                 remove(act);
+                const obj = t[0].o;
                 return {
                     ...ent,
-                    description: t[0].o.v,
+                    description: obj.v,
                 };
             }
         })
@@ -1869,12 +1900,12 @@ const useChatSession = () => {
             addActivity(embActivity);
             // Get labels for each entity
             const labelPromises = result.entities.map(async (entity) => {
-                const labelActivity = "Label " + entity.v;
+                const labelActivity = "Label " + getTermValue$2(entity);
                 addActivity(labelActivity);
                 try {
                     const triples = await socket
                         .flow(flowId)
-                        .triplesQuery(entity, { v: RDFS_LABEL, e: true }, undefined, 1, settings.collection);
+                        .triplesQuery(entity, { t: "i", i: RDFS_LABEL }, undefined, 1, settings.collection);
                     removeActivity(labelActivity);
                     return triples;
                 }
@@ -1888,8 +1919,8 @@ const useChatSession = () => {
             const entityList = labelResponses
                 .filter((resp) => resp && resp.length > 0)
                 .map((resp) => ({
-                label: resp[0].o.v,
-                uri: resp[0].s.v,
+                label: getTermValue$2(resp[0].o),
+                uri: getTermValue$2(resp[0].s),
             }));
             setEntities(entityList);
             removeActivity(embActivity);
@@ -3359,12 +3390,12 @@ const useKnowledgeCores = () => {
     });
     /**
      * Mutation for loading multiple knowledge cores
-     * Executes parallel load requests with specified flow
+     * Executes parallel load requests with specified flow and collection
      */
     const loadKnowledgeCoresMutation = reactQuery.useMutation({
-        mutationFn: ({ ids, flow, onSuccess }) => {
+        mutationFn: ({ ids, flow, collection, onSuccess }) => {
             // Execute load requests in parallel for all knowledge cores
-            return Promise.all(ids.map((id) => socket.knowledge().loadKgCore(id, flow))).then(() => {
+            return Promise.all(ids.map((id) => socket.knowledge().loadKgCore(id, flow, collection))).then(() => {
                 // Execute success callback if provided
                 if (onSuccess)
                     onSuccess();
@@ -4080,6 +4111,18 @@ const useParameterValidation = (parameterDefinitions, parameterMapping, paramete
     ]);
 };
 
+// Helper to get the string value from a Term (IRI or Literal)
+const getTermValue = (term) => {
+    if (term.t === "i")
+        return term.i;
+    if (term.t === "l")
+        return term.v;
+    if (term.t === "b")
+        return term.d;
+    return "";
+};
+// Helper to check if a Term is an IRI
+const isIri = (term) => term.t === "i";
 /**
  * Standard URI to label mappings
  * These common URIs are mapped directly without knowledge graph queries
@@ -4130,10 +4173,10 @@ const useNodeDetails = (nodeId, flowId) => {
             if (!nodeId) {
                 throw new Error("Node ID is required");
             }
-            const subjectValue = { v: nodeId, e: true };
+            const subjectTerm = { t: "i", i: nodeId };
             return socket
                 .flow(flowId)
-                .triplesQuery(subjectValue, undefined, undefined, 20, settings.collection)
+                .triplesQuery(subjectTerm, undefined, undefined, 20, settings.collection)
                 .then((triples) => {
                 if (!Array.isArray(triples)) {
                     console.error("Expected triples array, got:", triples);
@@ -4159,10 +4202,10 @@ const useNodeDetails = (nodeId, flowId) => {
             if (!nodeId) {
                 throw new Error("Node ID is required");
             }
-            const objectValue = { v: nodeId, e: true };
+            const objectTerm = { t: "i", i: nodeId };
             return socket
                 .flow(flowId)
-                .triplesQuery(undefined, undefined, objectValue, 20, settings.collection)
+                .triplesQuery(undefined, undefined, objectTerm, 20, settings.collection)
                 .then((triples) => {
                 if (!Array.isArray(triples)) {
                     console.error("Expected triples array, got:", triples);
@@ -4188,17 +4231,17 @@ const useNodeDetails = (nodeId, flowId) => {
             if (!nodeId) {
                 throw new Error("Node ID is required");
             }
-            const subjectValue = { v: nodeId, e: true };
+            const subjectTerm = { t: "i", i: nodeId };
             return socket
                 .flow(flowId)
-                .triplesQuery(subjectValue, undefined, undefined, 50, settings.collection) // More limit for properties
+                .triplesQuery(subjectTerm, undefined, undefined, 50, settings.collection) // More limit for properties
                 .then((triples) => {
                 if (!Array.isArray(triples)) {
                     console.error("Expected triples array, got:", triples);
                     throw new Error("Invalid triples response");
                 }
-                // Filter for properties (where o.e === false)
-                return triples.filter((triple) => triple.o && triple.o.e === false);
+                // Filter for properties (where o is not an IRI, i.e., literals)
+                return triples.filter((triple) => triple.o && !isIri(triple.o));
             })
                 .catch((err) => {
                 console.error("Error fetching properties:", err);
@@ -4218,9 +4261,9 @@ const useNodeDetails = (nodeId, flowId) => {
         // Filter for entity relationships and extract unique predicates
         const uniqueRelationships = new Set();
         outboundTriplesQuery.data.forEach((triple) => {
-            // Check if object is an entity (o.e === true)
-            if (triple.o && triple.o.e === true && triple.p && triple.p.v) {
-                uniqueRelationships.add(triple.p.v);
+            // Check if object is an IRI (entity)
+            if (triple.o && isIri(triple.o) && triple.p && isIri(triple.p)) {
+                uniqueRelationships.add(triple.p.i);
             }
         });
         // Convert Set to array
@@ -4236,9 +4279,9 @@ const useNodeDetails = (nodeId, flowId) => {
         // Filter for entity relationships and extract unique predicates
         const uniqueRelationships = new Set();
         inboundTriplesQuery.data.forEach((triple) => {
-            // Check if subject is an entity (s.e === true)
-            if (triple.s && triple.s.e === true && triple.p && triple.p.v) {
-                uniqueRelationships.add(triple.p.v);
+            // Check if subject is an IRI (entity)
+            if (triple.s && isIri(triple.s) && triple.p && isIri(triple.p)) {
+                uniqueRelationships.add(triple.p.i);
             }
         });
         // Convert Set to array
@@ -4254,8 +4297,8 @@ const useNodeDetails = (nodeId, flowId) => {
         // Extract unique property predicates
         const uniqueProperties = new Set();
         propertiesQuery.data.forEach((triple) => {
-            if (triple.p && triple.p.v) {
-                uniqueProperties.add(triple.p.v);
+            if (triple.p && isIri(triple.p)) {
+                uniqueProperties.add(triple.p.i);
             }
         });
         // Convert Set to array
@@ -4284,14 +4327,14 @@ const useNodeDetails = (nodeId, flowId) => {
                 }
                 // If not in standard mappings, query the knowledge graph
                 try {
-                    const subjectValue = { v: relationshipURI, e: true };
-                    const predicateValue = { v: RDFS_LABEL, e: true };
+                    const subjectTerm = { t: "i", i: relationshipURI };
+                    const predicateTerm = { t: "i", i: RDFS_LABEL };
                     const labelTriples = await socket
                         .flow(flowId)
-                        .triplesQuery(subjectValue, predicateValue, undefined, 1, settings.collection);
+                        .triplesQuery(subjectTerm, predicateTerm, undefined, 1, settings.collection);
                     // Extract label from the first result, or use URI as fallback
                     if (labelTriples && labelTriples.length > 0 && labelTriples[0].o) {
-                        labelMap[relationshipURI] = labelTriples[0].o.v;
+                        labelMap[relationshipURI] = getTermValue(labelTriples[0].o);
                     }
                     else {
                         labelMap[relationshipURI] = relationshipURI;
@@ -4329,14 +4372,14 @@ const useNodeDetails = (nodeId, flowId) => {
                 }
                 // If not in standard mappings, query the knowledge graph
                 try {
-                    const subjectValue = { v: relationshipURI, e: true };
-                    const predicateValue = { v: RDFS_LABEL, e: true };
+                    const subjectTerm = { t: "i", i: relationshipURI };
+                    const predicateTerm = { t: "i", i: RDFS_LABEL };
                     const labelTriples = await socket
                         .flow(flowId)
-                        .triplesQuery(subjectValue, predicateValue, undefined, 1, settings.collection);
+                        .triplesQuery(subjectTerm, predicateTerm, undefined, 1, settings.collection);
                     // Extract label from the first result, or use URI as fallback
                     if (labelTriples && labelTriples.length > 0 && labelTriples[0].o) {
-                        labelMap[relationshipURI] = labelTriples[0].o.v;
+                        labelMap[relationshipURI] = getTermValue(labelTriples[0].o);
                     }
                     else {
                         labelMap[relationshipURI] = relationshipURI;
@@ -4374,14 +4417,14 @@ const useNodeDetails = (nodeId, flowId) => {
                 }
                 // If not in standard mappings, query the knowledge graph
                 try {
-                    const subjectValue = { v: propertyURI, e: true };
-                    const predicateValue = { v: RDFS_LABEL, e: true };
+                    const subjectTerm = { t: "i", i: propertyURI };
+                    const predicateTerm = { t: "i", i: RDFS_LABEL };
                     const labelTriples = await socket
                         .flow(flowId)
-                        .triplesQuery(subjectValue, predicateValue, undefined, 1, settings.collection);
+                        .triplesQuery(subjectTerm, predicateTerm, undefined, 1, settings.collection);
                     // Extract label from the first result, or use URI as fallback
                     if (labelTriples && labelTriples.length > 0 && labelTriples[0].o) {
-                        labelMap[propertyURI] = labelTriples[0].o.v;
+                        labelMap[propertyURI] = getTermValue(labelTriples[0].o);
                     }
                     else {
                         labelMap[propertyURI] = propertyURI;
@@ -4428,15 +4471,20 @@ const useNodeDetails = (nodeId, flowId) => {
         return propertiesQuery.data
             .filter((triple) => {
             // Exclude label properties (RDFS_LABEL) since node label is already shown
-            return triple.p?.v !== RDFS_LABEL;
+            const pUri = triple.p && isIri(triple.p) ? triple.p.i : "";
+            return pUri !== RDFS_LABEL;
         })
-            .map((triple) => ({
-            predicate: {
-                uri: triple.p?.v || "",
-                label: propertyLabelsQuery.data?.[triple.p?.v || ""] || triple.p?.v || "",
-            },
-            value: triple.o?.v || "",
-        }));
+            .map((triple) => {
+            const pUri = triple.p && isIri(triple.p) ? triple.p.i : "";
+            const oValue = triple.o ? getTermValue(triple.o) : "";
+            return {
+                predicate: {
+                    uri: pUri,
+                    label: propertyLabelsQuery.data?.[pUri] || pUri,
+                },
+                value: oValue,
+            };
+        });
     }, [propertiesQuery.data, propertyLabelsQuery.data]);
     // Show loading indicators for long-running operations
     useActivity(outboundTriplesQuery.isLoading ||
@@ -4543,6 +4591,7 @@ exports.SETTINGS_STORAGE_KEY = SETTINGS_STORAGE_KEY;
 exports.createDocId = createDocId;
 exports.fileToBase64 = fileToBase64;
 exports.generateFlowBlueprintId = generateFlowBlueprintId;
+exports.getTermValue = getTermValue$2;
 exports.getTriples = getTriples;
 exports.prepareMetadata = prepareMetadata;
 exports.textToBase64 = textToBase64;