extwee 2.0.5 → 2.0.6

package/bin/extwee.js

@@ -15,7 +15,7 @@ const program = new Command();
 
 program
 .name('extwee')
-.version('2.0.5')
+.version('2.0.6')
 .option('-c', 'From Twee into HTML')
 .option('-d', 'From HTML into Twee')
 .option('-s <storyformat>', 'Path to storyformat')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extwee",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "A Twee 3 compiler written in JS.",
   "author": "Dan Cox",
   "main": "index.js",
@@ -22,17 +22,17 @@
   "license": "MIT",
   "dependencies": {
     "commander": "^9.3.0",
-    "node-html-parser": "^1.2.16",
+    "node-html-parser": "^5.3.3",
     "semver": "^7.3.7",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.2",
+    "@babel/core": "^7.18.5",
     "@babel/eslint-parser": "^7.12.1",
     "@babel/eslint-plugin": "^7.12.1",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-transform-runtime": "^7.12.10",
+    "@babel/plugin-transform-runtime": "^7.18.5",
     "@babel/preset-env": "^7.18.2",
     "babel-loader": "^8.2.2",
     "core-js": "^3.22.8",

package/src/HTMLParser.js

@@ -51,6 +51,8 @@ export default class HTMLParser {
       if (Object.prototype.hasOwnProperty.call(storyData.attributes, 'name')) {
         // Create StoryTitle passage based on name
         story.addPassage(new Passage('StoryTitle', storyData.attributes.name));
+        // Set the story name
+        story.name = storyData.attributes.name;
       } else {
         // Name is a required filed. Warn user.
         console.warn('Twine 2 HTML must have a name!');

package/src/HTMLWriter.js

@@ -107,7 +107,7 @@ export default class HTMLWriter {
       // Add text of passages
       storyData += passage.text;
       // Remove from story
-      story.removePassage(passage);
+      story.removePassageByName(passage.name);
     });
 
     // Close the STYLE
@@ -124,7 +124,7 @@ export default class HTMLWriter {
       // Add text of passages
       storyData += passage.text;
       // Remove from story
-      story.removePassage(passage);
+      story.removePassageByName(passage.name);
     });
 
     // Close SCRIPT

package/src/Story.js

@@ -1,7 +1,7 @@
 import Passage from './Passage.js';
 
 const name = 'extwee';
-const version = '2.0.5';
+const version = '2.0.6';
 
 /**
  * @class Story
@@ -369,7 +369,7 @@ export default class Story {
           }
 
           // Test for default value.
-          // (This might occur if using Story directory
+          // (This might occur if using Story directly
           //  outside of using HTMLParser or TweeParser.)
           if (p.pid === -1) {
             // Set the internal counter.
@@ -395,11 +395,11 @@ export default class Story {
    * Remove a passage from the story by name
    *
    * @public
-   * @function removePassage
+   * @function removePassageByName
    * @memberof Story
    * @param {string} name - Passage name to remove
    */
-  removePassage (name) {
+  removePassageByName (name) {
     this.#_passages = this.#_passages.filter(passage => passage.name !== name);
   }
 
@@ -454,7 +454,8 @@ export default class Story {
 
   /**
    * Size (number of passages).
-   * Does not include StoryAuthor, StoryTitle, UserScript, or UserStylesheet passages
+   * Does not include StoryAuthor or StoryTitle.
+   * Does not include passages with 'script' or 'stylesheet' tags.
    *
    * @public
    * @function size
@@ -462,7 +463,26 @@ export default class Story {
    * @returns {number} Return number of passages
    */
   size () {
-    return this.#_passages.length;
+    let count = 0;
+    this.#_passages.forEach((passage) => {
+      // Exclude StoryTitle
+      if (passage.name === 'StoryTitle') {
+        return;
+      }
+
+      // Exclude if 'script' tags exists
+      if (passage.tags.includes('script')) {
+        return;
+      }
+
+      // Exclude if 'stylesheet' exists
+      if (passage.tags.includes('stylesheet')) {
+        return;
+      }
+
+      count++;
+    });
+    return count;
   }
 
   /**
@@ -482,6 +502,20 @@ export default class Story {
 
     // Use internal forEach
     this.#_passages.forEach((element, index) => {
+      // Exclude StoryTitle
+      if (element.name === 'StoryTitle') {
+        return;
+      }
+
+      // Exclude if 'script' tags exists
+      if (element.tags.includes('script')) {
+        return;
+      }
+
+      // Exclude if 'stylesheet' exists
+      if (element.tags.includes('stylesheet')) {
+        return;
+      }
       // Call callback function with element and index
       callback(element, index);
     });

package/src/TweeWriter.js

@@ -81,12 +81,35 @@ export default class TweeWriter {
     // Add two newlines.
     outputContents += '\n\n';
 
+    // Look for StoryTitle
+    const storyTitlePassage = story.getPassageByName('StoryTitle');
+
+    // Does it exist?
+    if (storyTitlePassage !== null) {
+      // Append StoryTitle content
+      outputContents += storyTitlePassage.toString();
+    }
+
     // For each passage, append it to the output.
     story.forEach((passage) => {
       // For each passage, append it to the output.
       outputContents += passage.toString();
     });
 
+    // Look for 'script' passages
+    const scriptPassages = story.getPassagesByTag('script');
+    // For each 'script', add it back
+    scriptPassages.forEach(passage => {
+      outputContents += passage.toString();
+    });
+
+    // Look for 'stylesheet' passages
+    const stylesheetPassages = story.getPassagesByTag('stylesheet');
+    // For each 'stylesheet', add it back
+    stylesheetPassages.forEach(passage => {
+      outputContents += passage.toString();
+    });
+
     try {
       // Try to write
       fs.writeFileSync(file, outputContents);

package/test/CLI/test2.html

@@ -11,12 +11,10 @@
 
 <tw-story></tw-story>
 
-<tw-storydata name="twineExample" startnode="2" creator="extwee" creator-version="2.0.5" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="0" format="Harlowe" format-version="3.0.2" options hidden>
+<tw-storydata name="twineExample" startnode="2" creator="extwee" creator-version="2.0.6" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="0" format="Harlowe" format-version="3.0.2" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css">body {background-color: green;}</style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
-	<tw-passagedata pid="1" name="StoryTitle">twineExample</tw-passagedata>
 	<tw-passagedata pid="2" name="Start" tags="tag tags"  position="200,200" size="100,100" >Content</tw-passagedata>
-	<tw-passagedata pid="3" name="Style1" tags="stylesheet" >body {background-color: green;}</tw-passagedata>
 </tw-storydata>
 
 <script title="Twine engine code" data-main="harlowe">"use strict";function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function _toConsumableArray(e){if(Array.isArray(e)){for(var t=0,n=Array(e.length);t<e.length;t++)n[t]=e[t];return n}return Array.from(e)}var _slicedToArray=function(){function e(e,t){var n=[],r=!0,i=!1,o=void 0;try{for(var a,s=e[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){i=!0,o=e}finally{try{!r&&s.return&&s.return()}finally{if(i)throw o}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};!function(){/**

package/test/CLI.test.js

@@ -6,23 +6,23 @@ import shell from 'shelljs';
 const currentPath = shell.pwd().stdout;
 const testFilePath = currentPath + '/test/CLI';
 
-describe('CLI', function () {
+describe('CLI', () => {
   // Remove the test files, if they exist
-  beforeAll(function () {
+  beforeAll(() => {
     shell.rm(`${testFilePath}/test.*`);
   });
 
   // Test generating Twee files
-  describe('Decompile', function () {
-    test('Decompile: HTML into Twee', function () {
+  describe('Decompile', () => {
+    it('Decompile: HTML into Twee', () => {
       shell.exec(`node ${currentPath}/bin/extwee.js -d -i ${testFilePath}/input.html -o ${testFilePath}/test.twee`);
       expect(shell.test('-e', `${testFilePath}/test.twee`)).toBe(true);
     });
   });
 
   // Test generating HTML files
-  describe('Compile', function () {
-    test('Compile: Twee + StoryFormat into Twee', function () {
+  describe('Compile', () => {
+    it('Compile: Twee + StoryFormat into Twee', () => {
       shell.exec(`node ${currentPath}/bin/extwee.js -c -i ${testFilePath}/example6.twee -s ${testFilePath}/harlowe.js -o ${testFilePath}/test2.html`);
       expect(shell.test('-e', `${testFilePath}/test2.html`)).toBe(true);
     });

package/test/FileReader.test.js

@@ -1,12 +1,12 @@
 import FileReader from '../src/FileReader.js';
 
-describe('FileReader', function () {
-  describe('#readFile()', function () {
-    test('Should throw error if file not found', function () {
+describe('FileReader', () => {
+  describe('#readFile()', () => {
+    it('Should throw error if file not found', () => {
       expect(() => { FileReader.read('test/FileReader/t2.txt'); }).toThrow();
     });
 
-    test('Should read the contents of a file', function () {
+    it('Should read the contents of a file', () => {
       const fr = FileReader.read('test/FileReader/t1.txt');
       expect(fr).toBe('Gibberish');
     });

package/test/HTMLParser/twineExample.html

@@ -6,10 +6,18 @@
 </head>
 <body>
 <tw-story></tw-story>
-<tw-storydata name="twineExample" startnode="1" creator="Twine" creator-version="2.2.1" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="1" format="Harlowe" format-version="2.1.0" options="" hidden><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style><script role="script" id="twine-user-script" type="text/twine-javascript"></script><tw-passagedata pid="1" name="Start" tags="" position="102,104" size="100,100">[[Another passage]]
+<tw-storydata name="twineExample" startnode="1" creator="Twine" creator-version="2.2.1" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="1" format="Harlowe" format-version="2.1.0" options="" hidden>
+    <style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
+    <script role="script" id="twine-user-script" type="text/twine-javascript"></script>
+    <tw-passagedata pid="1" name="Start" tags="" position="102,104" size="100,100">[[Another passage]]
 
-[[A third passage]]</tw-passagedata><tw-passagedata pid="2" name="Another passage" tags="" position="353,60" size="100,100">[[A fourth passage]]
+[[A third passage]]</tw-passagedata>
+<tw-passagedata pid="2" name="Another passage" tags="" position="353,60" size="100,100">[[A fourth passage]]
 
-[[A third passage]] </tw-passagedata><tw-passagedata pid="3" name="A third passage" tags="" position="350,288" size="100,100">[[Start]]</tw-passagedata><tw-passagedata pid="4" name="A fourth passage" tags="" position="587,197" size="100,100">[[A fifth passage]]</tw-passagedata><tw-passagedata pid="5" name="A fifth passage" tags="" position="800,306" size="100,100">Double-click this passage to edit it.</tw-passagedata></tw-storydata>
+[[A third passage]] </tw-passagedata>
+<tw-passagedata pid="3" name="A third passage" tags="" position="350,288" size="100,100">[[Start]]</tw-passagedata>
+<tw-passagedata pid="4" name="A fourth passage" tags="" position="587,197" size="100,100">[[A fifth passage]]</tw-passagedata>
+<tw-passagedata pid="5" name="A fifth passage" tags="" position="800,306" size="100,100">Double-click this passage to edit it.</tw-passagedata>
+</tw-storydata>
 </body>
 </html>

package/test/HTMLParser.test.js

@@ -5,111 +5,111 @@ import HTMLParser from '../src/HTMLParser.js';
 // These are used as the 'creator' and 'creator-version'.
 const { version } = JSON.parse(FileReader.read('package.json'));
 
-describe('HTMLParser', function () {
-  describe('#parse()', function () {
-    test('Should throw error if content is not Twine-2 style HTML', function () {
+describe('HTMLParser', () => {
+  describe('#parse()', () => {
+    it('Should throw error if content is not Twine-2 style HTML', () => {
       expect(() => { HTMLParser.parse(''); }).toThrow();
     });
 
-    test('Should be able to parse Twine 2 HTML for story name', function () {
+    it('Should be able to parse Twine 2 HTML for story name', () => {
       const fr = FileReader.read('test/HTMLParser/twineExample.html');
       const story = HTMLParser.parse(fr);
       const storyTitle = story.getPassageByName('StoryTitle');
       expect(storyTitle.text).toBe('twineExample');
     });
 
-    test('Should be able to parse Twine 2 HTML for correct number of passages', function () {
+    it('Should be able to parse Twine 2 HTML for correct number of passages', () => {
       const fr = FileReader.read('test/HTMLParser/twineExample.html');
       const tp = HTMLParser.parse(fr);
-      expect(tp.size()).toBe(6);
+      expect(tp.size()).toBe(5);
     });
 
-    test('Should be able to correctly parse passage tags', function () {
+    it('Should be able to correctly parse passage tags', () => {
       const fr = FileReader.read('test/HTMLParser/Tags.html');
       const story = HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(p.tags).toHaveLength(2);
     });
 
-    test('Should set a missing name to Untitled', function () {
+    it('Should set a missing name to Untitled', () => {
       const fr = FileReader.read('test/HTMLParser/missingName.html');
       const story = HTMLParser.parse(fr);
       const p = story.getPassageByName('StoryTitle');
       expect(p.text).toBe('Untitled');
     });
 
-    test('Should set a missing IFID to an empty string', function () {
+    it('Should set a missing IFID to an empty string', () => {
       const fr = FileReader.read('test/HTMLParser/missingIFID.html');
       const tp = HTMLParser.parse(fr);
       expect(tp.IFID).toBe('');
     });
 
-    test('Should have Extwee for creator when missing', function () {
+    it('Should have Extwee for creator when missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingCreator.html');
       const tp = HTMLParser.parse(fr);
       expect(tp.creator).toBe('extwee');
     });
 
-    test('Should have correct for creatorVersion when missing', function () {
+    it('Should have correct for creatorVersion when missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingCreatorVersion.html');
       const tp = HTMLParser.parse(fr);
       expect(tp.creatorVersion).toBe(version);
     });
 
-    test('Should have empty string as format when missing', function () {
+    it('Should have empty string as format when missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingFormat.html');
       const tp = HTMLParser.parse(fr);
       expect(tp.format).toBe('');
     });
 
-    test('Should have empty string as formatVersion when missing', function () {
+    it('Should have empty string as formatVersion when missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingFormatVersion.html');
       const tp = HTMLParser.parse(fr);
       expect(tp.formatVersion).toBe('');
     });
 
-    test('Should have empty string as zoom when missing', function () {
+    it('Should have empty string as zoom when missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingZoom.html');
       const tp = HTMLParser.parse(fr);
       expect(tp.zoom).toBe(0);
     });
 
-    test('Should not have position if passage does not', function () {
+    it('Should not have position if passage does not', () => {
       const fr = FileReader.read('test/HTMLParser/missingPosition.html');
       const story = HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(Object.prototype.hasOwnProperty.call(p.metadata, 'position')).toBe(false);
     });
 
-    test('Should not have size if passage does not', function () {
+    it('Should not have size if passage does not', () => {
       const fr = FileReader.read('test/HTMLParser/missingSize.html');
       const story = HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(Object.prototype.hasOwnProperty.call(p.metadata, 'size')).toBe(false);
     });
 
-    test('Should have empty array as tags if tags is missing', function () {
+    it('Should have empty array as tags if tags is missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingPassageTags.html');
       const story = HTMLParser.parse(fr);
       const p = story.getPassageByName('Untitled Passage');
       expect(p.tags).toHaveLength(0);
     });
 
-    test('Should not have stylesheet tag if no passages exist with it', function () {
+    it('Should not have stylesheet tag if no passages exist with it', () => {
       const fr = FileReader.read('test/HTMLParser/missingStyle.html');
       const story = HTMLParser.parse(fr);
       const passages = story.getPassagesByTag('stylesheet');
       expect(passages.length).toBe(0);
     });
 
-    test('Should not have script tag if no passages exist with it', function () {
+    it('Should not have script tag if no passages exist with it', () => {
       const fr = FileReader.read('test/HTMLParser/missingScript.html');
       const story = HTMLParser.parse(fr);
       const passages = story.getPassagesByTag('script');
       expect(passages.length).toBe(0);
     });
 
-    test('Should have script and style tags normally', function () {
+    it('Should have script and style tags normally', () => {
       const fr = FileReader.read('test/HTMLParser/Example1.html');
       const story = HTMLParser.parse(fr);
       const scriptPassages = story.getPassagesByTag('script');
@@ -118,27 +118,27 @@ describe('HTMLParser', function () {
       expect(stylesheetPassages.length).toBe(1);
     });
 
-    test('Should not have start property if startNode does not exist when parsed', function () {
+    it('Should not have start property if startNode does not exist when parsed', () => {
       const fr = FileReader.read('test/HTMLParser/missingStartnode.html');
       const story = HTMLParser.parse(fr);
       expect(story.start).toBe('');
     });
 
-    test('Should not add passages without names', function () {
+    it('Should not add passages without names', () => {
       const fr = FileReader.read('test/HTMLParser/missingPassageName.html');
       const story = HTMLParser.parse(fr);
       // There is only one passage, StoryTitle
-      expect(story.size()).toBe(1);
+      expect(story.size()).toBe(0);
     });
 
-    test('Should not add passages without PID', function () {
+    it('Should not add passages without PID', () => {
       const fr = FileReader.read('test/HTMLParser/missingPID.html');
       const story = HTMLParser.parse(fr);
       // There is only one passage, StoryTitle
-      expect(story.size()).toBe(1);
+      expect(story.size()).toBe(0);
     });
 
-    test('Parse tag colors', function () {
+    it('Parse tag colors', () => {
       const fr = FileReader.read('test/HTMLParser/tagColors.html');
       const story = HTMLParser.parse(fr);
       // Test for tag colors
@@ -146,21 +146,21 @@ describe('HTMLParser', function () {
       expect(tagColors.a).toBe('red');
     });
 
-    test('Will not set start if startnode is missing', function () {
+    it('Will not set start if startnode is missing', () => {
       const fr = FileReader.read('test/HTMLParser/missingStartnode.html');
       const story = HTMLParser.parse(fr);
       // Test for default start
       expect(story.start).toBe('');
     });
 
-    test('Throw error when startnode has PID that does not exist', function () {
+    it('Throw error when startnode has PID that does not exist', () => {
       const fr = FileReader.read('test/HTMLParser/lyingStartnode.html');
       expect(() => {
         HTMLParser.parse(fr);
       }).toThrow();
     });
 
-    test('Do not update name and color if those attributes do not exist', function () {
+    it('Do not update name and color if those attributes do not exist', () => {
       const fr = FileReader.read('test/HTMLParser/lyingTagColors.html');
       const story = HTMLParser.parse(fr);
       const tagColorProperties = Object.keys(story.tagColors).length;
@@ -168,8 +168,8 @@ describe('HTMLParser', function () {
     });
   });
 
-  describe('#escapeMetacharacters()', function () {
-    test('Should escape metacharacters', function () {
+  describe('#escapeMetacharacters()', () => {
+    it('Should escape metacharacters', () => {
       /* eslint no-useless-escape: "off" */
       expect(HTMLParser.escapeMetacharacters('\\\{\\\}\\\[\\\]\\\\')).toBe('\\\\{\\\\}\\\\[\\\\]\\\\');
     });

