mod2dom 1.1.0 → 1.2.0

package/Makefile

@@ -8,7 +8,7 @@ prod:
 	@npm run buildprod
 
 test:
-	@npm run test
+	@npm run test -- --slowTestThreshold 5 --retry 2 --logHeapUsage --reporter verbose
 
 updateMinor:
 	npm version minor

package/config/vitest.config.ts

@@ -1,7 +1,14 @@
-import { defineConfig } from "vitest/config"
+import { defineConfig } from "vitest/config";
+import path from "path";
 
 export default defineConfig({
-  test: {
-    environment: "jsdom"
-  }
+    resolve: {
+        alias: {
+            "@utils": path.resolve(__dirname, "../src/utils"),
+        },
+    },
+
+    test: {
+        environment: "jsdom",
+    },
 });

package/dist/errors.d.ts

@@ -6,10 +6,13 @@ declare class InvalidTagName extends BadData {
 }
 declare class InvalidClassName extends BadData {
 }
+declare class InvalidElementName extends BadData {
+}
 export declare const mod2domErrors: Readonly<{
     BadData: typeof BadData;
     InvalidTagName: typeof InvalidTagName;
     InvalidClassName: typeof InvalidClassName;
+    InvalidElementName: typeof InvalidElementName;
 }>;
 export {};
 //# sourceMappingURL=errors.d.ts.map

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,cAAM,OAAQ,SAAQ,YAAY;CAAG;AACrC,cAAM,cAAe,SAAQ,OAAO;CAAG;AACvC,cAAM,gBAAiB,SAAQ,OAAO;CAAG;AAEzC,eAAO,MAAM,aAAa;;;;EAIxB,CAAC"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAa,SAAQ,KAAK;CAAG;AAE1C,cAAM,OAAQ,SAAQ,YAAY;CAAG;AACrC,cAAM,cAAe,SAAQ,OAAO;CAAG;AACvC,cAAM,gBAAiB,SAAQ,OAAO;CAAG;AACzC,cAAM,kBAAmB,SAAQ,OAAO;CAAG;AAE3C,eAAO,MAAM,aAAa;;;;;EAKxB,CAAC"}

package/dist/errors.js

@@ -10,9 +10,13 @@ class InvalidTagName extends BadData {
 class InvalidClassName extends BadData {
 }
 ;
+class InvalidElementName extends BadData {
+}
+;
 export const mod2domErrors = Object.freeze({
     BadData: BadData,
     InvalidTagName: InvalidTagName,
     InvalidClassName: InvalidClassName,
+    InvalidElementName: InvalidElementName,
 });
 //# sourceMappingURL=errors.js.map

package/dist/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,YAAa,SAAQ,KAAK;CAAG;AAAA,CAAC;AAE3C,MAAM,OAAQ,SAAQ,YAAY;CAAG;AAAA,CAAC;AACtC,MAAM,cAAe,SAAQ,OAAO;CAAG;AAAA,CAAC;AACxC,MAAM,gBAAiB,SAAQ,OAAO;CAAG;AAAA,CAAC;AAE1C,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,OAAO;IAChB,cAAc,EAAE,cAAc;IAC9B,gBAAgB,EAAE,gBAAgB;CACrC,CAAC,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,YAAa,SAAQ,KAAK;CAAG;AAAA,CAAC;AAE3C,MAAM,OAAQ,SAAQ,YAAY;CAAG;AAAA,CAAC;AACtC,MAAM,cAAe,SAAQ,OAAO;CAAG;AAAA,CAAC;AACxC,MAAM,gBAAiB,SAAQ,OAAO;CAAG;AAAA,CAAC;AAC1C,MAAM,kBAAmB,SAAQ,OAAO;CAAG;AAAA,CAAC;AAE5C,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,OAAO;IAChB,cAAc,EAAE,cAAc;IAC9B,gBAAgB,EAAE,gBAAgB;IAClC,kBAAkB,EAAE,kBAAkB;CACzC,CAAC,CAAC"}

package/dist/validate.d.ts

@@ -1,3 +1,4 @@
+export declare function validateElementName(name: string): void;
 export declare function validateTagName(name: string): void;
 export declare function validateClassName(name: string): void;
 //# sourceMappingURL=validate.d.ts.map

package/dist/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAU3C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,QAU7C"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAMA,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,QAY/C;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,QAY3C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,QAY7C"}

