npm - extwee - Versions diffs - 2.3.14 → 2.3.15 - Mend

extwee 2.3.14 → 2.3.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/CHANGELOG.md +8 -0
package/build/extwee.core.min.js +1 -1
package/build/extwee.twine1html.min.js +1 -1
package/build/extwee.twine2archive.min.js +1 -1
package/build/extwee.tws.min.js +1 -1
package/logs/arrays.html +79 -0
package/logs/arrays.twee +64 -0
package/logs/example.html +47 -0
package/logs/fixing.js +23 -0
package/logs/format-fixed.js +8 -0
package/logs/format.js +8 -0
package/logs/test-entities.cjs +40 -0
package/package.json +23 -23
package/src/CLI/ProcessConfig/loadStoryFormat.js +8 -0
package/src/CLI/ProcessConfig/readDirectories.js +1 -3
package/src/Config/parser.js +6 -6
package/src/Config/reader.js +2 -2
package/src/JSON/parse.js +2 -2
package/src/Passage.js +44 -41
package/src/Story.js +40 -35
package/src/StoryFormat/parse.js +2 -2
package/src/StoryFormat.js +11 -4
package/src/TWS/parse.js +2 -2
package/src/Twee/parse.js +3 -3
package/src/Twine1HTML/compile.js +9 -9
package/types/src/Passage.d.ts +44 -41
package/types/src/Story.d.ts +32 -24
package/types/src/StoryFormat.d.ts +11 -4

package/logs/test-entities.cjs ADDED Viewed

@@ -0,0 +1,40 @@
+const jsdom = require('jsdom');
+const { JSDOM } = jsdom;
+// Test in a DOM context
+const dom = new JSDOM('<!DOCTYPE html><html><body></body></html>');
+const doc = dom.window.document;
+// Create elements with both encodings
+const div1 = doc.createElement('div');
+div1.setAttribute('data-test', 'test&apos;value');
+const div2 = doc.createElement('div');
+div2.setAttribute('data-test', 'test&#39;value');
+console.log('div1 getAttribute:', div1.getAttribute('data-test'));
+console.log('div2 getAttribute:', div2.getAttribute('data-test'));
+console.log('Are they equal?', div1.getAttribute('data-test') === div2.getAttribute('data-test'));
+// Test with innerHTML
+div1.innerHTML = 'Text with &apos;quote&apos;';
+div2.innerHTML = 'Text with &#39;quote&#39;';
+console.log('div1 textContent:', div1.textContent);
+console.log('div2 textContent:', div2.textContent);
+console.log('Text content equal?', div1.textContent === div2.textContent);
+// Test parsing HTML with both
+const html1 = '<tw-passagedata name="Test" data-value="It&apos;s">Content</tw-passagedata>';
+const html2 = '<tw-passagedata name="Test" data-value="It&#39;s">Content</tw-passagedata>';
+const container1 = doc.createElement('div');
+const container2 = doc.createElement('div');
+container1.innerHTML = html1;
+container2.innerHTML = html2;
+const passage1 = container1.querySelector('tw-passagedata');
+const passage2 = container2.querySelector('tw-passagedata');
+console.log('\nParsing tw-passagedata:');
+console.log('passage1 data-value:', passage1.getAttribute('data-value'));
+console.log('passage2 data-value:', passage2.getAttribute('data-value'));
+console.log('Attributes equal?', passage1.getAttribute('data-value') === passage2.getAttribute('data-value'));

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "extwee",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "description": "A story compiler tool using Twine-compatible formats",
   "author": "Dan Cox",
   "main": "index.js",
