@sprig-and-prose/sprig-universe 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprig-and-prose/sprig-universe",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "Minimal universe parser for sprig",
   "main": "src/index.js",

package/src/ast.js

@@ -133,7 +133,7 @@
  * @typedef {Object} BookDecl
  * @property {string} kind - Always 'book'
  * @property {string} name - Book name
- * @property {string} parentName - Parent name (from "in ParentName")
+ * @property {string} [parentName] - Optional parent name (from "in ParentName")
  * @property {Array<ChapterDecl | DescribeBlock | TitleBlock | ReferencesBlock | DocumentationBlock | RepositoryDecl | ReferenceDecl | UnknownBlock>} body - Body declarations
  * @property {SourceSpan} source - Source span
  */

package/src/graph.js

@@ -578,23 +578,29 @@ function processBody(
     } else if (decl.kind === 'book') {
       const nodeId = makeNodeId(universeName, 'book', decl.name);
       checkDuplicateInScope(graph, scopeIndex, currentNodeId, decl.name, nodeId, 'book', decl.source);
-      const resolved = resolveNameInScope(graph, scopeIndex, decl.parentName, currentNodeId, decl.source);
-      const containerNodeId = resolved.nodeId && !resolved.ambiguous ? resolved.nodeId : null;
-      // Always set container for book nodes (even if undefined when parentName doesn't resolve)
+      
+      // Handle optional parent
+      let actualParentNodeId = parentNodeId;
+      let containerNodeId = undefined;
+      if (decl.parentName) {
+        const resolved = resolveNameInScope(graph, scopeIndex, decl.parentName, currentNodeId, decl.source);
+        if (resolved.nodeId && !resolved.ambiguous) {
+          actualParentNodeId = resolved.nodeId;
+          containerNodeId = resolved.nodeId;
+        }
+        // If parent not found, fall back to parentNodeId (tolerant parsing)
+      }
+      
       const node = createNode(
         nodeId,
         'book',
         decl.name,
-        containerNodeId || parentNodeId,
+        actualParentNodeId,
         decl,
-        containerNodeId, // May be undefined if parentName doesn't resolve
+        containerNodeId, // May be undefined if no parentName or if parentName doesn't resolve
       );
       graph.nodes[nodeId] = node;
-      if (containerNodeId) {
-        graph.nodes[containerNodeId].children.push(nodeId);
-      } else {
-        graph.nodes[parentNodeId].children.push(nodeId);
-      }
+      graph.nodes[actualParentNodeId].children.push(nodeId);
       addNameToScope(graph, scopeIndex, currentNodeId, decl.name, nodeId);
       processBody(
         graph,
@@ -614,8 +620,39 @@ function processBody(
     } else if (decl.kind === 'chapter') {
       const nodeId = makeNodeId(universeName, 'chapter', decl.name);
       checkDuplicateInScope(graph, scopeIndex, currentNodeId, decl.name, nodeId, 'chapter', decl.source);
+      
+      // Validate: chapter must have an "in" block
+      if (!decl.parentName) {
+        graph.diagnostics.push({
+          severity: 'error',
+          message: `Chapter "${decl.name}" must belong to a book. Use "chapter ${decl.name} in <BookName> { ... }"`,
+          source: decl.source,
+        });
+        // Continue processing but mark as invalid
+      }
+      
       const resolved = resolveNameInScope(graph, scopeIndex, decl.parentName, currentNodeId, decl.source);
       const containerNodeId = resolved.nodeId && !resolved.ambiguous ? resolved.nodeId : null;
+      
+      // Validate: chapter container must be a book
+      if (containerNodeId) {
+        const containerNode = graph.nodes[containerNodeId];
+        if (containerNode && containerNode.kind !== 'book') {
+          graph.diagnostics.push({
+            severity: 'error',
+            message: `Chapter "${decl.name}" must belong to a book, but "${decl.parentName}" is a ${containerNode.kind}`,
+            source: decl.source,
+          });
+        }
+      } else if (decl.parentName) {
+        // Container not found
+        graph.diagnostics.push({
+          severity: 'error',
+          message: `Chapter "${decl.name}" references unknown book "${decl.parentName}"`,
+          source: decl.source,
+        });
+      }
+      
       // Always set container for chapter nodes (even if undefined when parentName doesn't resolve)
       const node = createNode(
         nodeId,

package/src/parser.js

@@ -347,8 +347,15 @@ class Parser {
   parseBook() {
     const startToken = this.expect('KEYWORD', 'book');
     const nameToken = this.expect('IDENTIFIER');
-    this.expect('KEYWORD', 'in');
-    const parentToken = this.expect('IDENTIFIER');
+    
+    // Optional "in <ParentName>" syntax
+    let parentName = undefined;
+    if (this.match('KEYWORD') && this.peek()?.value === 'in') {
+      this.expect('KEYWORD', 'in');
+      const parentToken = this.expect('IDENTIFIER');
+      parentName = parentToken.value;
+    }
+    
     const lbrace = this.expect('LBRACE');
     const body = this.parseBlockBody(['chapter', 'describe', 'title', 'references', 'documentation', 'repository', 'reference']);
     const rbrace = this.expect('RBRACE');
@@ -356,7 +363,7 @@ class Parser {
     return {
       kind: 'book',
       name: nameToken.value,
-      parentName: parentToken.value,
+      parentName,
       body,
       source: {
         file: this.file,
@@ -372,6 +379,16 @@ class Parser {
   parseChapter() {
     const startToken = this.expect('KEYWORD', 'chapter');
     const nameToken = this.expect('IDENTIFIER');
+    
+    // Chapters must belong to a book - check for "in" keyword
+    if (!this.match('KEYWORD') || this.peek()?.value !== 'in') {
+      const nextToken = this.peek();
+      const line = nextToken ? nextToken.span.start.line : startToken.span.start.line;
+      throw new Error(
+        `Chapter "${nameToken.value}" must belong to a book. Use "chapter ${nameToken.value} in <BookName> { ... }" at ${this.file}:${line}`,
+      );
+    }
+    
     this.expect('KEYWORD', 'in');
     const parentToken = this.expect('IDENTIFIER');
     const lbrace = this.expect('LBRACE');