@marko/language-tools 2.5.0 → 2.5.2

package/dist/extractors/script/util/is-text-only-script.d.ts

@@ -0,0 +1,7 @@
+import { type Node, Repeated } from "../../../parser";
+export declare function isTextOnlyScript(tag: Node.ParentTag): tag is Node.Tag & {
+    nameText: "script";
+    args: undefined;
+    attrs: undefined;
+    body: Repeated<Node.Text>;
+};

package/dist/index.js

@@ -883,9 +883,9 @@ function getAttributeValueType(value) {
   }
   if (
     // double quote string
-    /^"(?:[^"\\]+|\\.)*"$/.test(value) || // single quote string
-    /^'(?:[^'\\]+|\\.)*'$/.test(value) || // template literal without any interpolations
-    /^`(?:[^`\\$]+|\\.|\$(?!\{))*`$/.test(value)
+    /^"(?:[^"\\]|\\.)*"$/.test(value) || // single quote string
+    /^'(?:[^'\\]|\\.)*'$/.test(value) || // template literal without any interpolations
+    /^`(?:[^`\\$]|\\.|\$(?!\{))*`$/.test(value)
   ) {
     return 2 /* QuotedString */;
   } else if (
@@ -1055,6 +1055,21 @@ var import_relative_import_path = require("relative-import-path");
 
 // src/extractors/script/util/attach-scopes.ts
 var t = __toESM(require("@babel/types"));
+
+// src/extractors/script/util/is-text-only-script.ts
+function isTextOnlyScript(tag) {
+  if (tag.nameText !== "script" || tag.args || tag.attrs || !tag.body) {
+    return false;
+  }
+  for (const child of tag.body) {
+    if (child.type !== 17 /* Text */) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// src/extractors/script/util/attach-scopes.ts
 var ATTR_UNAMED = "value";
 var Scopes = /* @__PURE__ */ new WeakMap();
 var BoundAttrMemberExpressionStartOffsets = /* @__PURE__ */ new WeakMap();
@@ -1185,7 +1200,7 @@ function crawlProgramScope(parsed, scriptParser) {
                 }
               }
             }
-            if (child.nameText === "script" && child.body) {
+            if (isTextOnlyScript(child)) {
               checkForMutations(
                 parentScope,
                 scriptParser.expressionAt(
@@ -1691,7 +1706,7 @@ function isTemplateTag(ts, tag) {
 
 // src/extractors/script/util/runtime-overrides.ts
 var RuntimeOverloads = /* @__PURE__ */ new Map();
-var commentsReg = /\/\*(?:[^*]+|\*[^/])*\*\//gm;
+var commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
 var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)/gm;
 var overrideBlockReg = /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
 function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
@@ -1743,7 +1758,7 @@ function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
 }
 
 // src/extractors/script/util/script-parser.ts
-var import_parser5 = require("@babel/parser");
+var import_parser6 = require("@babel/parser");
 var plugins = [
   "exportDefaultFrom",
   "importAssertions",
@@ -1757,7 +1772,7 @@ var ScriptParser = class {
   statementAt(startIndex, src) {
     const pos = this.#parsed.positionAt(startIndex);
     try {
-      return (0, import_parser5.parse)(src, {
+      return (0, import_parser6.parse)(src, {
         plugins,
         startIndex,
         startLine: pos.line + 1,
@@ -1778,7 +1793,7 @@ var ScriptParser = class {
   expressionAt(startIndex, src) {
     const pos = this.#parsed.positionAt(startIndex);
     try {
-      return (0, import_parser5.parseExpression)(src, {
+      return (0, import_parser6.parseExpression)(src, {
         plugins,
         startIndex,
         startLine: pos.line + 1,
@@ -1809,7 +1824,7 @@ var ATTR_UNAMED2 = "value";
 var REG_EXT = /(?<=[/\\][^/\\]+)\.[^.]+$/;
 var REG_BLOCK = /\s*{/y;
 var REG_NEW_LINE = /^|(\r?\n)/g;
-var REG_ATTR_ARG_LITERAL = /(?<=\s*)(["'])((?:[^"'\\]+|\\.|(?!\1))*)\1\s*([,)])/my;
+var REG_ATTR_ARG_LITERAL = /(?<=\s*)(["'])((?:[^"'\\]|\\.|(?!\1))*)\1\s*([,)])/my;
 var REG_TAG_IMPORT = /(?<=(['"]))<([^'">]+)>(?=\1)/;
 var REG_INPUT_TYPE = /\s*(interface|type)\s+Input\b/y;
 var REG_OBJECT_PROPERTY = /^[_$a-z][_$a-z0-9]*$/i;
@@ -2673,17 +2688,25 @@ const attrTags = ${varShared(
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
-    const isScript = tag.nameText === "script";
-    const body = !isScript ? this.#processBody(tag) : void 0;
+    const isScript = isTextOnlyScript(tag);
     let hasRenderBody = false;
+    let body;
     if (isScript) {
-      hasRenderBody = !!tag.body;
-    } else if (body) {
-      hasInput = true;
-      this.#writeAttrTags(body, false, nestedTagType);
-      hasRenderBody = body.renderBody !== void 0;
-    } else if (tag.close) {
-      hasRenderBody = true;
+      this.#extractor.write("value(){");
+      this.#copyWithMutationsReplaced({
+        start: tag.body[0].start,
+        end: tag.body[tag.body.length - 1].end
+      });
+      this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
+    } else {
+      body = this.#processBody(tag);
+      if (body) {
+        hasInput = true;
+        this.#writeAttrTags(body, false, nestedTagType);
+        hasRenderBody = body.renderBody !== void 0;
+      } else if (tag.close) {
+        hasRenderBody = true;
+      }
     }
     if (tag.params || hasRenderBody) {
       this.#extractor.write('["renderBody"');
@@ -2700,15 +2723,7 @@ const attrTags = ${varShared(
 `);
       }
       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) {
+      if (body == null ? void 0 : body.renderBody) {
         didReturn = this.#writeChildren(tag, body.renderBody);
       }
       if (!tag.params) {

package/dist/index.mjs

@@ -844,9 +844,9 @@ function getAttributeValueType(value) {
   }
   if (
     // double quote string
-    /^"(?:[^"\\]+|\\.)*"$/.test(value) || // single quote string
-    /^'(?:[^'\\]+|\\.)*'$/.test(value) || // template literal without any interpolations
-    /^`(?:[^`\\$]+|\\.|\$(?!\{))*`$/.test(value)
+    /^"(?:[^"\\]|\\.)*"$/.test(value) || // single quote string
+    /^'(?:[^'\\]|\\.)*'$/.test(value) || // template literal without any interpolations
+    /^`(?:[^`\\$]|\\.|\$(?!\{))*`$/.test(value)
   ) {
     return 2 /* QuotedString */;
   } else if (
@@ -1016,6 +1016,21 @@ import { relativeImportPath } from "relative-import-path";
 
 // src/extractors/script/util/attach-scopes.ts
 import * as t from "@babel/types";
+
+// src/extractors/script/util/is-text-only-script.ts
+function isTextOnlyScript(tag) {
+  if (tag.nameText !== "script" || tag.args || tag.attrs || !tag.body) {
+    return false;
+  }
+  for (const child of tag.body) {
+    if (child.type !== 17 /* Text */) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// src/extractors/script/util/attach-scopes.ts
 var ATTR_UNAMED = "value";
 var Scopes = /* @__PURE__ */ new WeakMap();
 var BoundAttrMemberExpressionStartOffsets = /* @__PURE__ */ new WeakMap();
@@ -1146,7 +1161,7 @@ function crawlProgramScope(parsed, scriptParser) {
                 }
               }
             }
-            if (child.nameText === "script" && child.body) {
+            if (isTextOnlyScript(child)) {
               checkForMutations(
                 parentScope,
                 scriptParser.expressionAt(
@@ -1652,7 +1667,7 @@ function isTemplateTag(ts, tag) {
 
 // src/extractors/script/util/runtime-overrides.ts
 var RuntimeOverloads = /* @__PURE__ */ new Map();
-var commentsReg = /\/\*(?:[^*]+|\*[^/])*\*\//gm;
+var commentsReg = /\/\*(?:[^*]|\*[^/])*\*\//gm;
 var replaceTokensReg = /\babstract\s+(\w+)|Marko\.(TemplateInput(?:<[^>]+>)?|Component)/gm;
 var overrideBlockReg = /\/\*[*\s]*@marko-overload-start[*\s]*\*\/([\s\S]+)\/\*[*\s]*@marko-overload-end[*\s]*\*\//g;
 function getRuntimeOverrides(runtimeTypes, generics, applyGenerics) {
@@ -1773,7 +1788,7 @@ var ATTR_UNAMED2 = "value";
 var REG_EXT = /(?<=[/\\][^/\\]+)\.[^.]+$/;
 var REG_BLOCK = /\s*{/y;
 var REG_NEW_LINE = /^|(\r?\n)/g;
-var REG_ATTR_ARG_LITERAL = /(?<=\s*)(["'])((?:[^"'\\]+|\\.|(?!\1))*)\1\s*([,)])/my;
+var REG_ATTR_ARG_LITERAL = /(?<=\s*)(["'])((?:[^"'\\]|\\.|(?!\1))*)\1\s*([,)])/my;
 var REG_TAG_IMPORT = /(?<=(['"]))<([^'">]+)>(?=\1)/;
 var REG_INPUT_TYPE = /\s*(interface|type)\s+Input\b/y;
 var REG_OBJECT_PROPERTY = /^[_$a-z][_$a-z0-9]*$/i;
@@ -2637,17 +2652,25 @@ const attrTags = ${varShared(
     if (this.#writeAttrs(tag)) {
       hasInput = true;
     }
-    const isScript = tag.nameText === "script";
-    const body = !isScript ? this.#processBody(tag) : void 0;
+    const isScript = isTextOnlyScript(tag);
     let hasRenderBody = false;
+    let body;
     if (isScript) {
-      hasRenderBody = !!tag.body;
-    } else if (body) {
-      hasInput = true;
-      this.#writeAttrTags(body, false, nestedTagType);
-      hasRenderBody = body.renderBody !== void 0;
-    } else if (tag.close) {
-      hasRenderBody = true;
+      this.#extractor.write("value(){");
+      this.#copyWithMutationsReplaced({
+        start: tag.body[0].start,
+        end: tag.body[tag.body.length - 1].end
+      });
+      this.#extractor.write(`}${SEP_COMMA_NEW_LINE}`);
+    } else {
+      body = this.#processBody(tag);
+      if (body) {
+        hasInput = true;
+        this.#writeAttrTags(body, false, nestedTagType);
+        hasRenderBody = body.renderBody !== void 0;
+      } else if (tag.close) {
+        hasRenderBody = true;
+      }
     }
     if (tag.params || hasRenderBody) {
       this.#extractor.write('["renderBody"');
@@ -2664,15 +2687,7 @@ const attrTags = ${varShared(
 `);
       }
       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) {
+      if (body == null ? void 0 : body.renderBody) {
         didReturn = this.#writeChildren(tag, body.renderBody);
       }
       if (!tag.params) {

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
-    "@babel/parser": "^7.26.2",
+    "@babel/parser": "^7.26.3",
     "@luxass/strip-json-comments": "^1.3.2",
     "htmljs-parser": "^5.5.3",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@marko/compiler": "^5.38.0",
-    "@marko/translator-default": "^6.1.0",
+    "@marko/compiler": "^5.38.3",
+    "@marko/translator-default": "^6.1.2",
     "@types/babel__code-frame": "^7.0.6",
     "@typescript/vfs": "^1.6.0",
-    "marko": "^5.36.0",
-    "mitata": "^1.0.16",
+    "marko": "^5.36.3",
+    "mitata": "^1.0.20",
     "tsx": "^4.19.2"
   },
   "exports": {