package/test/HTMLWriter/creator.html

@@ -9,12 +9,11 @@
 	</head>
 	<body>
 		<tw-story tags></tw-story>
-		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.0.5" ifid="827B82ED-3279-4429-BCB6-3800F7AD3D2C" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
+		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.0.6" ifid="AE48EB3C-00FE-41CF-A659-E48068758B06" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="1" name="A"></tw-passagedata>
 	<tw-passagedata pid="2" name="B"></tw-passagedata>
-	<tw-passagedata pid="3" name="StoryTitle">Title</tw-passagedata>
 	<tw-passagedata pid="4" name="Start">Content</tw-passagedata>
 </tw-storydata>
 		<script>

package/test/HTMLWriter/test11.html

@@ -100,12 +100,10 @@ var saveAs=saveAs||navigator.msSaveBlob&&navigator.msSaveBlob.bind(navigator)||f
 		<div id="init-lacking">Your browser lacks required capabilities. Please upgrade it or switch to another to continue.</div>
 		<div id="init-loading"><div>Loading&hellip;</div></div>
 	</div>
-	<tw-storydata name="twineExample" startnode="2" creator="extwee" creator-version="2.0.5" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="0" format="SugarCube" format-version="2.31.1" options hidden>
+	<tw-storydata name="twineExample" startnode="2" creator="extwee" creator-version="2.0.6" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="0" format="SugarCube" format-version="2.31.1" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css">body {background-color: green;}</style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
-	<tw-passagedata pid="1" name="StoryTitle">twineExample</tw-passagedata>
 	<tw-passagedata pid="2" name="Start" tags="tag tags"  position="200,200" size="100,100" >Content</tw-passagedata>
