extwee 2.3.9 → 2.3.11

package/test/Twee/Twee.Parse.test.js

@@ -57,15 +57,16 @@ describe('Twee', () => {
       const fr = readFileSync('test/Twee/TweeParser/scriptPassage.twee', 'utf-8');
       const story = parseTwee(fr);
       const p = story.getPassageByName('UserScript');
-      expect(p.tags).toHaveLength(1);
+      expect(p).toBe(null);
+      expect(story.storyJavaScript.length).toBeGreaterThan(0);
     });
 
     it('Should parse single stylesheet passage', () => {
       const fr = readFileSync('test/Twee/TweeParser/stylePassage.twee', 'utf-8');
       const story = parseTwee(fr);
       const p = story.getPassageByName('UserStylesheet');
-      expect(p.tags).toHaveLength(1);
-      expect(p.name).toBe('UserStylesheet');
+      expect(p).toBe(null);
+      expect(story.storyStylesheet.length).toBeGreaterThan(0);
     });
 
     it('Should parse StoryTitle', () => {
@@ -89,5 +90,19 @@ describe('Twee', () => {
       expect(p).not.toBe(null);
       expect(startingPassage).toBe('Start');
     });
+
+    it('Should correctly parse "script" tagged passages as story javascript AND remove passages from story', () => {
+      const fr = readFileSync('test/Twee/TweeParser/cycling.twee', 'utf-8');
+      const story = parseTwee(fr);
+      expect(story.storyJavaScript.length).toBeGreaterThan(0);
+      expect(story.passages.length).toBe(2);
+    });
+
+    it('Should correctly parse "stylesheet" tagged passages as story stylesheet AND remove passages from story', () => {
+      const fr = readFileSync('test/Twee/TweeParser/style.twee', 'utf-8');
+      const story = parseTwee(fr);
+      expect(story.storyStylesheet.length).toBeGreaterThan(0);
+      expect(story.passages.length).toBe(1);
+    });
   });
 });

package/test/Twee/TweeParser/cycling.twee

@@ -0,0 +1,75 @@
+:: StoryTitle
+Cycling Choices in Snowman
+
+
+:: StoryData
+{
+    "ifid": "2A4D6978-93A7-4FD3-96FB-94B995FCBE29"
+}
+
+
+:: UserScript[script]
+$(function() {
+	
+	// Create a global object
+	window.setup = window.setup || {};
+	
+	// Iterate through all elements with the class 'cycle'
+	//  For each, save the current 'choices' and 'selection'
+	//  (This sets all the 'default' values.)
+	$('.cycle').each(function() {
+		
+		// Create a global object for each 'id'
+		var id = $(this).attr('id');
+		setup[id] = {};
+		
+		// Save the current 'choices' for each
+		var choices = JSON.parse($(this).attr("data-cycling-choices"));
+		setup[id].choices = choices; 
+		
+		// Save the current 'selection' for each
+		var selection = $(this).attr("data-cycling-selection");
+		setup[id].selection = selection;
+  		
+	});
+	
+	$('.cycle').click(function(){
+		
+		// Save the 'id'
+		var id = $(this).attr('id');
+		
+		// Retrieve the global 'choices'
+		var choices = setup[id].choices;
+		
+		// Retrieve the global 'selection'
+		var selection = setup[id].selection;
+		
+		// Update the 'selection' number
+		selection++;
+		
+		// Check if 'selection' is greater than length of choices
+		if(selection >= choices.length) {
+			selection = 0;
+		}
+		
+		// Update the 'selection' on the element
+		$(this).attr("data-cycling-selection", selection);
+		
+		// Update the text of the element with the choice
+		$(this).text(choices[selection]);
+	
+		// Update the global values of 'choices' and 'selection'
+		setup[id].choices = choices; 
+		setup[id].selection = selection;
+	
+	});
+	
+});
+
+:: Start
+<a href='javascript:void(0)' id='cycleOne' class='cycle' data-cycling-choices='["One", "Two", "Three"]' data-cycling-selection=0>One</a>
+
+[[Submit|Results]]
+
+:: Results
+<%= setup["cycleOne"].choices[setup["cycleOne"].selection] %>

package/test/Twee/TweeParser/style.twee

@@ -0,0 +1,16 @@
+:: StoryTitle
+Style Tag Usage
+
+
+:: StoryData
+{
+    "ifid": "2A4D6978-93A7-4FD3-96FB-94B995FCBE29"
+}
+
+:: Example [stylesheet]
+#green {
+    color:green;
+}
+
+:: Start
+Nothing here!

package/test/Twine2HTML/Twine2HTML.Parse.test.js

@@ -105,10 +105,9 @@ describe('Twine2HTMLParser', () => {
     it('Should have script and style tags normally', () => {
       const fr = readFileSync('test/Twine2HTML/Twine2HTMLParser/Example1.html', 'utf-8');
       const story = parseTwine2HTML(fr);
-      const scriptPassages = story.getPassagesByTag('script');
-      const stylesheetPassages = story.getPassagesByTag('stylesheet');
-      expect(scriptPassages.length).toBe(1);
-      expect(stylesheetPassages.length).toBe(1);
+      // Script-tagged passages are now stored in storyJavaScript, not passages array
+      expect(story.storyJavaScript.length).toBeGreaterThan(0);
+      expect(story.storyStylesheet.length).toBeGreaterThan(0);
     });
 
     it('Should parse HTML without passage start node', () => {

package/types/src/Story.d.ts

@@ -251,5 +251,5 @@ export class Story {
     #private;
 }
 export const creatorName: "extwee";
-export const creatorVersion: "2.3.9";
+export const creatorVersion: "2.3.11";
 import Passage from './Passage.js';