namespace refactoring and cleanup

1 files changed, 13 insertions, 14 deletions

diff --git a/bsfs/namespace/predefined.py b/bsfs/namespace/predefined.py
index 15f12ac..8b60d39 100644
--- a/bsfs/namespace/predefined.py
+++ b/bsfs/namespace/predefined.py
@@ -2,29 +2,28 @@
 # imports
 import typing
 
-# bsfs imports
-from bsfs.utils import URI
-
 # inner-module imports
-from . import namespace
+from .namespace import Namespace, FinalNamespace
 
 # essential bsfs namespaces
-bsfs: namespace.Namespace = namespace.Namespace(URI('http://bsfs.ai/schema'), fsep='/')
-
+bsfs = Namespace('https://schema.bsfs.io/core')
 # additional bsfs namespaces
-bse: namespace.Namespace = namespace.Namespace(URI('http://bsfs.ai/schema/Entity'))
-bsm: namespace.Namespace = namespace.Namespace(URI('http://bsfs.ai/schema/Meta'))
+bsd = bsfs.distance()
+bsl = bsfs.Literal
+bsn = bsfs.Node()
 
 # generic namespaces
-rdf: namespace.Namespace = namespace.Namespace(URI('http://www.w3.org/1999/02/22-rdf-syntax-ns'))
-rdfs: namespace.Namespace = namespace.Namespace(URI('http://www.w3.org/2000/01/rdf-schema'))
-schema: namespace.Namespace = namespace.Namespace(URI('http://schema.org'), fsep='/')
-xsd: namespace.Namespace = namespace.Namespace(URI('http://www.w3.org/2001/XMLSchema'))
+rdf = FinalNamespace('http://www.w3.org/1999/02/22-rdf-syntax-ns')
+rdfs = FinalNamespace('http://www.w3.org/2000/01/rdf-schema')
+xsd = FinalNamespace('http://www.w3.org/2001/XMLSchema')
+schema = FinalNamespace('http://schema.org', sep='/')
 
+# exports
 __all__: typing.Sequence[str] = (
-    'bse',
+    'bsd',
     'bsfs',
-    'bsm',
+    'bsl',
+    'bsn',
     'rdf',
     'rdfs',
     'schema',