ripple 0.2.39 → 0.2.41

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is a TypeScript UI framework for the web",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "type": "module",
   "module": "src/runtime/index.js",
   "main": "src/runtime/index.js",

package/src/compiler/phases/1-parse/index.js

@@ -2,6 +2,7 @@ import * as acorn from 'acorn';
 import { tsPlugin } from 'acorn-typescript';
 import { parse_style } from './style.js';
 import { walk } from 'zimmerframe';
+import { regex_newline_characters } from '../../../utils/patterns.js';
 
 const parser = acorn.Parser.extend(tsPlugin({ allowSatisfies: true }), RipplePlugin());
 
@@ -412,7 +413,9 @@ function RipplePlugin(config) {
 					}
 				} else {
 					if (open.name.name === 'style') {
-						const start = this.start;
+						// jsx_parseOpeningElementAt can treat a html element selector as an identifier and read it
+						// In that case, need to backtrack to include it in the css content
+						const start = this.pos - (this.value?.length ?? 1)
 						const input = this.input.slice(start);
 						const end = input.indexOf('</style>');
 						const content = input.slice(0, end);
@@ -423,7 +426,13 @@ function RipplePlugin(config) {
 						}
 						component.css = parse_style(content);
 
-						this.pos = start + end + 1;
+						const newLines = content.match(regex_newline_characters)?.length;
+						if (newLines) {
+							this.curLine += newLines;
+							this.lineStart = start + content.lastIndexOf('\n') + 1;
+						}
+						this.pos = start + content.length + 1;
+
 						this.type = tok.jsxTagStart;
 						this.next();
 						if (this.value === '/') {

package/src/compiler/phases/2-analyze/index.js

@@ -431,6 +431,10 @@ const visitors = {
 	},
 
 	ForOfStatement(node, context) {
+		if (!is_inside_component(context)) {
+			return context.next();
+		}
+
 		node.metadata = {
 			has_template: false,
 		};

package/src/utils/patterns.js

@@ -12,6 +12,7 @@ export const regex_whitespaces_strict = /[ \t\n\r\f]+/g;
 
 export const regex_only_whitespaces = /^[ \t\n\r\f]+$/;
 
+export const regex_newline_characters = /\n/g;
 export const regex_not_newline_characters = /[^\n]/g;
 
 export const regex_is_valid_identifier = /^[a-zA-Z_$][a-zA-Z_$0-9]*$/;