amateras 0.6.0 → 0.7.0

package/packages/dom/src/structure/html/HTMLVideoElement.ts

@@ -0,0 +1,22 @@
+import { assignAttributes } from "#lib/assignAttributes";
+import { HTMLMediaElement } from "#structure/html/HTMLMediaElement";
+import { _Object_assign } from "@amateras/utils";
+
+export class HTMLVideoElement extends HTMLMediaElement {
+    static defaultAttributes = {
+        ...HTMLMediaElement.defaultAttributes,
+        disablePictureInPicture: false,
+        height: '',
+        poster: '',
+        videoHeight: 0,
+        videoWidth: 0,
+        width: ''
+    }
+
+    constructor() {
+        super('video')
+    }
+}
+
+assignAttributes(HTMLVideoElement, HTMLVideoElement.defaultAttributes)
+_Object_assign(globalThis, { HTMLVideoElement })

package/packages/dom/src/structure/html/HTMLWBRElement.ts

@@ -0,0 +1,16 @@
+import { assignAttributes } from "#lib/assignAttributes";
+import { HTMLElement } from "#structure/HTMLElement";
+import { _Object_assign } from "@amateras/utils";
+
+export class HTMLWBRElement extends HTMLElement {
+    static defaultAttributes = {
+        ...HTMLElement.defaultAttributes
+    }
+
+    constructor() {
+        super('wbr')
+    }
+}
+
+assignAttributes(HTMLWBRElement, HTMLWBRElement.defaultAttributes)
+_Object_assign(globalThis, { HTMLWBRElement })

package/packages/html/package.json

@@ -0,0 +1,18 @@
+{
+    "name": "@amateras/html",
+    "peerDependencies": {
+      "@amateras/core": "workspace:*",
+      "@amateras/utils": "workspace:*"
+    },
+    "imports": {
+      "#structure/*": "./src/structure/*.ts",
+      "#lib/*": "./src/lib/*.ts",
+      "#node/*": "./src/node/*.ts"
+    },
+    "exports": {
+      ".": "./src/index.ts",
+      "./structure/*": "./src/structure/*.ts",
+      "./lib/*": "./src/lib/*.ts",
+      "./node/*": "./src/node/*.ts"
+    }
+}

package/{ext/html/html.ts → packages/html/src/index.ts}

@@ -1,4 +1,4 @@
-import '#core';
+import '@amateras/core';
 import './node/$Anchor';
 import './node/$Dialog';
 import './node/$Form';

