From 0c2d3def30ee690c3ada56421c7023a035a8f077 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Tue, 30 Jul 2024 13:40:54 +0200
Subject: [PATCH 01/58] start building the Paraglide adder

---
 adders/paraglide/config/adder.ts   | 144 +++++++++++++++++++++++++++++
 adders/paraglide/config/checks.ts  |   6 ++
 adders/paraglide/config/options.ts |  18 ++++
 adders/paraglide/config/tests.ts   |  14 +++
 adders/paraglide/index.ts          |   8 ++
 adders/paraglide/paraglide.png     | Bin 0 -> 26763 bytes
 6 files changed, 190 insertions(+)
 create mode 100644 adders/paraglide/config/adder.ts
 create mode 100644 adders/paraglide/config/checks.ts
 create mode 100644 adders/paraglide/config/options.ts
 create mode 100644 adders/paraglide/config/tests.ts
 create mode 100644 adders/paraglide/index.ts
 create mode 100644 adders/paraglide/paraglide.png

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
new file mode 100644
index 00000000..f90a55f4
--- /dev/null
+++ b/adders/paraglide/config/adder.ts
@@ -0,0 +1,144 @@
+import { defineAdderConfig } from '@svelte-add/core';
+import { options } from './options';
+
+const DEFAULT_INLANG_PROJECT = {
+	$schema: 'https://inlang.com/schema/project-settings',
+	sourceLanguageTag: 'en',
+	languageTags: ['en'],
+	modules: [
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@latest/dist/index.js',
+	],
+	'plugin.inlang.messageFormat': {
+		pathPattern: './messages/{languageTag}.json',
+	},
+};
+
+export const adder = defineAdderConfig({
+	metadata: {
+		id: 'paraglide',
+		name: 'Paraglide',
+		description: 'Typesafe i18n with localized routing',
+		environments: { svelte: false, kit: true },
+		website: {
+			logo: './paraglide.png',
+			keywords: [
+				'i18n',
+				'internationalization',
+				'l10n',
+				'localization',
+				'routing',
+				'paraglide',
+				'paraglide-js',
+				'paraglide-sveltekit',
+				'inlang',
+			],
+			documentation: 'https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n',
+		},
+	},
+	options,
+	integrationType: 'inline',
+	packages: [
+		{
+			name: '@inlang/paraglide-js',
+			version: '*',
+			dev: true,
+		},
+		{
+			name: '@inlang/paraglide-sveltekit',
+			version: '*',
+			dev: false,
+		},
+	],
+	files: [
+		{
+			// create an inlang project
+			name: () => 'project.inlang/settings.json',
+			contentType: 'json',
+			content: ({ options, data }) => {
+				const availableLanguageTags = options.availableLanguageTags
+					.split(',')
+					.map((tag) => tag.trim());
+				const sourceLanguageTag = availableLanguageTags[0];
+
+				data.sourceLanguageTag = sourceLanguageTag;
+				data.availableLanguageTags = availableLanguageTags;
+			},
+		},
+		{
+			// add the vite plugin
+			name: ({ typescript }) => `vite.config.${typescript.installed ? 'ts' : 'js'}`,
+			contentType: 'script',
+			content: ({ ast, array, object, functions, common, imports, exports }) => {
+				const vitePluginName = 'paraglide';
+				imports.addDefault(ast, '@inlang/paraglide-sveltekit/vite', vitePluginName);
+
+				const { value: rootObject } = exports.defaultExport(
+					ast,
+					functions.call('defineConfig', []),
+				);
+				const param1 = functions.argumentByIndex(rootObject, 0, object.createEmpty());
+
+				const pluginsArray = object.property(param1, 'plugins', array.createEmpty());
+				const pluginFunctionCall = functions.call(vitePluginName, []);
+				const pluginConfig = object.create({
+					project: common.createLiteral('./project.inlang'),
+					outdir: common.createLiteral('./src/lib/paraglide'),
+				});
+				functions.argumentByIndex(pluginFunctionCall, 0, pluginConfig);
+
+				array.push(pluginsArray, pluginFunctionCall);
+			},
+		},
+		{
+			// reroute hook
+			name: () => 'src/hooks.js',
+			contentType: 'script',
+			content({ ast, imports }) {
+				imports.addNamed(ast, '$lib/i18n', {
+					i18n: 'i18n',
+				});
+			},
+		},
+		{
+			// add the <ParaglideJS> component to the layout
+			name: ({ kit }) => `${kit.routesDirectory}/+layout.svelte`,
+			contentType: 'svelte',
+			content: ({ js, html }) => {
+				js.imports.addNamed(js.ast, '@inlang/paraglide-sveltekit', {
+					ParaglideJS: 'ParaglideJS',
+				});
+				js.imports.addNamed(js.ast, '$lib/i18n', {
+					i18n: 'i18n',
+				});
+
+				const rootChildren = html.ast.children;
+				if (rootChildren.length === 0) {
+					const slot = html.element('slot');
+					rootChildren.push(slot);
+				}
+
+				//wrap the HTML in a ParaglideJS instance
+				const root = html.element('ParaglideJS', {});
+				root.attribs = {
+					i18n: '{i18n}',
+				};
+				root.attributes.push({
+					name: 'i18n',
+					value: 'i18n',
+				});
+				root.children = rootChildren;
+				html.ast.children = [root];
+			},
+		},
+	],
+	nextSteps: () => [
+		'Edit your messages in `messages/en.json`',
+		'Consider installing the Sherlock IDE Extension',
+	],
+});
diff --git a/adders/paraglide/config/checks.ts b/adders/paraglide/config/checks.ts
new file mode 100644
index 00000000..fc08d6f3
--- /dev/null
+++ b/adders/paraglide/config/checks.ts
@@ -0,0 +1,6 @@
+import { defineAdderChecks } from '@svelte-add/core';
+import { options } from './options';
+
+export const checks = defineAdderChecks({
+	options,
+});
diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
new file mode 100644
index 00000000..3532c5d7
--- /dev/null
+++ b/adders/paraglide/config/options.ts
@@ -0,0 +1,18 @@
+import { defineAdderOptions } from '@svelte-add/core';
+
+export const options = defineAdderOptions({
+	availableLanguageTags: {
+		question: 'Which language tags would you like to support?',
+		type: 'string',
+		default: 'en',
+	},
+	routing: {
+		question: 'Which routing strategy would you like to use?',
+		type: 'select',
+		default: 'prefix',
+		options: [
+			{ value: 'prefix', label: 'Path Prefix' },
+			{ value: 'domain', label: 'Domain' },
+		],
+	},
+});
diff --git a/adders/paraglide/config/tests.ts b/adders/paraglide/config/tests.ts
new file mode 100644
index 00000000..f2745c00
--- /dev/null
+++ b/adders/paraglide/config/tests.ts
@@ -0,0 +1,14 @@
+import { defineAdderTests } from '@svelte-add/core';
+import { options } from './options';
+
+export const tests = defineAdderTests({
+	files: [],
+	options,
+	optionValues: [],
+	tests: [
+		{
+			name: '',
+			run: async () => {},
+		},
+	],
+});
diff --git a/adders/paraglide/index.ts b/adders/paraglide/index.ts
new file mode 100644
index 00000000..0ae44fcc
--- /dev/null
+++ b/adders/paraglide/index.ts
@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+import { defineAdder } from '@svelte-add/core';
+import { adder } from './config/adder.js';
+import { checks } from './config/checks.js';
+import { tests } from './config/tests.js';
+
+export default defineAdder(adder, checks, tests);
diff --git a/adders/paraglide/paraglide.png b/adders/paraglide/paraglide.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8dd3364ab9c26414919c865be56699f5b288ff1
GIT binary patch
literal 26763
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

literal 0
HcmV?d00001


From 556d242f7266f3ee01934f2366f347d138d21181 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 10:38:57 +0200
Subject: [PATCH 02/58] Add a bunch of config

---
 .gitignore.rej                     |  7 ++++
 adders/paraglide/config/adder.ts   | 52 ++++++++++++++++++++++++++----
 adders/paraglide/config/options.ts | 38 ++++++++++++++++------
 adders/paraglide/config/tests.ts   |  9 ++----
 4 files changed, 84 insertions(+), 22 deletions(-)
 create mode 100644 .gitignore.rej

diff --git a/.gitignore.rej b/.gitignore.rej
new file mode 100644
index 00000000..93200928
--- /dev/null
+++ b/.gitignore.rej
@@ -0,0 +1,7 @@
+diff a/.gitignore b/.gitignore	(rejected hunks)
+@@ -6,3 +6,4 @@ packages/tests/.outputs
+ temp/
+ coverage/
+ .rollup.cache
++playground
+\ No newline at end of file
diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index f90a55f4..28c5fc7a 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -1,3 +1,5 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import { defineAdderConfig } from '@svelte-add/core';
 import { options } from './options';
 
@@ -19,6 +21,11 @@ const DEFAULT_INLANG_PROJECT = {
 	},
 };
 
