@satorijs/element 3.1.6 → 4.0.0-alpha.0

package/lib/index.d.ts

@@ -1,9 +1,10 @@
-/// <reference types="node" />
-import { Awaitable, Dict } from 'cosmokit';
+import { Binary, Dict } from 'cosmokit';
+import Element from '@cordisjs/element';
+export default Element;
+export * from '@cordisjs/element';
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            [key: string]: any;
             message: {
                 id?: string;
                 forward?: boolean;
@@ -43,68 +44,18 @@ declare global {
         }
     }
 }
-declare const kElement: unique symbol;
-declare interface Element {
-    [kElement]: true;
-    type: string;
-    attrs: Dict;
-    /** @deprecated use `attrs` instead */
-    data: Dict;
-    children: Element[];
-    source?: string;
-    toString(strip?: boolean): string;
-}
-type RenderFunction = Element.Render<Element.Fragment, any>;
-declare function Element(type: string | RenderFunction, ...children: Element.Fragment[]): Element;
-declare function Element(type: string | RenderFunction, attrs: Dict, ...children: Element.Fragment[]): Element;
-declare namespace Element {
-    export const jsx: typeof Element;
-    export const jsxs: typeof Element;
-    export const jsxDEV: typeof Element;
-    export const Fragment = "template";
-    export type Fragment = string | Element | (string | Element)[];
-    export type Visit<T, S> = (element: Element, session: S) => T;
-    export type Render<T, S> = (attrs: Dict, children: Element[], session: S) => T;
-    export type SyncTransformer<S = never> = boolean | Fragment | Render<boolean | Fragment, S>;
-    export type Transformer<S = never> = boolean | Fragment | Render<Awaitable<boolean | Fragment>, S>;
-    type SyncVisitor<S> = Dict<SyncTransformer<S>> | Visit<boolean | Fragment, S>;
-    type Visitor<S> = Dict<Transformer<S>> | Visit<Awaitable<boolean | Fragment>, S>;
-    export function isElement(source: any): source is Element;
-    export function toElement(content: string | Element): Element;
-    export function toElementArray(content: Element.Fragment): Element[];
-    export function normalize(source: Fragment, context?: any): Element[];
-    export function escape(source: string, inline?: boolean): string;
-    export function unescape(source: string): string;
-    export interface FindOptions {
-        type?: string;
-        caret?: boolean;
-    }
-    /** @deprecated use `Element.select()` instead */
-    export function from(source: string, options?: FindOptions): Element;
-    type Combinator = ' ' | '>' | '+' | '~';
-    export interface Selector {
-        type: string;
-        combinator: Combinator;
+declare module '@cordisjs/element' {
+    namespace Element {
+        function at(id: any, attrs?: Dict): Element;
+        function sharp(id: any, attrs?: Dict): Element;
+        function quote(id: any, attrs?: Dict): Element;
+        let image: AssetFactory;
+        let img: AssetFactory;
+        let video: AssetFactory;
+        let audio: AssetFactory;
+        let file: AssetFactory;
+        function i18n(path: string | Dict, children?: any[]): Element;
     }
-    export function parseSelector(input: string): Selector[][];
-    export function select(source: string | Element[], query: string | Selector[][]): Element[];
-    export function interpolate(expr: string, context: any): any;
-    export function parse(source: string, context?: any): Element[];
-    export function transform<S = never>(source: string, rules: SyncVisitor<S>, session?: S): string;
-    export function transform<S = never>(source: Element[], rules: SyncVisitor<S>, session?: S): Element[];
-    export function transformAsync<S = never>(source: string, rules: Visitor<S>, session?: S): Promise<string>;
-    export function transformAsync<S = never>(source: Element[], rules: Visitor<S>, session?: S): Promise<Element[]>;
-    export type Factory<R extends any[]> = (...args: [...rest: R, attrs?: Dict]) => Element;
-    export let warn: (message: string) => void;
-    export const text: Factory<[content: any]>;
-    export const at: Factory<[id: any]>;
-    export const sharp: Factory<[id: any]>;
-    export const quote: Factory<[id: any]>;
-    export const image: Factory<[data: string] | [data: Buffer | ArrayBuffer | ArrayBufferView, type: string]>;
-    export const img: Factory<[data: string] | [data: Buffer | ArrayBuffer | ArrayBufferView, type: string]>;
-    export const video: Factory<[data: string] | [data: Buffer | ArrayBuffer | ArrayBufferView, type: string]>;
-    export const audio: Factory<[data: string] | [data: Buffer | ArrayBuffer | ArrayBufferView, type: string]>;
-    export const file: Factory<[data: string] | [data: Buffer | ArrayBuffer | ArrayBufferView, type: string]>;
-    export function i18n(path: string | Dict, children?: any[]): Element;
 }
-export = Element;
+type Factory<R extends any[]> = (...args: [...rest: R, attrs?: Dict]) => Element;
+type AssetFactory = Factory<[data: string] | [data: Binary.Source, type: string]>;

package/lib/{index.mjs → index.js}

@@ -6,8 +6,8 @@ var __commonJS = (cb, mod) => function __require() {
 };
 
 // src/index.ts
-import { arrayBufferToBase64, camelize, defineProperty, hyphenate, is, isNullable, makeArray } from "cosmokit";
-var require_src = __commonJS({
+import { Binary, camelize, defineProperty, hyphenate, is, isNonNullable, isNullable, makeArray } from "cosmokit";
+var require_index = __commonJS({
   "src/index.ts"(exports, module) {
     var kElement = Symbol.for("satori.element");
     var ElementConstructor = class {
@@ -26,13 +26,10 @@ var require_src = __commonJS({
       }
       toAttrString() {
         return Object.entries(this.attrs).map(([key, value]) => {
-          if (isNullable(value))
-            return "";
+          if (isNullable(value)) return "";
           key = hyphenate(key);
-          if (value === true)
-            return ` ${key}`;
-          if (value === false)
-            return ` no-${key}`;
+          if (value === true) return ` ${key}`;
+          if (value === false) return ` no-${key}`;
           return ` ${key}="${Element.escape("" + value, true)}"`;
         }).join("");
       }
@@ -41,12 +38,10 @@ var require_src = __commonJS({
           return strip ? this.attrs.content : Element.escape(this.attrs.content);
         }
         const inner = this.children.map((child) => child.toString(strip)).join("");
-        if (strip)
-          return inner;
+        if (strip) return inner;
         const attrs = this.toAttrString();
         const tag = this.getTagName();
-        if (!this.children.length)
-          return `<${tag}${attrs}/>`;
+        if (!this.children.length) return `<${tag}${attrs}/>`;
         return `<${tag}${attrs}>${inner}</${tag}>`;
       }
     };
@@ -58,8 +53,7 @@ var require_src = __commonJS({
       if (args[0] && typeof args[0] === "object" && !Element.isElement(args[0]) && !Array.isArray(args[0])) {
         const props = args.shift();
         for (const [key, value] of Object.entries(props)) {
-          if (isNullable(value))
-            continue;
+          if (isNullable(value)) continue;
           if (key === "children") {
             args.push(...makeArray(value));
           } else {
@@ -97,8 +91,7 @@ var require_src = __commonJS({
       function toElement(content) {
         if (typeof content === "string" || typeof content === "number" || typeof content === "boolean") {
           content = "" + content;
-          if (content)
-            return Element2("text", { content });
+          if (content) return Element2("text", { content });
         } else if (isElement(content)) {
           return content;
         } else if (!isNullable(content)) {
@@ -109,9 +102,9 @@ var require_src = __commonJS({
       __name(toElement, "toElement");
       function toElementArray(content) {
         if (Array.isArray(content)) {
-          return content.map(toElement).filter((x) => x);
+          return content.map(toElement).filter(isNonNullable);
         } else {
-          return [toElement(content)].filter((x) => x);
+          return [toElement(content)].filter(isNonNullable);
         }
       }
       Element2.toElementArray = toElementArray;
@@ -122,7 +115,7 @@ var require_src = __commonJS({
       Element2.normalize = normalize;
       __name(normalize, "normalize");
       function escape(source, inline = false) {
-        const result = source.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        const result = (source ?? "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         return inline ? result.replace(/"/g, "&quot;") : result;
       }
       Element2.escape = escape;
@@ -135,8 +128,7 @@ var require_src = __commonJS({
       function from(source, options = {}) {
         const elements = parse(source);
         if (options.caret) {
-          if (options.type && elements[0]?.type !== options.type)
-            return;
+          if (options.type && elements[0]?.type !== options.type) return;
           return elements[0];
         }
         return select(elements, options.type || "*")[0];
@@ -161,14 +153,10 @@ var require_src = __commonJS({
       Element2.parseSelector = parseSelector;
       __name(parseSelector, "parseSelector");
       function select(source, query) {
-        if (!source || !query)
-          return [];
-        if (typeof source === "string")
-          source = parse(source);
-        if (typeof query === "string")
-          query = parseSelector(query);
-        if (!query.length)
-          return [];
+        if (!source || !query) return [];
+        if (typeof source === "string") source = parse(source);
+        if (typeof query === "string") query = parseSelector(query);
+        if (!query.length) return [];
         let adjacent = [];
         const results = [];
         for (const [index, element] of source.entries()) {
@@ -193,8 +181,7 @@ var require_src = __commonJS({
               inner.push(group);
             }
           }
-          if (matched)
-            results.push(source[index]);
+          if (matched) results.push(source[index]);
           results.push(...select(element.children, inner));
         }
         return results;
@@ -209,8 +196,7 @@ var require_src = __commonJS({
         let value = context;
         for (const part of expr.split(".")) {
           value = value[part];
-          if (isNullable(value))
-            return "";
+          if (isNullable(value)) return "";
         }
         return value ?? "";
       }
@@ -219,7 +205,7 @@ var require_src = __commonJS({
       const tagRegExp1 = /(?<comment><!--[\s\S]*?-->)|(?<tag><(\/?)([^!\s>/]*)([^>]*?)\s*(\/?)>)/;
       const tagRegExp2 = /(?<comment><!--[\s\S]*?-->)|(?<tag><(\/?)([^!\s>/]*)([^>]*?)\s*(\/?)>)|(?<curly>\{(?<derivative>[@:/#][^\s}]*)?[\s\S]*?\})/;
       const attrRegExp1 = /([^\s=]+)(?:="(?<value1>[^"]*)"|='(?<value2>[^']*)')?/g;
-      const attrRegExp2 = /([^\s=]+)(?:="(?<value1>[^"]*)"|='(?<value2>[^']*)'|=(?<curly>\{([^}]+)\}))?/g;
+      const attrRegExp2 = /([^\s=]+)(?:="(?<value1>[^"]*)"|='(?<value2>[^']*)'|=\{(?<curly>[^}]+)\})?/g;
       let Position;
       ((Position2) => {
         Position2[Position2["OPEN"] = 0] = "OPEN";
@@ -230,38 +216,37 @@ var require_src = __commonJS({
       function parse(source, context) {
         const tokens = [];
         function pushText(content) {
-          if (content)
-            tokens.push(content);
+          if (content) tokens.push(content);
         }
         __name(pushText, "pushText");
         const tagRegExp = context ? tagRegExp2 : tagRegExp1;
         let tagCap;
         let trimStart = true;
         while (tagCap = tagRegExp.exec(source)) {
-          const trimEnd = !tagCap.groups.curly;
+          const { curly, comment, derivative } = tagCap.groups;
+          const trimEnd = !curly;
           parseContent(source.slice(0, tagCap.index), trimStart, trimEnd);
           trimStart = trimEnd;
           source = source.slice(tagCap.index + tagCap[0].length);
           const [_, , , close, type, extra, empty] = tagCap;
-          if (tagCap.groups.comment)
-            continue;
-          if (tagCap.groups.curly) {
+          if (comment) continue;
+          if (curly) {
             let name = "", position = 2 /* EMPTY */;
-            if (tagCap.groups.derivative) {
-              name = tagCap.groups.derivative.slice(1);
+            if (derivative) {
+              name = derivative.slice(1);
               position = {
                 "@": 2 /* EMPTY */,
                 "#": 0 /* OPEN */,
                 "/": 1 /* CLOSE */,
                 ":": 3 /* CONTINUE */
-              }[tagCap.groups.derivative[0]];
+              }[derivative[0]];
             }
             tokens.push({
               type: "curly",
               name,
               position,
-              source: tagCap.groups.curly,
-              extra: tagCap.groups.curly.slice(1 + (tagCap.groups.derivative ?? "").length, -1)
+              source: curly,
+              extra: curly.slice(1 + (derivative ?? "").length, -1)
             });
             continue;
           }
@@ -276,10 +261,8 @@ var require_src = __commonJS({
         parseContent(source, trimStart, true);
         function parseContent(source2, trimStart2, trimEnd) {
           source2 = unescape(source2);
-          if (trimStart2)
-            source2 = source2.replace(/^\s*\n\s*/, "");
-          if (trimEnd)
-            source2 = source2.replace(/\s*\n\s*$/, "");
+          if (trimStart2) source2 = source2.replace(/^\s*\n\s*/, "");
+          if (trimEnd) source2 = source2.replace(/\s*\n\s*$/, "");
           pushText(source2);
         }
         __name(parseContent, "parseContent");
@@ -358,8 +341,7 @@ var require_src = __commonJS({
           } else if (token.name === "each") {
             const [expr, ident] = token.extra.split(/\s+as\s+/);
             const items = interpolate(expr, context);
-            if (!items || !items[Symbol.iterator])
-              continue;
+            if (!items || !items[Symbol.iterator]) continue;
             for (const item of items) {
               result.push(...parseTokens(token.children.default, { ...context, [ident]: item }));
             }
@@ -440,9 +422,9 @@ var require_src = __commonJS({
           if (is("Buffer", src)) {
             src = prefix + src.toString("base64");
           } else if (is("ArrayBuffer", src)) {
-            src = prefix + arrayBufferToBase64(src);
+            src = prefix + Binary.toBase64(src);
           } else if (ArrayBuffer.isView(src)) {
-            src = prefix + arrayBufferToBase64(src.buffer);
+            src = prefix + Binary.toBase64(src.buffer);
           }
           if (src.startsWith("base64://")) {
             (0, Element2.warn)(`protocol "base64:" is deprecated and will be removed in the future, please use "data:" instead`);
@@ -469,5 +451,4 @@ var require_src = __commonJS({
     module.exports = Element;
   }
 });
-export default require_src();
-//# sourceMappingURL=index.mjs.map
+export default require_index();

package/package.json

@@ -1,41 +1,33 @@
 {
   "name": "@satorijs/element",
   "description": "Element Manipulation",
-  "version": "3.1.6",
-  "main": "lib/index.cjs",
-  "module": "lib/index.mjs",
-  "types": "lib/index.d.ts",
+  "version": "4.0.0-alpha.0",
+  "type": "module",
   "exports": {
     ".": {
-      "import": "./lib/index.mjs",
-      "require": "./lib/index.cjs",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
     },
     "./jsx-runtime": {
-      "import": "./lib/index.mjs",
-      "require": "./lib/index.cjs",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
     },
     "./jsx-dev-runtime": {
-      "import": "./lib/index.mjs",
-      "require": "./lib/index.cjs",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
     },
     "./src/*": "./src/*",
     "./package.json": "./package.json"
   },
   "files": [
-    "lib",
-    "src",
-    "jsx-runtime.d.ts",
-    "jsx-dev-runtime.d.ts"
+    "lib"
   ],
   "author": "Shigma <shigma10826@gmail.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/satorijs/satori.git",
-    "directory": "packages/message"
+    "directory": "packages/element"
   },
   "bugs": {
     "url": "https://github.com/satorijs/satori/issues"
@@ -50,9 +42,12 @@
     "utilities"
   ],
   "devDependencies": {
-    "chai-shape": "^1.0.0"
+    "@types/chai": "^5.2.0",
+    "chai": "^5.2.0",
+    "chai-shape": "^1.1.0"
   },
   "dependencies": {
-    "cosmokit": "^1.5.2"
+    "@cordisjs/element": "^0.2.0",
+    "cosmokit": "^1.7.4"
   }
 }

package/jsx-dev-runtime.d.ts

@@ -1,3 +0,0 @@
-import segment from './lib'
-
-export = segment

package/jsx-runtime.d.ts

@@ -1,3 +0,0 @@
-import segment from './lib'
-
-export = segment