@marko/language-tools 2.5.59 → 2.5.61

package/dist/index.d.ts

@@ -6,4 +6,5 @@ export * as Processors from "./processors";
 export { type Extracted } from "./util/extractor";
 export { getExt } from "./util/get-ext";
 export { isDefinitionFile } from "./util/is-definition-file";
+export { normalizePath } from "./util/normalize-path";
 export * as Project from "./util/project";

package/dist/index.js

@@ -44,6 +44,7 @@ __export(index_exports, {
   getPosition: () => import_htmljs_parser2.getPosition,
   isControlFlowTag: () => isControlFlowTag,
   isDefinitionFile: () => isDefinitionFile,
+  normalizePath: () => normalizePath,
   parse: () => parse
 });
 module.exports = __toCommonJS(index_exports);
@@ -132,6 +133,11 @@ function childAtOffset(offset, children) {
   return offset > child.start && offset <= child.end ? child : void 0;
 }
 
+// src/util/normalize-path.ts
+var import_path = __toESM(require("path"));
+var sepReg = /\//g;
+var normalizePath = import_path.default.sep === "/" ? (filename) => filename : (filename) => filename.replace(sepReg, import_path.default.sep);
+
 // src/parser.ts
 var import_htmljs_parser2 = require("htmljs-parser");
 var styleBlockReg = /((?:\.[^\s\\/:*?"<>|({]+)*)\s*\{/y;
@@ -178,7 +184,7 @@ function parse(code, filename = "index.marko") {
     locationAt: parser.locationAt,
     positionAt: parser.positionAt,
     nodeAt: (offset) => getNodeAtOffset(offset, program),
-    filename,
+    filename: normalizePath(filename),
     program,
     code
   };
@@ -1816,10 +1822,10 @@ function byStart(a, b) {
 
 // src/extractors/script/util/get-component-filename.ts
 var import_fs = __toESM(require("fs"));
-var import_path = __toESM(require("path"));
+var import_path2 = __toESM(require("path"));
 function getComponentFilename(from) {
-  const dir = import_path.default.dirname(from);
-  let nameNoExt = import_path.default.basename(from, ".marko");
+  const dir = import_path2.default.dirname(from);
+  let nameNoExt = import_path2.default.basename(from, ".marko");
   if (nameNoExt.endsWith(".d")) {
     nameNoExt = nameNoExt.slice(0, -2);
   }
@@ -1830,7 +1836,7 @@ function getComponentFilename(from) {
   );
   for (const entry of tryReaddirSync(dir)) {
     if (componentMatch.test(entry)) {
-      return import_path.default.join(dir, entry);
+      return import_path2.default.join(dir, entry);
     }
   }
 }
@@ -3364,6 +3370,15 @@ ${isMutatedVar(tag.parent, valueLiteral) ? varLocal(`change__${valueLiteral}.`)
             })
           };
         }
+      } else if (node.type === 24 /* Import */) {
+        const imported = this.#ast.import(node);
+        if (imported) {
+          for (const specifier of imported.specifiers) {
+            if (specifier.local.name === "Input") {
+              return { typeParameters: void 0 };
+            }
+          }
+        }
       }
     }
   }
