podns 1.0.0 → 1.0.2

package/dist/index.js

@@ -12,8 +12,8 @@ const parser_js_1 = require("./parser.js");
 async function getPronouns(domain, silenceParseErrors = true) {
     const pronounsRecords = await (0, http_js_1.getPronounsRecords)(domain);
     let processed = [];
-    for (let r in pronounsRecords) {
-        const parsed = (0, parser_js_1.parseRecord)(r, silenceParseErrors);
+    for (let i in pronounsRecords) {
+        const parsed = (0, parser_js_1.parseRecord)(pronounsRecords[i], silenceParseErrors);
         if (parsed != null) {
             processed.push(parsed);
         }

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,aAAa,EAA8C,MAAM,YAAY,CAAC;AAEhI;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,aAAa,GAAG,IAAI,CA8GvF"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,aAAa,EAA8C,MAAM,YAAY,CAAC;AAEhI;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,aAAa,GAAG,IAAI,CAgHvF"}

package/dist/parser.js

@@ -17,7 +17,7 @@ function parseRecord(record, silenceErrors = false) {
         parsed = record.split("#")[0];
     }
     // remove all whitespaces, make everything lowercase
-    parsed = parsed.trim().toLocaleLowerCase().replace(/\s/g, "");
+    parsed = parsed.trim().toLocaleLowerCase();
     // check special cases (wildcard, none, nothing other than a comment)
     switch (parsed) {
         case "*": {
@@ -55,7 +55,7 @@ function parseRecord(record, silenceErrors = false) {
     if (parsed.includes(";")) {
         const parsedTags = parsed.split(";").slice(1);
         for (const i in parsedTags) {
-            let t = parsedTags[i];
+            let t = parsedTags[i].trim();
             if (t == "") {
                 continue;
             }
@@ -84,7 +84,8 @@ function parseRecord(record, silenceErrors = false) {
         }
     }
     for (const i in parts) {
-        if (!/^[a-z]+$/.test(parts[i])) {
+        parts[i] = parts[i].trim();
+        if (/^[!\*]+$/.test(parts[i]) || !parts[i]) {
             if (!silenceErrors) {
                 throw Error("fetched pronoun \"" + record + "\" contains invalid characters in its pronoun set");
             }
@@ -93,6 +94,7 @@ function parseRecord(record, silenceErrors = false) {
             }
         }
     }
+    const cleanedRaw = parts;
     // special cases
     if (parts[0] == "it" && parts[1] == "its") {
         parts = ["it", "it", "its", "its", "itself"];
@@ -112,6 +114,6 @@ function parseRecord(record, silenceErrors = false) {
         type: "pronouns",
         raw: record,
         comment: comment,
-        cleanedRaw: parsed
+        cleanedRaw: cleanedRaw.join("/")
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "podns",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "author": "lumap <lumap@duck.com>",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/src/index.test.ts

@@ -0,0 +1,7 @@
+import { test } from "vitest";
+import getPronouns from "./"
+
+test("get some and see what it outputs", async () => {
+    const pronouns = await getPronouns("mauve.beer")
+    console.log(pronouns)
+})

package/src/index.ts

@@ -12,8 +12,8 @@ export default async function getPronouns(domain: string, silenceParseErrors = t
     const pronounsRecords = await getPronounsRecords(domain);
 
     let processed: PronounRecord[] = []
-    for (let r in pronounsRecords) {
-        const parsed = parseRecord(r, silenceParseErrors)
+    for (let i in pronounsRecords) {
+        const parsed = parseRecord(pronounsRecords[i], silenceParseErrors)
         if (parsed != null) {
             processed.push(parsed)
         }

package/src/parser.test.ts

@@ -44,9 +44,6 @@ test("parse invalid tag", () => {
 })
 
 test("parse invalid pronoun set", () => {
-    expect(() => parseRecord("she/Ìê®;")).toThrowError("fetched pronoun \"she/Ìê®;\" contains invalid characters in its pronoun set")
-})
-test("parse invalid pronoun set 2", () => {
     expect(() => parseRecord("she/")).toThrowError("fetched pronoun \"she/\" contains invalid characters in its pronoun set")
 })
 
@@ -134,4 +131,4 @@ test("parse they/them is automatically plural", () => {
     assert.equal(parsed.pronouns.possessiveDeterminer, undefined)
     assert.equal(parsed.pronouns.possessivePronoun, undefined)
     assert.equal(parsed.pronouns.reflexive, undefined)
-})
+})

package/src/parser.ts

@@ -16,7 +16,7 @@ export function parseRecord(record: string, silenceErrors = false): PronounRecor
     }
 
     // remove all whitespaces, make everything lowercase
-    parsed = parsed.trim().toLocaleLowerCase().replace(/\s/g, "")
+    parsed = parsed.trim().toLocaleLowerCase()
 
     // check special cases (wildcard, none, nothing other than a comment)
     switch (parsed) {
@@ -55,7 +55,7 @@ export function parseRecord(record: string, silenceErrors = false): PronounRecor
     if (parsed.includes(";")) {
         const parsedTags = parsed.split(";").slice(1);
         for (const i in parsedTags) {
-            let t = parsedTags[i]
+            let t = parsedTags[i].trim()
             if (t == "") {
                 continue
             }
@@ -84,7 +84,8 @@ export function parseRecord(record: string, silenceErrors = false): PronounRecor
     }
 
     for (const i in parts) {
-        if (!/^[a-z]+$/.test(parts[i])) {
+        parts[i]=parts[i].trim()
+        if (/^[!\*]+$/.test(parts[i]) || !parts[i]) {
             if (!silenceErrors) {
                 throw Error("fetched pronoun \"" + record +"\" contains invalid characters in its pronoun set")
             } else {
@@ -92,6 +93,7 @@ export function parseRecord(record: string, silenceErrors = false): PronounRecor
             }
         }
     }
+    const cleanedRaw = parts
 
     // special cases
     if (parts[0] == "it" && parts[1] == "its") {
@@ -114,6 +116,6 @@ export function parseRecord(record: string, silenceErrors = false): PronounRecor
         type: "pronouns",
         raw: record,
         comment: comment,
-        cleanedRaw: parsed
+        cleanedRaw: cleanedRaw.join("/")
     } as PronounsRecord
 }