@drincs/pixi-vn-ink 0.1.1 → 0.1.3

package/README.md

@@ -1,15 +1,85 @@
-# Pixi'VN + Ink
+# Pixi’VN + Ink Language
 
-npm library to import .ink files into pixi-vn
+Pixi’VN gives you the ability to write your own narrative using Ink.
 
-## install project
+## What is ink?
+
+Ink is a scripting language for writing interactive narrative. It is used in games like 80 Days, Heaven's Vault, and Sorcery! to create branching stories.
+
+This language is very simple to learn, you can learn the basics in a few minutes. Go on [ink website](https://www.inklestudios.com/ink/) to learn more about it.
+
+## Start using Ink in Pixi’VN
+
+If you have not created a project yet then it is recommended to use the [template](/start/getting-started.md#project-initialization) and select a template that is based on ink.
+
+Otherwise to add ink to your Pixi’VN project you need to install the `@drincs/pixi-vn-ink` package.
 
 ```bash
-git clone https://github.com/DRincs-Productions/pixi-vn-ink
-git submodule update --init --recursive
-npm install
+# npm
+npm install @drincs/pixi-vn-ink
+
+# yarn
+yarn add @drincs/pixi-vn-ink
+
+# pnpm
+pnpm add @drincs/pixi-vn-ink
+
+# bun
+bun add @drincs/pixi-vn-ink
 ```
 
-## Run tests
+After installing the package you need to import the `importInkText()` function from the package and use it to import the ink script into your project.
+
+```typescript
+// main.ts
+import { importInkText } from '@drincs/pixi-vn-ink'
 
-Press F5 in vscode to run tests
+const inkText = `
+=== start ===
+Hello
+-> END
+`
+
+importInkText([inkText, ...])
+```
+
+Now you can run the `start` knot (or label) with [Pixi’VN functions](/start/labels.md#run-a-label).
+
+```typescript
+GameStepManager.callLabel(`start`, {})
+```
+
+### Import text contained in .ink files
+
+( This method has been tested only on projects generated with vitejs )
+
+To import text contained in .ink files you need create the file `ink.d.ts`:
+
+```typescript
+// src/ink.d.ts
+declare module '*.ink' {
+    const value: string
+    export default value
+}
+
+```
+
+After that you need to add the `.ink` extension to the `assetsInclude` option in the `vite.config.ts` file:
+
+```typescript
+// vite.config.ts
+export default defineConfig({
+  // ...
+  assetsInclude: ['**/*.ink'],
+})
+```
+
+After that you can import the ink file and add `?raw` at the end of the import to get the text content.
+
+```typescript
+// main.ts
+import { importInkText } from '@drincs/pixi-vn-ink'
+import startLabel from './ink_labels/start.ink?raw'
+
+importInkText([startLabel, ...])
+```

package/dist/constant.d.mts

@@ -0,0 +1,3 @@
+declare const CHOISE_LABEL_KEY_SEPARATOR = "_|_";
+
+export { CHOISE_LABEL_KEY_SEPARATOR };

package/dist/constant.d.ts

@@ -0,0 +1,3 @@
+declare const CHOISE_LABEL_KEY_SEPARATOR = "_|_";
+
+export { CHOISE_LABEL_KEY_SEPARATOR };

package/dist/constant.js

@@ -0,0 +1,8 @@
+'use strict';
+
+// src/constant.ts
+var CHOISE_LABEL_KEY_SEPARATOR = "_|_";
+
+exports.CHOISE_LABEL_KEY_SEPARATOR = CHOISE_LABEL_KEY_SEPARATOR;
+//# sourceMappingURL=constant.js.map
+//# sourceMappingURL=constant.js.map

package/dist/constant.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/constant.ts"],"names":[],"mappings":";;;AAAO,IAAM,0BAA6B,GAAA","file":"constant.js","sourcesContent":["export const CHOISE_LABEL_KEY_SEPARATOR = \"_|_\"\n"]}

package/dist/constant.mjs

@@ -0,0 +1,6 @@
+// src/constant.ts
+var CHOISE_LABEL_KEY_SEPARATOR = "_|_";
+
+export { CHOISE_LABEL_KEY_SEPARATOR };
+//# sourceMappingURL=constant.mjs.map
+//# sourceMappingURL=constant.mjs.map

package/dist/constant.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/constant.ts"],"names":[],"mappings":";AAAO,IAAM,0BAA6B,GAAA","file":"constant.mjs","sourcesContent":["export const CHOISE_LABEL_KEY_SEPARATOR = \"_|_\"\n"]}

package/dist/functions/ChoiceInfoConverter.d.mts

@@ -1,5 +1,5 @@
 import LabelChoiceRes from '../types/LabelChoiceRes.mjs';
 
-declare function getLabelChoice(items: any[], result: LabelChoiceRes): void;
+declare function getLabelChoice(items: any[], result: LabelChoiceRes, lastLabel?: string): void;
 
 export { getLabelChoice };

package/dist/functions/ChoiceInfoConverter.d.ts

@@ -1,5 +1,5 @@
 import LabelChoiceRes from '../types/LabelChoiceRes.js';
 
-declare function getLabelChoice(items: any[], result: LabelChoiceRes): void;
+declare function getLabelChoice(items: any[], result: LabelChoiceRes, lastLabel?: string): void;
 
 export { getLabelChoice };

package/dist/functions/ChoiceInfoConverter.js

@@ -1,11 +1,19 @@
 'use strict';
 
