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

package/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2024 Alex Warren, textadventures.co.uk and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

package/dist/squiffy.runtime.js

@@ -463,7 +463,7 @@ export const init = (options) => {
                 else if (newSection.text && newSection.text != story.sections[existingSection].text) {
                     // section has been updated
                     for (const element of elements) {
-                        updateElementTextPreservingDisabledPassageLinks(element, newSection.text);
+                        updateElementTextPreservingDisabledPassageLinks(element, ui.processText(newSection.text));
                     }
                 }
             }
@@ -484,7 +484,7 @@ export const init = (options) => {
                 else if (newPassage.text && newPassage.text != story.sections[existingSection].passages[existingPassage].text) {
                     // passage has been updated
                     for (const element of elements) {
-                        updateElementTextPreservingDisabledPassageLinks(element, newPassage.text);
+                        updateElementTextPreservingDisabledPassageLinks(element, ui.processText(newPassage.text));
                     }
                 }
             }

package/dist/squiffy.runtime.test.js

@@ -342,3 +342,53 @@ Text from a passage.
     let output = getSectionContent(element, 'section1');
     expect(output).toBe('Here is some text from a passage: Text from a passage.');
 });
+test('Update section with embedded text', async () => {
+    const script = `
+[[section1]]:
+Here is some text from the next section: {section2}
+
+[[section2]]:
+Text from next section.
+`;
+    const { squiffyApi, element } = await initScript(script);
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from the next section: Text from next section.');
+    const script2 = `
+[[section1]]:
+Here is an updated script with text from the next section: {section2}
+
+[[section2]]:
+Updated text from next section.
+`;
+    const updated = await compile(script2);
+    squiffyApi.update(updated.story);
+    output = getSectionContent(element, 'section1');
+    // NOTE: The embedded text does not currently get updated. We would need to track where the embedded
+    // text has been written.
+    expect(output).toBe('Here is an updated script with text from the next section: Text from next section.');
+});
+test('Update passage with embedded text', async () => {
+    const script = `
+[[section1]]:
+Here is some text from a passage: {passage}
+
+[passage]:
+Text from a passage.
+`;
+    const { squiffyApi, element } = await initScript(script);
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from a passage: Text from a passage.');
+    const script2 = `
+[[section1]]:
+Here is an updated script with text from a passage: {passage}
+
+[passage]:
+Updated text from a passage.
+`;
+    const updated = await compile(script2);
+    squiffyApi.update(updated.story);
+    output = getSectionContent(element, 'section1');
+    // NOTE: The embedded text does not currently get updated. We would need to track where the embedded
+    // text has been written.
+    expect(output).toBe('Here is an updated script with text from a passage: Text from a passage.');
+});

package/dist/textProcessor.js

@@ -64,11 +64,9 @@ export class TextProcessor {
             return this.processTextCommand_Rotate('sequence', text);
         }
         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.13",
+  "version": "6.0.0-alpha.15",
   "type": "module",
   "main": "dist/squiffy.runtime.js",
   "types": "dist/squiffy.runtime.d.ts",
@@ -22,8 +22,9 @@
     "@types/jsdom": "^21.1.7",
     "global-jsdom": "^25.0.0",
     "jsdom": "^25.0.0",
-    "squiffy-compiler": "^6.0.0-alpha.3",
+    "squiffy-compiler": "^6.0.0-alpha.15",
     "typescript": "^5.6.2",
     "vitest": "^2.1.1"
-  }
+  },
+  "gitHead": "a326d226beb6121dcdf528e97d287deba553fe39"
 }

package/src/squiffy.runtime.test.ts

@@ -440,4 +440,66 @@ Text from a passage.
 
     let output = getSectionContent(element, 'section1');
     expect(output).toBe('Here is some text from a passage: Text from a passage.');
+});
+
+test('Update section with embedded text', async () => {
+    const script = `
+[[section1]]:
+Here is some text from the next section: {section2}
+
+[[section2]]:
+Text from next section.
+`;
+
+    const { squiffyApi, element } = await initScript(script);
+
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from the next section: Text from next section.');
+
+    const script2 = `
+[[section1]]:
+Here is an updated script with text from the next section: {section2}
+
+[[section2]]:
+Updated text from next section.
+`;
+
+    const updated = await compile(script2);
+    squiffyApi.update(updated.story);
+    output = getSectionContent(element, 'section1');
+
+    // NOTE: The embedded text does not currently get updated. We would need to track where the embedded
+    // text has been written.
+    expect(output).toBe('Here is an updated script with text from the next section: Text from next section.');
+});
+
+test('Update passage with embedded text', async () => {
+    const script = `
+[[section1]]:
+Here is some text from a passage: {passage}
+
+[passage]:
+Text from a passage.
+`;
+
+    const { squiffyApi, element } = await initScript(script);
+
+    let output = getSectionContent(element, 'section1');
+    expect(output).toBe('Here is some text from a passage: Text from a passage.');
+
+    const script2 = `
+[[section1]]:
+Here is an updated script with text from a passage: {passage}
+
+[passage]:
+Updated text from a passage.
+`;
+
+    const updated = await compile(script2);
+    squiffyApi.update(updated.story);
+    output = getSectionContent(element, 'section1');
+
+    // NOTE: The embedded text does not currently get updated. We would need to track where the embedded
+    // text has been written.
+    expect(output).toBe('Here is an updated script with text from a passage: Text from a passage.');
 });

package/src/squiffy.runtime.ts

@@ -496,7 +496,7 @@ export const init = (options: SquiffyInitOptions): SquiffyApi => {
                 else if (newSection.text && newSection.text != story.sections[existingSection].text) {
                     // section has been updated
                     for (const element of elements) {
-                        updateElementTextPreservingDisabledPassageLinks(element, newSection.text);
+                        updateElementTextPreservingDisabledPassageLinks(element, ui.processText(newSection.text));
                     }
                 }
             }
@@ -518,7 +518,7 @@ export const init = (options: SquiffyInitOptions): SquiffyApi => {
                 else if (newPassage.text && newPassage.text != story.sections[existingSection].passages[existingPassage].text) {
                     // passage has been updated
                     for (const element of elements) {
-                        updateElementTextPreservingDisabledPassageLinks(element, newPassage.text);
+                        updateElementTextPreservingDisabledPassageLinks(element, ui.processText(newPassage.text));
                     }
                 }
             }

package/src/textProcessor.ts

@@ -77,10 +77,8 @@ export class TextProcessor {
         } else if (/^sequence[: ]/.test(text)) {
             return this.processTextCommand_Rotate('sequence', text);
         } 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(","));