Merge branch 'develop' into 'master'

Add ability to run arbitrary script on matched text, add cherokee, update help messages and version

See merge request Dandellion/matrix-wug!11

.gitignore

@@ -1,2 +1,3 @@
 config.json
 node_modules
+build

.gitlab-ci.yml

@@ -0,0 +1,6 @@
+image: node:10-slim
+
+build:
+  script:
+  - npm install
+  - npm build

Dockerfile

@@ -4,5 +4,6 @@ WORKDIR /server
 COPY . /server
 
 RUN npm install
+RUN mkdir build && npm run build
 
 CMD [ "npm", "start" ]

README.md

@@ -21,7 +21,15 @@ For the PIE notation:
 
 This is best learned by experimenting.
 
-These conversions were originally taken from [xsduan/conniebot](https://github.com/xsduan/conniebot). But have later divirged a bit.
+Inuktitut Syllabics: https://en.wikipedia.org/wiki/Inuktitut_syllabics
+
+Iñupiatun Orthography:
+
+* & for miniscule ł
+* l% and n% for ł and ñ each
+* g^, l^, &^ (or l%^ and l^%) n^, and r^ for ġ ḷ ł̣ ŋ ȓ each
+
+These conversions were originally taken from [xsduan/conniebot](https://github.com/xsduan/conniebot), and the discord bot Tuugaalikkuluk (thanks!) But have later divirged a bit.
 
 To use the bot I run an instance at [@wug:dodsorf.as](https://matrix.to/#/@wug:dodsorf.as), you can invite it to a room or DM it to use the converter. Or you can read the setup instructions below to host your own!
 

index.ts

@@ -1,12 +1,9 @@
-const version = "1.1.2";
+const version = "2.2.0";
 import x2i from "./x2i";
 import { existsSync } from "fs";
 
 const config = (existsSync("./config.json")) ? require("./config.json") : {};
 
-console.log(process.env.MATRIXDEV_HOMESERVER);
-console.log(process.env.MATRIXDEV_TOKEN);
-
 const MatrixClient = require("matrix-bot-sdk").MatrixClient;
 const AutojoinRoomsMixin = require("matrix-bot-sdk").AutojoinRoomsMixin;
 
@@ -29,6 +26,9 @@ async function handle(roomId, event) {
     if (event.sender === await myself) { console.log("Wait a minute... That's me!"); return;};
 
     if (event.content.body === "!xhelp" || event.content.body === (await client.getUserProfile(await myself)).displayname + ": help") {help(roomId); return;};
+    if (event.content.body === "!xik") {xik(roomId); return;};
+    if (event.content.body === "!xpie") {xpie(roomId); return;};
+    if (event.content.body === "!xchr") {xchr(roomId); return;};
     if (event.content.body === "!xdebug") {debug(roomId); return;};
 
     console.log("Trying to convert the message!");
@@ -41,11 +41,62 @@ async function handle(roomId, event) {
 
 
 function help(roomId) {
-    var message = `Hi I can help you translate X-SAMPA, Z-SAMPA to IPA, and transcribe into proto-indo european notation!
+    var message = `Hi I am a general language bot!
-Use (x/z/p) together with either / or [] as delimeters
+To use me, type a key together with either / or [] as delimeters
-x/"hEloU/ z[or\` 5aIk DIz] p/mreghnom/ 😀
 
-Find my source at https://github.com/Dali99/matrix-wug`;
+x - X-SAMPA - https://en.wikipedia.org/wiki/X-SAMPA
+z - Z-SAMPA - http://www.kneequickie.com/kq/Z-SAMPA
+p - Proto-Indo-European Notation (see !xpie)
+i - Inuktitut Syllabics - https://en.wikipedia.org/wiki/Inuktitut_syllabics
+ik - Iñupiatun Orthographies (see !xik)
+chr - Cherokee (see !xchr) - https://en.wikipedia.org/wiki/Cherokee_syllabary
+
+Find my source at https://github.com/Dali99/matrix-wug
+
+EXAMPLES:
+x/"hEloU/ - /ˈhɛloʊ/
+z[or\` 5aIk DIz] - [oɽ ɫaɪk ðɪz]
+`;
+    
+    client.sendNotice(roomId, message);
+}
+
+function xpie(roomId) {
+    var message = `This is a fun PIE notation
+
+a preceding " is acute accent
+a following : is the macron
+a following . is the syllabicity marker
+h always becomes superscript and v is superscript w.
+Palato-velars are marked with a following ' and x1, x2, x3 etc. yields the laryngeals, with x@ for the subscript a laryngeal, and xx for an unknown laryngeal.
+
+There's probably more, but this is best learned by experimenting (or reading https://github.com/dali99/matrix-wug/blob/master/x2i/apie-keys.yaml)
+
+Thanks to conniebot (xsduan) for the encoding`;
+    
+    client.sendNotice(roomId, message);
+}
+
+function xik(roomId) {
+    var message = `There are several distinct Iñupiatun orthographies, and I can type all of them.
+& for miniscule ł
+l% and n% for ł and ñ each
+g^, l^, &^ (or l%^ and l^%) n^, and r^ for ġ ḷ ł̣ ŋ ȓ each
+
+Thanks to Tuugaalikkuluk for the encoding`;
+    
+    client.sendNotice(roomId, message);
+}
+
+function xchr(roomId) {
+    var message = `I'm sadly not smart enough to know which syllable to  use in certain situations.
+That means you have to help me out a little.
+Write the wanted syllables down, but separate them by  a dot (.)
+
+Thanks to Tuugaalikkuluk for the encoding
+
+EXAMPLES:
+chr/tsa.la.gi ga.wo.ni.hi.s.di/ - ᏣᎳᎩ ᎦᏬᏂᎯᏍᏗ`;
     
     client.sendNotice(roomId, message);
 }

package.json

@@ -4,7 +4,8 @@
   "description": "Language bot for matrix",
   "main": "index.js",
   "scripts": {
-    "start": "nodemon --exitcrash --ignore *.sqlite -x ts-node index.ts"
+    "build": "tsc",
+    "start": "node build/index.js"
   },
   "author": "Daniel",
   "license": "ISC",

shell.nix

@@ -1,7 +1,7 @@
 with import <nixpkgs> {};
 stdenv.mkDerivation {
   name = "node";
-  buildInputs = [ nodejs ];
+  buildInputs = [ nodejs-10_x ];
   shellHook = ''
     export PATH="$PWD/node_modules/.bin/:$PATH"
   '';

tsconfig.json

@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "outDir": "build"
+    },
+    "files": [
+        "index.ts"
+    ]
+}

x2i/apie-keys.yaml

@@ -1,4 +1,12 @@
 ---
+- - '"l.:'
+  - l̥̄́
+- - '"m.:'
+  - m̥̥̄́
+- - '"n.:'
+  - n̥̄́
+- - '"r.:'
+  - r̥̄́
 - - '"a:'
   - ā́
 - - '"e:'
@@ -91,11 +99,3 @@
   - hₐ
 - - xx
   - hₓ
-- - '"l.':
-  - l̥̄́
-- - '"m.':
-  - m̥̥̄́
-- - '"n.':
-  - n̥̄́
-- - '"r.':
-  - r̥̄́

x2i/chr.ts

@@ -0,0 +1,134 @@
+export function convert(input: string)
+{
+    console.log("Converting to cherokee!!!");
+    var c=" ";
+    var i=0;
+    var j=0;
+    var k=0;
+    var flag=0;
+    var rom=input+" ";
+    const cons=["g","k","h","l","m","n","q","s","d","t","c","j","w","y","qu","qw","gw","kw","dl","tl","ts","ch","dz"];
+    const vowel=["a","e","i","o","u","v"];
+    const syl=[["Ꭶ","Ꭸ","Ꭹ","Ꭺ","Ꭻ","Ꭼ"],["Ꭷ","Ꭸ","Ꭹ","Ꭺ","Ꭻ","Ꭼ"],["Ꭽ","Ꭾ","Ꭿ","Ꮀ","Ꮁ","Ꮂ"],["Ꮃ","Ꮄ","Ꮅ","Ꮆ","Ꮇ","Ꮈ"],["Ꮉ","Ꮊ","Ꮋ","Ꮌ","Ꮍ","Ᏽ"],["Ꮎ","Ꮑ","Ꮒ","Ꮓ","Ꮔ","Ꮕ"],["Ꮖ","Ꮗ","Ꮘ","Ꮙ","Ꮚ","Ꮛ"],["Ꮜ","Ꮞ","Ꮟ","Ꮠ","Ꮡ","Ꮢ"],["Ꮣ","Ꮥ","Ꮧ","Ꮩ","Ꮪ","Ꮫ"],["Ꮤ","Ꮦ","Ꮨ","Ꮩ","Ꮪ","Ꮫ"],["Ꮳ","Ꮴ","Ꮵ","Ꮶ","Ꮷ","Ꮸ"],["Ꮳ","Ꮴ","Ꮵ","Ꮶ","Ꮷ","Ꮸ"],["Ꮹ","Ꮺ","Ꮻ","Ꮼ","Ꮽ","Ꮾ"],["Ꮿ","Ᏸ","Ᏹ","Ᏺ","Ᏻ","Ᏼ"],["Ꮖ","Ꮗ","Ꮘ","Ꮙ","Ꮚ","Ꮛ"],["Ꮖ","Ꮗ","Ꮘ","Ꮙ","Ꮚ","Ꮛ"],["Ꮖ","Ꮗ","Ꮘ","Ꮙ","Ꮚ","Ꮛ"],["Ꮖ","Ꮗ","Ꮘ","Ꮙ","Ꮚ","Ꮛ"],["Ꮬ","Ꮮ","Ꮯ","Ꮰ","Ꮱ","Ꮲ"],["Ꮭ","Ꮮ","Ꮯ","Ꮰ","Ꮱ","Ꮲ"],["Ꮳ","Ꮴ","Ꮵ","Ꮶ","Ꮷ","Ꮸ"],["Ꮳ","Ꮴ","Ꮵ","Ꮶ","Ꮷ","Ꮸ"],["Ꮳ","Ꮴ","Ꮵ","Ꮶ","Ꮷ","Ꮸ"]];
+    while (rom.length>1) {
+        i=0;
+        while(isAlpha(rom[i])) {
+            i=i+1;
+        }
+        if (i==0) {
+            if (rom[0]=="#") break;
+            c=c+rom[0];
+            rom=rom.slice(1);
+        }
+        else if (i==1) {
+            if (rom[0].toLowerCase()=='a') {
+                c=c+'Ꭰ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2)
+                else rom=rom.slice(1);
+            }
+            else if (rom[0].toLowerCase()=='e') {
+                c=c+'Ꭱ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2);
+                else rom=rom.slice(1);
+            }
+            else if (rom[0].toLowerCase()=='i') {
+                c=c+'Ꭲ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2);
+                else rom=rom.slice(1);
+            }
+            else if (rom[0].toLowerCase()=='o') {
+                c=c+'Ꭳ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2);
+                else rom=rom.slice(1);
+            }
+            else if (rom[0].toLowerCase()=='u') {
+                c=c+'Ꭴ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2);
+                else rom=rom.slice(1);
+            }
+            else if (rom[0].toLowerCase()=='v') {
+                c=c+'Ꭵ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2);
+                else rom=rom.slice(1);
+            }
+            else if (rom[0].toLowerCase()=='s') {
+                c=c+'Ꮝ';
+                if(rom[1]=="."&& isAlpha(rom[2])) rom=rom.slice(2);
+                else rom=rom.slice(1);
+            }
+            else {
+                c=c+rom.slice(0,2);;
+                rom=rom.slice(2);;
+            };
+        }
+        else if (i==2) {
+            j=0;
+            k=0;
+            flag=0;
+            for (var j = 0; j < 14; j++) {
+                if (rom[0].toLowerCase()==cons[j]) {
+                    for (var k = 0; k < 6; k++) {
+                        if (rom[1].toLowerCase()==vowel[k]) {
+                            flag=1;
+                            break;
+                        };
+                    };
+                };
+                if(flag) break;
+            };
+            if(flag) {
+                c=c+syl[j][k];
+                if(rom[2]=="."&& isAlpha(rom[3])) rom=rom.slice(3);
+                else rom=rom.slice(2);
+            }
+            else {
+                c=c+rom.slice(0, 3);
+                rom=rom.slice(3);
+            };
+        }
+        else if (i==3) {
+            j=0;
+            k=0;
+            flag=0;
+            for (j = 14; j < 23; j++) {
+                if (rom.slice(0,2).toLowerCase()==cons[j]) {
+                    for (k = 0; k < 6; k++) {
+                        if (rom[2].toLowerCase()==vowel[k]) {
+                            flag=1;
+                            break;
+                        };
+                    };
+                };
+                if(flag) break;
+            };
+            if(flag) {
+                c=c+syl[j][k];
+                if(rom[3]=="." && isAlpha(rom[4])) rom=rom.slice(4);
+                else rom=rom.slice(3);
+            }
+            else if (rom.slice(0,3).toLowerCase()=="nah") {
+                c=c+"Ꮐ";
+                if(rom[3]=="." && isAlpha(rom[4])) rom=rom.slice(4);
+                else rom=rom.slice(3);
+            }
+            else if (rom.slice(0,3).toLowerCase()=="hna") {
+                c=c+"Ꮏ";
+                if(rom[3]=="." && isAlpha(rom[4])) rom=rom.slice(4);
+                else rom=rom.slice(3);
+            }
+            else {
+                c=c+rom.slice(0, 4);
+                rom=rom.slice(4);
+            };
+        }
+        else {
+            c=c+rom.slice(0,i+1);
+            rom=rom.slice(i+1);
+        };
+    };
+    return c;
+}
+
+function isAlpha(ch: string){
+    return /^[A-Z]$/i.test(ch);
+}

x2i/i-keys.yaml

@@ -0,0 +1,359 @@
+---
+- raw:
+  - "[nN][n][g][iI][iI]"
+  - "ᙲ"
+- raw:
+  - "[nN][n][g][uU][uU]"
+  - "ᙴ"
+- raw:
+  - "[nN][n][g][aA][aA]"
+  - "ᙶ"
+
+- raw:
+  - "[nN][gG][iI][iI]"
+  - "ᖐ"
+- raw:
+  - "[nN][gG][uU][uU]"
+  - "ᖒ"
+- raw:
+  - "[nN][gG][aA][aA]"
+  - "ᖔ"
+- raw:
+  - "[nN][n][g][iI]"
+  - "ᙱ"
+- raw:
+  - "[nN][n][g][uU]"
+  - "ᙳ"
+- raw:
+  - "[nN][n][g][aA]"
+  - "ᙵ"
+- raw:
+  - "[qQ][qQ][iI][iI]"
+  - "ᖅᑮ"
+- raw:
+  - "[qQ][qQ][uU][uU]"
+  - "ᖅᑰ"
+- raw:
+  - "[qQ][qQ][aA][aA]"
+  - "ᖅᑳ"
+
+- raw:
+  - "[nN][n][g]"
+  - "ᖖ"
+- raw:
+  - "[pP][iI][iI]"
+  - "ᐲ"
+- raw:
+  - "[pP][uU][uU]"
+  - "ᐴ"
+- raw:
+  - "[pP][aA][aA]"
+  - "ᐹ"
+- raw:
+  - "[tT][iI][iI]"
+  - "ᑏ"
+- raw:
+  - "[tT][uU][uU]"
+  - "ᑑ"
+- raw:
+  - "[tT][aA][aA]"
+  - "ᑖ"
+- raw:
+  - "[kK][iI][iI]"
+  - "ᑮ"
+- raw:
+  - "[kK][uU][uU]"
+  - "ᑰ"
+- raw:
+  - "[kK][aA][aA]"
+  - "ᑳ"
+- raw:
+  - "[gG][iI][iI]"
+  - "ᒌ"
+- raw:
+  - "[gG][uU][uU]"
+  - "ᒎ"
+- raw:
+  - "[gG][aA][aA]"
+  - "ᒑ"
+- raw:
+  - "[mM][iI][iI]"
+  - "ᒦ"
+- raw:
+  - "[mM][uU][uU]"
+  - "ᒨ"
+- raw:
+  - "[mM][aA][aA]"
+  - "ᒫ"
+- raw:
+  - "[nN][iI][iI]"
+  - "ᓃ"
+- raw:
+  - "[nN][uU][uU]"
+  - "ᓅ"
+- raw:
+  - "[nN][aA][aA]"
+  - "ᓈ"
+- raw:
+  - "[nN][gG][iI]"
+  - "ᖏ"
+- raw:
+  - "[nN][gG][uU]"
+  - "ᖑ"
+- raw:
+  - "[nN][gG][aA]"
+  - "ᖓ"
+- raw:
+  - "[sS][iI][iI]"
+  - "ᓰ"
+- raw:
+  - "[sS][uU][uU]"
+  - "ᓲ"
+- raw:
+  - "[sS][aA][aA]"
+  - "ᓵ"
+- raw:
+  - "[lL][iI][iI]"
+  - "ᓖ"
+- raw:
+  - "[lL][uU][uU]"
+  - "ᓘ"
+- raw:
+  - "[lL][aA][aA]"
+  - "ᓛ"
+- raw:
+  - "[jJyY][iI][iI]"
+  - "ᔩ"
+- raw:
+  - "[jJyY][uU][uU]"
+  - "ᔫ"
+- raw:
+  - "[jJyY][aA][aA]"
+  - "ᔮ"
+- raw:
+  - "[vV][iI][iI]"
+  - "ᕖ"
+- raw:
+  - "[vV][uU][uU]"
+  - "ᕘ"
+- raw:
+  - "[vV][aA][aA]"
+  - "ᕚ"
+- raw:
+  - "[rR][iI][iI]"
+  - "ᕇ"
+- raw:
+  - "[rR][uU][uU]"
+  - "ᕉ"
+- raw:
+  - "[rR][aA][aA]"
+  - "ᕌ"
+- raw:
+  - "[qQ][iI][iI]"
+  - "ᖀ"
+- raw:
+  - "[qQ][uU][uU]"
+  - "ᖂ"
+- raw:
+  - "[qQ][aA][aA]"
+  - "ᖄ"
+- raw:
+  - "[qQ][qQ][iI]"
+  - "ᖅᑭ"
+- raw:
+  - "[qQ][qQ][uU]"
+  - "ᖅᑯ"
+- raw:
+  - "[qQ][aA][aA]"
+  - "ᖅᑲ"
+- raw:
+  - "[łŁ&][iI][iI]"
+  - "ᖡ"
+- raw:
+  - "[łŁ&][uU][uU]"
+  - "ᖣ"
+- raw:
+  - "[łŁ&][aA][aA]"
+  - "ᖥ"
+
+- raw:
+  - "[iI][iI]"
+  - "ᐄ"
+- raw:
+  - "[uU][uU]"
+  - "ᐆ"
+- raw:
+  - "[aA][aA]"
+  - "ᐋ"
+- raw:
+  - "[pP][iI]"
+  - "ᐱ"
+- raw:
+  - "[pP][uU]"
+  - "ᐳ"
+- raw:
+  - "[pP][aA]"
+  - "ᐸ"
+- raw:
+  - "[tT][iI]"
+  - "ᑎ"
+- raw:
+  - "[tT][uU]"
+  - "ᑐ"
+- raw:
+  - "[tT][aA]"
+  - "ᑕ"
+- raw:
+  - "[kK][iI]"
+  - "ᑭ"
+- raw:
+  - "[kK][uU]"
+  - "ᑯ"
+- raw:
+  - "[kK][aA]"
+  - "ᑲ"
+- raw:
+  - "[gG][iI]"
+  - "ᒋ"
+- raw:
+  - "[gG][uU]"
+  - "ᒍ"
+- raw:
+  - "[gG][aA]"
+  - "ᒐ"
+- raw:
+  - "[mM][iI]"
+  - "ᒥ"
+- raw:
+  - "[mM][uU]"
+  - "ᒧ"
+- raw:
+  - "[mM][aA]"
+  - "ᒪ"
+- raw:
+  - "[nN][iI]"
+  - "ᓂ"
+- raw:
+  - "[nN][uU]"
+  - "ᓄ"
+- raw:
+  - "[nN][aA]"
+  - "ᓇ"
+- raw:
+  - "[nN][gG]"
+  - "ᖕ"
+- raw:
+  - "[sS][iI]"
+  - "ᓯ"
+- raw:
+  - "[sS][uU]"
+  - "ᓱ"
+- raw:
+  - "[sS][aA]"
+  - "ᓴ"
+- raw:
+  - "[lL][iI]"
+  - "ᓕ"
+- raw:
+  - "[lL][uU]"
+  - "ᓗ"
+- raw:
+  - "[lL][aA]"
+  - "ᓚ"
+- raw:
+  - "[jJyY][iI]"
+  - "ᔨ"
+- raw:
+  - "[jJyY][uU]"
+  - "ᔪ"
+- raw:
+  - "[jJyY][aA]"
+  - "ᔭ"
+- raw:
+  - "[vV][iI]"
+  - "ᕕ"
+- raw:
+  - "[vV][uU]"
+  - "ᕗ"
+- raw:
+  - "[vV][aA]"
+  - "ᕙ"
+- raw:
+  - "[rR][iI]"
+  - "ᕆ"
+- raw:
+  - "[rR][uU]"
+  - "ᕈ"
+- raw:
+  - "[rR][aA]"
+  - "ᕋ"
+- raw:
+  - "[qQ][iI]"
+  - "ᕿ"
+- raw:
+  - "[qQ][uU]"
+  - "ᖁ"
+- raw:
+  - "[qQ][aA]"
+  - "ᖃ"
+- raw:
+  - "[łŁ&][iI]"
+  - "ᖠ"
+- raw:
+  - "[łŁ&][uU]"
+  - "ᖢ"
+- raw:
+  - "[łŁ&][aA]"
+  - "ᖤ"
+
+- raw:
+  - "[iI]"
+  - "ᐃ"
+- raw:
+  - "[uU]"
+  - "ᐅ"
+- raw:
+  - "[aA]"
+  - "ᐊ"
+- raw:
+  - "[pP]"
+  - "ᑉ"
+- raw:
+  - "[pP]"
+  - "ᑉ"
+- raw:
+  - "[tT]"
+  - "ᑦ"
+- raw:
+  - "[kK]"
+  - "ᒃ"
+- raw:
+  - "[gG]"
+  - "ᒡ"
+- raw:
+  - "[mM]"
+  - "ᒻ"
+- raw:
+  - "[nN]"
+  - "ᓐ"
+- raw:
+  - "[sS]"
+  - "ᔅ"
+- raw:
+  - "[lL]"
+  - "ᓪ"
+- raw:
+  - "[jJyY]"
+  - "ᔾ"
+- raw:
+  - "[vV]"
+  - "ᕝ"
+- raw:
+  - "[rR]"
+  - "ᕐ"
+- raw:
+  - "[qQ]"
+  - "ᖅ"
+- raw:
+  - "[łŁ&]"
+  - "ᖦ"

x2i/ik-keys.yaml

@@ -0,0 +1,39 @@
+---
+- - l^%
+  - ł̣
+- - l%^
+  - ł̣
+- - L^%
+  - Ł̣
+- - L%^
+  - Ł̣
+
+- - g^
+  - ġ
+- - G^
+  - Ġ
+- - l^
+  - ḷ
+- - l%
+  - ł
+- - L^
+  - Ḷ
+- - L%
+  - Ł
+- - '&^'
+  - ł̣
+- - N%
+  - Ñ
+- - N^
+  - Ŋ
+- - n%
+  - ñ
+- - n^
+  - ŋ
+- - r^
+  - ȓ
+- - R^
+  - Ȓ
+
+- - '&'
+  - ł

x2i/index.js

@@ -1,101 +0,0 @@
-"use strict";
-exports.__esModule = true;
-var fs = require("fs");
-var yaml = require("js-yaml");
-var OuterXRegExp = require("xregexp");
-var regex = OuterXRegExp("(?:(^|[`\\p{White_Space}]))   # must be preceded by whitespace or surrounded by code brackets\n  ([A-Za-z]*)                     # key, to lower (2)\n  ([/[])                          # bracket left  (3)\n  (\\S|\\S.*?\\S)                 # body          (4)\n  ([/\\]])                        # bracket right (5)\n  (?=$|[`\\p{White_Space}\\pP])  # must be followed by a white space or punctuation", "gmx");
-var defaultMatchAction = function (left, match, right) { return left + match + right; };
-var matchType = {
-    p: {
-        join: function (_, match) { return "*" + match; },
-        keys: readKeys("./x2i/apie-keys.yaml")
-    },
-    x: {
-        keys: readKeys("./x2i/x2i-keys.yaml")
-    },
-    z: {
-        keys: readKeys("./x2i/z2i-keys.yaml")
-    }
-};
-/**
- * Read translation keys from file. Escapes strings first.
- *
- * @param fpath File to key definitions. (yaml, utf8)
- * @returns Compiled keys.
- */
-function readKeys(fpath) {
-    return yaml
-        .safeLoad(fs.readFileSync(fpath, "utf8"))
-        .map(compileKey)
-        .filter(Boolean);
-}
-/**
- * Compiles a plain object into a regexp thing.
- *
- * @param entry Regex and replacement pair, or delimited match object.
- */
-function compileKey(entry) {
-    if (Array.isArray(entry)) {
-        var key = entry[0], val = entry[1];
-        return [OuterXRegExp(OuterXRegExp.escape(key)), val, "all"];
-    }
-    // don't escape key
-    if ("raw" in entry) {
-        var _a = entry.raw, key = _a[0], val = _a[1];
-        return [OuterXRegExp(key), val, "all"];
-    }
-    // is a dict
-    try {
-        var _b = entry.delimiters, left = _b[0], right = _b[1], translations_1 = entry.translations;
-        return [
-            OuterXRegExp(OuterXRegExp.escape(left) + "(?<inside>.*?)" + OuterXRegExp.escape(right)),
-            function (m) { return OuterXRegExp.replaceEach(m.inside, translations_1.map(compileKey)); },
-            "all"
-        ];
-    }
-    catch (e) {
-        console.log(entry + " is not an array or a proper object, ignoring");
-    }
-}
-/**
- * Convert four-tuple of Strings into a specified "official" representation
- *
- * @param key What kind of conversion key is appropriate
- * @param left Left bracket
- * @param match Body
- * @param right Right bracket
- * @returns Converted item, if any.
- */
-function force(key, left, match, right) {
-    var lowerKey = key.toLowerCase();
-    if (!(lowerKey in matchType))
-        return;
-    var _a = matchType[lowerKey], keys = _a.keys, join = _a.join;
-    if (keys) {
-        var action = join || defaultMatchAction;
-        // need to use `as (RegExp | string)[][]` because the provided typings are too generic
-        return action(left, OuterXRegExp.replaceEach(match, keys), right);
-    }
-}
-exports.force = force;
-/**
- * Grab all x2i strings in message string.
- *
- * @param content Full message that may or may not contain x2i strings
- * @returns Converted representations
- */
-function x2i(content) {
-    var results = [];
-    OuterXRegExp.forEach(content, regex, function (match) {
-        var parts = match.slice(2, 6);
-        if (parts.length === 4) {
-            var k = parts[0], l = parts[1], m = parts[2], r = parts[3];
-            var converted = force(k, l, m, r); // eg x, [, text, ]
-            if (converted) {
-                results.push(converted);
-            }
-        }
-    });
-    return results.join(" ");
-}
-exports["default"] = x2i;

x2i/index.ts

@@ -21,8 +21,9 @@ type CompiledReplacer = [
 ];
 
 interface IMatchInstructions {
-  keys: CompiledReplacer[];
+  keys?: CompiledReplacer[];
   join?(left: string, match: string, right: string): string;
+  matchFunction?: Function;
 }
 
 const regex = OuterXRegExp(
@@ -35,8 +36,19 @@ const regex = OuterXRegExp(
   "gmx");
 
 const defaultMatchAction = (left: string, match: string, right: string) => left + match + right;
+const defaultMatchFunction = (match: string, keys: ([RegExp, string | ((m: {[key: string]: string;}) => string), string][])) => OuterXRegExp.replaceEach(match, keys as (RegExp | string)[][])
+
+import * as chr from "./chr";
 
 const matchType: { [key: string]: IMatchInstructions } = {
+  chr: {
+    join: (_, match) => `- ${match}`,
+    matchFunction: chr.convert,
+  },
+  ik: {
+    join: (_, match) => `- ${match}`,
+    keys: readKeys("./x2i/ik-keys.yaml"),
+  },
   p: {
     join: (_, match) => `*${match}`,
     keys: readKeys("./x2i/apie-keys.yaml"),
@@ -47,6 +59,10 @@ const matchType: { [key: string]: IMatchInstructions } = {
   z: {
     keys: readKeys("./x2i/z2i-keys.yaml"),
   },
+  i: {
+    join: (_, match) => `- ${match}`,
+    keys: readKeys("./x2i/i-keys.yaml"),
+  },
 };
 
 /**
@@ -111,11 +127,12 @@ export function force(key: string, left: string, match: string, right: string) {
   const lowerKey = key.toLowerCase();
   if (!(lowerKey in matchType)) return;
 
-  const { keys, join } = matchType[lowerKey];
+  const { keys, join, matchFunction } = matchType[lowerKey];
-  if (keys) {
+  if (keys || matchFunction) {
     const action = join || defaultMatchAction;
+    const doFunction = matchFunction || defaultMatchFunction;
     // need to use `as (RegExp | string)[][]` because the provided typings are too generic
-    return action(left, OuterXRegExp.replaceEach(match, keys as (RegExp | string)[][]), right);
+    return action(left, doFunction(match, keys), right);
   }
 }