@yozora/tokenizer-admonition 2.0.0-alpha.0 → 2.0.0

package/README.md

@@ -84,14 +84,14 @@ so you can use `YozoraParser` directly.
 registered in *YastParser* as a plugin-in before it can be used.
 
 ```typescript {4,9}
-import { DefaultYastParser } from '@yozora/core-parser'
+import { DefaultParser } from '@yozora/core-parser'
 import ParagraphTokenizer from '@yozora/tokenizer-paragraph'
 import TextTokenizer from '@yozora/tokenizer-text'
 import AdmonitionTokenizer from '@yozora/tokenizer-admonition'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new AdmonitionTokenizer())
 
 // parse source markdown content
@@ -180,7 +180,7 @@ Name              | Type        | Required  | Default
 ### Node Type
 
 ```typescript
-export interface Admonition extends YastParent<'admonition'> {
+export interface Admonition extends Parent<'admonition'> {
   type: 'admonition'
   /**
   * Keyword of an admonition.
@@ -189,11 +189,11 @@ export interface Admonition extends YastParent<'admonition'> {
   /**
   * Admonition title.
   */
-  title: YastNode[]
+  title: Node[]
   /**
    * Admonition body.
    */
-  children: YastNode[]
+  children: Node[]
 }
 ```
 
@@ -285,7 +285,6 @@ export interface Admonition extends YastParent<'admonition'> {
 [@yozora/tokenizer-link]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/link#readme
 [@yozora/tokenizer-link-reference]:           https://github.com/yozorajs/yozora/tree/main/tokenizers/link-reference#readme
 [@yozora/tokenizer-list]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/list#readme
-[@yozora/tokenizer-list-item]:                https://github.com/yozorajs/yozora/tree/main/tokenizers/list-item#readme
 [@yozora/tokenizer-math]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/math#readme
 [@yozora/tokenizer-paragraph]:                https://github.com/yozorajs/yozora/tree/main/tokenizers/paragraph#readme
 [@yozora/tokenizer-setext-heading]:           https://github.com/yozorajs/yozora/tree/main/tokenizers/setext-heading#readme
@@ -345,7 +344,6 @@ export interface Admonition extends YastParent<'admonition'> {
 [doc-@yozora/tokenizer-definition]:           https://yozora.guanghechen.com/docs/package/tokenizer-definition
 [doc-@yozora/tokenizer-link-reference]:       https://yozora.guanghechen.com/docs/package/tokenizer-link-reference
 [doc-@yozora/tokenizer-list]:                 https://yozora.guanghechen.com/docs/package/tokenizer-list
-[doc-@yozora/tokenizer-list-item]:            https://yozora.guanghechen.com/docs/package/tokenizer-list-item
 [doc-@yozora/tokenizer-math]:                 https://yozora.guanghechen.com/docs/package/tokenizer-math
 [doc-@yozora/tokenizer-paragraph]:            https://yozora.guanghechen.com/docs/package/tokenizer-paragraph
 [doc-@yozora/tokenizer-setext-heading]:       https://yozora.guanghechen.com/docs/package/tokenizer-setext-heading

package/lib/cjs/index.js

@@ -12,7 +12,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var FencedBlockTokenizer__default = /*#__PURE__*/_interopDefaultLegacy(FencedBlockTokenizer);
 
 const match = function (api) {
-    const hook = FencedBlockTokenizer.fencedMatch.call(this, api);
+    const hook = FencedBlockTokenizer.fencedBlockMatch.call(this, api);
     return Object.assign(Object.assign({}, hook), { isContainingBlock: true, onClose });
     function onClose(token) {
         const children = api.rollbackPhrasingLines(token.lines);
@@ -22,15 +22,15 @@ const match = function (api) {
 
 const parse = function (api) {
     return {
-        parse: (token, children) => {
+        parse: tokens => tokens.map(token => {
             const infoString = token.infoString;
             let i = 0;
-            const keyword = [];
+            const keywordNodePoints = [];
             for (; i < infoString.length; ++i) {
                 const p = infoString[i];
                 if (character.isUnicodeWhitespaceCharacter(p.codePoint))
                     break;
-                keyword.push(p);
+                keywordNodePoints.push(p);
             }
             i = coreTokenizer.eatOptionalWhitespaces(infoString, i, infoString.length);
             const title = (() => {
@@ -45,19 +45,16 @@ const parse = function (api) {
                         countOfPrecedeSpaces: 0,
                     },
                 ];
-                const phrasingContent = api.buildPhrasingContent(titleLines);
-                if (phrasingContent == null)
-                    return [];
-                return api.parsePhrasingContent(phrasingContent);
+                const contents = coreTokenizer.mergeAndStripContentLines(titleLines);
+                return api.processInlines(contents);
             })();
-            const node = {
-                type: ast.AdmonitionType,
-                keyword: character.calcEscapedStringFromNodePoints(keyword, 0, keyword.length, true),
-                title,
-                children,
-            };
+            const keyword = character.calcEscapedStringFromNodePoints(keywordNodePoints, 0, keywordNodePoints.length, true);
+            const children = api.parseBlockTokens(token.children);
+            const node = api.shouldReservePosition
+                ? { type: ast.AdmonitionType, position: token.position, keyword, title, children }
+                : { type: ast.AdmonitionType, keyword, title, children };
             return node;
-        },
+        }),
     };
 };
 

package/lib/esm/index.js

@@ -1,10 +1,10 @@
-import FencedBlockTokenizer, { fencedMatch } from '@yozora/tokenizer-fenced-block';
+import FencedBlockTokenizer, { fencedBlockMatch } from '@yozora/tokenizer-fenced-block';
 import { AdmonitionType } from '@yozora/ast';
 import { isUnicodeWhitespaceCharacter, calcEscapedStringFromNodePoints, AsciiCodePoint } from '@yozora/character';
-import { eatOptionalWhitespaces, TokenizerPriority } from '@yozora/core-tokenizer';
+import { eatOptionalWhitespaces, mergeAndStripContentLines, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function (api) {
-    const hook = fencedMatch.call(this, api);
+    const hook = fencedBlockMatch.call(this, api);
     return Object.assign(Object.assign({}, hook), { isContainingBlock: true, onClose });
     function onClose(token) {
         const children = api.rollbackPhrasingLines(token.lines);
@@ -14,15 +14,15 @@ const match = function (api) {
 
 const parse = function (api) {
     return {
-        parse: (token, children) => {
+        parse: tokens => tokens.map(token => {
             const infoString = token.infoString;
             let i = 0;
-            const keyword = [];
+            const keywordNodePoints = [];
             for (; i < infoString.length; ++i) {
                 const p = infoString[i];
                 if (isUnicodeWhitespaceCharacter(p.codePoint))
                     break;
-                keyword.push(p);
+                keywordNodePoints.push(p);
             }
             i = eatOptionalWhitespaces(infoString, i, infoString.length);
             const title = (() => {
@@ -37,19 +37,16 @@ const parse = function (api) {
                         countOfPrecedeSpaces: 0,
                     },
                 ];
-                const phrasingContent = api.buildPhrasingContent(titleLines);
-                if (phrasingContent == null)
-                    return [];
-                return api.parsePhrasingContent(phrasingContent);
+                const contents = mergeAndStripContentLines(titleLines);
+                return api.processInlines(contents);
             })();
-            const node = {
-                type: AdmonitionType,
-                keyword: calcEscapedStringFromNodePoints(keyword, 0, keyword.length, true),
-                title,
-                children,
-            };
+            const keyword = calcEscapedStringFromNodePoints(keywordNodePoints, 0, keywordNodePoints.length, true);
+            const children = api.parseBlockTokens(token.children);
+            const node = api.shouldReservePosition
+                ? { type: AdmonitionType, position: token.position, keyword, title, children }
+                : { type: AdmonitionType, keyword, title, children };
             return node;
-        },
+        }),
     };
 };
 

package/lib/types/index.d.ts

@@ -2,4 +2,4 @@ export { match as admonitionMatch } from './match';
 export { parse as admonitionParse } from './parse';
 export { AdmonitionTokenizer, AdmonitionTokenizer as default } from './tokenizer';
 export { uniqueName as AdmonitionTokenizerName } from './types';
-export type { IHookContext as IAdmonitionHookContext, IToken as IAdmonitionToken, ITokenizerProps as IAdmonitionTokenizerProps, } from './types';
+export type { IThis as IAdmonitionHookContext, IToken as IAdmonitionToken, ITokenizerProps as IAdmonitionTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -1,5 +1,5 @@
 import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
-import type { IHookContext, IToken, T } from './types';
+import type { IThis, IToken, T } from './types';
 /**
  * A code fence is a sequence of at least three consecutive backtick characters
  * (`) or tildes (~). (Tildes and backticks cannot be mixed.) A fenced code
