sv 0.5.2 → 0.5.3

package/dist/bin.js

@@ -25,7 +25,7 @@ import require$$0$3 from 'events';
 import { t as templates, c as create$2 } from './index-A89HFWzv.js';
 
 var name = "sv";
-var version = "0.5.2";
+var version = "0.5.3";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -46406,7 +46406,7 @@ function addGlobalAppInterface(ast, name) {
   }
   return interfaceNode;
 }
-function addHooksHandle(ast, typescript, newHandleName, handleContent, forceSeparateHandle = false) {
+function addHooksHandle(ast, typescript, newHandleName, handleContent) {
   if (typescript) {
     addNamed(ast, "@sveltejs/kit", { Handle: "Handle" }, true);
   }
@@ -46439,31 +46439,23 @@ function addHooksHandle(ast, typescript, newHandleName, handleContent, forceSepa
   const newHandle = expressionFromString(handleContent);
   if (hasNode(ast, newHandle)) return;
   if (!originalHandleDecl || !exportDecl) {
-    const newDecl2 = declaration(ast, "const", handleName, newHandle);
+    const newDecl2 = declaration(ast, "const", newHandleName, newHandle);
     if (typescript) {
       const declarator = newDecl2.declarations[0];
       typeAnnotateDeclarator(declarator, "Handle");
     }
-    if (!forceSeparateHandle) namedExport(ast, handleName, newDecl2);
-    else {
-      const newDecl3 = declaration(ast, "const", newHandleName, newHandle);
-      if (typescript) {
-        const declarator = newDecl3.declarations[0];
-        typeAnnotateDeclarator(declarator, "Handle");
-      }
-      ast.body.push(newDecl3);
-      const handleDecl = declaration(
-        ast,
-        "const",
-        handleName,
-        expressionFromString(newHandleName)
-      );
-      if (typescript) {
-        const declarator = handleDecl.declarations[0];
-        typeAnnotateDeclarator(declarator, "Handle");
-      }
-      namedExport(ast, handleName, handleDecl);
+    ast.body.push(newDecl2);
+    const handleDecl = declaration(
+      ast,
+      "const",
+      handleName,
+      expressionFromString(newHandleName)
+    );
+    if (typescript) {
+      const declarator = handleDecl.declarations[0];
+      typeAnnotateDeclarator(declarator, "Handle");
     }
+    namedExport(ast, handleName, handleDecl);
     return;
   }
   const newDecl = declaration(ast, "const", newHandleName, newHandle);
@@ -50479,7 +50471,7 @@ ${sessionType}`);
         const { ast, generateCode } = parseScript(content);
         imports.addNamespace(ast, "$lib/server/auth.js", "auth");
         imports.addNamed(ast, "$app/environment", { dev: "dev" });
-        kit.addHooksHandle(ast, typescript, "auth", getAuthHandleContent());
+        kit.addHooksHandle(ast, typescript, "handleAuth", getAuthHandleContent());
         return generateCode();
       }
     },
@@ -50624,15 +50616,16 @@ ${sessionType}`);
     {
       name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/login/+page.svelte`,
       condition: ({ options: options2 }) => options2.demo,
-      content({ content, typescript, kit: kit2 }) {
+      content({ content, dependencyVersion, typescript, kit: kit2 }) {
         if (content) {
           const filePath = `${kit2.routesDirectory}/demo/login/+page.svelte`;
           log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
           return content;
         }
-        const [ts] = utils.createPrinter(typescript);
-        return dedent(_a || (_a = __template(["\n					<script ", ">\n						import { enhance } from '$app/forms';\n						", "\n						export let form", ";\n					<\/script>\n\n					<h1>Login/Register</h1>\n					<form method='post' action='?/login' use:enhance>\n						<label>\n							Username\n							<input name='username' />\n						</label>\n						<label>\n							Password\n							<input type='password' name='password' />\n						</label>\n						<button>Login</button>\n						<button formaction='?/register'>Register</button>\n					</form>\n					<p style='color: red'>{form?.message ?? ''}</p>\n				"])), ts(`lang='ts'`), ts(`import type { ActionData } from './$types';
-`), ts(": ActionData"));
+        const svelte5 = !!dependencyVersion("svelte")?.startsWith("5");
+        const [ts, s5] = utils.createPrinter(typescript, svelte5);
+        return dedent(_a || (_a = __template(["\n					<script ", ">\n						import { enhance } from '$app/forms';\n						", "\n						", "\n					<\/script>\n\n					<h1>Login/Register</h1>\n					<form method='post' action='?/login' use:enhance>\n						<label>\n							Username\n							<input name='username' />\n						</label>\n						<label>\n							Password\n							<input type='password' name='password' />\n						</label>\n						<button>Login</button>\n						<button formaction='?/register'>Register</button>\n					</form>\n					<p style='color: red'>{form?.message ?? ''}</p>\n				"])), ts(`lang='ts'`), ts(`import type { ActionData } from './$types';
+`), s5(`let { form }${ts(": { form: ActionData }")} = $props();`, `export let form${ts(": ActionData")};`));
       }
     },
     // logout
@@ -50675,15 +50668,16 @@ ${sessionType}`);
     {
       name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/+page.svelte`,
       condition: ({ options: options2 }) => options2.demo,
-      content({ content, typescript, kit: kit2 }) {
+      content({ content, dependencyVersion, typescript, kit: kit2 }) {
         if (content) {
           const filePath = `${kit2.routesDirectory}/demo/+page.svelte`;
           log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
           return content;
         }
-        const [ts] = utils.createPrinter(typescript);
-        return dedent(_b || (_b = __template(["\n					<script ", ">\n						import { enhance } from '$app/forms';\n						", "\n						export let data", ";\n					<\/script>\n\n					<h1>Hi, {data.user.username}!</h1>\n					<p>Your user ID is {data.user.id}.</p>\n					<form method='post' action='?/logout' use:enhance>\n						<button>Sign out</button>\n					</form>\n				"])), ts(`lang='ts'`), ts(`import type { PageServerData } from './$types';
-`), ts(": PageServerData"));
+        const svelte5 = !!dependencyVersion("svelte")?.startsWith("5");
+        const [ts, s5] = utils.createPrinter(typescript, svelte5);
+        return dedent(_b || (_b = __template(["\n					<script ", ">\n						import { enhance } from '$app/forms';\n						", "\n						", "\n					<\/script>\n\n					<h1>Hi, {data.user.username}!</h1>\n					<p>Your user ID is {data.user.id}.</p>\n					<form method='post' action='?/logout' use:enhance>\n						<button>Sign out</button>\n					</form>\n				"])), ts(`lang='ts'`), ts(`import type { PageServerData } from './$types';
+`), s5(`let { data }${ts(": { data: PageServerData }")} = $props();`, `export let data${ts(": PageServerData")};`));
       }
     }
   ],
@@ -50841,15 +50835,14 @@ const DEFAULT_INLANG_PROJECT = {
 };
 const options$1 = defineAdderOptions({
   availableLanguageTags: {
-    question: "Which language tags would you like to support?",
+    question: `Which language tags would you like to support? ${picocolors.gray("(e.g. en,de-ch)")}`,
     type: "string",
-    default: "",
-    placeholder: "en,de-ch",
+    default: "en",
     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`;
+          return `The input "${invalidLanguageTags[0]}" is not a valid IETF BCP 47 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`;
@@ -50901,9 +50894,7 @@ var paraglide = defineAdder({
       content: ({ content }) => {
         const { ast, generateCode } = parseScript(content);
         const vitePluginName = "paraglide";
-        imports.addNamed(ast, "@inlang/paraglide-sveltekit/vite", {
-          paraglide: vitePluginName
-        });
+        imports.addNamed(ast, "@inlang/paraglide-sveltekit/vite", { paraglide: vitePluginName });
         const { value: rootObject } = exports.defaultExport(
           ast,
           _function.call("defineConfig", [])
@@ -50962,7 +50953,7 @@ var paraglide = defineAdder({
           i18n: "i18n"
         });
         const hookHandleContent = "i18n.handle()";
-        kit.addHooksHandle(ast, typescript, "paraglide", hookHandleContent);
+        kit.addHooksHandle(ast, typescript, "handleParaglide", hookHandleContent);
         return generateCode();
       }
     },
@@ -51019,7 +51010,7 @@ var paraglide = defineAdder({
       name: ({ kit: kit2 }) => `${kit2?.routesDirectory}/+page.svelte`,
       condition: ({ options: options2 }) => options2.demo,
       content({ content, options: options2, typescript }) {
-        const { script, template, generateCode } = parseSvelte(content);
+        const { script, template, generateCode } = parseSvelte(content, { typescript });
         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" });
@@ -55538,10 +55529,13 @@ async function runAdders({
     changedFiles.forEach((file) => filesToFormat.add(file));
     await config.postInstall?.(workspace);
     if (config.scripts && config.scripts.length > 0) {
-      log$1.step(`Running external command ${pc.gray(`(${config.id})`)}`);
       for (const script of config.scripts) {
         if (script.condition?.(workspace) === false) continue;
         const { command, args } = resolveCommand(workspace.packageManager, "execute", script.args);
+        const adderPrefix = details.length > 1 ? `${config.id}: ` : "";
+        log$1.step(
+          `${adderPrefix}Running external command ${pc.gray(`(${command} ${args.join(" ")})`)}`
+        );
         if (workspace.packageManager === "npm") args.unshift("--yes");
         try {
           await be(command, args, { nodeOptions: { cwd: workspace.cwd, stdio: script.stdio } });
@@ -55552,7 +55546,6 @@ async function runAdders({
           );
         }
       }
-      log$1.success(`Finished running ${config.id}`);
     }
   }
   return Array.from(filesToFormat);