@statorjs/language-server 0.1.0 → 0.1.2

package/dist/server.cjs

@@ -45328,8 +45328,37 @@ function extractFrontmatterTypes(fm) {
 var import_typescript6 = __toESM(require("typescript"), 1);
 
 // ../stator/src/compiler/virtual-code.ts
-var TEMPLATE_IMPORTS = "import { read, each, when, match, on, classList, styleList, raw } from '@statorjs/stator/template';\n";
-var CLIENT_IMPORTS = "import { StatorElement, use, machine, defineElement, bind, effect, dispatch } from '@statorjs/stator/client';\n";
+var TEMPLATE_GLOBALS = ["read", "each", "when", "match", "on", "classList", "styleList"];
+var CLIENT_GLOBALS = [
+  "StatorElement",
+  "use",
+  "machine",
+  "defineElement",
+  "bind",
+  "effect",
+  "dispatch"
+];
+function userImportedLocals(code, modulePath) {
+  const locals = /* @__PURE__ */ new Set();
+  const re = new RegExp(
+    `import\\s+(?:type\\s+)?\\{([^}]*)\\}\\s+from\\s+['"]${modulePath.replace(/\//g, "\\/")}['"]`,
+    "g"
+  );
+  for (const m of code.matchAll(re)) {
+    for (const spec of m[1].split(",")) {
+      const parts = spec.trim().split(/\s+as\s+/);
+      const local = (parts[1] ?? parts[0] ?? "").trim().replace(/^type\s+/, "");
+      if (local) locals.add(local);
+    }
+  }
+  return locals;
+}
+function injectImports(globals, modulePath, userCode) {
+  const bound = userImportedLocals(userCode, modulePath);
+  const missing = globals.filter((g) => !bound.has(g));
+  return missing.length > 0 ? `import { ${missing.join(", ")} } from '${modulePath}';
+` : "";
+}
 var AMBIENT_TYPE_IMPORTS = "import type { AnyMachineDef as __SMachineDef } from '@statorjs/stator/machine';\nimport type { InstanceOf as __SInstanceOf } from '@statorjs/stator/template';\n";
 var STATOR_AMBIENT = `declare const Stator: {
   props<P>(): P;
@@ -45354,7 +45383,8 @@ function toVirtualCode(source) {
 }
 function buildServerTsx(regions) {
   const mappings = [];
-  let code = TEMPLATE_IMPORTS + AMBIENT_TYPE_IMPORTS + STATOR_AMBIENT;
+  const userCode = (regions.frontmatter?.content ?? "") + regions.template.content;
+  let code = injectImports(TEMPLATE_GLOBALS, "@statorjs/stator/template", userCode) + AMBIENT_TYPE_IMPORTS + STATOR_AMBIENT;
   if (regions.frontmatter?.content.trim()) {
     push(
       mappings,
@@ -45385,7 +45415,8 @@ function buildServerTsx(regions) {
 }
 function buildClientTsx(regions) {
   const mappings = [];
-  let code = TEMPLATE_IMPORTS + CLIENT_IMPORTS + AMBIENT_TYPE_IMPORTS + STATOR_AMBIENT;
+  const userScript = regions.scripts.map((s) => s.content).join("\n");
+  let code = injectImports(TEMPLATE_GLOBALS, "@statorjs/stator/template", userScript) + injectImports(CLIENT_GLOBALS, "@statorjs/stator/client", userScript) + AMBIENT_TYPE_IMPORTS + STATOR_AMBIENT;
   for (const script of regions.scripts) {
     push(mappings, script.contentOffset, code.length, script.content.length);
     code += `${script.content}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statorjs/language-server",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Volar-based language server for .stator files.",
   "license": "MIT",
   "type": "module",
@@ -33,7 +33,7 @@
     "volar-service-typescript": "0.0.71",
     "vscode-css-languageservice": "^6.3.0",
     "vscode-uri": "^3.0.8",
-    "@statorjs/stator": "1.0.0"
+    "@statorjs/stator": "1.1.1"
   },
   "peerDependencies": {
     "typescript": "^5.6.0"