@marko/language-tools 2.4.7 → 2.5.0

package/dist/index.js

@@ -388,9 +388,18 @@ var Builder = class {
         case "source":
         case "track":
         case "wbr":
+        case "const":
+        case "debug":
+        case "id":
+        case "let":
+        case "lifecycle":
+        case "log":
+        case "return":
           bodyType = import_htmljs_parser.TagType.void;
           break;
         case "html-comment":
+        case "html-script":
+        case "html-style":
         case "script":
         case "textarea":
           bodyType = import_htmljs_parser.TagType.text;
@@ -1176,7 +1185,22 @@ function crawlProgramScope(parsed, scriptParser) {
                 }
               }
             }
-            visit(child.body, bodyScope);
+            if (child.nameText === "script" && child.body) {
+              checkForMutations(
+                parentScope,
+                scriptParser.expressionAt(
+                  child.body[0].start - "()=>{\n".length,
+                  `()=>{
+${read({
+                    start: child.body[0].start,
+                    end: child.body[child.body.length - 1].end
+                  })}
+}`
+                )
+              );
+            } else {
+              visit(child.body, bodyScope);
+            }
             Scopes.set(child.body, bodyScope);
           }
           if (child.attrs) {
@@ -2649,9 +2673,12 @@ const attrTags = ${varShared(
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
-    const body = this.#processBody(tag);
+    const isScript = tag.nameText === "script";
+    const body = !isScript ? this.#processBody(tag) : void 0;
     let hasRenderBody = false;
-    if (body) {
+    if (isScript) {
+      hasRenderBody = !!tag.body;
+    } else if (body) {
       hasInput = true;
       this.#writeAttrTags(body, false, nestedTagType);
       hasRenderBody = body.renderBody !== void 0;
@@ -2672,15 +2699,25 @@ const attrTags = ${varShared(
         this.#extractor.write(`(() => {
 `);
       }
-      const localBindings = getHoistSources(tag);
-      const didReturn = (body == null ? void 0 : body.renderBody) && this.#writeChildren(tag, body.renderBody);
+      let didReturn = false;
+      if (isScript) {
+        if (tag.body) {
+          this.#copyWithMutationsReplaced({
+            start: tag.body[0].start,
+            end: tag.body[tag.body.length - 1].end
+          });
+          didReturn = this.#writeChildren(tag, []);
+        }
+      } else if (body == null ? void 0 : body.renderBody) {
+        didReturn = this.#writeChildren(tag, body.renderBody);
+      }
       if (!tag.params) {
         this.#extractor.write(`return () => {
 `);
       }
       this.#writeReturn(
         didReturn ? `${varLocal("return")}.return` : void 0,
-        localBindings
+        getHoistSources(tag)
       );
       if (tag.params) {
         this.#extractor.write("})");

package/dist/index.mjs

@@ -349,9 +349,18 @@ var Builder = class {
         case "source":
         case "track":
         case "wbr":
+        case "const":
+        case "debug":
+        case "id":
+        case "let":
+        case "lifecycle":
+        case "log":
+        case "return":
           bodyType = TagType.void;
           break;
         case "html-comment":
+        case "html-script":
+        case "html-style":
         case "script":
         case "textarea":
           bodyType = TagType.text;
@@ -1137,7 +1146,22 @@ function crawlProgramScope(parsed, scriptParser) {
                 }
               }
             }
-            visit(child.body, bodyScope);
+            if (child.nameText === "script" && child.body) {
+              checkForMutations(
+                parentScope,
+                scriptParser.expressionAt(
+                  child.body[0].start - "()=>{\n".length,
+                  `()=>{
+${read({
+                    start: child.body[0].start,
+                    end: child.body[child.body.length - 1].end
+                  })}
+}`
+                )
+              );
+            } else {
+              visit(child.body, bodyScope);
+            }
             Scopes.set(child.body, bodyScope);
           }
           if (child.attrs) {
@@ -2613,9 +2637,12 @@ const attrTags = ${varShared(
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
-    const body = this.#processBody(tag);
+    const isScript = tag.nameText === "script";
+    const body = !isScript ? this.#processBody(tag) : void 0;
     let hasRenderBody = false;
-    if (body) {
+    if (isScript) {
+      hasRenderBody = !!tag.body;
+    } else if (body) {
       hasInput = true;
       this.#writeAttrTags(body, false, nestedTagType);
       hasRenderBody = body.renderBody !== void 0;
@@ -2636,15 +2663,25 @@ const attrTags = ${varShared(
         this.#extractor.write(`(() => {
 `);
       }
-      const localBindings = getHoistSources(tag);
-      const didReturn = (body == null ? void 0 : body.renderBody) && this.#writeChildren(tag, body.renderBody);
+      let didReturn = false;
+      if (isScript) {
+        if (tag.body) {
+          this.#copyWithMutationsReplaced({
+            start: tag.body[0].start,
+            end: tag.body[tag.body.length - 1].end
+          });
+          didReturn = this.#writeChildren(tag, []);
+        }
+      } else if (body == null ? void 0 : body.renderBody) {
+        didReturn = this.#writeChildren(tag, body.renderBody);
+      }
       if (!tag.params) {
         this.#extractor.write(`return () => {
 `);
       }
       this.#writeReturn(
         didReturn ? `${varLocal("return")}.return` : void 0,
-        localBindings
+        getHoistSources(tag)
       );
       if (tag.params) {
         this.#extractor.write("})");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.4.7",
+  "version": "2.5.0",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"