@yozora/tokenizer-ecma-import 1.2.2 → 2.0.0-alpha.2

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

@@ -6,8 +6,6 @@ var ast = require('@yozora/ast');
 var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
-const uniqueName = '@yozora/tokenizer-ecma-import';
-
 const namedImportItemRegex = /^(\w+)(?:\s+as\s+(\w+))?$/;
 const namedImportRegex = /\{\s*((?:[\w]+(?:\s+as\s+[\w]+)?\s*,\s*)*[\w]+(?:\s+as\s+[\w]+)?)\s*\}\s*/;
 const regex1 = /^import\s+(['"])([^'"]+)\1$/;
@@ -25,16 +23,12 @@ function resolveNameImports(text) {
     return result;
 }
 
-class EcmaImportTokenizer extends coreTokenizer.BaseBlockTokenizer {
-    constructor(props = {}) {
-        var _a, _b;
-        super({
-            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
-            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : coreTokenizer.TokenizerPriority.ATOMIC,
-        });
-        this.isContainingBlock = false;
-    }
-    eatOpener(line) {
+const match = function () {
+    return {
+        isContainingBlock: false,
+        eatOpener,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
@@ -88,21 +82,48 @@ class EcmaImportTokenizer extends coreTokenizer.BaseBlockTokenizer {
                 namedImports: resolveNameImports(m[2]),
             };
         }
-        return token === null
-            ? null
-            : { token, nextIndex: endIndex, saturated: true };
+        return token === null ? null : { token, nextIndex: endIndex, saturated: true };
     }
-    parseBlock(token) {
-        const node = {
-            type: ast.EcmaImportType,
-            moduleName: token.moduleName,
-            defaultImport: token.defaultImport,
-            namedImports: token.namedImports,
-        };
-        return node;
+};
+
+const parse = function (api) {
+    return {
+        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;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-ecma-import';
+
+class EcmaImportTokenizer extends coreTokenizer.BaseBlockTokenizer {
+    constructor(props = {}) {
+        var _a, _b;
+        super({
+            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
+            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : coreTokenizer.TokenizerPriority.ATOMIC,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
 exports.EcmaImportTokenizer = EcmaImportTokenizer;
 exports.EcmaImportTokenizerName = uniqueName;
-exports['default'] = EcmaImportTokenizer;
+exports["default"] = EcmaImportTokenizer;
+exports.ecmaImportMatch = match;
+exports.ecmaImportParse = parse;

package/lib/esm/index.js

@@ -1,8 +1,6 @@
 import { EcmaImportType } from '@yozora/ast';
 import { AsciiCodePoint, calcTrimBoundaryOfCodePoints, calcStringFromNodePoints } from '@yozora/character';
-import { BaseBlockTokenizer, TokenizerPriority, calcStartYastNodePoint, calcEndYastNodePoint } from '@yozora/core-tokenizer';
-
-const uniqueName = '@yozora/tokenizer-ecma-import';
+import { calcStartYastNodePoint, calcEndYastNodePoint, 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*/;
@@ -21,16 +19,12 @@ function resolveNameImports(text) {
     return result;
 }
 
-class EcmaImportTokenizer extends BaseBlockTokenizer {
-    constructor(props = {}) {
-        var _a, _b;
-        super({
-            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
-            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : TokenizerPriority.ATOMIC,
-        });
-        this.isContainingBlock = false;
-    }
-    eatOpener(line) {
+const match = function () {
+    return {
+        isContainingBlock: false,
+        eatOpener,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
@@ -84,19 +78,44 @@ class EcmaImportTokenizer extends BaseBlockTokenizer {
                 namedImports: resolveNameImports(m[2]),
             };
         }
-        return token === null
-            ? null
-            : { token, nextIndex: endIndex, saturated: true };
+        return token === null ? null : { token, nextIndex: endIndex, saturated: true };
     }
-    parseBlock(token) {
-        const node = {
-            type: EcmaImportType,
-            moduleName: token.moduleName,
-            defaultImport: token.defaultImport,
-            namedImports: token.namedImports,
-        };
-        return node;
+};
+
+const parse = function (api) {
+    return {
+        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;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-ecma-import';
+
+class EcmaImportTokenizer extends BaseBlockTokenizer {
+    constructor(props = {}) {
+        var _a, _b;
+        super({
+            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
+            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : TokenizerPriority.ATOMIC,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
-export { EcmaImportTokenizer, uniqueName as EcmaImportTokenizerName, EcmaImportTokenizer as default };
+export { EcmaImportTokenizer, uniqueName as EcmaImportTokenizerName, EcmaImportTokenizer as default, match as ecmaImportMatch, parse as ecmaImportParse };

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { EcmaImportTokenizer } from './tokenizer';
-export { EcmaImportTokenizer } from './tokenizer';
+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 { Token as EcmaImportToken, TokenizerProps as EcmaImportProps, } from './types';
-export default EcmaImportTokenizer;
+export type { IThis as ecmaImportHookContext, IToken as IEcmaImportToken, ITokenizerProps as IEcmaImportProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,15 @@
+import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
+import type { IThis, IToken, T } from './types';
+/**
+ * Examples
+ *
+ *    import '@yozora/parser'
+ *    import Parser from '@yozora/parser'
+ *    import Parser, { YozoraParserProps } from '@yozora/parser'
+ *    import { YozoraParserProps } from '@yozora/parser'
+ *    import { YozoraParser, YozoraParser as Parser } from '@yozora/parser'
+ *
+ * @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, IThis>;

package/lib/types/parse.d.ts

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

package/lib/types/tokenizer.d.ts

@@ -1,32 +1,13 @@
-import type { PhrasingContentLine, ResultOfEatOpener, ResultOfParse, Tokenizer, TokenizerMatchBlockHook, TokenizerParseBlockHook } from '@yozora/core-tokenizer';
+import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator } from '@yozora/core-tokenizer';
 import { BaseBlockTokenizer } from '@yozora/core-tokenizer';
-import type { Node, T, Token, TokenizerProps } from './types';
-/**
- * Params for constructing EcmaImportTokenizer
- */
-export interface EcmaImportTokenizerProps {
-}
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Ecma Import statement
- *
- * Examples
- *
- *    import '@yozora/parser'
- *    import Parser from '@yozora/parser'
- *    import Parser, { YozoraParserProps } from '@yozora/parser'
- *    import { YozoraParserProps } from '@yozora/parser'
- *    import { YozoraParser, YozoraParser as Parser } from '@yozora/parser'
- *
  * @see https://github.com/syntax-tree/mdast#strong
  * @see https://github.github.com/gfm/#emphasis-and-strong-emphasis
  */
-export declare class EcmaImportTokenizer extends BaseBlockTokenizer implements Tokenizer, TokenizerMatchBlockHook<T, Token>, TokenizerParseBlockHook<T, Token, Node> {
-    readonly isContainingBlock = false;
-    constructor(props?: TokenizerProps);
-    eatOpener(line: Readonly<PhrasingContentLine>): ResultOfEatOpener<T, Token>;
-    /**
-     * @override
-     * @see TokenizerParseBlockHook
-     */
-    parseBlock(token: Readonly<Token>): ResultOfParse<T, Node>;
+export declare class EcmaImportTokenizer extends BaseBlockTokenizer<T, IToken, INode, IThis> implements IBlockTokenizer<T, IToken, INode, IThis> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchBlockHookCreator<T, IToken, IThis>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,7 +1,8 @@
-import type { EcmaImport, EcmaImportType } from '@yozora/ast';
-import type { BaseBlockTokenizerProps, PartialYastBlockToken } from '@yozora/core-tokenizer';
+import type { EcmaImportType, IEcmaImport } from '@yozora/ast';
+import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, ITokenizer } from '@yozora/core-tokenizer';
 export declare type T = EcmaImportType;
-export declare type Node = EcmaImport;
+export declare type INode = IEcmaImport;
 export declare const uniqueName = "@yozora/tokenizer-ecma-import";
-export declare type Token = PartialYastBlockToken<T> & Omit<EcmaImport, 'type'>;
-export declare type TokenizerProps = Partial<BaseBlockTokenizerProps>;
+export declare type IToken = IPartialYastBlockToken<T> & Omit<IEcmaImport, 'type'>;
+export declare type IThis = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/lib/types/util.d.ts

@@ -1,4 +1,4 @@
-import type { EcmaImportNamedImport } from '@yozora/ast';
+import type { IEcmaImportNamedImport } from '@yozora/ast';
 /**
  * import '@yozora.parser'
  */
@@ -20,4 +20,4 @@ export declare const regex3: RegExp;
  *
  * @param text
  */
-export declare function resolveNameImports(text: string): EcmaImportNamedImport[];
+export declare function resolveNameImports(text: string): IEcmaImportNamedImport[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-ecma-import",
-  "version": "1.2.2",
+  "version": "2.0.0-alpha.2",
   "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": "^1.2.2",
-    "@yozora/character": "^1.2.2",
-    "@yozora/core-tokenizer": "^1.2.2"
+    "@yozora/ast": "^2.0.0-alpha.2",
+    "@yozora/character": "^2.0.0-alpha.2",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.2"
   },
-  "gitHead": "fb4b804548592c09259aabcf9cc4dd96176bd024"
+  "gitHead": "da59d85520455c59a117a35032ef1a035c10ea21"
 }