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

package/lib/cjs/index.js

@@ -8,11 +8,13 @@ var coreTokenizer = require('@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*/;
-const regex1 = /^import\s+(['"])([^'"]+)\1$/;
-const regex2 = /^import\s+([\w]+)\s+from\s+(['"])([^'"]+)\2$/;
+const endRegex = /\s*;*\s*$/;
+const regex1 = new RegExp(/^import\s+(['"])([^'"]+)\1/.source + endRegex.source);
+const regex2 = new RegExp(/^import\s+([\w]+)\s+from\s+(['"])([^'"]+)\2/.source + endRegex.source);
 const regex3 = new RegExp(/^import\s+(?:([\w]+)\s*,\s*)?/.source +
     namedImportRegex.source +
-    /from\s+(['"])([^'"]+)\3$/.source);
+    /from\s+(['"])([^'"]+)\3/.source +
+    endRegex.source);
 function resolveNameImports(text) {
     const items = text.split(/\s*,\s*/g).filter(item => item.length > 0);
     const result = [];
@@ -52,8 +54,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 = {

package/lib/esm/index.js

@@ -1,14 +1,16 @@
 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*/;
-const regex1 = /^import\s+(['"])([^'"]+)\1$/;
-const regex2 = /^import\s+([\w]+)\s+from\s+(['"])([^'"]+)\2$/;
+const endRegex = /\s*;*\s*$/;
+const regex1 = new RegExp(/^import\s+(['"])([^'"]+)\1/.source + endRegex.source);
+const regex2 = new RegExp(/^import\s+([\w]+)\s+from\s+(['"])([^'"]+)\2/.source + endRegex.source);
 const regex3 = new RegExp(/^import\s+(?:([\w]+)\s*,\s*)?/.source +
     namedImportRegex.source +
-    /from\s+(['"])([^'"]+)\3$/.source);
+    /from\s+(['"])([^'"]+)\3/.source +
+    endRegex.source);
 function resolveNameImports(text) {
     const items = text.split(/\s*,\s*/g).filter(item => item.length > 0);
     const result = [];
@@ -48,8 +50,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 = {

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 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.2",
+  "version": "2.0.1",
   "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.2",
-    "@yozora/character": "^2.0.0-alpha.2",
-    "@yozora/core-tokenizer": "^2.0.0-alpha.2"
+    "@yozora/ast": "^2.0.1",
+    "@yozora/character": "^2.0.1",
+    "@yozora/core-tokenizer": "^2.0.1"
   },
-  "gitHead": "da59d85520455c59a117a35032ef1a035c10ea21"
+  "gitHead": "3aea33091e402bd6c7754d91d549e8d648475073"
 }