@nesso-how/schema 0.1.0-alpha.39 → 0.1.0-alpha.40

package/dist/index.js

@@ -15,8 +15,8 @@ export function serialize(doc) {
         ...(meta !== undefined && { meta }),
     }, null, 2);
 }
-function asRecord(value) {
-    return typeof value === 'object' && value !== null ? value : null;
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
 }
 /**
  * Parse and structurally validate a graph document. Files are user-editable (and
@@ -26,41 +26,74 @@ function asRecord(value) {
  */
 export function deserialize(json) {
     const data = JSON.parse(json);
-    const root = asRecord(data);
-    if (!root || !Array.isArray(root.concepts) || !Array.isArray(root.relations)) {
+    if (!isRecord(data) || !Array.isArray(data.concepts) || !Array.isArray(data.relations)) {
         throw new Error('Invalid Nesso graph document: missing concepts or relations array');
     }
-    if (typeof root.version === 'number' && root.version !== GRAPH_FORMAT_VERSION) {
-        throw new Error(`Unsupported Nesso graph document version: ${root.version}`);
+    if (typeof data.version === 'number' && data.version !== GRAPH_FORMAT_VERSION) {
+        throw new Error(`Unsupported Nesso graph document version: ${data.version}`);
     }
-    const concepts = root.concepts.map((value, i) => {
-        const concept = asRecord(value);
-        if (!concept ||
-            typeof concept.id !== 'string' ||
-            concept.id === '' ||
-            typeof concept.label !== 'string' ||
-            typeof concept.x !== 'number' ||
-            !Number.isFinite(concept.x) ||
-            typeof concept.y !== 'number' ||
-            !Number.isFinite(concept.y)) {
+    const rawConcepts = data.concepts;
+    const concepts = rawConcepts.map((value, i) => {
+        if (!isRecord(value) ||
+            typeof value.id !== 'string' ||
+            value.id === '' ||
+            typeof value.label !== 'string' ||
+            typeof value.x !== 'number' ||
+            !Number.isFinite(value.x) ||
+            typeof value.y !== 'number' ||
+            !Number.isFinite(value.y)) {
             throw new Error(`Invalid Nesso graph document: concept ${i} is missing a valid id, label, or position`);
         }
-        return concept;
+        const conceptData = value.data;
+        return {
+            id: value.id,
+            label: value.label,
+            x: value.x,
+            y: value.y,
+            ...(conceptData !== undefined && { data: conceptData }),
+        };
     });
-    const relations = root.relations.map((value, i) => {
-        const relation = asRecord(value);
-        if (!relation ||
-            typeof relation.id !== 'string' ||
-            typeof relation.source !== 'string' ||
-            typeof relation.target !== 'string') {
+    const rawRelations = data.relations;
+    const relations = rawRelations.map((value, i) => {
+        if (!isRecord(value) ||
+            typeof value.id !== 'string' ||
+            typeof value.source !== 'string' ||
+            typeof value.target !== 'string') {
             throw new Error(`Invalid Nesso graph document: relation ${i} is missing id, source or target`);
         }
-        return relation;
+        const relationType = typeof value.type === 'string' ? value.type : undefined;
+        const relationData = value.data;
+        return {
+            id: value.id,
+            source: value.source,
+            target: value.target,
+            ...(relationType !== undefined && { type: relationType }),
+            ...(relationData !== undefined && { data: relationData }),
+        };
     });
+    const name = typeof data.name === 'string' ? data.name : '';
+    const docId = typeof data.id === 'string' ? data.id : undefined;
+    const updatedAt = typeof data.updatedAt === 'number' ? data.updatedAt : undefined;
+    let vocabulary;
+    const vocabValue = data.vocabulary;
+    if (isRecord(vocabValue) &&
+        typeof vocabValue.id === 'string' &&
+        typeof vocabValue.version === 'string') {
+        vocabulary = { id: vocabValue.id, version: vocabValue.version };
+    }
+    let meta;
+    const metaValue = data.meta;
+    if (metaValue !== undefined) {
+        meta = metaValue;
+    }
     return {
-        ...root,
         version: GRAPH_FORMAT_VERSION,
+        ...(vocabulary !== undefined && { vocabulary }),
+        ...(docId !== undefined && { id: docId }),
+        ...(updatedAt !== undefined && { updatedAt }),
+        name,
         concepts,
         relations,
+        ...(meta !== undefined && { meta }),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nesso-how/schema",
-  "version": "0.1.0-alpha.39",
+  "version": "0.1.0-alpha.40",
   "description": "Nesso knowledge graph document schema — JSON serialize/deserialize",
   "license": "MIT",
   "repository": {