make PostCSS dependency messages more consistent

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changes to PostCSS Sass
 
+### 5.1.1 (December 28, 2023)
+
+- Make PostCSS dependency messages more consistent.
+
 ### 5.1.0 (December 28, 2023)
 
 - Updated: `dart-sass` to 1.69.5 (minor)

dist/index.cjs

@@ -183,12 +183,13 @@ const plugin = (opts = {}) => {
           const doneWrap = importerResult => {
             const file = importerResult && importerResult.file;
             if (file) {
-              const parent = path.resolve(parentId);
+              const parent = path.resolve(parentId.replace(/#sass$/, ''));
 
               // push the dependency to watch tasks
               result.messages.push({
                 type: 'dependency',
-                file,
+                plugin: 'postcss-sass',
+                file: file,
                 parent
               });
             }
@@ -219,12 +220,14 @@ const plugin = (opts = {}) => {
           }
 
           // push the dependency to watch tasks
-          result.messages.push({
-            type: 'dependency',
-            plugin: 'postcss-sass',
-            file,
-            parent
-          });
+          if (file) {
+            result.messages.push({
+              type: 'dependency',
+              plugin: 'postcss-sass',
+              file: file,
+              parent: parent
+            });
+          }
         }
         return mergeSourceMaps(postMap.toJSON(), JSON.parse(sassMap)).then(prev => {
           // update root to post-node-sass ast

dist/index.mjs

@@ -164,12 +164,13 @@ const plugin = (opts = {}) => {
           const doneWrap = importerResult => {
             const file = importerResult && importerResult.file;
             if (file) {
-              const parent = resolve(parentId);
+              const parent = resolve(parentId.replace(/#sass$/, ''));
 
               // push the dependency to watch tasks
               result.messages.push({
                 type: 'dependency',
-                file,
+                plugin: 'postcss-sass',
+                file: file,
                 parent
               });
             }
@@ -200,12 +201,14 @@ const plugin = (opts = {}) => {
           }
 
           // push the dependency to watch tasks
-          result.messages.push({
-            type: 'dependency',
-            plugin: 'postcss-sass',
-            file,
-            parent
-          });
+          if (file) {
+            result.messages.push({
+              type: 'dependency',
+              plugin: 'postcss-sass',
+              file: file,
+              parent: parent
+            });
+          }
         }
         return mergeSourceMaps(postMap.toJSON(), JSON.parse(sassMap)).then(prev => {
           // update root to post-node-sass ast

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@csstools/postcss-sass",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "Use Sass as a PostCSS plugin",
   "author": "Jonathan Neal <jonathantneal@hotmail.com>",
   "license": "CC0-1.0",

src/index.mjs

@@ -92,12 +92,13 @@ const plugin = (opts = {}) => {
 									const file = importerResult && importerResult.file;
 
 									if (file) {
-										const parent = pathResolve(parentId);
+										const parent = pathResolve(parentId.replace(/#sass$/, ''));
 
 										// push the dependency to watch tasks
 										result.messages.push({
 											type: 'dependency',
-											file,
+											plugin: 'postcss-sass',
+											file: file,
 											parent,
 										});
 									}
@@ -129,12 +130,14 @@ const plugin = (opts = {}) => {
 					}
 
 					// push the dependency to watch tasks
-					result.messages.push({
-						type: 'dependency',
-						plugin: 'postcss-sass',
-						file,
-						parent,
-					});
+					if (file) {
+						result.messages.push({
+							type: 'dependency',
+							plugin: 'postcss-sass',
+							file: file,
+							parent: parent,
+						});
+					}
 				}
 
 				return mergeSourceMaps(postMap.toJSON(), JSON.parse(sassMap)).then(

test/_messages.mjs

@@ -0,0 +1,83 @@
+import plugin from '@csstools/postcss-sass';
+import postcss from 'postcss';
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+test('emits dependency messages', async () => {
+	const source = '@import "components/colors";';
+
+	const result = await postcss([plugin]).process(source, {
+		from: 'test/basic.scss',
+	});
+
+	assert.deepStrictEqual(result.warnings(), []);
+	assert.deepStrictEqual(
+		result.messages.map((x) => {
+			x.file = x.file.split('test')[1];
+			x.parent = x.parent.split('test')[1];
+
+			return x;
+		}),
+		[
+			{
+				type: 'dependency',
+				plugin: 'postcss-sass',
+				file: '/components/colors.scss',
+				parent: '/basic.scss',
+			},
+		],
+	);
+});
+
+test('emits dependency messages with custom importer', async () => {
+	const source = `
+		@import "custom:colors";
+		@import "components/fonts";
+		@import "components/page";
+	`;
+
+	const result = await postcss([plugin({
+		importer: (id, parentId, done) => {
+			if (id === 'custom:colors') {
+				done({ file: 'test/components/colors.scss', contents: '$primary-color: #333;' });
+			}
+		},
+	})]).process(source, {
+		from: 'test/basic.scss',
+	});
+
+	assert.deepStrictEqual(result.warnings(), []);
+	assert.deepStrictEqual(
+		result.messages.map((x) => {
+			x.file = x.file.split('test')[1];
+			x.parent = x.parent.split('test')[1];
+
+			return x;
+		}),
+		[
+			{
+				type: 'dependency',
+				plugin: 'postcss-sass',
+				file: '/components/colors.scss',
+				parent: '/basic.scss',
+			},
+			{
+				type: 'dependency',
+				plugin: 'postcss-sass',
+				file: '/components/colors.scss',
+				parent: '/basic.scss',
+			},
+			{
+				type: 'dependency',
+				plugin: 'postcss-sass',
+				file: '/components/fonts.scss',
+				parent: '/basic.scss',
+			},
+			{
+				type: 'dependency',
+				plugin: 'postcss-sass',
+				file: '/components/page.scss',
+				parent: '/basic.scss',
+			}],
+	);
+});