@markuplint/svelte-parser 4.0.0-alpha.6 → 4.0.0-alpha.8

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2023 Yusuke Hirao
+Copyright (c) 2017-2024 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/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/nodeize.js

@@ -190,7 +190,7 @@ parentNode, rawHtml, options) {
                 }
             }
             // eslint-disable-next-line regexp/strict
-            const reEndTag = /{\/await}$/i;
+            const reEndTag = /{\s*\/await\s*}$/i;
             let endTag = null;
             if (reEndTag.test(raw)) {
                 const endTagRawMatched = raw.match(reEndTag);

package/lib/parse-ctrl-block.js

@@ -14,7 +14,7 @@ nextNode, options) {
     }
     const children = originNode.children ?? [];
     // eslint-disable-next-line regexp/strict
-    const reEndTag = /{\/each}$/i;
+    const reEndTag = /{\s*\/each\s*}$/i;
     const startTagEndOffset = children.length > 0 ? children[0]?.start ?? 0 : raw.replace(reEndTag, '').length + startOffset;
     const startTagLocation = sliceFragment(rawHtml, startOffset, startTagEndOffset);
     const tag = {
@@ -141,7 +141,8 @@ nextNode, options) {
     if (originNode.elseif) {
         return [tag, ...elseOrElseIfTags];
     }
-    const endTagRawMatched = raw.match('{/if}');
+    // eslint-disable-next-line regexp/strict
+    const endTagRawMatched = raw.match(/{\s*\/if\s*}/);
     if (!endTagRawMatched) {
         throw new Error('Missing the end token `{/if}`');
     }

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.6",
+	"version": "4.0.0-alpha.8",
 	"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.6",
-		"@markuplint/ml-ast": "4.0.0-alpha.6",
-		"@markuplint/parser-utils": "4.0.0-alpha.6",
-		"svelte": "^4.2.7"
+		"@markuplint/html-parser": "4.0.0-alpha.8",
+		"@markuplint/ml-ast": "4.0.0-alpha.8",
+		"@markuplint/parser-utils": "4.0.0-alpha.8",
+		"svelte": "^4.2.8"
 	},
-	"gitHead": "06e1242d274c72cf08a10a572b06ac35d1b924a4"
+	"gitHead": "5bcd25f13ff804af0d09aaabd87e495af668e6a8"
 }