small refactoring

ULB-Darmstadt · Jan 8, 2024 · 613dff6 · 613dff6
1 parent 0d11aaa
commit 613dff6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 29 deletions.
diff --git a/src/node.ts b/src/node.ts
@@ -6,7 +6,6 @@ import { createShaclGroup } from './group'
 import { v4 as uuidv4 } from 'uuid'
 import { createShaclOrConstraint } from './constraints'
 import { Config } from './config'
-import { findLabel } from './util'
 
 export class ShaclNode extends HTMLElement {
     shaclSubject: NamedNode

diff --git a/src/property.ts b/src/property.ts
@@ -6,7 +6,8 @@ import { SHAPES_GRAPH } from './constants'
 import { createShaclOrConstraint, resolveShaclOrConstraint } from './constraints'
 import { Config } from './config'
 import { ShaclPropertyTemplate } from './property-template'
-import { Editor, fieldFactory, toRDF } from './theme'
+import { Editor, fieldFactory } from './theme'
+import { toRDF } from './serialize'
 
 export class ShaclProperty extends HTMLElement {
     template: ShaclPropertyTemplate

diff --git a/src/serialize.ts b/src/serialize.ts
@@ -1,5 +1,6 @@
-import { Writer, Quad, Literal, Prefixes } from 'n3'
-import { PREFIX_XSD, RDF_PREDICATE_TYPE } from './constants'
+import { DataFactory, NamedNode, Writer, Quad, Literal, Prefixes } from 'n3'
+import { PREFIX_XSD, RDF_PREDICATE_TYPE, PREFIX_SHACL } from './constants'
+import { Editor } from './theme'
 import { NodeObject } from 'jsonld'
 
 export function serialize(quads: Quad[], format: string, prefixes?: Prefixes): string {
@@ -43,3 +44,26 @@ function serializeJsonld(quads: Quad[]): string {
     }
     return JSON.stringify(triples)
 }
+
+export function toRDF(editor: Editor): Literal | NamedNode | undefined {
+    let languageOrDatatype: NamedNode<string> | string | undefined = editor['shaclDatatype']
+    let value: number | string = editor.value
+    if (value) {
+        if (editor.dataset.class || editor.dataset.nodeKind === PREFIX_SHACL + 'IRI') {
+            return DataFactory.namedNode(value)
+        } else {
+            if (editor.dataset.lang) {
+                languageOrDatatype = editor.dataset.lang
+            }
+            else if (editor['type'] === 'number') {
+                value = parseFloat(value)
+            }
+            return DataFactory.literal(value, languageOrDatatype)
+        }
+    } else if (editor['type'] === 'checkbox' || editor.getAttribute('type') === 'checkbox') {
+        // emit boolean 'false' only when required
+        if (editor['checked'] || parseInt(editor.dataset.minCount || '0') > 0) {
+            return DataFactory.literal(editor['checked'] ? 'true' : 'false', languageOrDatatype)
+        }
+    }
+}
diff --git a/src/theme.ts b/src/theme.ts
@@ -1,6 +1,6 @@
-import { DataFactory, Literal, NamedNode } from 'n3'
+import { Literal, NamedNode } from 'n3'
 import { Term } from '@rdfjs/types'
-import { PREFIX_SHACL, PREFIX_XSD, PREFIX_RDF, SHAPES_GRAPH } from './constants'
+import { PREFIX_XSD, PREFIX_RDF, SHAPES_GRAPH } from './constants'
 import { createInputListEntries, findInstancesOf, findLabel, isURL } from './util'
 import { ShaclPropertyTemplate } from './property-template'
 import css from './styles.css'
@@ -72,29 +72,6 @@ export abstract class Theme {
     abstract createButton(label: string, primary: boolean): HTMLElement
 }
 
-export function toRDF(editor: Editor): Literal | NamedNode | undefined {
-    let languageOrDatatype: NamedNode<string> | string | undefined = editor['shaclDatatype']
-    let value: number | string = editor.value
-    if (value) {
-        if (editor.dataset.class || editor.dataset.nodeKind === PREFIX_SHACL + 'IRI') {
-            return DataFactory.namedNode(value)
-        } else {
-            if (editor.dataset.lang) {
-                languageOrDatatype = editor.dataset.lang
-            }
-            else if (editor['type'] === 'number') {
-                value = parseFloat(value)
-            }
-            return DataFactory.literal(value, languageOrDatatype)
-        }
-    } else if (editor['type'] === 'checkbox' || editor.getAttribute('type') === 'checkbox') {
-        // emit boolean 'false' only when required
-        if (editor['checked'] || parseInt(editor.dataset.minCount || '0') > 0) {
-            return DataFactory.literal(editor['checked'] ? 'true' : 'false', languageOrDatatype)
-        }
-    }
-}
-
 export function fieldFactory(template: ShaclPropertyTemplate, value: Term | null): HTMLElement {
     if (template.config.editMode) {
         const required = template.minCount !== undefined && template.minCount > 0