vscode-css-languageservice 6.2.13 → 6.3.0

package/lib/umd/parser/cssNodes.js

@@ -109,6 +109,7 @@
         NodeType[NodeType["LayerName"] = 85] = "LayerName";
         NodeType[NodeType["PropertyAtRule"] = 86] = "PropertyAtRule";
         NodeType[NodeType["Container"] = 87] = "Container";
+        NodeType[NodeType["ModuleConfig"] = 88] = "ModuleConfig";
     })(NodeType || (exports.NodeType = NodeType = {}));
     var ReferenceType;
     (function (ReferenceType) {
@@ -837,10 +838,10 @@
         get type() {
             return NodeType.Use;
         }
+        setParameters(value) {
+            return this.setNode('parameters', value);
+        }
         getParameters() {
-            if (!this.parameters) {
-                this.parameters = new Nodelist(this);
-            }
             return this.parameters;
         }
         setIdentifier(node) {
@@ -882,16 +883,10 @@
         getIdentifier() {
             return this.identifier;
         }
-        getMembers() {
-            if (!this.members) {
-                this.members = new Nodelist(this);
-            }
-            return this.members;
+        setParameters(value) {
+            return this.setNode('parameters', value);
         }
         getParameters() {
-            if (!this.parameters) {
-                this.parameters = new Nodelist(this);
-            }
             return this.parameters;
         }
     }

package/lib/umd/parser/cssParser.js

@@ -287,7 +287,7 @@
                 || this._parseViewPort()
                 || this._parseNamespace()
                 || this._parseDocument()
-                || this._parseContainer()
+                || this._parseContainer(isNested)
                 || this._parseUnknownAtRule();
         }
         _tryParseRuleset(isNested) {
@@ -321,6 +321,7 @@
             return this._parseMedia(true)
                 || this._parseSupports(true)
                 || this._parseLayer(true)
+                || this._parseContainer(true)
                 || this._parseUnknownAtRule();
         }
         _parseRuleSetDeclaration() {
@@ -1148,7 +1149,14 @@
             this.resync([], [cssScanner_1.TokenType.CurlyL]); // ignore all the rules
             return this._parseBody(node, this._parseStylesheetStatement.bind(this));
         }
-        _parseContainer() {
+        _parseContainerDeclaration(isNested = false) {
+            if (isNested) {
+                // if nested, the body can contain rulesets, but also declarations
+                return this._tryParseRuleset(true) || this._tryToParseDeclaration() || this._parseStylesheetStatement(true);
+            }
+            return this._parseStylesheetStatement(false);
+        }
+        _parseContainer(isNested = false) {
             if (!this.peekKeyword('@container')) {
                 return null;
             }
@@ -1156,7 +1164,7 @@
             this.consumeToken(); // @container
             node.addChild(this._parseIdent()); // optional container name
             node.addChild(this._parseContainerQuery());
-            return this._parseBody(node, this._parseStylesheetStatement.bind(this));
+            return this._parseBody(node, this._parseContainerDeclaration.bind(this, isNested));
         }
         _parseContainerQuery() {
             // <container-query>     = not <query-in-parens>

package/lib/umd/parser/lessParser.js

@@ -285,7 +285,7 @@
                     || this._parseSupports(true) // @supports
                     || this._parseLayer() // @layer
                     || this._parsePropertyAtRule() // @property
-                    || this._parseContainer() // @container
+                    || this._parseContainer(true) // @container
                     || this._parseDetachedRuleSetMixin() // less detached ruleset mixin
                     || this._parseVariableDeclaration() // Variable declarations
                     || this._parseRuleSetDeclarationAtStatement();

package/lib/umd/parser/scssParser.js

@@ -230,7 +230,7 @@
                     || this._parseSupports(true) // @supports
                     || this._parseLayer() // @layer
                     || this._parsePropertyAtRule() // @property
-                    || this._parseContainer() // @container
+                    || this._parseContainer(true) // nested @container
                     || this._parseRuleSetDeclarationAtStatement();
             }
             return this._parseVariableDeclaration() // variable declaration
@@ -716,24 +716,9 @@
                     return this.finish(node, cssErrors_1.ParseError.IdentifierOrWildcardExpected);
                 }
                 if (this.acceptIdent('with')) {
-                    if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                    if (!node.setParameters(this._parseModuleConfig())) {
                         return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [cssScanner_1.TokenType.ParenthesisR]);
                     }
-                    // First variable statement, no comma.
-                    if (!node.getParameters().addChild(this._parseModuleConfigDeclaration())) {
-                        return this.finish(node, cssErrors_1.ParseError.VariableNameExpected);
-                    }
-                    while (this.accept(cssScanner_1.TokenType.Comma)) {
-                        if (this.peek(cssScanner_1.TokenType.ParenthesisR)) {
-                            break;
-                        }
-                        if (!node.getParameters().addChild(this._parseModuleConfigDeclaration())) {
-                            return this.finish(node, cssErrors_1.ParseError.VariableNameExpected);
-                        }
-                    }
-                    if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
-                        return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected);
-                    }
                 }
             }
             if (!this.accept(cssScanner_1.TokenType.SemiColon) && !this.accept(cssScanner_1.TokenType.EOF)) {
@@ -741,6 +726,28 @@
             }
             return this.finish(node);
         }
