chore: ensure that template names are in the css block errors.

Author: chriseppstein

packages/jsx-analyzer/src/analyzer/JSXElementAnalyzer.ts

@@ -1,5 +1,9 @@
 import { Block } from 'css-blocks';
 import { ObjectDictionary, } from '@opticss/util';
+import {
+  SourceLocation as TemplateSourceLocation,
+  SourcePosition as TemplateSourcePosition
+} from '@opticss/template-api';
 import { NodePath, Binding } from 'babel-traverse';
 import {
   CallExpression,
@@ -14,9 +18,10 @@ import {
   isVariableDeclarator,
   JSXAttribute,
   Identifier,
+  SourceLocation,
 } from 'babel-types';
 
-import { MalformedBlockPath, TemplateAnalysisError, ErrorLocation } from '../utils/Errors';
+import { MalformedBlockPath, TemplateAnalysisError } from '../utils/Errors';
 import { isConsoleLogStatement } from '../utils/isConsoleLogStatement';
 
 import { JSXElementAnalysis, Flags, newJSXElementAnalysis } from './types';
@@ -54,21 +59,19 @@ export class JSXElementAnalyzer {
     return found;
   }
 
-  analyze(filename: string, path: NodePath<JSXOpeningElement>): JSXElementAnalysis | undefined {
+  analyze(path: NodePath<JSXOpeningElement>): JSXElementAnalysis | undefined {
     let el = path.node;
 
     // We don't care about elements with no attributes;
     if (!el.attributes || el.attributes.length === 0) {
       return;
     }
 
-    let loc = { filename, ...path.node.loc };
-
     let classAttrs = this.classAttributePaths(path);
     // If/When we add state attributes, we should throw an error if those are set before exiting.
     if (classAttrs.length === 0) return;
 
-    let element = newJSXElementAnalysis(loc, htmlTagName(el));
+    let element = newJSXElementAnalysis(this.location(path), htmlTagName(el));
 
     for (let classAttr of classAttrs) {
       this.analyzeClassAttribute(classAttr, element);
@@ -83,9 +86,23 @@ export class JSXElementAnalyzer {
     return element;
   }
 
-  private nodeLoc(node: Node | NodePath<Node>): ErrorLocation {
-    let n = isNodePath(node) ? node.node : node;
-    return { filename: this.filename, ...n.loc.start };
+  private location(loc: SourceLocation | Node | NodePath<Node>): TemplateSourceLocation {
+    if (isNodePath(loc)) {
+      loc = loc.node.loc;
+    } else if (!isLocation(loc)) {
+      loc = loc.loc;
+    }
+    let location: TemplateSourceLocation = {
+      start: {...loc.start},
+      end: {...loc.end},
+    };
+    location.start.filename = this.filename;
+    location.end!.filename = this.filename;
+    return location;
+  }
+
+  private nodeLoc(node: Node | NodePath<Node>): TemplateSourcePosition {
+    return this.location(node).start;
   }
 
   styleVariableBinding(path: NodePath<JSXAttribute>): Binding | undefined {
@@ -232,6 +249,13 @@ function htmlTagName(el: JSXOpeningElement): string | undefined {
   return;
 }
 
+function isLocation(n: object): n is SourceLocation {
+  if ((<SourceLocation>n).start && (<SourceLocation>n).end && typeof (<SourceLocation>n).start.line === 'number') {
+    return true;
+  } else {
+    return false;
+  }
+}
 function isNodePath(n: object): n is NodePath {
   if ((<NodePath>n).node) {
     return true;

packages/jsx-analyzer/src/analyzer/index.ts

@@ -20,7 +20,7 @@ export default function visitors(analysis: Analysis): object {
      * @param path The JSXOpeningElement Babylon path we are processing.
      */
     JSXOpeningElement(path: NodePath<JSXOpeningElement>): void {
-      let element = elementAnalyzer.analyze(analysis.template.identifier, path);
+      let element = elementAnalyzer.analyze(path);
       if (element) analysis.addElement(element);
     }
   };

packages/jsx-analyzer/src/transformer/babel.ts

@@ -97,7 +97,7 @@ export default function mkTransform(tranformOpts: { rewriter: Rewriter }): () =>
         JSXOpeningElement(path: NodePath<JSXOpeningElement>, state: any): void {
           if (!this.shouldProcess) return;
 
-          let elementAnalysis = this.elementAnalyzer.analyze(this.filename, path);
+          let elementAnalysis = this.elementAnalyzer.analyze(path);
           if (elementAnalysis) {
             let classMapping = this.mapping.simpleRewriteMapping(elementAnalysis);
             let attributeValue: JSXAttribute['value'] | undefined = undefined;