ts-gem-plugin 0.0.6 → 0.0.8

package/dist/index.js

@@ -158,11 +158,14 @@ var Configuration = class {
   }
 };
 
+// src/constants.ts
+var NAME = "gem-plugin";
+
 // src/context.ts
-var import_vscode_html_languageservice2 = require("@mantou/vscode-html-languageservice");
-var import_standard_template_source_helper = __toESM(require("@mantou/typescript-template-language-service-decorator/lib/standard-template-source-helper"));
 var import_standard_script_source_helper = __toESM(require("@mantou/typescript-template-language-service-decorator/lib/standard-script-source-helper"));
+var import_standard_template_source_helper = __toESM(require("@mantou/typescript-template-language-service-decorator/lib/standard-template-source-helper"));
 var import_vscode_css_languageservice = require("@mantou/vscode-css-languageservice");
+var import_vscode_html_languageservice2 = require("@mantou/vscode-html-languageservice");
 
 // ../duoyun-ui/lib/map.js
 var StringWeakMap = class {
@@ -188,12 +191,83 @@ var StringWeakMap = class {
   }
 };
 
+// ../duoyun-ui/lib/cache.js
+var Cache = class {
+  #max;
+  #maxAge;
+  #renewal;
+  #map = /* @__PURE__ */ new Map();
+  #reverseMap = /* @__PURE__ */ new Map();
+  #addedLinked = new LinkedList();
+  constructor({ max = Infinity, maxAge = Infinity, renewal = false } = {}) {
+    this.#max = max;
+    this.#maxAge = maxAge;
+    this.#renewal = renewal;
+  }
+  setOptions(options) {
+    this.#max = options.max ?? this.#max;
+    this.#maxAge = options.maxAge ?? this.#maxAge;
+    this.#renewal = options.renewal ?? this.#renewal;
+  }
+  #trim() {
+    for (let i = this.#addedLinked.size - this.#max; i > 0; i--) {
+      const value = this.#addedLinked.get();
+      const key = this.#reverseMap.get(value);
+      this.#reverseMap.delete(value);
+      this.#map.delete(key);
+    }
+  }
+  set(key, value) {
+    this.#addedLinked.add(value);
+    this.#reverseMap.set(value, key);
+    this.#map.set(key, { value, timestamp: Date.now() });
+    this.#trim();
+    return value;
+  }
+  get(key, init) {
+    const cache = this.#map.get(key);
+    if (!cache) {
+      return init && this.set(key, init(key));
+    }
+    const { timestamp, value } = cache;
+    if (Date.now() - timestamp > this.#maxAge) {
+      this.#addedLinked.delete(value);
+      this.#reverseMap.delete(value);
+      this.#map.delete(key);
+      return init && this.set(key, init(key));
+    }
+    if (this.#renewal) {
+      cache.timestamp = Date.now();
+    }
+    this.#addedLinked.add(value);
+    return value;
+  }
+};
+
+// src/cache.ts
+var LRUCache = class {
+  #bucket;
+  constructor(args) {
+    this.#bucket = new Cache({ max: 25, renewal: true, ...args });
+  }
+  #genKey(context, position) {
+    return [context.fileName, position?.line, position?.character, context.text].join(";");
+  }
+  get(context, position, init) {
+    return this.#bucket.get(this.#genKey(context, position), init);
+  }
+};
+
+// src/data-provider.ts
+var import_vscode_html_languageservice = require("@mantou/vscode-html-languageservice");
+
 // src/utils.ts
 function isCustomElementTag(tag) {
   return tag.includes("-");
 }
 function isDepElement(node) {
-  return node.getSourceFile().fileName.includes("/node_modules/");
+  const { fileName } = node.getSourceFile();
+  return ["/node_modules/", "/dist/", ".d.ts"].some((s) => fileName.includes(s));
 }
 function bindMemberFunction(o, keys2 = Object.keys(o)) {
   return Object.fromEntries(keys2.map((key) => [key, o[key].bind?.(o)]));
@@ -265,12 +339,6 @@ function decorate(origin, cb) {
   return result;
 }
 
-// src/data-provider.ts
-var import_vscode_html_languageservice = require("@mantou/vscode-html-languageservice");
-
-// src/constants.ts
-var NAME = "gem-plugin";
-
 // src/data-provider.ts
 var dataProvider = (0, import_vscode_html_languageservice.getDefaultHTMLDataProvider)();
 var HTMLDataProvider = class {
@@ -373,73 +441,6 @@ function getDocComment(typescript, declaration) {
   return commentStrings?.join("\n\n");
 }
 
-// ../duoyun-ui/lib/cache.js
-var Cache = class {
-  #max;
-  #maxAge;
-  #renewal;
-  #map = /* @__PURE__ */ new Map();
-  #reverseMap = /* @__PURE__ */ new Map();
-  #addedLinked = new LinkedList();
-  constructor({ max = Infinity, maxAge = Infinity, renewal = false } = {}) {
-    this.#max = max;
-    this.#maxAge = maxAge;
-    this.#renewal = renewal;
-  }
-  setOptions(options) {
-    this.#max = options.max ?? this.#max;
-    this.#maxAge = options.maxAge ?? this.#maxAge;
-    this.#renewal = options.renewal ?? this.#renewal;
-  }
-  #trim() {
-    for (let i = this.#addedLinked.size - this.#max; i > 0; i--) {
-      const value = this.#addedLinked.get();
-      const key = this.#reverseMap.get(value);
-      this.#reverseMap.delete(value);
-      this.#map.delete(key);
-    }
-  }
-  set(key, value) {
-    this.#addedLinked.add(value);
-    this.#reverseMap.set(value, key);
-    this.#map.set(key, { value, timestamp: Date.now() });
-    this.#trim();
-    return value;
-  }
-  get(key, init) {
-    const cache = this.#map.get(key);
-    if (!cache) {
-      return init && this.set(key, init(key));
-    }
-    const { timestamp, value } = cache;
-    if (Date.now() - timestamp > this.#maxAge) {
-      this.#addedLinked.delete(value);
-      this.#reverseMap.delete(value);
-      this.#map.delete(key);
-      return init && this.set(key, init(key));
-    }
-    if (this.#renewal) {
-      cache.timestamp = Date.now();
-    }
-    this.#addedLinked.add(value);
-    return value;
-  }
-};
-
-// src/cache.ts
-var LRUCache = class {
-  #bucket;
-  constructor(args) {
-    this.#bucket = new Cache({ max: 25, renewal: true, ...args });
-  }
-  #genKey(context, position) {
-    return [context.fileName, position?.line, position?.character, context.text].join(";");
-  }
-  get(context, position, init) {
-    return this.#bucket.get(this.#genKey(context, position), init);
-  }
-};
-
 // src/context.ts
 var Context = class {
   elements;
@@ -582,7 +583,7 @@ function getSubstitution(templateString, start, end) {
 function isValidCSSTemplate(typescript, node, callName) {
   switch (node.kind) {
     case typescript.SyntaxKind.NoSubstitutionTemplateLiteral:
-    case typescript.SyntaxKind.TemplateExpression:
+    case typescript.SyntaxKind.TemplateExpression: {
       const parent = node.parent;
       if (typescript.isCallExpression(parent) && parent.expression.getText() === callName) {
         return true;
@@ -594,6 +595,7 @@ function isValidCSSTemplate(typescript, node, callName) {
         }
       }
       return false;
+    }
     default:
       return false;
   }
@@ -662,8 +664,6 @@ function translationCompletionItemKind(context, kind) {
       return typescript.ScriptElementKind.alias;
     case vscode.CompletionItemKind.File:
       return typescript.ScriptElementKind.moduleElement;
-    case vscode.CompletionItemKind.Snippet:
-    case vscode.CompletionItemKind.Text:
     default:
       return typescript.ScriptElementKind.unknown;
   }
@@ -727,11 +727,11 @@ function genDefaultCompletionEntryDetails(context, name) {
 }
 function toDisplayParts(text, isDoc = false) {
   if (!text) return [];
-  const escape = (unsafe) => unsafe.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;").replaceAll(" ", "&nbsp;").replaceAll("\n", "  \n").replaceAll("	", "&emsp;");
+  const escapeText = (unsafe) => unsafe.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;").replaceAll(" ", "&nbsp;").replaceAll("\n", "  \n").replaceAll("	", "&emsp;");
   return [
     {
       kind: "unknown",
-      text: typeof text !== "string" ? text.value : isDoc ? escape(text) : text
+      text: typeof text !== "string" ? text.value : isDoc ? escapeText(text) : text
     }
   ];
 }
@@ -1010,7 +1010,8 @@ var HTMLLanguageService = class {
     const diagnostics = [];
     forEachNode(vHtml.roots, (node) => {
       if (!node.tag) return;
-      if (isCustomElementTag(node.tag) && !this.#ctx.elements.get(node.tag)) {
+      const customElementTagDecl = this.#ctx.elements.get(node.tag);
+      if (isCustomElementTag(node.tag) && !customElementTagDecl) {
         diagnostics.push({
           category: context.typescript.DiagnosticCategory.Warning,
           code: 101 /* UnknownTag */,
@@ -1021,13 +1022,13 @@ var HTMLLanguageService = class {
           source: NAME
         });
       }
-      const tagDeclaration = this.#ctx.elements.get(node.tag) || this.#ctx.builtInElements.get(node.tag);
+      const tagDeclaration = customElementTagDecl || this.#ctx.builtInElements.get(node.tag);
       if (!tagDeclaration) return;
       for (const [attributeName, { value, start, end }] of node.attributesMap) {
         if (attributeName.startsWith("_")) continue;
         const hasValueSpan = value?.startsWith("_");
         const attrInfo = getAttrName(attributeName);
-        const propType = getPropType(typeChecker, tagDeclaration, attrInfo);
+        const propType = getPropType(typeChecker, tagDeclaration, !customElementTagDecl, attrInfo);
         const diagnostic = {
           category: context.typescript.DiagnosticCategory.Warning,
           file,
@@ -1082,7 +1083,7 @@ var HTMLLanguageService = class {
         if (hasValueSpan) {
           const spanType = getSpanType(this.#ctx.ts, typeChecker, file, offset, end);
           switch (attrInfo.decorate) {
-            case "?":
+            case "?": {
               const boolType = getUnionType(typeChecker, [
                 typeChecker.getBooleanType(),
                 typeChecker.getUndefinedType(),
@@ -1092,6 +1093,7 @@ var HTMLLanguageService = class {
                 diagnostics.push(diagnostic);
               }
               continue;
+            }
             case ".":
             case "@":
               if (!typeChecker.isTypeAssignableTo(spanType, propType)) {
@@ -1121,7 +1123,6 @@ var HTMLLanguageService = class {
           } else if (types.every((t) => !typeChecker.isTypeAssignableTo(t, propType))) {
             diagnostics.push(diagnostic);
           }
-          continue;
         }
       }
     });
@@ -1186,35 +1187,57 @@ function getSpanType(typescript, typeChecker, file, htmlOffset, attrNameEnd) {
   const spanExp = getSpanExpression(typescript, file, valueOffset);
   return typeChecker.getTypeAtLocation(spanExp);
 }
-function getPropType(typeChecker, tagClassDeclaration, attrInfo) {
+var buildInElementNoGlobalAttrPropMap = /* @__PURE__ */ new Map([
+  ["crossorigin", "crossOrigin"],
+  ["rowspan", "rowSpan"],
+  ["colspan", "colSpan"],
+  // <input> list: string
+  ["list", "ariaLabelledby"]
+]);
+function getPropType(typeChecker, tagClassDeclaration, isBuiltInTag, attrInfo) {
   const classType = typeChecker.getTypeAtLocation(tagClassDeclaration);
   if (attrInfo.attr.startsWith("data-")) {
     return typeChecker.getStringType();
   }
-  const propName = kebabToCamelCase(attrInfo.attr);
+  const propName = isBuiltInTag ? buildInElementNoGlobalAttrPropMap.get(attrInfo.attr) || kebabToCamelCase(attrInfo.attr) : kebabToCamelCase(attrInfo.attr);
   switch (propName) {
     case "class":
     case "style":
     case "part":
     case "exportparts":
+    case "xmlns":
+    case "viewBox":
+    case "ariaLabelledby":
       return typeChecker.getStringType();
     case "tabindex":
       return typeChecker.getNumberType();
-    case "ariaDisabled":
+    case "ariaAtomic":
+    case "ariaBusy":
     case "ariaChecked":
+    case "ariaDisabled":
+    case "ariaExpanded":
+    case "ariaGrabbed":
     case "ariaHidden":
+    case "ariaModal":
+    case "ariaMultiline":
+    case "ariaMultiselectable":
+    case "ariaReadonly":
+    case "ariaRequired":
+    case "ariaPressed":
+    case "ariaSelected":
       return getUnionType(typeChecker, [
         typeChecker.getStringType(),
         typeChecker.getBooleanType(),
         typeChecker.getUndefinedType()
       ]);
-    default:
+    default: {
       const isEvent = attrInfo.decorate === "@";
       const propSymbol = classType.getProperty(propName);
       const propType = propSymbol && typeChecker.getTypeOfSymbol(propSymbol);
       if (!isEvent) return propType;
       const eventHandleType = getEmitterHandleType(typeChecker, classType, propType);
       return getUnionType(typeChecker, [eventHandleType, typeChecker.getUndefinedType()]);
+    }
   }
 }
 function getEmitterHandleType(typeChecker, classType, propType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-gem-plugin",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Typescript language service plugin for Gem",
   "keywords": [
     "gem",
@@ -14,17 +14,17 @@
     "prepublishOnly": "pnpm run build"
   },
   "dependencies": {
-    "@mantou/gem": "^2.2.0",
+    "@mantou/gem": "^2.2.1",
     "@mantou/typescript-template-language-service-decorator": "^2.3.4",
     "@mantou/vscode-css-languageservice": "^6.3.3",
     "@mantou/vscode-emmet-helper": "^2.9.3",
-    "@mantou/vscode-html-languageservice": "^5.3.4",
-    "duoyun-ui": "^2.2.0",
+    "@mantou/vscode-html-languageservice": "^5.3.6",
+    "duoyun-ui": "^2.2.1",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-languageserver-types": "^3.17.5"
   },
   "devDependencies": {
-    "@gemjs/config": "^2.1.0",
+    "@gemjs/config": "^2.1.1",
     "typescript": "^5.6.2"
   },
   "author": "mantou132",