@markuplint/vue-parser 4.0.0-alpha.4 → 4.0.0-alpha.6

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2023 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/parse.js

@@ -1,7 +1,6 @@
-import { parseRawTag } from '@markuplint/html-parser';
-import { flattenNodes, getEndCol, getEndLine, uuid, ParserError, detectElementType } from '@markuplint/parser-utils';
+import { flattenNodes, getEndCol, getEndLine, uuid, ParserError, detectElementType, tagParser, } from '@markuplint/parser-utils';
 import { attr } from './attr.js';
-import vueParse from './vue-parser/index.js';
+import { vueParse } from './vue-parser/index.js';
 export const parse = (rawCode, options) => {
     let ast;
     try {
@@ -161,13 +160,13 @@ comments, options) {
         default: {
             const tagLoc = originNode.startTag;
             const startTagRaw = rawHtml.slice(tagLoc.range[0], tagLoc.range[1]);
-            const tagTokens = parseRawTag(startTagRaw, startLine, startCol, startOffset);
+            const tagTokens = tagParser(startTagRaw, startLine, startCol, startOffset);
             const tagName = tagTokens.tagName;
             let endTag = null;
             const endTagLoc = originNode.endTag;
             if (endTagLoc) {
                 const endTagRaw = rawHtml.slice(endTagLoc.range[0], endTagLoc.range[1]);
-                const endTagTokens = parseRawTag(endTagRaw, endTagLoc.loc.start.line, endTagLoc.loc.start.column, endTagLoc.range[0]);
+                const endTagTokens = tagParser(endTagRaw, endTagLoc.loc.start.line, endTagLoc.loc.start.column, endTagLoc.range[0]);
                 const endTagName = endTagTokens.tagName;
                 endTag = {
                     uuid: uuid(),
@@ -227,7 +226,7 @@ comments, options) {
                 nextNode,
                 pearNode: endTag,
                 selfClosingSolidus: tagTokens.selfClosingSolidus,
-                endSpace: tagTokens.endSpace,
+                endSpace: tagTokens.afterAttrSpaces,
                 isFragment: false,
                 isGhost: false,
                 tagOpenChar: '<',

package/lib/vue-parser/index.d.ts

@@ -1,5 +1,5 @@
 import * as VueESLintParser from 'vue-eslint-parser';
 export type VueTokens = VueESLintParser.AST.ESLintProgram;
-export default function vueParse(vueTemplate: string): VueTokens;
+export declare function vueParse(vueTemplate: string): VueTokens;
 export type ASTNode = VueESLintParser.AST.VElement | VueESLintParser.AST.VText | VueESLintParser.AST.VExpressionContainer;
 export type ASTComment = VueESLintParser.AST.Token & VueESLintParser.AST.HasLocation;

package/lib/vue-parser/index.js

@@ -1,5 +1,5 @@
 import * as VueESLintParser from 'vue-eslint-parser';
-export default function vueParse(vueTemplate) {
+export function vueParse(vueTemplate) {
     const ast = VueESLintParser.parse(vueTemplate, { parser: false });
     return ast;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/vue-parser",
-	"version": "4.0.0-alpha.4",
+	"version": "4.0.0-alpha.6",
 	"description": "Vue parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,10 +21,10 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0-alpha.4",
-		"@markuplint/ml-ast": "4.0.0-alpha.4",
-		"@markuplint/parser-utils": "4.0.0-alpha.4",
+		"@markuplint/html-parser": "4.0.0-alpha.6",
+		"@markuplint/ml-ast": "4.0.0-alpha.6",
+		"@markuplint/parser-utils": "4.0.0-alpha.6",
 		"vue-eslint-parser": "^9.3.1"
 	},
-	"gitHead": "991b3aef77fde42c79343ee8c807257a35c589d7"
+	"gitHead": "06e1242d274c72cf08a10a572b06ac35d1b924a4"
 }