@yozora/tokenizer-ecma-import 2.0.0-alpha.0 → 2.0.0

package/README.md

@@ -105,14 +105,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 EcmaImportTokenizer from '@yozora/tokenizer-ecma-import'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new EcmaImportTokenizer())
 
 // parse source markdown content
@@ -248,7 +248,6 @@ Name              | Type        | Required  | Default
 [@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
@@ -308,7 +307,6 @@ Name              | Type        | Required  | Default
 [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

@@ -52,8 +52,8 @@ const match = function () {
         let m;
         let token = null;
         const position = () => ({
-            start: coreTokenizer.calcStartYastNodePoint(nodePoints, startIndex),
-            end: coreTokenizer.calcEndYastNodePoint(nodePoints, endIndex - 1),
+            start: coreTokenizer.calcStartPoint(nodePoints, startIndex),
+            end: coreTokenizer.calcEndPoint(nodePoints, endIndex - 1),
         });
         if ((m = regex1.exec(text)) != null) {
             token = {
@@ -86,17 +86,25 @@ const match = function () {
     }
 };
 
-const parse = function () {
+const parse = function (api) {
     return {
-        parse: token => {
-            const node = {
-                type: ast.EcmaImportType,
-                moduleName: token.moduleName,
-                defaultImport: token.defaultImport,
-                namedImports: token.namedImports,
-            };
+        parse: tokens => tokens.map(token => {
+            const node = api.shouldReservePosition
+                ? {
+                    type: ast.EcmaImportType,
+                    position: token.position,
+                    moduleName: token.moduleName,
+                    defaultImport: token.defaultImport,
+                    namedImports: token.namedImports,
+                }
+                : {
+                    type: ast.EcmaImportType,
+                    moduleName: token.moduleName,
+                    defaultImport: token.defaultImport,
+                    namedImports: token.namedImports,
+                };
             return node;
-        },
+        }),
     };
 };
 

package/lib/esm/index.js

@@ -1,6 +1,6 @@
 import { EcmaImportType } from '@yozora/ast';
 import { AsciiCodePoint, calcTrimBoundaryOfCodePoints, calcStringFromNodePoints } from '@yozora/character';
-import { calcStartYastNodePoint, calcEndYastNodePoint, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { calcStartPoint, calcEndPoint, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const namedImportItemRegex = /^(\w+)(?:\s+as\s+(\w+))?$/;
 const namedImportRegex = /\{\s*((?:[\w]+(?:\s+as\s+[\w]+)?\s*,\s*)*[\w]+(?:\s+as\s+[\w]+)?)\s*\}\s*/;
@@ -48,8 +48,8 @@ const match = function () {
         let m;
         let token = null;
         const position = () => ({
-            start: calcStartYastNodePoint(nodePoints, startIndex),
-            end: calcEndYastNodePoint(nodePoints, endIndex - 1),
+            start: calcStartPoint(nodePoints, startIndex),
+            end: calcEndPoint(nodePoints, endIndex - 1),
         });
         if ((m = regex1.exec(text)) != null) {
             token = {
@@ -82,17 +82,25 @@ const match = function () {
     }
 };
 
-const parse = function () {
+const parse = function (api) {
     return {
-        parse: token => {
-            const node = {
-                type: EcmaImportType,
-                moduleName: token.moduleName,
-                defaultImport: token.defaultImport,
-                namedImports: token.namedImports,
-            };
+        parse: tokens => tokens.map(token => {
+            const node = api.shouldReservePosition
+                ? {
+                    type: EcmaImportType,
+                    position: token.position,
+                    moduleName: token.moduleName,
+                    defaultImport: token.defaultImport,
+                    namedImports: token.namedImports,
+                }
+                : {
+                    type: EcmaImportType,
+                    moduleName: token.moduleName,
+                    defaultImport: token.defaultImport,
+                    namedImports: token.namedImports,
+                };
             return node;
-        },
+        }),
     };
 };
 

package/lib/types/index.d.ts

@@ -2,4 +2,4 @@ export { match as ecmaImportMatch } from './match';
 export { parse as ecmaImportParse } from './parse';
 export { EcmaImportTokenizer, EcmaImportTokenizer as default } from './tokenizer';
 export { uniqueName as EcmaImportTokenizerName } from './types';
-export type { IHookContext as ecmaImportHookContext, IToken as IEcmaImportToken, ITokenizerProps as IEcmaImportProps, } from './types';
+export type { IThis as ecmaImportHookContext, IToken as IEcmaImportToken, ITokenizerProps as IEcmaImportProps, } 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';
 /**
  * Examples
  *
@@ -12,4 +12,4 @@ import type { IHookContext, IToken, T } from './types';
  * @see https://github.com/syntax-tree/mdast#strong
  * @see https://github.github.com/gfm/#emphasis-and-strong-emphasis
  */
-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 { BaseBlockTokenizer } from '@yozora/core-tokenizer';
-import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Ecma Import statement
  * @see https://github.com/syntax-tree/mdast#strong
  * @see https://github.github.com/gfm/#emphasis-and-strong-emphasis
  */
-export declare class EcmaImportTokenizer extends BaseBlockTokenizer<T, IToken, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+export declare class EcmaImportTokenizer extends BaseBlockTokenizer<T, IToken, 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 { EcmaImportType, IEcmaImport } from '@yozora/ast';
+import type { EcmaImport, EcmaImportType } from '@yozora/ast';
 import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, ITokenizer } from '@yozora/core-tokenizer';
 export declare type T = EcmaImportType;
-export declare type INode = IEcmaImport;
+export declare type INode = EcmaImport;
 export declare const uniqueName = "@yozora/tokenizer-ecma-import";
-export declare type IToken = IPartialYastBlockToken<T> & Omit<IEcmaImport, 'type'>;
-export declare type IHookContext = ITokenizer;
+export declare type IToken = IPartialYastBlockToken<T> & Omit<EcmaImport, 'type'>;
+export declare type IThis = ITokenizer;
 export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-ecma-import",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0",
   "author": {
     "name": "guanghechen",
     "url": "https://github.com/guanghechen/"
@@ -35,9 +35,9 @@
     "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/ast": "^2.0.0",
+    "@yozora/character": "^2.0.0",
+    "@yozora/core-tokenizer": "^2.0.0"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "65e99d1709fdd1c918465dce6b1e91de96bdab5e"
 }