@css-modules-kit/ts-plugin 0.0.6 → 0.1.1

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,QAAA,MAAM,MAAM,iDA2CV,CAAC;AAEH,SAAS,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,QAAA,MAAM,MAAM,iDA4CV,CAAC;AAEH,SAAS,MAAM,CAAC"}

package/dist/index.js

@@ -30,10 +30,11 @@ const plugin = (0, createLanguageServicePlugin_js_1.createLanguageServicePlugin)
             return { languagePlugins: [] };
         }
     }
-    const resolver = (0, core_1.createResolver)(config.compilerOptions);
+    const moduleResolutionCache = info.languageServiceHost.getModuleResolutionCache?.();
+    const resolver = (0, core_1.createResolver)(config.compilerOptions, moduleResolutionCache);
     const matchesPattern = (0, core_1.createMatchesPattern)(config);
     return {
-        languagePlugins: [(0, language_plugin_js_1.createCSSModuleLanguagePlugin)(resolver, matchesPattern)],
+        languagePlugins: [(0, language_plugin_js_1.createCSSLanguagePlugin)(resolver, matchesPattern)],
         setup: (language) => {
             info.languageService = (0, proxy_js_1.proxyLanguageService)(language, info.languageService, info.project, resolver, matchesPattern);
         },

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,gDAA6F;AAC7F,gDAAkE;AAClE,oHAA8G;AAC9G,6DAAqE;AACrE,0DAAmE;AAEnE,MAAM,MAAM,GAAG,IAAA,4DAA2B,EAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;IACtD,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QACxG,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,MAAiB,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;QACvD,2BAA2B;QAC3B,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CACrC,4DAA4D,MAAM,CAAC,cAAc,GAAG,CACrF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,uDAAuD;QACvD,IAAI,KAAK,YAAY,gCAAyB,EAAE,CAAC;YAC/C,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,GAAG,8DAA8D,CAAC;YACzE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,GAAG,IAAI,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;gBAC9B,GAAG,IAAI,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,IAAA,2BAAoB,EAAC,MAAM,CAAC,CAAC;IAEpD,OAAO;QACL,eAAe,EAAE,CAAC,IAAA,kDAA6B,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC1E,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;YAClB,IAAI,CAAC,eAAe,GAAG,IAAA,+BAAoB,EACzC,QAAQ,EACR,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,OAAO,EACZ,QAAQ,EACR,cAAc,CACf,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,iBAAS,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,gDAA6F;AAC7F,gDAAkE;AAClE,oHAA8G;AAC9G,6DAA+D;AAC/D,0DAAmE;AAEnE,MAAM,MAAM,GAAG,IAAA,4DAA2B,EAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;IACtD,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QACxG,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,MAAiB,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;QACvD,2BAA2B;QAC3B,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CACrC,4DAA4D,MAAM,CAAC,cAAc,GAAG,CACrF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,uDAAuD;QACvD,IAAI,KAAK,YAAY,gCAAyB,EAAE,CAAC;YAC/C,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,GAAG,8DAA8D,CAAC;YACzE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,GAAG,IAAI,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;gBAC9B,GAAG,IAAI,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,wBAAwB,EAAE,EAAE,CAAC;IACpF,MAAM,QAAQ,GAAG,IAAA,qBAAc,EAAC,MAAM,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;IAC/E,MAAM,cAAc,GAAG,IAAA,2BAAoB,EAAC,MAAM,CAAC,CAAC;IAEpD,OAAO;QACL,eAAe,EAAE,CAAC,IAAA,4CAAuB,EAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACpE,KAAK,EAAE,CAAC,QAAQ,EAAE,EAAE;YAClB,IAAI,CAAC,eAAe,GAAG,IAAA,+BAAoB,EACzC,QAAQ,EACR,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,OAAO,EACZ,QAAQ,EACR,cAAc,CACf,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,iBAAS,MAAM,CAAC"}

package/dist/language-plugin.d.ts

@@ -1,11 +1,11 @@
-import type { CSSModule, MatchesPattern, Resolver, SyntacticDiagnostic } from '@css-modules-kit/core';
+import type { CSSModule, DiagnosticWithLocation, MatchesPattern, Resolver } from '@css-modules-kit/core';
 import type { LanguagePlugin, SourceScript, VirtualCode } from '@volar/language-core';
-export declare const LANGUAGE_ID = "css-module";
+export declare const LANGUAGE_ID = "css";
 export declare const CMK_DATA_KEY: unique symbol;
 interface CSSModuleVirtualCode extends VirtualCode {
     [CMK_DATA_KEY]: {
         cssModule: CSSModule;
-        diagnostics: SyntacticDiagnostic[];
+        syntacticDiagnostics: DiagnosticWithLocation[];
     };
 }
 export interface CSSModuleScript extends SourceScript<string> {
@@ -13,7 +13,7 @@ export interface CSSModuleScript extends SourceScript<string> {
         root: CSSModuleVirtualCode;
     };
 }
-export declare function createCSSModuleLanguagePlugin(resolver: Resolver, matchesPattern: MatchesPattern): LanguagePlugin<string, VirtualCode>;
+export declare function createCSSLanguagePlugin(resolver: Resolver, matchesPattern: MatchesPattern): LanguagePlugin<string, VirtualCode>;
 export declare function isCSSModuleScript(script: SourceScript<string> | undefined): script is CSSModuleScript;
 export {};
 //# sourceMappingURL=language-plugin.d.ts.map

package/dist/language-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"language-plugin.d.ts","sourceRoot":"","sources":["../src/language-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEtG,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAItF,eAAO,MAAM,WAAW,eAAe,CAAC;AAExC,eAAO,MAAM,YAAY,eAAiC,CAAC;AAE3D,UAAU,oBAAqB,SAAQ,WAAW;IAChD,CAAC,YAAY,CAAC,EAAE;QACd,SAAS,EAAE,SAAS,CAAC;QACrB,WAAW,EAAE,mBAAmB,EAAE,CAAC;KACpC,CAAC;CACH;AAED,MAAM,WAAW,eAAgB,SAAQ,YAAY,CAAC,MAAM,CAAC;IAC3D,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,GAAG;QAC7C,IAAI,EAAE,oBAAoB,CAAC;KAC5B,CAAC;CACH;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,GAC7B,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAqDrC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,GAAG,MAAM,IAAI,eAAe,CAIrG"}
+{"version":3,"file":"language-plugin.d.ts","sourceRoot":"","sources":["../src/language-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,sBAAsB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEzG,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAItF,eAAO,MAAM,WAAW,QAAQ,CAAC;AAEjC,eAAO,MAAM,YAAY,eAAiC,CAAC;AAE3D,UAAU,oBAAqB,SAAQ,WAAW;IAChD,CAAC,YAAY,CAAC,EAAE;QACd,SAAS,EAAE,SAAS,CAAC;QACrB,oBAAoB,EAAE,sBAAsB,EAAE,CAAC;KAChD,CAAC;CACH;AAED,MAAM,WAAW,eAAgB,SAAQ,YAAY,CAAC,MAAM,CAAC;IAC3D,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,GAAG;QAC7C,IAAI,EAAE,oBAAoB,CAAC;KAC5B,CAAC;CACH;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,GAC7B,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAgErC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG,SAAS,GAAG,MAAM,IAAI,eAAe,CAIrG"}

package/dist/language-plugin.js

@@ -4,22 +4,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CMK_DATA_KEY = exports.LANGUAGE_ID = void 0;
-exports.createCSSModuleLanguagePlugin = createCSSModuleLanguagePlugin;
+exports.createCSSLanguagePlugin = createCSSLanguagePlugin;
 exports.isCSSModuleScript = isCSSModuleScript;
 const core_1 = require("@css-modules-kit/core");
 const typescript_1 = __importDefault(require("typescript"));
-exports.LANGUAGE_ID = 'css-module';
+exports.LANGUAGE_ID = 'css';
 exports.CMK_DATA_KEY = Symbol('css-modules-kit-data');
-function createCSSModuleLanguagePlugin(resolver, matchesPattern) {
+function createCSSLanguagePlugin(resolver, matchesPattern) {
     return {
         getLanguageId(scriptId) {
-            if (!matchesPattern(scriptId))
+            if (!scriptId.endsWith('.css'))
                 return undefined;
             return exports.LANGUAGE_ID;
         },
         createVirtualCode(scriptId, languageId, snapshot) {
             if (languageId !== exports.LANGUAGE_ID)
                 return undefined;
+            if (!matchesPattern(scriptId)) {
+                // `scriptId` is CSS, but not a CSS module.
+                // If an empty VirtualCode is not returned for a CSS file, tsserver will treat it as TypeScript code.
+                // ref: https://github.com/mizdra/css-modules-kit/issues/170
+                return {
+                    id: 'main',
+                    languageId,
+                    snapshot,
+                    mappings: [],
+                };
+            }
             const length = snapshot.getLength();
             const cssModuleCode = snapshot.getText(0, length);
             const { cssModule, diagnostics } = (0, core_1.parseCSSModule)(cssModuleCode, {
@@ -43,7 +54,7 @@ function createCSSModuleLanguagePlugin(resolver, matchesPattern) {
                 linkedCodeMappings: [{ ...linkedCodeMapping, data: undefined }],
                 [exports.CMK_DATA_KEY]: {
                     cssModule,
-                    diagnostics,
+                    syntacticDiagnostics: diagnostics,
                 },
             };
         },

package/dist/language-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"language-plugin.js","sourceRoot":"","sources":["../src/language-plugin.ts"],"names":[],"mappings":";;;;;;AAuBA,sEAwDC;AAED,8CAIC;AApFD,gDAAkE;AAGlE,4DAA4B;AAEf,QAAA,WAAW,GAAG,YAAY,CAAC;AAE3B,QAAA,YAAY,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAe3D,SAAgB,6BAA6B,CAC3C,QAAkB,EAClB,cAA8B;IAE9B,OAAO;QACL,aAAa,CAAC,QAAQ;YACpB,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;gBAAE,OAAO,SAAS,CAAC;YAChD,OAAO,mBAAW,CAAC;QACrB,CAAC;QACD,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ;YAC9C,IAAI,UAAU,KAAK,mBAAW;gBAAE,OAAO,SAAS,CAAC;YAEjD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;YAClD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,IAAA,qBAAc,EAAC,aAAa,EAAE;gBAC/D,QAAQ,EAAE,QAAQ;gBAClB,sFAAsF;gBACtF,2DAA2D;gBAC3D,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,IAAA,gBAAS,EAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;YAChG,OAAO;gBACL,EAAE,EAAE,MAAM;gBACV,UAAU,EAAE,mBAAW;gBACvB,QAAQ,EAAE;oBACR,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC;oBAC/C,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM;oBAC5B,cAAc,EAAE,GAAG,EAAE,CAAC,SAAS;iBAChC;gBACD,qEAAqE;gBACrE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;gBACtD,uGAAuG;gBACvG,kBAAkB,EAAE,CAAC,EAAE,GAAG,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;gBAC/D,CAAC,oBAAY,CAAC,EAAE;oBACd,SAAS;oBACT,WAAW;iBACZ;aACF,CAAC;QACJ,CAAC;QACD,UAAU,EAAE;YACV,mBAAmB,EAAE;gBACnB;oBACE,SAAS,EAAE,KAAK;oBAChB,cAAc,EAAE,IAAI;oBACpB,UAAU,EAAE,oBAAE,CAAC,UAAU,CAAC,EAAE;iBAC7B;aACF;YACD,gBAAgB,CAAC,IAAI;gBACnB,OAAO;oBACL,IAAI,EAAE,IAAI;oBACV,SAAS,EAAE,oBAAE,CAAC,SAAS,CAAC,EAAE;oBAC1B,UAAU,EAAE,oBAAE,CAAC,UAAU,CAAC,EAAE;iBAC7B,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,MAAwC;IACxE,OAAO,CACL,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,KAAK,mBAAW,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,IAAI,oBAAY,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CACnH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"language-plugin.js","sourceRoot":"","sources":["../src/language-plugin.ts"],"names":[],"mappings":"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"}

package/dist/language-service/feature/completion.js

@@ -40,7 +40,7 @@ function isStylesEntryForCSSModuleFile(entry, cssModuleFileName) {
 function isClassNamePropEntry(entry) {
     return (entry.name === 'className' &&
         entry.kind === typescript_1.default.ScriptElementKind.memberVariableElement &&
-        entry.insertText === 'className="$1"' &&
+        (entry.insertText === 'className="$1"' || entry.insertText === "className='$1'") &&
         entry.isSnippet);
 }
 //# sourceMappingURL=completion.js.map

package/dist/language-service/feature/completion.js.map

@@ -1 +1 @@
-{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/language-service/feature/completion.ts"],"names":[],"mappings":";;;;;AAGA,4DAqBC;AAxBD,gDAAsG;AACtG,4DAA4B;AAE5B,SAAgB,wBAAwB,CACtC,eAAmC;IAEnC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,eAAe,CAAC,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAExG,IAAI,IAAA,0BAAmB,EAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC;YAC3C,MAAM,iBAAiB,GAAG,IAAA,2BAAoB,EAAC,QAAQ,CAAC,CAAC;YACzD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClC,IAAI,6BAA6B,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC5D,2FAA2F;oBAC3F,qEAAqE;oBACrE,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC;gBACvB,CAAC;qBAAM,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;oBACvC,yEAAyE;oBACzE,KAAK,CAAC,UAAU,GAAG,gBAAgB,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,6BAA6B,CAAC,KAAyB,EAAE,iBAAyB;IACzF,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,yBAAkB;QACjC,KAAK,CAAC,IAAI;QACV,wEAAwE;QACxE,KAAK,CAAC,IAAI,CAAC,UAAU,KAAK,oBAAE,CAAC,kBAAkB,CAAC,OAAO;QACvD,KAAK,CAAC,IAAI,CAAC,QAAQ;QACnB,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,iBAAiB,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAyB;IACrD,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,WAAW;QAC1B,KAAK,CAAC,IAAI,KAAK,oBAAE,CAAC,iBAAiB,CAAC,qBAAqB;QACzD,KAAK,CAAC,UAAU,KAAK,gBAAgB;QACrC,KAAK,CAAC,SAAS,CAChB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"completion.js","sourceRoot":"","sources":["../../../src/language-service/feature/completion.ts"],"names":[],"mappings":";;;;;AAGA,4DAqBC;AAxBD,gDAAsG;AACtG,4DAA4B;AAE5B,SAAgB,wBAAwB,CACtC,eAAmC;IAEnC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,eAAe,CAAC,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAExG,IAAI,IAAA,0BAAmB,EAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC;YAC3C,MAAM,iBAAiB,GAAG,IAAA,2BAAoB,EAAC,QAAQ,CAAC,CAAC;YACzD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClC,IAAI,6BAA6B,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC5D,2FAA2F;oBAC3F,qEAAqE;oBACrE,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC;gBACvB,CAAC;qBAAM,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;oBACvC,yEAAyE;oBACzE,KAAK,CAAC,UAAU,GAAG,gBAAgB,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,6BAA6B,CAAC,KAAyB,EAAE,iBAAyB;IACzF,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,yBAAkB;QACjC,KAAK,CAAC,IAAI;QACV,wEAAwE;QACxE,KAAK,CAAC,IAAI,CAAC,UAAU,KAAK,oBAAE,CAAC,kBAAkB,CAAC,OAAO;QACvD,KAAK,CAAC,IAAI,CAAC,QAAQ;QACnB,KAAK,CAAC,IAAI,CAAC,QAAQ,KAAK,iBAAiB,CAC1C,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAyB;IACrD,OAAO,CACL,KAAK,CAAC,IAAI,KAAK,WAAW;QAC1B,KAAK,CAAC,IAAI,KAAK,oBAAE,CAAC,iBAAiB,CAAC,qBAAqB;QACzD,CAAC,KAAK,CAAC,UAAU,KAAK,gBAAgB,IAAI,KAAK,CAAC,UAAU,KAAK,gBAAgB,CAAC;QAChF,KAAK,CAAC,SAAS,CAChB,CAAC;AACJ,CAAC"}

package/dist/language-service/feature/semantic-diagnostic.d.ts

@@ -1,5 +1,5 @@
 import type { CSSModule, ExportBuilder, MatchesPattern, Resolver } from '@css-modules-kit/core';
 import type { Language } from '@volar/language-core';
-import ts from 'typescript';
+import type ts from 'typescript';
 export declare function getSemanticDiagnostics(language: Language<string>, languageService: ts.LanguageService, exportBuilder: ExportBuilder, resolver: Resolver, matchesPattern: MatchesPattern, getCSSModule: (path: string) => CSSModule | undefined): ts.LanguageService['getSemanticDiagnostics'];
 //# sourceMappingURL=semantic-diagnostic.d.ts.map

package/dist/language-service/feature/semantic-diagnostic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semantic-diagnostic.d.ts","sourceRoot":"","sources":["../../../src/language-service/feature/semantic-diagnostic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAsB,MAAM,uBAAuB,CAAC;AAEpH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,MAAM,YAAY,CAAC;AAK5B,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC1B,eAAe,EAAE,EAAE,CAAC,eAAe,EACnC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,GACpD,EAAE,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAkB9C"}
+{"version":3,"file":"semantic-diagnostic.d.ts","sourceRoot":"","sources":["../../../src/language-service/feature/semantic-diagnostic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEhG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAIjC,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC1B,eAAe,EAAE,EAAE,CAAC,eAAe,EACnC,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,SAAS,GAAG,SAAS,GACpD,EAAE,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAkB9C"}

package/dist/language-service/feature/semantic-diagnostic.js

@@ -1,13 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSemanticDiagnostics = getSemanticDiagnostics;
 const core_1 = require("@css-modules-kit/core");
-const typescript_1 = __importDefault(require("typescript"));
 const language_plugin_js_1 = require("../../language-plugin.js");
-const util_js_1 = require("../../util.js");
 // eslint-disable-next-line max-params
 function getSemanticDiagnostics(language, languageService, exportBuilder, resolver, matchesPattern, getCSSModule) {
     return (fileName) => {
@@ -20,26 +15,10 @@ function getSemanticDiagnostics(language, languageService, exportBuilder, resolv
             exportBuilder.clearCache();
             const diagnostics = (0, core_1.checkCSSModule)(cssModule, exportBuilder, matchesPattern, resolver, getCSSModule);
             const sourceFile = languageService.getProgram().getSourceFile(fileName);
-            const tsDiagnostics = diagnostics.map((diagnostic) => convertDiagnostic(diagnostic, sourceFile));
+            const tsDiagnostics = diagnostics.map((diagnostic) => (0, core_1.convertDiagnostic)(diagnostic, () => sourceFile));
             prior.push(...tsDiagnostics);
         }
         return prior;
     };
 }
-function convertDiagnostic(diagnostic, sourceFile) {
-    const start = diagnostic.start ?
-        typescript_1.default.getPositionOfLineAndCharacter(sourceFile, diagnostic.start.line - 1, diagnostic.start.column - 1)
-        : undefined;
-    const length = start !== undefined && diagnostic.end ?
-        typescript_1.default.getPositionOfLineAndCharacter(sourceFile, diagnostic.end.line - 1, diagnostic.end.column - 1) - start
-        : undefined;
-    return {
-        file: sourceFile,
-        start,
-        category: (0, util_js_1.convertErrorCategory)(diagnostic.category),
-        length,
-        messageText: diagnostic.text,
-        code: util_js_1.TS_ERROR_CODE_FOR_CMK_ERROR,
-    };
-}
 //# sourceMappingURL=semantic-diagnostic.js.map

package/dist/language-service/feature/semantic-diagnostic.js.map

@@ -1 +1 @@
-{"version":3,"file":"semantic-diagnostic.js","sourceRoot":"","sources":["../../../src/language-service/feature/semantic-diagnostic.ts"],"names":[],"mappings":";;;;;AAQA,wDAyBC;AAhCD,gDAAuD;AAEvD,4DAA4B;AAC5B,iEAA2E;AAC3E,2CAAkF;AAElF,sCAAsC;AACtC,SAAgB,sBAAsB,CACpC,QAA0B,EAC1B,eAAmC,EACnC,aAA4B,EAC5B,QAAkB,EAClB,cAA8B,EAC9B,YAAqD;IAErD,OAAO,CAAC,QAAgB,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,eAAe,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,IAAA,sCAAiB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,iCAAY,CAAC,CAAC,SAAS,CAAC;YAEtD,qDAAqD;YACrD,aAAa,CAAC,UAAU,EAAE,CAAC;YAE3B,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YACrG,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,EAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC;YAC1E,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;YACjG,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,UAA8B,EAAE,UAAyB;IAClF,MAAM,KAAK,GACT,UAAU,CAAC,KAAK,CAAC,CAAC;QAChB,oBAAE,CAAC,6BAA6B,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACtG,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,MAAM,GACV,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;QACrC,oBAAE,CAAC,6BAA6B,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK;QAC1G,CAAC,CAAC,SAAS,CAAC;IACd,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,KAAK;QACL,QAAQ,EAAE,IAAA,8BAAoB,EAAC,UAAU,CAAC,QAAQ,CAAC;QACnD,MAAM;QACN,WAAW,EAAE,UAAU,CAAC,IAAI;QAC5B,IAAI,EAAE,qCAA2B;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"semantic-diagnostic.js","sourceRoot":"","sources":["../../../src/language-service/feature/semantic-diagnostic.ts"],"names":[],"mappings":";;AAOA,wDAyBC;AA/BD,gDAA0E;AAG1E,iEAA2E;AAE3E,sCAAsC;AACtC,SAAgB,sBAAsB,CACpC,QAA0B,EAC1B,eAAmC,EACnC,aAA4B,EAC5B,QAAkB,EAClB,cAA8B,EAC9B,YAAqD;IAErD,OAAO,CAAC,QAAgB,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,eAAe,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,IAAA,sCAAiB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,iCAAY,CAAC,CAAC,SAAS,CAAC;YAEtD,qDAAqD;YACrD,aAAa,CAAC,UAAU,EAAE,CAAC;YAE3B,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,SAAS,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YACrG,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,EAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC;YAC1E,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAA,wBAAiB,EAAC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;YACvG,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}

package/dist/language-service/feature/syntactic-diagnostic.d.ts

@@ -1,4 +1,4 @@
 import type { Language } from '@volar/language-core';
-import ts from 'typescript';
+import type ts from 'typescript';
 export declare function getSyntacticDiagnostics(language: Language<string>, languageService: ts.LanguageService): ts.LanguageService['getSyntacticDiagnostics'];
 //# sourceMappingURL=syntactic-diagnostic.d.ts.map

package/dist/language-service/feature/syntactic-diagnostic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syntactic-diagnostic.d.ts","sourceRoot":"","sources":["../../../src/language-service/feature/syntactic-diagnostic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,MAAM,YAAY,CAAC;AAI5B,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC1B,eAAe,EAAE,EAAE,CAAC,eAAe,GAClC,EAAE,CAAC,eAAe,CAAC,yBAAyB,CAAC,CAa/C"}
+{"version":3,"file":"syntactic-diagnostic.d.ts","sourceRoot":"","sources":["../../../src/language-service/feature/syntactic-diagnostic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC1B,eAAe,EAAE,EAAE,CAAC,eAAe,GAClC,EAAE,CAAC,eAAe,CAAC,yBAAyB,CAAC,CAe/C"}

package/dist/language-service/feature/syntactic-diagnostic.js

@@ -1,38 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSyntacticDiagnostics = getSyntacticDiagnostics;
-const typescript_1 = __importDefault(require("typescript"));
+const core_1 = require("@css-modules-kit/core");
 const language_plugin_js_1 = require("../../language-plugin.js");
-const util_js_1 = require("../../util.js");
 function getSyntacticDiagnostics(language, languageService) {
     return (fileName) => {
         const prior = languageService.getSyntacticDiagnostics(fileName);
         const script = language.scripts.get(fileName);
         if ((0, language_plugin_js_1.isCSSModuleScript)(script)) {
             const virtualCode = script.generated.root;
-            const diagnostics = virtualCode[language_plugin_js_1.CMK_DATA_KEY].diagnostics;
+            const diagnostics = virtualCode[language_plugin_js_1.CMK_DATA_KEY].syntacticDiagnostics;
             const sourceFile = languageService.getProgram().getSourceFile(fileName);
-            const tsDiagnostics = diagnostics.map((diagnostic) => convertDiagnostic(diagnostic, sourceFile));
+            const tsDiagnostics = diagnostics.map((diagnostic) => (0, core_1.convertDiagnosticWithLocation)(diagnostic, () => sourceFile));
             prior.push(...tsDiagnostics);
         }
         return prior;
     };
 }
-function convertDiagnostic(diagnostic, sourceFile) {
-    const start = typescript_1.default.getPositionOfLineAndCharacter(sourceFile, diagnostic.start.line - 1, diagnostic.start.column - 1);
-    const length = diagnostic.end ?
-        typescript_1.default.getPositionOfLineAndCharacter(sourceFile, diagnostic.end.line - 1, diagnostic.end.column - 1) - start
-        : 1;
-    return {
-        file: sourceFile,
-        start,
-        category: (0, util_js_1.convertErrorCategory)(diagnostic.category),
-        length,
-        messageText: diagnostic.text,
-        code: util_js_1.TS_ERROR_CODE_FOR_CMK_ERROR,
-    };
-}
 //# sourceMappingURL=syntactic-diagnostic.js.map

package/dist/language-service/feature/syntactic-diagnostic.js.map

@@ -1 +1 @@
-{"version":3,"file":"syntactic-diagnostic.js","sourceRoot":"","sources":["../../../src/language-service/feature/syntactic-diagnostic.ts"],"names":[],"mappings":";;;;;AAMA,0DAgBC;AApBD,4DAA4B;AAC5B,iEAA2E;AAC3E,2CAAkF;AAElF,SAAgB,uBAAuB,CACrC,QAA0B,EAC1B,eAAmC;IAEnC,OAAO,CAAC,QAAgB,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,eAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,IAAA,sCAAiB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1C,MAAM,WAAW,GAAG,WAAW,CAAC,iCAAY,CAAC,CAAC,WAAW,CAAC;YAC1D,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,EAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC;YAC1E,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;YACjG,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,UAA+B,EAAE,UAAyB;IACnF,MAAM,KAAK,GAAG,oBAAE,CAAC,6BAA6B,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnH,MAAM,MAAM,GACV,UAAU,CAAC,GAAG,CAAC,CAAC;QACd,oBAAE,CAAC,6BAA6B,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK;QAC1G,CAAC,CAAC,CAAC,CAAC;IACN,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,KAAK;QACL,QAAQ,EAAE,IAAA,8BAAoB,EAAC,UAAU,CAAC,QAAQ,CAAC;QACnD,MAAM;QACN,WAAW,EAAE,UAAU,CAAC,IAAI;QAC5B,IAAI,EAAE,qCAA2B;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"syntactic-diagnostic.js","sourceRoot":"","sources":["../../../src/language-service/feature/syntactic-diagnostic.ts"],"names":[],"mappings":";;AAKA,0DAkBC;AAvBD,gDAAsE;AAGtE,iEAA2E;AAE3E,SAAgB,uBAAuB,CACrC,QAA0B,EAC1B,eAAmC;IAEnC,OAAO,CAAC,QAAgB,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,eAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,IAAA,sCAAiB,EAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YAC1C,MAAM,WAAW,GAAG,WAAW,CAAC,iCAAY,CAAC,CAAC,oBAAoB,CAAC;YACnE,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,EAAG,CAAC,aAAa,CAAC,QAAQ,CAAE,CAAC;YAC1E,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACnD,IAAA,oCAA6B,EAAC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,CAC5D,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@css-modules-kit/ts-plugin",
   "description": "A TypeScript Language Service Plugin for CSS Modules",
-  "version": "0.0.6",
+  "version": "0.1.1",
   "type": "commonjs",
   "sideEffects": false,
   "repository": {
@@ -39,7 +39,7 @@
   "dependencies": {
     "@volar/language-core": "^2.4.11",
     "@volar/typescript": "^2.4.11",
-    "@css-modules-kit/core": "^0.1.0"
+    "@css-modules-kit/core": "^0.2.0"
   },
   "peerDependencies": {
     "typescript": ">=5.6.3"

package/src/index.ts

@@ -2,7 +2,7 @@ import type { CMKConfig } from '@css-modules-kit/core';
 import { createMatchesPattern, createResolver, readConfigFile } from '@css-modules-kit/core';
 import { TsConfigFileNotFoundError } from '@css-modules-kit/core';
 import { createLanguageServicePlugin } from '@volar/typescript/lib/quickstart/createLanguageServicePlugin.js';
-import { createCSSModuleLanguagePlugin } from './language-plugin.js';
+import { createCSSLanguagePlugin } from './language-plugin.js';
 import { proxyLanguageService } from './language-service/proxy.js';
 
 const plugin = createLanguageServicePlugin((ts, info) => {
@@ -33,11 +33,12 @@ const plugin = createLanguageServicePlugin((ts, info) => {
     }
   }
 
-  const resolver = createResolver(config.compilerOptions);
+  const moduleResolutionCache = info.languageServiceHost.getModuleResolutionCache?.();
+  const resolver = createResolver(config.compilerOptions, moduleResolutionCache);
   const matchesPattern = createMatchesPattern(config);
 
   return {
-    languagePlugins: [createCSSModuleLanguagePlugin(resolver, matchesPattern)],
+    languagePlugins: [createCSSLanguagePlugin(resolver, matchesPattern)],
     setup: (language) => {
       info.languageService = proxyLanguageService(
         language,

package/src/language-plugin.ts

@@ -1,17 +1,17 @@
-import type { CSSModule, MatchesPattern, Resolver, SyntacticDiagnostic } from '@css-modules-kit/core';
+import type { CSSModule, DiagnosticWithLocation, MatchesPattern, Resolver } from '@css-modules-kit/core';
 import { createDts, parseCSSModule } from '@css-modules-kit/core';
 import type { LanguagePlugin, SourceScript, VirtualCode } from '@volar/language-core';
 import type {} from '@volar/typescript';
 import ts from 'typescript';
 
-export const LANGUAGE_ID = 'css-module';
+export const LANGUAGE_ID = 'css';
 
 export const CMK_DATA_KEY = Symbol('css-modules-kit-data');
 
 interface CSSModuleVirtualCode extends VirtualCode {
   [CMK_DATA_KEY]: {
     cssModule: CSSModule;
-    diagnostics: SyntacticDiagnostic[];
+    syntacticDiagnostics: DiagnosticWithLocation[];
   };
 }
 
@@ -21,17 +21,28 @@ export interface CSSModuleScript extends SourceScript<string> {
   };
 }
 
-export function createCSSModuleLanguagePlugin(
+export function createCSSLanguagePlugin(
   resolver: Resolver,
   matchesPattern: MatchesPattern,
 ): LanguagePlugin<string, VirtualCode> {
   return {
     getLanguageId(scriptId) {
-      if (!matchesPattern(scriptId)) return undefined;
+      if (!scriptId.endsWith('.css')) return undefined;
       return LANGUAGE_ID;
     },
-    createVirtualCode(scriptId, languageId, snapshot): CSSModuleVirtualCode | undefined {
+    createVirtualCode(scriptId, languageId, snapshot): VirtualCode | CSSModuleVirtualCode | undefined {
       if (languageId !== LANGUAGE_ID) return undefined;
+      if (!matchesPattern(scriptId)) {
+        // `scriptId` is CSS, but not a CSS module.
+        // If an empty VirtualCode is not returned for a CSS file, tsserver will treat it as TypeScript code.
+        // ref: https://github.com/mizdra/css-modules-kit/issues/170
+        return {
+          id: 'main',
+          languageId,
+          snapshot,
+          mappings: [],
+        };
+      }
 
       const length = snapshot.getLength();
       const cssModuleCode = snapshot.getText(0, length);
@@ -56,7 +67,7 @@ export function createCSSModuleLanguagePlugin(
         linkedCodeMappings: [{ ...linkedCodeMapping, data: undefined }],
         [CMK_DATA_KEY]: {
           cssModule,
-          diagnostics,
+          syntacticDiagnostics: diagnostics,
         },
       };
     },

package/src/language-service/feature/completion.ts

@@ -42,7 +42,7 @@ function isClassNamePropEntry(entry: ts.CompletionEntry) {
   return (
     entry.name === 'className' &&
     entry.kind === ts.ScriptElementKind.memberVariableElement &&
-    entry.insertText === 'className="$1"' &&
+    (entry.insertText === 'className="$1"' || entry.insertText === "className='$1'") &&
     entry.isSnippet
   );
 }

package/src/language-service/feature/semantic-diagnostic.ts

@@ -1,9 +1,8 @@
-import type { CSSModule, ExportBuilder, MatchesPattern, Resolver, SemanticDiagnostic } from '@css-modules-kit/core';
-import { checkCSSModule } from '@css-modules-kit/core';
+import type { CSSModule, ExportBuilder, MatchesPattern, Resolver } from '@css-modules-kit/core';
+import { checkCSSModule, convertDiagnostic } from '@css-modules-kit/core';
 import type { Language } from '@volar/language-core';
-import ts from 'typescript';
+import type ts from 'typescript';
 import { CMK_DATA_KEY, isCSSModuleScript } from '../../language-plugin.js';
-import { convertErrorCategory, TS_ERROR_CODE_FOR_CMK_ERROR } from '../../util.js';
 
 // eslint-disable-next-line max-params
 export function getSemanticDiagnostics(
@@ -26,28 +25,9 @@ export function getSemanticDiagnostics(
 
       const diagnostics = checkCSSModule(cssModule, exportBuilder, matchesPattern, resolver, getCSSModule);
       const sourceFile = languageService.getProgram()!.getSourceFile(fileName)!;
-      const tsDiagnostics = diagnostics.map((diagnostic) => convertDiagnostic(diagnostic, sourceFile));
+      const tsDiagnostics = diagnostics.map((diagnostic) => convertDiagnostic(diagnostic, () => sourceFile));
       prior.push(...tsDiagnostics);
     }
     return prior;
   };
 }
-
-function convertDiagnostic(diagnostic: SemanticDiagnostic, sourceFile: ts.SourceFile): ts.Diagnostic {
-  const start =
-    diagnostic.start ?
-      ts.getPositionOfLineAndCharacter(sourceFile, diagnostic.start.line - 1, diagnostic.start.column - 1)
-    : undefined;
-  const length =
-    start !== undefined && diagnostic.end ?
-      ts.getPositionOfLineAndCharacter(sourceFile, diagnostic.end.line - 1, diagnostic.end.column - 1) - start
-    : undefined;
-  return {
-    file: sourceFile,
-    start,
-    category: convertErrorCategory(diagnostic.category),
-    length,
-    messageText: diagnostic.text,
-    code: TS_ERROR_CODE_FOR_CMK_ERROR,
-  };
-}

package/src/language-service/feature/syntactic-diagnostic.ts

@@ -1,8 +1,7 @@
-import type { SyntacticDiagnostic } from '@css-modules-kit/core';
+import { convertDiagnosticWithLocation } from '@css-modules-kit/core';
 import type { Language } from '@volar/language-core';
-import ts from 'typescript';
+import type ts from 'typescript';
 import { CMK_DATA_KEY, isCSSModuleScript } from '../../language-plugin.js';
-import { convertErrorCategory, TS_ERROR_CODE_FOR_CMK_ERROR } from '../../util.js';
 
 export function getSyntacticDiagnostics(
   language: Language<string>,
@@ -13,27 +12,13 @@ export function getSyntacticDiagnostics(
     const script = language.scripts.get(fileName);
     if (isCSSModuleScript(script)) {
       const virtualCode = script.generated.root;
-      const diagnostics = virtualCode[CMK_DATA_KEY].diagnostics;
+      const diagnostics = virtualCode[CMK_DATA_KEY].syntacticDiagnostics;
       const sourceFile = languageService.getProgram()!.getSourceFile(fileName)!;
-      const tsDiagnostics = diagnostics.map((diagnostic) => convertDiagnostic(diagnostic, sourceFile));
+      const tsDiagnostics = diagnostics.map((diagnostic) =>
+        convertDiagnosticWithLocation(diagnostic, () => sourceFile),
+      );
       prior.push(...tsDiagnostics);
     }
     return prior;
   };
 }
-
-function convertDiagnostic(diagnostic: SyntacticDiagnostic, sourceFile: ts.SourceFile): ts.DiagnosticWithLocation {
-  const start = ts.getPositionOfLineAndCharacter(sourceFile, diagnostic.start.line - 1, diagnostic.start.column - 1);
-  const length =
-    diagnostic.end ?
-      ts.getPositionOfLineAndCharacter(sourceFile, diagnostic.end.line - 1, diagnostic.end.column - 1) - start
-    : 1;
-  return {
-    file: sourceFile,
-    start,
-    category: convertErrorCategory(diagnostic.category),
-    length,
-    messageText: diagnostic.text,
-    code: TS_ERROR_CODE_FOR_CMK_ERROR,
-  };
-}