package/{ext/html → packages/html/src}/node/$Anchor.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Anchor extends $HTMLElement<HTMLAnchorElement> {
     constructor() {
@@ -42,7 +42,7 @@ export interface $Anchor extends $HTMLElement<HTMLAnchorElement> {
 
 export type AnchorTarget = '_self' | '_blank' | '_parent' | '_top' | '_unfenced_top' | '' | '_replace';
 
-declare module '#core' {
+declare module '@amateras/core' {
     export function $(nodeName: 'a'): $Anchor
 }
 

package/packages/html/src/node/$Canvas.ts

@@ -0,0 +1,38 @@
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
+
+export class $Canvas extends $HTMLElement<HTMLCanvasElement> {
+    constructor() {
+        super('canvas');
+    }
+}
+
+export interface $Canvas extends $HTMLElement<HTMLCanvasElement> {
+    /** {@link HTMLCanvasElement.height} */
+    height(height: $Parameter<number>): this;
+    height(): number;
+    /** {@link HTMLCanvasElement.width} */
+    width(width: $Parameter<number>): this;
+    width(): number;
+
+    /** {@link HTMLCanvasElement.captureStream} */
+    captureStream(frameRequestRate?: number): MediaStream;
+    /** {@link HTMLCanvasElement.getContext} */
+    getContext(contextId: "2d", options?: CanvasRenderingContext2DSettings): CanvasRenderingContext2D | null;
+    getContext(contextId: "bitmaprenderer", options?: ImageBitmapRenderingContextSettings): ImageBitmapRenderingContext | null;
+    getContext(contextId: "webgl", options?: WebGLContextAttributes): WebGLRenderingContext | null;
+    getContext(contextId: "webgl2", options?: WebGLContextAttributes): WebGL2RenderingContext | null;
+    getContext(contextId: string, options?: any): RenderingContext | null;
+    /** {@link HTMLCanvasElement.toBlob} */
+    toBlob(callback: BlobCallback, type?: string, quality?: number): this;
+    /** {@link HTMLCanvasElement.toDataURL} */
+    toDataURL(type?: string, quality?: number): string;
+    /** {@link HTMLCanvasElement.transferControlToOffscreen} */
+    transferControlToOffscreen(): OffscreenCanvas;
+}
+
+assignProperties(HTMLCanvasElement, $Canvas, 'canvas');
+
+declare module "@amateras/core" {
+    export function $(nodeName: 'canvas'): $Canvas
+}

package/{ext/html → packages/html/src}/node/$Dialog.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Dialog extends $HTMLElement<HTMLDialogElement> {
     constructor() {
@@ -11,6 +11,6 @@ export interface $Dialog extends $HTMLElement<HTMLDialogElement> {}
 
 assignProperties(HTMLDialogElement, $Dialog, 'dialog');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'dialog'): $Dialog
 }

package/{ext/html → packages/html/src}/node/$Form.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Form extends $HTMLElement<HTMLFormElement> {
     constructor() {
@@ -11,6 +11,6 @@ export interface $Form extends $HTMLElement<HTMLFormElement> {}
 
 assignProperties(HTMLFormElement, $Form, 'form');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'form'): $Form
 }

package/{ext/html → packages/html/src}/node/$Image.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Image extends $HTMLElement<HTMLImageElement> {
     constructor() {
@@ -67,6 +67,6 @@ export interface $Image extends $HTMLElement<HTMLImageElement> {
 
 assignProperties(HTMLImageElement, $Image, 'img');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'img'): $Image
 }

package/{ext/html → packages/html/src}/node/$Input.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Input extends $HTMLElement<HTMLInputElement> {
     constructor() {
@@ -188,6 +188,6 @@ export type InputType =
 
 assignProperties(HTMLInputElement, $Input, 'input');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'input'): $Input
 }

package/{ext/html → packages/html/src}/node/$Label.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Label extends $HTMLElement<HTMLLabelElement> {
     constructor() {
@@ -20,6 +20,6 @@ export interface $Label extends $HTMLElement<HTMLLabelElement> {
 
 assignProperties(HTMLLabelElement, $Label, 'label');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'label'): $Label
 }

package/{ext/html → packages/html/src}/node/$Media.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Media extends $HTMLElement<HTMLMediaElement> {
     constructor() {
@@ -11,6 +11,6 @@ export interface $Media extends $HTMLElement<HTMLMediaElement> {}
 
 assignProperties(HTMLMediaElement, $Media, 'media');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'media'): $Media
 }

package/{ext/html → packages/html/src}/node/$OptGroup.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $OptGroup extends $HTMLElement<HTMLOptGroupElement> {
     constructor() {
@@ -18,6 +18,6 @@ export interface $OptGroup extends $HTMLElement<HTMLOptGroupElement> {
 
 assignProperties(HTMLOptGroupElement, $OptGroup, 'optgroup');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'optgroup'): $OptGroup
 }

package/{ext/html → packages/html/src}/node/$Option.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Option extends $HTMLElement<HTMLOptionElement> {
     constructor() {
@@ -35,6 +35,6 @@ export interface $Option extends $HTMLElement<HTMLOptionElement> {
 
 assignProperties(HTMLOptionElement, $Option, 'option');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'option'): $Option
 }

package/{ext/html → packages/html/src}/node/$Select.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $Select extends $HTMLElement<HTMLSelectElement> {
     constructor() {
@@ -71,6 +71,6 @@ export interface $Select extends $HTMLElement<HTMLSelectElement> {
 
 assignProperties(HTMLSelectElement, $Select, 'select');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'select'): $Select
 }

package/{ext/html → packages/html/src}/node/$TextArea.ts

@@ -1,5 +1,5 @@
-import { assignProperties } from "#lib/assignProperties";
-import { $HTMLElement } from "#node/$HTMLElement";
+import { assignProperties } from "@amateras/core/lib/assignProperties";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
 export class $TextArea extends $HTMLElement<HTMLTextAreaElement> {
     constructor() {
@@ -11,6 +11,6 @@ export interface $TextArea extends $HTMLElement<HTMLTextAreaElement> {}
 
 assignProperties(HTMLTextAreaElement, $TextArea, 'textarea');
 
-declare module '#core' {
+declare module "@amateras/core" {
     export function $(nodeName: 'textarea'): $TextArea
 }

package/packages/i18n/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "@amateras/i18n",
+    "peerDependencies": {
+      "@amateras/core": "workspace:*",
+      "@amateras/signal": "workspace:*",
+      "@amateras/utils": "workspace:*"
+    },
+    "imports": {
+      "#structure/*": "./src/structure/*.ts",
+      "#lib/*": "./src/lib/*.ts",
+      "#node/*": "./src/node/*.ts"
+    },
+    "exports": {
+      ".": "./src/index.ts",
+      "./structure/*": "./src/structure/*.ts",
+      "./lib/*": "./src/lib/*.ts",
+      "./node/*": "./src/node/*.ts"
+    }
+}

package/{ext → packages}/i18n/src/index.ts

@@ -1,17 +1,9 @@
-import { _Array_from, _instanceof, _Object_assign } from "amateras/lib/native"
-import { $ } from "amateras/core"
+import "@amateras/core"
+import { _Array_from, _instanceof, _Object_assign } from "@amateras/utils"
 import { I18n } from "#structure/I18n"
 import { I18nDictionary, type I18nDictionaryContext, type I18nDictionaryContextImporter } from "#structure/I18nDictionary";
-import { $Node, $Text } from "amateras/node/$Node";
-import { I18nTranslation as _I18nTranslation, type I18nTranslationOptions } from "#structure/I18nTranslation";
-
-$Node.processors.add((_, content) => {
-    if (_instanceof(content, _I18nTranslation)) {
-        const text = new $Text();
-        $.effect(() => text.textContent(content.content$()))
-        return [text]
-    }
-})
+import { $Node, type $NodeContentResolver } from "@amateras/core/node/$Node";
+import { I18nTranslation as _I18nTranslation, I18nTranslation, type I18nTranslationOptions } from "#structure/I18nTranslation";
 
 $Node.setters.add((value, set) => {
     if (_instanceof(value, _I18nTranslation)) {
@@ -86,7 +78,7 @@ type FindParam<T extends string> =
     T extends `${string}$${infer Param}$${infer Rest}`
     ?   Param extends `${string}${' '}${string}`
         ?   Prettify<{} & FindParam<Rest>>
-        :   Prettify<Record<Param, any> & FindParam<Rest>>
+        :   Prettify<Record<Param, $NodeContentResolver<I18nTranslation>> & FindParam<Rest>>
     :   {}
 
 type FindTranslationByKey<K extends string, T extends I18nDictionaryContext> = 
@@ -123,7 +115,7 @@ type Mixin<A, B> =
             :   A[key] | B[key]  
     }
 
-declare module "amateras/core" {
+declare module "@amateras/core" {
     export namespace $ {
         export interface I18nFunction<D extends I18nDictionaryContext = {}> {
             <K extends I18nTranslationKey<D>, P extends I18nTranslationParams<K, D>>(path: K, ...params: P extends Record<string, never> ? [] : [P]): I18nTranslation;

package/{ext → packages}/i18n/src/structure/I18n.ts

@@ -1,6 +1,6 @@
-import { _instanceof, _null } from "amateras/lib/native";
+import '@amateras/signal';
+import { _instanceof, _null } from "@amateras/utils";
 import { I18nDictionary } from "#structure/I18nDictionary";
-import 'amateras/signal';
 import { I18nTranslation, type I18nTranslationOptions } from "./I18nTranslation";
 
 export class I18n {

package/{ext → packages}/i18n/src/structure/I18nDictionary.ts

@@ -1,4 +1,4 @@
-import { _instanceof, isFunction, isObject } from "amateras/lib/native";
+import { _instanceof, isFunction, isObject } from "@amateras/utils";
 
 export class I18nDictionary {
     #context: I18nDictionaryContext | Promise<I18nDictionaryContext> | null = null;

package/{ext → packages}/i18n/src/structure/I18nTranslation.ts

@@ -1,12 +1,15 @@
-import { _Array_from, _null, isUndefined } from "amateras/lib/native";
+import { _Array_from, _null, isUndefined } from "@amateras/utils";
 import type { I18n } from "#structure/I18n";
+import { $Node, type $NodeContentResolver, type $NodeContentTypes } from "@amateras/core/node/$Node";
+import { $HTMLElement } from "@amateras/core/node/$HTMLElement";
 
-export class I18nTranslation {
+export class I18nTranslation extends $HTMLElement {
     i18n: I18n;
     key: string;
     options: I18nTranslationOptions | undefined;
     content$ = $.signal('');
     constructor(i18n: I18n, key: string, options?: I18nTranslationOptions) {
+        super('t')
         this.i18n = i18n;
         this.key = key;
         this.options = options;
@@ -16,7 +19,10 @@ export class I18nTranslation {
     
     async update() {
         const {key, i18n, options} = this;
-        const contentUpdate = (content: string) => this.content$.set(content);
+        const contentUpdate = (content: $NodeContentResolver<this>) => {
+            this.content(content);
+            this.content$.set(this.textContent() ?? '')
+        }
         update: {
             const dictionary = i18n.dictionary();
             if (!dictionary) { contentUpdate(key); break update }
@@ -25,7 +31,7 @@ export class I18nTranslation {
             const snippets = target.split(/\$[a-zA-Z0-9_]+\$/);
             if (snippets.length === 1 || !options) { contentUpdate(target); break update }
             const matches = target.matchAll(/(\$([a-zA-Z0-9_]+)\$)/g);
-            const content = snippets.map(text => [text, options[matches.next().value?.at(2)!] ?? null].join('')).join('');
+            const content = snippets.map(text => [text, options[matches.next().value?.at(2)!] ?? null]).flat();
             contentUpdate(content);
         }
         return this;

package/packages/idb/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "@amateras/idb",
+    "peerDependencies": {
+      "@amateras/core": "workspace:*",
+      "@amateras/signal": "workspace:*",
+      "@amateras/utils": "workspace:*"
+    },
+    "imports": {
+      "#structure/*": "./src/structure/*.ts",
+      "#lib/*": "./src/lib/*.ts",
+      "#node/*": "./src/node/*.ts"
+    },
+    "exports": {
+      ".": "./src/index.ts",
+      "./structure/*": "./src/structure/*.ts",
+      "./lib/*": "./src/lib/*.ts",
+      "./node/*": "./src/node/*.ts"
+    }
+}

package/{ext → packages}/idb/src/index.ts

@@ -1,7 +1,7 @@
-import { _Object_assign } from "amateras/lib/native"
+import { _Object_assign } from "@amateras/utils"
 import { $IDBBuilder } from "#structure/builder/$IDBBuilder"
 
-declare module 'amateras/core' {
+declare module '@amateras/core' {
     export namespace $ {
         /**
          * Create {@link $IDBBuilder} with IDB name and version number.

package/{ext → packages}/idb/src/lib/$IDBRequest.ts

@@ -1,4 +1,4 @@
-import { _Promise } from "../../../../src/lib/native";
+import { _Promise } from "@amateras/utils";
 
 export const $IDBRequest = <T>(req: IDBRequest<T>, handle?: (req: IDBRequest<T>, resolve: (value: T) => void) => void) => {
     return new _Promise<T>((resolve, reject) => {

package/{ext → packages}/idb/src/structure/$IDB.ts

@@ -1,4 +1,4 @@
-import { _Array_from, _null, _Object_assign, _Object_fromEntries, _Promise, isBoolean } from "amateras/lib/native";
+import { _Array_from, _null, _Object_assign, _Object_fromEntries, _Promise, isBoolean } from "@amateras/utils";
 import { $IDBStore, type $IDBStoreConfig } from "./$IDBStore";
 import { $IDBTransaction } from "./$IDBTransaction";
 

package/{ext → packages}/idb/src/structure/$IDBCursor.ts

@@ -1,4 +1,4 @@
-import { _instanceof, _Object_assign, _Promise } from "amateras/lib/native";
+import { _instanceof, _Object_assign, _Promise } from "@amateras/utils";
 import { $IDBRequest } from "#lib/$IDBRequest";
 import { $IDBStore, type $IDBStoreConfig } from "./$IDBStore";
 import { $IDBIndex } from "./$IDBIndex";

package/{ext → packages}/idb/src/structure/$IDBIndex.ts

@@ -1,4 +1,4 @@
-import { _Object_assign } from "amateras/lib/native";
+import { _Object_assign } from "@amateras/utils";
 import type { $IDBStore, $IDBStoreConfig, QueryMultipleKeyPath } from "./$IDBStore";
 import { $IDBStoreBase } from "./$IDBStoreBase";
 import type { $IDBCursor } from "./$IDBCursor";

package/{ext → packages}/idb/src/structure/$IDBStore.ts

@@ -1,4 +1,4 @@
-import { _instanceof, _Object_assign, _Promise } from "amateras/lib/native";
+import { _instanceof, _Object_assign, _Promise } from "@amateras/utils";
 import { $IDBIndex, type $IDBIndexConfig } from "./$IDBIndex";
 import { $IDBRequest } from "#lib/$IDBRequest";
 import { $IDBStoreBase } from "./$IDBStoreBase";

package/{ext → packages}/idb/src/structure/$IDBStoreBase.ts

@@ -1,4 +1,4 @@
-import { _Array_from, _instanceof, _null, _Promise } from "amateras/lib/native";
+import { _Array_from, _instanceof, _null, _Promise } from "@amateras/utils";
 import { $IDBRequest } from "#lib/$IDBRequest";
 import { $IDBCursor } from "./$IDBCursor";
 

package/{ext → packages}/idb/src/structure/$IDBTransaction.ts

@@ -1,4 +1,4 @@
-import { _Array_from, _Object_assign, forEach } from "../../../../src/lib/native";
+import { _Array_from, _Object_assign, forEach } from "@amateras/utils";
 import type { $IDB } from "./$IDB";
 import { $IDBStore, type $IDBStoreConfig } from "./$IDBStore";
 

package/{ext → packages}/idb/src/structure/builder/$IDBBuilder.ts

@@ -1,9 +1,8 @@
 import { $IDB, type $IDBConfig } from "#structure/$IDB";
-import { _Array_from, _instanceof, _JSON_stringify, _null, _Object_assign, _Object_fromEntries, _Promise, forEach, isFunction } from "amateras/lib/native";
+import { _Array_from, _instanceof, _JSON_stringify, _null, _Object_assign, _Object_fromEntries, _Promise, forEach, isFunction, trycatch } from "@amateras/utils";
 import { $IDBStoreBuilder } from "./$IDBStoreBuilder";
 import type { $IDBIndexConfig } from "#structure/$IDBIndex";
 import type { $IDBStoreConfig } from "#structure/$IDBStore";
-import { trycatch } from "amateras/lib/trycatch";
 // optimizer variables
 const objectStoreNames = 'objectStoreNames';
 const deleteObjectStore = 'deleteObjectStore';

package/{ext → packages}/idb/src/structure/builder/$IDBStoreBuilder.ts

@@ -1,5 +1,5 @@
 import type { $IDB } from "#structure/$IDB";
-import { _null } from "amateras/lib/native";
+import { _null } from "@amateras/utils";
 import type { $IDBStoreConfig } from "#structure/$IDBStore";
 import type { $IDBIndexConfig } from "#structure/$IDBIndex";
 

package/packages/markdown/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "@amateras/markdown",
+    "peerDependencies": {
+      "@amateras/core": "workspace:*",
+      "@amateras/utils": "workspace:*"
+    },
+    "imports": {
+      "#structure/*": "./src/structure/*.ts",
+      "#lib/*": "./src/lib/*.ts",
+      "#node/*": "./src/node/*.ts"
+    },
+    "exports": {
+      ".": "./src/index.ts",
+      "./structure/*": "./src/structure/*.ts",
+      "./lib/*": "./src/lib/*.ts",
+      "./node/*": "./src/node/*.ts",
+      "./syntax/*": "./src/syntax/*.ts"
+    }
+}

package/{ext → packages}/markdown/src/lib/util.ts

@@ -1,6 +1,6 @@
 import type { BlockTokenizer, InlineTokenizer, MarkdownLexer } from "#structure/MarkdownLexer";
 import type { MarkdownParseProcessor, MarkdownParser } from "#structure/MarkdownParser";
-import { forEach } from "amateras/lib/native";
+import { forEach } from "@amateras/utils";
 
 export const setBlockTokenizer = (lexer: MarkdownLexer, type: string, tokenizer: BlockTokenizer) => lexer.blockTokenizers.set(type, tokenizer);
 export const setInlineTokenizer = (lexer: MarkdownLexer, type: string, tokenizer: InlineTokenizer) => lexer.inlineTokenizers.set(type, tokenizer);

package/{ext → packages}/markdown/src/structure/MarkdownLexer.ts

@@ -1,12 +1,12 @@
 import { BLOCK, EMPTY_LINE, INLINE_CONTENT, INLINE_TEXT, TEXT_LINE } from "#lib/type";
-import { forEach, isString } from "amateras/lib/native";
+import { forEach, isString } from "@amateras/utils";
 
 export class MarkdownLexer {
     blockTokenizers = new Map<string, BlockTokenizer>();
     inlineTokenizers = new Map<string, InlineTokenizer>();
     
     blockTokenize(str: string) {
-        const lines = str.split(/\r?\n/);
+        const lines = str?.split(/\r?\n/) ?? [];
         const tokens: BlockToken[] = [];
         let lineIndex = 0;
         lineLoop: while (lineIndex < lines.length) {

package/{ext → packages}/markdown/src/structure/MarkdownParser.ts

@@ -1,4 +1,4 @@
-import { forEach, isString } from "../../../../src/lib/native";
+import { forEach, isString } from "@amateras/utils";
 import { type Token } from "./MarkdownLexer";
 
 export class MarkdownParser {
@@ -7,6 +7,7 @@ export class MarkdownParser {
     parse(tokens: (Token)[]) {
         let html = '';
         let i = 0;
+        if (!tokens) return html;
         while (i < tokens.length) {
             const token = tokens[i]!;
             const processor = this.processors.get(token.type);

package/{ext → packages}/markdown/src/syntax/alert.ts

@@ -2,7 +2,7 @@ import { ALERT, ALERT_LINE, BLOCK } from "#lib/type";
 import { setBlockTokenizer, setProcessor } from "#lib/util";
 import type { BlockToken, MarkdownLexer } from "#structure/MarkdownLexer";
 import type { MarkdownParser } from "#structure/MarkdownParser";
-import { uppercase } from "amateras/lib/uppercase";
+import { uppercase } from "@amateras/utils";
 
 export const alertProcessor = (parser: MarkdownParser) => setProcessor(parser, ALERT, (token, tokens) => {
     let html = '';

package/{ext → packages}/markdown/src/syntax/codeblock.ts

@@ -19,7 +19,7 @@ export const codeblockProcessor = (parser: MarkdownParser) => setProcessor(parse
     })
 
 export const codeblockTokenizer = (lexer: MarkdownLexer) => setBlockTokenizer(lexer, CODE_START, {
-    regex: /^```(\w+)/,
+    regex: /^```(\w+)?/,
     handle: (matches, position, lines) => {
         const tokens: BlockToken[] = [];
         position++;

package/{ext → packages}/markdown/src/syntax/link.ts

@@ -2,12 +2,12 @@ import { LINK, QUICK_LINK } from "#lib/type";
 import { setInlineTokenizer, setProcessor } from "#lib/util";
 import type { MarkdownLexer, Token } from "#structure/MarkdownLexer";
 import type { MarkdownParser } from "#structure/MarkdownParser";
-import { isUndefined } from "amateras/lib/native";
+import { isUndefined } from "@amateras/utils";
 
 export const linkProcessor = (parser: MarkdownParser) => {
     const linkProcessor = (token: Token) => {
         const {href, email, title} = token.data!;
-        return `<a href="${isUndefined(href) ? `mailto:${email}` : href}"${title ? ` title="${title}"` : ''}>${parser.parse(token.content!)}</a>`
+        return `<a href="${isUndefined(href) ? `mailto:${email}` : href}"${title ? ` title="${title}"` : ''}>${token.text ?? parser.parse(token.content!)}</a>`
     }
     setProcessor(parser, QUICK_LINK, linkProcessor)
     setProcessor(parser, LINK, linkProcessor)

package/{ext → packages}/markdown/src/syntax/list.ts

@@ -2,7 +2,7 @@ import { EMPTY_LINE, ORDERED_LIST_ITEM, TEXT_LINE, UNORDERED_LIST_ITEM } from "#
 import { htmltag, setBlockTokenizer, setProcessor } from "#lib/util";
 import type { MarkdownLexer, Token } from "#structure/MarkdownLexer";
 import type { MarkdownParser } from "#structure/MarkdownParser";
-import { equal, isString } from "amateras/lib/native";
+import { equal, isString } from "@amateras/utils";
 
 export const listProcessor = (parser: MarkdownParser) => {
     const listType = (type: string) => type === ORDERED_LIST_ITEM ? 'ol' : 'ul'

package/{ext → packages}/markdown/src/syntax/table.ts

@@ -2,7 +2,7 @@ import { BLOCK, TABLE, TABLE_COLUMN, TABLE_ROW } from "#lib/type";
 import { htmltag, setBlockTokenizer, setProcessor } from "#lib/util";
 import type { BlockToken, MarkdownLexer } from "#structure/MarkdownLexer";
 import type { MarkdownParser } from "#structure/MarkdownParser";
-import { _Array_from } from "amateras/lib/native";
+import { _Array_from } from "@amateras/utils";
 
 export const tableProcessor = (parser: MarkdownParser) => setProcessor(parser, TABLE, (token) => {
         let thead = '';