(defun unsupported (node)
(reject :unsupported-construct (format nil "XTM ~A is not implemented in this subset." (node-name node))
node 'xtm-unsupported))
-(defun check-reifier (node)
- (when (attr node "reifier")
- (reject :reification "XTM Reification is outside this subset." node 'xtm-unsupported)))
(defun leaf-href (node)
(attributes node '("href") '("href"))
(when (elements node) (reject :unexpected-child "A locator element must be empty." node))
(when (< next phase) (reject :element-order "topicMap child order is invalid." child))
(setf phase next)
(validate child '("itemIdentity" "mergeMap" "topic" "association"))))))
+ ((string= name "mergeMap") (mergemap-iri node))
((string= name "topic")
(attributes node '("id") '("id"))
(let ((id (collapse-space (attr node "id"))))
(unless value-seen (reject :missing-name-value "name requires a value element." node))))
((string= name "variant")
(attributes node '("reifier") nil)
- (check-reifier node)
+ (when (attr node "reifier") (resolve-iri (attr node "reifier") *document-iri* node))
(let ((phase 0) (scope-seen nil) (resource-seen nil))
(dolist (child (elements node))
(check-namespace child)
(unless (iri-parts-scheme (split-iri datatype))
(reject :invalid-resource-data-datatype "resourceData datatype must be an absolute IRI." node))
(validate-decoded-reference (unescape-reference datatype node) node)
- (unless (member datatype (list (topic-maps.tmdm:string-datatype) (topic-maps.tmdm:iri-datatype)) :test #'equal)
- (reject :resource-data-datatype "Only textual xsd:string and xsd:anyURI resourceData are implemented." node 'xtm-unsupported)))
+ (when (equal datatype "http://www.w3.org/2001/XMLSchema#anyType")
+ (reject :resource-data-datatype "xsd:anyType XML canonicalization is outside this subset." node 'xtm-unsupported)))
(dolist (child (node-children node))
(unless (stringp child)
- (if (or (equal datatype (topic-maps.tmdm:iri-datatype)) (equal (node-uri child) +namespace+))
- (reject :unexpected-child
- (if (equal datatype (topic-maps.tmdm:iri-datatype))
- "anyURI resourceData cannot contain child elements."
- "resourceData cannot contain XTM markup.") child)
- (reject :resource-data-markup "Embedded XML resourceData is outside this subset." child 'xtm-unsupported))))))
+ (reject :unexpected-child "Textual resourceData cannot contain child elements." child)))))
((string= name "type")
(attributes node nil nil)
(let ((refs (elements node)))
(topic-maps.tmdm:make-association map (core-topic map "type-instance")
(list (list (core-topic map "type") type)
(list (core-topic map "instance") (topic-maps.tmdm:canonical-topic owner)))))))
+(defun read-resource-value (resource)
+ "Return value and datatype for a validated resource node (XTM 4.16/4.17).
+This operation neither looks up Topics nor fetches resources. ANYTYPE is rejected
+by source validation before model construction. Preserve other datatype IRIs."
+ (if (string= (node-name resource) "resourceRef")
+ (values (leaf-href resource) (topic-maps.tmdm:iri-datatype))
+ (let ((datatype (or (attr resource "datatype") (topic-maps.tmdm:string-datatype)))
+ (text (with-output-to-string (out)
+ (dolist (part (node-children resource)) (write-string part out)))))
+ (values (if (equal datatype (topic-maps.tmdm:iri-datatype))
+ (resolve-iri text *document-iri* resource)
+ text)
+ datatype))))
(defun read-variant (node name map)
(let* ((children (elements node))
(scope-node (find "scope" children :key #'node-name :test #'string=))
(resource (find-if (lambda (child) (member (node-name child) '("resourceData" "resourceRef") :test #'string=)) children))
- (reference-p (string= (node-name resource) "resourceRef"))
- (uri-data-p (and (not reference-p) (equal (attr resource "datatype") (topic-maps.tmdm:iri-datatype))))
- (explicit (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) (elements scope-node)))
- ;; A resource locator is a value, not a topic reference. LEAF-HREF uses
- ;; the shared XTM IRI resolver without topic lookup or resource access.
- (text (unless reference-p (with-output-to-string (out)
- (dolist (part (node-children resource)) (write-string part out)))))
- (value (cond (reference-p (leaf-href resource))
- (uri-data-p (resolve-iri text *document-iri* resource))
- (t text))))
- ;; ADD-VARIANT canonicalizes the union and enforces the proper superset.
- ;; A nonempty explicit scope may still add no theme to the Name scope.
- (let ((variant (topic-maps.tmdm:add-variant name value
- :datatype (if (or reference-p uri-data-p) (topic-maps.tmdm:iri-datatype) (topic-maps.tmdm:string-datatype))
- :scope (append (topic-maps.tmdm:topic-name-scope name) explicit))))
- ;; Normalize first: an equal Variant may already own this identifier.
- ;; Keep the native canonical result and its global conflict conditions.
- (dolist (child children variant)
- (when (string= (node-name child) "itemIdentity")
- (setf variant (topic-maps.tmdm:add-item-identifier variant (leaf-href child))))))))
+ (explicit (mapcar (lambda (ref) (find-reference-topic map (reference-iri ref))) (elements scope-node))))
+ (multiple-value-bind (value datatype) (read-resource-value resource)
+ ;; ADD-VARIANT owns canonicalization and the proper-superset constraint.
+ (let ((variant (topic-maps.tmdm:add-variant name value :datatype datatype
+ :scope (append (topic-maps.tmdm:topic-name-scope name) explicit))))
+ (dolist (child children)
+ (when (string= (node-name child) "itemIdentity")
+ (setf variant (topic-maps.tmdm:add-item-identifier variant (leaf-href child)))))
+ ;; Reification may normalize again; retain the native canonical handle.
+ (topic-maps.tmdm:canonical-variant (read-item-reifier node variant map))))))
(defun read-name (node owner map)
(let* ((children (elements node))
(type-node (find "type" children :key #'node-name :test #'string=))
(t :subject-locator))
(leaf-href child)))))))
(topic-maps.tmdm:canonical-topic topic)))
-(defun deserialize-octets (bytes &key document-iri source-key)
- "Deserialize raw XML octets into a new TMDM Topic Map (XTM 2.0 identity/Name subset).
-DOCUMENT-IRI is required, absolute and fragment-free. SOURCE-KEY is a diagnostic
-label only. XML positions are approximate SAX line/column values, not spans.
-XML-policy errors, XTM rejection/unsupported and original TMDM conflicts remain
-distinct. No resources are fetched. No externally supplied Map is mutated."
+(defun mergemap-iri (node)
+ (let ((iri (leaf-href node)))
+ (when (iri-parts-fragment (split-iri iri))
+ (reject :mergemap-fragment "mergeMap href must not have a fragment identifier." node))
+ iri))
+(defun resource-failure (code detail node &optional cause)
+ (error 'xtm-resource-error :code code :detail detail :cause cause
+ :document-iri *document-iri* :source-key *source-key*
+ :line (node-line node) :column (node-column node)))
+(defun resource-octets-p (value)
+ ;; Same resolver value convention as CTM, without a dependency on its Reader.
+ (and (vectorp value) (not (stringp value))
+ (every (lambda (n) (and (integerp n) (<= 0 n 255))) value)))
+(defun read-mergemap (node map resolver max-depth active-iris)
+ (let ((resource (mergemap-iri node)))
+ (unless resolver
+ (reject :resource-resolver-required "mergeMap requires an explicit resource resolver; no resource was loaded." node 'xtm-unsupported))
+ ;; These are finite resource-policy guards, not normative cycle semantics.
+ ;; Each independent public call starts a new active path; siblings may repeat.
+ (when (member resource active-iris :test #'string=)
+ (reject :cyclic-mergemap "Active recursive XTM resource dependency; cycle processing is not implemented." node 'xtm-unsupported))
+ (when (>= (length active-iris) (1+ max-depth))
+ (reject :resource-depth-limit "Configured nested XTM resource limit reached; this is implementation policy." node 'xtm-unsupported))
+ (multiple-value-bind (bytes source-key)
+ (handler-case
+ (funcall resolver resource :purpose :mergemap :from-document-iri *document-iri*
+ :notation "http://psi.topicmaps.org/iso13250/xtm")
+ (error (c) (resource-failure :resource-resolver-failure (princ-to-string c) node c)))
+ (unless bytes
+ (resource-failure :resource-unavailable "Resolver declined or did not supply the requested XTM resource." node))
+ (unless (and (resource-octets-p bytes) (or (null source-key) (stringp source-key)))
+ (resource-failure :invalid-resource-result "Resolver must return an octet vector and a string source key or NIL." node))
+ (let ((source (deserialize-document
+ (if (typep bytes '(vector (unsigned-byte 8))) bytes
+ (map '(vector (unsigned-byte 8)) #'identity bytes))
+ resource (or source-key resource) resolver max-depth active-iris)))
+ ;; Import only Topics/Associations. The existing operation preflights
+ ;; conflicts, preserves SOURCE, and excludes its Map identifiers/reifier.
+ (handler-case (topic-maps.tmdm:import-map-content map source)
+ (error (c) (resource-failure :mergemap-import-failure (princ-to-string c) node c)))))))
+(defun deserialize-octets (bytes &key document-iri source-key resource-resolver (max-resource-depth 32))
+ "Deserialize raw XTM 2.0 octets into a fresh TMDM Map.
+DOCUMENT-IRI is required, absolute and fragment-free. SOURCE-KEY is diagnostic.
+RESOURCE-RESOLVER is optional: (resolver absolute-iri :purpose :mergemap
+ :from-document-iri parent-iri :notation XTM-notation-IRI)
+returns raw octets and an optional diagnostic source key. No implicit I/O.
+Children use their resolved IRI as Document IRI and the same explicit resolver.
+MAX-RESOURCE-DEPTH bounds nested imports (default 32); active cycles are
+Unsupported implementation policy, not a normative XTM invalidity decision.
+Child XML/XTM/model errors retain their original contexts; resolver/import
+failures use XTM-RESOURCE-ERROR with the original ERROR-CAUSE. No supplied Map
+is mutated. Each public call has its own resource recursion context."
+ (check-type max-resource-depth (integer 0 *))
+ (deserialize-document bytes document-iri source-key resource-resolver max-resource-depth nil))
+(defun deserialize-document (bytes document-iri source-key resource-resolver max-resource-depth active-iris)
(check-type bytes (vector (unsigned-byte 8)))
(let ((*document-iri* document-iri) (*source-key* source-key)
(handler (make-instance 'source-handler)))
;; The attribute is processed before itemIdentity and later Topic nodes.
(read-map-reifier root map)
(dolist (child (elements root))
- (if (string= (node-name child) "itemIdentity")
- (topic-maps.tmdm:add-item-identifier map (leaf-href child))
- (read-topic child map)))
+ (cond ((string= (node-name child) "itemIdentity")
+ (topic-maps.tmdm:add-item-identifier map (leaf-href child)))
+ ((string= (node-name child) "mergeMap")
+ (read-mergemap child map resource-resolver max-resource-depth
+ (cons document-iri active-iris)))
+ (t (read-topic child map))))
map)))