@@ -17,11 +17,11 @@
   },
   "scripts": {
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand",
-    "lint": "eslint ./src/**/*.js --fix",
-    "lint:test": "eslint ./test/**/*.test.js --fix",
+    "lint": "eslint \"./src/**/*.js\" --fix",
+    "lint:test": "eslint \"./test/**/*.test.js\" --fix",
     "build:web": "webpack",
     "analyze:web": "webpack-bundle-analyzer build/extwee.web.min.js",
-    "gen-types": "npx -p typescript tsc src/**/*.js --declaration --allowJs --emitDeclarationOnly --outDir types",
+    "gen-types": "npx -p typescript tsc src/**/*.js --declaration --allowJs --emitDeclarationOnly --outDir types --skipLibCheck",
     "copy:build": "cp build/*.js docs/build",
     "all": "npm run lint && npm run lint:test && npm run test && npm run build:web && npm run gen-types && npm run copy:build"
   },
@@ -36,34 +36,34 @@
     "commander": "^14.0.3",
     "graphemer": "^1.4.0",
     "html-entities": "^2.6.0",
-    "node-html-parser": "^7.0.2",
+    "node-html-parser": "^7.1.0",
     "pickleparser": "^0.2.1",
-    "semver": "^7.7.3",
-    "shelljs": "^0.10.0"
+    "semver": "^7.7.4"
   },
   "devDependencies": {
     "@babel/cli": "^7.28.6",
     "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
-    "@eslint/js": "^9.39.2",
-    "@inquirer/prompts": "^8.2.0",
-    "@types/node": "^25.2.0",
+    "@babel/preset-env": "^7.29.2",
+    "@eslint/js": "^10.0.1",
+    "@inquirer/prompts": "^8.3.2",
+    "@types/node": "^25.5.0",
     "@types/semver": "^7.7.1",
-    "babel-loader": "^10.0.0",
+    "babel-loader": "^10.1.1",
     "clean-jsdoc-theme": "^4.3.0",
-    "core-js": "^3.48.0",
-    "eslint": "^9.39.2",
-    "eslint-plugin-jest": "^29.12.1",
-    "eslint-plugin-jsdoc": "^62.5.0",
-    "globals": "^17.3.0",
-    "jest": "^30.2.0",
-    "jest-environment-jsdom": "^30.2.0",
+    "core-js": "^3.49.0",
+    "eslint": "^10.1.0",
+    "eslint-plugin-jest": "^29.15.1",
+    "eslint-plugin-jsdoc": "^62.8.1",
+    "globals": "^17.4.0",
+    "jest": "^30.3.0",
+    "jest-environment-jsdom": "^30.3.0",
     "regenerator-runtime": "^0.14.1",
+    "shelljs": "^0.10.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.54.0",
-    "webpack": "^5.104.1",
-    "webpack-bundle-analyzer": "^5.2.0",
-    "webpack-cli": "^6.0.1"
+    "typescript-eslint": "^8.57.2",
+    "webpack": "^5.105.4",
+    "webpack-bundle-analyzer": "^5.3.0",
+    "webpack-cli": "^7.0.2"
   },
   "repository": {
     "type": "git",

package/src/CLI/ProcessConfig/loadStoryFormat.js CHANGED Viewed

@@ -23,6 +23,14 @@ import { readFileSync } from "node:fs";
  * // Output: The contents of the format.js file.
  */
 export function loadStoryFormat(storyFormatName, storyFormatVersion) {
+    // Validate path components to prevent path traversal.
+    if (/[/\\]|\.\./.test(storyFormatName)) {
+        throw new Error('Error: story format name contains invalid characters.');
+    }
+    if (/[/\\]|\.\./.test(storyFormatVersion)) {
+        throw new Error('Error: story format version contains invalid characters.');
+    }
     // If the story-formats directory does not exist, throw error.
     if (isDirectory('story-formats') === false) {
         throw new Error(`Error: story-formats directory does not exist. Consider running 'npx sfa-get' to download the latest story formats.`);

package/src/CLI/ProcessConfig/readDirectories.js CHANGED Viewed

@@ -11,9 +11,6 @@ import { isDirectory } from '../isDirectory.js';
  */
 export function readDirectories(directory) {
-    // Create default response.
-    let results = [];
     // Check if the directory exists.
     const isDir = isDirectory(directory);
     // If the directory does not exist, return an empty array
@@ -23,6 +20,7 @@ export function readDirectories(directory) {
     }
     // Read the directory and return the list of files.
+    let results;
     try {
         results = readdirSync(directory);
     } catch (error) {

package/src/Config/parser.js CHANGED Viewed

@@ -20,34 +20,34 @@ export function parser(obj) {
     };
     // Does the object contain 'StoryFormat'?
-    if (Object.hasOwnProperty.call(obj, 'story-format')) {
+    if (Object.prototype.hasOwnProperty.call(obj, 'story-format')) {
         results.StoryFormat = obj['story-format'];
     }
     // Does the object contain 'StoryFormatVersion'?
-    if (Object.hasOwnProperty.call(obj, 'story-format-version')) {
+    if (Object.prototype.hasOwnProperty.call(obj, 'story-format-version')) {
         results.StoryFormatVersion = obj['story-format-version'];
     } else {
         results.StoryFormatVersion = "latest";
     }
     // Does the object contain 'mode'?
-    if (Object.hasOwnProperty.call(obj, 'mode')) {
+    if (Object.prototype.hasOwnProperty.call(obj, 'mode')) {
         results.Mode = obj['mode'];
     }
     // Does the object contain 'input'?
-    if (Object.hasOwnProperty.call(obj, 'input')) {
+    if (Object.prototype.hasOwnProperty.call(obj, 'input')) {
         results.Input = obj['input'];
     }
     // Does the object contain 'output'?
-    if (Object.hasOwnProperty.call(obj, 'output')) {
+    if (Object.prototype.hasOwnProperty.call(obj, 'output')) {
         results.Output = obj['output'];
     }
     // Does the object contain 'twine1-project'?
-    if (Object.hasOwnProperty.call(obj, 'twine1-project')) {
+    if (Object.prototype.hasOwnProperty.call(obj, 'twine1-project')) {
         results.Twine1Project = obj['twine1-project'];
     } else {
         results.Twine1Project = false;

package/src/Config/reader.js CHANGED Viewed

@@ -20,13 +20,13 @@ export function reader(path) {
     const contents = readFileSync(path, 'utf8');
     // Parsed contents.
-    let parsedContents = null;
+    let parsedContents;
     // Try to parse the contents into JSON object.
     try {
         parsedContents = JSON.parse(contents);
     } catch (error) {
-        throw new Error(`Error: File ${path} is not a valid JSON file. ${error.message}`);
+        throw new Error(`Error: File ${path} is not a valid JSON file. ${error.message}`, { cause: error });
     }
     // Return the parsed contents.

package/src/JSON/parse.js CHANGED Viewed

@@ -52,7 +52,7 @@ import Passage from '../Passage.js';
  */
 function parse (jsonString) {
   // Create future object.
-  let result = {};
+  let result;
   // Create Story.
   const s = new Story();
@@ -61,7 +61,7 @@ function parse (jsonString) {
   try {
     result = JSON.parse(jsonString);
   } catch (error) {
-    throw new Error(`Error: JSON could not be parsed! ${error.message}`);
+    throw new Error(`Error: JSON could not be parsed! ${error.message}`, { cause: error });
   }
   // Name

package/src/Passage.js CHANGED Viewed

@@ -2,42 +2,42 @@ import { encode } from 'html-entities';
 import { escapeTweeMetacharacters } from './Twee/parse.js';
 /**
-  * Passage class.
-  * @class
-  * @classdesc Represents a passage in a Twine story.
-  * @property {string} name - Name of the passage.
-  * @property {Array} tags - Tags for the passage.
-  * @property {object} metadata - Metadata for the passage.
-  * @property {string} text - Text content of the passage.
-  * @method {string} toTwee - Return a Twee representation.
-  * @method {string} toJSON - Return JSON representation.
-  * @method {string} toTwine2HTML - Return Twine 2 HTML representation.
-  * @method {string} toTwine1HTML - Return Twine 1 HTML representation.
-  * @example
-  * const p = new Passage('Start', 'This is the start of the story.');
-  * console.log(p.toTwee());
-  * // :: Start
-  * // This is the start of the story.
-  * //
-  * console.log(p.toJSON());
-  * // {"name":"Start","tags":[],"metadata":{},"text":"This is the start of the story."}
-  * console.log(p.toTwine2HTML());
-  * // <tw-passagedata pid="1" name="Start" tags="" >This is the start of the story.</tw-passagedata>
-  * console.log(p.toTwine1HTML());
-  * // <div tiddler="Start" tags="" modifier="extwee" twine-position="10,10">This is the start of the story.</div>
-  * @example
-  * const p = new Passage('Start', 'This is the start of the story.', ['start', 'beginning'], {position: '10,10', size: '100,100'});
-  * console.log(p.toTwee());
-  * // :: Start [start beginning] {"position":"10,10","size":"100,100"}
-  * // This is the start of the story.
-  * //
-  * console.log(p.toJSON());
-  * // {"name":"Start","tags":["start","beginning"],"metadata":{"position":"10,10","size":"100,100"},"text":"This is the start of the story."}
-  * console.log(p.toTwine2HTML());
-  * // <tw-passagedata pid="1" name="Start" tags="start beginning" position="10,10" size="100,100">This is the start of the story.</tw-passagedata>
-  * console.log(p.toTwine1HTML());
-  * // <div tiddler="Start" tags="start beginning" modifier="extwee" twine-position="10,10">This is the start of the story.</div>
-  */
+ * Passage class.
+ * @class
+ * @classdesc Represents a passage in a Twine story.
+ * @property {string} name - Name of the passage.
+ * @property {Array} tags - Tags for the passage.
+ * @property {object} metadata - Metadata for the passage.
+ * @property {string} text - Text content of the passage.
+ * @function toTwee - Return a Twee representation.
+ * @function toJSON - Return JSON representation.
+ * @function toTwine2HTML - Return Twine 2 HTML representation.
+ * @function toTwine1HTML - Return Twine 1 HTML representation.
+ * @example
+ * const p = new Passage('Start', 'This is the start of the story.');
+ * console.log(p.toTwee());
+ * // :: Start
+ * // This is the start of the story.
+ * //
+ * console.log(p.toJSON());
+ * // {"name":"Start","tags":[],"metadata":{},"text":"This is the start of the story."}
+ * console.log(p.toTwine2HTML());
+ * // <tw-passagedata pid="1" name="Start" tags="" >This is the start of the story.</tw-passagedata>
+ * console.log(p.toTwine1HTML());
+ * // <div tiddler="Start" tags="" modifier="extwee" twine-position="10,10">This is the start of the story.</div>
+ * @example
+ * const p = new Passage('Start', 'This is the start of the story.', ['start', 'beginning'], {position: '10,10', size: '100,100'});
+ * console.log(p.toTwee());
+ * // :: Start [start beginning] {"position":"10,10","size":"100,100"}
+ * // This is the start of the story.
+ * //
+ * console.log(p.toJSON());
+ * // {"name":"Start","tags":["start","beginning"],"metadata":{"position":"10,10","size":"100,100"},"text":"This is the start of the story."}
+ * console.log(p.toTwine2HTML());
+ * // <tw-passagedata pid="1" name="Start" tags="start beginning" position="10,10" size="100,100">This is the start of the story.</tw-passagedata>
+ * console.log(p.toTwine1HTML());
+ * // <div tiddler="Start" tags="start beginning" modifier="extwee" twine-position="10,10">This is the start of the story.</div>
+ */
 export default class Passage {
   /**
    * Name of the Passage
@@ -95,6 +95,7 @@ export default class Passage {
   get name () { return this.#_name; }
   /**
+   * Set passage name.
    * @param {string} s - Name to replace
    * @throws {Error} Name must be a String!
    */
@@ -113,6 +114,7 @@ export default class Passage {
   get tags () { return this.#_tags; }
   /**
+   * Set passage tags.
    * @param {Array} t - Replacement array
    * @throws {Error} Tags must be an array!
    */
@@ -133,6 +135,7 @@ export default class Passage {
   get metadata () { return this.#_metadata; }
   /**
+   * Set passage metadata.
    * @param {object} m - Replacement object
    * @throws {Error} Metadata must be an object literal!
    */
@@ -152,6 +155,7 @@ export default class Passage {
   get text () { return this.#_text; }
   /**
+   * Set passage text.
    * @param {string} t - Replacement text
    * @throws {Error} Text should be a String!
    */
@@ -168,8 +172,7 @@ export default class Passage {
    * Return a Twee representation.
    *
    * See: https://github.com/iftechfoundation/twine-specs/blob/master/twee-3-specification.md
-   *
-   * @method toTwee
+   * @function toTwee
    * @returns {string} String form of passage.
    */
   toTwee () {
@@ -216,7 +219,7 @@ export default class Passage {
   /**
    * Return JSON representation.
-   * @method toJSON
+   * @function toJSON
    * @returns {string} JSON string.
    */
   toJSON () {
@@ -235,7 +238,7 @@ export default class Passage {
   /**
    * Return Twine 2 HTML representation.
    * (Default Passage ID is 1.)
-   * @method toTwine2HTML
+   * @function toTwine2HTML
    * @param {number} pid - Passage ID (PID) to record in HTML.
    * @returns {string} Twine 2 HTML string.
    */
@@ -292,7 +295,7 @@ export default class Passage {
   /**
    * Return Twine 1 HTML representation.
-   * @method toTwine1HTML
+   * @function toTwine1HTML
    * @returns {string} Twine 1 HTML string.
    */
   toTwine1HTML () {

package/src/Story.js CHANGED Viewed

@@ -7,7 +7,7 @@ import { encode } from 'html-entities';
 const creatorName = 'extwee';
 // Set the creator version.
-const creatorVersion = '2.3.14';
+const creatorVersion = '2.3.15';
 /**
  * Story class.
@@ -19,22 +19,22 @@ const creatorVersion = '2.3.14';
  * @property {string} format - Story format of Story.
  * @property {string} formatVersion - Story format version of Story.
  * @property {number} zoom - Zoom level.
- * @property {Array} passages - Array of Passage objects. @see {@link Passage}
+ * @property {Array} passages - Array of Passage objects. See {@link Passage}.
  * @property {string} creator - Program used to create Story.
  * @property {string} creatorVersion - Version used to create Story.
  * @property {object} metadata - Metadata of Story.
  * @property {object} tagColors - Tag Colors
  * @property {string} storyJavaScript - Story JavaScript
  * @property {string} storyStylesheet - Story Stylesheet
- * @method {number} addPassage - Add a passage to the story and returns the new length of the passages array.
- * @method {number} removePassageByName - Remove a passage from the story by name and returns the new length of the passages array.
- * @method {Array} getPassagesByTag - Find passages by tag.
- * @method {Array} getPassageByName - Find passage by name.
- * @method {number} size - Size (number of passages).
- * @method {string} toJSON - Export Story as JSON representation.
- * @method {string} toTwee - Return Twee representation.
- * @method {string} toTwine2HTML - Return Twine 2 HTML representation.
- * @method {string} toTwine1HTML - Return Twine 1 HTML representation.
+ * @function addPassage - Add a passage to the story and returns the new length of the passages array.
+ * @function removePassageByName - Remove a passage from the story by name and returns the new length of the passages array.
+ * @function getPassagesByTag - Find passages by tag.
+ * @function getPassageByName - Find passage by name.
+ * @function size - Size (number of passages).
+ * @function toJSON - Export Story as JSON representation.
+ * @function toTwee - Return Twee representation.
+ * @function toTwine2HTML - Return Twine 2 HTML representation.
+ * @function toTwine1HTML - Return Twine 1 HTML representation.
  * @example
  * const story = new Story('My Story');
  * story.IFID = '12345678-1234-5678-1234-567812345678';
@@ -148,6 +148,7 @@ class Story {
   get name () { return this.#_name; }
   /**
+   * Set story name.
    * @param {string} a - Replacement story name
    */
   set name (a) {
@@ -165,13 +166,14 @@ class Story {
   get tagColors () { return this.#_tagColors; }
   /**
+   * Set tag colors.
    * @param {object} a - Replacement tag colors
    */
   set tagColors (a) {
-    if (a instanceof Object) {
+    if (a !== null && typeof a === 'object' && !Array.isArray(a)) {
       this.#_tagColors = a;
     } else {
-      throw new Error('Tag colors must be an object!');
+      throw new Error('Tag colors must be a plain object!');
     }
   }
@@ -182,6 +184,7 @@ class Story {
   get IFID () { return this.#_IFID; }
   /**
+   * Set story IFID.
    * @param {string} i - Replacement IFID.
    */
   set IFID (i) {
@@ -199,6 +202,7 @@ class Story {
   get start () { return this.#_start; }
   /**
+   * Set start passage name.
    * @param {string} s - Replacement start
    */
   set start (s) {
@@ -216,6 +220,7 @@ class Story {
   get formatVersion () { return this.#_formatVersion; }
   /**
+   * Set story format version.
    * @param {string} f - Replacement format version
    */
   set formatVersion (f) {
@@ -233,13 +238,14 @@ class Story {
   get metadata () { return this.#_metadata; }
   /**
+   * Set story metadata.
    * @param {object} o - Replacement metadata
    */
   set metadata (o) {
-    if (typeof o === 'object') {
+    if (o !== null && typeof o === 'object') {
       this.#_metadata = o;
     } else {
-      throw new Error('Story metadata must be Object!');
+      throw new Error('Story metadata must be a non-null Object!');
     }
   }
@@ -250,6 +256,7 @@ class Story {
   get format () { return this.#_format; }
   /**
+   * Set story format.
    * @param {string} f - Replacement format
    */
   set format (f) {
@@ -267,6 +274,7 @@ class Story {
   get creator () { return this.#_creator; }
   /**
+   * Set creator program.
    * @param {string} c - Creator Program of Story
    */
   set creator (c) {
@@ -284,6 +292,7 @@ class Story {
   get creatorVersion () { return this.#_creatorVersion; }
   /**
+   * Set creator version.
    * @param {string} c - Version of creator program
    */
   set creatorVersion (c) {
@@ -301,14 +310,15 @@ class Story {
   get zoom () { return this.#_zoom; }
   /**
+   * Set zoom level.
    * @param {number} n - Replacement zoom level
    */
   set zoom (n) {
-    if (typeof n === 'number') {
+    if (typeof n === 'number' && Number.isFinite(n)) {
       // Parse float with a fixed length and then force into Number
       this.#_zoom = Number(Number.parseFloat(n).toFixed(2));
     } else {
-      throw new Error('Zoom level must be a Number!');
+      throw new Error('Zoom level must be a finite Number!');
     }
   }
@@ -316,7 +326,7 @@ class Story {
    * Passages in Story.
    * @returns {Array} Passages
    * @property {Array} passages - Passages
-  */
+   */
   get passages () { return this.#_passages; }
   /**
@@ -347,6 +357,7 @@ class Story {
   }
   /**
+   * Set story stylesheet.
    * @param {string} s - Replacement story stylesheet
    */
   set storyStylesheet (s) {
@@ -380,7 +391,7 @@ class Story {
   /**
    * Add a passage to the story.
    * Passing `StoryData` will override story metadata and `StoryTitle` will override story name.
-   * @method addPassage
+   * @function addPassage
    * @param {Passage} p - Passage to add to Story.
    * @returns {number} Return new length of passages array.
    */
@@ -492,7 +503,7 @@ class Story {
   /**
    * Remove a passage from the story by name.
-   * @method removePassageByName
+   * @function removePassageByName
    * @param {string} name - Passage name to remove.
    * @returns {number} Return new length of passages array.
    */
@@ -503,7 +514,7 @@ class Story {
   /**
    * Find passages by tag.
-   * @method getPassagesByTag
+   * @function getPassagesByTag
    * @param {string} t - Passage name to search for
    * @returns {Array} Return array of passages
    */
@@ -517,7 +528,7 @@ class Story {
   /**
    * Find passage by name.
-   * @method getPassageByName
+   * @function getPassageByName
    * @param {string} name - Passage name to search for
    * @returns {Passage | null} Return passage or null
    */
@@ -530,7 +541,7 @@ class Story {
   /**
    * Size (number of passages).
-   * @method size
+   * @function size
    * @returns {number} Return number of passages
    */
   size () {
@@ -539,7 +550,7 @@ class Story {
   /**
    * Export Story as JSON representation.
-   * @method toJSON
+   * @function toJSON
    * @returns {string} JSON string.
    */
   toJSON () {
@@ -579,8 +590,7 @@ class Story {
    *
    * See: Twee 3 Specification
    * (https://github.com/iftechfoundation/twine-specs/blob/master/twee-3-specification.md)
-   *
-   * @method toTwee
+   * @function toTwee
    * @returns {string} Twee String
    */
   toTwee () {
@@ -607,7 +617,7 @@ class Story {
     /**
      * format: (string) Optional. Maps to <tw-storydata format>.
-    */
+     */
     // Does format exist?
     if (this.format !== '') {
       // Write the existing format.
@@ -706,8 +716,7 @@ class Story {
    * Because story stylesheet data can be represented as a passage, property value, or both, all approaches are encoded.
    *
    * Because story JavaScript can be represented as a passage, property value, or both, all approaches are encoded.
-   *
-   * @method toTwine2HTML
+   * @function toTwine2HTML
    * @returns {string} Twine 2 HTML string
    */
   toTwine2HTML () {
@@ -852,9 +861,6 @@ class Story {
     // Filter out passages with tag of 'script'.
     const scriptPassages = passages.filter((passage) => passage.tags.includes('script'));
-    // Remove script passages from the main array.
-    passages = passages.filter(p => !p.tags.includes('script'));
     // Were there any script passages?
     if (scriptPassages.length > 0) {
       // Start the SCRIPT.
@@ -894,7 +900,7 @@ class Story {
     // For each tag, generate a <tw-tag> element.
     tagList.forEach((tag) => {
       // Add the <tw-tag> element.
-      storyData += `\t<tw-tag name="${tag}" color="${this.tagColors[tag]}"></tw-tag>\n`;
+      storyData += `\t<tw-tag name="${encode(tag)}" color="${encode(String(this.tagColors[tag]))}"></tw-tag>\n`;
     });
     // Close the HTML element.
@@ -909,8 +915,7 @@ class Story {
    *
    * See: Twine 1 HTML Output
    * (https://github.com/iftechfoundation/twine-specs/blob/master/twine-1-htmloutput-doc.md)
-   *
-   * @method toTwine1HTML
+   * @function toTwine1HTML
    * @returns {string} Twine 1 HTML string.
    */
   toTwine1HTML () {

package/src/StoryFormat/parse.js CHANGED Viewed

@@ -85,13 +85,13 @@ function parse (contents) {
   }
   // Create an object literal
-  let jsonContent = {};
+  let jsonContent;
   // Attempt to parse the JSON.
   try {
     jsonContent = JSON.parse(contents);
   } catch (error) {
-    throw new Error(`Error: Unable to parse Twine 2 JSON chunk! ${error.message}`);
+    throw new Error(`Error: Unable to parse Twine 2 JSON chunk! ${error.message}`, { cause: error });
   }
   /**