+// src/functions/utility.ts
+function unionStringOrArray(start = "", end = "") {
+  const startArray = Array.isArray(start) ? start : [start];
+  const endArray = Array.isArray(end) ? end : [end];
+  return [.../* @__PURE__ */ new Set([...startArray, ...endArray])];
+}
+
 // src/functions/ChoiceInfoConverter.ts
-function getLabelChoice(items, result) {
+function getLabelChoice(items, result, lastLabel) {
   let text = "";
   let label = "";
   let preDialog = "";
-  items.forEach((v, index) => {
+  for (let index = 0; index < items.length; index++) {
+    let v = items[index];
     if (typeof v === "string") {
       if (v.startsWith("^")) {
         text = v.substring(1);
@@ -17,14 +25,19 @@ function getLabelChoice(items, result) {
       } else if ("s" in v && v["s"] instanceof Array) {
         let t = findChoiceText(v["s"]);
         if (t) {
-          text = t;
-          preDialog = t;
+          if (lastLabel && result[lastLabel]) {
+            result[lastLabel].preDialog = { text: t };
+            result[lastLabel].text = unionStringOrArray(t, result[lastLabel].text);
+          } else {
+            text = t;
+            preDialog = t;
+          }
         }
       }
     }
     if (text && label) {
       if (result[label]) {
-        result[label].text = text + result[label].text;
+        result[label].text = unionStringOrArray(text, result[label].text);
       } else {
         result[label] = { text };
       }
@@ -32,10 +45,10 @@ function getLabelChoice(items, result) {
         result[label].preDialog = { text: preDialog };
       }
       let newListItem = items.slice(index + 1);
-      getLabelChoice(newListItem, result);
+      getLabelChoice(newListItem, result, label);
       return;
     }
-  });
+  }
 }
 function findChoiceText(items) {
   for (const item of items) {

package/dist/functions/ChoiceInfoConverter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/functions/ChoiceInfoConverter.ts"],"names":[],"mappings":";;;AAGO,SAAS,cAAA,CAAe,OAAc,MAAwB,EAAA;AACjE,EAAA,IAAI,IAAe,GAAA,EAAA,CAAA;AACnB,EAAA,IAAI,KAAgB,GAAA,EAAA,CAAA;AACpB,EAAA,IAAI,SAAoB,GAAA,EAAA,CAAA;AACxB,EAAM,KAAA,CAAA,OAAA,CAAQ,CAAC,CAAA,EAAG,KAAU,KAAA;AACxB,IAAI,IAAA,OAAO,MAAM,QAAU,EAAA;AAEvB,MAAI,IAAA,CAAA,CAAE,UAAW,CAAA,GAAG,CAAG,EAAA;AACnB,QAAO,IAAA,GAAA,CAAA,CAAE,UAAU,CAAC,CAAA,CAAA;AAAA,OACxB;AAAA,KAEK,MAAA,IAAA,CAAA,IAAK,OAAO,CAAA,KAAM,QAAU,EAAA;AAEjC,MAAA,IAAI,OAAO,CAAK,IAAA,OAAO,CAAE,CAAA,GAAG,KAAK,OAAO,CAAA,CAAE,GAAG,CAAA,KAAM,YAAY,CAAE,CAAA,GAAG,CAAE,CAAA,QAAA,CAAS,GAAG,CAAG,EAAA;AACjF,QAAI,IAAA,CAAA,GAAI,MAAM,CAAE,CAAA,GAAG,EAAE,KAAM,CAAA,GAAG,EAAE,CAAC,CAAA,CAAA;AACjC,QAAQ,KAAA,GAAA,CAAA,CAAA;AAAA,iBAGH,GAAO,IAAA,CAAA,IAAK,CAAE,CAAA,GAAG,aAAa,KAAO,EAAA;AAC1C,QAAA,IAAI,CAAI,GAAA,cAAA,CAAe,CAAE,CAAA,GAAG,CAAC,CAAA,CAAA;AAC7B,QAAA,IAAI,CAAG,EAAA;AACH,UAAO,IAAA,GAAA,CAAA,CAAA;AACP,UAAY,SAAA,GAAA,CAAA,CAAA;AAAA,SAChB;AAAA,OACJ;AAAA,KACJ;AACA,IAAA,IAAI,QAAQ,KAAO,EAAA;AACf,MAAI,IAAA,MAAA,CAAO,KAAK,CAAG,EAAA;AACf,QAAA,MAAA,CAAO,KAAK,CAAE,CAAA,IAAA,GAAO,IAAO,GAAA,MAAA,CAAO,KAAK,CAAE,CAAA,IAAA,CAAA;AAAA,OAEzC,MAAA;AACD,QAAO,MAAA,CAAA,KAAK,CAAI,GAAA,EAAE,IAAW,EAAA,CAAA;AAAA,OACjC;AACA,MAAA,IAAI,SAAW,EAAA;AACX,QAAA,MAAA,CAAO,KAAK,CAAA,CAAE,SAAY,GAAA,EAAE,MAAM,SAAU,EAAA,CAAA;AAAA,OAChD;AAEA,MAAA,IAAI,WAAc,GAAA,KAAA,CAAM,KAAM,CAAA,KAAA,GAAQ,CAAC,CAAA,CAAA;AACvC,MAAA,cAAA,CAAe,aAAa,MAAM,CAAA,CAAA;AAClC,MAAA,OAAA;AAAA,KACJ;AAAA,GACH,CAAA,CAAA;AACL,CAAA;AAEA,SAAS,eAAe,KAAiD,EAAA;AACrE,EAAA,KAAA,MAAW,QAAQ,KAAO,EAAA;AACtB,IAAI,IAAA,OAAO,SAAS,QAAU,EAAA;AAC1B,MAAI,IAAA,IAAA,CAAK,UAAW,CAAA,GAAG,CAAG,EAAA;AACtB,QAAO,OAAA,IAAA,CAAK,UAAU,CAAC,CAAA,CAAA;AAAA,OAC3B;AAAA,KACJ,MAAA,IACS,gBAAgB,KAAO,EAAA;AAC5B,MAAI,IAAA,GAAA,GAAM,eAAe,IAAI,CAAA,CAAA;AAC7B,MAAA,IAAI,GAAK,EAAA;AACL,QAAO,OAAA,GAAA,CAAA;AAAA,OACX;AAAA,KACJ;AAAA,GACJ;AACJ","file":"ChoiceInfoConverter.js","sourcesContent":["import LabelChoiceRes from '../types/LabelChoiceRes';\nimport RootParserItemType from '../types/parserItems/RootParserItemType';\n\nexport function getLabelChoice(items: any[], result: LabelChoiceRes) {\n    let text: string = \"\"\n    let label: string = \"\"\n    let preDialog: string = \"\"\n    items.forEach((v, index) => {\n        if (typeof v === \"string\") {\n            // Dialog\n            if (v.startsWith(\"^\")) {\n                text = v.substring(1)\n            }\n        }\n        else if (v && typeof v === \"object\") {\n            // if is a choice\n            if (\"*\" in v && typeof v[\"*\"] && typeof v[\"*\"] === \"string\" && v[\"*\"].includes(\"c\")) {\n                let l = \"c\" + v[\"*\"].split(\"c\")[1]\n                label = l\n            }\n            // if is choise info\n            else if (\"s\" in v && v[\"s\"] instanceof Array) {\n                let t = findChoiceText(v[\"s\"])\n                if (t) {\n                    text = t\n                    preDialog = t\n                }\n            }\n        }\n        if (text && label) {\n            if (result[label]) {\n                result[label].text = text + result[label].text\n            }\n            else {\n                result[label] = { text: text }\n            }\n            if (preDialog) {\n                result[label].preDialog = { text: preDialog }\n            }\n            // split text and label\n            let newListItem = items.slice(index + 1)\n            getLabelChoice(newListItem, result)\n            return\n        }\n    })\n}\n\nfunction findChoiceText(items: RootParserItemType[]): string | undefined {\n    for (const item of items) {\n        if (typeof item === \"string\") {\n            if (item.startsWith(\"^\")) {\n                return item.substring(1)\n            }\n        }\n        else if (item instanceof Array) {\n            let res = findChoiceText(item)\n            if (res) {\n                return res\n            }\n        }\n    }\n}\n"]}
+{"version":3,"sources":["../../src/functions/utility.ts","../../src/functions/ChoiceInfoConverter.ts"],"names":[],"mappings":";;;AAAO,SAAS,kBAAmB,CAAA,KAAA,GAA2B,EAAI,EAAA,GAAA,GAAyB,EAAc,EAAA;AACrG,EAAA,MAAM,aAAa,KAAM,CAAA,OAAA,CAAQ,KAAK,CAAI,GAAA,KAAA,GAAQ,CAAC,KAAK,CAAA,CAAA;AACxD,EAAA,MAAM,WAAW,KAAM,CAAA,OAAA,CAAQ,GAAG,CAAI,GAAA,GAAA,GAAM,CAAC,GAAG,CAAA,CAAA;AAChD,EAAO,OAAA,CAAC,mBAAG,IAAI,GAAI,CAAA,CAAC,GAAG,UAAY,EAAA,GAAG,QAAQ,CAAC,CAAC,CAAA,CAAA;AACpD,CAAA;;;ACAO,SAAS,cAAA,CAAe,KAAc,EAAA,MAAA,EAAwB,SAAoB,EAAA;AACrF,EAAA,IAAI,IAAe,GAAA,EAAA,CAAA;AACnB,EAAA,IAAI,KAAgB,GAAA,EAAA,CAAA;AACpB,EAAA,IAAI,SAAoB,GAAA,EAAA,CAAA;AACxB,EAAA,KAAA,IAAS,KAAQ,GAAA,CAAA,EAAG,KAAQ,GAAA,KAAA,CAAM,QAAQ,KAAS,EAAA,EAAA;AAC/C,IAAI,IAAA,CAAA,GAAI,MAAM,KAAK,CAAA,CAAA;AACnB,IAAI,IAAA,OAAO,MAAM,QAAU,EAAA;AAEvB,MAAI,IAAA,CAAA,CAAE,UAAW,CAAA,GAAG,CAAG,EAAA;AACnB,QAAO,IAAA,GAAA,CAAA,CAAE,UAAU,CAAC,CAAA,CAAA;AAAA,OACxB;AAAA,KAEK,MAAA,IAAA,CAAA,IAAK,OAAO,CAAA,KAAM,QAAU,EAAA;AAEjC,MAAA,IAAI,OAAO,CAAK,IAAA,OAAO,CAAE,CAAA,GAAG,KAAK,OAAO,CAAA,CAAE,GAAG,CAAA,KAAM,YAAY,CAAE,CAAA,GAAG,CAAE,CAAA,QAAA,CAAS,GAAG,CAAG,EAAA;AACjF,QAAI,IAAA,CAAA,GAAI,MAAM,CAAE,CAAA,GAAG,EAAE,KAAM,CAAA,GAAG,EAAE,CAAC,CAAA,CAAA;AACjC,QAAQ,KAAA,GAAA,CAAA,CAAA;AAAA,iBAGH,GAAO,IAAA,CAAA,IAAK,CAAE,CAAA,GAAG,aAAa,KAAO,EAAA;AAC1C,QAAA,IAAI,CAAI,GAAA,cAAA,CAAe,CAAE,CAAA,GAAG,CAAC,CAAA,CAAA;AAC7B,QAAA,IAAI,CAAG,EAAA;AACH,UAAI,IAAA,SAAA,IAAa,MAAO,CAAA,SAAS,CAAG,EAAA;AAChC,YAAA,MAAA,CAAO,SAAS,CAAA,CAAE,SAAY,GAAA,EAAE,MAAM,CAAE,EAAA,CAAA;AACxC,YAAO,MAAA,CAAA,SAAS,EAAE,IAAO,GAAA,kBAAA,CAAmB,GAAG,MAAO,CAAA,SAAS,EAAE,IAAI,CAAA,CAAA;AAAA,WAEpE,MAAA;AACD,YAAO,IAAA,GAAA,CAAA,CAAA;AACP,YAAY,SAAA,GAAA,CAAA,CAAA;AAAA,WAChB;AAAA,SACJ;AAAA,OACJ;AAAA,KACJ;AACA,IAAA,IAAI,QAAQ,KAAO,EAAA;AACf,MAAI,IAAA,MAAA,CAAO,KAAK,CAAG,EAAA;AACf,QAAO,MAAA,CAAA,KAAK,EAAE,IAAO,GAAA,kBAAA,CAAmB,MAAM,MAAO,CAAA,KAAK,EAAE,IAAI,CAAA,CAAA;AAAA,OAE/D,MAAA;AACD,QAAO,MAAA,CAAA,KAAK,CAAI,GAAA,EAAE,IAAW,EAAA,CAAA;AAAA,OACjC;AACA,MAAA,IAAI,SAAW,EAAA;AACX,QAAA,MAAA,CAAO,KAAK,CAAA,CAAE,SAAY,GAAA,EAAE,MAAM,SAAU,EAAA,CAAA;AAAA,OAChD;AAEA,MAAA,IAAI,WAAc,GAAA,KAAA,CAAM,KAAM,CAAA,KAAA,GAAQ,CAAC,CAAA,CAAA;AACvC,MAAe,cAAA,CAAA,WAAA,EAAa,QAAQ,KAAK,CAAA,CAAA;AACzC,MAAA,OAAA;AAAA,KACJ;AAAA,GACJ;AACJ,CAAA;AAEA,SAAS,eAAe,KAAiD,EAAA;AACrE,EAAA,KAAA,MAAW,QAAQ,KAAO,EAAA;AACtB,IAAI,IAAA,OAAO,SAAS,QAAU,EAAA;AAC1B,MAAI,IAAA,IAAA,CAAK,UAAW,CAAA,GAAG,CAAG,EAAA;AACtB,QAAO,OAAA,IAAA,CAAK,UAAU,CAAC,CAAA,CAAA;AAAA,OAC3B;AAAA,KACJ,MAAA,IACS,gBAAgB,KAAO,EAAA;AAC5B,MAAI,IAAA,GAAA,GAAM,eAAe,IAAI,CAAA,CAAA;AAC7B,MAAA,IAAI,GAAK,EAAA;AACL,QAAO,OAAA,GAAA,CAAA;AAAA,OACX;AAAA,KACJ;AAAA,GACJ;AACJ","file":"ChoiceInfoConverter.js","sourcesContent":["export function unionStringOrArray(start: string | string[] = \"\", end: string | string[] = \"\"): string[] {\n    const startArray = Array.isArray(start) ? start : [start];\n    const endArray = Array.isArray(end) ? end : [end];\n    return [...new Set([...startArray, ...endArray])];\n}","import LabelChoiceRes from '../types/LabelChoiceRes';\nimport RootParserItemType from '../types/parserItems/RootParserItemType';\nimport { unionStringOrArray } from './utility';\n\nexport function getLabelChoice(items: any[], result: LabelChoiceRes, lastLabel?: string) {\n    let text: string = \"\"\n    let label: string = \"\"\n    let preDialog: string = \"\"\n    for (let index = 0; index < items.length; index++) {\n        let v = items[index]\n        if (typeof v === \"string\") {\n            // Dialog\n            if (v.startsWith(\"^\")) {\n                text = v.substring(1)\n            }\n        }\n        else if (v && typeof v === \"object\") {\n            // if is a choice\n            if (\"*\" in v && typeof v[\"*\"] && typeof v[\"*\"] === \"string\" && v[\"*\"].includes(\"c\")) {\n                let l = \"c\" + v[\"*\"].split(\"c\")[1]\n                label = l\n            }\n            // if is choise info\n            else if (\"s\" in v && v[\"s\"] instanceof Array) {\n                let t = findChoiceText(v[\"s\"])\n                if (t) {\n                    if (lastLabel && result[lastLabel]) {\n                        result[lastLabel].preDialog = { text: t }\n                        result[lastLabel].text = unionStringOrArray(t, result[lastLabel].text)\n                    }\n                    else {\n                        text = t\n                        preDialog = t\n                    }\n                }\n            }\n        }\n        if (text && label) {\n            if (result[label]) {\n                result[label].text = unionStringOrArray(text, result[label].text)\n            }\n            else {\n                result[label] = { text: text }\n            }\n            if (preDialog) {\n                result[label].preDialog = { text: preDialog }\n            }\n            // split text and label\n            let newListItem = items.slice(index + 1)\n            getLabelChoice(newListItem, result, label)\n            return\n        }\n    }\n}\n\nfunction findChoiceText(items: RootParserItemType[]): string | undefined {\n    for (const item of items) {\n        if (typeof item === \"string\") {\n            if (item.startsWith(\"^\")) {\n                return item.substring(1)\n            }\n        }\n        else if (item instanceof Array) {\n            let res = findChoiceText(item)\n            if (res) {\n                return res\n            }\n        }\n    }\n}\n"]}

package/dist/functions/ChoiceInfoConverter.mjs

@@ -1,9 +1,17 @@
+// src/functions/utility.ts
+function unionStringOrArray(start = "", end = "") {
+  const startArray = Array.isArray(start) ? start : [start];
+  const endArray = Array.isArray(end) ? end : [end];
+  return [.../* @__PURE__ */ new Set([...startArray, ...endArray])];
+}
+
 // src/functions/ChoiceInfoConverter.ts
-function getLabelChoice(items, result) {
+function getLabelChoice(items, result, lastLabel) {
   let text = "";
   let label = "";
   let preDialog = "";
-  items.forEach((v, index) => {
+  for (let index = 0; index < items.length; index++) {
+    let v = items[index];
     if (typeof v === "string") {
       if (v.startsWith("^")) {
         text = v.substring(1);
@@ -15,14 +23,19 @@ function getLabelChoice(items, result) {
       } else if ("s" in v && v["s"] instanceof Array) {
         let t = findChoiceText(v["s"]);
         if (t) {
-          text = t;
-          preDialog = t;
+          if (lastLabel && result[lastLabel]) {
+            result[lastLabel].preDialog = { text: t };
+            result[lastLabel].text = unionStringOrArray(t, result[lastLabel].text);
+          } else {
+            text = t;
+            preDialog = t;
+          }
         }
       }
     }
     if (text && label) {
       if (result[label]) {
-        result[label].text = text + result[label].text;
+        result[label].text = unionStringOrArray(text, result[label].text);
       } else {
         result[label] = { text };
       }
@@ -30,10 +43,10 @@ function getLabelChoice(items, result) {
         result[label].preDialog = { text: preDialog };
       }
       let newListItem = items.slice(index + 1);
-      getLabelChoice(newListItem, result);
+      getLabelChoice(newListItem, result, label);
       return;
     }
-  });
+  }
 }
 function findChoiceText(items) {
   for (const item of items) {

package/dist/functions/ChoiceInfoConverter.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/functions/ChoiceInfoConverter.ts"],"names":[],"mappings":";AAGO,SAAS,cAAA,CAAe,OAAc,MAAwB,EAAA;AACjE,EAAA,IAAI,IAAe,GAAA,EAAA,CAAA;AACnB,EAAA,IAAI,KAAgB,GAAA,EAAA,CAAA;AACpB,EAAA,IAAI,SAAoB,GAAA,EAAA,CAAA;AACxB,EAAM,KAAA,CAAA,OAAA,CAAQ,CAAC,CAAA,EAAG,KAAU,KAAA;AACxB,IAAI,IAAA,OAAO,MAAM,QAAU,EAAA;AAEvB,MAAI,IAAA,CAAA,CAAE,UAAW,CAAA,GAAG,CAAG,EAAA;AACnB,QAAO,IAAA,GAAA,CAAA,CAAE,UAAU,CAAC,CAAA,CAAA;AAAA,OACxB;AAAA,KAEK,MAAA,IAAA,CAAA,IAAK,OAAO,CAAA,KAAM,QAAU,EAAA;AAEjC,MAAA,IAAI,OAAO,CAAK,IAAA,OAAO,CAAE,CAAA,GAAG,KAAK,OAAO,CAAA,CAAE,GAAG,CAAA,KAAM,YAAY,CAAE,CAAA,GAAG,CAAE,CAAA,QAAA,CAAS,GAAG,CAAG,EAAA;AACjF,QAAI,IAAA,CAAA,GAAI,MAAM,CAAE,CAAA,GAAG,EAAE,KAAM,CAAA,GAAG,EAAE,CAAC,CAAA,CAAA;AACjC,QAAQ,KAAA,GAAA,CAAA,CAAA;AAAA,iBAGH,GAAO,IAAA,CAAA,IAAK,CAAE,CAAA,GAAG,aAAa,KAAO,EAAA;AAC1C,QAAA,IAAI,CAAI,GAAA,cAAA,CAAe,CAAE,CAAA,GAAG,CAAC,CAAA,CAAA;AAC7B,QAAA,IAAI,CAAG,EAAA;AACH,UAAO,IAAA,GAAA,CAAA,CAAA;AACP,UAAY,SAAA,GAAA,CAAA,CAAA;AAAA,SAChB;AAAA,OACJ;AAAA,KACJ;AACA,IAAA,IAAI,QAAQ,KAAO,EAAA;AACf,MAAI,IAAA,MAAA,CAAO,KAAK,CAAG,EAAA;AACf,QAAA,MAAA,CAAO,KAAK,CAAE,CAAA,IAAA,GAAO,IAAO,GAAA,MAAA,CAAO,KAAK,CAAE,CAAA,IAAA,CAAA;AAAA,OAEzC,MAAA;AACD,QAAO,MAAA,CAAA,KAAK,CAAI,GAAA,EAAE,IAAW,EAAA,CAAA;AAAA,OACjC;AACA,MAAA,IAAI,SAAW,EAAA;AACX,QAAA,MAAA,CAAO,KAAK,CAAA,CAAE,SAAY,GAAA,EAAE,MAAM,SAAU,EAAA,CAAA;AAAA,OAChD;AAEA,MAAA,IAAI,WAAc,GAAA,KAAA,CAAM,KAAM,CAAA,KAAA,GAAQ,CAAC,CAAA,CAAA;AACvC,MAAA,cAAA,CAAe,aAAa,MAAM,CAAA,CAAA;AAClC,MAAA,OAAA;AAAA,KACJ;AAAA,GACH,CAAA,CAAA;AACL,CAAA;AAEA,SAAS,eAAe,KAAiD,EAAA;AACrE,EAAA,KAAA,MAAW,QAAQ,KAAO,EAAA;AACtB,IAAI,IAAA,OAAO,SAAS,QAAU,EAAA;AAC1B,MAAI,IAAA,IAAA,CAAK,UAAW,CAAA,GAAG,CAAG,EAAA;AACtB,QAAO,OAAA,IAAA,CAAK,UAAU,CAAC,CAAA,CAAA;AAAA,OAC3B;AAAA,KACJ,MAAA,IACS,gBAAgB,KAAO,EAAA;AAC5B,MAAI,IAAA,GAAA,GAAM,eAAe,IAAI,CAAA,CAAA;AAC7B,MAAA,IAAI,GAAK,EAAA;AACL,QAAO,OAAA,GAAA,CAAA;AAAA,OACX;AAAA,KACJ;AAAA,GACJ;AACJ","file":"ChoiceInfoConverter.mjs","sourcesContent":["import LabelChoiceRes from '../types/LabelChoiceRes';\nimport RootParserItemType from '../types/parserItems/RootParserItemType';\n\nexport function getLabelChoice(items: any[], result: LabelChoiceRes) {\n    let text: string = \"\"\n    let label: string = \"\"\n    let preDialog: string = \"\"\n    items.forEach((v, index) => {\n        if (typeof v === \"string\") {\n            // Dialog\n            if (v.startsWith(\"^\")) {\n                text = v.substring(1)\n            }\n        }\n        else if (v && typeof v === \"object\") {\n            // if is a choice\n            if (\"*\" in v && typeof v[\"*\"] && typeof v[\"*\"] === \"string\" && v[\"*\"].includes(\"c\")) {\n                let l = \"c\" + v[\"*\"].split(\"c\")[1]\n                label = l\n            }\n            // if is choise info\n            else if (\"s\" in v && v[\"s\"] instanceof Array) {\n                let t = findChoiceText(v[\"s\"])\n                if (t) {\n                    text = t\n                    preDialog = t\n                }\n            }\n        }\n        if (text && label) {\n            if (result[label]) {\n                result[label].text = text + result[label].text\n            }\n            else {\n                result[label] = { text: text }\n            }\n            if (preDialog) {\n                result[label].preDialog = { text: preDialog }\n            }\n            // split text and label\n            let newListItem = items.slice(index + 1)\n            getLabelChoice(newListItem, result)\n            return\n        }\n    })\n}\n\nfunction findChoiceText(items: RootParserItemType[]): string | undefined {\n    for (const item of items) {\n        if (typeof item === \"string\") {\n            if (item.startsWith(\"^\")) {\n                return item.substring(1)\n            }\n        }\n        else if (item instanceof Array) {\n            let res = findChoiceText(item)\n            if (res) {\n                return res\n            }\n        }\n    }\n}\n"]}
+{"version":3,"sources":["../../src/functions/utility.ts","../../src/functions/ChoiceInfoConverter.ts"],"names":[],"mappings":"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","file":"ChoiceInfoConverter.mjs","sourcesContent":["export function unionStringOrArray(start: string | string[] = \"\", end: string | string[] = \"\"): string[] {\n    const startArray = Array.isArray(start) ? start : [start];\n    const endArray = Array.isArray(end) ? end : [end];\n    return [...new Set([...startArray, ...endArray])];\n}","import LabelChoiceRes from '../types/LabelChoiceRes';\nimport RootParserItemType from '../types/parserItems/RootParserItemType';\nimport { unionStringOrArray } from './utility';\n\nexport function getLabelChoice(items: any[], result: LabelChoiceRes, lastLabel?: string) {\n    let text: string = \"\"\n    let label: string = \"\"\n    let preDialog: string = \"\"\n    for (let index = 0; index < items.length; index++) {\n        let v = items[index]\n        if (typeof v === \"string\") {\n            // Dialog\n            if (v.startsWith(\"^\")) {\n                text = v.substring(1)\n            }\n        }\n        else if (v && typeof v === \"object\") {\n            // if is a choice\n            if (\"*\" in v && typeof v[\"*\"] && typeof v[\"*\"] === \"string\" && v[\"*\"].includes(\"c\")) {\n                let l = \"c\" + v[\"*\"].split(\"c\")[1]\n                label = l\n            }\n            // if is choise info\n            else if (\"s\" in v && v[\"s\"] instanceof Array) {\n                let t = findChoiceText(v[\"s\"])\n                if (t) {\n                    if (lastLabel && result[lastLabel]) {\n                        result[lastLabel].preDialog = { text: t }\n                        result[lastLabel].text = unionStringOrArray(t, result[lastLabel].text)\n                    }\n                    else {\n                        text = t\n                        preDialog = t\n                    }\n                }\n            }\n        }\n        if (text && label) {\n            if (result[label]) {\n                result[label].text = unionStringOrArray(text, result[label].text)\n            }\n            else {\n                result[label] = { text: text }\n            }\n            if (preDialog) {\n                result[label].preDialog = { text: preDialog }\n            }\n            // split text and label\n            let newListItem = items.slice(index + 1)\n            getLabelChoice(newListItem, result, label)\n            return\n        }\n    }\n}\n\nfunction findChoiceText(items: RootParserItemType[]): string | undefined {\n    for (const item of items) {\n        if (typeof item === \"string\") {\n            if (item.startsWith(\"^\")) {\n                return item.substring(1)\n            }\n        }\n        else if (item instanceof Array) {\n            let res = findChoiceText(item)\n            if (res) {\n                return res\n            }\n        }\n    }\n}\n"]}

package/dist/functions/Importer.d.mts

@@ -1,3 +1,18 @@
+/**
+ * This function imports string or array of strings written in ink language into the Pixi’VN engine.
+ * @example
+ * ```ts
+ * import { importInkText } from 'pixi-vn'
+ * importInkText(`
+ * === back_in_london ===
+ * Hello, World!
+ * `)
+ *
+ * GameStepManager.callLabel("back_in_london", {})
+ * ```
+ * @param text string or array of strings written in ink language
+ * @returns
+ */
 declare function importInkText(text: string | string[]): void;
 
 export { importInkText };

package/dist/functions/Importer.d.ts

@@ -1,3 +1,18 @@
+/**
+ * This function imports string or array of strings written in ink language into the Pixi’VN engine.
+ * @example
+ * ```ts
+ * import { importInkText } from 'pixi-vn'
+ * importInkText(`
+ * === back_in_london ===
+ * Hello, World!
+ * `)
+ *
+ * GameStepManager.callLabel("back_in_london", {})
+ * ```
+ * @param text string or array of strings written in ink language
+ * @returns
+ */
 declare function importInkText(text: string | string[]): void;
 
 export { importInkText };

package/dist/functions/Importer.js

@@ -5,12 +5,23 @@ var Compiler = require('inkjs/compiler/Compiler');
 
 // src/functions/Importer.ts
 
+// src/constant.ts
+var CHOISE_LABEL_KEY_SEPARATOR = "_|_";
+
+// src/functions/utility.ts
+function unionStringOrArray(start = "", end = "") {
+  const startArray = Array.isArray(start) ? start : [start];
+  const endArray = Array.isArray(end) ? end : [end];
+  return [.../* @__PURE__ */ new Set([...startArray, ...endArray])];
+}
+
 // src/functions/ChoiceInfoConverter.ts
-function getLabelChoice(items, result) {
+function getLabelChoice(items, result, lastLabel) {
   let text = "";
   let label = "";
   let preDialog = "";
-  items.forEach((v, index) => {
+  for (let index = 0; index < items.length; index++) {
+    let v = items[index];
     if (typeof v === "string") {
       if (v.startsWith("^")) {
         text = v.substring(1);
@@ -22,14 +33,19 @@ function getLabelChoice(items, result) {
       } else if ("s" in v && v["s"] instanceof Array) {
         let t = findChoiceText(v["s"]);
         if (t) {
-          text = t;
-          preDialog = t;
+          if (lastLabel && result[lastLabel]) {
+            result[lastLabel].preDialog = { text: t };
+            result[lastLabel].text = unionStringOrArray(t, result[lastLabel].text);
+          } else {
+            text = t;
+            preDialog = t;
+          }
         }
       }
     }
     if (text && label) {
       if (result[label]) {
-        result[label].text = text + result[label].text;
+        result[label].text = unionStringOrArray(text, result[label].text);
       } else {
         result[label] = { text };
       }
@@ -37,10 +53,10 @@ function getLabelChoice(items, result) {
         result[label].preDialog = { text: preDialog };
       }
       let newListItem = items.slice(index + 1);
-      getLabelChoice(newListItem, result);
+      getLabelChoice(newListItem, result, label);
       return;
     }
-  });
+  }
 }
 function findChoiceText(items) {
   for (const item of items) {
@@ -64,7 +80,7 @@ function getInkLabel(story) {
     findLabel(story, label);
     return label;
   } catch (e) {
-    console.error("[Pixi'VN Ink] Error parsing ink file", e);
+    console.error("[Pixi\u2019VN Ink] Error parsing ink file", e);
   }
 }
 function findLabel(story, labels) {
@@ -86,7 +102,7 @@ function addLabels(storyItem, result, dadLabelKey = "", shareData = { preDialog:
     if (value instanceof Array) {
       let labels = [];
       let subLabels = {};
-      let labelName = (dadLabelKey ? dadLabelKey + "_" : "") + key;
+      let labelName = (dadLabelKey ? dadLabelKey + CHOISE_LABEL_KEY_SEPARATOR : "") + key;
       getLabel(value, labelName, labels, subLabels, shareData);
       for (const [subKey, subValue] of Object.entries(subLabels)) {
         result[subKey] = subValue;
@@ -117,7 +133,19 @@ function getLabel(items, labelKey, labelSteps, subLabels, shareData, isNewLine =
     } else if (typeof v === "string") {
       if (v.startsWith("^")) {
         if (!isNewLine && labelSteps.length > 0) {
-          labelSteps[labelSteps.length - 1].dialog = labelSteps[labelSteps.length - 1].dialog + v.substring(1);
+          if (labelSteps[labelSteps.length - 1].glueEnabled) {
+            labelSteps.push({
+              dialog: v.substring(1)
+            });
+          } else {
+            let newDialog = labelSteps[labelSteps.length - 1].dialog;
+            if (typeof newDialog === "string" || newDialog instanceof Array || !newDialog) {
+              labelSteps[labelSteps.length - 1].dialog = unionStringOrArray(newDialog, v.substring(1));
+            } else {
+              newDialog.text = unionStringOrArray(newDialog.text, v.substring(1));
+              labelSteps[labelSteps.length - 1].dialog = newDialog;
+            }
+          }
         } else {
           labelSteps.push({
             dialog: v.substring(1)
@@ -138,16 +166,46 @@ function getLabel(items, labelKey, labelSteps, subLabels, shareData, isNewLine =
           end: "game_end"
         });
         isNewLine = false;
+      } else if (v == "<>") {
+        labelSteps.push({
+          glueEnabled: true,
+          goNextStep: true
+        });
+        isNewLine = false;
       }
     } else if (v instanceof Array) {
       getLabel(v, labelKey, labelSteps, subLabels, shareData, isNewLine);
     } else if (v && typeof v === "object") {
-      if ("->" in v && typeof v["->"] === "string" && !v["->"].includes(".^.^.")) {
+      if ("->" in v && typeof v["->"] === "string" && !new RegExp(/^\.\^\.\^\.\d\.s$/).test(v["->"])) {
+        let labelIdToOpen = v["->"];
+        let glueEnabled = isNewLine ? void 0 : true;
+        let goNextStep = isNewLine ? void 0 : true;
+        if (
+          // if there are a sub label "=label"
+          new RegExp(/^\.\^\.\^\.\^\.\^\..*$/).test(v["->"]) && labelKey
+        ) {
+          let endOfLabel = v["->"].substring(9);
+          labelIdToOpen = labelKey.split(CHOISE_LABEL_KEY_SEPARATOR)[0] + CHOISE_LABEL_KEY_SEPARATOR + endOfLabel;
+        } else if (
+          // if there are a sub label "=label"
+          new RegExp(/^\.\^\.\^\.\^\..*$/).test(v["->"]) && labelKey.includes(CHOISE_LABEL_KEY_SEPARATOR)
+        ) {
+          let endOfLabel = v["->"].substring(7);
+          labelIdToOpen = labelKey.split(CHOISE_LABEL_KEY_SEPARATOR)[0] + CHOISE_LABEL_KEY_SEPARATOR + endOfLabel;
+        } else if (
+          // if there are a sub label "=label"
+          new RegExp(/^\.\^\..*$/).test(v["->"]) && labelKey
+        ) {
+          let endOfLabel = v["->"].substring(3);
+          labelIdToOpen = labelKey + CHOISE_LABEL_KEY_SEPARATOR + endOfLabel;
+        }
         labelSteps.push({
           labelToOpen: {
-            labelId: v["->"],
+            labelId: labelIdToOpen,
             type: "call"
-          }
+          },
+          glueEnabled,
+          goNextStep
         });
         isNewLine = false;
       } else if ("*" in v && typeof v["*"] === "string" && v["*"].includes("c")) {
@@ -165,9 +223,9 @@ function getLabel(items, labelKey, labelSteps, subLabels, shareData, isNewLine =
     let choices = {};
     getLabelChoice(envList, choices);
     for (const [key, value] of Object.entries(choices)) {
-      let newKey = labelKey + "_" + key;
-      if (labelSteps.length > 0 && "currentChoiceMenuOptions" in labelSteps[labelSteps.length - 1]) {
-        (_a = labelSteps[labelSteps.length - 1].currentChoiceMenuOptions) == null ? void 0 : _a.push({
+      let newKey = labelKey + CHOISE_LABEL_KEY_SEPARATOR + key;
+      if (labelSteps.length > 0 && "choices" in labelSteps[labelSteps.length - 1]) {
+        (_a = labelSteps[labelSteps.length - 1].choices) == null ? void 0 : _a.push({
           text: value.text,
           label: newKey,
           props: {},
@@ -175,7 +233,7 @@ function getLabel(items, labelKey, labelSteps, subLabels, shareData, isNewLine =
         });
       } else {
         labelSteps.push({
-          currentChoiceMenuOptions: [{
+          choices: [{
             text: value.text,
             label: newKey,
             props: {},
@@ -190,28 +248,34 @@ function getLabel(items, labelKey, labelSteps, subLabels, shareData, isNewLine =
       }
     }
   }
+  if (labelKey.includes(CHOISE_LABEL_KEY_SEPARATOR) && labelSteps.length == 2 && labelSteps[0].dialog == " " && labelSteps[1].labelToOpen) {
+    labelSteps.shift();
+    labelSteps[0].glueEnabled = void 0;
+    labelSteps[0].goNextStep = void 0;
+  }
 }
 
 // src/functions/InkToPixivn.ts
 function convertInkText(text) {
+  let result = {};
   let json = convertorInkToJson(text);
   let obj;
   try {
     obj = JSON.parse(json);
   } catch (e) {
-    console.error("[Pixi'VN Ink] Error parsing ink file", e);
+    console.error("[Pixi\u2019VN Ink] Error parsing ink file", e);
     return;
   }
-  return getInkLabel(obj.root);
+  result.labels = getInkLabel(obj.root);
+  return result;
 }
 function convertorInkToJson(test) {
   try {
     const story = new Compiler.Compiler(test).Compile();
     let json = story.ToJson();
-    console.log(json);
     return json || "";
   } catch (e) {
-    console.error("[Pixi'VN] Error compiling ink file", e);
+    console.error("[Pixi\u2019VN] Error compiling ink file", e);
     return "";
   }
 }