mdld-parse 0.3.0 → 0.3.2

package/README.md

@@ -36,7 +36,7 @@ ex:armstrong schema:name "Neil Armstrong" .
 
 - **Subject declarations**: `{=IRI}` and `{=#fragment}` for context setting
 - **Object IRIs**: `{+IRI}` and `{+#fragment}` for temporary object declarations  
-- **Four predicate forms**: `p` (S→L), `?p` (S→O), `^p` (L→S), `!p` (O→S)
+- **Four predicate forms**: `p` (S→L), `?p` (S→O), `!p` (O→S)
 - **Type declarations**: `.Class` for rdf:type triples
 - **Datatypes & language**: `^^xsd:date` and `@en` support
 - **Lists**: Explicit subject declarations for structured data
@@ -92,7 +92,6 @@ Each predicate form determines the graph edge:
 |-------|---------|------------------------------|------------------|
 | `p`   | S → L   | `[Alice] {name}`             | literal property |
 | `?p`  | S → O   | `[NASA](ex:nasa) {?org}`     | object property  |
-| `^p`  | *(none)*| *(literals can't be subjects)* | reverse literal  |
 | `!p` | O → S   | `[Parent](ex:p) {!hasPart}` | reverse object   |
 
 ## Syntax Reference
@@ -249,9 +248,9 @@ ex:book schema:hasPart ex:part .
 ### Prefix Declarations
 
 ```markdown
-[ex] {: http://example.org/}
-[foaf] {: http://xmlns.com/foaf/0.1/}
-[@vocab] {: http://schema.org/}
+[ex] <http://example.org/>
+[foaf] <http://xmlns.com/foaf/0.1/>
+[@vocab] <http://schema.org/>
 
 # Person {=ex:alice .foaf:Person}
 ```
@@ -416,8 +415,8 @@ Each predicate is partitioned by **direction** and **node kind**:
 | -------------- | -------------- |
 | `p`            | `S ─p→ L`      |
 | `?p`           | `S ─p→ O`      |
-| `^p`           | `L ─p→ S`      |
-| `!p`          | `O ─p→ S`      |
+| not allowed    | `L ─p→ S`      |
+| `!p`           | `O ─p→ S`      |
 
 This spans all **2 × 2** combinations of:
 
@@ -433,14 +432,14 @@ Therefore, the algebra is **closed**.
 ```markdown
 # Meeting Notes {=urn:note:2024-01-15 .Meeting}
 
-Attendees: {?attendee}
+Attendees: {?attendee name}
 
-- Alice {=urn:person:alice name}
-- Bob {=urn:person:bob name}
+- Alice {=urn:person:alice}
+- Bob {=urn:person:bob}
 
-Action items: {?actionItem}
+Action items: {?actionItem name}
 
-- Review proposal {=urn:task:1 name}
+- Review proposal {=urn:task:1}
 ```
 
 ### Developer Documentation
@@ -480,7 +479,7 @@ npm test
 
 Tests validate:
 - Subject declaration and context
-- All predicate forms (p, ?p, ^p, !p)
+- All predicate forms (p, ?p, !p)
 - Datatypes and language tags
 - List processing
 - Code blocks and blockquotes

package/index.js

@@ -198,7 +198,7 @@ function scanTokens(text) {
             continue;
         }
 
-        const prefixMatch = line.match(/^\[([^\]]+)\]\s*\{:\s*([^}]+)\}/);
+        const prefixMatch = line.match(/^\[([^\]]+)\]\s*<([^>]+)>/);
         if (prefixMatch) {
             tokens.push({ type: 'prefix', prefix: prefixMatch[1], iri: prefixMatch[2].trim() });
             continue;
@@ -224,7 +224,7 @@ function scanTokens(text) {
             continue;
         }
 
-        const listMatch = line.match(/^(\s*)([-*+]|\d+\.)\s+(.+?)(?:\s*(\{[^}]+\}))?$/);
+        const listMatch = line.match(/^(\s*)([-*+]|\d+\.)\s+(.+?)(?:\s*(\{[^}]+\}))?\s*$/);
         if (listMatch) {
             const attrs = listMatch[4] || null;
             const attrsStartInLine = attrs ? line.lastIndexOf(attrs) : -1;
@@ -662,7 +662,7 @@ function processListContext(contextSem, listTokens, state, contextSubject = null
             const P = state.df.namedNode(expandIRI(pred.iri, state.ctx));
 
             // According to MD-LD spec: list predicates that connect to item subjects MUST use object predicate forms (?p or !p)
-            // Literal predicate forms (p, ^p) in list scope emit no quads
+            // Literal predicate forms (p) in list scope emit no quads
             if (pred.form === '!') {
                 // Reverse object property: O —p→ S
                 emitQuad(state.quads, state.origin.quadIndex, 'list-context', itemSubject, P, contextSubject, state.df);
@@ -676,8 +676,44 @@ function processListContext(contextSem, listTokens, state, contextSubject = null
         const prevSubject = state.currentSubject;
         state.currentSubject = itemSubject;
 
+        // Check if item has its own predicates
+        let hasOwnPredicates = false;
+        let itemSem = null;
+
         if (listToken.attrs) {
-            const itemSem = parseSemanticBlock(listToken.attrs);
+            itemSem = parseSemanticBlock(listToken.attrs);
+            if (itemSem.predicates.length > 0) {
+                hasOwnPredicates = true;
+            }
+        }
+
+        if (!hasOwnPredicates) {
+            // Check inline carriers for predicates
+            for (const carrier of carriers) {
+                if (carrier.attrs) {
+                    const carrierSem = parseSemanticBlock(carrier.attrs);
+                    if (carrierSem.predicates.length > 0) {
+                        hasOwnPredicates = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        // If item has no predicates, inherit literal predicates from context
+        if (!hasOwnPredicates) {
+            const inheritedPredicates = contextSem.predicates.filter(p => p.form === '');
+            if (inheritedPredicates.length > 0 && listToken.text) {
+                // Create inherited annotation block
+                const inheritedTokens = inheritedPredicates.map(p => p.iri).join(' ');
+                const inheritedSem = parseSemanticBlock(`{${inheritedTokens}}`);
+                const carrier = { type: 'list', text: listToken.text, range: listToken.range, attrsRange: listToken.attrsRange || null, valueRange: listToken.valueRange || null };
+                processAnnotation(carrier, inheritedSem, state);
+            }
+        }
+
+        if (listToken.attrs) {
+            if (!itemSem) itemSem = parseSemanticBlock(listToken.attrs);
             const carrier = { type: 'list', text: listToken.text, range: listToken.range, attrsRange: listToken.attrsRange || null, valueRange: listToken.valueRange || null };
             processAnnotation(carrier, itemSem, state);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mdld-parse",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"description": "A standards-compliant parser for **MD-LD (Markdown-Linked Data)** — a human-friendly RDF authoring format that extends Markdown with semantic annotations.",
 	"type": "module",
 	"main": "index.js",