Merge pull request benawad#2722 from goldyydev/patch-38

feat(dolma) dolma improvements
Mahmoud-Skafi · May 14, 2021 · add0ab7 · add0ab7
2 parents 667abcd + fb72879
commit add0ab7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/dolma/src/index.ts b/dolma/src/index.ts
@@ -10,12 +10,23 @@ interface RootMethodResponse {
 
 export * from './util/types/tokenTypes';
 
-export default function dolma(values?: Array<Unitoken | MessageToken | string> | string): RootMethodResponse {
-	return {
-		encoded: encodeTokens(values ?? ""),
-		decoded: decodeTokens(values ?? "")
-	}
-}
+// export default function dolma(values?: Array<Unitoken | MessageToken | string> | string): RootMethodResponse {
+// 	return {
+// 		encoded: encodeTokens(values ?? ""),
+// 		decoded: decodeTokens(values ?? "")
+// 	}
+// }
+
+// dolma['encode'] = encodeTokens;
+// dolma['decode'] = decodeTokens;
+
+export default class dolma {
+  public readonly emotes: {name: string}[];
 
-dolma['encode'] = encodeTokens;
-dolma['decode'] = decodeTokens;
+  constructor(emotes: {name: string}[]) {
+    this.emotes = emotes;
+  }
+
+  public decode = decodeTokens;
+  public encode = encodeTokens;
+}
diff --git a/dolma/src/test/run.ts b/dolma/src/test/run.ts
@@ -41,7 +41,7 @@ async function main() {
 
   tests.encoding.map(async test => {
     const started = new Date();
-    const encodedValue = dolma.encode(test.input);
+    const encodedValue = new dolma([]).encode(test.input);
     if (JSON.stringify(encodedValue) == JSON.stringify(test.expectedOutput)) testFinished(test, started, true);
     else testFinished(test, started, false);
   });

diff --git a/dolma/src/util/regex.ts b/dolma/src/util/regex.ts
@@ -4,7 +4,7 @@ export const validationRegex = {
 	emote: /\:([a-z0-9]+)\:/gi,
 	block: /\`(.*?)\`/gi,
 
-	global: /(\`.*?\`)|(\@[a-zA-Z0-9_]{4,})|(\:[a-z0-9]+\:)|(https?\:\/\/[^ ]+)/gi,
+	global: /(?=(\`.*?\`)|(\@[a-zA-Z0-9_]{4,})|(\:[a-z0-9]+\:)|(https?\:\/\/[^ ]+))/gi,
 
 	unicodeEmoji:  /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff])/gm
-}
+}
diff --git a/dolma/tsconfig.json b/dolma/tsconfig.json
@@ -15,6 +15,7 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
+    "declaration": true,
     "noImplicitAny": false
   },
   "include": ["src/**/*.ts"]