+        _parseModuleConfig() {
+            const node = this.createNode(nodes.NodeType.ModuleConfig);
+            if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                return null;
+            }
+            // First variable statement, no comma.
+            if (!node.addChild(this._parseModuleConfigDeclaration())) {
+                return this.finish(node, cssErrors_1.ParseError.VariableNameExpected);
+            }
+            while (this.accept(cssScanner_1.TokenType.Comma)) {
+                if (this.peek(cssScanner_1.TokenType.ParenthesisR)) {
+                    break;
+                }
+                if (!node.addChild(this._parseModuleConfigDeclaration())) {
+                    return this.finish(node, cssErrors_1.ParseError.VariableNameExpected);
+                }
+            }
+            if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
+                return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected);
+            }
+            return this.finish(node);
+        }
         _parseModuleConfigDeclaration() {
             const node = this.create(nodes.ModuleConfiguration);
             if (!node.setIdentifier(this._parseVariable())) {
@@ -776,24 +783,9 @@
                 }
             }
             if (this.acceptIdent('with')) {
-                if (!this.accept(cssScanner_1.TokenType.ParenthesisL)) {
+                if (!node.setParameters(this._parseModuleConfig())) {
                     return this.finish(node, cssErrors_1.ParseError.LeftParenthesisExpected, [cssScanner_1.TokenType.ParenthesisR]);
                 }
-                // First variable statement, no comma.
-                if (!node.getParameters().addChild(this._parseModuleConfigDeclaration())) {
-                    return this.finish(node, cssErrors_1.ParseError.VariableNameExpected);
-                }
-                while (this.accept(cssScanner_1.TokenType.Comma)) {
-                    if (this.peek(cssScanner_1.TokenType.ParenthesisR)) {
-                        break;
-                    }
-                    if (!node.getParameters().addChild(this._parseModuleConfigDeclaration())) {
-                        return this.finish(node, cssErrors_1.ParseError.VariableNameExpected);
-                    }
-                }
-                if (!this.accept(cssScanner_1.TokenType.ParenthesisR)) {
-                    return this.finish(node, cssErrors_1.ParseError.RightParenthesisExpected);
-                }
             }
             else if (this.peekIdent('hide') || this.peekIdent('show')) {
                 if (!node.addChild(this._parseForwardVisibility())) {

package/lib/umd/services/cssNavigation.js

@@ -13,7 +13,7 @@
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.CSSNavigation = void 0;
+    exports.getModuleNameFromPath = exports.CSSNavigation = void 0;
     const cssLanguageTypes_1 = require("../cssLanguageTypes");
     const l10n = require("@vscode/l10n");
     const nodes = require("../parser/cssNodes");
@@ -59,7 +59,7 @@
         getHighlightNode(document, position, stylesheet) {
             const offset = document.offsetAt(position);
             let node = nodes.getNodeAtOffset(stylesheet, offset);
-            if (!node || node.type === nodes.NodeType.Stylesheet || node.type === nodes.NodeType.Declarations) {
+            if (!node || node.type === nodes.NodeType.Stylesheet || node.type === nodes.NodeType.Declarations || node.type === nodes.NodeType.ModuleConfig) {
                 return;
             }
             if (node.type === nodes.NodeType.Identifier && node.parent && node.parent.type === nodes.NodeType.ClassSelector) {
@@ -418,6 +418,17 @@
                 return false;
             }
         }
+        async getContent(uri) {
+            if (!this.fileSystemProvider || !this.fileSystemProvider.getContent) {
+                return null;
+            }
+            try {
+                return await this.fileSystemProvider.getContent(uri);
+            }
+            catch (err) {
+                return null;
+            }
+        }
     }
     exports.CSSNavigation = CSSNavigation;
     function getColorInformation(node, document) {
@@ -494,4 +505,5 @@
         // Otherwise get until first instance of '/'
         return path.substring(0, firstSlash);
     }
+    exports.getModuleNameFromPath = getModuleNameFromPath;
 });

package/lib/umd/services/scssNavigation.js

@@ -4,7 +4,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./cssNavigation", "../parser/cssNodes", "vscode-uri", "../utils/strings"], factory);
+        define(["require", "exports", "./cssNavigation", "../parser/cssNodes", "vscode-uri", "../utils/strings", "../utils/resources"], factory);
     }
 })(function (require, exports) {
     /*---------------------------------------------------------------------------------------------
@@ -18,6 +18,7 @@
     const nodes = require("../parser/cssNodes");
     const vscode_uri_1 = require("vscode-uri");
     const strings_1 = require("../utils/strings");
+    const resources_1 = require("../utils/resources");
     class SCSSNavigation extends cssNavigation_1.CSSNavigation {
         constructor(fileSystemProvider) {
             super(fileSystemProvider, true);
@@ -42,8 +43,102 @@
             if ((0, strings_1.startsWith)(target, 'sass:')) {
                 return undefined; // sass library
             }
+            // Following the [sass package importer](https://github.com/sass/sass/blob/f6832f974c61e35c42ff08b3640ff155071a02dd/js-api-doc/importer.d.ts#L349),
+            // look for the `exports` field of the module and any `sass`, `style` or `default` that matches the import.
+            // If it's only `pkg:module`, also look for `sass` and `style` on the root of package.json.
+            if (target.startsWith('pkg:')) {
+                return this.resolvePkgModulePath(target, documentUri, documentContext);
+            }
             return super.resolveReference(target, documentUri, documentContext, isRawLink);
         }
+        async resolvePkgModulePath(target, documentUri, documentContext) {
+            const bareTarget = target.replace('pkg:', '');
+            const moduleName = bareTarget.includes('/') ? (0, cssNavigation_1.getModuleNameFromPath)(bareTarget) : bareTarget;
+            const rootFolderUri = documentContext.resolveReference('/', documentUri);
+            const documentFolderUri = (0, resources_1.dirname)(documentUri);
+            const modulePath = await this.resolvePathToModule(moduleName, documentFolderUri, rootFolderUri);
+            if (!modulePath) {
+                return undefined;
+            }
+            // Since submodule exports import strings don't match the file system,
+            // we need the contents of `package.json` to look up the correct path.
+            let packageJsonContent = await this.getContent((0, resources_1.joinPath)(modulePath, 'package.json'));
+            if (!packageJsonContent) {
+                return undefined;
+            }
+            let packageJson;
+            try {
+                packageJson = JSON.parse(packageJsonContent);
+            }
+            catch (e) {
+                // problems parsing package.json
+                return undefined;
+            }
+            const subpath = bareTarget.substring(moduleName.length + 1);
+            if (packageJson.exports) {
+                if (!subpath) {
+                    const dotExport = packageJson.exports['.'];
+                    // look for the default/index export
+                    // @ts-expect-error If ['.'] is a string this just produces undefined
+                    const entry = dotExport && (dotExport['sass'] || dotExport['style'] || dotExport['default']);
+                    // the 'default' entry can be whatever, typically .js – confirm it looks like `scss`
+                    if (entry && entry.endsWith('.scss')) {
+                        const entryPath = (0, resources_1.joinPath)(modulePath, entry);
+                        return entryPath;
+                    }
+                }
+                else {
+                    // The import string may be with or without .scss.
+                    // Likewise the exports entry. Look up both paths.
+                    // However, they need to be relative (start with ./).
+                    const lookupSubpath = subpath.endsWith('.scss') ? `./${subpath.replace('.scss', '')}` : `./${subpath}`;
+                    const lookupSubpathScss = subpath.endsWith('.scss') ? `./${subpath}` : `./${subpath}.scss`;
+                    const subpathObject = packageJson.exports[lookupSubpathScss] || packageJson.exports[lookupSubpath];
+                    if (subpathObject) {
+                        // @ts-expect-error If subpathObject is a string this just produces undefined
+                        const entry = subpathObject['sass'] || subpathObject['styles'] || subpathObject['default'];
+                        // the 'default' entry can be whatever, typically .js – confirm it looks like `scss`
+                        if (entry && entry.endsWith('.scss')) {
+                            const entryPath = (0, resources_1.joinPath)(modulePath, entry);
+                            return entryPath;
+                        }
+                    }
+                    else {
+                        // We have a subpath, but found no matches on direct lookup.
+                        // It may be a [subpath pattern](https://nodejs.org/api/packages.html#subpath-patterns).
+                        for (const [maybePattern, subpathObject] of Object.entries(packageJson.exports)) {
+                            if (!maybePattern.includes("*")) {
+                                continue;
+                            }
+                            // Patterns may also be without `.scss` on the left side, so compare without on both sides
+                            const re = new RegExp((0, strings_1.convertSimple2RegExpPattern)(maybePattern.replace('.scss', '')).replace(/\.\*/g, '(.*)'));
+                            const match = re.exec(lookupSubpath);
+                            if (match) {
+                                // @ts-expect-error If subpathObject is a string this just produces undefined
+                                const entry = subpathObject['sass'] || subpathObject['styles'] || subpathObject['default'];
+                                // the 'default' entry can be whatever, typically .js – confirm it looks like `scss`
+                                if (entry && entry.endsWith('.scss')) {
+                                    // The right-hand side of a subpath pattern is also a pattern.
+                                    // Replace the pattern with the match from our regexp capture group above.
+                                    const expandedPattern = entry.replace('*', match[1]);
+                                    const entryPath = (0, resources_1.joinPath)(modulePath, expandedPattern);
+                                    return entryPath;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            else if (!subpath && (packageJson.sass || packageJson.style)) {
+                // Fall back to a direct lookup on `sass` and `style` on package root
+                const entry = packageJson.sass || packageJson.style;
+                if (entry) {
+                    const entryPath = (0, resources_1.joinPath)(modulePath, entry);
+                    return entryPath;
+                }
+            }
+            return undefined;
+        }
     }
     exports.SCSSNavigation = SCSSNavigation;
     function toPathVariations(target) {

package/lib/umd/utils/strings.js

@@ -13,7 +13,7 @@
      *--------------------------------------------------------------------------------------------*/
     'use strict';
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.repeat = exports.trim = exports.getLimitedString = exports.difference = exports.endsWith = exports.startsWith = void 0;
+    exports.convertSimple2RegExpPattern = exports.repeat = exports.trim = exports.getLimitedString = exports.difference = exports.endsWith = exports.startsWith = void 0;
     function startsWith(haystack, needle) {
         if (haystack.length < needle.length) {
             return false;
@@ -117,4 +117,8 @@
         return s;
     }
     exports.repeat = repeat;
+    function convertSimple2RegExpPattern(pattern) {
+        return pattern.replace(/[\-\\\{\}\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&').replace(/[\*]/g, '.*');
+    }
+    exports.convertSimple2RegExpPattern = convertSimple2RegExpPattern;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-css-languageservice",
-  "version": "6.2.13",
+  "version": "6.3.0",
   "description": "Language service for CSS, LESS and SCSS",
   "main": "./lib/umd/cssLanguageService.js",
   "typings": "./lib/umd/cssLanguageService",
@@ -15,17 +15,17 @@
     "url": "https://github.com/Microsoft/vscode-css-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.7",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
-    "@vscode/web-custom-data": "^0.4.9",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
+    "@vscode/web-custom-data": "^0.4.11",
     "eslint": "^8.57.0",
     "js-beautify": "^1.15.1",
-    "mocha": "^10.3.0",
-    "rimraf": "^5.0.5",
+    "mocha": "^10.4.0",
+    "rimraf": "^5.0.7",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@vscode/l10n": "^0.0.18",