@markuplint/svelte-parser 4.0.0-alpha.7 → 4.0.0-alpha.9

package/README.md

@@ -23,3 +23,15 @@ Add `parser` option to your [configuration](https://markuplint.dev/configuration
   }
 }
 ```
+
+### Use with [SvelteKit](https://kit.svelte.dev/)
+
+```diff
+{
+  "parser": {
+--  ".svelte$": "@markuplint/svelte-parser"
+++  ".svelte$": "@markuplint/svelte-parser",
+++  ".html$": "@markuplint/svelte-parser/kit"
+  }
+}
+```

package/lib/attr.js

@@ -26,12 +26,7 @@ attr, rawHTML) {
     }
     else {
         const { raw, startLine, startCol, startOffset } = sliceFragment(rawHTML, start, end);
-        const valueToken = isShorthand
-            ? attr.name
-            : attr.expression && 'start' in attr.expression && 'end' in attr.expression
-                ? sliceFragment(rawHTML, attr.expression.start, attr.expression.end).raw
-                : '';
-        token = directiveTokenizer(raw, valueToken, startLine, startCol, startOffset);
+        token = directiveTokenizer(raw, startLine, startCol, startOffset);
     }
     if (!specificBindDirective.has(token.name.raw) && /^bind:/i.test(token.name.raw)) {
         // Remove "bind:"

package/lib/directive-tokenizer.d.ts

@@ -1,2 +1,2 @@
 import type { MLASTHTMLAttr } from '@markuplint/ml-ast';
-export declare function directiveTokenizer(raw: string, rawValue: string, line: number, col: number, startOffset: number): MLASTHTMLAttr;
+export declare function directiveTokenizer(raw: string, line: number, col: number, startOffset: number): MLASTHTMLAttr;

package/lib/directive-tokenizer.js

@@ -1,5 +1,5 @@
 import { AttrState, attrTokenizer } from '@markuplint/parser-utils';
-export function directiveTokenizer(raw, rawValue, line, col, startOffset) {
+export function directiveTokenizer(raw, line, col, startOffset) {
     const nameOnly = raw.trim().startsWith('{') && raw.trim().endsWith('}');
     const directiveToken = attrTokenizer(raw, line, col, startOffset, [
         { start: '"', end: '"' },

package/lib/nodeize.js

@@ -1,6 +1,7 @@
 import { getNamespace } from '@markuplint/html-parser';
 import { detectElementType, sliceFragment, uuid, tagParser } from '@markuplint/parser-utils';
 import { attr } from './attr.js';
+import { directiveTokenizer } from './directive-tokenizer.js';
 import { parseCtrlBlock } from './parse-ctrl-block.js';
 import { traverse } from './traverse.js';
 export function nodeize(
@@ -96,7 +97,7 @@ parentNode, rawHtml, options) {
             const directives = originNode.attributes.map(a => attr(a, rawHtml)) ?? [];
             const attributes = directives.filter((d) => !('__spreadAttr' in d));
             const hasSpreadAttr = directives.some(d => '__spreadAttr' in d);
-            const tagTokens = tagParser(startTagLocation.raw, startTagLocation.startLine, startTagLocation.startCol, startTagLocation.startOffset);
+            const tagTokens = tagParser(startTagLocation.raw, startTagLocation.startLine, startTagLocation.startCol, startTagLocation.startOffset, undefined, undefined, undefined, undefined, directiveTokenizer);
             const namespace = getNamespace(originNode.name, parentNamespace);
             const startTag = {
                 uuid: uuid(),

package/lib/parse.js

@@ -39,7 +39,7 @@ export const parse = (rawCode, options) => {
         };
     }
     const nodes = traverse(ast, null, blocks.replaced, options);
-    const nodeList = restoreNode(flattenNodes(nodes, blocks.replaced), blocks);
+    const nodeList = restoreNode(flattenNodes(nodes, blocks.replaced), blocks, false);
     return {
         nodeList,
         isFragment: true,

package/lib/sveltekit-parser.d.ts

@@ -0,0 +1,2 @@
+import type { Parse } from '@markuplint/ml-ast';
+export declare const parse: Parse;

package/lib/sveltekit-parser.js

@@ -0,0 +1,14 @@
+import { parse as htmlParse } from '@markuplint/html-parser';
+import { ignoreBlock, restoreNode } from '@markuplint/parser-utils';
+export const parse = (rawCode, options) => {
+    const blocks = ignoreBlock(rawCode, [
+        {
+            type: 'sveltekit-placeholder',
+            start: '%sveltekit.',
+            end: '%',
+        },
+    ]);
+    const doc = htmlParse(blocks.replaced, options);
+    doc.nodeList = restoreNode(doc.nodeList, blocks);
+    return doc;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "4.0.0-alpha.7",
+	"version": "4.0.0-alpha.9",
 	"description": "Svelte parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -10,6 +10,9 @@
 	"exports": {
 		".": {
 			"import": "./lib/index.js"
+		},
+		"./kit": {
+			"import": "./lib/sveltekit-parser.js"
 		}
 	},
 	"types": "lib/index.d.ts",
@@ -21,10 +24,10 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0-alpha.7",
-		"@markuplint/ml-ast": "4.0.0-alpha.7",
-		"@markuplint/parser-utils": "4.0.0-alpha.7",
+		"@markuplint/html-parser": "4.0.0-alpha.9",
+		"@markuplint/ml-ast": "4.0.0-alpha.9",
+		"@markuplint/parser-utils": "4.0.0-alpha.9",
 		"svelte": "^4.2.8"
 	},
-	"gitHead": "571129bf6498541125e1e7c3907d5ed9af53459a"
+	"gitHead": "c86b754700aaf61b561a64dbd0c87424e772f619"
 }