@azerothjs/typescript-plugin 0.5.0-beta.2 → 0.6.0-beta.1

package/dist/index.js

@@ -25,9 +25,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // src/decorate.ts
 var import_node_path = __toESM(require("node:path"));
 
-// ../language-service/src/ts-project.ts
-var import_typescript = __toESM(require("typescript"), 1);
-
 // ../compiler/src/scanner.ts
 function isWhitespace(ch) {
   return ch === " " || ch === "	" || ch === "\n" || ch === "\r" || ch === "\f" || ch === "\v";
@@ -739,6 +736,16 @@ var CodeMapping = class _CodeMapping {
   }
 };
 
+// ../language-service/src/perf.ts
+var enabled = false;
+var timings = {};
+function isEnabled() {
+  return enabled;
+}
+function record(label, ms) {
+  timings[label] = ms;
+}
+
 // ../language-service/src/virtual-code.ts
 var RUNTIME_MODULE = "@azerothjs/core";
 var BUILTIN_COMPONENTS = [
@@ -782,6 +789,15 @@ var Builder = class {
   }
 };
 function generateVirtualCode(source) {
+  if (!isEnabled()) {
+    return buildVirtualCode(source);
+  }
+  const start = performance.now();
+  const result = buildVirtualCode(source);
+  record("virtualCode", performance.now() - start);
+  return result;
+}
+function buildVirtualCode(source) {
   const builder = new Builder(source);
   const usedBuiltins = /* @__PURE__ */ new Set();
   const collect = (node) => walkComponentTags(node, (tag) => {
@@ -927,8 +943,13 @@ function generateVirtualCode(source) {
     if (node.isComponent) {
       const tagStart = node.start + 1;
       builder.copy(tagStart, tagStart + node.tag.length, "tag");
+      const childrenThunk = emitComponentChildren(node.children);
+      if (node.attributes.length === 0 && childrenThunk === null) {
+        builder.emit("()");
+        return;
+      }
       builder.emit("(");
-      emitProps(node.attributes, emitComponentChildren(node.children), false);
+      emitProps(node.attributes, childrenThunk, false);
       builder.emit(")");
       return;
     }
@@ -1028,43 +1049,34 @@ function quoteString(value) {
   return `'${value.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n")}'`;
 }
 
-// ../language-service/src/ts-project.ts
-var VIRTUAL_SUFFIX = ".azeroth.ts";
-function isVirtualFile(fileName) {
-  return fileName.endsWith(VIRTUAL_SUFFIX);
-}
-function toVirtualFile(azerothPath) {
-  return `${azerothPath}.ts`;
-}
-function toAzerothPath(virtualFile) {
-  return virtualFile.slice(0, -3);
-}
-
 // src/decorate.ts
 var AZEROTH_EXT = ".azeroth";
 function isAzerothSpecifier(text) {
   return text.endsWith(AZEROTH_EXT) && (text.startsWith(".") || text.startsWith("/"));
 }
-function scriptKindFromName(ts2, fileName) {
+function isAzerothFile(fileName) {
+  return fileName.endsWith(AZEROTH_EXT);
+}
+function scriptKindFromName(ts, fileName) {
   if (fileName.endsWith(".tsx")) {
-    return ts2.ScriptKind.TSX;
+    return ts.ScriptKind.TSX;
   }
   if (fileName.endsWith(".jsx")) {
-    return ts2.ScriptKind.JSX;
+    return ts.ScriptKind.JSX;
   }
   if (fileName.endsWith(".json")) {
-    return ts2.ScriptKind.JSON;
+    return ts.ScriptKind.JSON;
   }
   if (/\.(?:m|c)?js$/.test(fileName)) {
-    return ts2.ScriptKind.JS;
+    return ts.ScriptKind.JS;
   }
-  return ts2.ScriptKind.TS;
+  return ts.ScriptKind.TS;
 }
 function resolveSibling(containingFile, specifier) {
   return import_node_path.default.resolve(import_node_path.default.dirname(containingFile), specifier).replace(/\\/g, "/");
 }
-function decorateLanguageServiceHost(ts2, host, options = {}) {
-  const read = options.readAzeroth ?? ((azerothPath) => ts2.sys.readFile(azerothPath));
+function decorateLanguageServiceHost(ts, host, options = {}) {
+  const read = options.readAzeroth ?? ((azerothPath) => ts.sys.readFile(azerothPath));
   const cache = /* @__PURE__ */ new Map();
   const virtualCodeFor = (azerothPath) => {
     const source = read(azerothPath);
@@ -1081,57 +1093,52 @@ function decorateLanguageServiceHost(ts2, host, options = {}) {
   };
   const origSnapshot = host.getScriptSnapshot?.bind(host);
   host.getScriptSnapshot = (fileName) => {
-    if (isVirtualFile(fileName)) {
-      const code = virtualCodeFor(toAzerothPath(fileName));
-      return code === void 0 ? void 0 : ts2.ScriptSnapshot.fromString(code);
+    if (isAzerothFile(fileName)) {
+      const code = virtualCodeFor(fileName);
+      return code === void 0 ? void 0 : ts.ScriptSnapshot.fromString(code);
     }
     return origSnapshot ? origSnapshot(fileName) : void 0;
   };
   const origKind = host.getScriptKind?.bind(host);
   host.getScriptKind = (fileName) => {
-    if (isVirtualFile(fileName)) {
-      return ts2.ScriptKind.TS;
-    }
-    return origKind ? origKind(fileName) : scriptKindFromName(ts2, fileName);
-  };
-  const origVersion = host.getScriptVersion.bind(host);
-  host.getScriptVersion = (fileName) => {
-    if (isVirtualFile(fileName)) {
-      const azerothPath = toAzerothPath(fileName);
-      const mtime = ts2.sys.getModifiedTime?.(azerothPath)?.getTime() ?? 0;
-      return `azeroth:${mtime}`;
-    }
-    return origVersion(fileName);
-  };
-  const origExists = host.fileExists?.bind(host);
-  host.fileExists = (fileName) => {
-    if (isVirtualFile(fileName)) {
-      return read(toAzerothPath(fileName)) !== void 0;
+    if (isAzerothFile(fileName)) {
+      return ts.ScriptKind.TS;
     }
-    return origExists ? origExists(fileName) : ts2.sys.fileExists(fileName);
+    return origKind ? origKind(fileName) : scriptKindFromName(ts, fileName);
   };
   const origReadFile = host.readFile?.bind(host);
   host.readFile = (fileName, encoding) => {
-    if (isVirtualFile(fileName)) {
-      return virtualCodeFor(toAzerothPath(fileName));
+    if (isAzerothFile(fileName)) {
+      return virtualCodeFor(fileName);
     }
-    return origReadFile ? origReadFile(fileName, encoding) : ts2.sys.readFile(fileName, encoding);
+    return origReadFile ? origReadFile(fileName, encoding) : ts.sys.readFile(fileName, encoding);
   };
   const origResolve = host.resolveModuleNameLiterals?.bind(host);
   host.resolveModuleNameLiterals = (literals, containingFile, redirectedReference, compilerOptions, containingSourceFile, reusedNames) => {
-    const base = origResolve ? origResolve(literals, containingFile, redirectedReference, compilerOptions, containingSourceFile, reusedNames) : literals.map((literal) => ts2.resolveModuleName(literal.text, containingFile, compilerOptions, host));
+    const base = origResolve ? origResolve(literals, containingFile, redirectedReference, compilerOptions, containingSourceFile, reusedNames) : literals.map((literal) => ts.resolveModuleName(literal.text, containingFile, compilerOptions, host));
+    const asAzeroth = (azerothPath) => ({
+      resolvedModule: {
+        // The REAL `.azeroth` path, reported with a `.ts` module
+        // extension so TypeScript treats it as a TypeScript module. Its
+        // snapshot (above) is the compiled virtual code.
+        resolvedFileName: azerothPath,
+        extension: ts.Extension.Ts,
+        isExternalLibraryImport: false
+      }
+    });
     return literals.map((literal, index) => {
-      if (isAzerothSpecifier(literal.text)) {
-        const azerothPath = resolveSibling(containingFile, literal.text);
+      const text = literal.text;
+      if (isAzerothSpecifier(text)) {
+        const azerothPath = resolveSibling(containingFile, text);
+        if (read(azerothPath) !== void 0) {
+          return asAzeroth(azerothPath);
+        }
+      }
+      const relative = text.startsWith(".") || text.startsWith("/");
+      if (!base[index].resolvedModule && relative && !text.endsWith(AZEROTH_EXT)) {
+        const azerothPath = resolveSibling(containingFile, text + AZEROTH_EXT);
         if (read(azerothPath) !== void 0) {
-          return {
-            resolvedModule: {
-              resolvedFileName: toVirtualFile(azerothPath),
-              extension: ts2.Extension.Ts,
-              isExternalLibraryImport: false
-            },
-            failedLookupLocations: []
-          };
+          return asAzeroth(azerothPath);
         }
       }
       return base[index];
@@ -1141,10 +1148,10 @@ function decorateLanguageServiceHost(ts2, host, options = {}) {
 
 // src/index.ts
 function init(modules) {
-  const ts2 = modules.typescript;
+  const ts = modules.typescript;
   return {
     create(info) {
-      decorateLanguageServiceHost(ts2, info.languageServiceHost);
+      decorateLanguageServiceHost(ts, info.languageServiceHost);
       info.project.projectService.logger.info("[azerothjs] typescript-plugin: .azeroth module resolution enabled");
       return info.languageService;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azerothjs/typescript-plugin",
-    "version": "0.5.0-beta.2",
+    "version": "0.6.0-beta.1",
     "description": "AzerothJS TypeScript language-service plugin — resolves .azeroth imports with real types in tsserver/editors",
     "main": "./dist/index.js",
     "files":
@@ -22,7 +22,7 @@
     ],
     "devDependencies":
     {
-        "@azerothjs/language-service": "0.5.0-beta.2",
+        "@azerothjs/language-service": "0.6.0-beta.1",
         "esbuild": "^0.28.0"
     },
     "peerDependencies":