@tsrx/typescript-plugin 0.3.29 → 0.3.31

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @tsrx/typescript-plugin
 
+## 0.3.31
+
+### Patch Changes
+
+- [#941](https://github.com/Ripple-TS/ripple/pull/941)
+  [`079617d`](https://github.com/Ripple-TS/ripple/commit/079617d639569e4cb2c79239011a6b892dbdbb45)
+  Thanks [@leonidaz](https://github.com/leonidaz)! - Add Preact compiler
+  resolution for `.tsrx` language service support.
+
+- Updated dependencies
+  [[`7529e1f`](https://github.com/Ripple-TS/ripple/commit/7529e1fe3f0870319bd3399501fd2eb43c516065)]:
+  - @tsrx/react@0.1.5
+  - @tsrx/preact@0.0.6
+  - @tsrx/solid@0.0.11
+  - @tsrx/ripple@0.0.13
+
+## 0.3.30
+
+### Patch Changes
+
+- Updated dependencies
+  [[`7f59ed8`](https://github.com/Ripple-TS/ripple/commit/7f59ed80d7b44c847fb9eb8bf00d4fe9835c3136)]:
+  - @tsrx/ripple@0.0.12
+  - @tsrx/react@0.1.4
+
 ## 0.3.29
 
 ### Patch Changes

package/package.json

@@ -3,7 +3,7 @@
   "description": "TypeScript plugin for TSRX",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "main": "dist/index.js",
   "type": "module",
   "homepage": "https://ripple-ts.com",
@@ -25,8 +25,24 @@
   },
   "peerDependencies": {
     "typescript": "^5.9.3",
-    "@tsrx/react": "0.1.3",
-    "@tsrx/ripple": "0.0.11"
+    "@tsrx/react": "0.1.5",
+    "@tsrx/ripple": "0.0.13",
+    "@tsrx/solid": "0.0.11",
+    "@tsrx/preact": "0.0.6"
+  },
+  "peerDependenciesMeta": {
+    "@tsrx/react": {
+      "optional": true
+    },
+    "@tsrx/solid": {
+      "optional": true
+    },
+    "@tsrx/ripple": {
+      "optional": true
+    },
+    "@tsrx/preact": {
+      "optional": true
+    }
   },
   "publishConfig": {
     "access": "public"

package/src/language.js

@@ -48,6 +48,12 @@ export const COMPILER_CANDIDATES = [
 		['.tsrx'],
 		['@tsrx/solid', '@tsrx/vite-plugin-solid'],
 	],
+	[
+		'@tsrx/preact',
+		['node_modules', '@tsrx', 'preact'],
+		['.tsrx'],
+		['@tsrx/preact', '@tsrx/vite-plugin-preact'],
+	],
 ];
 
 /**

package/tests/compiler-resolution.test.js

@@ -27,20 +27,28 @@ describe('typescript-plugin compiler resolution', () => {
 			expect(RIPPLE_EXTENSIONS).toEqual(['.tsrx']);
 		});
 
-		it('maps both compilers to .tsrx', () => {
+		it('maps all compiler candidates to .tsrx', () => {
 			const ripple_candidate = COMPILER_CANDIDATES.find(
 				([package_name]) => package_name === '@tsrx/ripple',
 			);
 			const react_candidate = COMPILER_CANDIDATES.find(
 				([package_name]) => package_name === '@tsrx/react',
 			);
+			const solid_candidate = COMPILER_CANDIDATES.find(
+				([package_name]) => package_name === '@tsrx/solid',
+			);
+			const preact_candidate = COMPILER_CANDIDATES.find(
+				([package_name]) => package_name === '@tsrx/preact',
+			);
 
-			if (!ripple_candidate || !react_candidate) {
+			if (!ripple_candidate || !react_candidate || !solid_candidate || !preact_candidate) {
 				throw new Error('Missing compiler candidates');
 			}
 
 			expect(ripple_candidate[2]).toEqual(['.tsrx']);
 			expect(react_candidate[2]).toEqual(['.tsrx']);
+			expect(solid_candidate[2]).toEqual(['.tsrx']);
+			expect(preact_candidate[2]).toEqual(['.tsrx']);
 		});
 	});
 
@@ -81,6 +89,16 @@ describe('typescript-plugin compiler resolution', () => {
 			);
 		});
 
+		it('selects the preact compiler in a preact-only project', () => {
+			const workspace = create_fixture_workspace('preact-only');
+			const file_name = path.join(workspace, 'src', 'App.tsrx');
+			const expected = path.join(workspace, 'node_modules', '@tsrx', 'preact', 'src', 'index.js');
+
+			expect(find_workspace_compiler_entry_for_file(file_name, fs.existsSync, new Map())).toBe(
+				expected,
+			);
+		});
+
 		it('prefers the ripple compiler when both compilers exist in a ripple project', () => {
 			const workspace = create_fixture_workspace('both');
 			const file_name = path.join(workspace, 'src', 'App.tsrx');
@@ -101,6 +119,16 @@ describe('typescript-plugin compiler resolution', () => {
 			);
 		});
 
+		it('prefers the preact compiler when multiple compilers exist in a preact project', () => {
+			const workspace = create_fixture_workspace('both-preact');
+			const file_name = path.join(workspace, 'src', 'App.tsrx');
+			const expected = path.join(workspace, 'node_modules', '@tsrx', 'preact', 'src', 'index.js');
+
+			expect(find_workspace_compiler_entry_for_file(file_name, fs.existsSync, new Map())).toBe(
+				expected,
+			);
+		});
+
 		it('walks up nested directories to find the nearest compiler', () => {
 			const workspace = create_fixture_workspace('ripple-only');
 			const file_name = path.join(workspace, 'src', 'nested', 'components', 'App.tsrx');
@@ -154,8 +182,11 @@ describe('typescript-plugin compiler resolution', () => {
 		const cases = [
 			{ name: 'ripple-only', expected: ['@tsrx', 'ripple'] },
 			{ name: 'react-only', expected: ['@tsrx', 'react'] },
+			{ name: 'solid-only', expected: ['@tsrx', 'solid'] },
+			{ name: 'preact-only', expected: ['@tsrx', 'preact'] },
 			{ name: 'both', expected: ['@tsrx', 'ripple'] },
 			{ name: 'both-react', expected: ['@tsrx', 'react'] },
+			{ name: 'both-preact', expected: ['@tsrx', 'preact'] },
 		];
 
 		for (const test_case of cases) {

package/tests/workspace-fixtures.js

@@ -58,6 +58,62 @@ const COMPILER_STUBS = {
 		};
 	},
 };
+`,
+	solid: `module.exports = {
+	compile_to_volar_mappings(source, filename) {
+		const code = \`/* compiler:solid */\\nexport const filename = \${JSON.stringify(filename)};\\nexport default \${JSON.stringify(source)};\`;
+		return {
+			code,
+			mappings: [
+				{
+					sourceOffsets: [0],
+					generatedOffsets: [0],
+					lengths: [source.length],
+					generatedLengths: [source.length],
+					data: {
+						verification: false,
+						completion: true,
+						semantic: true,
+						navigation: true,
+						structure: true,
+						format: true,
+						customData: {},
+					},
+				},
+			],
+			cssMappings: [],
+			errors: [],
+		};
+	},
+};
+`,
+	preact: `module.exports = {
+	compile_to_volar_mappings(source, filename) {
+		const code = \`/* compiler:preact */\\nexport const filename = \${JSON.stringify(filename)};\\nexport default \${JSON.stringify(source)};\`;
+		return {
+			code,
+			mappings: [
+				{
+					sourceOffsets: [0],
+					generatedOffsets: [0],
+					lengths: [source.length],
+					generatedLengths: [source.length],
+					data: {
+						verification: false,
+						completion: true,
+						semantic: true,
+						navigation: true,
+						structure: true,
+						format: true,
+						customData: {},
+					},
+				},
+			],
+			cssMappings: [],
+			errors: [],
+		};
+	},
+};
 `,
 };
 
@@ -85,6 +141,28 @@ export const WORKSPACE_CONFIGS = {
 		},
 		compilers: ['react'],
 	},
+	'solid-only': {
+		package_json: {
+			name: '@tsrx/fixture-solid-only-project',
+			private: true,
+			devDependencies: {
+				'@tsrx/solid': 'workspace:*',
+				'@tsrx/vite-plugin-solid': 'workspace:*',
+			},
+		},
+		compilers: ['solid'],
+	},
+	'preact-only': {
+		package_json: {
+			name: '@tsrx/fixture-preact-only-project',
+			private: true,
+			devDependencies: {
+				'@tsrx/preact': 'workspace:*',
+				'@tsrx/vite-plugin-preact': 'workspace:*',
+			},
+		},
+		compilers: ['preact'],
+	},
 	both: {
 		package_json: {
 			name: '@ripple-ts/fixture-ripple-project',
@@ -108,6 +186,17 @@ export const WORKSPACE_CONFIGS = {
 		},
 		compilers: ['ripple', 'react'],
 	},
+	'both-preact': {
+		package_json: {
+			name: '@tsrx/fixture-preact-project',
+			private: true,
+			devDependencies: {
+				'@tsrx/preact': 'workspace:*',
+				'@tsrx/vite-plugin-preact': 'workspace:*',
+			},
+		},
+		compilers: ['ripple', 'react', 'solid', 'preact'],
+	},
 };
 
 /** @type {string[]} */