+/**
+ * If some parts of the automated setup fail we need to tell the user to do it manually.
+ */
+const manualSteps : string[] = [];
+
 export const adder = defineAdderConfig({
 	metadata: {
 		id: 'paraglide',
@@ -57,10 +64,15 @@ export const adder = defineAdderConfig({
 	],
 	files: [
 		{
-			// create an inlang project
+			// create an inlang project if it doesn't exist yet
 			name: () => 'project.inlang/settings.json',
+			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang')),
 			contentType: 'json',
 			content: ({ options, data }) => {
+				for (const key in DEFAULT_INLANG_PROJECT) {
+					data[key] = DEFAULT_INLANG_PROJECT[key];
+				}
+
 				const availableLanguageTags = options.availableLanguageTags
 					.split(',')
 					.map((tag) => tag.trim());
@@ -95,14 +107,43 @@ export const adder = defineAdderConfig({
 				array.push(pluginsArray, pluginFunctionCall);
 			},
 		},
+		{
+			// src/lib/i18n file
+			name: ({ typescript }) => `src/lib/i18n.${typescript.installed ? 'ts' : 'js'}`,
+			contentType: 'script',
+			content({ ast, imports, exports, functions, variables, common }) {
+				imports.addNamed(ast, '@inlang/paraglide-sveltekit', { createI18n: 'createI18n' });
+				imports.addDefault(ast, '$lib/paraglide/runtime', '* as runtime');
+
+				const createI18nExpression = common.expressionFromString('createI18n(runtime)');
+				const i18n = variables.declaration(ast, 'const', 'i18n', createI18nExpression);
+
+				const existingExport = exports.namedExport(ast, 'i18n', i18n);
+				if (existingExport) {
+					manualSteps.push(
+						'⚠️ Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct',
+					);
+				}
+			},
+		},
 		{
 			// reroute hook
 			name: () => 'src/hooks.js',
 			contentType: 'script',
-			content({ ast, imports }) {
+			content({ ast, imports, exports, functions, variables, common }) {
 				imports.addNamed(ast, '$lib/i18n', {
 					i18n: 'i18n',
 				});
+
+				const expression = common.expressionFromString('i18n.reroute()');
+				const rerouteIdentifier = variables.declaration(ast, 'const', 'reroute', expression);
+
+				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
+				if (existingExport) {
+					manualSteps.push(
+						'⚠️ Adding the reroute hook automatically failed. You need to do it manually',
+					);
+				}
 			},
 		},
 		{
@@ -126,18 +167,15 @@ export const adder = defineAdderConfig({
 				//wrap the HTML in a ParaglideJS instance
 				const root = html.element('ParaglideJS', {});
 				root.attribs = {
-					i18n: '{i18n}',
+					'{i18n}': '',
 				};
-				root.attributes.push({
-					name: 'i18n',
-					value: 'i18n',
-				});
 				root.children = rootChildren;
 				html.ast.children = [root];
 			},
 		},
 	],
 	nextSteps: () => [
+		...manualSteps,
 		'Edit your messages in `messages/en.json`',
 		'Consider installing the Sherlock IDE Extension',
 	],
diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
index 3532c5d7..44e93c55 100644
--- a/adders/paraglide/config/options.ts
+++ b/adders/paraglide/config/options.ts
@@ -6,13 +6,33 @@ export const options = defineAdderOptions({
 		type: 'string',
 		default: 'en',
 	},
-	routing: {
-		question: 'Which routing strategy would you like to use?',
-		type: 'select',
-		default: 'prefix',
-		options: [
-			{ value: 'prefix', label: 'Path Prefix' },
-			{ value: 'domain', label: 'Domain' },
-		],
-	},
 });
+
+export const isValidLanguageTag = (languageTag: string): boolean =>
+	RegExp(
+		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$',
+	).test(languageTag);
+
+export function parseLanguageTagInput(input: string): {
+	validLanguageTags: string[];
+	invalidLanguageTags: string[];
+} {
+	const probablyLanguageTags = input
+		.replace(/[,:\s]/g, ' ') //replace common separators with spaces
+		.split(' ')
+		.filter(Boolean) //remove empty segments
+		.map((tag) => tag.toLowerCase());
+
+	const validLanguageTags: string[] = [];
+	const invalidLanguageTags: string[] = [];
+
+	for (const tag of probablyLanguageTags) {
+		if (isValidLanguageTag(tag)) validLanguageTags.push(tag);
+		else invalidLanguageTags.push(tag);
+	}
+
+	return {
+		validLanguageTags,
+		invalidLanguageTags,
+	};
+}
diff --git a/adders/paraglide/config/tests.ts b/adders/paraglide/config/tests.ts
index f2745c00..5f116d04 100644
--- a/adders/paraglide/config/tests.ts
+++ b/adders/paraglide/config/tests.ts
@@ -1,14 +1,11 @@
 import { defineAdderTests } from '@svelte-add/core';
 import { options } from './options';
 
+// e2e tests make no sense in this context
+
 export const tests = defineAdderTests({
 	files: [],
 	options,
 	optionValues: [],
-	tests: [
-		{
-			name: '',
-			run: async () => {},
-		},
-	],
+	tests: [],
 });

From 0f070b4a9b7abeb28db9e22d30c2bcefad6b6464 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 11:24:58 +0200
Subject: [PATCH 03/58] Add the handle hook

---
 adders/paraglide/config/adder.ts | 59 +++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index 28c5fc7a..292af553 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -24,7 +24,7 @@ const DEFAULT_INLANG_PROJECT = {
 /**
  * If some parts of the automated setup fail we need to tell the user to do it manually.
  */
-const manualSteps : string[] = [];
+const manualSteps: string[] = [];
 
 export const adder = defineAdderConfig({
 	metadata: {
@@ -51,20 +51,16 @@ export const adder = defineAdderConfig({
 	options,
 	integrationType: 'inline',
 	packages: [
-		{
-			name: '@inlang/paraglide-js',
-			version: '*',
-			dev: true,
-		},
 		{
 			name: '@inlang/paraglide-sveltekit',
-			version: '*',
+			version: '^0.11.0',
 			dev: false,
 		},
 	],
 	files: [
 		{
 			// create an inlang project if it doesn't exist yet
+			// TODO Scan for & use existing projects
 			name: () => 'project.inlang/settings.json',
 			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang')),
 			contentType: 'json',
@@ -111,7 +107,7 @@ export const adder = defineAdderConfig({
 			// src/lib/i18n file
 			name: ({ typescript }) => `src/lib/i18n.${typescript.installed ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast, imports, exports, functions, variables, common }) {
+			content({ ast, imports, exports, variables, common }) {
 				imports.addNamed(ast, '@inlang/paraglide-sveltekit', { createI18n: 'createI18n' });
 				imports.addDefault(ast, '$lib/paraglide/runtime', '* as runtime');
 
@@ -128,9 +124,9 @@ export const adder = defineAdderConfig({
 		},
 		{
 			// reroute hook
-			name: () => 'src/hooks.js',
+			name: ({ typescript }) => `src/hooks.${typescript.installed ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast, imports, exports, functions, variables, common }) {
+			content({ ast, imports, exports, variables, common }) {
 				imports.addNamed(ast, '$lib/i18n', {
 					i18n: 'i18n',
 				});
@@ -140,9 +136,31 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
 				if (existingExport) {
-					manualSteps.push(
-						'⚠️ Adding the reroute hook automatically failed. You need to do it manually',
-					);
+					manualSteps.push('⚠️ Adding the reroute hook automatically failed. Add it manually');
+				}
+			},
+		},
+		{
+			// handle hook
+			name: ({ typescript }) => `src/hooks.server.${typescript.installed ? 'ts' : 'js'}`,
+			contentType: 'script',
+			content({ ast, imports, exports, variables, common }) {
+				imports.addNamed(ast, '$lib/i18n', {
+					i18n: 'i18n',
+				});
+
+				const expression = common.expressionFromString('i18n.handle()');
+				const rerouteIdentifier = variables.declaration(ast, 'const', 'handle', expression);
+				const existingExport = exports.namedExport(ast, 'handle', rerouteIdentifier);
+				if (existingExport) {
+					manualSteps.push('⚠️ Adding the handle hook automatically failed. Add it manually');
+
+					// TODO automatically apply the sequence to merge the hooks
+					/*
+					imports.addNamed(ast, '@sveltejs/kit/hooks', {
+						sequence: 'sequence',
+					});
+					*/
 				}
 			},
 		},
@@ -158,13 +176,13 @@ export const adder = defineAdderConfig({
 					i18n: 'i18n',
 				});
 
+				// wrap the HTML in a ParaglideJS instance
+				// TODO: Skip if this is already done
 				const rootChildren = html.ast.children;
 				if (rootChildren.length === 0) {
 					const slot = html.element('slot');
 					rootChildren.push(slot);
 				}
-
-				//wrap the HTML in a ParaglideJS instance
 				const root = html.element('ParaglideJS', {});
 				root.attribs = {
 					'{i18n}': '',
@@ -173,8 +191,17 @@ export const adder = defineAdderConfig({
 				html.ast.children = [root];
 			},
 		},
+		// add the langauge file
+		{
+			name: ({ options }) => `messages/${options.sourceLanguageTag}.json`,
+			contentType: 'json',
+			content: ({ data }) => {
+				data['$schema'] = 'https://inlang.com/schema/inlang-message-format';
+				data.hello_world = 'Hello, World!';
+			},
+		},
 	],
-	nextSteps: () => [
+	nextSteps: ({ options }) => [
 		...manualSteps,
 		'Edit your messages in `messages/en.json`',
 		'Consider installing the Sherlock IDE Extension',

From 427eeef66216ec8f037b91e24d6ba6fe2f323676 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 13:03:54 +0200
Subject: [PATCH 04/58] Validate input & custom placeholder

---
 adders/paraglide/config/adder.ts   |  3 +-
 adders/paraglide/config/options.ts | 21 +++++++--
 packages/core/adder/options.ts.rej | 76 ++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 packages/core/adder/options.ts.rej

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index 292af553..e980f628 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -99,7 +99,6 @@ export const adder = defineAdderConfig({
 					outdir: common.createLiteral('./src/lib/paraglide'),
 				});
 				functions.argumentByIndex(pluginFunctionCall, 0, pluginConfig);
-
 				array.push(pluginsArray, pluginFunctionCall);
 			},
 		},
@@ -201,7 +200,7 @@ export const adder = defineAdderConfig({
 			},
 		},
 	],
-	nextSteps: ({ options }) => [
+	nextSteps: () => [
 		...manualSteps,
 		'Edit your messages in `messages/en.json`',
 		'Consider installing the Sherlock IDE Extension',
diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
index 44e93c55..3cce9915 100644
--- a/adders/paraglide/config/options.ts
+++ b/adders/paraglide/config/options.ts
@@ -4,14 +4,26 @@ export const options = defineAdderOptions({
 	availableLanguageTags: {
 		question: 'Which language tags would you like to support?',
 		type: 'string',
-		default: 'en',
+		default: '',
+		placeholder: 'en, de-ch',
+		validate(input) {
+			const { invalidLanguageTags, validLanguageTags } = parseLanguageTagInput(input);
+
+			if (invalidLanguageTags.length > 0)
+				return `Please enter a series of valid BCP47 language tags. Eg: en, de-ch, ar`;
+			if (validLanguageTags.length === 0)
+				return `Please enter at least one valid BCP47 language tag. Eg: en`;
+
+			return undefined;
+		},
 	},
 });
 
+export const pattern =
+	'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$';
+
 export const isValidLanguageTag = (languageTag: string): boolean =>
-	RegExp(
-		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$',
-	).test(languageTag);
+	RegExp(`${pattern}`).test(languageTag);
 
 export function parseLanguageTagInput(input: string): {
 	validLanguageTags: string[];
@@ -23,6 +35,7 @@ export function parseLanguageTagInput(input: string): {
 		.filter(Boolean) //remove empty segments
 		.map((tag) => tag.toLowerCase());
 
+
 	const validLanguageTags: string[] = [];
 	const invalidLanguageTags: string[] = [];
 
diff --git a/packages/core/adder/options.ts.rej b/packages/core/adder/options.ts.rej
new file mode 100644
index 00000000..4ee04124
--- /dev/null
+++ b/packages/core/adder/options.ts.rej
@@ -0,0 +1,76 @@
+diff a/packages/core/adder/options.ts b/packages/core/adder/options.ts	(rejected hunks)
+@@ -10,11 +10,15 @@ export type BooleanQuestion = {
+ export type StringQuestion = {
+ 	type: 'string';
+ 	default: string;
++	validate?: (value: string) => string | undefined;
++	placeholder?: string;
+ };
+ 
+ export type NumberQuestion = {
+ 	type: 'number';
+ 	default: number;
++	validate?: (value: string) => string | undefined;
++	placeholder?: string;
+ };
+ 
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+@@ -283,26 +287,39 @@ export async function requestMissingOptionsFromUser<Args extends OptionDefinitio
+ 			// if the option already has an value, ignore it and continue
+ 			if (optionValue !== undefined) continue;
+ 
+-			if (option.type == 'number' || option.type == 'string') {
+-				optionValue = await textPrompt(
+-					questionPrefix + option.question,
+-					'Not sure',
+-					option.default.toString(),
+-				);
+-			} else if (option.type == 'boolean') {
+-				optionValue = await booleanPrompt(questionPrefix + option.question, option.default);
+-			} else if (option.type == 'select') {
+-				optionValue = await selectPrompt(
+-					questionPrefix + option.question,
+-					option.default,
+-					option.options,
+-				);
+-			}
+-
+-			if (optionValue === 'true') optionValue = true;
+-			if (optionValue === 'false') optionValue = false;
+-
++			optionValue = await promptOptionValue({ option, questionPrefix });
+ 			selectedValues[optionKey] = optionValue;
+ 		}
+ 	}
+ }
++
++async function promptOptionValue({
++	option,
++	questionPrefix,
++}: {
++	option: Question;
++	questionPrefix: string;
++}): Promise<unknown> {
++	let optionValue: unknown = undefined;
++	if (option.type == 'number' || option.type == 'string') {
++		optionValue = await textPrompt(
++			questionPrefix + option.question,
++			option.placeholder ?? 'Not sure',
++			option.default.toString(),
++			option.validate,
++		);
++	} else if (option.type == 'boolean') {
++		optionValue = await booleanPrompt(questionPrefix + option.question, option.default);
++	} else if (option.type == 'select') {
++		optionValue = await selectPrompt(
++			questionPrefix + option.question,
++			option.default,
++			option.options,
++		);
++	}
++
++	if (optionValue === 'true') optionValue = true;
++	if (optionValue === 'false') optionValue = false;
++
++	return optionValue;
++}

From 8c6263dd79435f4aee67080f12c441b67a7fc43b Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 13:53:18 +0200
Subject: [PATCH 05/58] Create example message file

---
 adders/paraglide/config/adder.ts   | 46 +++++++++++++++---------------
 adders/paraglide/config/options.ts |  8 ++----
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index e980f628..c30141be 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -1,12 +1,12 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { defineAdderConfig } from '@svelte-add/core';
-import { options } from './options';
+import { options, parseLanguageTagInput } from './options';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
-	sourceLanguageTag: 'en',
-	languageTags: ['en'],
+	// sourceLanguageTag: 'en',
+	// languageTags: ['en'],
 	modules: [
 		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@latest/dist/index.js',
 		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@latest/dist/index.js',
@@ -21,11 +21,7 @@ const DEFAULT_INLANG_PROJECT = {
 	},
 };
 
-/**
- * If some parts of the automated setup fail we need to tell the user to do it manually.
- */
-const manualSteps: string[] = [];
-
+const warnings: string[] = [];
 export const adder = defineAdderConfig({
 	metadata: {
 		id: 'paraglide',
@@ -68,14 +64,11 @@ export const adder = defineAdderConfig({
 				for (const key in DEFAULT_INLANG_PROJECT) {
 					data[key] = DEFAULT_INLANG_PROJECT[key];
 				}
-
-				const availableLanguageTags = options.availableLanguageTags
-					.split(',')
-					.map((tag) => tag.trim());
-				const sourceLanguageTag = availableLanguageTags[0];
+				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
+				const sourceLanguageTag = validLanguageTags[0];
 
 				data.sourceLanguageTag = sourceLanguageTag;
-				data.availableLanguageTags = availableLanguageTags;
+				data.availableLanguageTags = validLanguageTags;
 			},
 		},
 		{
@@ -84,7 +77,9 @@ export const adder = defineAdderConfig({
 			contentType: 'script',
 			content: ({ ast, array, object, functions, common, imports, exports }) => {
 				const vitePluginName = 'paraglide';
-				imports.addDefault(ast, '@inlang/paraglide-sveltekit/vite', vitePluginName);
+				imports.addNamed(ast, '@inlang/paraglide-sveltekit/vite', {
+					paraglide: vitePluginName,
+				});
 
 				const { value: rootObject } = exports.defaultExport(
 					ast,
@@ -115,7 +110,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
 				if (existingExport) {
-					manualSteps.push(
+					warnings.push(
 						'⚠️ Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct',
 					);
 				}
@@ -135,7 +130,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
 				if (existingExport) {
-					manualSteps.push('⚠️ Adding the reroute hook automatically failed. Add it manually');
+					warnings.push('⚠️ Adding the reroute hook automatically failed. Add it manually');
 				}
 			},
 		},
@@ -152,7 +147,7 @@ export const adder = defineAdderConfig({
 				const rerouteIdentifier = variables.declaration(ast, 'const', 'handle', expression);
 				const existingExport = exports.namedExport(ast, 'handle', rerouteIdentifier);
 				if (existingExport) {
-					manualSteps.push('⚠️ Adding the handle hook automatically failed. Add it manually');
+					warnings.push('⚠️ Adding the handle hook automatically failed. Add it manually');
 
 					// TODO automatically apply the sequence to merge the hooks
 					/*
@@ -190,18 +185,23 @@ export const adder = defineAdderConfig({
 				html.ast.children = [root];
 			},
 		},
-		// add the langauge file
 		{
-			name: ({ options }) => `messages/${options.sourceLanguageTag}.json`,
+			// add an example langauge file
+			name: ({ options }) => {
+				const { validLanguageTags } = parseLanguageTagInput(options.sourceLanguageTag);
+				const sourceLanguageTag = validLanguageTags[0];
+				if (!sourceLanguageTag) throw new Error('No language tags'); // this should be unreachable
+				return `messages/${sourceLanguageTag}.json`;
+			},
 			contentType: 'json',
 			content: ({ data }) => {
 				data['$schema'] = 'https://inlang.com/schema/inlang-message-format';
-				data.hello_world = 'Hello, World!';
+				data.hello_world = 'Hello, {name}!';
 			},
 		},
 	],
-	nextSteps: () => [
-		...manualSteps,
+	nextSteps: ({ colors }) => [
+		...warnings.map(colors.yellow),
 		'Edit your messages in `messages/en.json`',
 		'Consider installing the Sherlock IDE Extension',
 	],
diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
index 3cce9915..887d8223 100644
--- a/adders/paraglide/config/options.ts
+++ b/adders/paraglide/config/options.ts
@@ -19,11 +19,10 @@ export const options = defineAdderOptions({
 	},
 });
 
-export const pattern =
-	'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$';
-
 export const isValidLanguageTag = (languageTag: string): boolean =>
-	RegExp(`${pattern}`).test(languageTag);
+	RegExp(
+		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$',
+	).test(languageTag);
 
 export function parseLanguageTagInput(input: string): {
 	validLanguageTags: string[];
@@ -35,7 +34,6 @@ export function parseLanguageTagInput(input: string): {
 		.filter(Boolean) //remove empty segments
 		.map((tag) => tag.toLowerCase());
 
-
 	const validLanguageTags: string[] = [];
 	const invalidLanguageTags: string[] = [];
 

From 5d4c6c65761e20bace48bf3b4ac37d0ca514790f Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 14:14:07 +0200
Subject: [PATCH 06/58] Automatically add `sequence` if handle hook is already
 defined

---
 adders/paraglide/config/adder.ts | 35 ++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index c30141be..fa0e7e95 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -138,23 +138,40 @@ export const adder = defineAdderConfig({
 			// handle hook
 			name: ({ typescript }) => `src/hooks.server.${typescript.installed ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast, imports, exports, variables, common }) {
+			content({ ast, imports, exports, functions, variables, common }) {
 				imports.addNamed(ast, '$lib/i18n', {
 					i18n: 'i18n',
 				});
 
-				const expression = common.expressionFromString('i18n.handle()');
-				const rerouteIdentifier = variables.declaration(ast, 'const', 'handle', expression);
+				const i18nHandleExpression = common.expressionFromString('i18n.handle()');
+				const rerouteIdentifier = variables.declaration(
+					ast,
+					'const',
+					'handle',
+					i18nHandleExpression,
+				);
 				const existingExport = exports.namedExport(ast, 'handle', rerouteIdentifier);
 				if (existingExport) {
-					warnings.push('⚠️ Adding the handle hook automatically failed. Add it manually');
-
-					// TODO automatically apply the sequence to merge the hooks
-					/*
 					imports.addNamed(ast, '@sveltejs/kit/hooks', {
 						sequence: 'sequence',
 					});
-					*/
+
+					const existingHandle = existingExport.declaration;
+					if (!existingHandle || existingHandle.type !== 'VariableDeclaration') {
+						warnings.push('⚠️ Adding the handle hook automatically failed. Add it manually');
+						return;
+					}
+
+					const sequenceExpression = functions.call('sequence', []);
+					sequenceExpression.arguments = [
+						i18nHandleExpression,
+						...existingHandle.declarations
+							.filter((decl) => decl.type === 'VariableDeclarator')
+							.map((decl) => decl.init),
+					];
+
+					const newHandle = variables.declaration(ast, 'const', 'handle', sequenceExpression);
+					existingExport.declaration = newHandle;
 				}
 			},
 		},
@@ -188,7 +205,7 @@ export const adder = defineAdderConfig({
 		{
 			// add an example langauge file
 			name: ({ options }) => {
-				const { validLanguageTags } = parseLanguageTagInput(options.sourceLanguageTag);
+				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
 				const sourceLanguageTag = validLanguageTags[0];
 				if (!sourceLanguageTag) throw new Error('No language tags'); // this should be unreachable
 				return `messages/${sourceLanguageTag}.json`;

From 75cfd9bc9765f218bf89f0026cd6e59c6110470f Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 14:27:36 +0200
Subject: [PATCH 07/58] comments

---
 adders/paraglide/config/adder.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index fa0e7e95..19d8f407 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -152,6 +152,7 @@ export const adder = defineAdderConfig({
 				);
 				const existingExport = exports.namedExport(ast, 'handle', rerouteIdentifier);
 				if (existingExport) {
+					// if there is an existing `handle` hook, use the `sequence` function to add i18n.handle to it
 					imports.addNamed(ast, '@sveltejs/kit/hooks', {
 						sequence: 'sequence',
 					});
@@ -187,8 +188,9 @@ export const adder = defineAdderConfig({
 					i18n: 'i18n',
 				});
 
+			
 				// wrap the HTML in a ParaglideJS instance
-				// TODO: Skip if this is already done
+				// TODO if (alreadyContainsParaglideJS(html.ast)) return;
 				const rootChildren = html.ast.children;
 				if (rootChildren.length === 0) {
 					const slot = html.element('slot');

From 4fb5bf1b6480262ef5340fd878de8259d38ccfe3 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 14:32:03 +0200
Subject: [PATCH 08/58] Fix typo in inlang config

---
 adders/paraglide/config/adder.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index 19d8f407..268125c3 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -68,7 +68,7 @@ export const adder = defineAdderConfig({
 				const sourceLanguageTag = validLanguageTags[0];
 
 				data.sourceLanguageTag = sourceLanguageTag;
-				data.availableLanguageTags = validLanguageTags;
+				data.languageTags = validLanguageTags;
 			},
 		},
 		{
@@ -206,6 +206,7 @@ export const adder = defineAdderConfig({
 		},
 		{
 			// add an example langauge file
+			// TODO: Expand this for all languages
 			name: ({ options }) => {
 				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
 				const sourceLanguageTag = validLanguageTags[0];

From 8392626ca9b1843b22e003fa2b4cfdd9bf588da8 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 14:52:54 +0200
Subject: [PATCH 09/58] Update the app.html file

---
 adders/paraglide/config/adder.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index 268125c3..1e4d4f11 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { defineAdderConfig } from '@svelte-add/core';
 import { options, parseLanguageTagInput } from './options';
+import { HtmlElement, HtmlElementType } from '../../../packages/ast-tooling';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
@@ -188,7 +189,6 @@ export const adder = defineAdderConfig({
 					i18n: 'i18n',
 				});
 
-			
 				// wrap the HTML in a ParaglideJS instance
 				// TODO if (alreadyContainsParaglideJS(html.ast)) return;
 				const rootChildren = html.ast.children;
@@ -204,6 +204,28 @@ export const adder = defineAdderConfig({
 				html.ast.children = [root];
 			},
 		},
+		{
+			// add the text-direction and lang attribute placeholders to app.html
+			name: () => `src/app.html`,
+			contentType: 'html',
+			content(editor) {
+				const htmlNode = editor.ast.children.find(
+					(child): child is HtmlElement =>
+						child.type === HtmlElementType.Tag && child.name === 'html',
+				);
+				if (!htmlNode) {
+					warnings.push(
+						"⚠️ Could not find <html> node in app.html. You'll need to add the language placeholder manually",
+					);
+					return;
+				}
+				htmlNode.attribs = {
+					...htmlNode.attribs,
+					lang: '%paraglide.lang%',
+					dir: '%paraglide.textDirection%',
+				};
+			},
+		},
 		{
 			// add an example langauge file
 			// TODO: Expand this for all languages

From 22a2d4a27aa92393adf7364c506bd5254583d600 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Wed, 31 Jul 2024 14:56:06 +0200
Subject: [PATCH 10/58] Revert accidental gitignore change

---
 .gitignore.rej | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore.rej b/.gitignore.rej
index 93200928..9ec139a3 100644
--- a/.gitignore.rej
+++ b/.gitignore.rej
@@ -1,7 +1,10 @@
 diff a/.gitignore b/.gitignore	(rejected hunks)
-@@ -6,3 +6,4 @@ packages/tests/.outputs
+@@ -5,5 +5,4 @@ build/
+ packages/tests/.outputs
  temp/
  coverage/
- .rollup.cache
-+playground
+-.rollup.cache
+-playground
+\ No newline at end of file
++.rollup.cache
 \ No newline at end of file

From 475cc98d269f3cc23ea00ae903b2fe703ee3c4a9 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Fri, 2 Aug 2024 14:22:19 +0200
Subject: [PATCH 11/58] Fix types

---
 adders/paraglide/config/adder.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index 1e4d4f11..e1a76fa7 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -63,7 +63,7 @@ export const adder = defineAdderConfig({
 			contentType: 'json',
 			content: ({ options, data }) => {
 				for (const key in DEFAULT_INLANG_PROJECT) {
-					data[key] = DEFAULT_INLANG_PROJECT[key];
+					data[key] = DEFAULT_INLANG_PROJECT[key as keyof typeof DEFAULT_INLANG_PROJECT];
 				}
 				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
 				const sourceLanguageTag = validLanguageTags[0];
@@ -112,7 +112,7 @@ export const adder = defineAdderConfig({
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
 				if (existingExport) {
 					warnings.push(
-						'⚠️ Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct',
+						'Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct',
 					);
 				}
 			},
@@ -131,7 +131,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
 				if (existingExport) {
-					warnings.push('⚠️ Adding the reroute hook automatically failed. Add it manually');
+					warnings.push('Adding the reroute hook automatically failed. Add it manually');
 				}
 			},
 		},
@@ -160,16 +160,24 @@ export const adder = defineAdderConfig({
 
 					const existingHandle = existingExport.declaration;
 					if (!existingHandle || existingHandle.type !== 'VariableDeclaration') {
-						warnings.push('⚠️ Adding the handle hook automatically failed. Add it manually');
+						warnings.push('Adding the handle hook automatically failed. Add it manually');
 						return;
 					}
 
 					const sequenceExpression = functions.call('sequence', []);
+
+					type VariableDeclarator = Extract<
+						(typeof existingHandle.declarations)[number],
+						{ type: 'VariableDeclarator' }
+					>;
+					type ExpressionKind = Exclude<VariableDeclarator['init'], null | undefined>;
+
 					sequenceExpression.arguments = [
 						i18nHandleExpression,
 						...existingHandle.declarations
 							.filter((decl) => decl.type === 'VariableDeclarator')
-							.map((decl) => decl.init),
+							.map((decl) => decl.init)
+							.filter((exp): exp is ExpressionKind => !!exp),
 					];
 
 					const newHandle = variables.declaration(ast, 'const', 'handle', sequenceExpression);
@@ -215,7 +223,7 @@ export const adder = defineAdderConfig({
 				);
 				if (!htmlNode) {
 					warnings.push(
-						"⚠️ Could not find <html> node in app.html. You'll need to add the language placeholder manually",
+						"Could not find <html> node in app.html. You'll need to add the language placeholder manually",
 					);
 					return;
 				}

From ebb714831890a8d16d6454fd0da2a02c0dad1f0e Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Fri, 2 Aug 2024 15:17:28 +0200
Subject: [PATCH 12/58] Add link to original Regex

---
 adders/paraglide/config/options.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
index 887d8223..8b34042b 100644
--- a/adders/paraglide/config/options.ts
+++ b/adders/paraglide/config/options.ts
@@ -20,6 +20,7 @@ export const options = defineAdderOptions({
 });
 
 export const isValidLanguageTag = (languageTag: string): boolean =>
+	// Regex vendored in from https://github.com/opral/monorepo/blob/94c2298cc1da5378b908e4c160b0fa71a45caadb/inlang/source-code/versioned-interfaces/language-tag/src/interface.ts#L16
 	RegExp(
 		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$',
 	).test(languageTag);

From 344a6c878bcf0762eddb696aa39a01e3808c2259 Mon Sep 17 00:00:00 2001
From: Loris Sigrist <43482866+LorisSigrist@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:58:56 +0200
Subject: [PATCH 13/58] normalize comment formatting

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 adders/paraglide/config/options.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
index 8b34042b..e892eb71 100644
--- a/adders/paraglide/config/options.ts
+++ b/adders/paraglide/config/options.ts
@@ -30,9 +30,9 @@ export function parseLanguageTagInput(input: string): {
 	invalidLanguageTags: string[];
 } {
 	const probablyLanguageTags = input
-		.replace(/[,:\s]/g, ' ') //replace common separators with spaces
+		.replace(/[,:\s]/g, ' ') // replace common separators with spaces
 		.split(' ')
-		.filter(Boolean) //remove empty segments
+		.filter(Boolean) // remove empty segments
 		.map((tag) => tag.toLowerCase());
 
 	const validLanguageTags: string[] = [];

From cfd399a1a19d74ce13f1343448cd85b3467900c4 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Mon, 5 Aug 2024 13:00:16 +0200
Subject: [PATCH 14/58] don't change gitignore

---
 .gitignore.rej | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore.rej b/.gitignore.rej
index 9ec139a3..9d420c99 100644
--- a/.gitignore.rej
+++ b/.gitignore.rej
@@ -1,10 +1,8 @@
 diff a/.gitignore b/.gitignore	(rejected hunks)
-@@ -5,5 +5,4 @@ build/
+@@ -5,4 +5,4 @@ build/
  packages/tests/.outputs
  temp/
  coverage/
 -.rollup.cache
--playground
 \ No newline at end of file
 +.rollup.cache
-\ No newline at end of file

From 234cedaeddd605ef4cc7df0f98a31883e51a0753 Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Mon, 5 Aug 2024 13:27:45 +0200
Subject: [PATCH 15/58] print invalid language tags

---
 adders/paraglide/config/options.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/adders/paraglide/config/options.ts b/adders/paraglide/config/options.ts
index e892eb71..2d062899 100644
--- a/adders/paraglide/config/options.ts
+++ b/adders/paraglide/config/options.ts
@@ -9,8 +9,14 @@ export const options = defineAdderOptions({
 		validate(input) {
 			const { invalidLanguageTags, validLanguageTags } = parseLanguageTagInput(input);
 
-			if (invalidLanguageTags.length > 0)
-				return `Please enter a series of valid BCP47 language tags. Eg: en, de-ch, ar`;
+			if (invalidLanguageTags.length > 0) {
+				if (invalidLanguageTags.length === 1) {
+					return `The input "${invalidLanguageTags[0]}" is not a valid BCP47 language tag`;
+				} else {
+					const listFormat = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' });
+					return `The inputs ${listFormat.format(invalidLanguageTags.map((x) => `"${x}"`))} are not valid BCP47 language tags`;
+				}
+			}
 			if (validLanguageTags.length === 0)
 				return `Please enter at least one valid BCP47 language tag. Eg: en`;
 

From 05c6d8b07625681882c0aabcad4037dbb98d9d5f Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Mon, 5 Aug 2024 14:15:58 +0200
Subject: [PATCH 16/58] Pin version numbers

---
 adders/paraglide/config/adder.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/adders/paraglide/config/adder.ts b/adders/paraglide/config/adder.ts
index e1a76fa7..7f1afd54 100644
--- a/adders/paraglide/config/adder.ts
+++ b/adders/paraglide/config/adder.ts
@@ -9,13 +9,13 @@ const DEFAULT_INLANG_PROJECT = {
 	// sourceLanguageTag: 'en',
 	// languageTags: ['en'],
 	modules: [
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@latest/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@latest/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@latest/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@latest/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@latest/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@latest/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@latest/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1.4.8/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1.5.9/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1.4.8/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1.4.8/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1.0.8/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2.2.0/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0.9.36/dist/index.js',
 	],
 	'plugin.inlang.messageFormat': {
 		pathPattern: './messages/{languageTag}.json',

From ba7e080a5dc8877bbe4e14333060ff19dac1d1bd Mon Sep 17 00:00:00 2001
From: LorisSigrist <loris@sigrist.dev>
Date: Mon, 5 Aug 2024 14:18:26 +0200
Subject: [PATCH 17/58] Add changeset

---
 .changeset/four-crabs-greet.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/four-crabs-greet.md

diff --git a/.changeset/four-crabs-greet.md b/.changeset/four-crabs-greet.md
new file mode 100644
index 00000000..1c2e7672
--- /dev/null
+++ b/.changeset/four-crabs-greet.md
@@ -0,0 +1,5 @@
+---
+'@svelte-add/adders': minor
+---
+
+add `paraglide` adder to set up [`@inlang/paraglide-sveltekit`](https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n)

From 0943224f96219cc5a871f3a35736f1ee491bf954 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sun, 6 Oct 2024 10:53:12 +0200
Subject: [PATCH 18/58] move adder

---
 .../adders}/paraglide/config/adder.ts               |   0
 .../adders}/paraglide/config/checks.ts              |   0
 .../adders}/paraglide/config/options.ts             |   0
 .../adders}/paraglide/config/tests.ts               |   0
 {adders => packages/adders}/paraglide/index.ts      |   0
 {adders => packages/adders}/paraglide/paraglide.png | Bin
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename {adders => packages/adders}/paraglide/config/adder.ts (100%)
 rename {adders => packages/adders}/paraglide/config/checks.ts (100%)
 rename {adders => packages/adders}/paraglide/config/options.ts (100%)
 rename {adders => packages/adders}/paraglide/config/tests.ts (100%)
 rename {adders => packages/adders}/paraglide/index.ts (100%)
 rename {adders => packages/adders}/paraglide/paraglide.png (100%)

diff --git a/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
similarity index 100%
rename from adders/paraglide/config/adder.ts
rename to packages/adders/paraglide/config/adder.ts
diff --git a/adders/paraglide/config/checks.ts b/packages/adders/paraglide/config/checks.ts
similarity index 100%
rename from adders/paraglide/config/checks.ts
rename to packages/adders/paraglide/config/checks.ts
diff --git a/adders/paraglide/config/options.ts b/packages/adders/paraglide/config/options.ts
similarity index 100%
rename from adders/paraglide/config/options.ts
rename to packages/adders/paraglide/config/options.ts
diff --git a/adders/paraglide/config/tests.ts b/packages/adders/paraglide/config/tests.ts
similarity index 100%
rename from adders/paraglide/config/tests.ts
rename to packages/adders/paraglide/config/tests.ts
diff --git a/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
similarity index 100%
rename from adders/paraglide/index.ts
rename to packages/adders/paraglide/index.ts
diff --git a/adders/paraglide/paraglide.png b/packages/adders/paraglide/paraglide.png
similarity index 100%
rename from adders/paraglide/paraglide.png
rename to packages/adders/paraglide/paraglide.png

From 73f952a3e522d67b6934ad37685cb7656fc8f944 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sun, 6 Oct 2024 11:45:13 +0200
Subject: [PATCH 19/58] migrate

---
 packages/adders/_config/official.ts         |   3 +-
 packages/adders/paraglide/config/adder.ts   | 107 ++++++++++----------
 packages/adders/paraglide/config/checks.ts  |   6 +-
 packages/adders/paraglide/config/options.ts |  10 +-
 packages/adders/paraglide/config/tests.ts   |   6 +-
 packages/adders/paraglide/index.ts          |   2 +-
 packages/core/tooling/html/index.ts         |   2 +
 7 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/packages/adders/_config/official.ts b/packages/adders/_config/official.ts
index 0ef4f47c..f5d9b53b 100644
--- a/packages/adders/_config/official.ts
+++ b/packages/adders/_config/official.ts
@@ -6,6 +6,7 @@ import drizzle from '../drizzle/index.ts';
 import eslint from '../eslint/index.ts';
 import lucia from '../lucia/index.ts';
 import mdsvex from '../mdsvex/index.ts';
+import paraglide from '../paraglide/index.ts';
 import playwright from '../playwright/index.ts';
 import prettier from '../prettier/index.ts';
 import routify from '../routify/index.ts';
@@ -19,7 +20,7 @@ const categories: Record<Category, Array<Adder<any>>> = {
 	CSS: [tailwindcss],
 	Database: [drizzle],
 	Auth: [lucia],
-	'Additional Functionality': [storybook, mdsvex, routify]
+	'Additional Functionality': [storybook, paraglide, mdsvex, routify]
 };
 
 export const adderCategories: AdderCategories = getCategoriesById();
diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 7f1afd54..3833927e 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -1,8 +1,9 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { defineAdderConfig } from '@svelte-add/core';
-import { options, parseLanguageTagInput } from './options';
-import { HtmlElement, HtmlElementType } from '../../../packages/ast-tooling';
+import { defineAdderConfig } from '@svelte-cli/core';
+import { options, parseLanguageTagInput } from './options.ts';
+import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
+import * as html from '@svelte-cli/core/html';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
@@ -15,11 +16,11 @@ const DEFAULT_INLANG_PROJECT = {
 		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1.4.8/dist/index.js',
 		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1.0.8/dist/index.js',
 		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2.2.0/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0.9.36/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0.9.36/dist/index.js'
 	],
 	'plugin.inlang.messageFormat': {
-		pathPattern: './messages/{languageTag}.json',
-	},
+		pathPattern: './messages/{languageTag}.json'
+	}
 };
 
 const warnings: string[] = [];
@@ -40,10 +41,10 @@ export const adder = defineAdderConfig({
 				'paraglide',
 				'paraglide-js',
 				'paraglide-sveltekit',
-				'inlang',
+				'inlang'
 			],
-			documentation: 'https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n',
-		},
+			documentation: 'https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n'
+		}
 	},
 	options,
 	integrationType: 'inline',
@@ -51,8 +52,8 @@ export const adder = defineAdderConfig({
 		{
 			name: '@inlang/paraglide-sveltekit',
 			version: '^0.11.0',
-			dev: false,
-		},
+			dev: false
+		}
 	],
 	files: [
 		{
@@ -70,21 +71,21 @@ export const adder = defineAdderConfig({
 
 				data.sourceLanguageTag = sourceLanguageTag;
 				data.languageTags = validLanguageTags;
-			},
+			}
 		},
 		{
 			// add the vite plugin
-			name: ({ typescript }) => `vite.config.${typescript.installed ? 'ts' : 'js'}`,
+			name: ({ typescript }) => `vite.config.${typescript ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content: ({ ast, array, object, functions, common, imports, exports }) => {
+			content: ({ ast }) => {
 				const vitePluginName = 'paraglide';
 				imports.addNamed(ast, '@inlang/paraglide-sveltekit/vite', {
-					paraglide: vitePluginName,
+					paraglide: vitePluginName
 				});
 
 				const { value: rootObject } = exports.defaultExport(
 					ast,
-					functions.call('defineConfig', []),
+					functions.call('defineConfig', [])
 				);
 				const param1 = functions.argumentByIndex(rootObject, 0, object.createEmpty());
 
@@ -92,17 +93,17 @@ export const adder = defineAdderConfig({
 				const pluginFunctionCall = functions.call(vitePluginName, []);
 				const pluginConfig = object.create({
 					project: common.createLiteral('./project.inlang'),
-					outdir: common.createLiteral('./src/lib/paraglide'),
+					outdir: common.createLiteral('./src/lib/paraglide')
 				});
 				functions.argumentByIndex(pluginFunctionCall, 0, pluginConfig);
 				array.push(pluginsArray, pluginFunctionCall);
-			},
+			}
 		},
 		{
 			// src/lib/i18n file
-			name: ({ typescript }) => `src/lib/i18n.${typescript.installed ? 'ts' : 'js'}`,
+			name: ({ typescript }) => `src/lib/i18n.${typescript ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast, imports, exports, variables, common }) {
+			content({ ast }) {
 				imports.addNamed(ast, '@inlang/paraglide-sveltekit', { createI18n: 'createI18n' });
 				imports.addDefault(ast, '$lib/paraglide/runtime', '* as runtime');
 
@@ -112,18 +113,18 @@ export const adder = defineAdderConfig({
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
 				if (existingExport) {
 					warnings.push(
-						'Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct',
+						'Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct'
 					);
 				}
-			},
+			}
 		},
 		{
 			// reroute hook
-			name: ({ typescript }) => `src/hooks.${typescript.installed ? 'ts' : 'js'}`,
+			name: ({ typescript }) => `src/hooks.${typescript ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast, imports, exports, variables, common }) {
+			content({ ast }) {
 				imports.addNamed(ast, '$lib/i18n', {
-					i18n: 'i18n',
+					i18n: 'i18n'
 				});
 
 				const expression = common.expressionFromString('i18n.reroute()');
@@ -133,15 +134,15 @@ export const adder = defineAdderConfig({
 				if (existingExport) {
 					warnings.push('Adding the reroute hook automatically failed. Add it manually');
 				}
-			},
+			}
 		},
 		{
 			// handle hook
-			name: ({ typescript }) => `src/hooks.server.${typescript.installed ? 'ts' : 'js'}`,
+			name: ({ typescript }) => `src/hooks.server.${typescript ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast, imports, exports, functions, variables, common }) {
+			content({ ast }) {
 				imports.addNamed(ast, '$lib/i18n', {
-					i18n: 'i18n',
+					i18n: 'i18n'
 				});
 
 				const i18nHandleExpression = common.expressionFromString('i18n.handle()');
@@ -149,13 +150,13 @@ export const adder = defineAdderConfig({
 					ast,
 					'const',
 					'handle',
-					i18nHandleExpression,
+					i18nHandleExpression
 				);
 				const existingExport = exports.namedExport(ast, 'handle', rerouteIdentifier);
 				if (existingExport) {
 					// if there is an existing `handle` hook, use the `sequence` function to add i18n.handle to it
 					imports.addNamed(ast, '@sveltejs/kit/hooks', {
-						sequence: 'sequence',
+						sequence: 'sequence'
 					});
 
 					const existingHandle = existingExport.declaration;
@@ -177,62 +178,62 @@ export const adder = defineAdderConfig({
 						...existingHandle.declarations
 							.filter((decl) => decl.type === 'VariableDeclarator')
 							.map((decl) => decl.init)
-							.filter((exp): exp is ExpressionKind => !!exp),
+							.filter((exp): exp is ExpressionKind => !!exp)
 					];
 
 					const newHandle = variables.declaration(ast, 'const', 'handle', sequenceExpression);
 					existingExport.declaration = newHandle;
 				}
-			},
+			}
 		},
 		{
 			// add the <ParaglideJS> component to the layout
-			name: ({ kit }) => `${kit.routesDirectory}/+layout.svelte`,
+			name: ({ kit }) => `${kit?.routesDirectory}/+layout.svelte`,
 			contentType: 'svelte',
-			content: ({ js, html }) => {
-				js.imports.addNamed(js.ast, '@inlang/paraglide-sveltekit', {
-					ParaglideJS: 'ParaglideJS',
+			content: ({ jsAst, htmlAst }) => {
+				imports.addNamed(jsAst, '@inlang/paraglide-sveltekit', {
+					ParaglideJS: 'ParaglideJS'
 				});
-				js.imports.addNamed(js.ast, '$lib/i18n', {
-					i18n: 'i18n',
+				imports.addNamed(jsAst, '$lib/i18n', {
+					i18n: 'i18n'
 				});
 
 				// wrap the HTML in a ParaglideJS instance
 				// TODO if (alreadyContainsParaglideJS(html.ast)) return;
-				const rootChildren = html.ast.children;
+				const rootChildren = htmlAst.children;
 				if (rootChildren.length === 0) {
 					const slot = html.element('slot');
 					rootChildren.push(slot);
 				}
 				const root = html.element('ParaglideJS', {});
 				root.attribs = {
-					'{i18n}': '',
+					'{i18n}': ''
 				};
 				root.children = rootChildren;
-				html.ast.children = [root];
-			},
+				htmlAst.children = [root];
+			}
 		},
 		{
 			// add the text-direction and lang attribute placeholders to app.html
-			name: () => `src/app.html`,
+			name: () => 'src/app.html',
 			contentType: 'html',
 			content(editor) {
 				const htmlNode = editor.ast.children.find(
-					(child): child is HtmlElement =>
-						child.type === HtmlElementType.Tag && child.name === 'html',
+					(child): child is html.HtmlElement =>
+						child.type === html.HtmlElementType.Tag && child.name === 'html'
 				);
 				if (!htmlNode) {
 					warnings.push(
-						"Could not find <html> node in app.html. You'll need to add the language placeholder manually",
+						"Could not find <html> node in app.html. You'll need to add the language placeholder manually"
 					);
 					return;
 				}
 				htmlNode.attribs = {
 					...htmlNode.attribs,
 					lang: '%paraglide.lang%',
-					dir: '%paraglide.textDirection%',
+					dir: '%paraglide.textDirection%'
 				};
-			},
+			}
 		},
 		{
 			// add an example langauge file
@@ -247,12 +248,12 @@ export const adder = defineAdderConfig({
 			content: ({ data }) => {
 				data['$schema'] = 'https://inlang.com/schema/inlang-message-format';
 				data.hello_world = 'Hello, {name}!';
-			},
-		},
+			}
+		}
 	],
 	nextSteps: ({ colors }) => [
 		...warnings.map(colors.yellow),
 		'Edit your messages in `messages/en.json`',
-		'Consider installing the Sherlock IDE Extension',
-	],
+		'Consider installing the Sherlock IDE Extension'
+	]
 });
diff --git a/packages/adders/paraglide/config/checks.ts b/packages/adders/paraglide/config/checks.ts
index fc08d6f3..923c1632 100644
--- a/packages/adders/paraglide/config/checks.ts
+++ b/packages/adders/paraglide/config/checks.ts
@@ -1,6 +1,6 @@
-import { defineAdderChecks } from '@svelte-add/core';
-import { options } from './options';
+import { defineAdderChecks } from '@svelte-cli/core';
+import { options } from './options.ts';
 
 export const checks = defineAdderChecks({
-	options,
+	options
 });
diff --git a/packages/adders/paraglide/config/options.ts b/packages/adders/paraglide/config/options.ts
index 2d062899..aa7ddf96 100644
--- a/packages/adders/paraglide/config/options.ts
+++ b/packages/adders/paraglide/config/options.ts
@@ -1,4 +1,4 @@
-import { defineAdderOptions } from '@svelte-add/core';
+import { defineAdderOptions } from '@svelte-cli/core';
 
 export const options = defineAdderOptions({
 	availableLanguageTags: {
@@ -21,14 +21,14 @@ export const options = defineAdderOptions({
 				return `Please enter at least one valid BCP47 language tag. Eg: en`;
 
 			return undefined;
-		},
-	},
+		}
+	}
 });
 
 export const isValidLanguageTag = (languageTag: string): boolean =>
 	// Regex vendored in from https://github.com/opral/monorepo/blob/94c2298cc1da5378b908e4c160b0fa71a45caadb/inlang/source-code/versioned-interfaces/language-tag/src/interface.ts#L16
 	RegExp(
-		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$',
+		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$'
 	).test(languageTag);
 
 export function parseLanguageTagInput(input: string): {
@@ -51,6 +51,6 @@ export function parseLanguageTagInput(input: string): {
 
 	return {
 		validLanguageTags,
-		invalidLanguageTags,
+		invalidLanguageTags
 	};
 }
diff --git a/packages/adders/paraglide/config/tests.ts b/packages/adders/paraglide/config/tests.ts
index 5f116d04..f1927a05 100644
--- a/packages/adders/paraglide/config/tests.ts
+++ b/packages/adders/paraglide/config/tests.ts
@@ -1,5 +1,5 @@
-import { defineAdderTests } from '@svelte-add/core';
-import { options } from './options';
+import { defineAdderTests } from '@svelte-cli/core';
+import { options } from './options.ts';
 
 // e2e tests make no sense in this context
 
@@ -7,5 +7,5 @@ export const tests = defineAdderTests({
 	files: [],
 	options,
 	optionValues: [],
-	tests: [],
+	tests: []
 });
diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index 0ae44fcc..4549a9e8 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { defineAdder } from '@svelte-add/core';
+import { defineAdder } from '@svelte-cli/core';
 import { adder } from './config/adder.js';
 import { checks } from './config/checks.js';
 import { tests } from './config/tests.js';
diff --git a/packages/core/tooling/html/index.ts b/packages/core/tooling/html/index.ts
index ecf958ac..3228f6ce 100644
--- a/packages/core/tooling/html/index.ts
+++ b/packages/core/tooling/html/index.ts
@@ -5,6 +5,8 @@ import {
 	parseHtml
 } from '@svelte-cli/ast-tooling';
 
+export { HtmlElement, HtmlElementType };
+
 export function div(attributes: Record<string, string> = {}): HtmlElement {
 	return element('div', attributes);
 }

From 7a8d405b01934dcdd2d672a20c9a0a69f6e61c61 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sun, 6 Oct 2024 11:51:51 +0200
Subject: [PATCH 20/58] remove implemented todo

---
 packages/adders/paraglide/config/adder.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 3833927e..074e17fa 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -58,7 +58,6 @@ export const adder = defineAdderConfig({
 	files: [
 		{
 			// create an inlang project if it doesn't exist yet
-			// TODO Scan for & use existing projects
 			name: () => 'project.inlang/settings.json',
 			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang')),
 			contentType: 'json',
@@ -112,9 +111,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
 				if (existingExport) {
-					warnings.push(
-						'Setting up $lib/i18n failed because it aleady exports an i18n function. Check that it is correct'
-					);
+					warnings.push('Setting up $lib/i18n failed because it aleady exports an i18n function');
 				}
 			}
 		},

From 9ebdd8cb85ef665da95e4cf28b111b40182bd9a0 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sun, 6 Oct 2024 14:23:28 +0200
Subject: [PATCH 21/58] fix adder

---
 .gitignore.rej                            |  8 --------
 packages/adders/paraglide/config/adder.ts | 14 +++++++-------
 2 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 .gitignore.rej

diff --git a/.gitignore.rej b/.gitignore.rej
deleted file mode 100644
index 9d420c99..00000000
--- a/.gitignore.rej
+++ /dev/null
@@ -1,8 +0,0 @@
-diff a/.gitignore b/.gitignore	(rejected hunks)
-@@ -5,4 +5,4 @@ build/
- packages/tests/.outputs
- temp/
- coverage/
--.rollup.cache
-\ No newline at end of file
-+.rollup.cache
diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 074e17fa..cb060f59 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -10,13 +10,13 @@ const DEFAULT_INLANG_PROJECT = {
 	// sourceLanguageTag: 'en',
 	// languageTags: ['en'],
 	modules: [
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1.4.8/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1.5.9/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1.4.8/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1.4.8/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1.0.8/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2.2.0/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0.9.36/dist/index.js'
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0/dist/index.js'
 	],
 	'plugin.inlang.messageFormat': {
 		pathPattern: './messages/{languageTag}.json'

From 9e1b0beb0e45167775feeece054a0906b7091682 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sun, 6 Oct 2024 16:10:08 +0200
Subject: [PATCH 22/58] make it work

---
 packages/adders/paraglide/config/adder.ts   | 68 ++++++++++++++----
 packages/adders/paraglide/config/options.ts |  9 ++-
 packages/cli/commands/add.ts                |  6 +-
 packages/core/adder/config.ts               |  2 +
 packages/core/adder/options.ts              |  4 ++
 packages/core/adder/options.ts.rej          | 76 ---------------------
 6 files changed, 72 insertions(+), 93 deletions(-)
 delete mode 100644 packages/core/adder/options.ts.rej

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index cb060f59..5796a04c 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -7,8 +7,6 @@ import * as html from '@svelte-cli/core/html';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
-	// sourceLanguageTag: 'en',
-	// languageTags: ['en'],
 	modules: [
 		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js',
 		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1/dist/index.js',
@@ -59,7 +57,7 @@ export const adder = defineAdderConfig({
 		{
 			// create an inlang project if it doesn't exist yet
 			name: () => 'project.inlang/settings.json',
-			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang')),
+			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang/settings.josn')),
 			contentType: 'json',
 			content: ({ options, data }) => {
 				for (const key in DEFAULT_INLANG_PROJECT) {
@@ -233,21 +231,63 @@ export const adder = defineAdderConfig({
 			}
 		},
 		{
-			// add an example langauge file
-			// TODO: Expand this for all languages
-			name: ({ options }) => {
+			// add usage example
+			name: ({ kit }) => `${kit?.routesDirectory}/+page.svelte`,
+			contentType: 'svelte',
+			condition: ({ options }) => options.demo,
+			content({ jsAst, htmlAst, options }) {
+				imports.addDefault(jsAst, '$lib/paraglide/messages.js', '* as m');
+				imports.addNamed(jsAst, '$app/navigation', { goto: 'goto' });
+				imports.addNamed(jsAst, '$app/stores', { page: 'page' });
+				imports.addNamed(jsAst, '$lib/i18n', { i18n: 'i18n' });
+
+				const methodStatement = common.statementFromString(`
+					/**
+					 * @param { import("$lib/paraglide/runtime").AvailableLanguageTag } newLanguage
+					 */
+					function switchToLanguage(newLanguage) {
+						const canonicalPath = i18n.route($page.url.pathname);
+						const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
+						goto(localisedPath);
+					}
+				`);
+				jsAst.body.push(methodStatement);
+
+				// add localized message
+				html.addFromRawHtml(
+					htmlAst.childNodes,
+					`<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>`
+				);
+
+				// add links to other localized pages, the first one is the default
+				// language, thus it does not require any localized route
 				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
-				const sourceLanguageTag = validLanguageTags[0];
-				if (!sourceLanguageTag) throw new Error('No language tags'); // this should be unreachable
-				return `messages/${sourceLanguageTag}.json`;
-			},
-			contentType: 'json',
-			content: ({ data }) => {
-				data['$schema'] = 'https://inlang.com/schema/inlang-message-format';
-				data.hello_world = 'Hello, {name}!';
+				const links = validLanguageTags
+					.map((x) => `<button onclick="{() => switchToLanguage('${x}')}">${x}</button>`)
+					.join('');
+				const div = html.element('div');
+				html.addFromRawHtml(div.childNodes, links);
+				html.appendElement(htmlAst.childNodes, div);
 			}
 		}
 	],
+	postInstall: ({ cwd, options }) => {
+		const jsonData: Record<string, string> = {};
+		jsonData['$schema'] = 'https://inlang.com/schema/inlang-message-format';
+
+		const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
+		for (const languageTag of validLanguageTags) {
+			jsonData.hello_world = `Hello, {name} from ${languageTag}!`;
+
+			const filePath = `messages/${languageTag}.json`;
+			const directoryPath = path.dirname(filePath);
+			const fullDirectoryPath = path.join(cwd, directoryPath);
+			const fullFilePath = path.join(cwd, filePath);
+
+			fs.mkdirSync(fullDirectoryPath, { recursive: true });
+			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2));
+		}
+	},
 	nextSteps: ({ colors }) => [
 		...warnings.map(colors.yellow),
 		'Edit your messages in `messages/en.json`',
diff --git a/packages/adders/paraglide/config/options.ts b/packages/adders/paraglide/config/options.ts
index aa7ddf96..f42983a2 100644
--- a/packages/adders/paraglide/config/options.ts
+++ b/packages/adders/paraglide/config/options.ts
@@ -5,7 +5,7 @@ export const options = defineAdderOptions({
 		question: 'Which language tags would you like to support?',
 		type: 'string',
 		default: '',
-		placeholder: 'en, de-ch',
+		placeholder: 'en,de-ch',
 		validate(input) {
 			const { invalidLanguageTags, validLanguageTags } = parseLanguageTagInput(input);
 
@@ -18,10 +18,15 @@ export const options = defineAdderOptions({
 				}
 			}
 			if (validLanguageTags.length === 0)
-				return `Please enter at least one valid BCP47 language tag. Eg: en`;
+				return 'Please enter at least one valid BCP47 language tag. Eg: en';
 
 			return undefined;
 		}
+	},
+	demo: {
+		type: 'boolean',
+		default: false,
+		question: 'Do you want to include a demo?'
 	}
 });
 
diff --git a/packages/cli/commands/add.ts b/packages/cli/commands/add.ts
index eab089ad..f4073620 100644
--- a/packages/cli/commands/add.ts
+++ b/packages/cli/commands/add.ts
@@ -441,7 +441,9 @@ export async function runAddCommand(options: Options, adders: string[]): Promise
 			if (question.type === 'string' || question.type === 'number') {
 				answer = await p.text({
 					message,
-					initialValue: question.default.toString()
+					initialValue: question.default.toString(),
+					placeholder: question.placeholder,
+					validate: question.validate
 				});
 			}
 			if (p.isCancel(answer)) {
@@ -555,10 +557,12 @@ export async function installAdders({
 
 		// execute adders
 		if (config.integrationType === 'inline') {
+			await config.preInstall?.(workspace);
 			const pkgPath = installPackages(config, workspace);
 			filesToFormat.add(pkgPath);
 			const changedFiles = createOrUpdateFiles(config.files, workspace);
 			changedFiles.forEach((file) => filesToFormat.add(file));
+			await config.postInstall?.(workspace);
 		} else if (config.integrationType === 'external') {
 			await processExternalAdder(config, cwd);
 		} else {
diff --git a/packages/core/adder/config.ts b/packages/core/adder/config.ts
index 918058d4..da899acd 100644
--- a/packages/core/adder/config.ts
+++ b/packages/core/adder/config.ts
@@ -47,6 +47,8 @@ export type InlineAdderConfig<Args extends OptionDefinition> = BaseAdderConfig<A
 	integrationType: 'inline';
 	packages: Array<PackageDefinition<Args>>;
 	files: Array<FileType<Args>>;
+	preInstall?: (workspace: Workspace<Args>) => MaybePromise<void>;
+	postInstall?: (workspace: Workspace<Args>) => MaybePromise<void>;
 	nextSteps?: (data: {
 		options: OptionValues<Args>;
 		cwd: string;
diff --git a/packages/core/adder/options.ts b/packages/core/adder/options.ts
index 73a469c7..0e07671f 100644
--- a/packages/core/adder/options.ts
+++ b/packages/core/adder/options.ts
@@ -6,11 +6,15 @@ export type BooleanQuestion = {
 export type StringQuestion = {
 	type: 'string';
 	default: string;
+	validate?: (value: string) => string | undefined;
+	placeholder?: string;
 };
 
 export type NumberQuestion = {
 	type: 'number';
 	default: number;
+	validate?: (value: string) => string | undefined;
+	placeholder?: string;
 };
 
 export type SelectQuestion<Value = any> = {
diff --git a/packages/core/adder/options.ts.rej b/packages/core/adder/options.ts.rej
deleted file mode 100644
index 4ee04124..00000000
--- a/packages/core/adder/options.ts.rej
+++ /dev/null
@@ -1,76 +0,0 @@
-diff a/packages/core/adder/options.ts b/packages/core/adder/options.ts	(rejected hunks)
-@@ -10,11 +10,15 @@ export type BooleanQuestion = {
- export type StringQuestion = {
- 	type: 'string';
- 	default: string;
-+	validate?: (value: string) => string | undefined;
-+	placeholder?: string;
- };
- 
- export type NumberQuestion = {
- 	type: 'number';
- 	default: number;
-+	validate?: (value: string) => string | undefined;
-+	placeholder?: string;
- };
- 
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
-@@ -283,26 +287,39 @@ export async function requestMissingOptionsFromUser<Args extends OptionDefinitio
- 			// if the option already has an value, ignore it and continue
- 			if (optionValue !== undefined) continue;
- 
--			if (option.type == 'number' || option.type == 'string') {
--				optionValue = await textPrompt(
--					questionPrefix + option.question,
--					'Not sure',
--					option.default.toString(),
--				);
--			} else if (option.type == 'boolean') {
--				optionValue = await booleanPrompt(questionPrefix + option.question, option.default);
--			} else if (option.type == 'select') {
--				optionValue = await selectPrompt(
--					questionPrefix + option.question,
--					option.default,
--					option.options,
--				);
--			}
--
--			if (optionValue === 'true') optionValue = true;
--			if (optionValue === 'false') optionValue = false;
--
-+			optionValue = await promptOptionValue({ option, questionPrefix });
- 			selectedValues[optionKey] = optionValue;
- 		}
- 	}
- }
-+
-+async function promptOptionValue({
-+	option,
-+	questionPrefix,
-+}: {
-+	option: Question;
-+	questionPrefix: string;
-+}): Promise<unknown> {
-+	let optionValue: unknown = undefined;
-+	if (option.type == 'number' || option.type == 'string') {
-+		optionValue = await textPrompt(
-+			questionPrefix + option.question,
-+			option.placeholder ?? 'Not sure',
-+			option.default.toString(),
-+			option.validate,
-+		);
-+	} else if (option.type == 'boolean') {
-+		optionValue = await booleanPrompt(questionPrefix + option.question, option.default);
-+	} else if (option.type == 'select') {
-+		optionValue = await selectPrompt(
-+			questionPrefix + option.question,
-+			option.default,
-+			option.options,
-+		);
-+	}
-+
-+	if (optionValue === 'true') optionValue = true;
-+	if (optionValue === 'false') optionValue = false;
-+
-+	return optionValue;
-+}

From 76cd4230da98f61bedbc91299bed2c1aa2570409 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Tue, 8 Oct 2024 17:10:23 +0200
Subject: [PATCH 23/58] Update packages/adders/paraglide/config/adder.ts

Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com>
---
 packages/adders/paraglide/config/adder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 5796a04c..edeb7486 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -49,7 +49,7 @@ export const adder = defineAdderConfig({
 	packages: [
 		{
 			name: '@inlang/paraglide-sveltekit',
-			version: '^0.11.0',
+			version: '^0.11.1',
 			dev: false
 		}
 	],

From ae8b8c733ce56ca52bfaa84cdb28e28cf6b4ef8a Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Wed, 9 Oct 2024 17:35:03 +0200
Subject: [PATCH 24/58] fix type errors

---
 packages/adders/paraglide/config/adder.ts | 5 ++---
 packages/core/adder/config.ts             | 1 +
 packages/core/files/utils.ts              | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index edeb7486..f7ceeade 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -45,7 +45,6 @@ export const adder = defineAdderConfig({
 		}
 	},
 	options,
-	integrationType: 'inline',
 	packages: [
 		{
 			name: '@inlang/paraglide-sveltekit',
@@ -288,8 +287,8 @@ export const adder = defineAdderConfig({
 			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2));
 		}
 	},
-	nextSteps: ({ colors }) => [
-		...warnings.map(colors.yellow),
+	nextSteps: ({ highlighter }) => [
+		...warnings.map(highlighter.warning),
 		'Edit your messages in `messages/en.json`',
 		'Consider installing the Sherlock IDE Extension'
 	]
diff --git a/packages/core/adder/config.ts b/packages/core/adder/config.ts
index ee6280de..dd74d110 100644
--- a/packages/core/adder/config.ts
+++ b/packages/core/adder/config.ts
@@ -60,6 +60,7 @@ export type AdderConfig<Args extends OptionDefinition> = {
 export type Highlighter = {
 	path: (str: string) => string;
 	command: (str: string) => string;
+	warning: (str: string) => string;
 	website: (str: string) => string;
 	route: (str: string) => string;
 	env: (str: string) => string;
diff --git a/packages/core/files/utils.ts b/packages/core/files/utils.ts
index b207db40..b1f38d21 100644
--- a/packages/core/files/utils.ts
+++ b/packages/core/files/utils.ts
@@ -123,6 +123,7 @@ export function getHighlighter(): Highlighter {
 	return {
 		command: (str) => pc.bold(pc.cyanBright(str)),
 		env: (str) => pc.yellow(str),
+		warning: (str) => pc.yellow(str),
 		path: (str) => pc.green(str),
 		route: (str) => pc.bold(str),
 		website: (str) => pc.whiteBright(str)

From 5e2a466706eafffd557d7f2cb1a510250c254e03 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Wed, 9 Oct 2024 17:52:33 +0200
Subject: [PATCH 25/58] robustness

---
 packages/adders/paraglide/config/adder.ts | 66 +++++++----------------
 1 file changed, 18 insertions(+), 48 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index f7ceeade..a802b19d 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -4,6 +4,7 @@ import { defineAdderConfig } from '@svelte-cli/core';
 import { options, parseLanguageTagInput } from './options.ts';
 import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
 import * as html from '@svelte-cli/core/html';
+import { addHooksHandle } from '../../common.ts';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
@@ -134,50 +135,13 @@ export const adder = defineAdderConfig({
 			// handle hook
 			name: ({ typescript }) => `src/hooks.server.${typescript ? 'ts' : 'js'}`,
 			contentType: 'script',
-			content({ ast }) {
+			content({ ast, typescript }) {
 				imports.addNamed(ast, '$lib/i18n', {
 					i18n: 'i18n'
 				});
 
-				const i18nHandleExpression = common.expressionFromString('i18n.handle()');
-				const rerouteIdentifier = variables.declaration(
-					ast,
-					'const',
-					'handle',
-					i18nHandleExpression
-				);
-				const existingExport = exports.namedExport(ast, 'handle', rerouteIdentifier);
-				if (existingExport) {
-					// if there is an existing `handle` hook, use the `sequence` function to add i18n.handle to it
-					imports.addNamed(ast, '@sveltejs/kit/hooks', {
-						sequence: 'sequence'
-					});
-
-					const existingHandle = existingExport.declaration;
-					if (!existingHandle || existingHandle.type !== 'VariableDeclaration') {
-						warnings.push('Adding the handle hook automatically failed. Add it manually');
-						return;
-					}
-
-					const sequenceExpression = functions.call('sequence', []);
-
-					type VariableDeclarator = Extract<
-						(typeof existingHandle.declarations)[number],
-						{ type: 'VariableDeclarator' }
-					>;
-					type ExpressionKind = Exclude<VariableDeclarator['init'], null | undefined>;
-
-					sequenceExpression.arguments = [
-						i18nHandleExpression,
-						...existingHandle.declarations
-							.filter((decl) => decl.type === 'VariableDeclarator')
-							.map((decl) => decl.init)
-							.filter((exp): exp is ExpressionKind => !!exp)
-					];
-
-					const newHandle = variables.declaration(ast, 'const', 'handle', sequenceExpression);
-					existingExport.declaration = newHandle;
-				}
+				const hookHandleContent = 'i18n.handle()';
+				addHooksHandle(ast, typescript, 'paraglide', hookHandleContent);
 			}
 		},
 		{
@@ -185,26 +149,32 @@ export const adder = defineAdderConfig({
 			name: ({ kit }) => `${kit?.routesDirectory}/+layout.svelte`,
 			contentType: 'svelte',
 			content: ({ jsAst, htmlAst }) => {
+				const paraglideComponentName = 'ParaglideJS';
 				imports.addNamed(jsAst, '@inlang/paraglide-sveltekit', {
-					ParaglideJS: 'ParaglideJS'
+					[paraglideComponentName]: paraglideComponentName
 				});
 				imports.addNamed(jsAst, '$lib/i18n', {
 					i18n: 'i18n'
 				});
 
 				// wrap the HTML in a ParaglideJS instance
-				// TODO if (alreadyContainsParaglideJS(html.ast)) return;
 				const rootChildren = htmlAst.children;
 				if (rootChildren.length === 0) {
 					const slot = html.element('slot');
 					rootChildren.push(slot);
 				}
-				const root = html.element('ParaglideJS', {});
-				root.attribs = {
-					'{i18n}': ''
-				};
-				root.children = rootChildren;
-				htmlAst.children = [root];
+
+				const hasParaglideJsNode = rootChildren.find(
+					(x) => x.type == 'tag' && x.name == paraglideComponentName
+				);
+				if (!hasParaglideJsNode) {
+					const root = html.element(paraglideComponentName, {});
+					root.attribs = {
+						'{i18n}': ''
+					};
+					root.children = rootChildren;
+					htmlAst.children = [root];
+				}
 			}
 		},
 		{

From 49c752633ea7ec4f8959d111237f8d6d778fac35 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Wed, 9 Oct 2024 18:15:24 +0200
Subject: [PATCH 26/58] fix warnings

---
 packages/adders/paraglide/config/adder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index a802b19d..c2d5cea9 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -108,7 +108,7 @@ export const adder = defineAdderConfig({
 				const i18n = variables.declaration(ast, 'const', 'i18n', createI18nExpression);
 
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
-				if (existingExport) {
+				if (existingExport.declaration != i18n) {
 					warnings.push('Setting up $lib/i18n failed because it aleady exports an i18n function');
 				}
 			}
@@ -126,7 +126,7 @@ export const adder = defineAdderConfig({
 				const rerouteIdentifier = variables.declaration(ast, 'const', 'reroute', expression);
 
 				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
-				if (existingExport) {
+				if (existingExport.declaration != rerouteIdentifier) {
 					warnings.push('Adding the reroute hook automatically failed. Add it manually');
 				}
 			}

From 517e52a6ea77a2dd9fedda461822567873dcfc18 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Wed, 9 Oct 2024 18:23:03 +0200
Subject: [PATCH 27/58] fix new lines

---
 packages/adders/paraglide/config/adder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index c2d5cea9..2a7ed357 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -254,7 +254,7 @@ export const adder = defineAdderConfig({
 			const fullFilePath = path.join(cwd, filePath);
 
 			fs.mkdirSync(fullDirectoryPath, { recursive: true });
-			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2));
+			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + '\n');
 		}
 	},
 	nextSteps: ({ highlighter }) => [

From 3f1addaa8aad7a7934e186c21268fab7aff1f2f6 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Wed, 9 Oct 2024 20:01:47 +0200
Subject: [PATCH 28/58] remove old changeset

---
 .changeset/four-crabs-greet.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/four-crabs-greet.md

diff --git a/.changeset/four-crabs-greet.md b/.changeset/four-crabs-greet.md
deleted file mode 100644
index 1c2e7672..00000000
--- a/.changeset/four-crabs-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@svelte-add/adders': minor
----
-
-add `paraglide` adder to set up [`@inlang/paraglide-sveltekit`](https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n)

From e0fe0699f429288b45be9cc86cbb1a49853051d2 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Thu, 10 Oct 2024 17:22:21 +0200
Subject: [PATCH 29/58] use log.warn

---
 packages/adders/paraglide/config/adder.ts | 12 +++++-------
 packages/core/adder/config.ts             |  1 -
 packages/core/files/utils.ts              |  1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 2a7ed357..dc874cbf 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { defineAdderConfig } from '@svelte-cli/core';
+import { defineAdderConfig, log } from '@svelte-cli/core';
 import { options, parseLanguageTagInput } from './options.ts';
 import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
 import * as html from '@svelte-cli/core/html';
@@ -22,7 +22,6 @@ const DEFAULT_INLANG_PROJECT = {
 	}
 };
 
-const warnings: string[] = [];
 export const adder = defineAdderConfig({
 	metadata: {
 		id: 'paraglide',
@@ -109,7 +108,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
 				if (existingExport.declaration != i18n) {
-					warnings.push('Setting up $lib/i18n failed because it aleady exports an i18n function');
+					log.warn('Setting up $lib/i18n failed because it aleady exports an i18n function');
 				}
 			}
 		},
@@ -127,7 +126,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
 				if (existingExport.declaration != rerouteIdentifier) {
-					warnings.push('Adding the reroute hook automatically failed. Add it manually');
+					log.warn('Adding the reroute hook automatically failed. Add it manually');
 				}
 			}
 		},
@@ -187,7 +186,7 @@ export const adder = defineAdderConfig({
 						child.type === html.HtmlElementType.Tag && child.name === 'html'
 				);
 				if (!htmlNode) {
-					warnings.push(
+					log.warn(
 						"Could not find <html> node in app.html. You'll need to add the language placeholder manually"
 					);
 					return;
@@ -257,8 +256,7 @@ export const adder = defineAdderConfig({
 			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + '\n');
 		}
 	},
-	nextSteps: ({ highlighter }) => [
-		...warnings.map(highlighter.warning),
+	nextSteps: () => [
 		'Edit your messages in `messages/en.json`',
 		'Consider installing the Sherlock IDE Extension'
 	]
diff --git a/packages/core/adder/config.ts b/packages/core/adder/config.ts
index dd74d110..ee6280de 100644
--- a/packages/core/adder/config.ts
+++ b/packages/core/adder/config.ts
@@ -60,7 +60,6 @@ export type AdderConfig<Args extends OptionDefinition> = {
 export type Highlighter = {
 	path: (str: string) => string;
 	command: (str: string) => string;
-	warning: (str: string) => string;
 	website: (str: string) => string;
 	route: (str: string) => string;
 	env: (str: string) => string;
diff --git a/packages/core/files/utils.ts b/packages/core/files/utils.ts
index b1f38d21..b207db40 100644
--- a/packages/core/files/utils.ts
+++ b/packages/core/files/utils.ts
@@ -123,7 +123,6 @@ export function getHighlighter(): Highlighter {
 	return {
 		command: (str) => pc.bold(pc.cyanBright(str)),
 		env: (str) => pc.yellow(str),
-		warning: (str) => pc.yellow(str),
 		path: (str) => pc.green(str),
 		route: (str) => pc.bold(str),
 		website: (str) => pc.whiteBright(str)

From 7e93368bec71df195a5410ca77cea46da2b12727 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Thu, 10 Oct 2024 17:23:11 +0200
Subject: [PATCH 30/58] add comment

---
 packages/core/adder/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/adder/config.ts b/packages/core/adder/config.ts
index ee6280de..9e8eb5a7 100644
--- a/packages/core/adder/config.ts
+++ b/packages/core/adder/config.ts
@@ -62,7 +62,7 @@ export type Highlighter = {
 	command: (str: string) => string;
 	website: (str: string) => string;
 	route: (str: string) => string;
-	env: (str: string) => string;
+	env: (str: string) => string; // used for printing environment variable names
 };
 
 export function defineAdderConfig<Args extends OptionDefinition>(

From 986ea1f6238e6030e8ca6877bb2a25f96016facc Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Thu, 10 Oct 2024 17:25:24 +0200
Subject: [PATCH 31/58] fix lint

---
 packages/cli/commands/create.ts | 2 +-
 packages/cli/common.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
index e6a619ea..b46054b9 100644
--- a/packages/cli/commands/create.ts
+++ b/packages/cli/commands/create.ts
@@ -49,7 +49,7 @@ export const create = new Command('create')
 			let i = 1;
 			const initialSteps: string[] = [];
 			const relative = path.relative(process.cwd(), directory);
-			const pm = await detectPackageManager(cwd);
+			const pm = detectPackageManager(cwd);
 			if (relative !== '') {
 				initialSteps.push(`${i++}: ${highlight(`cd ${relative}`)}`);
 			}
diff --git a/packages/cli/common.ts b/packages/cli/common.ts
index cce2a99d..4ebcf60c 100644
--- a/packages/cli/common.ts
+++ b/packages/cli/common.ts
@@ -43,7 +43,7 @@ export async function runCommand(action: MaybePromise) {
 }
 
 export async function formatFiles(cwd: string, paths: string[]): Promise<void> {
-	const pm = await detectPackageManager(cwd);
+	const pm = detectPackageManager(cwd);
 	const args = ['prettier', '--write', '--ignore-unknown', ...paths];
 	const cmd = resolveCommand(pm, 'execute-local', args)!;
 	await exec(cmd.command, cmd.args, {

From de742f84bb07c703f2e8fee7b2e5d4ffdff3c005 Mon Sep 17 00:00:00 2001
From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:05:39 -0400
Subject: [PATCH 32/58] coerce to a number

---
 packages/cli/commands/add.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/cli/commands/add.ts b/packages/cli/commands/add.ts
index 75fdb045..93815033 100644
--- a/packages/cli/commands/add.ts
+++ b/packages/cli/commands/add.ts
@@ -440,6 +440,9 @@ export async function runAddCommand(options: Options, adders: string[]): Promise
 					placeholder: question.placeholder,
 					validate: question.validate
 				});
+				if (question.type === 'number') {
+					answer = Number(answer);
+				}
 			}
 			if (p.isCancel(answer)) {
 				p.cancel('Operation cancelled.');

From e7f87015ece191ca8c7e35266f7401d2b361b882 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:35:06 +0200
Subject: [PATCH 33/58] Update packages/adders/paraglide/config/adder.ts

Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com>
---
 packages/adders/paraglide/config/adder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index dc874cbf..5cc03ba0 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -257,7 +257,7 @@ export const adder = defineAdderConfig({
 		}
 	},
 	nextSteps: () => [
-		'Edit your messages in `messages/en.json`',
+		`Edit your messages in ${highlighter.path("messages/en.json")}`,
 		'Consider installing the Sherlock IDE Extension'
 	]
 });

From f5d005aa3e7a5bba3af269d559dad497f37e4293 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:37:27 +0200
Subject: [PATCH 34/58] Update packages/adders/paraglide/config/adder.ts

Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com>
---
 packages/adders/paraglide/config/adder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 5cc03ba0..becdde98 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -56,7 +56,7 @@ export const adder = defineAdderConfig({
 		{
 			// create an inlang project if it doesn't exist yet
 			name: () => 'project.inlang/settings.json',
-			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang/settings.josn')),
+			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang/settings.json')),
 			contentType: 'json',
 			content: ({ options, data }) => {
 				for (const key in DEFAULT_INLANG_PROJECT) {

From 2fa31a168a9a61e28b3aa73e4edf5141ec080ad1 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:37:36 +0200
Subject: [PATCH 35/58] Update packages/adders/paraglide/config/adder.ts

Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com>
---
 packages/adders/paraglide/config/adder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index becdde98..6e40602c 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -108,7 +108,7 @@ export const adder = defineAdderConfig({
 
 				const existingExport = exports.namedExport(ast, 'i18n', i18n);
 				if (existingExport.declaration != i18n) {
-					log.warn('Setting up $lib/i18n failed because it aleady exports an i18n function');
+					log.warn('Setting up $lib/i18n failed because it already exports an i18n function');
 				}
 			}
 		},

From 1b5d560a144ac61d0cf7db61deee2240731a0a1e Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Thu, 10 Oct 2024 19:37:51 +0200
Subject: [PATCH 36/58] Update packages/adders/paraglide/config/adder.ts

Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com>
---
 packages/adders/paraglide/config/adder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 6e40602c..e37c9de5 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -26,7 +26,7 @@ export const adder = defineAdderConfig({
 	metadata: {
 		id: 'paraglide',
 		name: 'Paraglide',
-		description: 'Typesafe i18n with localized routing',
+		description: 'Typesafe i18n with localised routing',
 		environments: { svelte: false, kit: true },
 		website: {
 			logo: './paraglide.png',

From ee1997f9b3292a22437823194c978bbf3093f03a Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Thu, 10 Oct 2024 20:14:42 +0200
Subject: [PATCH 37/58] add jsdoc utility method

---
 .../tests/js/common/jsdoc-comment/input.ts    |  5 +++++
 .../tests/js/common/jsdoc-comment/output.ts   |  8 ++++++++
 .../core/tests/js/common/jsdoc-comment/run.ts | 10 ++++++++++
 packages/core/tooling/js/common.ts            | 19 +++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 packages/core/tests/js/common/jsdoc-comment/input.ts
 create mode 100644 packages/core/tests/js/common/jsdoc-comment/output.ts
 create mode 100644 packages/core/tests/js/common/jsdoc-comment/run.ts

diff --git a/packages/core/tests/js/common/jsdoc-comment/input.ts b/packages/core/tests/js/common/jsdoc-comment/input.ts
new file mode 100644
index 00000000..c4a1447a
--- /dev/null
+++ b/packages/core/tests/js/common/jsdoc-comment/input.ts
@@ -0,0 +1,5 @@
+function switchToLanguage(newLanguage) {
+    const canonicalPath = i18n.route($page.url.pathname);
+    const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
+    goto(localisedPath);
+}
diff --git a/packages/core/tests/js/common/jsdoc-comment/output.ts b/packages/core/tests/js/common/jsdoc-comment/output.ts
new file mode 100644
index 00000000..a35a9015
--- /dev/null
+++ b/packages/core/tests/js/common/jsdoc-comment/output.ts
@@ -0,0 +1,8 @@
+/**
+ * @param {import("$lib/paraglide/runtime").AvailableLanguageTag} newLanguage
+ */
+function switchToLanguage(newLanguage) {
+    const canonicalPath = i18n.route($page.url.pathname);
+    const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
+    goto(localisedPath);
+}
\ No newline at end of file
diff --git a/packages/core/tests/js/common/jsdoc-comment/run.ts b/packages/core/tests/js/common/jsdoc-comment/run.ts
new file mode 100644
index 00000000..6e3407f2
--- /dev/null
+++ b/packages/core/tests/js/common/jsdoc-comment/run.ts
@@ -0,0 +1,10 @@
+import { array, common, variables } from '@svelte-cli/core/js';
+import type { AstTypes, ScriptFileEditor } from '@svelte-cli/core';
+
+export function run({ ast }: ScriptFileEditor<any>): void {
+	const functionDeclaration = ast.body[0] as AstTypes.FunctionDeclaration;
+
+	common.addJsDocComment(functionDeclaration, {
+		'import("$lib/paraglide/runtime").AvailableLanguageTag': 'newLanguage'
+	});
+}
diff --git a/packages/core/tooling/js/common.ts b/packages/core/tooling/js/common.ts
index 258a7c18..abe80eaf 100644
--- a/packages/core/tooling/js/common.ts
+++ b/packages/core/tooling/js/common.ts
@@ -16,6 +16,25 @@ export function addJsDocTypeComment(node: AstTypes.Node, type: string): void {
 		leading: true
 	};
 
+	addComment(node, comment);
+}
+
+export function addJsDocComment(node: AstTypes.Node, params: Record<string, string>): void {
+	const commentLines: string[] = [];
+	for (const [key, value] of Object.entries(params)) {
+		commentLines.push(`@param {${key}} ${value}`);
+	}
+
+	const comment: AstTypes.CommentBlock = {
+		type: 'CommentBlock',
+		value: `*\n * ${commentLines.join('\n * ')}\n `,
+		leading: true
+	};
+
+	addComment(node, comment);
+}
+
+function addComment(node: AstTypes.Node, comment: AstTypes.CommentBlock) {
 	node.comments ??= [];
 
 	const found = node.comments.find((n) => n.type === 'CommentBlock' && n.value === comment.value);

From ebef50209d651bd2940a2d14fd93ed3da695b77e Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Thu, 10 Oct 2024 20:15:03 +0200
Subject: [PATCH 38/58] remove useless imports

---
 packages/core/tests/js/common/jsdoc-comment/run.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/tests/js/common/jsdoc-comment/run.ts b/packages/core/tests/js/common/jsdoc-comment/run.ts
index 6e3407f2..bcb371d8 100644
--- a/packages/core/tests/js/common/jsdoc-comment/run.ts
+++ b/packages/core/tests/js/common/jsdoc-comment/run.ts
@@ -1,4 +1,4 @@
-import { array, common, variables } from '@svelte-cli/core/js';
+import { common } from '@svelte-cli/core/js';
 import type { AstTypes, ScriptFileEditor } from '@svelte-cli/core';
 
 export function run({ ast }: ScriptFileEditor<any>): void {

From d6c86a7a647b0a2359b4b683ef171baedc303f29 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Thu, 10 Oct 2024 20:23:11 +0200
Subject: [PATCH 39/58] only add jsdoc comment if not in typescript context

---
 packages/adders/paraglide/config/adder.ts | 29 ++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index e37c9de5..85f4524d 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -4,7 +4,7 @@ import { defineAdderConfig, log } from '@svelte-cli/core';
 import { options, parseLanguageTagInput } from './options.ts';
 import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
 import * as html from '@svelte-cli/core/html';
-import { addHooksHandle } from '../../common.ts';
+import { addHooksHandle, createPrinter } from '../../common.ts';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
@@ -203,22 +203,35 @@ export const adder = defineAdderConfig({
 			name: ({ kit }) => `${kit?.routesDirectory}/+page.svelte`,
 			contentType: 'svelte',
 			condition: ({ options }) => options.demo,
-			content({ jsAst, htmlAst, options }) {
+			content({ jsAst, htmlAst, options, typescript }) {
 				imports.addDefault(jsAst, '$lib/paraglide/messages.js', '* as m');
 				imports.addNamed(jsAst, '$app/navigation', { goto: 'goto' });
 				imports.addNamed(jsAst, '$app/stores', { page: 'page' });
 				imports.addNamed(jsAst, '$lib/i18n', { i18n: 'i18n' });
+				if (typescript) {
+					imports.addNamed(
+						jsAst,
+						'$lib/paraglide/runtime',
+						{ AvailableLanguageTag: 'AvailableLanguageTag' },
+						true
+					);
+				}
+
+				const [ts] = createPrinter(typescript);
 
 				const methodStatement = common.statementFromString(`
-					/**
-					 * @param { import("$lib/paraglide/runtime").AvailableLanguageTag } newLanguage
-					 */
-					function switchToLanguage(newLanguage) {
+					function switchToLanguage(newLanguage${ts(': AvailableLanguageTag')}) {
 						const canonicalPath = i18n.route($page.url.pathname);
 						const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
 						goto(localisedPath);
 					}
 				`);
+				if (!typescript) {
+					common.addJsDocComment(methodStatement, {
+						'import("$lib/paraglide/runtime").AvailableLanguageTag': 'newLanguage'
+					});
+				}
+
 				jsAst.body.push(methodStatement);
 
 				// add localized message
@@ -256,8 +269,8 @@ export const adder = defineAdderConfig({
 			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + '\n');
 		}
 	},
-	nextSteps: () => [
-		`Edit your messages in ${highlighter.path("messages/en.json")}`,
+	nextSteps: ({ highlighter }) => [
+		`Edit your messages in ${highlighter.path('messages/en.json')}`,
 		'Consider installing the Sherlock IDE Extension'
 	]
 });

From 57f396c2c27ceb1eb5d8949e848cfb1d2437f2d3 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Fri, 11 Oct 2024 04:17:38 +0000
Subject: [PATCH 40/58] update to new syntax

---
 packages/adders/paraglide/config/adder.ts | 91 +++++++++++++++--------
 1 file changed, 58 insertions(+), 33 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 85f4524d..0cdcd98b 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -1,10 +1,11 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { defineAdderConfig, log } from '@svelte-cli/core';
+import { defineAdder, log } from '@svelte-cli/core';
 import { options, parseLanguageTagInput } from './options.ts';
 import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
 import * as html from '@svelte-cli/core/html';
 import { addHooksHandle, createPrinter } from '../../common.ts';
+import { parseHtml, parseJson, parseScript, parseSvelte } from '@svelte-cli/core/parsers';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
@@ -22,7 +23,7 @@ const DEFAULT_INLANG_PROJECT = {
 	}
 };
 
-export const adder = defineAdderConfig({
+export const adder = defineAdder({
 	metadata: {
 		id: 'paraglide',
 		name: 'Paraglide',
@@ -57,8 +58,9 @@ export const adder = defineAdderConfig({
 			// create an inlang project if it doesn't exist yet
 			name: () => 'project.inlang/settings.json',
 			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang/settings.json')),
-			contentType: 'json',
-			content: ({ options, data }) => {
+			content: ({ options, content }) => {
+				const { data, generateCode } = parseJson(content);
+
 				for (const key in DEFAULT_INLANG_PROJECT) {
 					data[key] = DEFAULT_INLANG_PROJECT[key as keyof typeof DEFAULT_INLANG_PROJECT];
 				}
@@ -67,13 +69,16 @@ export const adder = defineAdderConfig({
 
 				data.sourceLanguageTag = sourceLanguageTag;
 				data.languageTags = validLanguageTags;
+
+				return generateCode();
 			}
 		},
 		{
 			// add the vite plugin
 			name: ({ typescript }) => `vite.config.${typescript ? 'ts' : 'js'}`,
-			contentType: 'script',
-			content: ({ ast }) => {
+			content: ({ content }) => {
+				const { ast, generateCode } = parseScript(content);
+
 				const vitePluginName = 'paraglide';
 				imports.addNamed(ast, '@inlang/paraglide-sveltekit/vite', {
 					paraglide: vitePluginName
@@ -93,13 +98,16 @@ export const adder = defineAdderConfig({
 				});
 				functions.argumentByIndex(pluginFunctionCall, 0, pluginConfig);
 				array.push(pluginsArray, pluginFunctionCall);
+
+				return generateCode();
 			}
 		},
 		{
 			// src/lib/i18n file
 			name: ({ typescript }) => `src/lib/i18n.${typescript ? 'ts' : 'js'}`,
-			contentType: 'script',
-			content({ ast }) {
+			content({ content }) {
+				const { ast, generateCode } = parseScript(content);
+
 				imports.addNamed(ast, '@inlang/paraglide-sveltekit', { createI18n: 'createI18n' });
 				imports.addDefault(ast, '$lib/paraglide/runtime', '* as runtime');
 
@@ -110,13 +118,16 @@ export const adder = defineAdderConfig({
 				if (existingExport.declaration != i18n) {
 					log.warn('Setting up $lib/i18n failed because it already exports an i18n function');
 				}
+
+				return generateCode();
 			}
 		},
 		{
 			// reroute hook
 			name: ({ typescript }) => `src/hooks.${typescript ? 'ts' : 'js'}`,
-			contentType: 'script',
-			content({ ast }) {
+			content({ content }) {
+				const { ast, generateCode } = parseScript(content);
+
 				imports.addNamed(ast, '$lib/i18n', {
 					i18n: 'i18n'
 				});
@@ -128,36 +139,42 @@ export const adder = defineAdderConfig({
 				if (existingExport.declaration != rerouteIdentifier) {
 					log.warn('Adding the reroute hook automatically failed. Add it manually');
 				}
+
+				return generateCode();
 			}
 		},
 		{
 			// handle hook
 			name: ({ typescript }) => `src/hooks.server.${typescript ? 'ts' : 'js'}`,
-			contentType: 'script',
-			content({ ast, typescript }) {
+			content({ content, typescript }) {
+				const { ast, generateCode } = parseScript(content);
+
 				imports.addNamed(ast, '$lib/i18n', {
 					i18n: 'i18n'
 				});
 
 				const hookHandleContent = 'i18n.handle()';
 				addHooksHandle(ast, typescript, 'paraglide', hookHandleContent);
+
+				return generateCode();
 			}
 		},
 		{
 			// add the <ParaglideJS> component to the layout
 			name: ({ kit }) => `${kit?.routesDirectory}/+layout.svelte`,
-			contentType: 'svelte',
-			content: ({ jsAst, htmlAst }) => {
+			content: ({ content }) => {
+				const { script, template, generateCode } = parseSvelte(content);
+
 				const paraglideComponentName = 'ParaglideJS';
-				imports.addNamed(jsAst, '@inlang/paraglide-sveltekit', {
+				imports.addNamed(script.ast, '@inlang/paraglide-sveltekit', {
 					[paraglideComponentName]: paraglideComponentName
 				});
-				imports.addNamed(jsAst, '$lib/i18n', {
+				imports.addNamed(script.ast, '$lib/i18n', {
 					i18n: 'i18n'
 				});
 
 				// wrap the HTML in a ParaglideJS instance
-				const rootChildren = htmlAst.children;
+				const rootChildren = template.ast.children;
 				if (rootChildren.length === 0) {
 					const slot = html.element('slot');
 					rootChildren.push(slot);
@@ -172,16 +189,19 @@ export const adder = defineAdderConfig({
 						'{i18n}': ''
 					};
 					root.children = rootChildren;
-					htmlAst.children = [root];
+					template.ast.children = [root];
 				}
+
+				return generateCode({ script: script.generateCode(), template: template.generateCode() });
 			}
 		},
 		{
 			// add the text-direction and lang attribute placeholders to app.html
 			name: () => 'src/app.html',
-			contentType: 'html',
-			content(editor) {
-				const htmlNode = editor.ast.children.find(
+			content: ({ content }) => {
+				const { ast, generateCode } = parseHtml(content);
+
+				const htmlNode = ast.children.find(
 					(child): child is html.HtmlElement =>
 						child.type === html.HtmlElementType.Tag && child.name === 'html'
 				);
@@ -189,28 +209,31 @@ export const adder = defineAdderConfig({
 					log.warn(
 						"Could not find <html> node in app.html. You'll need to add the language placeholder manually"
 					);
-					return;
+					return generateCode();
 				}
 				htmlNode.attribs = {
 					...htmlNode.attribs,
 					lang: '%paraglide.lang%',
 					dir: '%paraglide.textDirection%'
 				};
+
+				return generateCode();
 			}
 		},
 		{
 			// add usage example
 			name: ({ kit }) => `${kit?.routesDirectory}/+page.svelte`,
-			contentType: 'svelte',
 			condition: ({ options }) => options.demo,
-			content({ jsAst, htmlAst, options, typescript }) {
-				imports.addDefault(jsAst, '$lib/paraglide/messages.js', '* as m');
-				imports.addNamed(jsAst, '$app/navigation', { goto: 'goto' });
-				imports.addNamed(jsAst, '$app/stores', { page: 'page' });
-				imports.addNamed(jsAst, '$lib/i18n', { i18n: 'i18n' });
+			content({ content, options, typescript }) {
+				const { script, template, generateCode } = parseSvelte(content);
+
+				imports.addDefault(script.ast, '$lib/paraglide/messages.js', '* as m');
+				imports.addNamed(script.ast, '$app/navigation', { goto: 'goto' });
+				imports.addNamed(script.ast, '$app/stores', { page: 'page' });
+				imports.addNamed(script.ast, '$lib/i18n', { i18n: 'i18n' });
 				if (typescript) {
 					imports.addNamed(
-						jsAst,
+						script.ast,
 						'$lib/paraglide/runtime',
 						{ AvailableLanguageTag: 'AvailableLanguageTag' },
 						true
@@ -220,7 +243,7 @@ export const adder = defineAdderConfig({
 				const [ts] = createPrinter(typescript);
 
 				const methodStatement = common.statementFromString(`
-					function switchToLanguage(newLanguage${ts(': AvailableLanguageTag')}) {
+					function switchToLanguage(newLanguage${ts!(': AvailableLanguageTag')}) {
 						const canonicalPath = i18n.route($page.url.pathname);
 						const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
 						goto(localisedPath);
@@ -232,11 +255,11 @@ export const adder = defineAdderConfig({
 					});
 				}
 
-				jsAst.body.push(methodStatement);
+				script.ast.body.push(methodStatement);
 
 				// add localized message
 				html.addFromRawHtml(
-					htmlAst.childNodes,
+					template.ast.childNodes,
 					`<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>`
 				);
 
@@ -248,7 +271,9 @@ export const adder = defineAdderConfig({
 					.join('');
 				const div = html.element('div');
 				html.addFromRawHtml(div.childNodes, links);
-				html.appendElement(htmlAst.childNodes, div);
+				html.appendElement(template.ast.childNodes, div);
+
+				return generateCode({ script: script.generateCode(), template: template.generateCode() });
 			}
 		}
 	],

From a5b35fcdad1ecbb398a9182450ee3c4f2a11c694 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Fri, 11 Oct 2024 04:22:24 +0000
Subject: [PATCH 41/58] update adder

---
 packages/adders/paraglide/config/checks.ts | 6 ------
 packages/adders/paraglide/index.ts         | 9 ++-------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 packages/adders/paraglide/config/checks.ts

diff --git a/packages/adders/paraglide/config/checks.ts b/packages/adders/paraglide/config/checks.ts
deleted file mode 100644
index 923c1632..00000000
--- a/packages/adders/paraglide/config/checks.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { defineAdderChecks } from '@svelte-cli/core';
-import { options } from './options.ts';
-
-export const checks = defineAdderChecks({
-	options
-});
diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index 4549a9e8..70c45e9f 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -1,8 +1,3 @@
-#!/usr/bin/env node
+import { adder } from './config/adder.ts';
 
-import { defineAdder } from '@svelte-cli/core';
-import { adder } from './config/adder.js';
-import { checks } from './config/checks.js';
-import { tests } from './config/tests.js';
-
-export default defineAdder(adder, checks, tests);
+export default adder;

From e5e138dbaac83a795137777f82b225b56c2847dd Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Fri, 11 Oct 2024 14:22:05 +0200
Subject: [PATCH 42/58] disable `noUncheckedIndexedAccess`

---
 packages/adders/paraglide/config/adder.ts | 2 +-
 tsconfig.json                             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
index 0cdcd98b..552751e1 100644
--- a/packages/adders/paraglide/config/adder.ts
+++ b/packages/adders/paraglide/config/adder.ts
@@ -243,7 +243,7 @@ export const adder = defineAdder({
 				const [ts] = createPrinter(typescript);
 
 				const methodStatement = common.statementFromString(`
-					function switchToLanguage(newLanguage${ts!(': AvailableLanguageTag')}) {
+					function switchToLanguage(newLanguage${ts(': AvailableLanguageTag')}) {
 						const canonicalPath = i18n.route($page.url.pathname);
 						const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
 						goto(localisedPath);
diff --git a/tsconfig.json b/tsconfig.json
index 773f62bd..415c0abd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,6 @@
 		"esModuleInterop": true,
 		"verbatimModuleSyntax": true,
 		"isolatedModules": true,
-		"noEmit": true,
-		"noUncheckedIndexedAccess": true
+		"noEmit": true
 	}
 }

From 603ee585c4ce016942b1222a4f572e264d71df97 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Fri, 11 Oct 2024 17:50:41 +0200
Subject: [PATCH 43/58] update to new syntax

---
 packages/adders/paraglide/config/adder.ts     | 301 ---------------
 packages/adders/paraglide/config/options.ts   |  61 ----
 packages/adders/paraglide/index.ts            | 345 +++++++++++++++++-
 .../paraglide/{paraglide.png => logo.png}     | Bin
 .../adders/paraglide/{config => }/tests.ts    |   0
 5 files changed, 343 insertions(+), 364 deletions(-)
 delete mode 100644 packages/adders/paraglide/config/adder.ts
 delete mode 100644 packages/adders/paraglide/config/options.ts
 rename packages/adders/paraglide/{paraglide.png => logo.png} (100%)
 rename packages/adders/paraglide/{config => }/tests.ts (100%)

diff --git a/packages/adders/paraglide/config/adder.ts b/packages/adders/paraglide/config/adder.ts
deleted file mode 100644
index 552751e1..00000000
--- a/packages/adders/paraglide/config/adder.ts
+++ /dev/null
@@ -1,301 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { defineAdder, log } from '@svelte-cli/core';
-import { options, parseLanguageTagInput } from './options.ts';
-import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
-import * as html from '@svelte-cli/core/html';
-import { addHooksHandle, createPrinter } from '../../common.ts';
-import { parseHtml, parseJson, parseScript, parseSvelte } from '@svelte-cli/core/parsers';
-
-const DEFAULT_INLANG_PROJECT = {
-	$schema: 'https://inlang.com/schema/project-settings',
-	modules: [
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2/dist/index.js',
-		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0/dist/index.js'
-	],
-	'plugin.inlang.messageFormat': {
-		pathPattern: './messages/{languageTag}.json'
-	}
-};
-
-export const adder = defineAdder({
-	metadata: {
-		id: 'paraglide',
-		name: 'Paraglide',
-		description: 'Typesafe i18n with localised routing',
-		environments: { svelte: false, kit: true },
-		website: {
-			logo: './paraglide.png',
-			keywords: [
-				'i18n',
-				'internationalization',
-				'l10n',
-				'localization',
-				'routing',
-				'paraglide',
-				'paraglide-js',
-				'paraglide-sveltekit',
-				'inlang'
-			],
-			documentation: 'https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n'
-		}
-	},
-	options,
-	packages: [
-		{
-			name: '@inlang/paraglide-sveltekit',
-			version: '^0.11.1',
-			dev: false
-		}
-	],
-	files: [
-		{
-			// create an inlang project if it doesn't exist yet
-			name: () => 'project.inlang/settings.json',
-			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang/settings.json')),
-			content: ({ options, content }) => {
-				const { data, generateCode } = parseJson(content);
-
-				for (const key in DEFAULT_INLANG_PROJECT) {
-					data[key] = DEFAULT_INLANG_PROJECT[key as keyof typeof DEFAULT_INLANG_PROJECT];
-				}
-				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
-				const sourceLanguageTag = validLanguageTags[0];
-
-				data.sourceLanguageTag = sourceLanguageTag;
-				data.languageTags = validLanguageTags;
-
-				return generateCode();
-			}
-		},
-		{
-			// add the vite plugin
-			name: ({ typescript }) => `vite.config.${typescript ? 'ts' : 'js'}`,
-			content: ({ content }) => {
-				const { ast, generateCode } = parseScript(content);
-
-				const vitePluginName = 'paraglide';
-				imports.addNamed(ast, '@inlang/paraglide-sveltekit/vite', {
-					paraglide: vitePluginName
-				});
-
-				const { value: rootObject } = exports.defaultExport(
-					ast,
-					functions.call('defineConfig', [])
-				);
-				const param1 = functions.argumentByIndex(rootObject, 0, object.createEmpty());
-
-				const pluginsArray = object.property(param1, 'plugins', array.createEmpty());
-				const pluginFunctionCall = functions.call(vitePluginName, []);
-				const pluginConfig = object.create({
-					project: common.createLiteral('./project.inlang'),
-					outdir: common.createLiteral('./src/lib/paraglide')
-				});
-				functions.argumentByIndex(pluginFunctionCall, 0, pluginConfig);
-				array.push(pluginsArray, pluginFunctionCall);
-
-				return generateCode();
-			}
-		},
-		{
-			// src/lib/i18n file
-			name: ({ typescript }) => `src/lib/i18n.${typescript ? 'ts' : 'js'}`,
-			content({ content }) {
-				const { ast, generateCode } = parseScript(content);
-
-				imports.addNamed(ast, '@inlang/paraglide-sveltekit', { createI18n: 'createI18n' });
-				imports.addDefault(ast, '$lib/paraglide/runtime', '* as runtime');
-
-				const createI18nExpression = common.expressionFromString('createI18n(runtime)');
-				const i18n = variables.declaration(ast, 'const', 'i18n', createI18nExpression);
-
-				const existingExport = exports.namedExport(ast, 'i18n', i18n);
-				if (existingExport.declaration != i18n) {
-					log.warn('Setting up $lib/i18n failed because it already exports an i18n function');
-				}
-
-				return generateCode();
-			}
-		},
-		{
-			// reroute hook
-			name: ({ typescript }) => `src/hooks.${typescript ? 'ts' : 'js'}`,
-			content({ content }) {
-				const { ast, generateCode } = parseScript(content);
-
-				imports.addNamed(ast, '$lib/i18n', {
-					i18n: 'i18n'
-				});
-
-				const expression = common.expressionFromString('i18n.reroute()');
-				const rerouteIdentifier = variables.declaration(ast, 'const', 'reroute', expression);
-
-				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
-				if (existingExport.declaration != rerouteIdentifier) {
-					log.warn('Adding the reroute hook automatically failed. Add it manually');
-				}
-
-				return generateCode();
-			}
-		},
-		{
-			// handle hook
-			name: ({ typescript }) => `src/hooks.server.${typescript ? 'ts' : 'js'}`,
-			content({ content, typescript }) {
-				const { ast, generateCode } = parseScript(content);
-
-				imports.addNamed(ast, '$lib/i18n', {
-					i18n: 'i18n'
-				});
-
-				const hookHandleContent = 'i18n.handle()';
-				addHooksHandle(ast, typescript, 'paraglide', hookHandleContent);
-
-				return generateCode();
-			}
-		},
-		{
-			// add the <ParaglideJS> component to the layout
-			name: ({ kit }) => `${kit?.routesDirectory}/+layout.svelte`,
-			content: ({ content }) => {
-				const { script, template, generateCode } = parseSvelte(content);
-
-				const paraglideComponentName = 'ParaglideJS';
-				imports.addNamed(script.ast, '@inlang/paraglide-sveltekit', {
-					[paraglideComponentName]: paraglideComponentName
-				});
-				imports.addNamed(script.ast, '$lib/i18n', {
-					i18n: 'i18n'
-				});
-
-				// wrap the HTML in a ParaglideJS instance
-				const rootChildren = template.ast.children;
-				if (rootChildren.length === 0) {
-					const slot = html.element('slot');
-					rootChildren.push(slot);
-				}
-
-				const hasParaglideJsNode = rootChildren.find(
-					(x) => x.type == 'tag' && x.name == paraglideComponentName
-				);
-				if (!hasParaglideJsNode) {
-					const root = html.element(paraglideComponentName, {});
-					root.attribs = {
-						'{i18n}': ''
-					};
-					root.children = rootChildren;
-					template.ast.children = [root];
-				}
-
-				return generateCode({ script: script.generateCode(), template: template.generateCode() });
-			}
-		},
-		{
-			// add the text-direction and lang attribute placeholders to app.html
-			name: () => 'src/app.html',
-			content: ({ content }) => {
-				const { ast, generateCode } = parseHtml(content);
-
-				const htmlNode = ast.children.find(
-					(child): child is html.HtmlElement =>
-						child.type === html.HtmlElementType.Tag && child.name === 'html'
-				);
-				if (!htmlNode) {
-					log.warn(
-						"Could not find <html> node in app.html. You'll need to add the language placeholder manually"
-					);
-					return generateCode();
-				}
-				htmlNode.attribs = {
-					...htmlNode.attribs,
-					lang: '%paraglide.lang%',
-					dir: '%paraglide.textDirection%'
-				};
-
-				return generateCode();
-			}
-		},
-		{
-			// add usage example
-			name: ({ kit }) => `${kit?.routesDirectory}/+page.svelte`,
-			condition: ({ options }) => options.demo,
-			content({ content, options, typescript }) {
-				const { script, template, generateCode } = parseSvelte(content);
-
-				imports.addDefault(script.ast, '$lib/paraglide/messages.js', '* as m');
-				imports.addNamed(script.ast, '$app/navigation', { goto: 'goto' });
-				imports.addNamed(script.ast, '$app/stores', { page: 'page' });
-				imports.addNamed(script.ast, '$lib/i18n', { i18n: 'i18n' });
-				if (typescript) {
-					imports.addNamed(
-						script.ast,
-						'$lib/paraglide/runtime',
-						{ AvailableLanguageTag: 'AvailableLanguageTag' },
-						true
-					);
-				}
-
-				const [ts] = createPrinter(typescript);
-
-				const methodStatement = common.statementFromString(`
-					function switchToLanguage(newLanguage${ts(': AvailableLanguageTag')}) {
-						const canonicalPath = i18n.route($page.url.pathname);
-						const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
-						goto(localisedPath);
-					}
-				`);
-				if (!typescript) {
-					common.addJsDocComment(methodStatement, {
-						'import("$lib/paraglide/runtime").AvailableLanguageTag': 'newLanguage'
-					});
-				}
-
-				script.ast.body.push(methodStatement);
-
-				// add localized message
-				html.addFromRawHtml(
-					template.ast.childNodes,
-					`<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>`
-				);
-
-				// add links to other localized pages, the first one is the default
-				// language, thus it does not require any localized route
-				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
-				const links = validLanguageTags
-					.map((x) => `<button onclick="{() => switchToLanguage('${x}')}">${x}</button>`)
-					.join('');
-				const div = html.element('div');
-				html.addFromRawHtml(div.childNodes, links);
-				html.appendElement(template.ast.childNodes, div);
-
-				return generateCode({ script: script.generateCode(), template: template.generateCode() });
-			}
-		}
-	],
-	postInstall: ({ cwd, options }) => {
-		const jsonData: Record<string, string> = {};
-		jsonData['$schema'] = 'https://inlang.com/schema/inlang-message-format';
-
-		const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
-		for (const languageTag of validLanguageTags) {
-			jsonData.hello_world = `Hello, {name} from ${languageTag}!`;
-
-			const filePath = `messages/${languageTag}.json`;
-			const directoryPath = path.dirname(filePath);
-			const fullDirectoryPath = path.join(cwd, directoryPath);
-			const fullFilePath = path.join(cwd, filePath);
-
-			fs.mkdirSync(fullDirectoryPath, { recursive: true });
-			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + '\n');
-		}
-	},
-	nextSteps: ({ highlighter }) => [
-		`Edit your messages in ${highlighter.path('messages/en.json')}`,
-		'Consider installing the Sherlock IDE Extension'
-	]
-});
diff --git a/packages/adders/paraglide/config/options.ts b/packages/adders/paraglide/config/options.ts
deleted file mode 100644
index f42983a2..00000000
--- a/packages/adders/paraglide/config/options.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { defineAdderOptions } from '@svelte-cli/core';
-
-export const options = defineAdderOptions({
-	availableLanguageTags: {
-		question: 'Which language tags would you like to support?',
-		type: 'string',
-		default: '',
-		placeholder: 'en,de-ch',
-		validate(input) {
-			const { invalidLanguageTags, validLanguageTags } = parseLanguageTagInput(input);
-
-			if (invalidLanguageTags.length > 0) {
-				if (invalidLanguageTags.length === 1) {
-					return `The input "${invalidLanguageTags[0]}" is not a valid BCP47 language tag`;
-				} else {
-					const listFormat = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' });
-					return `The inputs ${listFormat.format(invalidLanguageTags.map((x) => `"${x}"`))} are not valid BCP47 language tags`;
-				}
-			}
-			if (validLanguageTags.length === 0)
-				return 'Please enter at least one valid BCP47 language tag. Eg: en';
-
-			return undefined;
-		}
-	},
-	demo: {
-		type: 'boolean',
-		default: false,
-		question: 'Do you want to include a demo?'
-	}
-});
-
-export const isValidLanguageTag = (languageTag: string): boolean =>
-	// Regex vendored in from https://github.com/opral/monorepo/blob/94c2298cc1da5378b908e4c160b0fa71a45caadb/inlang/source-code/versioned-interfaces/language-tag/src/interface.ts#L16
-	RegExp(
-		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$'
-	).test(languageTag);
-
-export function parseLanguageTagInput(input: string): {
-	validLanguageTags: string[];
-	invalidLanguageTags: string[];
-} {
-	const probablyLanguageTags = input
-		.replace(/[,:\s]/g, ' ') // replace common separators with spaces
-		.split(' ')
-		.filter(Boolean) // remove empty segments
-		.map((tag) => tag.toLowerCase());
-
-	const validLanguageTags: string[] = [];
-	const invalidLanguageTags: string[] = [];
-
-	for (const tag of probablyLanguageTags) {
-		if (isValidLanguageTag(tag)) validLanguageTags.push(tag);
-		else invalidLanguageTags.push(tag);
-	}
-
-	return {
-		validLanguageTags,
-		invalidLanguageTags
-	};
-}
diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index 70c45e9f..8f34cc1d 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -1,3 +1,344 @@
-import { adder } from './config/adder.ts';
+import fs from 'node:fs';
+import path from 'node:path';
+import { defineAdder, defineAdderOptions, log } from '@svelte-cli/core';
+import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
+import * as html from '@svelte-cli/core/html';
+import { addHooksHandle, createPrinter } from '../common.ts';
+import { parseHtml, parseJson, parseScript, parseSvelte } from '@svelte-cli/core/parsers';
 
-export default adder;
+const DEFAULT_INLANG_PROJECT = {
+	$schema: 'https://inlang.com/schema/project-settings',
+	modules: [
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-valid-js-identifier@1/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@2/dist/index.js',
+		'https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@0/dist/index.js'
+	],
+	'plugin.inlang.messageFormat': {
+		pathPattern: './messages/{languageTag}.json'
+	}
+};
+
+export const options = defineAdderOptions({
+	availableLanguageTags: {
+		question: 'Which language tags would you like to support?',
+		type: 'string',
+		default: '',
+		placeholder: 'en,de-ch',
+		validate(input: any) {
+			const { invalidLanguageTags, validLanguageTags } = parseLanguageTagInput(input);
+
+			if (invalidLanguageTags.length > 0) {
+				if (invalidLanguageTags.length === 1) {
+					return `The input "${invalidLanguageTags[0]}" is not a valid BCP47 language tag`;
+				} else {
+					const listFormat = new Intl.ListFormat('en', { style: 'long', type: 'conjunction' });
+					return `The inputs ${listFormat.format(invalidLanguageTags.map((x) => `"${x}"`))} are not valid BCP47 language tags`;
+				}
+			}
+			if (validLanguageTags.length === 0)
+				return 'Please enter at least one valid BCP47 language tag. Eg: en';
+
+			return undefined;
+		}
+	},
+	demo: {
+		type: 'boolean',
+		default: false,
+		question: 'Do you want to include a demo?'
+	}
+});
+
+export default defineAdder({
+	id: 'paraglide',
+	name: 'Paraglide',
+	description: 'Typesafe i18n with localised routing',
+	environments: { svelte: false, kit: true },
+	documentation: 'https://inlang.com/m/dxnzrydw/paraglide-sveltekit-i18n',
+	options,
+	packages: [
+		{
+			name: '@inlang/paraglide-sveltekit',
+			version: '^0.11.1',
+			dev: false
+		}
+	],
+	files: [
+		{
+			// create an inlang project if it doesn't exist yet
+			name: () => 'project.inlang/settings.json',
+			condition: ({ cwd }) => !fs.existsSync(path.join(cwd, 'project.inlang/settings.json')),
+			content: ({ options, content }) => {
+				const { data, generateCode } = parseJson(content);
+
+				for (const key in DEFAULT_INLANG_PROJECT) {
+					data[key] = DEFAULT_INLANG_PROJECT[key as keyof typeof DEFAULT_INLANG_PROJECT];
+				}
+				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
+				const sourceLanguageTag = validLanguageTags[0];
+
+				data.sourceLanguageTag = sourceLanguageTag;
+				data.languageTags = validLanguageTags;
+
+				return generateCode();
+			}
+		},
+		{
+			// add the vite plugin
+			name: ({ typescript }) => `vite.config.${typescript ? 'ts' : 'js'}`,
+			content: ({ content }) => {
+				const { ast, generateCode } = parseScript(content);
+
+				const vitePluginName = 'paraglide';
+				imports.addNamed(ast, '@inlang/paraglide-sveltekit/vite', {
+					paraglide: vitePluginName
+				});
+
+				const { value: rootObject } = exports.defaultExport(
+					ast,
+					functions.call('defineConfig', [])
+				);
+				const param1 = functions.argumentByIndex(rootObject, 0, object.createEmpty());
+
+				const pluginsArray = object.property(param1, 'plugins', array.createEmpty());
+				const pluginFunctionCall = functions.call(vitePluginName, []);
+				const pluginConfig = object.create({
+					project: common.createLiteral('./project.inlang'),
+					outdir: common.createLiteral('./src/lib/paraglide')
+				});
+				functions.argumentByIndex(pluginFunctionCall, 0, pluginConfig);
+				array.push(pluginsArray, pluginFunctionCall);
+
+				return generateCode();
+			}
+		},
+		{
+			// src/lib/i18n file
+			name: ({ typescript }) => `src/lib/i18n.${typescript ? 'ts' : 'js'}`,
+			content({ content }) {
+				const { ast, generateCode } = parseScript(content);
+
+				imports.addNamed(ast, '@inlang/paraglide-sveltekit', { createI18n: 'createI18n' });
+				imports.addDefault(ast, '$lib/paraglide/runtime', '* as runtime');
+
+				const createI18nExpression = common.expressionFromString('createI18n(runtime)');
+				const i18n = variables.declaration(ast, 'const', 'i18n', createI18nExpression);
+
+				const existingExport = exports.namedExport(ast, 'i18n', i18n);
+				if (existingExport.declaration != i18n) {
+					log.warn('Setting up $lib/i18n failed because it already exports an i18n function');
+				}
+
+				return generateCode();
+			}
+		},
+		{
+			// reroute hook
+			name: ({ typescript }) => `src/hooks.${typescript ? 'ts' : 'js'}`,
+			content({ content }) {
+				const { ast, generateCode } = parseScript(content);
+
+				imports.addNamed(ast, '$lib/i18n', {
+					i18n: 'i18n'
+				});
+
+				const expression = common.expressionFromString('i18n.reroute()');
+				const rerouteIdentifier = variables.declaration(ast, 'const', 'reroute', expression);
+
+				const existingExport = exports.namedExport(ast, 'reroute', rerouteIdentifier);
+				if (existingExport.declaration != rerouteIdentifier) {
+					log.warn('Adding the reroute hook automatically failed. Add it manually');
+				}
+
+				return generateCode();
+			}
+		},
+		{
+			// handle hook
+			name: ({ typescript }) => `src/hooks.server.${typescript ? 'ts' : 'js'}`,
+			content({ content, typescript }) {
+				const { ast, generateCode } = parseScript(content);
+
+				imports.addNamed(ast, '$lib/i18n', {
+					i18n: 'i18n'
+				});
+
+				const hookHandleContent = 'i18n.handle()';
+				addHooksHandle(ast, typescript, 'paraglide', hookHandleContent);
+
+				return generateCode();
+			}
+		},
+		{
+			// add the <ParaglideJS> component to the layout
+			name: ({ kit }) => `${kit?.routesDirectory}/+layout.svelte`,
+			content: ({ content }) => {
+				const { script, template, generateCode } = parseSvelte(content);
+
+				const paraglideComponentName = 'ParaglideJS';
+				imports.addNamed(script.ast, '@inlang/paraglide-sveltekit', {
+					[paraglideComponentName]: paraglideComponentName
+				});
+				imports.addNamed(script.ast, '$lib/i18n', {
+					i18n: 'i18n'
+				});
+
+				// wrap the HTML in a ParaglideJS instance
+				const rootChildren = template.ast.children;
+				if (rootChildren.length === 0) {
+					const slot = html.element('slot');
+					rootChildren.push(slot);
+				}
+
+				const hasParaglideJsNode = rootChildren.find(
+					(x) => x.type == 'tag' && x.name == paraglideComponentName
+				);
+				if (!hasParaglideJsNode) {
+					const root = html.element(paraglideComponentName, {});
+					root.attribs = {
+						'{i18n}': ''
+					};
+					root.children = rootChildren;
+					template.ast.children = [root];
+				}
+
+				return generateCode({ script: script.generateCode(), template: template.generateCode() });
+			}
+		},
+		{
+			// add the text-direction and lang attribute placeholders to app.html
+			name: () => 'src/app.html',
+			content: ({ content }) => {
+				const { ast, generateCode } = parseHtml(content);
+
+				const htmlNode = ast.children.find(
+					(child): child is html.HtmlElement =>
+						child.type === html.HtmlElementType.Tag && child.name === 'html'
+				);
+				if (!htmlNode) {
+					log.warn(
+						"Could not find <html> node in app.html. You'll need to add the language placeholder manually"
+					);
+					return generateCode();
+				}
+				htmlNode.attribs = {
+					...htmlNode.attribs,
+					lang: '%paraglide.lang%',
+					dir: '%paraglide.textDirection%'
+				};
+
+				return generateCode();
+			}
+		},
+		{
+			// add usage example
+			name: ({ kit }) => `${kit?.routesDirectory}/+page.svelte`,
+			condition: ({ options }) => options.demo,
+			content({ content, options, typescript }) {
+				const { script, template, generateCode } = parseSvelte(content);
+
+				imports.addDefault(script.ast, '$lib/paraglide/messages.js', '* as m');
+				imports.addNamed(script.ast, '$app/navigation', { goto: 'goto' });
+				imports.addNamed(script.ast, '$app/stores', { page: 'page' });
+				imports.addNamed(script.ast, '$lib/i18n', { i18n: 'i18n' });
+				if (typescript) {
+					imports.addNamed(
+						script.ast,
+						'$lib/paraglide/runtime',
+						{ AvailableLanguageTag: 'AvailableLanguageTag' },
+						true
+					);
+				}
+
+				const [ts] = createPrinter(typescript);
+
+				const methodStatement = common.statementFromString(`
+					function switchToLanguage(newLanguage${ts(': AvailableLanguageTag')}) {
+						const canonicalPath = i18n.route($page.url.pathname);
+						const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
+						goto(localisedPath);
+					}
+				`);
+				if (!typescript) {
+					common.addJsDocComment(methodStatement, {
+						'import("$lib/paraglide/runtime").AvailableLanguageTag': 'newLanguage'
+					});
+				}
+
+				script.ast.body.push(methodStatement);
+
+				// add localized message
+				html.addFromRawHtml(
+					template.ast.childNodes,
+					`<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>`
+				);
+
+				// add links to other localized pages, the first one is the default
+				// language, thus it does not require any localized route
+				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
+				const links = validLanguageTags
+					.map((x) => `<button onclick="{() => switchToLanguage('${x}')}">${x}</button>`)
+					.join('');
+				const div = html.element('div');
+				html.addFromRawHtml(div.childNodes, links);
+				html.appendElement(template.ast.childNodes, div);
+
+				return generateCode({ script: script.generateCode(), template: template.generateCode() });
+			}
+		}
+	],
+	postInstall: ({ cwd, options }) => {
+		const jsonData: Record<string, string> = {};
+		jsonData['$schema'] = 'https://inlang.com/schema/inlang-message-format';
+
+		const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
+		for (const languageTag of validLanguageTags) {
+			jsonData.hello_world = `Hello, {name} from ${languageTag}!`;
+
+			const filePath = `messages/${languageTag}.json`;
+			const directoryPath = path.dirname(filePath);
+			const fullDirectoryPath = path.join(cwd, directoryPath);
+			const fullFilePath = path.join(cwd, filePath);
+
+			fs.mkdirSync(fullDirectoryPath, { recursive: true });
+			fs.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + '\n');
+		}
+	},
+	nextSteps: ({ highlighter }) => [
+		`Edit your messages in ${highlighter.path('messages/en.json')}`,
+		'Consider installing the Sherlock IDE Extension'
+	]
+});
+
+const isValidLanguageTag = (languageTag: string): boolean =>
+	// Regex vendored in from https://github.com/opral/monorepo/blob/94c2298cc1da5378b908e4c160b0fa71a45caadb/inlang/source-code/versioned-interfaces/language-tag/src/interface.ts#L16
+	RegExp(
+		'^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?))(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*))$'
+	).test(languageTag);
+
+function parseLanguageTagInput(input: string): {
+	validLanguageTags: string[];
+	invalidLanguageTags: string[];
+} {
+	const probablyLanguageTags = input
+		.replace(/[,:\s]/g, ' ') // replace common separators with spaces
+		.split(' ')
+		.filter(Boolean) // remove empty segments
+		.map((tag) => tag.toLowerCase());
+
+	const validLanguageTags: string[] = [];
+	const invalidLanguageTags: string[] = [];
+
+	for (const tag of probablyLanguageTags) {
+		if (isValidLanguageTag(tag)) validLanguageTags.push(tag);
+		else invalidLanguageTags.push(tag);
+	}
+
+	return {
+		validLanguageTags,
+		invalidLanguageTags
+	};
+}
diff --git a/packages/adders/paraglide/paraglide.png b/packages/adders/paraglide/logo.png
similarity index 100%
rename from packages/adders/paraglide/paraglide.png
rename to packages/adders/paraglide/logo.png
diff --git a/packages/adders/paraglide/config/tests.ts b/packages/adders/paraglide/tests.ts
similarity index 100%
rename from packages/adders/paraglide/config/tests.ts
rename to packages/adders/paraglide/tests.ts

From d2d13fb009c41c5cbb8f3757da09056d79c03ee7 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Fri, 11 Oct 2024 18:07:40 +0200
Subject: [PATCH 44/58] fix

---
 packages/adders/paraglide/tests.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/adders/paraglide/tests.ts b/packages/adders/paraglide/tests.ts
index f1927a05..84d28cc7 100644
--- a/packages/adders/paraglide/tests.ts
+++ b/packages/adders/paraglide/tests.ts
@@ -1,6 +1,5 @@
 import { defineAdderTests } from '@svelte-cli/core';
-import { options } from './options.ts';
-
+import { options } from './index.ts';
 // e2e tests make no sense in this context
 
 export const tests = defineAdderTests({

From 0e39a5c80592748ea9b3cbc856eed86ab14b821e Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Fri, 11 Oct 2024 18:24:48 +0200
Subject: [PATCH 45/58] use new slot feature

---
 packages/adders/paraglide/index.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index 8f34cc1d..f6b17b79 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -3,7 +3,7 @@ import path from 'node:path';
 import { defineAdder, defineAdderOptions, log } from '@svelte-cli/core';
 import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
 import * as html from '@svelte-cli/core/html';
-import { addHooksHandle, createPrinter } from '../common.ts';
+import { addHooksHandle, addSlot, createPrinter } from '../common.ts';
 import { parseHtml, parseJson, parseScript, parseSvelte } from '@svelte-cli/core/parsers';
 
 const DEFAULT_INLANG_PROJECT = {
@@ -175,7 +175,7 @@ export default defineAdder({
 		{
 			// add the <ParaglideJS> component to the layout
 			name: ({ kit }) => `${kit?.routesDirectory}/+layout.svelte`,
-			content: ({ content }) => {
+			content: ({ content, dependencyVersion }) => {
 				const { script, template, generateCode } = parseSvelte(content);
 
 				const paraglideComponentName = 'ParaglideJS';
@@ -189,8 +189,10 @@ export default defineAdder({
 				// wrap the HTML in a ParaglideJS instance
 				const rootChildren = template.ast.children;
 				if (rootChildren.length === 0) {
-					const slot = html.element('slot');
-					rootChildren.push(slot);
+					const svelteVersion = dependencyVersion('svelte');
+					if (!svelteVersion) throw new Error('Failed to determine svelte version');
+
+					addSlot(script.ast, template.ast, svelteVersion);
 				}
 
 				const hasParaglideJsNode = rootChildren.find(

From 252c9ee0dd01a705eb9a5b9f5605c67ae0f5cdf2 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 11 Oct 2024 11:18:40 -0700
Subject: [PATCH 46/58] newline

---
 packages/core/tests/js/common/jsdoc-comment/output.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/tests/js/common/jsdoc-comment/output.ts b/packages/core/tests/js/common/jsdoc-comment/output.ts
index a35a9015..d97338ba 100644
--- a/packages/core/tests/js/common/jsdoc-comment/output.ts
+++ b/packages/core/tests/js/common/jsdoc-comment/output.ts
@@ -5,4 +5,4 @@ function switchToLanguage(newLanguage) {
     const canonicalPath = i18n.route($page.url.pathname);
     const localisedPath = i18n.resolveRoute(canonicalPath, newLanguage);
     goto(localisedPath);
-}
\ No newline at end of file
+}

From da11218bb8d3ccf326eff43a89bb368b02c84309 Mon Sep 17 00:00:00 2001
From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:50:09 -0400
Subject: [PATCH 47/58] update imports

---
 packages/adders/paraglide/index.ts               | 16 ++++++++++++----
 packages/adders/paraglide/tests.ts               |  2 +-
 .../core/tests/js/common/jsdoc-comment/run.ts    |  5 ++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index f6b17b79..c1e3d236 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -1,10 +1,18 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { defineAdder, defineAdderOptions, log } from '@svelte-cli/core';
-import { array, common, functions, imports, object, variables, exports } from '@svelte-cli/core/js';
-import * as html from '@svelte-cli/core/html';
+import { defineAdder, defineAdderOptions, log } from '@sveltejs/cli-core';
+import {
+	array,
+	common,
+	functions,
+	imports,
+	object,
+	variables,
+	exports
+} from '@sveltejs/cli-core/js';
+import * as html from '@sveltejs/cli-core/html';
 import { addHooksHandle, addSlot, createPrinter } from '../common.ts';
-import { parseHtml, parseJson, parseScript, parseSvelte } from '@svelte-cli/core/parsers';
+import { parseHtml, parseJson, parseScript, parseSvelte } from '@sveltejs/cli-core/parsers';
 
 const DEFAULT_INLANG_PROJECT = {
 	$schema: 'https://inlang.com/schema/project-settings',
diff --git a/packages/adders/paraglide/tests.ts b/packages/adders/paraglide/tests.ts
index 84d28cc7..8941a20b 100644
--- a/packages/adders/paraglide/tests.ts
+++ b/packages/adders/paraglide/tests.ts
@@ -1,4 +1,4 @@
-import { defineAdderTests } from '@svelte-cli/core';
+import { defineAdderTests } from '@sveltejs/cli-core';
 import { options } from './index.ts';
 // e2e tests make no sense in this context
 
diff --git a/packages/core/tests/js/common/jsdoc-comment/run.ts b/packages/core/tests/js/common/jsdoc-comment/run.ts
index bcb371d8..0dc71cf2 100644
--- a/packages/core/tests/js/common/jsdoc-comment/run.ts
+++ b/packages/core/tests/js/common/jsdoc-comment/run.ts
@@ -1,7 +1,6 @@
-import { common } from '@svelte-cli/core/js';
-import type { AstTypes, ScriptFileEditor } from '@svelte-cli/core';
+import { common, type AstTypes } from '@sveltejs/cli-core/js';
 
-export function run({ ast }: ScriptFileEditor<any>): void {
+export function run({ ast }: { ast: AstTypes.Program }): void {
 	const functionDeclaration = ast.body[0] as AstTypes.FunctionDeclaration;
 
 	common.addJsDocComment(functionDeclaration, {

From 6ed51b8866d680c1f6763439316571badbb2531d Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:32:18 -0700
Subject: [PATCH 48/58] upgrade magic-string. doesn't help, but might as well
 be on latest

---
 packages/core/package.json |  2 +-
 pnpm-lock.yaml             | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 923df0ad..6b303e99 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -40,7 +40,7 @@
 		"@sveltejs/clack-prompts": "workspace:*",
 		"decircular": "^1.0.0",
 		"dedent": "^1.5.3",
-		"magic-string": "^0.30.11",
+		"magic-string": "^0.30.12",
 		"picocolors": "^1.1.0"
 	},
 	"dependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 26924ec7..916e0506 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -43,7 +43,7 @@ importers:
         version: 9.10.0
       magic-string:
         specifier: ^0.30.11
-        version: 0.30.11
+        version: 0.30.12
       prettier:
         specifier: ^3.1.1
         version: 3.3.3
@@ -209,8 +209,8 @@ importers:
         specifier: ^1.5.3
         version: 1.5.3
       magic-string:
-        specifier: ^0.30.11
-        version: 0.30.11
+        specifier: ^0.30.12
+        version: 0.30.12
       picocolors:
         specifier: ^1.1.0
         version: 1.1.0
@@ -985,7 +985,7 @@ packages:
     resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
 
   concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+    resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
 
   cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
@@ -1485,8 +1485,8 @@ packages:
   magic-string@0.25.9:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
 
-  magic-string@0.30.11:
-    resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
+  magic-string@0.30.12:
+    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
 
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -2540,7 +2540,7 @@ snapshots:
       estree-walker: 2.0.2
       glob: 10.4.5
       is-reference: 1.2.1
-      magic-string: 0.30.11
+      magic-string: 0.30.12
     optionalDependencies:
       rollup: 4.21.2
 
@@ -2550,7 +2550,7 @@ snapshots:
       astring: 1.8.6
       estree-walker: 2.0.2
       fast-glob: 3.3.2
-      magic-string: 0.30.11
+      magic-string: 0.30.12
     optionalDependencies:
       rollup: 4.21.2
 
@@ -2772,7 +2772,7 @@ snapshots:
   '@vitest/snapshot@2.0.5':
     dependencies:
       '@vitest/pretty-format': 2.0.5
-      magic-string: 0.30.11
+      magic-string: 0.30.12
       pathe: 1.1.2
 
   '@vitest/spy@2.0.5':
@@ -3463,7 +3463,7 @@ snapshots:
     dependencies:
       sourcemap-codec: 1.4.8
 
-  magic-string@0.30.11:
+  magic-string@0.30.12:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
@@ -3852,7 +3852,7 @@ snapshots:
       esrap: 1.2.2
       is-reference: 3.0.2
       locate-character: 3.0.0
-      magic-string: 0.30.11
+      magic-string: 0.30.12
       zimmerframe: 1.1.2
 
   tapable@2.2.1: {}
@@ -3950,7 +3950,7 @@ snapshots:
   unplugin-isolated-decl@0.6.5(rollup@4.21.2)(typescript@5.6.2)(webpack-sources@3.2.3):
     dependencies:
       '@rollup/pluginutils': 5.1.2(rollup@4.21.2)
-      magic-string: 0.30.11
+      magic-string: 0.30.12
       oxc-parser: 0.30.3
       unplugin: 1.14.1(webpack-sources@3.2.3)
     optionalDependencies:
@@ -4015,7 +4015,7 @@ snapshots:
       chai: 5.1.1
       debug: 4.3.7
       execa: 8.0.1
-      magic-string: 0.30.11
+      magic-string: 0.30.12
       pathe: 1.1.2
       std-env: 3.7.0
       tinybench: 2.9.0

From 2b7c924cd7b9a3d562f13ee089a269ceba869419 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:48:31 -0700
Subject: [PATCH 49/58] should generally use update instead of overwrite.
 though it doesn't help

---
 packages/core/tooling/parsers.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/tooling/parsers.ts b/packages/core/tooling/parsers.ts
index a9afc5e3..bc077438 100644
--- a/packages/core/tooling/parsers.ts
+++ b/packages/core/tooling/parsers.ts
@@ -86,7 +86,7 @@ export function parseSvelte(
 			} else {
 				const { start, end } = locations(source, scriptSource);
 				const formatted = indent(code.script, ms.getIndentString());
-				ms.overwrite(start, end, formatted);
+				ms.update(start, end, formatted);
 			}
 		}
 		if (code.module !== undefined) {
@@ -99,7 +99,7 @@ export function parseSvelte(
 			} else {
 				const { start, end } = locations(source, moduleSource);
 				const formatted = indent(code.module, ms.getIndentString());
-				ms.overwrite(start, end, formatted);
+				ms.update(start, end, formatted);
 			}
 		}
 		if (code.css !== undefined) {
@@ -110,7 +110,7 @@ export function parseSvelte(
 			} else {
 				const { start, end } = locations(source, cssSource);
 				const formatted = indent(code.css, ms.getIndentString());
-				ms.overwrite(start, end, formatted);
+				ms.update(start, end, formatted);
 			}
 		}
 		if (code.template !== undefined) {
@@ -118,7 +118,7 @@ export function parseSvelte(
 				ms.appendLeft(0, code.template);
 			} else {
 				const { start, end } = locations(source, templateSource);
-				ms.overwrite(start, end, code.template);
+				ms.update(start, end, code.template);
 			}
 		}
 		return ms.toString();

From 175961254abed6b0d96ca11502099dd11361cede Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:22:09 -0700
Subject: [PATCH 50/58] fix

---
 packages/core/tooling/parsers.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/tooling/parsers.ts b/packages/core/tooling/parsers.ts
index bc077438..2bfe4b85 100644
--- a/packages/core/tooling/parsers.ts
+++ b/packages/core/tooling/parsers.ts
@@ -67,7 +67,8 @@ export function parseSvelte(
 	const templateSource = source
 		.replace(moduleScriptTag, '')
 		.replace(scriptTag, '')
-		.replace(styleTag, '');
+		.replace(styleTag, '')
+		.trim();
 
 	const script = parseScript(scriptSource);
 	const module = parseScript(moduleSource);

From bf37e8d96814d103822ea7566ca73243b17085b5 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sat, 12 Oct 2024 17:05:17 +0200
Subject: [PATCH 51/58] changeset

---
 .changeset/four-grapes-cheat.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/four-grapes-cheat.md

diff --git a/.changeset/four-grapes-cheat.md b/.changeset/four-grapes-cheat.md
new file mode 100644
index 00000000..9c9c2863
--- /dev/null
+++ b/.changeset/four-grapes-cheat.md
@@ -0,0 +1,5 @@
+---
+'sv': patch
+---
+
+feat: paraglide adder

From 0adb8d14f63cce48a408abcec3e0415c2336ae63 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sat, 12 Oct 2024 17:14:13 +0200
Subject: [PATCH 52/58] improve formatting

---
 packages/adders/paraglide/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index c1e3d236..a8923414 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -283,17 +283,17 @@ export default defineAdder({
 				// add localized message
 				html.addFromRawHtml(
 					template.ast.childNodes,
-					`<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>`
+					`\n\n<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>\n`
 				);
 
 				// add links to other localized pages, the first one is the default
 				// language, thus it does not require any localized route
 				const { validLanguageTags } = parseLanguageTagInput(options.availableLanguageTags);
 				const links = validLanguageTags
-					.map((x) => `<button onclick="{() => switchToLanguage('${x}')}">${x}</button>`)
+					.map((x) => `\n\t<button onclick="{() => switchToLanguage('${x}')}">${x}</button>`)
 					.join('');
 				const div = html.element('div');
-				html.addFromRawHtml(div.childNodes, links);
+				html.addFromRawHtml(div.childNodes, `${links}\n`);
 				html.appendElement(template.ast.childNodes, div);
 
 				return generateCode({ script: script.generateCode(), template: template.generateCode() });

From fb37e153819e81e7ae14c6450b599333c49cb69c Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sat, 12 Oct 2024 17:48:36 +0200
Subject: [PATCH 53/58] improve output

---
 packages/adders/paraglide/index.ts  | 2 +-
 packages/ast-tooling/index.ts       | 1 +
 packages/core/tooling/html/index.ts | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index a8923414..d0a1a07e 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -211,7 +211,7 @@ export default defineAdder({
 					root.attribs = {
 						'{i18n}': ''
 					};
-					root.children = rootChildren;
+					root.children = [html.text('\n\t'), ...rootChildren, html.text('\n')];
 					template.ast.children = [root];
 				}
 
diff --git a/packages/ast-tooling/index.ts b/packages/ast-tooling/index.ts
index 110ca956..74a27cab 100644
--- a/packages/ast-tooling/index.ts
+++ b/packages/ast-tooling/index.ts
@@ -30,6 +30,7 @@ export {
 	// html
 	Document as HtmlDocument,
 	Element as HtmlElement,
+	Text as HtmlText,
 	ElementType as HtmlElementType,
 
 	// css
diff --git a/packages/core/tooling/html/index.ts b/packages/core/tooling/html/index.ts
index d9497123..f35a846e 100644
--- a/packages/core/tooling/html/index.ts
+++ b/packages/core/tooling/html/index.ts
@@ -3,6 +3,7 @@ import {
 	type HtmlDocument,
 	HtmlElement,
 	HtmlElementType,
+	HtmlText,
 	parseHtml
 } from '@sveltejs/ast-tooling';
 
@@ -33,3 +34,10 @@ export function addFromRawHtml(childNodes: HtmlChildNode[], html: string): void
 		childNodes.push(childNode);
 	}
 }
+
+export function text(content: string): HtmlText {
+	return {
+		type: HtmlElementType.Text,
+		data: content
+	} as HtmlText;
+}

From 62e8d152ca68c03cc202684a8da9240807105f66 Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sat, 12 Oct 2024 18:54:35 +0200
Subject: [PATCH 54/58] fix command line parsing

---
 packages/cli/commands/add/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts
index 0ff4387e..3c0f27a4 100644
--- a/packages/cli/commands/add/index.ts
+++ b/packages/cli/commands/add/index.ts
@@ -27,7 +27,8 @@ const AddersSchema = v.array(v.string());
 const AdderOptionFlagsSchema = v.object({
 	tailwindcss: v.optional(v.array(v.string())),
 	drizzle: v.optional(v.array(v.string())),
-	supabase: v.optional(v.array(v.string()))
+	supabase: v.optional(v.array(v.string())),
+	paraglide: v.optional(v.array(v.string()))
 });
 const OptionsSchema = v.strictObject({
 	cwd: v.string(),

From c8117974e82101b5cc70a398958d6ab332357e9c Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Sun, 13 Oct 2024 04:53:08 +0000
Subject: [PATCH 55/58] Revert "improve output"

This reverts commit fb37e153819e81e7ae14c6450b599333c49cb69c.
---
 packages/adders/paraglide/index.ts  | 2 +-
 packages/ast-tooling/index.ts       | 1 -
 packages/core/tooling/html/index.ts | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index d0a1a07e..a8923414 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -211,7 +211,7 @@ export default defineAdder({
 					root.attribs = {
 						'{i18n}': ''
 					};
-					root.children = [html.text('\n\t'), ...rootChildren, html.text('\n')];
+					root.children = rootChildren;
 					template.ast.children = [root];
 				}
 
diff --git a/packages/ast-tooling/index.ts b/packages/ast-tooling/index.ts
index 74a27cab..110ca956 100644
--- a/packages/ast-tooling/index.ts
+++ b/packages/ast-tooling/index.ts
@@ -30,7 +30,6 @@ export {
 	// html
 	Document as HtmlDocument,
 	Element as HtmlElement,
-	Text as HtmlText,
 	ElementType as HtmlElementType,
 
 	// css
diff --git a/packages/core/tooling/html/index.ts b/packages/core/tooling/html/index.ts
index 5a44a59e..57628744 100644
--- a/packages/core/tooling/html/index.ts
+++ b/packages/core/tooling/html/index.ts
@@ -4,7 +4,6 @@ import {
 	type HtmlDocument,
 	HtmlElement,
 	HtmlElementType,
-	HtmlText,
 	parseHtml
 } from '@sveltejs/ast-tooling';
 import { addFromString } from '../js/common.ts';

From 9f5f09e02e1ba800bc7c7df0a4a2e4db57239175 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Sun, 13 Oct 2024 05:00:11 +0000
Subject: [PATCH 56/58] fix merge conflicts

---
 packages/adders/paraglide/index.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/adders/paraglide/index.ts b/packages/adders/paraglide/index.ts
index a8923414..23cdb525 100644
--- a/packages/adders/paraglide/index.ts
+++ b/packages/adders/paraglide/index.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { defineAdder, defineAdderOptions, log } from '@sveltejs/cli-core';
+import { defineAdder, defineAdderOptions, log, utils } from '@sveltejs/cli-core';
 import {
 	array,
 	common,
@@ -8,10 +8,10 @@ import {
 	imports,
 	object,
 	variables,
-	exports
+	exports,
+	kit
 } from '@sveltejs/cli-core/js';
 import * as html from '@sveltejs/cli-core/html';
-import { addHooksHandle, addSlot, createPrinter } from '../common.ts';
 import { parseHtml, parseJson, parseScript, parseSvelte } from '@sveltejs/cli-core/parsers';
 
 const DEFAULT_INLANG_PROJECT = {
@@ -175,7 +175,7 @@ export default defineAdder({
 				});
 
 				const hookHandleContent = 'i18n.handle()';
-				addHooksHandle(ast, typescript, 'paraglide', hookHandleContent);
+				kit.addHooksHandle(ast, typescript, 'paraglide', hookHandleContent);
 
 				return generateCode();
 			}
@@ -200,7 +200,7 @@ export default defineAdder({
 					const svelteVersion = dependencyVersion('svelte');
 					if (!svelteVersion) throw new Error('Failed to determine svelte version');
 
-					addSlot(script.ast, template.ast, svelteVersion);
+					html.addSlot(script.ast, template.ast, svelteVersion);
 				}
 
 				const hasParaglideJsNode = rootChildren.find(
@@ -263,7 +263,7 @@ export default defineAdder({
 					);
 				}
 
-				const [ts] = createPrinter(typescript);
+				const { ts } = utils.createPrinter({ ts: typescript });
 
 				const methodStatement = common.statementFromString(`
 					function switchToLanguage(newLanguage${ts(': AvailableLanguageTag')}) {

From ef55cb6a7fd0f6cd255fd9c2ccb4e7a8d7a67f77 Mon Sep 17 00:00:00 2001
From: Manuel <30698007+manuel3108@users.noreply.github.com>
Date: Sun, 13 Oct 2024 05:04:35 +0000
Subject: [PATCH 57/58] remove useless function

---
 packages/core/tooling/html/index.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/core/tooling/html/index.ts b/packages/core/tooling/html/index.ts
index 57628744..a02e689a 100644
--- a/packages/core/tooling/html/index.ts
+++ b/packages/core/tooling/html/index.ts
@@ -36,13 +36,6 @@ export function addFromRawHtml(childNodes: HtmlChildNode[], html: string): void
 	}
 }
 
-export function text(content: string): HtmlText {
-	return {
-		type: HtmlElementType.Text,
-		data: content
-	} as HtmlText;
-}
-
 export function addSlot(
 	jsAst: AstTypes.Program,
 	htmlAst: HtmlDocument,

From 63e065a6a6786c99a46df6dc97267914debd1b0d Mon Sep 17 00:00:00 2001
From: Manuel Serret <mserret99@gmail.com>
Date: Sun, 13 Oct 2024 16:53:42 +0200
Subject: [PATCH 58/58] fix

---
 packages/core/utils.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/core/utils.ts b/packages/core/utils.ts
index b431c75e..2e592998 100644
--- a/packages/core/utils.ts
+++ b/packages/core/utils.ts
@@ -4,9 +4,10 @@ type Printers<Condition extends Record<string, boolean>> = {
 export function createPrinter<Condition extends Record<string, boolean>>(
 	conditions: Condition
 ): Printers<Condition> {
-	const printers = Object.values(conditions).map((condition) => {
-		return (content: string, alt = '') => (condition ? content : alt);
-	}) as Printers<Condition>;
+	const printers = Object.entries(conditions).reduce((acc, [key, condition]) => {
+		acc[key as keyof Condition] = (content: string, alt = '') => (condition ? content : alt);
+		return acc;
+	}, {} as Printers<Condition>);
 
 	return printers;
 }