@marko/language-tools 2.1.11 → 2.2.1

package/dist/index.js

@@ -1533,14 +1533,17 @@ var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 function getComponentFilename(from) {
   const dir = import_path.default.dirname(from);
-  const nameNoExt = import_path.default.basename(from, ".marko");
+  let nameNoExt = import_path.default.basename(from, ".marko");
+  if (nameNoExt.endsWith(".d")) {
+    nameNoExt = nameNoExt.slice(0, -2);
+  }
   const isEntry = nameNoExt === "index";
-  const componentFull = `${nameNoExt}.component.`;
-  const componentBrowserFull = `${nameNoExt}.component-browser.`;
-  const componentPartial = isEntry ? "component." : void 0;
-  const componentBrowserPartial = isEntry ? "component-browser." : void 0;
+  const fileMatch = `(${nameNoExt.replace(/\./g, "\\.")}\\.${isEntry ? "|" : ""})`;
+  const componentMatch = new RegExp(
+    `^${fileMatch}component(-browser)?\\.\\w+$`
+  );
   for (const entry of tryReaddirSync(dir)) {
-    if (entry !== from && (isEntry && entry.startsWith(componentBrowserPartial) || entry.startsWith(componentPartial)) || entry.startsWith(componentBrowserFull) || entry.startsWith(componentFull)) {
+    if (componentMatch.test(entry)) {
       return import_path.default.join(dir, entry);
     }
   }
@@ -3165,6 +3168,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 }) {
@@ -3175,6 +3180,7 @@ 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,
@@ -3183,6 +3189,27 @@ var marko_default = {
         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,

package/dist/index.mjs

@@ -1501,14 +1501,17 @@ import fs from "fs";
 import path from "path";
 function getComponentFilename(from) {
   const dir = path.dirname(from);
-  const nameNoExt = path.basename(from, ".marko");
+  let nameNoExt = path.basename(from, ".marko");
+  if (nameNoExt.endsWith(".d")) {
+    nameNoExt = nameNoExt.slice(0, -2);
+  }
   const isEntry = nameNoExt === "index";
-  const componentFull = `${nameNoExt}.component.`;
-  const componentBrowserFull = `${nameNoExt}.component-browser.`;
-  const componentPartial = isEntry ? "component." : void 0;
-  const componentBrowserPartial = isEntry ? "component-browser." : void 0;
+  const fileMatch = `(${nameNoExt.replace(/\./g, "\\.")}\\.${isEntry ? "|" : ""})`;
+  const componentMatch = new RegExp(
+    `^${fileMatch}component(-browser)?\\.\\w+$`
+  );
   for (const entry of tryReaddirSync(dir)) {
-    if (entry !== from && (isEntry && entry.startsWith(componentBrowserPartial) || entry.startsWith(componentPartial)) || entry.startsWith(componentBrowserFull) || entry.startsWith(componentFull)) {
+    if (componentMatch.test(entry)) {
       return path.join(dir, entry);
     }
   }
@@ -3133,6 +3136,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 }) {
@@ -3143,6 +3148,7 @@ 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,
@@ -3151,6 +3157,27 @@ var marko_default = {
         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,

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.11",
+  "version": "2.2.1",
   "bugs": "https://github.com/marko-js/language-server/issues/new?template=Bug_report.md",
   "peerDependencies": {
     "@marko/compiler": "^5.28.4"