book-source 0.2.3 → 0.3.0

package/lib/StructuredDocument.js

@@ -675,12 +675,13 @@ function parseOrderedListItem( str , ctx , indent ) {
 	var lastPart = ctx.parts[ ctx.parts.length - 1 ] ;
 
 	if ( ! lastPart || lastPart.type !== 'orderedList' ) {
-		ctx.parts.push( new documentParts.OrderedList( indent ) ) ;
+		lastPart = new documentParts.OrderedList( indent ) ;
+		ctx.parts.push( lastPart ) ;
 	}
 
 	stack( ctx ) ;
 
-	ctx.parts.push( new documentParts.OrderedListItem( indent , order ) ) ;
+	ctx.parts.push( new documentParts.OrderedListItem( indent , order , lastPart.autoIndex ++ ) ) ;
 
 	var blockEnd = detectBlockEnd( str , ctx.i , ctx.parent?.indent , LIST_ITEM_END_PARAMS ) ;
 	parseInlineChildren( str , ctx , blockEnd ) ;
@@ -1323,8 +1324,7 @@ function parseInlineChildrenOfParent( str , ctx , parent , blockEnd , trim = fal
 // Try to parse non-block content
 function parseInline( str , ctx , blockEnd , trim = false ) {
 	//console.log( "parseInline() -- remaining:" , ctx.i , str.slice( ctx.i ) ) ;
-	var isSpace , scanEnd ,
-		lastWasSpace = WHITE_SPACES.has( str[ ctx.i - 1 ] ) ;
+	var isSpace , scanEnd ;
 
 	scanEnd = blockEnd = blockEnd ?? searchEndOfLine( str , ctx.i ) ;
 
@@ -1343,6 +1343,19 @@ function parseInline( str , ctx , blockEnd , trim = false ) {
 		scanEnd = last + 1 ;
 	}
 
+	parseNestedInline( str , ctx , scanEnd , true ) ;
+}
+
+
+
+function parseNestedInline( str , ctx , scanEnd , topLevel = false ) {
+	var isSpace ,
+		lastWasSpace = WHITE_SPACES.has( str[ ctx.i - 1 ] ) ;
+
+	//console.log( "parseInline() -- remaining:" , ctx.i , str.slice( ctx.i ) ) ;
+
+	if ( ! topLevel ) { stack( ctx ) ; }
+
 	ctx.iStartOfInlineChunk = ctx.i ;
 
 	for ( ; ctx.i < scanEnd ; ctx.i ++ ) {
@@ -1387,8 +1400,10 @@ function parseInline( str , ctx , blockEnd , trim = false ) {
 
 	addInlineTextChunk( str , ctx ) ;
 
-	ctx.i = blockEnd ;
+	ctx.i = scanEnd ;
 	if ( str[ ctx.i ] === '\n' ) { ctx.i ++ ; }
+
+	if ( ! topLevel ) { unstack( ctx ) ; }
 }
 
 
@@ -1466,44 +1481,48 @@ function parseEscape( str , ctx ) {
 
 
 
-function parseEmphasisText( str , ctx , blockEnd ) {
+function parseEmphasisText( str , ctx , scanEnd ) {
 	//console.error( "parseStyledText()" ) ;
 	var streak = countStreak( str , ctx.i , '*' ) ;
 	if ( streak > 3 ) { return ; }
-	var end = searchSwitchCloser( str , ctx.i + streak , '*' , streak , true , false , blockEnd ) ;
+	var end = searchSwitchCloser( str , ctx.i + streak , '*' , streak , true , false , scanEnd ) ;
 	if ( end < 0 ) { return ; }
 
-	var text = str.slice( ctx.i + streak , end + 1 - streak ) ;
+	ctx.parts.push( new documentParts.EmphasisText( streak ) ) ;
+
+	ctx.i += streak ;
+	parseNestedInline( str , ctx , end + 1 - streak ) ;
 
-	ctx.parts.push( new documentParts.EmphasisText( text , streak ) ) ;
 	ctx.i = end ;
 	ctx.iStartOfInlineChunk = ctx.i + 1 ;
 }
 
 
 
-function parseDecoratedText( str , ctx , blockEnd ) {
+function parseDecoratedText( str , ctx , scanEnd ) {
 	//console.error( "parseStyledText()" ) ;
 	var streak = countStreak( str , ctx.i , '_' ) ;
 	if ( streak > 2 ) { return ; }
-	var end = searchSwitchCloser( str , ctx.i + streak , '_' , streak , true , false , blockEnd ) ;
+	var end = searchSwitchCloser( str , ctx.i + streak , '_' , streak , true , false , scanEnd ) ;
 	if ( end < 0 ) { return ; }
 
-	var text = str.slice( ctx.i + streak , end + 1 - streak ) ;
+	ctx.parts.push( new documentParts.DecoratedText( streak ) ) ;
+
+	ctx.i += streak ;
+	parseNestedInline( str , ctx , end + 1 - streak ) ;
 
-	ctx.parts.push( new documentParts.DecoratedText( text , streak ) ) ;
 	ctx.i = end ;
 	ctx.iStartOfInlineChunk = ctx.i + 1 ;
 }
 
 
 
-function parseCode( str , ctx , blockEnd ) {
+function parseCode( str , ctx , scanEnd ) {
 	//console.error( "parseStyledText()" ) ;
 	var streak = countStreak( str , ctx.i , '`' ) ;
 	// Markdown supports inline code inside two pairs of backquote, to allow backquote in code, hence streak can be 2.
 	if ( streak > 2 ) { return ; }
-	var end = searchSwitchCloser( str , ctx.i + streak , '`' , streak , false , false , blockEnd ) ;
+	var end = searchSwitchCloser( str , ctx.i + streak , '`' , streak , false , false , scanEnd ) ;
 	if ( end < 0 ) { return ; }
 
 	var sliceStart = ctx.i + streak ,
@@ -1525,27 +1544,39 @@ const STYLE_DATA_MARK = {
 	text: true , href: true , style: true , extra: false
 } ;
 
-function parseStyledText( str , ctx , blockEnd ) {
+function parseStyledText( str , ctx , scanEnd ) {
 	//console.error( "parseStyledText()" ) ;
-	var end = searchCloser( str , ctx.i + 1 , '[' , ']' , false , blockEnd ) ;
+	var end = searchCloser( str , ctx.i + 1 , '[' , ']' , false , scanEnd ) ;
 	if ( end < 0 ) { return ; }
 
-	var text = str.slice( ctx.i + 1 , end ) ;
+	//var text = str.slice( ctx.i + 1 , end ) ;
 
+	var start = ctx.i + 1 ;
 	ctx.i = end ;
-	var data = parseDataMark( str , ctx , STYLE_DATA_MARK , blockEnd ) ;
+	var data = parseDataMark( str , ctx , STYLE_DATA_MARK , scanEnd ) ;
 	if ( ! data ) { return ; }
 
+	var fullMarkupEnd = ctx.i ;
+
 	var href = data.href?.[ 0 ] ,
 		style = data.style?.[ 0 ] ,
 		title = data.text?.[ 0 ] ;
 
 	if ( href ) {
-		ctx.parts.push( new documentParts.Link( text , href , style , title ) ) ;
+		ctx.parts.push( new documentParts.Link( href , style , title ) ) ;
 	}
 	else if ( style || title ) {
-		ctx.parts.push( new documentParts.StyledText( text , style , title ) ) ;
+		ctx.parts.push( new documentParts.StyledText( style , title ) ) ;
 	}
+	else {
+		return ;
+	}
+
+	ctx.i = start ;
+	parseNestedInline( str , ctx , end ) ;
+
+	ctx.i = fullMarkupEnd ;
+	ctx.iStartOfInlineChunk = ctx.i + 1 ;
 }
 
 
@@ -1554,16 +1585,16 @@ const IMAGE_DATA_MARK = {
 	text: true , href: true , style: false , extra: false
 } ;
 
-function parseImage( str , ctx , blockEnd ) {
+function parseImage( str , ctx , scanEnd ) {
 	//console.error( "parseStyledText()" ) ;
-	var end = searchCloser( str , ctx.i + 2 , '[' , ']' , false , blockEnd ) ;
+	var end = searchCloser( str , ctx.i + 2 , '[' , ']' , false , scanEnd ) ;
 	if ( end < 0 ) { return ; }
 
 	var text = str.slice( ctx.i + 2 , end ) ;
 
 	ctx.i = end ;
 	ctx.iStartOfInlineChunk = ctx.i + 1 ;
-	var data = parseDataMark( str , ctx , IMAGE_DATA_MARK , blockEnd ) ;
+	var data = parseDataMark( str , ctx , IMAGE_DATA_MARK , scanEnd ) ;
 	if ( ! data ) { return ; }
 
 	var href = data.href?.[ 0 ] ;
@@ -1578,13 +1609,13 @@ function parseImage( str , ctx , blockEnd ) {
 
 
 
-function parseDataMark( str , ctx , allow , blockEnd , forTextElement = true ) {
+function parseDataMark( str , ctx , allow , scanEnd , forTextElement = true ) {
 	var end ,
 		data = {} ;
 
 	for ( ;; ) {
 		if ( str[ ctx.i + 1 ] === '[' && allow.text ) {
-			end = searchCloser( str , ctx.i + 2 , '[' , ']' , false , blockEnd ) ;
+			end = searchCloser( str , ctx.i + 2 , '[' , ']' , false , scanEnd ) ;
 			if ( end < 0 ) { return ; }
 			if ( ! data.text ) { data.text = [] ; }
 			data.text.push( str.slice( ctx.i + 2 , end ) ) ;
@@ -1592,7 +1623,7 @@ function parseDataMark( str , ctx , allow , blockEnd , forTextElement = true ) {
 			ctx.iStartOfInlineChunk = ctx.i + 1 ;
 		}
 		else if ( str[ ctx.i + 1 ] === '(' && allow.href ) {
-			end = searchCloser( str , ctx.i + 2 , '(' , ')' , true , blockEnd ) ;
+			end = searchCloser( str , ctx.i + 2 , '(' , ')' , true , scanEnd ) ;
 			if ( end < 0 ) { return ; }
 			if ( ! data.href ) { data.href = [] ; }
 			data.href.push( str.slice( ctx.i + 2 , end ) ) ;
@@ -1600,7 +1631,7 @@ function parseDataMark( str , ctx , allow , blockEnd , forTextElement = true ) {
 			ctx.iStartOfInlineChunk = ctx.i + 1 ;
 		}
 		else if ( str[ ctx.i + 1 ] === '<' && allow.style ) {
-			end = searchCloser( str , ctx.i + 2 , '<' , '>' , true , blockEnd ) ;
+			end = searchCloser( str , ctx.i + 2 , '<' , '>' , true , scanEnd ) ;
 			if ( end < 0 ) { return ; }
 			if ( ! data.style ) { data.style = [] ; }
 			//data.style.push( str.slice( ctx.i + 2 , end ) ) ;
@@ -1612,7 +1643,7 @@ function parseDataMark( str , ctx , allow , blockEnd , forTextElement = true ) {
 		}
 		/*
 		else if ( str[ ctx.i + 1 ] === '{' && allow.extra ) {
-			end = searchCloser( str , ctx.i + 2 , '{' , '}' , false , blockEnd ) ;
+			end = searchCloser( str , ctx.i + 2 , '{' , '}' , false , scanEnd ) ;
 			if ( end < 0 ) { return ; }
 			if ( ! data.extra ) { data.extra = [] ; }
 			data.extra.push( str.slice( ctx.i + 2 , end ) ) ;

package/lib/documentParts.js

@@ -33,15 +33,13 @@ module.exports = documentParts ;
 
 
 
-function Part() {
-}
+function Part() {}
 
 documentParts.Part = Part ;
 
 
 
-function InlinePart() {
-}
+function InlinePart() {}
 
 InlinePart.prototype = Object.create( Part.prototype ) ;
 InlinePart.prototype.constructor = InlinePart ;
@@ -49,6 +47,16 @@ documentParts.InlinePart = InlinePart ;
 
 
 
+function InlineContainerPart() {
+	this.parts = [] ;
+}
+
+InlineContainerPart.prototype = Object.create( Part.prototype ) ;
+InlineContainerPart.prototype.constructor = InlineContainerPart ;
+documentParts.InlineContainerPart = InlineContainerPart ;
+
+
+
 function InlineTextPart( text ) {
 	this.text = text ;
 }
@@ -82,26 +90,26 @@ documentParts.Text = Text ;
 
 
 
-function EmphasisText( text , level ) {
+function EmphasisText( level ) {
 	this.type = 'emphasisText' ;
 	this.level = level ;
-	InlineTextPart.call( this , text ) ;
+	InlineContainerPart.call( this ) ;
 }
 
-EmphasisText.prototype = Object.create( InlineTextPart.prototype ) ;
+EmphasisText.prototype = Object.create( InlineContainerPart.prototype ) ;
 EmphasisText.prototype.constructor = EmphasisText ;
 documentParts.EmphasisText = EmphasisText ;
 
 
 
-function DecoratedText( text , level ) {
+function DecoratedText( level ) {
 	this.type = 'decoratedText' ;
 	this.level = level ;
 	this.underline = true ;
-	InlineTextPart.call( this , text ) ;
+	InlineContainerPart.call( this ) ;
 }
 
-DecoratedText.prototype = Object.create( InlineTextPart.prototype ) ;
+DecoratedText.prototype = Object.create( InlineContainerPart.prototype ) ;
 DecoratedText.prototype.constructor = DecoratedText ;
 documentParts.DecoratedText = DecoratedText ;
 
@@ -118,28 +126,28 @@ documentParts.Code = Code ;
 
 
 
-function Link( text , href , style , title ) {
+function Link( href , style , title ) {
 	this.type = 'link' ;
 	this.href = href ;
 	this.style = style || undefined ;
-	InlineTextPart.call( this , text ) ;
+	InlineContainerPart.call( this ) ;
 	this.title = title || undefined ;
 }
 
-Link.prototype = Object.create( InlineTextPart.prototype ) ;
+Link.prototype = Object.create( InlineContainerPart.prototype ) ;
 Link.prototype.constructor = Link ;
 documentParts.Link = Link ;
 
 
 
-function StyledText( text , style , title ) {
+function StyledText( style , title ) {
 	this.type = 'styledText' ;
 	this.style = style || undefined ;
-	InlineTextPart.call( this , text ) ;
+	InlineContainerPart.call( this ) ;
 	this.title = title || undefined ;
 }
 
-StyledText.prototype = Object.create( InlineTextPart.prototype ) ;
+StyledText.prototype = Object.create( InlineContainerPart.prototype ) ;
 StyledText.prototype.constructor = StyledText ;
 documentParts.StyledText = StyledText ;
 
@@ -247,6 +255,7 @@ documentParts.ListItem = ListItem ;
 function OrderedList( indent ) {
 	this.type = 'orderedList' ;
 	this.indent = indent ;
+	this.autoIndex = 1 ;
 	BlockPart.call( this ) ;
 }
 
@@ -256,10 +265,11 @@ documentParts.OrderedList = OrderedList ;
 
 
 
-function OrderedListItem( indent , order ) {
+function OrderedListItem( indent , order , index ) {
 	this.type = 'orderedListItem' ;
 	this.indent = indent ;
-	this.order = order ;
+	this.order = order ;	// User order value
+	this.index = index ;	// Real index, starting at 1, and auto-incrementing
 	BlockPart.call( this ) ;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "book-source",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "A lightweight markup language, inspired by Markdown.",
   "main": "lib/book-source.js",
   "directories": {