-	<tw-passagedata pid="3" name="Style1" tags="stylesheet" >body {background-color: green;}</tw-passagedata>
 </tw-storydata>
 	<script id="script-sugarcube" type="text/javascript">
 	/*! SugarCube JS */

package/test/HTMLWriter/test2.html

@@ -12,7 +12,6 @@
 		<tw-storydata name="twineExample" startnode="1" creator="Twine" creator-version="2.2.1" ifid="2B68ECD6-348F-4CF5-96F8-549A512A8128" zoom="1" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css">html{font-size: 1.2em;}</style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript">window.test = {};</script>
-	<tw-passagedata pid="1" name="StoryTitle">twineExample</tw-passagedata>
 	<tw-passagedata pid="1" name="Start" position="102,104" size="100,100" >[[Another passage]]
 
 [[A third passage]]</tw-passagedata>
@@ -22,8 +21,6 @@
 	<tw-passagedata pid="3" name="A third passage" position="350,288" size="100,100" >[[Start]]</tw-passagedata>
 	<tw-passagedata pid="4" name="A fourth passage" position="587,197" size="100,100" >[[A fifth passage]]</tw-passagedata>
 	<tw-passagedata pid="5" name="A fifth passage" position="800,306" size="100,100" >Double-click this passage to edit it.</tw-passagedata>
