@marko/language-tools 2.1.10 → 2.2.0

package/dist/index.js

@@ -2551,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);
@@ -3167,6 +3165,8 @@ function getExt(fileName) {
 
 // src/processors/marko.ts
 var import_path3 = __toESM(require("path"));
+var isRemapExtensionReg = /\.ts$/;
+var skipRemapExtensionsReg = /\.(?:[cm]?jsx?|json|marko|css|less|sass|scss|styl|stylus|pcss|postcss|sss|a?png|jpe?g|jfif|pipeg|pjp|gif|svg|ico|web[pm]|avif|mp4|ogg|mp3|wav|flac|aac|opus|woff2?|eot|[ot]tf|webmanifest|pdf|txt)$/;
 var marko_default = {
   extension: ".marko",
   create({ ts, host, configFile }) {
@@ -3177,6 +3177,45 @@ var marko_default = {
       runtimeTypes.internalTypesFile,
       runtimeTypes.markoTypesFile
     ];
+    const getJSFileIfTSExists = (source, importer) => host.fileExists(import_path3.default.join(importer, "..", `${source}.ts`)) && `${source}.js`;
+    const compileConfig = {
+      output: "source",
+      stripTypes: true,
+      sourceMaps: true,
+      babelConfig: {
+        babelrc: false,
+        configFile: false,
+        browserslistConfigFile: false,
+        plugins: [
+          {
+            visitor: {
+              // Find all relative imports in Marko template
+              // if they would map to a `.ts` file, then we convert it to a `.js` file for the output.
+              "ImportDeclaration|ExportNamedDeclaration"(decl) {
+                var _a;
+                const { node } = decl;
+                const value = (_a = node.source) == null ? void 0 : _a.value;
+                const importKind = "importKind" in node ? node.importKind : void 0;
+                if ((value == null ? void 0 : value[0]) === "." && (!importKind || importKind === "value") && !skipRemapExtensionsReg.test(value)) {
+                  const filename = decl.hub.file.opts.filename;
+                  const remap = isRemapExtensionReg.test(value) ? `${value.slice(0, -2)}js` : getJSFileIfTSExists(value, filename) || getJSFileIfTSExists(`${value}/index`, filename);
+                  if (remap) {
+                    node.source.value = remap;
+                  }
+                }
+              }
+            }
+          }
+        ],
+        caller: {
+          name: "@marko/type-check",
+          supportsStaticESM: true,
+          supportsDynamicImport: true,
+          supportsTopLevelAwait: true,
+          supportsExportNamespaceFrom: true
+        }
+      }
+    };
     if (runtimeTypes.markoRunTypesFile) {
       rootNames.push(runtimeTypes.markoRunTypesFile);
     }
@@ -3212,11 +3251,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 }) {
@@ -3301,7 +3336,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

@@ -2519,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);
@@ -3135,6 +3133,8 @@ function getExt(fileName) {
 
 // src/processors/marko.ts
 import path3 from "path";
+var isRemapExtensionReg = /\.ts$/;
+var skipRemapExtensionsReg = /\.(?:[cm]?jsx?|json|marko|css|less|sass|scss|styl|stylus|pcss|postcss|sss|a?png|jpe?g|jfif|pipeg|pjp|gif|svg|ico|web[pm]|avif|mp4|ogg|mp3|wav|flac|aac|opus|woff2?|eot|[ot]tf|webmanifest|pdf|txt)$/;
 var marko_default = {
   extension: ".marko",
   create({ ts, host, configFile }) {
@@ -3145,6 +3145,45 @@ var marko_default = {
       runtimeTypes.internalTypesFile,
       runtimeTypes.markoTypesFile
     ];
+    const getJSFileIfTSExists = (source, importer) => host.fileExists(path3.join(importer, "..", `${source}.ts`)) && `${source}.js`;
+    const compileConfig = {
+      output: "source",
+      stripTypes: true,
+      sourceMaps: true,
+      babelConfig: {
+        babelrc: false,
+        configFile: false,
+        browserslistConfigFile: false,
+        plugins: [
+          {
+            visitor: {
+              // Find all relative imports in Marko template
+              // if they would map to a `.ts` file, then we convert it to a `.js` file for the output.
+              "ImportDeclaration|ExportNamedDeclaration"(decl) {
+                var _a;
+                const { node } = decl;
+                const value = (_a = node.source) == null ? void 0 : _a.value;
+                const importKind = "importKind" in node ? node.importKind : void 0;
+                if ((value == null ? void 0 : value[0]) === "." && (!importKind || importKind === "value") && !skipRemapExtensionsReg.test(value)) {
+                  const filename = decl.hub.file.opts.filename;
+                  const remap = isRemapExtensionReg.test(value) ? `${value.slice(0, -2)}js` : getJSFileIfTSExists(value, filename) || getJSFileIfTSExists(`${value}/index`, filename);
+                  if (remap) {
+                    node.source.value = remap;
+                  }
+                }
+              }
+            }
+          }
+        ],
+        caller: {
+          name: "@marko/type-check",
+          supportsStaticESM: true,
+          supportsDynamicImport: true,
+          supportsTopLevelAwait: true,
+          supportsExportNamespaceFrom: true
+        }
+      }
+    };
     if (runtimeTypes.markoRunTypesFile) {
       rootNames.push(runtimeTypes.markoRunTypesFile);
     }
@@ -3180,11 +3219,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 }) {
@@ -3269,7 +3304,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/processors/index.d.ts

@@ -32,5 +32,5 @@ export interface PrintContext {
     formatSettings: Required<ts.FormatCodeSettings>;
 }
 export declare const extensions: `.${string}`[];
-export declare function create(options: Parameters<ProcessorConfig["create"]>[0]): Record<`.${string}`, Processor>;
+export declare function create(options: CreateProcessorOptions): Record<`.${string}`, Processor>;
 export declare function has(fileName: string): boolean;

package/package.json

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