package/dist/validate.js

@@ -1,5 +1,23 @@
 import { mod2domErrors } from "./errors.js";
+function isASCII(str) {
+    return /^[\x00-\x7F]*$/.test(str);
+}
+export function validateElementName(name) {
+    if (!isASCII(name))
+        throw new mod2domErrors.InvalidElementName(`Invalid element name (non-ASCII).`);
+    if (!name.trim())
+        throw new mod2domErrors.InvalidElementName(`Invalid element name (empty).`);
+    const invalid = name.match(/[/\\\s.#\[\]]/g);
+    if (invalid) {
+        throw new mod2domErrors.InvalidElementName(`Invalid element name: \`${name}\` (character: "${invalid[0]}")`);
+    }
+    let v;
+    if (v = name.match(/^[0-9]/))
+        throw new mod2domErrors.InvalidElementName(`Invalid element name: \`${name}\` (character: "${v}")`);
+}
 export function validateTagName(name) {
+    if (!isASCII(name))
+        throw new mod2domErrors.InvalidTagName(`Invalid tag name (non-ASCII).`);
     if (!name.trim())
         throw new mod2domErrors.InvalidTagName(`Invalid tag name (empty).`);
     const invalid = name.match(/[/\\\s.#\[\]]/g);
@@ -11,6 +29,8 @@ export function validateTagName(name) {
         throw new mod2domErrors.InvalidTagName(`Invalid tag name: \`${name}\` (character: "${v}")`);
 }
 export function validateClassName(name) {
+    if (!isASCII(name))
+        throw new mod2domErrors.InvalidTagName(`Invalid class name (non-ASCII).`);
     if (!name.trim())
         throw new mod2domErrors.InvalidTagName(`Invalid class name (empty).`);
     const invalid = name.match(/[/\\\s.#\[\]]/g);

package/dist/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,UAAU,eAAe,CAAC,IAAY;IACxC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACZ,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAI,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,uBAAuB,IAAI,mBAAmB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACzG,CAAC;IACD,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,uBAAuB,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACZ,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,6BAA6B,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAI,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,IAAI,mBAAmB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7G,CAAC;IACD,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACxG,CAAC"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,SAAS,OAAO,CAAC,GAAW;IACxB,OAAO,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC5C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QACd,MAAM,IAAI,aAAa,CAAC,kBAAkB,CAAC,mCAAmC,CAAC,CAAC;IACpF,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACZ,MAAM,IAAI,aAAa,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAI,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,aAAa,CAAC,kBAAkB,CAAC,2BAA2B,IAAI,mBAAmB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjH,CAAC;IACD,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,kBAAkB,CAAC,2BAA2B,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AAC5G,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IACxC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QACd,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,+BAA+B,CAAC,CAAC;IAC5E,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACZ,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAI,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,uBAAuB,IAAI,mBAAmB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACzG,CAAC;IACD,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,uBAAuB,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC1C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QACd,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,iCAAiC,CAAC,CAAC;IAC9E,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QACZ,MAAM,IAAI,aAAa,CAAC,cAAc,CAAC,6BAA6B,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC7C,IAAI,OAAO,EAAE,CAAC;QACV,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,IAAI,mBAAmB,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7G,CAAC;IACD,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC;AACxG,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod2dom",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/errors.ts

@@ -3,9 +3,11 @@ export class MOD2DOMError extends Error {};
 class BadData extends MOD2DOMError {};
 class InvalidTagName extends BadData {};
 class InvalidClassName extends BadData {};
+class InvalidElementName extends BadData {};
 
 export const mod2domErrors = Object.freeze({
     BadData: BadData,
     InvalidTagName: InvalidTagName,
     InvalidClassName: InvalidClassName,
+    InvalidElementName: InvalidElementName,
 });

package/src/localServices/clipboard.ts

@@ -1,17 +1,57 @@
-const mapAsync = async (array: Array<any>, callback: (item: any) => Promise<void>) => {
-    const newArray = new Array();
-    for (const item of array) {
-        newArray.push(await callback(item));
+import { mapAsync } from "@utils";
+
+export class CLItem {
+    raw: ClipboardItem
+
+    constructor(item: ClipboardItem) {
+        this.raw = item;
+    }
+
+    get text() {
+        return (async () => {
+            if (this.raw.types[0]?.match(/text\/.+/g)) {
+                return await (await this.raw.getType(this.raw.types[0])).text();
+            } else {
+                return undefined;
+            }
+        })();
+    }
+
+    get type() {
+        return this.raw.types[0];
+    }
+
+    get types() {
+        return this.raw.types;
     }
 }
 
 export const clipboard = {
-    readAll: async function readAll() {
+    ClipboardItem: CLItem,
+
+    raw: async function raw(): Promise<Array<CLItem>> {
         const r = await navigator.clipboard.read();
-        return await mapAsync(r, async (l) => {
-            const blob = await l.getType("text/plain");
-            const text = await blob.text();
-            return text;
-        });
-    }
+
+        return r.map((l) => new this.ClipboardItem(l));
+    },
+
+    readAll: async function readAll() {
+        const r = await this.raw();
+        
+        return (await mapAsync(r, async (l) => {
+            return await l.text;
+        })).filter((v) => v !== undefined);
+    },
+
+    read: async function read() {
+        return (await this.readAll()).at(-1);
+    },
+
+    write: async function write(text: string) {
+        return await navigator.clipboard.writeText(text);
+    },
+
+    writeRaw: async function write(...raw: ClipboardItems) {
+        return await navigator.clipboard.write(raw);
+    },
 }

package/src/types.ts

@@ -1,2 +1,3 @@
 export type DNode = Document | HTMLElement | Element | Node;
 export type { QueryType, QueryOption, QueryOptions } from "./query.js";
+export { CLItem } from "./localServices/clipboard.js";

package/src/utils/index.ts

@@ -0,0 +1,7 @@
+export const mapAsync = async (array: Array<any>, callback: (item: any) => Promise<void>) => {
+    const newArray = new Array();
+    for (const item of array) {
+        newArray.push(await callback(item));
+    }
+    return newArray;
+}

package/src/validate.ts

@@ -1,6 +1,26 @@
 import { mod2domErrors } from "./errors.js";
 
+function isASCII(str: string) {
+    return /^[\x00-\x7F]*$/.test(str);
+}
+
+export function validateElementName(name: string) {
+    if (!isASCII(name))
+        throw new mod2domErrors.InvalidElementName(`Invalid element name (non-ASCII).`);
+    if (!name.trim())
+        throw new mod2domErrors.InvalidElementName(`Invalid element name (empty).`);
+    const invalid = name.match(/[/\\\s.#\[\]]/g);
+    if (invalid) {
+        throw new mod2domErrors.InvalidElementName(`Invalid element name: \`${name}\` (character: "${invalid[0]}")`);
+    }
+    let v;
+    if (v = name.match(/^[0-9]/))
+        throw new mod2domErrors.InvalidElementName(`Invalid element name: \`${name}\` (character: "${v}")`);
+}
+
 export function validateTagName(name: string) {
+    if (!isASCII(name))
+        throw new mod2domErrors.InvalidTagName(`Invalid tag name (non-ASCII).`);
     if (!name.trim())
         throw new mod2domErrors.InvalidTagName(`Invalid tag name (empty).`);
     const invalid = name.match(/[/\\\s.#\[\]]/g);
@@ -13,6 +33,8 @@ export function validateTagName(name: string) {
 }
 
 export function validateClassName(name: string) {
+    if (!isASCII(name))
+        throw new mod2domErrors.InvalidTagName(`Invalid class name (non-ASCII).`);
     if (!name.trim())
         throw new mod2domErrors.InvalidTagName(`Invalid class name (empty).`);
     const invalid = name.match(/[/\\\s.#\[\]]/g);

package/tests/clipboard/simple.test.ts

@@ -0,0 +1,61 @@
+import { describe, it, vi, beforeEach, expect } from "vitest";
+import { clipboard } from "../../src/localServices/clipboard.js";
+import { CLItem } from "../../src/localServices/clipboard.js";
+
+describe("read", () => {
+    describe("text", () => {
+        let navigatorMock = {
+            clipboard: {
+                read: vi.fn()
+            }
+        }
+        let makeClipboardItemMock = (types: any, blob: any) => {
+            return {
+                types: types,
+                getType: vi.fn().mockResolvedValue(blob)
+            };
+        }
+        beforeEach(() => {
+            vi.resetAllMocks();
+
+            vi.stubGlobal("navigator", navigatorMock);
+        })
+
+
+        it("Normal Read (1)", async () => {
+            const mockBlob = new Blob(["hello world"], {
+                type: "text/plain",
+            });
+
+            const mockClipboardItem = makeClipboardItemMock(["text/plain"], mockBlob);
+            navigatorMock.clipboard.read.mockResolvedValue([mockClipboardItem]);
+
+            const result = await clipboard.read();
+
+            expect(mockClipboardItem.getType).toHaveBeenCalledOnce();
+            expect(navigatorMock.clipboard.read).toHaveBeenCalledOnce();
+            expect(result).toBe("hello world");
+        });
+
+        it("Normal Read (2)", async () => {
+            const wrongBlob = new Blob(["wrong"], {
+                type: "text/plain"
+            });
+            const wrongClipboardItem = makeClipboardItemMock(["text/plain"], wrongBlob);
+
+            const mockBlob = new Blob(["hello world"], {
+                type: "text/html",
+            });
+
+            const mockClipboardItem = makeClipboardItemMock(["text/html"], mockBlob);
+            navigatorMock.clipboard.read.mockResolvedValue([wrongClipboardItem, mockClipboardItem]);
+
+            const result = await clipboard.read();
+
+            expect(wrongClipboardItem.getType).toHaveBeenCalledOnce();
+            expect(mockClipboardItem.getType).toHaveBeenCalledOnce();
+            expect(navigatorMock.clipboard.read).toHaveBeenCalledOnce();
+            expect(result).toBe("hello world");
+        });
+    })
+})

package/tests/dom/error.test.ts

@@ -3,7 +3,7 @@ import { DOMParser } from "../../src/index";
 import { TagName as IDName, Element, ClassName } from "../../src/query";
 
 describe("invalidClass.empty.none", () => {
-    it("finds an element", () => {
+    it("fails to find an element", () => {
         document.body.innerHTML = `
             <div>
             <button id="x" class="test">Hello, World!</button>
@@ -22,7 +22,7 @@ describe("invalidClass.empty.none", () => {
 });
 
 describe("invalidClass.empty.whitespace", () => {
-    it("finds an element", () => {
+    it("fails to find an element", () => {
         document.body.innerHTML = `
             <div>
             <button id="x" class="test">Hello, World!</button>
@@ -41,7 +41,7 @@ describe("invalidClass.empty.whitespace", () => {
 });
 
 describe("invalidClass.character(1)", () => {
-    it("finds an element", () => {
+    it("fails to find an element", () => {
         document.body.innerHTML = `
             <div>
             <button id="x" class="test">Hello, World!</button>
@@ -60,7 +60,7 @@ describe("invalidClass.character(1)", () => {
 });
 
 describe("invalidClass.character(2)", () => {
-    it("finds an element", () => {
+    it("fails to find an element", () => {
         document.body.innerHTML = `
             <div>
             <button id="x" class="test">Hello, World!</button>

package/tests/dom/simple.test.ts

@@ -10,6 +10,16 @@ describe("findTheButton", () => {
 
         const btn = DOMParser.find(Element('button', {}, IDName("x"), ClassName("test")));
 
+        expect(btn?.textContent).toBe("Hello, World!")
+    });
+
+    it("finds an element based on an array query", () => {
+        document.body.innerHTML = `
+            <button id="x" class="test">Hello, World!</button>
+        `
+
+        const btn = DOMParser.find([Element('button', {}, IDName("x"), ClassName("test"))]);
+
         expect(btn?.textContent).toBe("Hello, World!")
     })
 });

package/tsconfig.json

@@ -40,7 +40,11 @@
     "isolatedModules": true,
     "noUncheckedSideEffectImports": true,
     "moduleDetection": "force",
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "paths": {
+      "@utils": ["./src/utils/index.ts"],
+      "@/*": ["./src/*"]
+    }
   },
 
   "include": [