-	<tw-passagedata pid="2" name="UserStylesheet" tags="stylesheet" >html{font-size: 1.2em;}</tw-passagedata>
-	<tw-passagedata pid="3" name="UserScript" tags="script" >window.test = {};</tw-passagedata>
 </tw-storydata>
 		<script>
 		(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){

package/test/HTMLWriter/test3.html

@@ -12,7 +12,6 @@
 		<tw-storydata name="TestTags" startnode="1" creator="Twine" creator-version="2.3.9" ifid="5B4E374F-E8B0-4FBB-A78E-A4150401BF24" zoom="1" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
-	<tw-passagedata pid="1" name="StoryTitle">TestTags</tw-passagedata>
 	<tw-passagedata pid="1" name="Untitled Passage" tags="one"  position="199,100" size="100,100" >[[Another]]</tw-passagedata>
 	<tw-passagedata pid="2" name="Another" tags="two three"  position="399,99" size="100,100" >Double-click this passage to edit it.</tw-passagedata>
 </tw-storydata>

package/test/HTMLWriter/test4.html

@@ -9,12 +9,11 @@
 	</head>
 	<body>
 		<tw-story tags></tw-story>
-		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.0.5" ifid="A1B257B5-F799-4618-9683-07B9F6BB6CE2" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
+		<tw-storydata name="Title" startnode="4" creator="extwee" creator-version="2.0.6" ifid="1096FE8A-C8B0-4485-8628-61B25490AB7E" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="1" name="A"></tw-passagedata>
 	<tw-passagedata pid="2" name="B"></tw-passagedata>
-	<tw-passagedata pid="3" name="StoryTitle">Title</tw-passagedata>
 	<tw-passagedata pid="4" name="Start">Content</tw-passagedata>
 </tw-storydata>
 		<script>

package/test/HTMLWriter/test6.html

@@ -9,11 +9,10 @@
 	</head>
 	<body>
 		<tw-story tags></tw-story>
-		<tw-storydata name="Name" startnode="3" creator="extwee" creator-version="2.0.5" ifid="64851070-16F0-410B-8C27-F90668C994BC" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
+		<tw-storydata name="Name" startnode="3" creator="extwee" creator-version="2.0.6" ifid="AD1FF443-CFE8-4651-99AD-FD9E1DCB0304" zoom="0" format="Snowman" format-version="2.0.0" options hidden>
 	<style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>
 	<script role="script" id="twine-user-script" type="text/twine-javascript"></script>
 	<tw-passagedata pid="1" name="A"></tw-passagedata>
-	<tw-passagedata pid="2" name="StoryTitle">Name</tw-passagedata>
 	<tw-passagedata pid="3" name="Start">Content</tw-passagedata>
 </tw-storydata>
 		<script>

package/test/HTMLWriter.test.js

@@ -38,10 +38,8 @@ describe('HTMLWriter', () => {
       // Parse HTML.
       const story2 = HTMLParser.parse(fr3);
 
-      const s2Title = story2.getPassageByName('StoryTitle').text;
-
       // Test both names to be the same.
-      expect(s1Title).toBe(s2Title);
+      expect(s1Title).toBe(story2.name);
     });
 
     it('Should write one and two-tag passages', () => {