Merge pull request #55 from comake/update_database_mapping_functions

feat: Update entity handling for runtime verb parameters

.gitignore

@@ -9,3 +9,4 @@ rmlmapper-5.0.0-r362-all.jar
 tmp
 comake-skl-js-engine-*.tgz
 test/deploy/package-lock.json
+.env

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@comake/skl-js-engine",
-	"version": "0.25.0",
+	"version": "0.25.1",
 	"description": "Standard Knowledge Language Javascript Engine",
 	"keywords": [
 		"skl",

src/SklEngine.ts

@@ -53,7 +53,7 @@ import {
   getValueIfDefined,
   ensureArray,
 } from './util/Util';
-import { SKL, SHACL, RDFS, SKL_ENGINE, XSD, RDF } from './util/Vocabularies';
+import { SKL, SHACL, RDFS, SKL_ENGINE, XSD, RDF, SKLSO_PROPERTY, SKLSO_DATA_NAMESPACE } from './util/Vocabularies';
 import { GroupByOptions, GroupByResponse } from './storage/GroupOptionTypes';
 import { AxiosRequestConfig } from 'axios';
 
@@ -630,15 +630,49 @@ export class SKLEngine {
     return args;
   }
 
+
+
+  private replaceTypeAndId(entity: Record<string, any>): Record<string, any> {
+    if (typeof entity !== 'object') {
+      throw new Error('Entity is not an object');
+    }
+    const clonedEntity = structuredClone(entity);
+    if (clonedEntity[SKLSO_PROPERTY.type]) {
+        clonedEntity['@type'] = clonedEntity[SKLSO_PROPERTY.type];
+    }
+    if (clonedEntity[SKLSO_PROPERTY.identifier]) {
+        clonedEntity['@id'] = SKLSO_DATA_NAMESPACE + clonedEntity[SKLSO_PROPERTY.identifier];
+    }
+    return clonedEntity;
+  }
+
   private async updateEntityFromVerbArgs(args: Record<string, any>): Promise<void> {
-    await this.update(args.id ?? args.ids, args.attributes);
+    let ids = args.id ?? args.ids;
+    if (!Array.isArray(ids)) {
+      ids = [ids];
+    }
+    ids = ids.map((id: string) => `${SKLSO_DATA_NAMESPACE}${id}`);
+    await this.update(ids, args.attributes);
   }
 
   private async saveEntityOrEntitiesFromVerbArgs(args: Record<string, any>): Promise<OrArray<Entity>> {
+
+    if (args.entity && typeof args.entity === 'object') {
+        args.entity = this.replaceTypeAndId(args.entity);
+    }
+    if (args.entities && Array.isArray(args.entities)) {
+        args.entities = args.entities.map(this.replaceTypeAndId);
+    }
     return await this.save(args.entity ?? args.entities);
   }
 
   private async destroyEntityOrEntitiesFromVerbArgs(args: Record<string, any>): Promise<OrArray<Entity>> {
+    if (args.entity && typeof args.entity === 'object') {
+      args.entity = this.replaceTypeAndId(args.entity);
+    }
+    if (args.entities && Array.isArray(args.entities)) {
+      args.entities = args.entities.map(this.replaceTypeAndId);
+    }
     return await this.destroy(args.entity ?? args.entities);
   }
 

src/util/Vocabularies.ts

@@ -97,6 +97,14 @@ export const SKL = createNamespace(SKL_NAMESPACE, [
   'headers',
 ]);
 
+export const SKLSO_DATA_NAMESPACE = 'https://skl.so/d/';
+
+export const SKLSO_PROPERTY_NAMESPACE = 'https://skl.so/p/';
+export const SKLSO_PROPERTY = createNamespace(SKLSO_PROPERTY_NAMESPACE, [
+  'type',
+  'identifier',
+]);
+
 export const SKL_ENGINE_NAMESPACE = 'https://standardknowledge.com/ontologies/skl-engine/';
 export const SKL_ENGINE = createNamespace(SKL_ENGINE_NAMESPACE, [
   'update',