@marko/language-tools 2.1.9 → 2.1.11

package/dist/index.js

@@ -1677,6 +1677,7 @@ var REG_OBJECT_PROPERTY = /^[_$a-z][_$a-z0-9]*$/i;
 var REG_COMMENT_PRAGMA = /\/\/(?:\s*@ts-|\/\s*<)/y;
 var IF_TAG_ALTERNATES = /* @__PURE__ */ new WeakMap();
 var WROTE_COMMENT = /* @__PURE__ */ new WeakSet();
+var START_OF_FILE = { start: 0, end: 0 };
 var ScriptLang = /* @__PURE__ */ ((ScriptLang2) => {
   ScriptLang2["js"] = "js";
   ScriptLang2["ts"] = "ts";
@@ -1907,6 +1908,7 @@ function ${templateName}() {
       -1
     )}>${renderAndReturn};` : `(): () => <${internalInputWithExtends}>${renderAndReturn};`}
 }>`;
+    this.#extractor.copy(START_OF_FILE);
     if (this.#scriptLang === "ts" /* ts */) {
       this.#extractor.write(`export default new (
   class Template extends ${templateOverrideClass} {}
@@ -2549,9 +2551,7 @@ const attrTags = ${varShared(
       this.#extractor.write(SEP_COMMA_NEW_LINE);
     }
     if (tag.type === 16 /* AttrTag */) {
-      this.#extractor.write(
-        `[Symbol.iterator]: ${varShared("any")}${SEP_COMMA_NEW_LINE}`
-      );
+      this.#extractor.write("[/*").copy(tag.name).write(`*/Symbol.iterator]: ${varShared("any")}${SEP_COMMA_NEW_LINE}`);
     }
     if (!hasInput) {
       this.#writeTagNameComment(tag);
@@ -3175,6 +3175,23 @@ var marko_default = {
       runtimeTypes.internalTypesFile,
       runtimeTypes.markoTypesFile
     ];
+    const compileConfig = {
+      output: "source",
+      stripTypes: true,
+      sourceMaps: true,
+      babelConfig: {
+        babelrc: false,
+        configFile: false,
+        browserslistConfigFile: false,
+        caller: {
+          name: "@marko/type-check",
+          supportsStaticESM: true,
+          supportsDynamicImport: true,
+          supportsTopLevelAwait: true,
+          supportsExportNamespaceFrom: true
+        }
+      }
+    };
     if (runtimeTypes.markoRunTypesFile) {
       rootNames.push(runtimeTypes.markoRunTypesFile);
     }
@@ -3210,11 +3227,7 @@ var marko_default = {
       print({ extracted: { parsed } }) {
         const { code, map } = getCompiler(
           import_path3.default.dirname(parsed.filename)
-        ).compileSync(parsed.code, parsed.filename, {
-          output: "source",
-          stripTypes: true,
-          sourceMaps: true
-        });
+        ).compileSync(parsed.code, parsed.filename, compileConfig);
         return { code, map };
       },
       printTypes({ printer, typeChecker, sourceFile, formatSettings }) {
@@ -3299,7 +3312,7 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isIndexedAccessTypeNode(statement.type) && ts.isTypeReferenceNode(statement.type.objectType) && ts.isIdentifier(statement.type.objectType.typeName) && statement.type.objectType.typeName.escapedText === "Component" && ts.isLiteralTypeNode(statement.type.indexType) && ts.isStringLiteral(statement.type.indexType.literal) && statement.type.indexType.literal.text === "input";
     }
     function isExportEmptyInputType(statement) {
-      return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.typeParameters && statement.members.length === 0;
+      return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
       return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && statement.exportClause.elements[0].name.escapedText === "Component";

package/dist/index.mjs

@@ -1645,6 +1645,7 @@ var REG_OBJECT_PROPERTY = /^[_$a-z][_$a-z0-9]*$/i;
 var REG_COMMENT_PRAGMA = /\/\/(?:\s*@ts-|\/\s*<)/y;
 var IF_TAG_ALTERNATES = /* @__PURE__ */ new WeakMap();
 var WROTE_COMMENT = /* @__PURE__ */ new WeakSet();
+var START_OF_FILE = { start: 0, end: 0 };
 var ScriptLang = /* @__PURE__ */ ((ScriptLang2) => {
   ScriptLang2["js"] = "js";
   ScriptLang2["ts"] = "ts";
@@ -1875,6 +1876,7 @@ function ${templateName}() {
       -1
     )}>${renderAndReturn};` : `(): () => <${internalInputWithExtends}>${renderAndReturn};`}
 }>`;
+    this.#extractor.copy(START_OF_FILE);
     if (this.#scriptLang === "ts" /* ts */) {
       this.#extractor.write(`export default new (
   class Template extends ${templateOverrideClass} {}
@@ -2517,9 +2519,7 @@ const attrTags = ${varShared(
       this.#extractor.write(SEP_COMMA_NEW_LINE);
     }
     if (tag.type === 16 /* AttrTag */) {
-      this.#extractor.write(
-        `[Symbol.iterator]: ${varShared("any")}${SEP_COMMA_NEW_LINE}`
-      );
+      this.#extractor.write("[/*").copy(tag.name).write(`*/Symbol.iterator]: ${varShared("any")}${SEP_COMMA_NEW_LINE}`);
     }
     if (!hasInput) {
       this.#writeTagNameComment(tag);
@@ -3143,6 +3143,23 @@ var marko_default = {
       runtimeTypes.internalTypesFile,
       runtimeTypes.markoTypesFile
     ];
+    const compileConfig = {
+      output: "source",
+      stripTypes: true,
+      sourceMaps: true,
+      babelConfig: {
+        babelrc: false,
+        configFile: false,
+        browserslistConfigFile: false,
+        caller: {
+          name: "@marko/type-check",
+          supportsStaticESM: true,
+          supportsDynamicImport: true,
+          supportsTopLevelAwait: true,
+          supportsExportNamespaceFrom: true
+        }
+      }
+    };
     if (runtimeTypes.markoRunTypesFile) {
       rootNames.push(runtimeTypes.markoRunTypesFile);
     }
@@ -3178,11 +3195,7 @@ var marko_default = {
       print({ extracted: { parsed } }) {
         const { code, map } = getCompiler(
           path3.dirname(parsed.filename)
-        ).compileSync(parsed.code, parsed.filename, {
-          output: "source",
-          stripTypes: true,
-          sourceMaps: true
-        });
+        ).compileSync(parsed.code, parsed.filename, compileConfig);
         return { code, map };
       },
       printTypes({ printer, typeChecker, sourceFile, formatSettings }) {
@@ -3267,7 +3280,7 @@ var marko_default = {
       return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isIndexedAccessTypeNode(statement.type) && ts.isTypeReferenceNode(statement.type.objectType) && ts.isIdentifier(statement.type.objectType.typeName) && statement.type.objectType.typeName.escapedText === "Component" && ts.isLiteralTypeNode(statement.type.indexType) && ts.isStringLiteral(statement.type.indexType.literal) && statement.type.indexType.literal.text === "input";
     }
     function isExportEmptyInputType(statement) {
-      return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.typeParameters && statement.members.length === 0;
+      return ts.isTypeAliasDeclaration(statement) && statement.name.escapedText === "Input" && ts.isTypeLiteralNode(statement.type) && !statement.typeParameters && statement.type.members.length === 0 || ts.isInterfaceDeclaration(statement) && statement.name.escapedText === "Input" && !statement.heritageClauses && !statement.typeParameters && statement.members.length === 0;
     }
     function isExportComponentType(statement) {
       return ts.isExportDeclaration(statement) && statement.exportClause && ts.isNamedExports(statement.exportClause) && statement.exportClause.elements.length === 1 && statement.exportClause.elements[0].name.escapedText === "Component";

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.1.9",
+  "version": "2.1.11",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"
   },
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.22.20",
-    "@babel/parser": "^7.23.5",
+    "@babel/parser": "^7.23.6",
     "htmljs-parser": "^5.5.1",
     "strip-json-comments": "^3.1.1",
     "relative-import-path": "^1.0.0"
@@ -20,7 +20,7 @@
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__helper-validator-identifier": "^7.15.2",
     "@typescript/vfs": "^1.5.0",
-    "marko": "^5.32.0",
+    "marko": "^5.32.1",
     "mitata": "^0.1.6",
     "tsx": "^4.6.2"
   },