Change fetch to use request-middleware instead

changelog.md

@@ -75,188 +75,11 @@ pre {
 .page {
 	padding-bottom: 1.5cm;
 }
-
-.varSyntaxTable th:first-of-type {
-  width:6cm;
-}
 ```
 
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
-### Wednesday 21/2/2024 - v3.11.0
-{{taskList
-
-##### Gazook89
-
-* [x] Brew view count no longer increases when viewed by owner
-
-Fixes issue [#3037](https://github.com/naturalcrit/homebrewery/issues/3037)
-
-* [x] Small tweak to PHB H3 sizing
-
-Fixes issue [#2989](https://github.com/naturalcrit/homebrewery/issues/2989)
-
-* [x] Add **Fold/Unfold All** {{fas,fa-compress-alt}} / {{fas,fa-expand-alt}} buttons to editor bar 
-
-Fixes issue [#2965](https://github.com/naturalcrit/homebrewery/issues/2965)
-
-
-##### G-Ambatte
-
-* [x] Share link added to Editor Access error page
-
-Fixes issue [#3086](https://github.com/naturalcrit/homebrewery/issues/3086)
-
-* [x] Add Darkbrewery theme to Editor theme selector {{fas,fa-palette}}
-
-Fixes issue [#3034](https://github.com/naturalcrit/homebrewery/issues/3034)
-
-* [x] Fix Firefox prints with alternating blank pages
-
-Fixes issue [#3115](https://github.com/naturalcrit/homebrewery/issues/3115)
-
-* [x] Admin page working again
-
-Fixes issue [#2657](https://github.com/naturalcrit/homebrewery/issues/2657)
-
-
-##### 5e-Cleric
-
-* [x] Fix indenting issue with Monster Blocks and italics in Class Feature
-
-Fixes issues [#527](https://github.com/naturalcrit/homebrewery/issues/527),
-[#3247](https://github.com/naturalcrit/homebrewery/issues/3247)
-
-* [x] Allow CSS vars in curly syntax to be formatted as strings using single quotes
-
-`{{--customVar:"'a string'"}}`
-
-Fixes issue [#3066](https://github.com/naturalcrit/homebrewery/issues/3066)
-
-* [x] Add *Elderberry Inn* icons {{ei,action}} `{{ei,icon-name}}`
-
-Fixes issue [#3171](https://github.com/naturalcrit/homebrewery/issues/3171)
-
-* [x] New {{openSans **{{fas,fa-keyboard}} FONTS**  }} snippets!
-
-Fixes issue [#3171](https://github.com/naturalcrit/homebrewery/issues/3171)
-
-* [x] New page now opens in a new tab
-
-
-##### abquintic (new contributor!)
-
-* [x] Add ^super^ `^abc^` and ^^sub^^ `^^abc^^` syntax.
- 
-Fixes issue [#2171](https://github.com/naturalcrit/homebrewery/issues/2171)
-
-* [x] Add HTML tag assignment to curly syntax `{{tag=value}}`
- 
-Fixes issue [1488](https://github.com/naturalcrit/homebrewery/issues/1488)
-
-* [x] {{openSans **Brew → Clone to New**}} now clones tags
- 
-Fixes issue [1488](https://github.com/naturalcrit/homebrewery/issues/1488)
-
-##### calculuschild
-
-* [x] Better error messages for "Out of Google Drive Storage" and "Not logged in to edit"
-
-Fixes issues [2510](https://github.com/naturalcrit/homebrewery/issues/2510),
-[2975](https://github.com/naturalcrit/homebrewery/issues/2975)
-
-* [x] New Variables syntax. See below for details.
-}}
-
-{{wide
-
-### Brew Variable Syntax
-
-You may already be familiar with `[link](url)` and `![image](url)` syntax. We have expanded this to include a third `$[variable](text)` syntax. All three of these syntaxes now share a common set of features:
-
-{{varSyntaxTable
-| syntax | description |
-|:-------|-------------|
-| `[var]:content`  | Assigns a variable (must start on a line by itself, and ends at the next blank line) |
-| `[var](content)` | Assigns a variable and outputs it (can be inline) |
-| `[var]`  | Outputs the variable contents as a link, if formatted as a valid link |
-| `![var]` | Outputs as an image, if formatted as a valid image                    |
-| `$[var]` | Outputs as Markdown                                          |
-| `$[var1 + var2 - 2 * var3]` | Performs math operations and outputs result if all variables are valid numbers                                     |
-}}
-
-}}
-
-{{wide,margin-top:0,margin-bottom:0
-### Examples
-}}
-
-{{wide,columns:2,margin-top:0,margin-bottom:0
-
-```
-[first]: Bob
-
-[last]: Jones
-
-My name is $[first] $[last].
-```
-
-\column
-
-[first]: Bob
-
-[last]: Jones
-
-My name is $[first] $[last].
-
-}}
-
-{{wide,columns:2,margin-top:0,margin-bottom:0
-
-```
-[myTable]:
-| h1 | h2 |
-|----|----|
-| c1 | c2 |
-
-Here is my table:
-$[myTable]
-```
-
-\column
-
-[myTable]:
-| h1 | h2 |
-|----|----|
-| c1 | c2 |
-
-Here is my table:
-$[myTable]
-}}
-
-{{wide,columns:2,margin-top:0,margin-bottom:0
-
-```
-There are $[TableNum] tables total.
-
-#### Table $[TableNum](1): Horses
-
-#### Table $[TableNum]($[TableNum + 1]): Cows
-```
-
-\column
-
-There are $[TableNum] tables in this document. *(note: final value of `$[TableNum]` gets hoisted up if available)*
-
-
-#### Table $[TableNum](1): Horses
-
-#### Table $[TableNum]($[TableNum + 1]): Cows
-}}
-
-\page
-
 ### Friday 13/10/2023 - v3.10.0
 {{taskList
 

client/admin/stats/stats.jsx

@@ -34,6 +34,8 @@ const Stats = createClass({
 			<dl>
 				<dt>Total Brew Count</dt>
 				<dd>{this.state.stats.totalBrews}</dd>
+				<dt>Total Brews Published Count</dt>
+				<dd>{this.state.stats.totalPublishedBrews || 'no published brews'}</dd>
 			</dl>
 
 			{this.state.fetching

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -89,16 +89,15 @@ const BrewRenderer = (props)=>{
 		}));
 	};
 
-	const isInView = (index)=>{
-		if(!state.isMounted)
-			return false;
-
-		if(index == props.currentEditorPage)	//Already rendered before this step
-			return false;
+	const shouldRender = (index)=>{
+		if(!state.isMounted) return false;
 
 		if(Math.abs(index - state.viewablePageNumber) <= 3)
 			return true;
 
+		if(index + 1 == props.currentEditorPage)
+			return true;
+
 		return false;
 	};
 
@@ -139,7 +138,7 @@ const BrewRenderer = (props)=>{
 			return <BrewPage className='page phb' index={index} key={index} contents={html} />;
 		} else {
 			cleanPageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
-			const html = Markdown.render(cleanPageText, index);
+			const html = Markdown.render(cleanPageText);
 			return <BrewPage className='page' index={index} key={index} contents={html} />;
 		}
 	};
@@ -151,11 +150,8 @@ const BrewRenderer = (props)=>{
 		if(rawPages.length != renderedPages.length) // Re-render all pages when page count changes
 			renderedPages.length = 0;
 
-		// Render currently-edited page first so cross-page effects (variables, links) can propagate out first
-		renderedPages[props.currentEditorPage] = renderPage(rawPages[props.currentEditorPage], props.currentEditorPage);
-
 		_.forEach(rawPages, (page, index)=>{
-			if((isInView(index) || !renderedPages[index]) && typeof window !== 'undefined'){
+			if((shouldRender(index) || !renderedPages[index]) && typeof window !== 'undefined'){
 				renderedPages[index] = renderPage(page, index); // Render any page not yet rendered, but only re-render those in PPR range
 			}
 		});

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -25,10 +25,13 @@ const NotificationPopup = createClass({
 			return (
 				<>
 					<li key='psa'>
-						<em>Don't store IMAGES in Google Drive</em><br />
-						Google Drive is not an image service, and will block images from being used 
-						in brews if they get more views than expected. Google has confirmed they won't fix 
-						this, so we recommend you look for another image hosting service such as imgur, ImgBB or Google Photos.
+						<em>Broken default logo on <b>CoverPage</b> </em> <br />
+						If you have used the Cover Page snippet and notice the Naturalcrit
+						logo is showing as a broken image, this is due to some small tweaks
+						of this BETA feature. To fix the logo in your cover page, rename
+						the image link <b>"/assets/naturalCritLogoRed.svg"</b>. Remember
+						that any snippet marked "BETA" may have a similar change in the
+						future as we encounter any bugs or reworks.
 					</li>
 
 					<li key='googleDriveFolder'>

client/homebrew/homebrew.jsx

@@ -11,6 +11,7 @@ const SharePage = require('./pages/sharePage/sharePage.jsx');
 const NewPage = require('./pages/newPage/newPage.jsx');
 const ErrorPage = require('./pages/errorPage/errorPage.jsx');
 const PrintPage = require('./pages/printPage/printPage.jsx');
+const ArchivePage = require('./pages/archivePage/archivePage.jsx');
 const AccountPage = require('./pages/accountPage/accountPage.jsx');
 
 const WithRoute = (props)=>{
@@ -74,6 +75,7 @@ const Homebrew = createClass({
 						<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} />} />
 						<Route path='/print/:id' element={<WithRoute el={PrintPage} brew={this.props.brew} />} />
 						<Route path='/print' element={<WithRoute el={PrintPage} />} />
+						<Route path='/archive' element={<WithRoute el={ArchivePage}/>}/>
 						<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 						<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} uiItems={this.props.brew.uiItems} />} />

client/homebrew/pages/archivePage/archivePage.jsx

@@ -0,0 +1,201 @@
+require('./archivePage.less');
+
+const React       = require('react');
+const createClass = require('create-react-class');
+const _           = require('lodash');
+const cx          = require('classnames');
+
+const Nav           = require('naturalcrit/nav/nav.jsx');
+const Navbar        = require('../../navbar/navbar.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const Account       = require('../../navbar/account.navitem.jsx');
+const NewBrew       = require('../../navbar/newbrew.navitem.jsx');
+const HelpNavItem   = require('../../navbar/help.navitem.jsx');
+const BrewItem      = require('../basePages/listPage/brewItem/brewItem.jsx');
+
+const request = require('../../utils/request-middleware.js');
+
+const ArchivePage = createClass({
+	displayName     : 'ArchivePage',
+	getDefaultProps : function () {
+		return {};
+	},
+	getInitialState : function () {
+		return {
+			title          : this.props.query.title || '',
+			brewCollection : null,
+			page           : 1,
+			totalPages     : 1,
+			searching      : false,
+			error          : null,
+		};
+	},
+	componentDidMount : function() {
+
+	},
+	handleChange(e) {
+		this.setState({ title: e.target.value });
+	},
+
+	updateStateWithBrews : function (brews, page, totalPages) {
+		this.setState({
+			brewCollection : brews || null,
+			page           : page || 1,
+			totalPages     : totalPages || 1,
+			searching      : false
+		});
+	},
+
+	loadPage : async function(page) {
+		if(this.state.title == '') {} else {
+
+			try {
+				//this.updateUrl();
+				this.setState({ searching: true, error: null });
+				const title = encodeURIComponent(this.state.title);
+				await request.get(`/api/archive?title=${title}&page=${page}`)
+                    .then((response)=>{
+                    	if(response.ok) {
+                    		this.updateStateWithBrews(response.body.brews, page, response.body.totalPages);
+                    	}
+                    });
+			} catch (error) {
+				console.log(`LoadPage error: ${error}`);
+			}
+		}
+	},
+
+	updateUrl : function() {
+		const url = new URL(window.location.href);
+		const urlParams = new URLSearchParams(url.search);
+
+		// Set the title and page parameters
+		urlParams.set('title', this.state.title);
+		urlParams.set('page', this.state.page);
+
+		url.search = urlParams.toString(); // Convert URLSearchParams to string
+		window.history.replaceState(null, null, url);
+	},
+
+	renderFoundBrews() {
+		const { title, brewCollection, page, totalPages, error } = this.state;
+
+		if(title === '') {return (<div className='foundBrews noBrews'><h3>Whenever you want, just start typing...</h3></div>);}
+
+		if(error !== null) {
+			return (
+				<div className='foundBrews noBrews'>
+					<div><h3>I'm sorry, your request didn't work</h3>
+						<br /><p>Your search is not specific enough. Too many brews meet this criteria for us to display them.</p>
+					</div></div>
+			);
+		}
+
+		if(!brewCollection || brewCollection.length === 0) {
+			return (
+				<div className='foundBrews noBrews'>
+					<h3>We haven't found brews meeting your request.</h3>
+				</div>
+			);
+		}
+
+		return (
+			<div className='foundBrews'>
+				<span className='brewCount'>{`Brews Found: ${brewCollection.length}`}</span>
+
+				{brewCollection.map((brew, index)=>(
+					<BrewItem brew={brew} key={index} reportError={this.props.reportError} />
+				))}
+				<div className='paginationControls'>
+					{page > 1 && (
+						<button onClick={()=>this.loadPage(page - 1)}>Previous Page</button>
+					)}
+					<span className='currentPage'>Page {page}</span>
+					{page < totalPages && (
+						<button onClick={()=>this.loadPage(page + 1)}>Next Page</button>
+					)}
+				</div>
+			</div>
+		);
+	},
+
+
+	renderForm : function () {
+		return (
+			<div className='brewLookup'>
+				<h2>Brew Lookup</h2>
+				<label>Title of the brew</label>
+				<input
+					type='text'
+					value={this.state.title}
+					onChange={this.handleChange}
+					onKeyDown={(e)=>{
+						if(e.key === 'Enter') {
+							this.handleChange(e);
+							this.loadPage(1);
+						}
+					}}
+					placeholder='v3 Reference Document'
+				/>
+				{/* In the future, we should be able to filter the results by adding tags.
+            <label>Tags</label><input type='text' value={this.state.query} placeholder='add a tag to filter'/>
+            <input type="checkbox" id="v3" /><label>v3 only</label>
+            */}
+
+				<button onClick={()=>{ this.handleChange({ target: { value: this.state.title } }); this.loadPage(1); }}>
+					<i
+						className={cx('fas', {
+							'fa-search'          : !this.state.searching,
+							'fa-spin fa-spinner' : this.state.searching,
+						})}
+					/>
+				</button>
+			</div>
+		);
+	},
+
+
+
+	renderNavItems : function () {
+		return (
+			<Navbar>
+				<Nav.section>
+					<Nav.item className='brewTitle'>Archive: Search for brews</Nav.item>
+				</Nav.section>
+				<Nav.section>
+					<NewBrew />
+					<HelpNavItem />
+					<RecentNavItem />
+					<Account />
+				</Nav.section>
+			</Navbar>
+		);
+	},
+
+	render : function () {
+		return (
+			<div className='archivePage'>
+				<link href='/themes/V3/Blank/style.css' rel='stylesheet'/>
+			  <link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/>
+				{this.renderNavItems()}
+
+				<div className='content'>
+					<div className='welcome'>
+						<h1>Welcome to the Archive</h1>
+					</div>
+					<div className='flexGroup'>
+						<div className='form dataGroup'>{this.renderForm()}</div>
+						<div className='resultsContainer dataGroup'>
+							<div className='title'>
+								<h2>Your results, my lordship</h2>
+							</div>
+							{this.renderFoundBrews()}
+						</div>
+					</div>
+				</div>
+			</div>
+		);
+	},
+});
+
+module.exports = ArchivePage;

client/homebrew/pages/archivePage/archivePage.less

@@ -0,0 +1,173 @@
+body {
+    height: 100vh;
+
+    .content {
+        height: 100%;
+    }
+}
+
+.archivePage {
+    overflow-y: hidden;
+    height: 100%;
+    background-color: #2C3E50;
+
+    h1,h2,h3 {
+        font-family: 'Open Sans';
+        color: white;
+        font-weight: 900;
+    }
+
+    .content {
+        display: grid;
+        grid-template-rows: 20vh 1fr;
+
+        .welcome {
+            display: grid;
+            place-items: center;
+            background: url('https://i.imgur.com/MJ4YHu7.jpg');
+            background-size: 100%;
+            background-position: center;
+            height: 20vh;
+            border-bottom: 5px solid #333;
+
+            h1 {
+                font-size: 40px;
+                filter:drop-shadow(0 0 5px black);
+            }
+        }
+
+        .flexGroup {
+            height: 100%;
+            display: grid;
+            grid-template-columns: 500px 2fr;
+            background: #2C3E50;
+
+            .dataGroup {
+                width: 100%;
+                height: 100%;
+                background: white;
+
+                &.form .brewLookup {
+                    padding: 50px;
+
+                    h2 {
+                        font-size: 30px;
+                        border-bottom: 2px solid;
+                        margin-block: 20px;
+                    }
+
+                    label {
+                        margin-right: 10px;
+                    }
+
+                    input+button {
+                        margin-left: 20px;
+                    }
+                }
+
+                &.resultsContainer {
+                    display: flex;
+                    flex-direction: column;
+                    border-left: 2px solid;
+                    height: 100%;
+                    font-family: "BookInsanityRemake";
+                    font-size: .34cm;
+
+                    .title {
+                        height: 10vh;
+                        background-color: #333;
+                        display: grid;
+                        place-items: center;
+
+                        h2 {
+                            font-size: 30px;
+                        }
+                    }
+                    .foundBrews {
+                        position: relative;
+                        background-color: #2C3E50;
+                        width: 100%;
+                        max-height: 100%;
+                        height: 66.7vh;
+                        padding: 50px;
+                        overflow-y:scroll;
+
+                        h3 {
+                            font-size: 25px;
+                        }
+
+                        &.noBrews {
+                            display:grid;
+                            place-items:center;
+                        }
+
+                        .brewCount {
+                            position: fixed;
+                            bottom: 0;
+                            right: 17px;
+                            font-size: 11px;
+                            font-weight: 800;
+                            color: white;
+                            background-color: #333;
+                            padding: 8px 10px;
+                            z-index: 1000;
+                            font-family: 'Open Sans';
+                            
+                            &:empty {
+                                display: none;
+                            }
+                        }
+
+                        .limit {
+                            position: fixed;
+                            bottom: 0;
+                            left: 502px;
+                            font-size: 11px;
+                            font-weight: 800;
+                            color: white;
+                            background-color: #333;
+                            padding: 8px 10px;
+                            z-index: 1000;
+                            font-family: 'Open Sans';
+                            
+                            &:empty {
+                                display: none;
+                            }
+                        }
+                        .brewItem {
+                            background-image: url('/assets/parchmentBackground.jpg');
+                            width: 48%;
+                            margin-right: 40px;
+                            color: black;
+
+                            &:nth-child(even) {
+                                margin-right: 0;
+                            }
+                            h2 {
+                                font-size: 0.75cm;
+                                line-height: 0.988em;
+                                font-family: "MrEavesRemake";
+                                font-weight: 800;
+                                color: var(--HB_Color_HeaderText);
+                            }
+
+                            .info {
+                                font-family: ScalySansRemake;
+                                font-size: 1.2em;
+
+                                >span {
+                                    margin-right: 12px;
+                                    line-height: 1.5em;
+                                }
+                            }
+                        }
+
+                        hr {
+                            visibility: hidden;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx

@@ -111,6 +111,8 @@ const BrewItem = createClass({
 			brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings
 		}
 		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
+		const authors = brew.authors.length > 0 ? brew.authors : 'No authors';
+
 
 		return <div className='brewItem'>
 			{brew.thumbnail &&
@@ -135,11 +137,18 @@ const BrewItem = createClass({
 				</> : <></>
 				}
 				<span title={`Authors:\n${brew.authors?.join('\n')}`}>
-					<i className='fas fa-user'/> {brew.authors?.map((author, index)=>(
-  					<>
-    					<a key={index} href={`/user/${author}`}>{author}</a>
-    					{index < brew.authors.length - 1 && ', '}
-  					</>))}
+				<i className='fas fa-user'/> {Array.isArray(authors) ? (
+  					<span>
+    					{authors.map((author, index) => (
+      					<span key={index}>
+        					<a href={`/share/${author}`}>{author}</a>
+        					{index < authors.length - 1 && ', '}
+      					</span>
+    					))}
+  					</span>
+					) : (
+  					<span>{authors}</span>
+					)}
 				</span>
 				<br />
 				<span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}>

client/homebrew/pages/editPage/editPage.jsx

@@ -113,7 +113,7 @@ const EditPage = createClass({
 			brew              : { ...prevState.brew, text: text },
 			isPending         : true,
 			htmlErrors        : htmlErrors,
-			currentEditorPage : this.refs.editor.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
+			currentEditorPage : this.refs.editor.getCurrentPage()
 		}), ()=>{if(this.state.autoSave) this.trySave();});
 	},
 

client/homebrew/pages/homePage/homePage.jsx

@@ -31,10 +31,9 @@ const HomePage = createClass({
 	},
 	getInitialState : function() {
 		return {
-			brew              : this.props.brew,
-			welcomeText       : this.props.brew.text,
-			error             : undefined,
-			currentEditorPage : 0
+			brew        : this.props.brew,
+			welcomeText : this.props.brew.text,
+			error       : undefined
 		};
 	},
 	handleSave : function(){
@@ -54,8 +53,7 @@ const HomePage = createClass({
 	},
 	handleTextChange : function(text){
 		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			currentEditorPage : this.refs.editor.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
+			brew : { ...prevState.brew, text: text }
 		}));
 	},
 	renderNavbar : function(){
@@ -87,12 +85,7 @@ const HomePage = createClass({
 						renderer={this.state.brew.renderer}
 						showEditButtons={false}
 					/>
-					<BrewRenderer
-						text={this.state.brew.text}
-						style={this.state.brew.style}
-						renderer={this.state.brew.renderer}
-						currentEditorPage={this.state.currentEditorPage}
-					/>
+					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer}/>
 				</SplitPane>
 			</div>
 

client/homebrew/pages/newPage/newPage.jsx

@@ -38,12 +38,11 @@ const NewPage = createClass({
 		const brew = this.props.brew;
 
 		return {
-			brew              : brew,
-			isSaving          : false,
-			saveGoogle        : (global.account && global.account.googleId ? true : false),
-			error             : null,
-			htmlErrors        : Markdown.validate(brew.text),
-			currentEditorPage : 0
+			brew       : brew,
+			isSaving   : false,
+			saveGoogle : (global.account && global.account.googleId ? true : false),
+			error      : null,
+			htmlErrors : Markdown.validate(brew.text)
 		};
 	},
 
@@ -105,9 +104,8 @@ const NewPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			htmlErrors        : htmlErrors,
-			currentEditorPage : this.refs.editor.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
+			brew       : { ...prevState.brew, text: text },
+			htmlErrors : htmlErrors
 		}));
 		localStorage.setItem(BREWKEY, text);
 	},
@@ -222,15 +220,7 @@ const NewPage = createClass({
 						onMetaChange={this.handleMetaChange}
 						renderer={this.state.brew.renderer}
 					/>
-					<BrewRenderer
-						text={this.state.brew.text}
-						style={this.state.brew.style}
-						renderer={this.state.brew.renderer}
-						theme={this.state.brew.theme}
-						errors={this.state.htmlErrors}
-						lang={this.state.brew.lang}
-						currentEditorPage={this.state.currentEditorPage}
-					/>
+					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer} theme={this.state.brew.theme} lang={this.state.brew.lang} errors={this.state.htmlErrors}/>
 				</SplitPane>
 			</div>
 		</div>;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "homebrewery",
-  "version": "3.11.0",
+  "version": "3.10.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "homebrewery",
-      "version": "3.11.0",
+      "version": "3.10.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -14,14 +14,13 @@
         "@babel/plugin-transform-runtime": "^7.23.9",
         "@babel/preset-env": "^7.23.9",
         "@babel/preset-react": "^7.23.3",
-        "@googleapis/drive": "^8.7.0",
+        "@googleapis/drive": "^8.6.0",
         "body-parser": "^1.20.2",
         "classnames": "^2.3.2",
         "codemirror": "^5.65.6",
         "cookie-parser": "^1.4.6",
         "create-react-class": "^15.7.0",
         "dedent-tabs": "^0.10.3",
-        "expr-eval": "^2.0.2",
         "express": "^4.18.2",
         "express-async-handler": "^1.2.0",
         "express-static-gzip": "2.1.7",
@@ -30,19 +29,19 @@
         "jwt-simple": "^0.5.6",
         "less": "^3.13.1",
         "lodash": "^4.17.21",
-        "marked": "11.2.0",
+        "marked": "11.1.1",
         "marked-extended-tables": "^1.0.8",
-        "marked-gfm-heading-id": "^3.1.3",
+        "marked-gfm-heading-id": "^3.1.2",
         "marked-smartypants-lite": "^1.0.2",
         "markedLegacy": "npm:marked@^0.3.19",
         "moment": "^2.30.1",
-        "mongoose": "^8.1.3",
+        "mongoose": "^8.1.1",
         "nanoid": "3.3.4",
         "nconf": "^0.12.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-frame-component": "^4.1.3",
-        "react-router-dom": "6.22.1",
+        "react-router-dom": "6.21.3",
         "sanitize-filename": "1.6.3",
         "superagent": "^8.1.2",
         "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
@@ -55,7 +54,7 @@
         "jest-expect-message": "^1.1.3",
         "postcss-less": "^6.0.0",
         "stylelint": "^15.11.0",
-        "stylelint-config-recess-order": "^4.6.0",
+        "stylelint-config-recess-order": "^4.4.0",
         "stylelint-config-recommended": "^13.0.0",
         "stylelint-stylistic": "^0.4.3",
         "supertest": "^6.3.4"
@@ -1967,9 +1966,9 @@
       }
     },
     "node_modules/@googleapis/drive": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.7.0.tgz",
-      "integrity": "sha512-XAi6kfySIU4H3ivX2DpzTDce5UhNke5NxEWCL6tySEdcVqx+cmXJmkMqwfOAHJalEB5s9PPfdLBU29Xd5XlLSQ==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.6.0.tgz",
+      "integrity": "sha512-Af3/5i6h7gbjHnwFuO9zMTpYOy2yhhfZlNciUEjb14L3ZdT1WNIDM038viIAb9ovFzkrIDqLSfUbFCgh1pywkw==",
       "dependencies": {
         "googleapis-common": "^7.0.0"
       },
@@ -2838,9 +2837,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.15.1.tgz",
-      "integrity": "sha512-zcU0gM3z+3iqj8UX45AmWY810l3oUmXM7uH4dt5xtzvMhRtYVhKGOmgOd1877dOPPepfCjUv57w+syamWIYe7w==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -6037,11 +6036,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/expr-eval": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expr-eval/-/expr-eval-2.0.2.tgz",
-      "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg=="
-    },
     "node_modules/express": {
       "version": "4.18.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
@@ -10047,9 +10041,9 @@
       }
     },
     "node_modules/marked": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-11.2.0.tgz",
-      "integrity": "sha512-HR0m3bvu0jAPYiIvLUUQtdg1g6D247//lvcekpHO1WMvbwDlwSkZAX9Lw4F4YHE1T0HaaNve0tuAWuV1UJ6vtw==",
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-11.1.1.tgz",
+      "integrity": "sha512-EgxRjgK9axsQuUa/oKMx5DEY8oXpKJfk61rT5iY3aRlgU6QJtUcxU5OAymdhCvWvhYcd9FKmO5eQoX8m9VGJXg==",
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -10066,14 +10060,14 @@
       }
     },
     "node_modules/marked-gfm-heading-id": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/marked-gfm-heading-id/-/marked-gfm-heading-id-3.1.3.tgz",
-      "integrity": "sha512-A0cRU4PCueX/5m8VE4mT8uTQ36l3xMYRojz3Eqnk4BmUFZ0T+9Xhn2KvHcANP4qbhfOeuMrWJCTQbASIBR5xeg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/marked-gfm-heading-id/-/marked-gfm-heading-id-3.1.2.tgz",
+      "integrity": "sha512-SdIZvhNxDgndFkDa2WRcFP4ahYm6k6hoHdTCN+fD7HRiI/R3Eimcw/Yl7ikQ+0KUuDpi75NnYQiThZnZsNr9Dg==",
       "dependencies": {
         "github-slugger": "^2.0.0"
       },
       "peerDependencies": {
-        "marked": ">=4 <13"
+        "marked": ">=4 <12"
       }
     },
     "node_modules/marked-smartypants-lite": {
@@ -10459,9 +10453,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.3.tgz",
-      "integrity": "sha512-a5MajZSDJiQgy0iQcR+MIpFe7zehGJI4doJ6Dh1MvnGh8/HNNhr5pn07RPA86KCTjP2vuKdffpFmvXxcHiUOjw==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.1.1.tgz",
+      "integrity": "sha512-DbLb0NsiEXmaqLOpEz+AtAsgwhRw6f25gwa1dF5R7jj6lS1D8X6uTdhBSC8GDVtOwe5Tfw2EL7nTn6hiJT3Bgg==",
       "dependencies": {
         "bson": "^6.2.0",
         "kareem": "2.5.1",
@@ -11879,11 +11873,11 @@
       "dev": true
     },
     "node_modules/react-router": {
-      "version": "6.22.1",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.1.tgz",
-      "integrity": "sha512-0pdoRGwLtemnJqn1K0XHUbnKiX0S4X8CgvVVmHGOWmofESj31msHo/1YiqcJWK7Wxfq2a4uvvtS01KAQyWK/CQ==",
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
+      "integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
       "dependencies": {
-        "@remix-run/router": "1.15.1"
+        "@remix-run/router": "1.14.2"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -11893,12 +11887,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.22.1",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.22.1.tgz",
-      "integrity": "sha512-iwMyyyrbL7zkKY7MRjOVRy+TMnS/OPusaFVxM2P11x9dzSzGmLsebkCvYirGq0DWB9K9hOspHYYtDz33gE5Duw==",
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
+      "integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
       "dependencies": {
-        "@remix-run/router": "1.15.1",
-        "react-router": "6.22.1"
+        "@remix-run/router": "1.14.2",
+        "react-router": "6.21.3"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -13333,9 +13327,9 @@
       }
     },
     "node_modules/stylelint-config-recess-order": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-4.6.0.tgz",
-      "integrity": "sha512-V76fhv3YtcNXh/hyAuAdSzi5FmcrG54Mp2AThJ3D/PTMTSYzUPd7GIhP6z9mTqnRhmkk6YTfcu/JWB8h+Yrcaw==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recess-order/-/stylelint-config-recess-order-4.4.0.tgz",
+      "integrity": "sha512-Q99kvZyIM/aoPEV4dRDkzD3fZLzH0LXi+pawCf1r700uUeF/PHQ5PZXjwFUuGrWhOzd1N+cuVm+OUGsY2fRN5A==",
       "dev": true,
       "dependencies": {
         "stylelint-order": "6.x"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.11.0",
+  "version": "3.10.0",
   "engines": {
     "npm": "^10.2.x",
     "node": "^20.8.x"
@@ -26,7 +26,6 @@
     "test:coverage": "jest --coverage --silent --runInBand",
     "test:dev": "jest --verbose --watch",
     "test:basic": "jest tests/markdown/basic.test.js --verbose",
-    "test:variables": "jest tests/markdown/variables.test.js --verbose",
     "test:mustache-syntax": "jest '.*(mustache-syntax).*' --verbose --noStackTrace",
     "test:mustache-syntax:inline": "jest '.*(mustache-syntax).*' -t '^Inline:.*' --verbose --noStackTrace",
     "test:mustache-syntax:block": "jest '.*(mustache-syntax).*' -t '^Block:.*' --verbose --noStackTrace",
@@ -84,14 +83,13 @@
     "@babel/plugin-transform-runtime": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
-    "@googleapis/drive": "^8.7.0",
+    "@googleapis/drive": "^8.6.0",
     "body-parser": "^1.20.2",
     "classnames": "^2.3.2",
     "codemirror": "^5.65.6",
     "cookie-parser": "^1.4.6",
     "create-react-class": "^15.7.0",
     "dedent-tabs": "^0.10.3",
-    "expr-eval": "^2.0.2",
     "express": "^4.18.2",
     "express-async-handler": "^1.2.0",
     "express-static-gzip": "2.1.7",
@@ -100,19 +98,19 @@
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "11.2.0",
+    "marked": "11.1.1",
     "marked-extended-tables": "^1.0.8",
-    "marked-gfm-heading-id": "^3.1.3",
+    "marked-gfm-heading-id": "^3.1.2",
     "marked-smartypants-lite": "^1.0.2",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.30.1",
-    "mongoose": "^8.1.3",
+    "mongoose": "^8.1.1",
     "nanoid": "3.3.4",
     "nconf": "^0.12.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-frame-component": "^4.1.3",
-    "react-router-dom": "6.22.1",
+    "react-router-dom": "6.21.3",
     "sanitize-filename": "1.6.3",
     "superagent": "^8.1.2",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
@@ -125,7 +123,7 @@
     "jest-expect-message": "^1.1.3",
     "postcss-less": "^6.0.0",
     "stylelint": "^15.11.0",
-    "stylelint-config-recess-order": "^4.6.0",
+    "stylelint-config-recess-order": "^4.4.0",
     "stylelint-config-recommended": "^13.0.0",
     "stylelint-stylistic": "^0.4.3",
     "supertest": "^6.3.4"

server/admin.api.js

@@ -84,7 +84,7 @@ router.get('/admin/lookup/:id', mw.adminOnly, async (req, res, next)=>{
 		return res.status(500).json({ error: 'Internal Server Error' });
 	});
 });
-
+  
 /* Find 50 brews that aren't compressed yet */
 router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
 	const query = uncompressedBrewQuery.clone();

server/app.js

@@ -67,6 +67,7 @@ app.use((req, res, next)=>{
 
 app.use(homebrewApi);
 app.use(require('./admin.api.js'));
+app.use(require('./archive.api.js'));
 
 const HomebrewModel     = require('./homebrew.model.js').model;
 const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
@@ -481,6 +482,11 @@ app.use(async (err, req, res, next)=>{
 		res.status(err.status || err.response?.status || 500).send(err);
 		return;
 	}
+	if(err.originalUrl?.startsWith('/archive/')) {
+		// console.log('archive error');
+		res.status(err.status || err.response?.status || 500).send(err);
+		return;
+	}
 
 	// console.log('non-API error');
 	const status = err.status || err.code || 500;
@@ -504,6 +510,8 @@ app.use(async (err, req, res, next)=>{
 	res.send(page);
 });
 
+
+
 app.use((req, res)=>{
 	if(!res.headersSent) {
 		console.error('Headers have not been sent, responding with a server error.', req.url);

server/archive.api.js

@@ -0,0 +1,53 @@
+const HomebrewModel = require('./homebrew.model.js').model;
+const router = require('express').Router();
+const asyncHandler = require('express-async-handler');
+
+const archive = {
+	archiveApi : router,
+	/* Searches for matching title, also attempts to partial match */
+	findBrews  : async (req, res, next)=>{
+		try {
+			const title = req.query.title || '';
+			const page = parseInt(req.query.page) || 1;
+			console.log('try:', page);
+			const pageSize = 10; // Set a default page size
+			const skip = (page - 1) * pageSize;
+
+			const titleQuery = {
+				title     : { $regex: decodeURIComponent(title), $options: 'i' },
+				published : true
+			};
+
+			const projection = {
+				editId   : 0,
+				googleId : 0,
+				text     : 0,
+				textBin  : 0,
+			};
+
+			const brews = await HomebrewModel.find(titleQuery, projection)
+                .skip(skip)
+                .limit(pageSize)
+                .maxTimeMS(5000)
+                .exec();
+
+			if(!brews || brews.length === 0) {
+				// No published documents found with the given title
+				return res.status(404).json({ error: 'Published documents not found' });
+			}
+
+			const totalDocuments = await HomebrewModel.countDocuments(title);
+
+			const totalPages = Math.ceil(totalDocuments / pageSize);
+
+			return res.json({ brews, page, totalPages });
+		} catch (error) {
+			console.error(error);
+			return res.status(500).json({ error: 'Internal Server Error' });
+		}
+	}
+};
+
+router.get('/api/archive', asyncHandler(archive.findBrews));
+
+module.exports = router;

shared/naturalcrit/markdown.js

@@ -4,40 +4,7 @@ const Marked = require('marked');
 const MarkedExtendedTables = require('marked-extended-tables');
 const { markedSmartypantsLite: MarkedSmartypantsLite } = require('marked-smartypants-lite');
 const { gfmHeadingId: MarkedGFMHeadingId } = require('marked-gfm-heading-id');
-const MathParser = require('expr-eval').Parser;
 const renderer = new Marked.Renderer();
-const tokenizer = new Marked.Tokenizer();
-
-//Limit math features to simple items
-const mathParser = new MathParser({
-	operators : {
-		// These default to true, but are included to be explicit
-		add      : true,
-		subtract : true,
-		multiply : true,
-		divide   : true,
-		power    : true,
-		round    : true,
-		floor    : true,
-		ceil     : true,
-
-		sin     : false, cos     : false, tan     : false, asin    : false, acos    : false,
-		atan    : false, sinh    : false, cosh    : false, tanh    : false, asinh   : false,
-		acosh   : false, atanh   : false, sqrt    : false, cbrt    : false, log     : false,
-		log2    : false, ln      : false, lg      : false, log10   : false, expm1   : false,
-		log1p   : false, abs     : false, trunc   : false, join    : false, sum     : false,
-		'-'     : false, '+'     : false, exp     : false, not     : false, length  : false,
-		'!'     : false, sign    : false, random  : false, fac     : false, min     : false,
-		max     : false, hypot   : false, pyt     : false, pow     : false, atan2   : false,
-		'if'    : false, gamma   : false, roundTo : false, map     : false, fold    : false,
-		filter  : false, indexOf : false,
-
-		remainder   : false, factorial   : false,
-		comparison  : false, concatenate : false,
-		logical     : false, assignment  : false,
-		array       : false, fndef       : false
-	}
-});
 
 //Processes the markdown within an HTML block if it's just a class-wrapper
 renderer.html = function (html) {
@@ -83,11 +50,6 @@ renderer.link = function (href, title, text) {
 	return out;
 };
 
-// Disable default reflink behavior, as it steps on our variables extension
-tokenizer.def = function () {
-	return undefined;
-};
-
 const mustacheSpans = {
 	name  : 'mustacheSpans',
 	level : 'inline',                                   // Is this a block-level or inline-level tokenizer?
@@ -326,255 +288,9 @@ const definitionLists = {
 	}
 };
 
-
-//v=====--------------------< Variable Handling >-------------------=====v// 242 lines
-const replaceVar = function(input, hoist=false, allowUnresolved=false) {
-	const regex = /([!$]?)\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g;
-	const match = regex.exec(input);
-
-	const prefix = match[1];
-	const label  = match[2];
-
-	//v=====--------------------< HANDLE MATH >-------------------=====v//
-	const mathRegex = /[a-z]+\(|[+\-*/^()]/g;
-	const matches = label.split(mathRegex);
-	const mathVars = matches.filter((match)=>isNaN(match))?.map((s)=>s.trim()); // Capture any variable names
-
-	let replacedLabel = label;
-
-	if(mathVars?.[0] !== label.trim())  {// If there was mathy stuff not captured, let's do math!
-		mathVars?.forEach((variable)=>{
-			const foundVar = lookupVar(variable, globalPageNumber, hoist);
-			if(foundVar && foundVar.resolved && foundVar.content && !isNaN(foundVar.content)) // Only subsitute math values if fully resolved, not empty strings, and numbers
-				replacedLabel = replacedLabel.replaceAll(variable, foundVar.content);
-		});
-
-		try {
-			return mathParser.evaluate(replacedLabel);
-		} catch (error) {
-			return undefined;		// Return undefined if invalid math result
-		}
-	}
-	//^=====--------------------< HANDLE MATH >-------------------=====^//
-
-	const foundVar = lookupVar(label, globalPageNumber, hoist);
-
-	if(!foundVar || (!foundVar.resolved && !allowUnresolved))
-		return undefined;			// Return undefined if not found, or parially-resolved vars are not allowed
-
-	//                    url or <url>            "title"    or   'title'     or  (title)
-	const linkRegex =  /^([^<\s][^\s]*|<.*?>)(?: ("(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\((?:\\\(|\\\)|[^()])*\)))?$/m;
-	const linkMatch = linkRegex.exec(foundVar.content);
-
-	const href  = linkMatch ? linkMatch[1]               : null; //TODO: TRIM OFF < > IF PRESENT
-	const title = linkMatch ? linkMatch[2]?.slice(1, -1) : null;
-
-	if(!prefix[0] && href)        // Link
-		return `[${label}](${href}${title ? ` "${title}"` : ''})`;
-
-	if(prefix[0] == '!' && href)  // Image
-		return `![${label}](${href} ${title ? ` "${title}"` : ''})`;
-
-	if(prefix[0] == '$')          // Variable
-		return foundVar.content;
-};
-
-const lookupVar = function(label, index, hoist=false) {
-	while (index >= 0) {
-		if(globalVarsList[index]?.[label] !== undefined)
-			return globalVarsList[index][label];
-		index--;
-	}
-
-	if(hoist) {	//If normal lookup failed, attempt hoisting
-		index = Object.keys(globalVarsList).length; // Move index to start from last page
-		while (index >= 0) {
-			if(globalVarsList[index]?.[label] !== undefined)
-				return globalVarsList[index][label];
-			index--;
-		}
-	}
-
-	return undefined;
-};
-
-const processVariableQueue = function() {
-	let resolvedOne = true;
-	let finalLoop   = false;
-	while (resolvedOne || finalLoop) { // Loop through queue until no more variable calls can be resolved
-		resolvedOne = false;
-		for (const item of varsQueue) {
-			if(item.type == 'text')
-				continue;
-
-			if(item.type == 'varDefBlock') {
-				const regex = /[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g;
-				let match;
-				let resolved = true;
-				let tempContent = item.content;
-				while (match = regex.exec(item.content)) { // regex to find variable calls
-					const value = replaceVar(match[0], true);
-
-					if(value == undefined)
-						resolved = false;
-					else
-						tempContent = tempContent.replaceAll(match[0], value);
-				}
-
-				if(resolved == true || item.content != tempContent) {
-					resolvedOne = true;
-					item.content = tempContent;
-				}
-
-				globalVarsList[globalPageNumber][item.varName] = {
-					content  : item.content,
-					resolved : resolved
-				};
-
-				if(resolved)
-					item.type = 'resolved';
-			}
-
-			if(item.type == 'varCallBlock' || item.type == 'varCallInline') {
-				const value = replaceVar(item.content, true, finalLoop); // final loop will just use the best value so far
-
-				if(value == undefined)
-					continue;
-
-				resolvedOne  = true;
-				item.content = value;
-				item.type    = 'text';
-			}
-		}
-		varsQueue = varsQueue.filter((item)=>item.type !== 'resolved'); // Remove any fully-resolved variable definitions
-
-		if(finalLoop)
-			break;
-		if(!resolvedOne)
-			finalLoop   = true;
-	}
-	varsQueue = varsQueue.filter((item)=>item.type !== 'varDefBlock');
-};
-
-function MarkedVariables() {
-	return {
-		hooks : {
-			preprocess(src) {
-				const codeBlockSkip   = /^(?: {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+|^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})(?:[^\n]*)(?:\n|$)(?:|(?:[\s\S]*?)(?:\n|$))(?: {0,3}\2[~`]* *(?=\n|$))|`[^`]*?`/;
-				const blockDefRegex   = /^[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]:(?!\() *((?:\n? *[^\s].*)+)(?=\n+|$)/; //Matches 3, [4]:5
-				const blockCallRegex  = /^[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\](?=\n|$)/;                              //Matches 6, [7]
-				const inlineDefRegex  = /([!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\])\(([^\n]+)\)/;                         //Matches 8, 9[10](11)
-				const inlineCallRegex =  /[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\](?!\()/;                                //Matches 12, [13]
-
-				// Combine regexes and wrap in parens like so: (regex1)|(regex2)|(regex3)|(regex4)
-				const combinedRegex = new RegExp([codeBlockSkip, blockDefRegex, blockCallRegex, inlineDefRegex, inlineCallRegex].map((s)=>`(${s.source})`).join('|'), 'gm');
-
-				let lastIndex = 0;
-				let match;
-				while ((match = combinedRegex.exec(src)) !== null) {
-					// Format any matches into tokens and store
-					if(match.index > lastIndex) { // Any non-variable stuff
-						varsQueue.push(
-							{ type    : 'text',
-								varName : null,
-								content : src.slice(lastIndex, match.index)
-							});
-					}
-					if(match[1]) {
-						varsQueue.push(
-							{ type    : 'text',
-								varName : null,
-								content : match[0]
-							});
-					}
-					if(match[3]) { // Block Definition
-						const label   = match[4] ? match[4].trim().replace(/\s+/g, ' ')    : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-						const content = match[5] ? match[5].trim().replace(/[ \t]+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						varsQueue.push(
-							{ type    : 'varDefBlock',
-								varName : label,
-								content : content
-							});
-					}
-					if(match[6]) { // Block Call
-						const label = match[7] ? match[7].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						varsQueue.push(
-							{ type    : 'varCallBlock',
-								varName : label,
-								content : match[0]
-							});
-					}
-					if(match[8]) { // Inline Definition
-						const label = match[10] ? match[10].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-						let content = match[11] ? match[11].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						// In case of nested (), find the correct matching end )
-						let level = 0;
-						let i;
-						for (i = 0; i < content.length; i++) {
-							if(content[i] === '\\') {
-								i++;
-							} else if(content[i] === '(') {
-								level++;
-							} else if(content[i] === ')') {
-								level--;
-								if(level < 0)
-									break;
-							}
-						}
-						if(i > -1) {
-							combinedRegex.lastIndex = combinedRegex.lastIndex - (content.length - i);
-							content = content.slice(0, i).trim().replace(/\s+/g, ' ');
-						}
-
-						varsQueue.push(
-							{ type    : 'varDefBlock',
-								varName : label,
-								content : content
-							});
-						varsQueue.push(
-							{ type    : 'varCallInline',
-								varName : label,
-								content : match[9]
-							});
-					}
-					if(match[12]) { // Inline Call
-						const label = match[13] ? match[13].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						varsQueue.push(
-							{ type    : 'varCallInline',
-								varName : label,
-								content : match[0]
-							});
-					}
-					lastIndex = combinedRegex.lastIndex;
-				}
-
-				if(lastIndex < src.length) {
-					varsQueue.push(
-						{ type    : 'text',
-							varName : null,
-							content : src.slice(lastIndex)
-						});
-				}
-
-				processVariableQueue();
-
-				const output = varsQueue.map((item)=>item.content).join('');
-				varsQueue = []; // Must clear varsQueue because custom HTML renderer uses Marked.parse which will preprocess again without clearing the array
-				return output;
-			}
-		}
-	};
-};
-//^=====--------------------< Variable Handling >-------------------=====^//
-
-Marked.use(MarkedVariables());
 Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts] });
 Marked.use(mustacheInjectBlock);
-Marked.use({ renderer: renderer, tokenizer: tokenizer, mangle: false });
+Marked.use({ renderer: renderer, mangle: false });
 Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite());
 
 const nonWordAndColonTest = /[^\w:]/g;
@@ -653,28 +369,12 @@ const processStyleTags = (string)=>{
 		`${attributes?.length   ? ` ${attributes.join(' ')}`     : ''}`;
 };
 
-const globalVarsList    = {};
-let varsQueue       = [];
-let globalPageNumber = 0;
-
 module.exports = {
 	marked : Marked,
-	render : (rawBrewText, pageNumber=1)=>{
-		globalVarsList[pageNumber] = {};						//Reset global links for current page, to ensure values are parsed in order
-		varsQueue              = [];						//Could move into MarkedVariables()
-		globalPageNumber        = pageNumber;
-
+	render : (rawBrewText)=>{
 		rawBrewText = rawBrewText.replace(/^\\column$/gm, `\n<div class='columnSplit'></div>\n`)
 														 .replace(/^(:+)$/gm, (match)=>`${`<div class='blank'></div>`.repeat(match.length)}\n`);
-		const opts = Marked.defaults;
-
-		rawBrewText = opts.hooks.preprocess(rawBrewText);
-		const tokens = Marked.lexer(rawBrewText, opts);
-
-		Marked.walkTokens(tokens, opts.walkTokens);
-
-		const html = Marked.parser(tokens, opts);
-		return opts.hooks.postprocess(html);
+		return Marked.parse(rawBrewText);
 	},
 
 	validate : (rawBrewText)=>{

tests/markdown/variables.test.js

@@ -1,373 +0,0 @@
-/* eslint-disable max-lines */
-
-const dedent = require('dedent-tabs').default;
-const Markdown = require('naturalcrit/markdown.js');
-
-// Marked.js adds line returns after closing tags on some default tokens.
-// This removes those line returns for comparison sake.
-String.prototype.trimReturns = function(){
-	return this.replace(/\r?\n|\r/g, '').trim();
-};
-
-renderAllPages = function(pages){
-	const outputs = [];
-	pages.forEach((page, index)=>{
-		const output = Markdown.render(page, index);
-		outputs.push(output);
-	});
-
-	return outputs;
-};
-
-// Adding `.failing()` method to `describe` or `it` will make failing tests "pass" as long as they continue to fail.
-// Remove the `.failing()` method once you have fixed the issue.
-
-describe('Block-level variables', ()=>{
-	it('Handles variable assignment and recall with simple text', function() {
-		const source = dedent`
-			[var]: string
-
-			$[var]
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string</p>');
-	});
-
-	it('Handles variable assignment and recall with multiline string', function() {
-		const source = dedent`
-			[var]: string
-			across multiple
-			lines
-
-			$[var]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string across multiple lines</p>');
-	});
-
-	it('Handles variable assignment and recall with tables', function() {
-		const source = dedent`
-			[var]:
-			##### Title
-			| H1 | H2 | 
-			|:---|:--:|
-			| A  | B  |
-			| C  | D  |
-			
-			$[var]`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<h5 id="title">Title</h5>
-			<table><thead><tr><th align=left>H1</th>
-			<th align=center>H2</th>
-			</tr></thead><tbody><tr><td align=left>A</td>
-			<td align=center>B</td>
-			</tr><tr><td align=left>C</td>
-			<td align=center>D</td>
-			</tr></tbody></table>`.trimReturns());
-	});
-
-	it('Hoists undefined variables', function() {
-		const source = dedent`
-			$[var]
-
-			[var]: string`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string</p>');
-	});
-
-	it('Hoists last instance of variable', function() {
-		const source = dedent`
-			$[var]
-
-			[var]: string
-
-			[var]: new string`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>new string</p>');
-	});
-
-	it('Handles complex hoisting', function() {
-		const source = dedent`
-			$[titleAndName]: $[title] $[fullName]
-
-			$[title]: Mr.
-
-			$[fullName]: $[firstName] $[lastName]
-
-			[firstName]: Bob
-
-			Welcome, $[titleAndName]!
-
-			[lastName]: Jacob
-
-			[lastName]: $[lastName]son
-			`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>Welcome, Mr. Bob Jacobson!</p>');
-	});
-
-	it('Handles variable reassignment', function() {
-		const source = dedent`
-			[var]: one
-
-			$[var]
-
-			[var]: two
-
-			$[var]
-			`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>one</p><p>two</p>'.trimReturns());
-	});
-
-	it('Handles variable reassignment with hoisting', function() {
-		const source = dedent`
-			$[var]
-		
-			[var]: one
-
-			$[var]
-
-			[var]: two
-
-			$[var]
-			`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>two</p><p>one</p><p>two</p>'.trimReturns());
-	});
-
-	it('Ignores undefined variables that can\'t be hoisted', function() {
-		const source = dedent`
-			$[var](My name is $[first] $[last])
-
-			$[last]: Jones
-			`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>My name is $[first] Jones</p>`.trimReturns());
-	});
-});
-
-describe('Inline-level variables', ()=>{
-	it('Handles variable assignment and recall with simple text', function() {
-		const source = dedent`
-			$[var](string)
-
-			$[var]
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string</p><p>string</p>');
-	});
-
-	it('Hoists undefined variables when possible', function() {
-		const source = dedent`
-			$[var](My name is $[name] Jones)
-
-			[name]: Bob`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>My name is Bob Jones</p>');
-	});
-
-	it('Hoists last instance of variable', function() {
-		const source = dedent`
-			$[var](My name is $[name] Jones)
-
-			$[name](Bob)
-
-			[name]: Bill`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>My name is Bill Jones</p> <p>Bob</p>`.trimReturns());
-	});
-
-	it('Only captures nested parens if balanced', function() {
-		const source = dedent`
-			$[var1](A variable (with nested parens) inside)
-
-			$[var1]
-
-			$[var2](A variable ) with unbalanced parens)
-
-			$[var2]`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		<p>A variable (with nested parens) inside</p>
-		<p>A variable (with nested parens) inside</p>
-		<p>A variable with unbalanced parens)</p>
-		<p>A variable</p>
-		`.trimReturns());
-	});
-});
-
-describe('Math', ()=>{
-	it('Handles simple math using numbers only', function() {
-		const source = dedent`
-			$[1 + 3 * 5 - (1 / 4)]
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>15.75</p>');
-	});
-
-	it('Handles round function', function() {
-		const source = dedent`
-			$[round(1/4)]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>0</p>');
-	});
-
-	it('Handles floor function', function() {
-		const source = dedent`
-			$[floor(0.6)]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>0</p>');
-	});
-
-	it('Handles ceil function', function() {
-		const source = dedent`
-			$[ceil(0.2)]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>1</p>');
-	});
-
-	it('Handles nested functions', function() {
-		const source = dedent`
-			$[ceil(floor(round(0.6)))]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>1</p>');
-	});
-
-	it('Handles simple math with variables', function() {
-		const source = dedent`
-			$[num1]: 5
-
-			$[num2]: 4
-
-			Answer is $[answer]($[1 + 3 * num1 - (1 / num2)]).
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>Answer is 15.75.</p>');
-	});
-
-	it('Handles variable incrementing', function() {
-		const source = dedent`
-			$[num1]: 5
-
-			Increment num1 to get $[num1]($[num1 + 1]) and again to $[num1]($[num1 + 1]).
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>Increment num1 to get 6 and again to 7.</p>');
-	});
-});
-
-describe('Code blocks', ()=>{
-	it('Ignores all variables in fenced code blocks', function() {
-		const source = dedent`
-		  \`\`\`
-			[var]: string
-
-			$[var]
-
-			$[var](new string)
-			\`\`\`
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		 <pre><code>
-		 [var]: string
-		 
-		 $[var]
-		 
-		 $[var](new string)
-		 </code></pre>`.trimReturns());
-	});
-
-	it('Ignores all variables in indented code blocks', function() {
-		const source = dedent`
-			test
-
-			    [var]: string
-
-			    $[var]
-
-			    $[var](new string)
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		 <p>test</p>
-
-		 <pre><code>
-		 [var]: string
-		 
-		 $[var]
-		 
-		 $[var](new string)
-		 </code></pre>`.trimReturns());
-	});
-
-	it('Ignores all variables in inline code blocks', function() {
-		const source = '[var](Hello) `[link](url)`. This `[var] does not work`';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><a href="Hello">var</a> <code>[link](url)</code>. This <code>[var] does not work</code></p>`.trimReturns());
-	});
-});
-
-describe('Normal Links and Images', ()=>{
-	it('Renders normal images', function() {
-		const source = `![alt text](url)`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><img src="url" alt="alt text"></p>`.trimReturns());
-	});
-
-	it('Renders normal images with a title', function() {
-		const source = 'An image ![alt text](url "and title")!';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p>An image <img src="url" alt="alt text" title="and title">!</p>`.trimReturns());
-	});
-
-	it('Applies curly injectors to images', function() {
-		const source = `![alt text](url){width:100px}`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><img class="" style="width:100px;" src="url" alt="alt text"></p>`.trimReturns());
-	});
-
-	it('Renders normal links', function() {
-		const source = 'A Link to my [website](url)!';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		<p>A Link to my <a href="url">website</a>!</p>`.trimReturns());
-	});
-
-	it('Renders normal links with a title', function() {
-		const source = 'A Link to my [website](url "and title")!';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		<p>A Link to my <a href="url" title="and title">website</a>!</p>`.trimReturns());
-	});
-});
-
-describe('Cross-page variables', ()=>{
-	it('Handles variable assignment and recall across pages', function() {
-		const source0 = `[var]: string`;
-		const source1 = `$[var]`;
-		const rendered = renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();
-		expect(rendered, `Input:\n${[source0, source1].join('\n\\page\n')}`, { showPrefix: false }).toBe('\\page<p>string</p>');
-	});
-
-	it('Handles hoisting across pages', function() {
-		const source0 = `$[var]`;
-		const source1 = `[var]: string`;
-		renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();	//Requires one full render of document before hoisting is picked up
-		const rendered = renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();
-		expect(rendered, `Input:\n${[source0, source1].join('\n\\page\n')}`, { showPrefix: false }).toBe('<p>string</p>\\page');
-	});
-
-	it('Handles reassignment and hoisting across pages', function() {
-		const source0 = `$[var]\n\n[var]: one\n\n$[var]`;
-		const source1 = `[var]: two\n\n$[var]`;
-		renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();	//Requires one full render of document before hoisting is picked up
-		const rendered = renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();
-		expect(rendered, `Input:\n${[source0, source1].join('\n\\page\n')}`, { showPrefix: false }).toBe('<p>two</p><p>one</p>\\page<p>two</p>');
-	});
-});