ripple 0.3.89 → 0.3.90

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # ripple
 
+## 0.3.90
+
+### Patch Changes
+
+- [#1324](https://github.com/Ripple-TS/ripple/pull/1324)
+  [`1925074`](https://github.com/Ripple-TS/ripple/commit/1925074254de0e61c8578cba136c50ea8f89cd35)
+  Thanks [@leonidaz](https://github.com/leonidaz)! - Minor adjustments from
+  @tsrx/ripple moving to the parser ast vs its own version
+
+- Updated dependencies
+  [[`1925074`](https://github.com/Ripple-TS/ripple/commit/1925074254de0e61c8578cba136c50ea8f89cd35),
+  [`1925074`](https://github.com/Ripple-TS/ripple/commit/1925074254de0e61c8578cba136c50ea8f89cd35)]:
+  - @tsrx/core@0.1.36
+  - @tsrx/ripple@0.1.37
+
 ## 0.3.89
 
 ### Patch Changes

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.3.89",
+  "version": "0.3.90",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",
@@ -73,8 +73,8 @@
     "clsx": "^2.1.1",
     "devalue": "^5.8.1",
     "esm-env": "^1.2.2",
-    "@tsrx/core": "0.1.35",
-    "@tsrx/ripple": "0.1.36"
+    "@tsrx/core": "0.1.36",
+    "@tsrx/ripple": "0.1.37"
   },
   "devDependencies": {
     "@types/estree": "^1.0.8",

package/tests/client/compiler/compiler.basic.test.tsrx

@@ -69,15 +69,15 @@ describe('compiler > basics', () => {
 
 		const ast = parse(source, 'App.tsrx');
 		const elements = get_returned_tsrx(ast.body[0]).children.filter(
-			(node: AST.Node) => node.type === 'Element',
-		) as AST.Element[];
+			(node: AST.Node) => node.type === 'JSXElement',
+		) as ESTreeJSX.JSXElement[];
 		const expression = elements[0].children[0] as AST.Node & { expression: AST.Expression };
 		const text_expression = elements[1].children[0] as AST.Node & { expression: AST.Expression };
 
 		expect(elements).toHaveLength(2);
-		expect(expression.type).toBe('TSRXExpression');
+		expect(expression.type).toBe('JSXExpressionContainer');
 		expect((expression.expression as AST.Identifier).name).toBe('markup');
-		expect(text_expression.type).toBe('TSRXExpression');
+		expect(text_expression.type).toBe('JSXExpressionContainer');
 		expect((text_expression.expression as AST.Identifier).name).toBe('text');
 
 		const { code } = compile(source, 'text-directive.tsrx', { mode: 'client' });
@@ -196,8 +196,8 @@ export function App() @{
 		const declaration = (ast.body[0] as AST.VariableDeclaration).declarations[0];
 		const fragment = get_returned_tsrx(declaration) as any;
 
-		expect(fragment.type).toBe('TsrxFragment');
-		expect(fragment.children[0].type).toBe('TSRXExpression');
+		expect(fragment.type).toBe('JSXFragment');
+		expect(fragment.children[0].type).toBe('JSXExpressionContainer');
 		expect(fragment.children[0].expression.type).toBe('TemplateLiteral');
 		expect(fragment.children[0].expression.quasis[0].value.raw).toBe('333');
 	});
@@ -215,9 +215,9 @@ export function App() @{
 		const declaration = (ast.body[0] as AST.VariableDeclaration).declarations[0];
 		const fragment = get_returned_tsrx(declaration) as any;
 
-		expect(fragment.type).toBe('TsrxFragment');
+		expect(fragment.type).toBe('JSXFragment');
 		expect(fragment.children.map((child: any) => child.type)).toEqual([
-			'TSRXExpression',
+			'JSXExpressionContainer',
 		]);
 		expect(fragment.children[0].expression.type).toBe('TemplateLiteral');
 		expect(fragment.children[0].expression.quasis[0].value.raw).toContain('<b></b>');
@@ -1229,14 +1229,16 @@ export function App() @{
 			const ast = parse(source, 'App.tsrx');
 			const returned = get_returned_tsrx(ast.body[0]);
 			const ul =
-				returned.type === 'Element'
+				returned.type === 'JSXElement'
 					? returned
-					: returned.children.find((n: AST.Node) => n.type === 'Element') as AST.Element;
-			expect((ul.id as AST.Identifier).name).toBe('ul');
+					: returned.children.find(
+							(n: AST.Node) => n.type === 'JSXElement',
+						) as ESTreeJSX.JSXElement;
+			expect((ul.openingElement.name as ESTreeJSX.JSXIdentifier).name).toBe('ul');
 			expect(ul.children).toHaveLength(1);
-			const text = ul.children[0] as unknown as { type: string; expression: AST.Literal };
-			expect(text.type).toBe('Text');
-			expect(text.expression.value).toBe('var a = "123"');
+			const text = ul.children[0] as unknown as { type: string; value: string };
+			expect(text.type).toBe('JSXText');
+			expect(text.value).toBe('var a = "123"');
 			expect((ul.closingElement?.name as ESTreeJSX.JSXIdentifier)?.name).toBe('ul');
 		},
 	);