wrec 0.40.1 → 0.40.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "wrec",
   "description": "a library that greatly simplifies building web components",
   "author": "R. Mark Volkmann",
-  "version": "0.40.1",
+  "version": "0.40.3",
   "license": "MIT",
   "repository": {
     "type": "git",

package/scripts/declare.js

@@ -49,6 +49,7 @@ function analyzeSourceFile(sourceFile) {
       if (!declareType) continue;
       declareLines.push(createDeclareLine(propName, declareType));
     }
+    declareLines.sort((a, b) => a.localeCompare(b));
 
     const start = propertiesMember.end;
     const end = findDeclareBlockEnd(classNode, propertiesMember, sourceFile);

package/scripts/lint.js

@@ -801,14 +801,20 @@ function extractTemplateExpressions(
       while (true) {
         const match = CSS_PROPERTY_RE.exec(rendered);
         if (!match) break;
-        const value = match[2]?.trim();
+        const rawValue = match[2] ?? '';
+        const value = rawValue.trim();
         if (value && REFS_TEST_RE.test(value)) {
+          const valueOffsetInMatch = match[0].lastIndexOf(rawValue);
+          const leadingWhitespace = rawValue.length - rawValue.trimStart().length;
+          const valueLocation = resolveLocation(
+            match.index + valueOffsetInMatch + leadingWhitespace
+          );
           expressions.push({
             context: 'instance',
             eventHandler: false,
             kind: 'css',
             text: value,
-            location: null
+            location: valueLocation
           });
         }
       }