@marko/language-tools 2.5.21 → 2.5.23

package/dist/index.js

@@ -1740,8 +1740,6 @@ function detectAPIFromTag(parsed, tag) {
     case "const":
     case "debug":
     case "define":
-    case "html-script":
-    case "html-style":
     case "id":
     case "let":
     case "lifecycle":
@@ -3476,7 +3474,7 @@ var defaultMeta;
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
-var metaByCompiler = /* @__PURE__ */ new Map();
+var metaByTranslator = /* @__PURE__ */ new Map();
 function getCompiler(dir) {
   return getMeta(dir).compiler;
 }
@@ -3579,7 +3577,7 @@ function clearCaches() {
   if (defaultMeta) {
     clearCacheForMeta(defaultMeta);
   }
-  for (const project of metaByCompiler.values()) {
+  for (const project of metaByTranslator.values()) {
     clearCacheForMeta(project);
   }
 }
@@ -3625,20 +3623,21 @@ function loadMeta(dir) {
   if (!cached) {
     const require2 = (0, import_module.createRequire)(import_path2.default.join(dir, "_.js"));
     const configPath = require2.resolve("@marko/compiler/config");
-    cached = metaByCompiler.get(configPath);
+    const config = interopDefault(require2(configPath));
+    const translatorPath = require2.resolve(config.translator);
+    cached = metaByTranslator.get(translatorPath);
     if (!cached) {
       const compiler = require2(import_path2.default.dirname(configPath));
-      const config = interopDefault(require2(configPath));
       cached = {
         compiler,
         config: {
           ...config,
           cache: /* @__PURE__ */ new Map(),
-          translator: require2(config.translator)
+          translator: require2(translatorPath)
         }
       };
       compiler.configure(cached.config);
-      metaByCompiler.set(configPath, cached);
+      metaByTranslator.set(translatorPath, cached);
     }
     metaByDir.set(dir, cached);
   }

package/dist/index.mjs

@@ -1700,8 +1700,6 @@ function detectAPIFromTag(parsed, tag) {
     case "const":
     case "debug":
     case "define":
-    case "html-script":
-    case "html-style":
     case "id":
     case "let":
     case "lifecycle":
@@ -3439,7 +3437,7 @@ var defaultMeta;
 var ignoreErrors = (_err) => {
 };
 var metaByDir = /* @__PURE__ */ new Map();
-var metaByCompiler = /* @__PURE__ */ new Map();
+var metaByTranslator = /* @__PURE__ */ new Map();
 function getCompiler(dir) {
   return getMeta(dir).compiler;
 }
@@ -3542,7 +3540,7 @@ function clearCaches() {
   if (defaultMeta) {
     clearCacheForMeta(defaultMeta);
   }
-  for (const project of metaByCompiler.values()) {
+  for (const project of metaByTranslator.values()) {
     clearCacheForMeta(project);
   }
 }
@@ -3588,20 +3586,21 @@ function loadMeta(dir) {
   if (!cached) {
     const require2 = createRequire(path2.join(dir, "_.js"));
     const configPath = require2.resolve("@marko/compiler/config");
-    cached = metaByCompiler.get(configPath);
+    const config = interopDefault(require2(configPath));
+    const translatorPath = require2.resolve(config.translator);
+    cached = metaByTranslator.get(translatorPath);
     if (!cached) {
       const compiler = require2(path2.dirname(configPath));
-      const config = interopDefault(require2(configPath));
       cached = {
         compiler,
         config: {
           ...config,
           cache: /* @__PURE__ */ new Map(),
-          translator: require2(config.translator)
+          translator: require2(translatorPath)
         }
       };
       compiler.configure(cached.config);
-      metaByCompiler.set(configPath, cached);
+      metaByTranslator.set(translatorPath, cached);
     }
     metaByDir.set(dir, cached);
   }

package/marko.internal.d.ts

@@ -350,10 +350,7 @@ declare global {
         _: infer Renderer;
       }
         ? Renderer
-        : Template extends Marko.Template<
-              infer Input extends Record<string, unknown>,
-              infer Return
-            >
+        : Template extends Marko.Template<infer Input, infer Return>
           ? BaseRenderer<Input, Return>
           : never;
 
@@ -387,10 +384,7 @@ declare global {
         >;
       }
 
-      export interface BaseRenderer<
-        Input extends Record<PropertyKey, unknown>,
-        Return = void,
-      > {
+      export interface BaseRenderer<Input, Return = void> {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
         (): () => <__marko_input_with_scope extends unknown>(
           input: Marko.Directives &
@@ -400,9 +394,7 @@ declare global {
       }
 
       export interface DefaultRenderer {
-        (): () => <Input extends Record<PropertyKey, unknown>>(
-          input: Input,
-        ) => ReturnAndScope<Scopes<Input>, void>;
+        (): () => <Input>(input: Input) => ReturnAndScope<Scopes<Input>, void>;
       }
 
       export type Relate<A, B> = B extends A ? A : B;
@@ -439,9 +431,7 @@ type BodyContentInput<Args extends readonly unknown[]> = Args extends {
 
 type Scopes<Input> = [0] extends [1 & Input]
   ? never
-  : Input extends Record<any, unknown>
-    ? MergeScopes<FlatScopes<Input>>
-    : never;
+  : MergeScopes<FlatScopes<Input>>;
 
 type ComponentEventHandlers<Component extends Marko.Component> = {
   [K in Exclude<

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@marko/language-tools",
   "description": "Marko Language Tools",
-  "version": "2.5.21",
+  "version": "2.5.23",
   "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.7",
+    "@babel/parser": "^7.27.5",
     "@luxass/strip-json-comments": "^1.4.0",
-    "htmljs-parser": "^5.5.3",
+    "htmljs-parser": "^5.5.4",
     "relative-import-path": "^1.0.0"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.26.2",
-    "@marko/compiler": "^5.39.11",
+    "@babel/code-frame": "^7.27.1",
+    "@marko/compiler": "^5.39.26",
     "@types/babel__code-frame": "^7.0.6",
-    "@typescript/vfs": "^1.6.0",
-    "marko": "^5.37.12",
-    "mitata": "^1.0.33",
-    "tsx": "^4.19.2"
+    "@typescript/vfs": "^1.6.1",
+    "marko": "^5.37.38",
+    "mitata": "^1.0.34",
+    "tsx": "^4.20.3"
   },
   "exports": {
     ".": {