@@ -3461,17 +3476,17 @@ ${isMutatedVar(tag.parent, valueLiteral) ? varLocal(`change__${valueLiteral}.`)
     return ((_a = this.#lookup.getTag(nameText)) == null ? void 0 : _a.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
   }
   #getAttrTagPath(tag) {
-    let path4 = `"${this.#getAttrTagName(tag)}"`;
+    let path5 = `"${this.#getAttrTagName(tag)}"`;
     let curTag = tag.parent;
     while (curTag) {
       if (curTag.type === 16 /* AttrTag */) {
-        path4 = `"${this.#getAttrTagName(curTag)}",${path4}`;
+        path5 = `"${this.#getAttrTagName(curTag)}",${path5}`;
       } else if (!isControlFlowTag(curTag)) {
         break;
       }
       curTag = curTag.parent;
     }
-    return path4;
+    return path5;
   }
   #getTagInputType(tag) {
     if (tag.type === 16 /* AttrTag */) {
@@ -3607,7 +3622,7 @@ function isValueAttribute(attr) {
 function resolveTagImport(from, def) {
   const filename = resolveTagFile(def);
   if (filename) {
-    return from ? (0, import_relative_import_path.relativeImportPath)(from, filename) : filename;
+    return from ? (0, import_relative_import_path.relativeImportPath)(from, normalizePath(filename)) : filename;
   }
 }
 function resolveTagFile(def) {
@@ -3718,7 +3733,7 @@ function getExt(fileName) {
 }
 
 // src/processors/marko.ts
-var import_path3 = __toESM(require("path"));
+var import_path4 = __toESM(require("path"));
 
 // src/util/project.ts
 var project_exports = {};
@@ -3735,7 +3750,7 @@ __export(project_exports, {
 });
 var import_strip_json_comments = require("@luxass/strip-json-comments");
 var import_module = require("module");
-var import_path2 = __toESM(require("path"));
+var import_path3 = __toESM(require("path"));
 var defaultTypeLibs = {};
 var defaultMeta;
 var ignoreErrors = (_err) => {
@@ -3762,11 +3777,11 @@ function getTypeLibs(rootDir, ts, host) {
   const resolveTypeCompilerOptions = {
     moduleResolution: ts.ModuleResolutionKind.Bundler
   };
-  const markoRunGeneratedTypesFile = import_path2.default.join(
+  const markoRunGeneratedTypesFile = import_path3.default.join(
     rootDir,
     ".marko-run/routes.d.ts"
   );
-  const resolveFromFile = import_path2.default.join(rootDir, "_.d.ts");
+  const resolveFromFile = import_path3.default.join(rootDir, "_.d.ts");
   const internalTypesFile = defaultTypeLibs.internalTypesFile || ((_a = ts.resolveTypeReferenceDirective(
     "@marko/language-tools/marko.internal.d.ts",
     resolveFromFile,
@@ -3804,7 +3819,7 @@ function getTypeLibs(rootDir, ts, host) {
 }
 function getScriptLang(fileName, defaultScriptLang, ts, host) {
   if (fileName.endsWith(".d.marko")) return "ts" /* ts */;
-  const dir = import_path2.default.dirname(fileName);
+  const dir = import_path3.default.dirname(fileName);
   const config = getConfig(dir);
   const cache = config.cache.get(getScriptLang);
   let scriptLang = cache == null ? void 0 : cache.get(dir);
@@ -3888,7 +3903,7 @@ function getMeta(dir) {
 function loadMeta(dir) {
   let cached = metaByDir.get(dir);
   if (!cached) {
-    const require2 = (0, import_module.createRequire)(import_path2.default.join(dir, "_.js"));
+    const require2 = (0, import_module.createRequire)(import_path3.default.join(dir, "_.js"));
     const configPath = (() => {
       try {
         return require2.resolve("@marko/compiler/config");
@@ -3902,7 +3917,7 @@ function loadMeta(dir) {
     const translatorPath = require2.resolve(config.translator);
     cached = metaByTranslator.get(translatorPath);
     if (!cached) {
-      const compiler = require2(import_path2.default.dirname(configPath));
+      const compiler = require2(import_path3.default.dirname(configPath));
       cached = {
         compiler,
         config: {
@@ -3963,13 +3978,13 @@ var marko_default = {
   extension: ".marko",
   create({ ts, host, configFile }) {
     const currentDirectory = host.getCurrentDirectory ? host.getCurrentDirectory() : ts.sys.getCurrentDirectory();
-    const defaultScriptLang = configFile && /tsconfig/g.test(configFile) ? "ts" /* ts */ : "js" /* js */;
+    const defaultScriptLang = configFile && /tsconfig/.test(configFile) ? "ts" /* ts */ : "js" /* js */;
     const runtimeTypes = getTypeLibs(currentDirectory, ts, host);
     const rootNames = [
       runtimeTypes.internalTypesFile,
       runtimeTypes.markoTypesFile
     ];
-    const getJSFileIfTSExists = (source, importer) => host.fileExists(import_path3.default.join(importer, "..", `${source}.ts`)) && `${source}.js`;
+    const getJSFileIfTSExists = (source, importer) => host.fileExists(import_path4.default.join(importer, "..", `${source}.ts`)) && `${source}.js`;
     const compileConfig = {
       output: "source",
       stripTypes: true,
@@ -4025,8 +4040,8 @@ var marko_default = {
         return getScriptLang(fileName, defaultScriptLang, ts, host) === "ts" /* ts */ ? ts.ScriptKind.TS : ts.ScriptKind.JS;
       },
       extract(fileName, code) {
-        const dir = import_path3.default.dirname(fileName);
         const parsed = parse(code, fileName);
+        const dir = import_path4.default.dirname(parsed.filename);
         return extractScript({
           ts,
           parsed,
@@ -4043,7 +4058,7 @@ var marko_default = {
       },
       print({ extracted: { parsed } }) {
         const { code, map } = getCompiler(
-          import_path3.default.dirname(parsed.filename)
+          import_path4.default.dirname(parsed.filename)
         ).compileSync(parsed.code, parsed.filename, compileConfig);
         return { code, map };
       },
@@ -4188,5 +4203,6 @@ function isDefinitionFile(fileName) {
   getPosition,
   isControlFlowTag,
   isDefinitionFile,
+  normalizePath,
   parse
 });

package/dist/index.mjs

@@ -88,6 +88,11 @@ function childAtOffset(offset, children) {
   return offset > child.start && offset <= child.end ? child : void 0;
 }
 
+// src/util/normalize-path.ts
+import path from "path";
+var sepReg = /\//g;
+var normalizePath = path.sep === "/" ? (filename) => filename : (filename) => filename.replace(sepReg, path.sep);
+
 // src/parser.ts
 import {
   getLines,
@@ -138,7 +143,7 @@ function parse(code, filename = "index.marko") {
     locationAt: parser.locationAt,
     positionAt: parser.positionAt,
     nodeAt: (offset) => getNodeAtOffset(offset, program),
-    filename,
+    filename: normalizePath(filename),
     program,
     code
   };
@@ -1779,10 +1784,10 @@ function byStart(a, b) {
 
 // src/extractors/script/util/get-component-filename.ts
 import fs from "fs";
-import path from "path";
+import path2 from "path";
 function getComponentFilename(from) {
-  const dir = path.dirname(from);
-  let nameNoExt = path.basename(from, ".marko");
+  const dir = path2.dirname(from);
+  let nameNoExt = path2.basename(from, ".marko");
   if (nameNoExt.endsWith(".d")) {
     nameNoExt = nameNoExt.slice(0, -2);
   }
@@ -1793,7 +1798,7 @@ function getComponentFilename(from) {
   );
   for (const entry of tryReaddirSync(dir)) {
     if (componentMatch.test(entry)) {
-      return path.join(dir, entry);
+      return path2.join(dir, entry);
     }
   }
 }
@@ -3327,6 +3332,15 @@ ${isMutatedVar(tag.parent, valueLiteral) ? varLocal(`change__${valueLiteral}.`)
             })
           };
         }
+      } else if (node.type === 24 /* Import */) {
+        const imported = this.#ast.import(node);
+        if (imported) {
+          for (const specifier of imported.specifiers) {
+            if (specifier.local.name === "Input") {
+              return { typeParameters: void 0 };
+            }
+          }
+        }
       }
     }
   }
@@ -3424,17 +3438,17 @@ ${isMutatedVar(tag.parent, valueLiteral) ? varLocal(`change__${valueLiteral}.`)
     return ((_a = this.#lookup.getTag(nameText)) == null ? void 0 : _a.targetProperty) || nameText.slice(nameText.lastIndexOf(":") + 1);
   }
   #getAttrTagPath(tag) {
-    let path4 = `"${this.#getAttrTagName(tag)}"`;
+    let path5 = `"${this.#getAttrTagName(tag)}"`;
     let curTag = tag.parent;
     while (curTag) {
       if (curTag.type === 16 /* AttrTag */) {
-        path4 = `"${this.#getAttrTagName(curTag)}",${path4}`;
+        path5 = `"${this.#getAttrTagName(curTag)}",${path5}`;
       } else if (!isControlFlowTag(curTag)) {
         break;
       }
       curTag = curTag.parent;
     }
-    return path4;
+    return path5;
   }
   #getTagInputType(tag) {
     if (tag.type === 16 /* AttrTag */) {
@@ -3570,7 +3584,7 @@ function isValueAttribute(attr) {
 function resolveTagImport(from, def) {
   const filename = resolveTagFile(def);
   if (filename) {
-    return from ? relativeImportPath(from, filename) : filename;
+    return from ? relativeImportPath(from, normalizePath(filename)) : filename;
   }
 }
 function resolveTagFile(def) {
@@ -3681,7 +3695,7 @@ function getExt(fileName) {
 }
 
 // src/processors/marko.ts
-import path3 from "path";
+import path4 from "path";
 
 // src/util/project.ts
 var project_exports = {};
@@ -3698,7 +3712,7 @@ __export(project_exports, {
 });
 import { strip as stripJSONComments } from "@luxass/strip-json-comments";
 import { createRequire } from "module";
-import path2 from "path";
+import path3 from "path";
 var defaultTypeLibs = {};
 var defaultMeta;
 var ignoreErrors = (_err) => {
@@ -3725,11 +3739,11 @@ function getTypeLibs(rootDir, ts, host) {
   const resolveTypeCompilerOptions = {
     moduleResolution: ts.ModuleResolutionKind.Bundler
   };
-  const markoRunGeneratedTypesFile = path2.join(
+  const markoRunGeneratedTypesFile = path3.join(
     rootDir,
     ".marko-run/routes.d.ts"
   );
-  const resolveFromFile = path2.join(rootDir, "_.d.ts");
+  const resolveFromFile = path3.join(rootDir, "_.d.ts");
   const internalTypesFile = defaultTypeLibs.internalTypesFile || ((_a = ts.resolveTypeReferenceDirective(
     "@marko/language-tools/marko.internal.d.ts",
     resolveFromFile,
@@ -3767,7 +3781,7 @@ function getTypeLibs(rootDir, ts, host) {
 }
 function getScriptLang(fileName, defaultScriptLang, ts, host) {
   if (fileName.endsWith(".d.marko")) return "ts" /* ts */;
-  const dir = path2.dirname(fileName);
+  const dir = path3.dirname(fileName);
   const config = getConfig(dir);
   const cache = config.cache.get(getScriptLang);
   let scriptLang = cache == null ? void 0 : cache.get(dir);
@@ -3851,7 +3865,7 @@ function getMeta(dir) {
 function loadMeta(dir) {
   let cached = metaByDir.get(dir);
   if (!cached) {
-    const require2 = createRequire(path2.join(dir, "_.js"));
+    const require2 = createRequire(path3.join(dir, "_.js"));
     const configPath = (() => {
       try {
         return require2.resolve("@marko/compiler/config");
@@ -3865,7 +3879,7 @@ function loadMeta(dir) {
     const translatorPath = require2.resolve(config.translator);
     cached = metaByTranslator.get(translatorPath);
     if (!cached) {
-      const compiler = require2(path2.dirname(configPath));
+      const compiler = require2(path3.dirname(configPath));
       cached = {
         compiler,
         config: {
@@ -3926,13 +3940,13 @@ var marko_default = {
   extension: ".marko",
   create({ ts, host, configFile }) {
     const currentDirectory = host.getCurrentDirectory ? host.getCurrentDirectory() : ts.sys.getCurrentDirectory();
-    const defaultScriptLang = configFile && /tsconfig/g.test(configFile) ? "ts" /* ts */ : "js" /* js */;
+    const defaultScriptLang = configFile && /tsconfig/.test(configFile) ? "ts" /* ts */ : "js" /* js */;
     const runtimeTypes = getTypeLibs(currentDirectory, ts, host);
     const rootNames = [
       runtimeTypes.internalTypesFile,
       runtimeTypes.markoTypesFile
     ];
-    const getJSFileIfTSExists = (source, importer) => host.fileExists(path3.join(importer, "..", `${source}.ts`)) && `${source}.js`;
+    const getJSFileIfTSExists = (source, importer) => host.fileExists(path4.join(importer, "..", `${source}.ts`)) && `${source}.js`;
     const compileConfig = {
       output: "source",
       stripTypes: true,
@@ -3988,8 +4002,8 @@ var marko_default = {
         return getScriptLang(fileName, defaultScriptLang, ts, host) === "ts" /* ts */ ? ts.ScriptKind.TS : ts.ScriptKind.JS;
       },
       extract(fileName, code) {
-        const dir = path3.dirname(fileName);
         const parsed = parse(code, fileName);
+        const dir = path4.dirname(parsed.filename);
         return extractScript({
           ts,
           parsed,
@@ -4006,7 +4020,7 @@ var marko_default = {
       },
       print({ extracted: { parsed } }) {
         const { code, map } = getCompiler(
-          path3.dirname(parsed.filename)
+          path4.dirname(parsed.filename)
         ).compileSync(parsed.code, parsed.filename, compileConfig);
         return { code, map };
       },
@@ -4150,5 +4164,6 @@ export {
   getPosition,
   isControlFlowTag,
   isDefinitionFile,
+  normalizePath,
   parse
 };

package/dist/util/normalize-path.d.ts

@@ -0,0 +1 @@
+export declare const normalizePath: (filename: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/language-tools",
-  "version": "2.5.59",
+  "version": "2.5.61",
   "description": "Marko Language Tools",
   "keywords": [
     "analysis",