squiffy-runtime 6.0.0-alpha.11 → 6.0.0-alpha.13

package/dist/squiffy.runtime.d.ts

@@ -1,2 +1,3 @@
 import { SquiffyApi, SquiffyInitOptions } from './types.js';
+export type { SquiffyApi } from "./types.js";
 export declare const init: (options: SquiffyInitOptions) => SquiffyApi;

package/dist/squiffy.runtime.js

@@ -514,7 +514,7 @@ export const init = (options) => {
             return;
         handleClick(event);
     });
-    textProcessor = new TextProcessor(get, set, story, ui, seen, processAttributes);
+    textProcessor = new TextProcessor(get, set, story, () => currentSection, seen, processAttributes);
     begin();
     return {
         restart: restart,

package/dist/squiffy.runtime.test.js

@@ -164,10 +164,10 @@ function safeQuerySelector(name) {
     return name.replace(/'/g, "\\'");
 }
 function getSectionContent(element, section) {
-    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]]'] p`)?.textContent || null;
+    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]]']`)?.textContent || null;
 }
 function getPassageContent(element, section, passage) {
-    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]][${safeQuerySelector(passage)}]'] p`)?.textContent || null;
+    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]][${safeQuerySelector(passage)}]']`)?.textContent || null;
 }
 test('Update default section output', async () => {
     const { squiffyApi, element } = await initScript("Hello world");
@@ -318,3 +318,27 @@ Passage in section B.`);
     const linkB1 = findLink(element, 'passage', 'b1');
     expect(squiffyApi.clickLink(linkB1)).toBe(true);
 });
+test('Embed text from a section', async () => {
+    const script = `
+[[section1]]:
+Here is some text from the next section: {section2}
+
+[[section2]]:
+Text from next section.
+`;
+    const { element } = await initScript(script);
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from the next section: Text from next section.');
+});
+test('Embed text from a passage', async () => {
+    const script = `
+[[section1]]:
+Here is some text from a passage: {passage}
+
+[passage]:
+Text from a passage.
+`;
+    const { element } = await initScript(script);
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from a passage: Text from a passage.');
+});

package/dist/textProcessor.d.ts

@@ -1,11 +1,12 @@
+import { Section } from "./types.js";
 export declare class TextProcessor {
     get: (attribute: string) => any;
     set: (attribute: string, value: any) => void;
     story: any;
-    currentSection: any;
+    getCurrentSection: () => Section;
     seen: (section: string) => boolean;
     processAttributes: (attributes: string[]) => void;
-    constructor(get: (attribute: string) => any, set: (attribute: string, value: any) => void, story: any, currentSection: any, seen: (section: string) => boolean, processAttributes: (attributes: string[]) => void);
+    constructor(get: (attribute: string) => any, set: (attribute: string, value: any) => void, story: any, currentSection: () => Section, seen: (section: string) => boolean, processAttributes: (attributes: string[]) => void);
     process(text: string, data: any): string;
     processTextCommand(text: string, data: any): any;
     processTextCommand_If(section: string, data: any): string;

package/dist/textProcessor.js

@@ -4,7 +4,7 @@ export class TextProcessor {
         this.get = get;
         this.set = set;
         this.story = story;
-        this.currentSection = currentSection;
+        this.getCurrentSection = currentSection;
         this.seen = seen;
         this.processAttributes = processAttributes;
     }
@@ -47,6 +47,7 @@ export class TextProcessor {
         return (text);
     }
     processTextCommand(text, data) {
+        const currentSection = this.getCurrentSection();
         if (startsWith(text, 'if ')) {
             return this.processTextCommand_If(text, data);
         }
@@ -62,10 +63,12 @@ export class TextProcessor {
         else if (/^sequence[: ]/.test(text)) {
             return this.processTextCommand_Rotate('sequence', text);
         }
-        else if (this.currentSection.passages && text in this.currentSection.passages) {
-            return this.process(this.currentSection.passages[text].text || '', data);
+        else if (currentSection.passages && text in currentSection.passages) {
+            console.log("Found passage");
+            return this.process(currentSection.passages[text].text || '', data);
         }
         else if (text in this.story.sections) {
+            console.log("Found section");
             return this.process(this.story.sections[text].text || '', data);
         }
         else if (startsWith(text, '@') && !startsWith(text, '@replace')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squiffy-runtime",
-  "version": "6.0.0-alpha.11",
+  "version": "6.0.0-alpha.13",
   "type": "module",
   "main": "dist/squiffy.runtime.js",
   "types": "dist/squiffy.runtime.d.ts",

package/src/squiffy.runtime.test.ts

@@ -213,11 +213,11 @@ function safeQuerySelector(name: string) {
 }
 
 function getSectionContent(element: HTMLElement, section: string) {
-    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]]'] p`)?.textContent || null;
+    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]]']`)?.textContent || null;
 }
 
 function getPassageContent(element: HTMLElement, section: string, passage: string) {
-    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]][${safeQuerySelector(passage)}]'] p`)?.textContent || null;
+    return element.querySelector(`[data-source='[[${safeQuerySelector(section)}]][${safeQuerySelector(passage)}]']`)?.textContent || null;
 }
 
 test('Update default section output', async () => {
@@ -410,4 +410,34 @@ Passage in section B.`);
     // and the passage [b1] within it should be clickable
     const linkB1 = findLink(element, 'passage', 'b1');
     expect(squiffyApi.clickLink(linkB1)).toBe(true);
+});
+
+test('Embed text from a section', async () => {
+    const script = `
+[[section1]]:
+Here is some text from the next section: {section2}
+
+[[section2]]:
+Text from next section.
+`;
+
+    const { element } = await initScript(script);
+
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from the next section: Text from next section.');
+});
+
+test('Embed text from a passage', async () => {
+    const script = `
+[[section1]]:
+Here is some text from a passage: {passage}
+
+[passage]:
+Text from a passage.
+`;
+
+    const { element } = await initScript(script);
+
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from a passage: Text from a passage.');
 });

package/src/squiffy.runtime.ts

@@ -3,6 +3,8 @@ import { startsWith, rotate } from "./utils.js";
 import { TextProcessor } from './textProcessor.js';
 import { Emitter, SquiffyEventMap } from './events.js';
 
+export type { SquiffyApi } from "./types.js"
+
 export const init = (options: SquiffyInitOptions): SquiffyApi => {
     let story: Story;
     let currentSection: Section;
@@ -552,7 +554,7 @@ export const init = (options: SquiffyInitOptions): SquiffyApi => {
         handleClick(event);
     });
 
-    textProcessor = new TextProcessor(get, set, story, ui, seen, processAttributes);
+    textProcessor = new TextProcessor(get, set, story, () => currentSection, seen, processAttributes);
     
     begin();
 

package/src/textProcessor.ts

@@ -1,22 +1,23 @@
 import { startsWith, rotate } from "./utils.js";
+import { Section } from "./types.js";
 
 export class TextProcessor {
     get: (attribute: string) => any;
     set: (attribute: string, value: any) => void;
     story: any;
-    currentSection: any;
+    getCurrentSection: () => Section;
     seen: (section: string) => boolean;
     processAttributes: (attributes: string[]) => void;
 
     constructor (get: (attribute: string) => any,
                  set: (attribute: string, value: any) => void,
-                 story: any, currentSection: any,
+                 story: any, currentSection: () => Section,
                  seen: (section: string) => boolean,
                  processAttributes: (attributes: string[]) => void) {
         this.get = get;
         this.set = set;
         this.story = story;
-        this.currentSection = currentSection;
+        this.getCurrentSection = currentSection;
         this.seen = seen;
         this.processAttributes = processAttributes;
     }
@@ -64,6 +65,7 @@ export class TextProcessor {
     }
 
     processTextCommand(text: string, data: any) {
+        const currentSection = this.getCurrentSection();
         if (startsWith(text, 'if ')) {
             return this.processTextCommand_If(text, data);
         } else if (startsWith(text, 'else:')) {
@@ -74,9 +76,11 @@ export class TextProcessor {
             return this.processTextCommand_Rotate('rotate', text);
         } else if (/^sequence[: ]/.test(text)) {
             return this.processTextCommand_Rotate('sequence', text);
-        } else if (this.currentSection.passages && text in this.currentSection.passages) {
-            return this.process(this.currentSection.passages[text].text || '', data);
+        } else if (currentSection.passages && text in currentSection.passages) {
+            console.log("Found passage");
+            return this.process(currentSection.passages[text].text || '', data);
         } else if (text in this.story.sections) {
+            console.log("Found section");
             return this.process(this.story.sections[text].text || '', data);
         } else if (startsWith(text, '@') && !startsWith(text, '@replace')) {
             this.processAttributes(text.substring(1).split(","));