@@ -8,4 +8,4 @@ import type { IHookContext, IToken, T } from './types';
  * @see https://github.com/syntax-tree/mdast#code
  * @see https://github.github.com/gfm/#code-fence
  */
-export declare const match: IMatchBlockHookCreator<T, IToken, IHookContext>;
+export declare const match: IMatchBlockHookCreator<T, IToken, IThis>;

package/lib/types/parse.d.ts

@@ -1,3 +1,3 @@
 import type { IParseBlockHookCreator } from '@yozora/core-tokenizer';
-import type { IHookContext, INode, IToken, T } from './types';
-export declare const parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
+import type { INode, IThis, IToken, T } from './types';
+export declare const parse: IParseBlockHookCreator<T, IToken, INode, IThis>;

package/lib/types/tokenizer.d.ts

@@ -1,13 +1,13 @@
 import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator } from '@yozora/core-tokenizer';
 import FencedBlockTokenizer from '@yozora/tokenizer-fenced-block';
-import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Admonition.
  * @see https://github.com/syntax-tree/mdast#code
  * @see https://github.github.com/gfm/#code-fence
  */
-export declare class AdmonitionTokenizer extends FencedBlockTokenizer<T, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+export declare class AdmonitionTokenizer extends FencedBlockTokenizer<T, INode, IThis> implements IBlockTokenizer<T, IToken, INode, IThis> {
     constructor(props?: ITokenizerProps);
-    readonly match: IMatchBlockHookCreator<T, IToken, IHookContext>;
-    readonly parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
+    readonly match: IMatchBlockHookCreator<T, IToken, IThis>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,8 +1,8 @@
-import type { AdmonitionType, IAdmonition } from '@yozora/ast';
+import type { Admonition, AdmonitionType } from '@yozora/ast';
 import type { IBaseBlockTokenizerProps, IYastBlockToken } from '@yozora/core-tokenizer';
 import type { IFencedBlockHookContext, IFencedBlockToken } from '@yozora/tokenizer-fenced-block';
 export declare type T = AdmonitionType;
-export declare type INode = IAdmonition;
+export declare type INode = Admonition;
 export declare const uniqueName = "@yozora/tokenizer-admonition";
 export interface IToken extends IFencedBlockToken<T> {
     /**
@@ -10,5 +10,5 @@ export interface IToken extends IFencedBlockToken<T> {
      */
     children?: IYastBlockToken[];
 }
-export declare type IHookContext = IFencedBlockHookContext<T>;
+export declare type IThis = IFencedBlockHookContext<T>;
 export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-admonition",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0",
   "description": "Tokenizer for processing admonitions",
   "author": {
     "name": "guanghechen",
@@ -42,10 +42,10 @@
     "test": "cross-env TS_NODE_FILES=true jest --config ../../jest.config.js --rootDir ."
   },
   "dependencies": {
-    "@yozora/ast": "^2.0.0-alpha.0",
-    "@yozora/character": "^2.0.0-alpha.0",
-    "@yozora/core-tokenizer": "^2.0.0-alpha.0",
-    "@yozora/tokenizer-fenced-block": "^2.0.0-alpha.0"
+    "@yozora/ast": "^2.0.0",
+    "@yozora/character": "^2.0.0",
+    "@yozora/core-tokenizer": "^2.0.0",
+    "@yozora/tokenizer-fenced-block": "^2.0.0"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "65e99d1709fdd1c918465dce6b1e91de96bdab5e"
 }