sv 0.5.1 → 0.5.3

package/dist/bin.js

@@ -22,28 +22,28 @@ import 'node:fs/promises';
 import { pipeline as pipeline$1 } from 'node:stream/promises';
 import { createGunzip } from 'node:zlib';
 import require$$0$3 from 'events';
-import { t as templates, c as create$2 } from './index-CfDBZLMZ.js';
+import { t as templates, c as create$2 } from './index-A89HFWzv.js';
 
 var name = "sv";
-var version = "0.5.1";
+var version = "0.5.3";
+var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
-var keywords = [
-	"create",
-	"new",
-	"project",
-	"starter",
-	"svelte",
-	"sveltekit",
-	"template",
-	"wizard"
-];
+var license = "MIT";
 var repository = {
 	type: "git",
 	url: "https://github.com/sveltejs/cli",
 	directory: "packages/cli"
 };
-var license = "MIT";
 var homepage = "https://svelte.dev";
+var scripts = {
+	check: "tsc",
+	format: "pnpm lint --write",
+	lint: "prettier --check . --config ../../prettier.config.js --ignore-path ../../.gitignore --ignore-path .gitignore --ignore-path ../../.prettierignore",
+	postpublish: "pnpm -F @sveltejs/create update-template-repo"
+};
+var files = [
+	"dist"
+];
 var bin = "./dist/bin.js";
 var exports$1 = {
 	".": {
@@ -65,30 +65,30 @@ var devDependencies = {
 	tinyexec: "^0.3.0",
 	valibot: "^0.41.0"
 };
-var scripts = {
-	lint: "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --ignore-path ../../.prettierignore",
-	format: "pnpm lint --write",
-	check: "tsc",
-	postpublish: "pnpm -F @sveltejs/create update-template-repo"
-};
-var files = [
-	"dist"
+var keywords = [
+	"create",
+	"new",
+	"project",
+	"starter",
+	"svelte",
+	"sveltekit",
+	"template",
+	"wizard"
 ];
-var type = "module";
 var pkg = {
 	name: name,
 	version: version,
+	type: type,
 	description: description,
-	keywords: keywords,
-	repository: repository,
 	license: license,
+	repository: repository,
 	homepage: homepage,
+	scripts: scripts,
+	files: files,
 	bin: bin,
 	exports: exports$1,
 	devDependencies: devDependencies,
-	scripts: scripts,
-	files: files,
-	type: type
+	keywords: keywords
 };
 
 var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -5608,83 +5608,6 @@ class ConfirmPrompt extends Prompt {
     });
   }
 }
-var __defProp$5 = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
-var _selectableGroups;
-class GroupMultiSelectPrompt extends Prompt {
-  constructor(opts) {
-    super(opts, false);
-    __publicField$5(this, "options");
-    __publicField$5(this, "cursor", 0);
-    __privateAdd(this, _selectableGroups);
-    const { options } = opts;
-    __privateSet(this, _selectableGroups, opts.selectableGroups ?? true);
-    this.options = Object.entries(options).flatMap(([key, option]) => [
-      { value: key, group: true, label: key },
-      ...option.map((opt) => ({ ...opt, group: key }))
-    ]);
-    this.value = [...opts.initialValues ?? []];
-    this.cursor = Math.max(
-      this.options.findIndex(({ value }) => value === opts.cursorAt),
-      __privateGet(this, _selectableGroups) ? 0 : 1
-    );
-    this.on("cursor", (key) => {
-      switch (key) {
-        case "left":
-        case "up":
-          this.cursor = this.cursor === 0 ? this.options.length - 1 : this.cursor - 1;
-          if (!__privateGet(this, _selectableGroups) && this.options[this.cursor].group === true) {
-            this.cursor = this.cursor === 0 ? this.options.length - 1 : this.cursor - 1;
-          }
-          break;
-        case "down":
-        case "right":
-          this.cursor = this.cursor === this.options.length - 1 ? 0 : this.cursor + 1;
-          if (!__privateGet(this, _selectableGroups) && this.options[this.cursor].group === true) {
-            this.cursor = this.cursor === this.options.length - 1 ? 0 : this.cursor + 1;
-          }
-          break;
-        case "space":
-          this.toggleValue();
-          break;
-      }
-    });
-  }
-  getGroupItems(group2) {
-    return this.options.filter((o) => o.group === group2);
-  }
-  isGroupSelected(group2) {
-    const items = this.getGroupItems(group2);
-    return __privateGet(this, _selectableGroups) && items.every((i) => this.value.includes(i.value));
-  }
-  toggleValue() {
-    const item = this.options[this.cursor];
-    if (item.group === true) {
-      const group2 = item.value;
-      const groupedItems = this.getGroupItems(group2);
-      if (this.isGroupSelected(group2)) {
-        this.value = this.value.filter(
-          (v) => groupedItems.findIndex((i) => i.value === v) === -1
-        );
-      } else {
-        this.value = [...this.value, ...groupedItems.map((i) => i.value)];
-      }
-      this.value = Array.from(new Set(this.value));
-    } else {
-      const selected = this.value.includes(item.value);
-      this.value = selected ? this.value.filter((v) => v !== item.value) : [...this.value, item.value];
-    }
-  }
-}
-_selectableGroups = /* @__PURE__ */ new WeakMap();
 var __defProp$4 = Object.defineProperty;
 var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -6277,112 +6200,6 @@ ${color$2.cyan(S_BAR_END)}
     }
   }).prompt();
 };
-const groupMultiselect = (opts) => {
-  const { selectableGroups = false, spacedGroups = false } = opts;
-  const opt = (option, state, options = []) => {
-    const label = option.label ?? String(option.value);
-    const isItem = typeof option.group === "string";
-    const next = isItem && (options[options.indexOf(option) + 1] ?? { group: true });
-    const isLast = isItem && next.group === true;
-    const prefix = isItem ? selectableGroups ? `${isLast ? S_BAR_END : S_BAR$1} ` : " " : "";
-    const spacingPrefix = spacedGroups && !isItem ? `
-${color$2.cyan(S_BAR$1)}  ` : "";
-    if (state === "active") {
-      return `${spacingPrefix}${color$2.dim(prefix)}${color$2.cyan(S_CHECKBOX_ACTIVE)} ${label} ${option.hint ? color$2.dim(`(${option.hint})`) : ""}`;
-    } else if (state === "group-active") {
-      return `${spacingPrefix}${prefix}${color$2.cyan(S_CHECKBOX_ACTIVE)} ${color$2.dim(label)}`;
-    } else if (state === "group-active-selected") {
-      return `${spacingPrefix}${prefix}${color$2.green(S_CHECKBOX_SELECTED)} ${color$2.dim(label)}`;
-    } else if (state === "selected") {
-      return `${spacingPrefix}${color$2.dim(prefix)}${color$2.green(S_CHECKBOX_SELECTED)} ${color$2.dim(
-        label
-      )}`;
-    } else if (state === "cancelled") {
-      return color$2.strikethrough(color$2.dim(label));
-    } else if (state === "active-selected") {
-      return `${spacingPrefix}${color$2.dim(prefix)}${color$2.green(S_CHECKBOX_SELECTED)} ${label} ${option.hint ? color$2.dim(`(${option.hint})`) : ""}`;
-    } else if (state === "submitted") {
-      return color$2.dim(label);
-    }
-    return `${spacingPrefix}${color$2.dim(prefix)}${isItem || selectableGroups ? `${color$2.dim(S_CHECKBOX_INACTIVE)} ` : ""}${color$2.dim(label)}`;
-  };
-  return new GroupMultiSelectPrompt({
-    options: opts.options,
-    initialValues: opts.initialValues,
-    required: opts.required ?? true,
-    cursorAt: opts.cursorAt,
-    selectableGroups,
-    validate(selected) {
-      if (this.required && selected.length === 0)
-        return `Please select at least one option.
-${color$2.reset(
-          color$2.dim(
-            `Press ${color$2.gray(color$2.bgWhite(color$2.inverse(" space ")))} to select, ${color$2.gray(
-              color$2.bgWhite(color$2.inverse(" enter "))
-            )} to submit`
-          )
-        )}`;
-    },
-    render() {
-      const title = `${color$2.gray(S_BAR$1)}
-${symbol(this.state)}  ${opts.message}
-`;
-      switch (this.state) {
-        case "submit": {
-          return `${title}${color$2.gray(S_BAR$1)}  ${this.options.filter(({ value }) => this.value.includes(value)).map((option) => opt(option, "submitted")).join(color$2.dim(", "))}`;
-        }
-        case "cancel": {
-          const label = this.options.filter(({ value }) => this.value.includes(value)).map((option) => opt(option, "cancelled")).join(color$2.dim(", "));
-          return `${title}${color$2.gray(S_BAR$1)}  ${label.trim() ? `${label}
-${color$2.gray(S_BAR$1)}` : ""}`;
-        }
-        case "error": {
-          const footer = this.error.split("\n").map(
-            (ln, i) => i === 0 ? `${color$2.yellow(S_BAR_END)}  ${color$2.yellow(ln)}` : `   ${ln}`
-          ).join("\n");
-          return `${title}${color$2.yellow(S_BAR$1)}  ${this.options.map((option, i, options) => {
-            const selected = this.value.includes(option.value) || option.group === true && this.isGroupSelected(`${option.value}`);
-            const active = i === this.cursor;
-            const groupActive = !active && typeof option.group === "string" && this.options[this.cursor].value === option.group;
-            if (groupActive) {
-              return opt(option, selected ? "group-active-selected" : "group-active", options);
-            }
-            if (active && selected) {
-              return opt(option, "active-selected", options);
-            }
-            if (selected) {
-              return opt(option, "selected", options);
-            }
-            return opt(option, active ? "active" : "inactive", options);
-          }).join(`
-${color$2.yellow(S_BAR$1)}  `)}
-${footer}
-`;
-        }
-        default: {
-          return `${title}${color$2.cyan(S_BAR$1)}  ${this.options.map((option, i, options) => {
-            const selected = this.value.includes(option.value) || option.group === true && this.isGroupSelected(`${option.value}`);
-            const active = i === this.cursor;
-            const groupActive = !active && typeof option.group === "string" && this.options[this.cursor].value === option.group;
-            if (groupActive) {
-              return opt(option, selected ? "group-active-selected" : "group-active", options);
-            }
-            if (active && selected) {
-              return opt(option, "active-selected", options);
-            }
-            if (selected) {
-              return opt(option, "selected", options);
-            }
-            return opt(option, active ? "active" : "inactive", options);
-          }).join(`
-${color$2.cyan(S_BAR$1)}  `)}
-${color$2.cyan(S_BAR_END)}
-`;
-        }
-      }
-    }
-  }).prompt();
-};
 const strip$1 = (str) => str.replace(ansiRegex(), "");
 function buildBox(message = "", title = "", dimmed = true) {
   const lines = `
@@ -45856,8 +45673,15 @@ function parseScript$1(content) {
   });
   return recastOutput.program;
 }
-function serializeScript(ast) {
-  return main.print(ast).code;
+function serializeScript(ast, previousContent) {
+  let options2;
+  if (!previousContent) {
+    options2 = {
+      quote: "single",
+      useTabs: true
+    };
+  }
+  return main.print(ast, options2).code;
 }
 function parseCss$1(content) {
   return parse$1(content);
@@ -46345,6 +46169,19 @@ function addEmpty(ast, importFrom) {
   };
   addImportIfNecessary(ast, expectedImportDeclaration);
 }
+function addNamespace(ast, importFrom, importAs) {
+  const expectedImportDeclaration = {
+    type: "ImportDeclaration",
+    source: { type: "Literal", value: importFrom },
+    specifiers: [
+      {
+        type: "ImportNamespaceSpecifier",
+        local: { type: "Identifier", name: importAs }
+      }
+    ]
+  };
+  addImportIfNecessary(ast, expectedImportDeclaration);
+}
 function addDefault(ast, importFrom, importAs) {
   const expectedImportDeclaration = {
     type: "ImportDeclaration",
@@ -46421,7 +46258,8 @@ var imports = /* @__PURE__ */ Object.freeze({
   __proto__: null,
   addDefault,
   addEmpty,
-  addNamed
+  addNamed,
+  addNamespace
 });
 function declaration(ast, kind, name, value) {
   const declarations = ast.type == "Program" ? ast.body.filter((x) => x.type == "VariableDeclaration") : [ast];
@@ -46568,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);
   }
@@ -46601,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);
@@ -48310,7 +48140,7 @@ let MagicString$1 = class MagicString {
 };
 function parseScript(source) {
   const ast = parseScript$1(source);
-  const generateCode = () => serializeScript(ast);
+  const generateCode = () => serializeScript(ast, source);
   return { ast, source, generateCode };
 }
 function parseCss(source) {
@@ -48494,10 +48324,8 @@ const options$3 = defineAdderOptions({
 });
 var drizzle = defineAdder({
   id: "drizzle",
-  name: "Drizzle",
-  description: "Headless ORM for NodeJS, TypeScript and JavaScript",
   environments: { svelte: false, kit: true },
-  documentation: "https://orm.drizzle.team/docs/overview",
+  homepage: "https://orm.drizzle.team",
   options: options$3,
   packages: [
     { name: "drizzle-orm", version: "^0.33.0", dev: false },
@@ -48769,7 +48597,7 @@ var drizzle = defineAdder({
     if (options2.docker) {
       steps.push(`Run ${highlighter.command("npm run db:start")} to start the docker container`);
     }
-    steps.push(`To update your DB schema, run ${highlighter.command("npm run db:push")}`);
+    steps.push(`Run ${highlighter.command("npm run db:push")} to update your database schema`);
     return steps;
   }
 });
@@ -48865,10 +48693,8 @@ function addEslintConfigPrettier({ content }) {
 
 var eslint = defineAdder({
   id: "eslint",
-  name: "ESLint",
-  description: "A configurable JavaScript linter",
   environments: { svelte: true, kit: true },
-  documentation: "https://eslint.org",
+  homepage: "https://eslint.org",
   options: {},
   packages: [
     { name: "eslint", version: "^9.7.0", dev: true },
@@ -48986,570 +48812,6 @@ var eslint = defineAdder({
   ]
 });
 
-var __freeze = Object.freeze;
-var __defProp = Object.defineProperty;
-var __template = (cooked, raw) => __freeze(__defProp(cooked, "raw", { value: __freeze(cooked.slice()) }));
-var _a, _b;
-const LUCIA_ADAPTER = {
-  mysql: "DrizzleMySQLAdapter",
-  postgresql: "DrizzlePostgreSQLAdapter",
-  sqlite: "DrizzleSQLiteAdapter"
-};
-const TABLE_TYPE = {
-  mysql: "mysqlTable",
-  postgresql: "pgTable",
-  sqlite: "sqliteTable"
-};
-let drizzleDialect;
-let schemaPath;
-const options$2 = defineAdderOptions({
-  demo: {
-    type: "boolean",
-    default: false,
-    question: `Do you want to include a demo? ${picocolors.dim("(includes a login/register page)")}`
-  }
-});
-var lucia = defineAdder({
-  id: "lucia",
-  name: "Lucia",
-  description: "An auth library that abstracts away the complexity of handling sessions",
-  environments: { svelte: false, kit: true },
-  documentation: "https://lucia-auth.com",
-  options: options$2,
-  packages: [
-    { name: "lucia", version: "^3.2.0", dev: false },
-    { name: "@lucia-auth/adapter-drizzle", version: "^1.1.0", dev: false },
-    // password hashing for demo
-    {
-      name: "@node-rs/argon2",
-      version: "^1.1.0",
-      condition: ({ options: options2 }) => options2.demo,
-      dev: false
-    }
-  ],
-  dependsOn: ["drizzle"],
-  files: [
-    {
-      name: ({ typescript }) => `drizzle.config.${typescript ? "ts" : "js"}`,
-      content: ({ content }) => {
-        const { ast, generateCode } = parseScript(content);
-        const isProp = (name, node) => node.key.type === "Identifier" && node.key.name === name;
-        walk$1.walk(ast, {}, {
-          ObjectProperty(node) {
-            if (isProp("dialect", node) && node.value.type === "StringLiteral") {
-              drizzleDialect = node.value.value;
-            }
-            if (isProp("schema", node) && node.value.type === "StringLiteral") {
-              schemaPath = node.value.value;
-            }
-          }
-        });
-        if (!drizzleDialect) {
-          throw new Error("Failed to detect DB dialect in your `drizzle.config.[js|ts]` file");
-        }
-        if (!schemaPath) {
-          throw new Error("Failed to find schema path in your `drizzle.config.[js|ts]` file");
-        }
-        return generateCode();
-      }
-    },
-    {
-      name: () => schemaPath,
-      content: ({ content, options: options2 }) => {
-        const { ast, generateCode } = parseScript(content);
-        const createTable = (name) => _function.call(TABLE_TYPE[drizzleDialect], [name]);
-        const userDecl = variables.declaration(ast, "const", "user", createTable("user"));
-        const sessionDecl = variables.declaration(ast, "const", "session", createTable("session"));
-        const user = exports.namedExport(ast, "user", userDecl);
-        const session = exports.namedExport(ast, "session", sessionDecl);
-        const userTable = getCallExpression(user);
-        const sessionTable = getCallExpression(session);
-        if (!userTable || !sessionTable) {
-          throw new Error("failed to find call expression of `user` or `session`");
-        }
-        if (userTable.arguments.length === 1) {
-          userTable.arguments.push(object.createEmpty());
-        }
-        if (sessionTable.arguments.length === 1) {
-          sessionTable.arguments.push(object.createEmpty());
-        }
-        const userAttributes = userTable.arguments[1];
-        const sessionAttributes = sessionTable.arguments[1];
-        if (userAttributes?.type !== "ObjectExpression" || sessionAttributes?.type !== "ObjectExpression") {
-          throw new Error("unexpected shape of `user` or `session` table definition");
-        }
-        if (drizzleDialect === "sqlite") {
-          imports.addNamed(ast, "drizzle-orm/sqlite-core", {
-            sqliteTable: "sqliteTable",
-            text: "text",
-            integer: "integer"
-          });
-          object.overrideProperties(userAttributes, {
-            id: common.expressionFromString(`text('id').primaryKey()`)
-          });
-          if (options2.demo) {
-            object.overrideProperties(userAttributes, {
-              username: common.expressionFromString(`text('username').notNull().unique()`),
-              passwordHash: common.expressionFromString(`text('password_hash').notNull()`)
-            });
-          }
-          object.overrideProperties(sessionAttributes, {
-            id: common.expressionFromString(`text('id').primaryKey()`),
-            userId: common.expressionFromString(
-              `text('user_id').notNull().references(() => user.id)`
-            ),
-            expiresAt: common.expressionFromString(`integer('expires_at').notNull()`)
-          });
-        }
-        if (drizzleDialect === "mysql") {
-          imports.addNamed(ast, "drizzle-orm/mysql-core", {
-            mysqlTable: "mysqlTable",
-            varchar: "varchar",
-            datetime: "datetime"
-          });
-          object.overrideProperties(userAttributes, {
-            id: common.expressionFromString(`varchar('id', { length: 255 }).primaryKey()`)
-          });
-          if (options2.demo) {
-            object.overrideProperties(userAttributes, {
-              username: common.expressionFromString(
-                `varchar('username', { length: 32 }).notNull().unique()`
-              ),
-              passwordHash: common.expressionFromString(
-                `varchar('password_hash', { length: 255 }).notNull()`
-              )
-            });
-          }
-          object.overrideProperties(sessionAttributes, {
-            id: common.expressionFromString(`varchar('id', { length: 255 }).primaryKey()`),
-            userId: common.expressionFromString(
-              `varchar('user_id', { length: 255 }).notNull().references(() => user.id)`
-            ),
-            expiresAt: common.expressionFromString(`datetime('expires_at').notNull()`)
-          });
-        }
-        if (drizzleDialect === "postgresql") {
-          imports.addNamed(ast, "drizzle-orm/pg-core", {
-            pgTable: "pgTable",
-            text: "text",
-            timestamp: "timestamp"
-          });
-          object.overrideProperties(userAttributes, {
-            id: common.expressionFromString(`text('id').primaryKey()`)
-          });
-          if (options2.demo) {
-            object.overrideProperties(userAttributes, {
-              username: common.expressionFromString(`text('username').notNull().unique()`),
-              passwordHash: common.expressionFromString(`text('password_hash').notNull()`)
-            });
-          }
-          object.overrideProperties(sessionAttributes, {
-            id: common.expressionFromString(`text('id').primaryKey()`),
-            userId: common.expressionFromString(
-              `text('user_id').notNull().references(() => user.id)`
-            ),
-            expiresAt: common.expressionFromString(
-              `timestamp('expires_at', { withTimezone: true, mode: 'date' }).notNull()`
-            )
-          });
-        }
-        return generateCode();
-      }
-    },
-    {
-      name: ({ kit: kit2, typescript }) => `${kit2?.libDirectory}/server/auth.${typescript ? "ts" : "js"}`,
-      content: ({ content, typescript, options: options2 }) => {
-        const { ast, generateCode } = parseScript(content);
-        const adapter = LUCIA_ADAPTER[drizzleDialect];
-        imports.addNamed(ast, "$lib/server/db/schema.js", { user: "user", session: "session" });
-        imports.addNamed(ast, "$lib/server/db", { db: "db" });
-        imports.addNamed(ast, "lucia", { Lucia: "Lucia" });
-        imports.addNamed(ast, "@lucia-auth/adapter-drizzle", { [adapter]: adapter });
-        imports.addNamed(ast, "$app/environment", { dev: "dev" });
-        const adapterDecl = common.statementFromString(
-          `const adapter = new ${adapter}(db, session, user);`
-        );
-        common.addStatement(ast, adapterDecl);
-        const luciaInit = common.expressionFromString(`
-					new Lucia(adapter, {
-						sessionCookie: {
-							attributes: {
-								secure: !dev
-							}
-						},
-						${options2.demo ? "getUserAttributes: (attributes) => ({ username: attributes.username })" : ""}
-					})`);
-        const luciaDecl = variables.declaration(ast, "const", "lucia", luciaInit);
-        exports.namedExport(ast, "lucia", luciaDecl);
-        if (typescript && !/declare module ["']lucia["']/.test(content)) {
-          const moduleDecl = common.statementFromString(`
-						declare module 'lucia' {
-							interface Register {
-								Lucia: typeof lucia;
-								// attributes that are already included are omitted
-								DatabaseUserAttributes: Omit<typeof user.$inferSelect, 'id'>;
-								DatabaseSessionAttributes: Omit<typeof session.$inferSelect, 'id' | 'userId' | 'expiresAt'>;
-							}
-						}`);
-          common.addStatement(ast, moduleDecl);
-        }
-        return generateCode();
-      }
-    },
-    {
-      name: () => "src/app.d.ts",
-      condition: ({ typescript }) => typescript,
-      content: ({ content }) => {
-        const { ast, generateCode } = parseScript(content);
-        const locals = kit.addGlobalAppInterface(ast, "Locals");
-        if (!locals) {
-          throw new Error("Failed detecting `locals` interface in `src/app.d.ts`");
-        }
-        const user = locals.body.body.find((prop) => common.hasTypeProp("user", prop));
-        const session = locals.body.body.find((prop) => common.hasTypeProp("session", prop));
-        if (!user) {
-          locals.body.body.push(createLuciaType("user"));
-        }
-        if (!session) {
-          locals.body.body.push(createLuciaType("session"));
-        }
-        return generateCode();
-      }
-    },
-    {
-      name: ({ typescript }) => `src/hooks.server.${typescript ? "ts" : "js"}`,
-      content: ({ content, typescript }) => {
-        const { ast, generateCode } = parseScript(content);
-        imports.addNamed(ast, "$lib/server/auth.js", { lucia: "lucia" });
-        kit.addHooksHandle(ast, typescript, "auth", getAuthHandleContent());
-        return generateCode();
-      }
-    },
-    // DEMO
-    // login/register
-    {
-      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/login/+page.server.${typescript ? "ts" : "js"}`,
-      condition: ({ options: options2 }) => options2.demo,
-      content({ content, typescript }) {
-        if (content) {
-          log.warn(
-            `Existing ${picocolors.yellow("/demo/login/+page.server.[js|ts]")} file. Could not update.`
-          );
-          return content;
-        }
-        const [ts] = utils.createPrinter(typescript);
-        return dedent`
-					import { fail, redirect } from '@sveltejs/kit';
-					import { hash, verify } from '@node-rs/argon2';
-					import { eq } from 'drizzle-orm';
-					import { generateId } from 'lucia';
-					import { lucia } from '$lib/server/auth';
-					import { db } from '$lib/server/db';
-					import { user } from '$lib/server/db/schema.js';
-					${ts(`import type { Actions, PageServerLoad } from './$types';`)}
-
-					export const load${ts(": PageServerLoad")} = async (event) => {
-						if (event.locals.user) {
-							return redirect(302, '/demo');
-						}
-						return {};
-					};
-
-					export const actions${ts(": Actions")} = {
-						login: async (event) => {
-							const formData = await event.request.formData();
-							const username = formData.get('username');
-							const password = formData.get('password');
-
-							if (!validateUsername(username)) {
-								return fail(400, {
-									message: 'Invalid username',
-								});
-							}
-							if (!validatePassword(password)) {
-								return fail(400, {
-									message: 'Invalid password',
-								});
-							}
-
-							const results = await db
-								.select()
-								.from(user)
-								.where(eq(user.username, username));
-
-							const existingUser = results.at(0);
-							if (!existingUser) {
-								return fail(400, {
-									message: 'Incorrect username or password',
-								});
-							}
-
-							const validPassword = await verify(existingUser.passwordHash, password, {
-								memoryCost: 19456,
-								timeCost: 2,
-								outputLen: 32,
-								parallelism: 1,
-							});
-							if (!validPassword) {
-								return fail(400, {
-									message: 'Incorrect username or password',
-								});
-							}
-
-							const session = await lucia.createSession(existingUser.id, {});
-							const sessionCookie = lucia.createSessionCookie(session.id);
-							event.cookies.set(sessionCookie.name, sessionCookie.value, {
-								path: '/',
-								...sessionCookie.attributes,
-							});
-
-							return redirect(302, '/demo');
-						},
-						register: async (event) => {
-							const formData = await event.request.formData();
-							const username = formData.get('username');
-							const password = formData.get('password');
-
-							if (!validateUsername(username)) {
-								return fail(400, {
-									message: 'Invalid username',
-								});
-							}
-							if (!validatePassword(password)) {
-								return fail(400, {
-									message: 'Invalid password',
-								});
-							}
-
-							const passwordHash = await hash(password, {
-								// recommended minimum parameters
-								memoryCost: 19456,
-								timeCost: 2,
-								outputLen: 32,
-								parallelism: 1,
-							});
-							const userId = generateId(15);
-
-							try {
-								await db.insert(user).values({
-									id: userId,
-									username,
-									passwordHash,
-								});
-
-								const session = await lucia.createSession(userId, {});
-								const sessionCookie = lucia.createSessionCookie(session.id);
-								event.cookies.set(sessionCookie.name, sessionCookie.value, {
-									path: '/',
-									...sessionCookie.attributes,
-								});
-							} catch (e) {
-								return fail(500, {
-									message: 'An error has occurred',
-								});
-							}
-							return redirect(302, '/demo');
-						},
-					};
-
-					function validateUsername(username${ts(": unknown): username is string", ")")} {
-						return (
-							typeof username === 'string' &&
-							username.length >= 3 &&
-							username.length <= 31 &&
-							/^[a-z0-9_-]+$/.test(username)
-						);
-					}
-
-					function validatePassword(password${ts(": unknown): password is string", ")")} {
-						return (
-							typeof password === 'string' &&
-							password.length >= 6 &&
-							password.length <= 255
-						);
-					}
-				`;
-      }
-    },
-    {
-      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/login/+page.svelte`,
-      condition: ({ options: options2 }) => options2.demo,
-      content({ content, typescript }) {
-        if (content) {
-          log.warn(`Existing ${picocolors.yellow("/demo/login/+page.svelte")} 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\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"));
-      }
-    },
-    // logout
-    {
-      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/+page.server.${typescript ? "ts" : "js"}`,
-      condition: ({ options: options2 }) => options2.demo,
-      content({ content, typescript }) {
-        if (content) {
-          log.warn(
-            `Existing ${picocolors.yellow("/demo/+page.server.[js|ts]")} file. Could not update.`
-          );
-          return content;
-        }
-        const [ts] = utils.createPrinter(typescript);
-        return dedent`
-					import { lucia } from '$lib/server/auth';
-					import { fail, redirect } from '@sveltejs/kit';
-					${ts(`import type { Actions, PageServerLoad } from './$types';`)}
-					
-					export const load${ts(": PageServerLoad")} = async (event) => {
-						if (!event.locals.user) {
-							return redirect(302, '/demo/login');
-						}
-						return {
-							user: event.locals.user,
-						};
-					};
-
-					export const actions${ts(": Actions")} = {
-						logout: async (event) => {
-							if (!event.locals.session) {
-								return fail(401);
-							}
-							await lucia.invalidateSession(event.locals.session.id);
-							const sessionCookie = lucia.createBlankSessionCookie();
-							event.cookies.set(sessionCookie.name, sessionCookie.value, {
-								path: '/',
-								...sessionCookie.attributes,
-							});
-							return redirect(302, '/demo/login');
-						},
-					};
-				`;
-      }
-    },
-    {
-      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/+page.svelte`,
-      condition: ({ options: options2 }) => options2.demo,
-      content({ content, typescript }) {
-        if (content) {
-          log.warn(`Existing ${picocolors.yellow("/demo/+page.svelte")} 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\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"));
-      }
-    }
-  ],
-  nextSteps: ({ highlighter, options: options2 }) => {
-    const steps = [`Run ${highlighter.command("npm run db:push")} to update your database`];
-    if (options2.demo) {
-      steps.push(`Visit ${highlighter.route("/demo")} route to view the demo`);
-    }
-    return steps;
-  }
-});
-function createLuciaType(name) {
-  return {
-    type: "TSPropertySignature",
-    key: {
-      type: "Identifier",
-      name
-    },
-    typeAnnotation: {
-      type: "TSTypeAnnotation",
-      typeAnnotation: {
-        type: "TSUnionType",
-        types: [
-          {
-            type: "TSImportType",
-            argument: { type: "StringLiteral", value: "lucia" },
-            qualifier: {
-              type: "Identifier",
-              // capitalize first letter
-              name: `${name[0].toUpperCase()}${name.slice(1)}`
-            }
-          },
-          {
-            type: "TSNullKeyword"
-          }
-        ]
-      }
-    }
-  };
-}
-function getAuthHandleContent() {
-  return `
-		async ({ event, resolve }) => {
-			const sessionId = event.cookies.get(lucia.sessionCookieName);
-			if (!sessionId) {
-				event.locals.user = null;
-				event.locals.session = null;
-				return resolve(event);
-			}
-
-			const { session, user } = await lucia.validateSession(sessionId);
-			if (!session) {
-				event.cookies.delete(lucia.sessionCookieName, { path: '/' });
-			}
-
-			if (session?.fresh) {
-				const sessionCookie = lucia.createSessionCookie(session.id);
-
-				event.cookies.set(sessionCookie.name, sessionCookie.value, {
-					path: '/',
-					...sessionCookie.attributes,
-				});
-			}
-
-			event.locals.user = user;
-			event.locals.session = session;
-
-			return resolve(event);
-		};`;
-}
-function getCallExpression(ast) {
-  let callExpression;
-  walk$1.walk(ast, {}, {
-    CallExpression(node) {
-      callExpression ?? (callExpression = node);
-    }
-  });
-  return callExpression;
-}
-
-var mdsvex = defineAdder({
-  id: "mdsvex",
-  name: "mdsvex",
-  description: "svelte in markdown",
-  environments: { svelte: true, kit: true },
-  documentation: "https://mdsvex.pngwn.io/docs",
-  options: {},
-  packages: [{ name: "mdsvex", version: "^0.11.2", dev: true }],
-  files: [
-    {
-      name: () => "svelte.config.js",
-      content: ({ content }) => {
-        const { ast, generateCode } = parseScript(content);
-        imports.addNamed(ast, "mdsvex", { mdsvex: "mdsvex" });
-        const { value: exportDefault } = exports.defaultExport(ast, object.createEmpty());
-        let preprocessorArray = object.property(exportDefault, "preprocess", array.createEmpty());
-        const isArray = preprocessorArray.type === "ArrayExpression";
-        if (!isArray) {
-          const previousElement = preprocessorArray;
-          preprocessorArray = array.createEmpty();
-          array.push(preprocessorArray, previousElement);
-          object.overrideProperty(exportDefault, "preprocess", preprocessorArray);
-        }
-        const mdsvexCall = _function.call("mdsvex", []);
-        array.push(preprocessorArray, mdsvexCall);
-        const extensionsArray = object.property(exportDefault, "extensions", array.createEmpty());
-        array.push(extensionsArray, ".svelte");
-        array.push(extensionsArray, ".svx");
-        return generateCode();
-      }
-    }
-  ]
-});
-
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -50897,6 +50159,637 @@ class MagicString {
 	}
 }
 
+var __freeze = Object.freeze;
+var __defProp = Object.defineProperty;
+var __template = (cooked, raw) => __freeze(__defProp(cooked, "raw", { value: __freeze(cooked.slice()) }));
+var _a, _b;
+const TABLE_TYPE = {
+  mysql: "mysqlTable",
+  postgresql: "pgTable",
+  sqlite: "sqliteTable"
+};
+let drizzleDialect;
+let schemaPath;
+const options$2 = defineAdderOptions({
+  demo: {
+    type: "boolean",
+    default: true,
+    question: `Do you want to include a demo? ${picocolors.dim("(includes a login/register page)")}`
+  }
+});
+var lucia = defineAdder({
+  id: "lucia",
+  environments: { svelte: false, kit: true },
+  homepage: "https://lucia-next.pages.dev",
+  options: options$2,
+  packages: [
+    { name: "@oslojs/crypto", version: "^1.0.1", dev: false },
+    { name: "@oslojs/encoding", version: "^1.1.0", dev: false },
+    // password hashing for demo
+    {
+      name: "@node-rs/argon2",
+      version: "^1.1.0",
+      condition: ({ options: options2 }) => options2.demo,
+      dev: false
+    }
+  ],
+  dependsOn: ["drizzle"],
+  files: [
+    {
+      name: ({ typescript }) => `drizzle.config.${typescript ? "ts" : "js"}`,
+      content: ({ content }) => {
+        const { ast, generateCode } = parseScript(content);
+        const isProp = (name, node) => node.key.type === "Identifier" && node.key.name === name;
+        walk$1.walk(ast, {}, {
+          ObjectProperty(node) {
+            if (isProp("dialect", node) && node.value.type === "StringLiteral") {
+              drizzleDialect = node.value.value;
+            }
+            if (isProp("schema", node) && node.value.type === "StringLiteral") {
+              schemaPath = node.value.value;
+            }
+          }
+        });
+        if (!drizzleDialect) {
+          throw new Error("Failed to detect DB dialect in your `drizzle.config.[js|ts]` file");
+        }
+        if (!schemaPath) {
+          throw new Error("Failed to find schema path in your `drizzle.config.[js|ts]` file");
+        }
+        return generateCode();
+      }
+    },
+    {
+      name: () => schemaPath,
+      content: ({ content, options: options2, typescript }) => {
+        const { ast, generateCode } = parseScript(content);
+        const createTable = (name) => _function.call(TABLE_TYPE[drizzleDialect], [name]);
+        const userDecl = variables.declaration(ast, "const", "user", createTable("user"));
+        const sessionDecl = variables.declaration(ast, "const", "session", createTable("session"));
+        const user = exports.namedExport(ast, "user", userDecl);
+        const session = exports.namedExport(ast, "session", sessionDecl);
+        const userTable = getCallExpression(user);
+        const sessionTable = getCallExpression(session);
+        if (!userTable || !sessionTable) {
+          throw new Error("failed to find call expression of `user` or `session`");
+        }
+        if (userTable.arguments.length === 1) {
+          userTable.arguments.push(object.createEmpty());
+        }
+        if (sessionTable.arguments.length === 1) {
+          sessionTable.arguments.push(object.createEmpty());
+        }
+        const userAttributes = userTable.arguments[1];
+        const sessionAttributes = sessionTable.arguments[1];
+        if (userAttributes?.type !== "ObjectExpression" || sessionAttributes?.type !== "ObjectExpression") {
+          throw new Error("unexpected shape of `user` or `session` table definition");
+        }
+        if (drizzleDialect === "sqlite") {
+          imports.addNamed(ast, "drizzle-orm/sqlite-core", {
+            sqliteTable: "sqliteTable",
+            text: "text",
+            integer: "integer"
+          });
+          object.overrideProperties(userAttributes, {
+            id: common.expressionFromString(`text('id').primaryKey()`)
+          });
+          if (options2.demo) {
+            object.overrideProperties(userAttributes, {
+              username: common.expressionFromString(`text('username').notNull().unique()`),
+              passwordHash: common.expressionFromString(`text('password_hash').notNull()`)
+            });
+          }
+          object.overrideProperties(sessionAttributes, {
+            id: common.expressionFromString(`text('id').primaryKey()`),
+            userId: common.expressionFromString(
+              `text('user_id').notNull().references(() => user.id)`
+            ),
+            expiresAt: common.expressionFromString(
+              `integer('expires_at', { mode: 'timestamp' }).notNull()`
+            )
+          });
+        }
+        if (drizzleDialect === "mysql") {
+          imports.addNamed(ast, "drizzle-orm/mysql-core", {
+            mysqlTable: "mysqlTable",
+            varchar: "varchar",
+            datetime: "datetime"
+          });
+          object.overrideProperties(userAttributes, {
+            id: common.expressionFromString(`varchar('id', { length: 255 }).primaryKey()`)
+          });
+          if (options2.demo) {
+            object.overrideProperties(userAttributes, {
+              username: common.expressionFromString(
+                `varchar('username', { length: 32 }).notNull().unique()`
+              ),
+              passwordHash: common.expressionFromString(
+                `varchar('password_hash', { length: 255 }).notNull()`
+              )
+            });
+          }
+          object.overrideProperties(sessionAttributes, {
+            id: common.expressionFromString(`varchar('id', { length: 255 }).primaryKey()`),
+            userId: common.expressionFromString(
+              `varchar('user_id', { length: 255 }).notNull().references(() => user.id)`
+            ),
+            expiresAt: common.expressionFromString(`datetime('expires_at').notNull()`)
+          });
+        }
+        if (drizzleDialect === "postgresql") {
+          imports.addNamed(ast, "drizzle-orm/pg-core", {
+            pgTable: "pgTable",
+            text: "text",
+            timestamp: "timestamp"
+          });
+          object.overrideProperties(userAttributes, {
+            id: common.expressionFromString(`text('id').primaryKey()`)
+          });
+          if (options2.demo) {
+            object.overrideProperties(userAttributes, {
+              username: common.expressionFromString(`text('username').notNull().unique()`),
+              passwordHash: common.expressionFromString(`text('password_hash').notNull()`)
+            });
+          }
+          object.overrideProperties(sessionAttributes, {
+            id: common.expressionFromString(`text('id').primaryKey()`),
+            userId: common.expressionFromString(
+              `text('user_id').notNull().references(() => user.id)`
+            ),
+            expiresAt: common.expressionFromString(
+              `timestamp('expires_at', { withTimezone: true, mode: 'date' }).notNull()`
+            )
+          });
+        }
+        let code = generateCode();
+        if (typescript) {
+          if (!code.includes("export type Session =")) {
+            code += "\n\nexport type Session = typeof session.$inferSelect;";
+          }
+          if (!code.includes("export type User =")) {
+            code += "\n\nexport type User = typeof user.$inferSelect;";
+          }
+        }
+        return code;
+      }
+    },
+    {
+      name: ({ kit: kit2, typescript }) => `${kit2?.libDirectory}/server/auth.${typescript ? "ts" : "js"}`,
+      content: ({ content, typescript }) => {
+        const { ast, generateCode } = parseScript(content);
+        imports.addNamespace(ast, "$lib/server/db/schema", "table");
+        imports.addNamed(ast, "$lib/server/db", { db: "db" });
+        imports.addNamed(ast, "@oslojs/encoding", {
+          encodeBase32LowerCaseNoPadding: "encodeBase32LowerCaseNoPadding",
+          encodeHexLowerCase: "encodeHexLowerCase"
+        });
+        imports.addNamed(ast, "@oslojs/crypto/sha2", { sha256: "sha256" });
+        imports.addNamed(ast, "drizzle-orm", { eq: "eq" });
+        const ms = new MagicString(generateCode().trim());
+        const [ts] = utils.createPrinter(typescript);
+        if (!ms.original.includes("const DAY_IN_MS")) {
+          ms.append("\n\nconst DAY_IN_MS = 1000 * 60 * 60 * 24;");
+        }
+        if (!ms.original.includes("export const sessionCookieName")) {
+          ms.append("\n\nexport const sessionCookieName = 'auth-session';");
+        }
+        if (!ms.original.includes("function generateSessionToken")) {
+          const generateSessionToken = dedent`					
+						${ts("", "/** @returns {string} */")}
+						function generateSessionToken()${ts(": string")} {
+							const bytes = crypto.getRandomValues(new Uint8Array(20));
+							const token = encodeBase32LowerCaseNoPadding(bytes);
+							return token;
+						}`;
+          ms.append(`
+
+${generateSessionToken}`);
+        }
+        if (!ms.original.includes("async function createSession")) {
+          const createSession = dedent`					
+						${ts("", "/** @param {string} userId */")}
+						export async function createSession(userId${ts(": string")})${ts(": Promise<table.Session>")} {
+							const token = generateSessionToken();
+							const sessionId = encodeHexLowerCase(sha256(new TextEncoder().encode(token)));
+							const session${ts(": table.Session")} = {
+								id: sessionId,
+								userId,
+								expiresAt: new Date(Date.now() + DAY_IN_MS * 30)
+							};
+							await db.insert(table.session).values(session);
+							return session;
+						}`;
+          ms.append(`
+
+${createSession}`);
+        }
+        if (!ms.original.includes("async function invalidateSession")) {
+          const invalidateSession = dedent`					
+						${ts("", "/**")}
+						${ts("", " * @param {string} sessionId")}
+						${ts("", " * @returns {Promise<void>}")}
+						${ts("", " */")}
+						export async function invalidateSession(sessionId${ts(": string")})${ts(": Promise<void>")} {
+							await db.delete(table.session).where(eq(table.session.id, sessionId));
+						}`;
+          ms.append(`
+
+${invalidateSession}`);
+        }
+        if (!ms.original.includes("async function validateSession")) {
+          const validateSession = dedent`					
+						${ts("", "/** @param {string} sessionId */")}
+						export async function validateSession(sessionId${ts(": string")}) {
+							const [result] = await db
+								.select({
+									// Adjust user table here to tweak returned data
+									user: { id: table.user.id, username: table.user.username },
+									session: table.session
+								})
+								.from(table.session)
+								.innerJoin(table.user, eq(table.session.userId, table.user.id))
+								.where(eq(table.session.id, sessionId));
+	
+							if (!result) {
+								return { session: null, user: null };
+							}
+							const { session, user } = result;
+	
+							const sessionExpired = Date.now() >= session.expiresAt.getTime();
+							if (sessionExpired) {
+								await db.delete(table.session).where(eq(table.session.id, session.id));
+								return { session: null, user: null };
+							}
+	
+							const renewSession = Date.now() >= session.expiresAt.getTime() - DAY_IN_MS * 15;
+							if (renewSession) {
+								session.expiresAt = new Date(Date.now() + DAY_IN_MS * 30);
+								await db
+									.update(table.session)
+									.set({ expiresAt: session.expiresAt })
+									.where(eq(table.session.id, session.id));
+							}
+	
+							return { session, user };
+						}`;
+          ms.append(`
+
+${validateSession}`);
+        }
+        if (typescript && !ms.original.includes("export type SessionValidationResult")) {
+          const sessionType = "export type SessionValidationResult = Awaited<ReturnType<typeof validateSession>>;";
+          ms.append(`
+
+${sessionType}`);
+        }
+        return ms.toString();
+      }
+    },
+    {
+      name: () => "src/app.d.ts",
+      condition: ({ typescript }) => typescript,
+      content: ({ content }) => {
+        const { ast, generateCode } = parseScript(content);
+        const locals = kit.addGlobalAppInterface(ast, "Locals");
+        if (!locals) {
+          throw new Error("Failed detecting `locals` interface in `src/app.d.ts`");
+        }
+        const user = locals.body.body.find((prop) => common.hasTypeProp("user", prop));
+        const session = locals.body.body.find((prop) => common.hasTypeProp("session", prop));
+        if (!user) {
+          locals.body.body.push(createLuciaType("user"));
+        }
+        if (!session) {
+          locals.body.body.push(createLuciaType("session"));
+        }
+        return generateCode();
+      }
+    },
+    {
+      name: ({ typescript }) => `src/hooks.server.${typescript ? "ts" : "js"}`,
+      content: ({ content, typescript }) => {
+        const { ast, generateCode } = parseScript(content);
+        imports.addNamespace(ast, "$lib/server/auth.js", "auth");
+        imports.addNamed(ast, "$app/environment", { dev: "dev" });
+        kit.addHooksHandle(ast, typescript, "handleAuth", getAuthHandleContent());
+        return generateCode();
+      }
+    },
+    // DEMO
+    // login/register
+    {
+      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/login/+page.server.${typescript ? "ts" : "js"}`,
+      condition: ({ options: options2 }) => options2.demo,
+      content({ content, typescript, kit: kit2 }) {
+        if (content) {
+          const filePath = `${kit2.routesDirectory}/demo/login/+page.server.${typescript ? "ts" : "js"}`;
+          log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
+          return content;
+        }
+        const [ts] = utils.createPrinter(typescript);
+        return dedent`
+					import { hash, verify } from '@node-rs/argon2';
+					import { generateRandomString } from '@oslojs/crypto/random';
+					import { fail, redirect } from '@sveltejs/kit';
+					import { eq } from 'drizzle-orm';
+					import { dev } from '$app/environment';
+					import * as auth from '$lib/server/auth';
+					import { db } from '$lib/server/db';
+					import * as table from '$lib/server/db/schema';
+					${ts(`import type { Actions, PageServerLoad } from './$types';
+`)}
+					export const load${ts(": PageServerLoad")} = async (event) => {
+						if (event.locals.user) {
+							return redirect(302, '/demo');
+						}
+						return {};
+					};
+
+					export const actions${ts(": Actions")} = {
+						login: async (event) => {
+							const formData = await event.request.formData();
+							const username = formData.get('username');
+							const password = formData.get('password');
+
+							if (!validateUsername(username)) {
+								return fail(400, { message: 'Invalid username' });
+							}
+							if (!validatePassword(password)) {
+								return fail(400, { message: 'Invalid password' });
+							}
+
+							const results = await db
+								.select()
+								.from(table.user)
+								.where(eq(table.user.username, username));
+
+							const existingUser = results.at(0);
+							if (!existingUser) {
+								return fail(400, { message: 'Incorrect username or password' });
+							}
+
+							const validPassword = await verify(existingUser.passwordHash, password, {
+								memoryCost: 19456,
+								timeCost: 2,
+								outputLen: 32,
+								parallelism: 1,
+							});
+							if (!validPassword) {
+								return fail(400, { message: 'Incorrect username or password' });
+							}
+
+							const session = await auth.createSession(existingUser.id);
+							event.cookies.set(auth.sessionCookieName, session.id, {
+								path: '/',
+								sameSite: 'lax',
+								httpOnly: true,
+								expires: session.expiresAt,
+								secure: !dev
+							});
+
+							return redirect(302, '/demo');
+						},
+						register: async (event) => {
+							const formData = await event.request.formData();
+							const username = formData.get('username');
+							const password = formData.get('password');
+
+							if (!validateUsername(username)) {
+								return fail(400, { message: 'Invalid username' });
+							}
+							if (!validatePassword(password)) {
+								return fail(400, { message: 'Invalid password' });
+							}
+
+							const userId = generateUserId();
+							const passwordHash = await hash(password, {
+								// recommended minimum parameters
+								memoryCost: 19456,
+								timeCost: 2,
+								outputLen: 32,
+								parallelism: 1,
+							});
+
+							try {
+								await db.insert(table.user).values({ id: userId, username, passwordHash });
+
+								const session = await auth.createSession(userId);
+								event.cookies.set(auth.sessionCookieName, session.id, {
+									path: '/',
+									sameSite: 'lax',
+									httpOnly: true,
+									expires: session.expiresAt,
+									secure: !dev
+								});
+							} catch (e) {
+								return fail(500, { message: 'An error has occurred' });
+							}
+							return redirect(302, '/demo');
+						},
+					};
+
+					const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_';
+
+					function generateUserId(length = 21)${ts(": string")} {
+						return generateRandomString({ read: (bytes) => crypto.getRandomValues(bytes) }, alphabet, length);
+					}
+
+					function validateUsername(username${ts(": unknown")})${ts(": username is string")} {
+						return (
+							typeof username === 'string' &&
+							username.length >= 3 &&
+							username.length <= 31 &&
+							/^[a-z0-9_-]+$/.test(username)
+						);
+					}
+
+					function validatePassword(password${ts(": unknown")})${ts(": password is string")} {
+						return (
+							typeof password === 'string' &&
+							password.length >= 6 &&
+							password.length <= 255
+						);
+					}
+				`;
+      }
+    },
+    {
+      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/login/+page.svelte`,
+      condition: ({ options: options2 }) => options2.demo,
+      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 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
+    {
+      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/+page.server.${typescript ? "ts" : "js"}`,
+      condition: ({ options: options2 }) => options2.demo,
+      content({ content, typescript, kit: kit2 }) {
+        if (content) {
+          const filePath = `${kit2.routesDirectory}/demo/+page.server.${typescript ? "ts" : "js"}`;
+          log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
+          return content;
+        }
+        const [ts] = utils.createPrinter(typescript);
+        return dedent`
+					import * as auth from '$lib/server/auth';
+					import { fail, redirect } from '@sveltejs/kit';
+					${ts(`import type { Actions, PageServerLoad } from './$types';
+`)}
+					export const load${ts(": PageServerLoad")} = async (event) => {
+						if (!event.locals.user) {
+							return redirect(302, '/demo/login');
+						}
+						return { user: event.locals.user };
+					};
+
+					export const actions${ts(": Actions")} = {
+						logout: async (event) => {
+							if (!event.locals.session) {
+								return fail(401);
+							}
+							await auth.invalidateSession(event.locals.session.id);
+							event.cookies.delete(auth.sessionCookieName, { path: '/' });
+
+							return redirect(302, '/demo/login');
+						},
+					};
+				`;
+      }
+    },
+    {
+      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/+page.svelte`,
+      condition: ({ options: options2 }) => options2.demo,
+      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 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")};`));
+      }
+    }
+  ],
+  nextSteps: ({ highlighter, options: options2 }) => {
+    const steps = [`Run ${highlighter.command("npm run db:push")} to update your database schema`];
+    if (options2.demo) {
+      steps.push(`Visit ${highlighter.route("/demo")} route to view the demo`);
+    }
+    return steps;
+  }
+});
+function createLuciaType(name) {
+  return {
+    type: "TSPropertySignature",
+    key: {
+      type: "Identifier",
+      name
+    },
+    typeAnnotation: {
+      type: "TSTypeAnnotation",
+      typeAnnotation: {
+        type: "TSIndexedAccessType",
+        objectType: {
+          type: "TSImportType",
+          argument: { type: "StringLiteral", value: "$lib/server/auth" },
+          qualifier: {
+            type: "Identifier",
+            name: "SessionValidationResult"
+          }
+        },
+        indexType: {
+          type: "TSLiteralType",
+          literal: {
+            type: "StringLiteral",
+            value: name
+          }
+        }
+      }
+    }
+  };
+}
+function getAuthHandleContent() {
+  return `
+		async ({ event, resolve }) => {
+			const sessionId = event.cookies.get(auth.sessionCookieName);
+			if (!sessionId) {
+				event.locals.user = null;
+				event.locals.session = null;
+				return resolve(event);
+			}
+
+			const { session, user } = await auth.validateSession(sessionId);
+			if (session) {
+				event.cookies.set(auth.sessionCookieName, session.id, {
+					path: '/',
+					sameSite: 'lax',
+					httpOnly: true,
+					expires: session.expiresAt,
+					secure: !dev
+				});
+			} else {
+				event.cookies.delete(auth.sessionCookieName, { path: '/' });
+			}
+
+			event.locals.user = user;
+			event.locals.session = session;
+
+			return resolve(event);
+		};`;
+}
+function getCallExpression(ast) {
+  let callExpression;
+  walk$1.walk(ast, {}, {
+    CallExpression(node) {
+      callExpression ?? (callExpression = node);
+    }
+  });
+  return callExpression;
+}
+
+var mdsvex = defineAdder({
+  id: "mdsvex",
+  environments: { svelte: true, kit: true },
+  homepage: "https://mdsvex.pngwn.io",
+  options: {},
+  packages: [{ name: "mdsvex", version: "^0.11.2", dev: true }],
+  files: [
+    {
+      name: () => "svelte.config.js",
+      content: ({ content }) => {
+        const { ast, generateCode } = parseScript(content);
+        imports.addNamed(ast, "mdsvex", { mdsvex: "mdsvex" });
+        const { value: exportDefault } = exports.defaultExport(ast, object.createEmpty());
+        let preprocessorArray = object.property(exportDefault, "preprocess", array.createEmpty());
+        const isArray = preprocessorArray.type === "ArrayExpression";
+        if (!isArray) {
+          const previousElement = preprocessorArray;
+          preprocessorArray = array.createEmpty();
+          array.push(preprocessorArray, previousElement);
+          object.overrideProperty(exportDefault, "preprocess", preprocessorArray);
+        }
+        const mdsvexCall = _function.call("mdsvex", []);
+        array.push(preprocessorArray, mdsvexCall);
+        const extensionsArray = object.property(exportDefault, "extensions", array.createEmpty());
+        array.push(extensionsArray, ".svelte");
+        array.push(extensionsArray, ".svx");
+        return generateCode();
+      }
+    }
+  ]
+});
+
 function element(tagName, attributes = {}) {
   const element2 = new Element(tagName, {}, void 0, index.Tag);
   element2.attribs = attributes;
@@ -50942,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`;
@@ -50969,10 +50861,8 @@ const options$1 = defineAdderOptions({
 });
 var paraglide = 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",
+  homepage: "https://inlang.com",
   options: options$1,
   packages: [
     {
@@ -51004,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", [])
@@ -51065,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();
       }
     },
@@ -51122,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" });
@@ -51205,10 +51093,8 @@ function parseLanguageTagInput(input) {
 
 var playwright = defineAdder({
   id: "playwright",
-  name: "Playwright",
-  description: "A testing framework for end-to-end testing",
   environments: { svelte: true, kit: true },
-  documentation: "https://playwright.dev",
+  homepage: "https://playwright.dev",
   options: {},
   packages: [{ name: "@playwright/test", version: "^1.45.3", dev: true }],
   files: [
@@ -51277,10 +51163,8 @@ var playwright = defineAdder({
 
 var prettier = defineAdder({
   id: "prettier",
-  name: "Prettier",
-  description: "An opinionated code formatter",
   environments: { svelte: true, kit: true },
-  documentation: "https://prettier.io",
+  homepage: "https://prettier.io",
   options: {},
   packages: [
     { name: "prettier", version: "^3.3.2", dev: true },
@@ -51370,10 +51254,8 @@ function hasEslint(dependencyVersion) {
 
 var routify = defineAdder({
   id: "routify",
-  name: "Routify",
-  description: "The Router that Grows With You",
   environments: { svelte: true, kit: false },
-  documentation: "https://routify.dev",
+  homepage: "https://routify.dev",
   options: {},
   packages: [{ name: "@roxi/routify", version: "next", dev: true }],
   files: [
@@ -51447,10 +51329,8 @@ const routifyDemoHtml = `
 
 var storybook = defineAdder({
   id: "storybook",
-  name: "Storybook",
-  description: "Build UIs without the grunt work",
   environments: { kit: true, svelte: true },
-  documentation: "https://storybook.js.org/docs/get-started",
+  homepage: "https://storybook.js.org",
   options: {},
   packages: [],
   scripts: [
@@ -51489,10 +51369,8 @@ const options = defineAdderOptions({
 var tailwindcss = defineAdder({
   id: "tailwindcss",
   alias: "tailwind",
-  name: "Tailwind CSS",
-  description: "Rapidly build modern websites without ever leaving your HTML",
   environments: { svelte: true, kit: true },
-  documentation: "https://tailwindcss.com/docs",
+  homepage: "https://tailwindcss.com",
   options,
   packages: [
     { name: "tailwindcss", version: "^3.4.9", dev: true },
@@ -51607,10 +51485,8 @@ var tailwindcss = defineAdder({
 
 var vitest = defineAdder({
   id: "vitest",
-  name: "Vitest",
-  description: "A testing framework powered by Vite",
   environments: { svelte: true, kit: true },
-  documentation: "https://vitest.dev",
+  homepage: "https://vitest.dev",
   options: {},
   packages: [{ name: "vitest", version: "^2.0.4", dev: true }],
   files: [
@@ -51685,45 +51561,31 @@ var vitest = defineAdder({
   ]
 });
 
-const categories$1 = {
-  "Code Quality": [prettier, eslint],
-  Testing: [vitest, playwright],
-  CSS: [tailwindcss],
-  Database: [drizzle],
-  Auth: [lucia],
-  "Additional Functionality": [storybook, paraglide, mdsvex, routify]
-};
-const adderCategories = getCategoriesById();
-function getCategoriesById() {
-  const adderCategories2 = {};
-  for (const [key, adders] of Object.entries(categories$1)) {
-    adderCategories2[key] = adders.map((a) => a.id);
-  }
-  return adderCategories2;
-}
-const adderIds = Object.values(adderCategories).flatMap((x) => x);
-const adderDetails$1 = Object.values(categories$1).flat();
-function getAdderDetails(name) {
-  const details = adderDetails$1.find((a) => a.id === name);
+const officialAdders = [
+  prettier,
+  eslint,
+  vitest,
+  playwright,
+  tailwindcss,
+  drizzle,
+  lucia,
+  mdsvex,
+  paraglide,
+  storybook,
+  routify
+];
+function getAdderDetails(id) {
+  const details = officialAdders.find((a) => a.id === id);
   if (!details) {
-    throw new Error(`Invalid adder name: ${name}`);
+    throw new Error(`Invalid adder: ${id}`);
   }
   return details;
 }
 
-const categories = [
-  "Code Quality",
-  "Testing",
-  "CSS",
-  "Database",
-  "Auth",
-  "Additional Functionality"
-];
-
 function __variableDynamicImportRuntime0__(path) {
   switch (path) {
-    case '../../../community-adders/unocss.ts': return import('./unocss-Dk7i15rK.js');
-    case '../../../community-adders/unplugin-icons.ts': return import('./unplugin-icons-DkNLYvBs.js');
+    case '../../../community-adders/unocss.ts': return import('./unocss-BUQS5wKg.js');
+    case '../../../community-adders/unplugin-icons.ts': return import('./unplugin-icons-BietOpsP.js');
     default: return new Promise(function(resolve, reject) {
       (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(
         reject.bind(null, new Error("Unknown variable dynamic import: " + path))
@@ -51853,7 +51715,7 @@ function getGlobalPreconditions(cwd, projectType, adders) {
             return { success: true, message: void 0 };
           }
           const messages = addersForInvalidEnvironment.map(
-            (a) => `"${a.name}" does not support "${projectType}"`
+            (a) => `"${a.id}" does not support "${projectType}"`
           );
           return { success: false, message: messages.join(" / ") };
         }
@@ -55301,7 +55163,7 @@ const AddersSchema = array$1(string());
 const AdderOptionFlagsSchema = object$1({
   tailwindcss: optional(array$1(string())),
   drizzle: optional(array$1(string())),
-  supabase: optional(array$1(string())),
+  lucia: optional(array$1(string())),
   paraglide: optional(array$1(string()))
 });
 const OptionsSchema$1 = strictObject({
@@ -55311,8 +55173,7 @@ const OptionsSchema$1 = strictObject({
   community: optional(union([AddersSchema, boolean()])),
   ...AdderOptionFlagsSchema.entries
 });
-const adderDetails = adderIds.map((id) => getAdderDetails(id));
-const aliases = adderDetails.map((c) => c.alias).filter((v2) => v2 !== void 0);
+const aliases = officialAdders.map((c) => c.alias).filter((v2) => v2 !== void 0);
 const addersOptions = getAdderOptionFlags();
 const communityDetails = [];
 const defaultPkgPath = up();
@@ -55329,14 +55190,17 @@ const add = new Command("add").description("applies specified adders into a proj
     );
     process$1$1.exit(1);
   }
-  const adders = parse$8(AddersSchema, adderArgs);
+  const specifiedAdders = parse$8(AddersSchema, adderArgs);
   const options = parse$8(OptionsSchema$1, opts);
-  const invalidAdders = adders.filter((a) => !adderIds.includes(a) && !aliases.includes(a));
+  const adderIds = officialAdders.map((adder) => adder.id);
+  const invalidAdders = specifiedAdders.filter(
+    (a) => !adderIds.includes(a) && !aliases.includes(a)
+  );
   if (invalidAdders.length > 0) {
     console.error(`Invalid adders specified: ${invalidAdders.join(", ")}`);
     process$1$1.exit(1);
   }
-  const selectedAdders = transformAliases(adders);
+  const selectedAdders = transformAliases(specifiedAdders);
   runCommand(async () => {
     await runAddCommand(options, selectedAdders);
   });
@@ -55344,9 +55208,9 @@ const add = new Command("add").description("applies specified adders into a proj
 for (const option of addersOptions) {
   add.addOption(option);
 }
-async function runAddCommand(options, adders) {
+async function runAddCommand(options, selectedAdderIds) {
   var _a;
-  const selectedAdders = adders.map((id) => ({
+  const selectedAdders = selectedAdderIds.map((id) => ({
     type: "official",
     adder: getAdderDetails(id)
   }));
@@ -55404,23 +55268,17 @@ Available options: ${choices.join(", ")}`
     }
   }
   if (options.community === true) {
-    const promptOptions = {};
     const communityAdders = await Promise.all(
-      communityAdderIds.map(async (id) => ({ id, ...await getCommunityAdder(id) }))
+      communityAdderIds.map(async (id) => await getCommunityAdder(id))
     );
-    const categories2 = new Set(communityAdders.map((adder) => adder.category));
-    for (const category of categories2) {
-      promptOptions[category] = communityAdders.filter((adder) => adder.category === category).map((adder) => ({
-        value: adder.id,
-        label: adder.name,
-        hint: adder.repo
-      }));
-    }
-    const selected = await groupMultiselect({
+    const promptOptions = communityAdders.map((adder) => ({
+      value: adder.id,
+      label: adder.id,
+      hint: "https://www.npmjs.com/package/" + adder.id
+    }));
+    const selected = await multiselect({
       message: "Which community tools would you like to add to your project?",
       options: promptOptions,
-      spacedGroups: true,
-      selectableGroups: false,
       required: false
     });
     if (isCancel(selected)) {
@@ -55433,7 +55291,7 @@ Available options: ${choices.join(", ")}`
     options.community = selected;
   }
   if (Array.isArray(options.community) && options.community.length > 0) {
-    const adders2 = options.community.map((id) => {
+    const adders = options.community.map((id) => {
       const hasDirective = Object.values(Directive).some((directive) => id.startsWith(directive));
       if (hasDirective) return id;
       const validAdder = communityAdderIds.includes(id);
@@ -55449,15 +55307,8 @@ Available options: ${communityAdderIds.join(", ")}`
     try {
       start("Resolving community adder packages");
       const pkgs = await Promise.all(
-        adders2.map(async (id) => {
-          const adder = await getCommunityAdder(id).catch(() => void 0);
-          const packageName = adder?.npm ?? id;
-          const details2 = await getPackageJSON({ cwd: options.cwd, packageName });
-          return {
-            ...details2,
-            // prioritize community adder defined repo urls
-            repo: adder?.repo ?? details2.repo
-          };
+        adders.map(async (id) => {
+          return await getPackageJSON({ cwd: options.cwd, packageName: id });
         })
       );
       stop("Resolved community adder packages");
@@ -55493,30 +55344,20 @@ Available options: ${communityAdderIds.join(", ")}`
     }
   }
   if (selectedAdders.length === 0) {
-    const adderOptions = {};
     const workspace2 = createWorkspace(options.cwd);
     const projectType = workspace2.kit ? "kit" : "svelte";
-    for (const category of categories) {
-      const adderIds2 = adderCategories[category];
-      const categoryOptions = adderIds2.map((id) => {
-        const config = getAdderDetails(id);
-        if (projectType === "kit" && !config.environments.kit) return;
-        if (projectType === "svelte" && !config.environments.svelte) return;
-        return {
-          label: config.name,
-          value: config.id,
-          hint: config.documentation
-        };
-      }).filter((c) => !!c);
-      if (categoryOptions.length > 0) {
-        adderOptions[category] = categoryOptions;
-      }
-    }
-    const selected = await groupMultiselect({
+    const adderOptions = officialAdders.map((adder) => {
+      if (projectType === "kit" && !adder.environments.kit) return;
+      if (projectType === "svelte" && !adder.environments.svelte) return;
+      return {
+        label: adder.id,
+        value: adder.id,
+        hint: adder.homepage
+      };
+    }).filter((a) => !!a);
+    const selected = await multiselect({
       message: "What would you like to add to your project?",
       options: adderOptions,
-      spacedGroups: true,
-      selectableGroups: false,
       required: false
     });
     if (isCancel(selected)) {
@@ -55526,12 +55367,11 @@ Available options: ${communityAdderIds.join(", ")}`
     selected.forEach((id) => selectedAdders.push({ type: "official", adder: getAdderDetails(id) }));
   }
   for (const { adder } of selectedAdders) {
-    const name = adder.name;
     const dependents = adder.dependsOn?.filter((dep) => !selectedAdders.some((a) => a.adder.id === dep)) ?? [];
     const workspace2 = createWorkspace(options.cwd);
     for (const depId of dependents) {
-      const dependent = adderDetails.find((a) => a.id === depId);
-      if (!dependent) throw new Error(`Adder '${name}' depends on an invalid '${depId}'`);
+      const dependent = officialAdders.find((a) => a.id === depId);
+      if (!dependent) throw new Error(`Adder '${adder.id}' depends on an invalid '${depId}'`);
       let installed = false;
       installed = dependent.packages.every(
         // we'll skip the conditions since we don't have any options to supply it
@@ -55539,7 +55379,7 @@ Available options: ${communityAdderIds.join(", ")}`
       );
       if (installed) continue;
       const install = await confirm({
-        message: `The ${pc.bold(pc.cyan(name))} adder requires ${pc.bold(pc.cyan(depId))} to also be installed. ${pc.green("Install it?")}`
+        message: `The ${pc.bold(pc.cyan(adder.id))} adder requires ${pc.bold(pc.cyan(depId))} to also be installed. ${pc.green("Install it?")}`
       });
       if (install !== true) {
         cancel("Operation cancelled.");
@@ -55548,11 +55388,11 @@ Available options: ${communityAdderIds.join(", ")}`
       selectedAdders.push({ type: "official", adder: dependent });
     }
   }
-  if (options.preconditions) {
+  if (options.preconditions && selectedAdders.length > 0) {
     const { kit } = createWorkspace(options.cwd);
     const projectType = kit ? "kit" : "svelte";
-    const adders2 = selectedAdders.map(({ adder }) => adder);
-    const { preconditions } = getGlobalPreconditions(options.cwd, projectType, adders2);
+    const adders = selectedAdders.map(({ adder }) => adder);
+    const { preconditions } = getGlobalPreconditions(options.cwd, projectType, adders);
     const fails = [];
     for (const condition of preconditions) {
       const { message, success } = await condition.run();
@@ -55573,7 +55413,7 @@ Available options: ${communityAdderIds.join(", ")}`
   }
   for (const { adder, type } of selectedAdders) {
     const adderId = adder.id;
-    const questionPrefix = selectedAdders.length > 1 ? `${adder.name}: ` : "";
+    const questionPrefix = selectedAdders.length > 1 ? `${adder.id}: ` : "";
     let values = {};
     if (type === "official") {
       official[adderId] ?? (official[adderId] = {});
@@ -55626,10 +55466,10 @@ Available options: ${communityAdderIds.join(", ")}`
   }
   let filesToFormat = [];
   if (Object.keys({ ...official, ...community }).length > 0) {
-    filesToFormat = await installAdders({ cwd: options.cwd, official, community });
-    log$1.success("Successfully installed adders");
+    filesToFormat = await runAdders({ cwd: options.cwd, official, community });
+    log$1.success("Successfully setup integrations");
   }
-  let depsStatus;
+  let depsStatus = "skipped";
   if (options.install && selectedAdders.length > 0) {
     depsStatus = await suggestInstallingDependencies(options.cwd);
   }
@@ -55649,7 +55489,7 @@ Available options: ${communityAdderIds.join(", ")}`
   const nextStepsMsg = selectedAdders.filter(({ adder }) => adder.nextSteps).map(({ adder }) => {
     let adderMessage = "";
     if (selectedAdders.length > 1) {
-      adderMessage = `${pc.green(adder.name)}:
+      adderMessage = `${pc.green(adder.id)}:
 `;
     }
     const adderNextSteps = adder.nextSteps({
@@ -55662,16 +55502,16 @@ Available options: ${communityAdderIds.join(", ")}`
   }).join("\n\n");
   if (nextStepsMsg) box(nextStepsMsg, "Next steps");
 }
-async function installAdders({
+async function runAdders({
   cwd,
   official = {},
   community = {}
 }) {
-  const adderDetails2 = Object.keys(official).map((id) => getAdderDetails(id));
+  const adderDetails = Object.keys(official).map((id) => getAdderDetails(id));
   const commDetails = Object.keys(community).map(
     (id) => communityDetails.find((a) => a.id === id)
   );
-  const details = adderDetails2.concat(commDetails);
+  const details = adderDetails.concat(commDetails);
   details.sort((a, b) => {
     if (!a.dependsOn) return -1;
     if (!b.dependsOn) return 1;
@@ -55689,11 +55529,13 @@ async function installAdders({
     changedFiles.forEach((file) => filesToFormat.add(file));
     await config.postInstall?.(workspace);
     if (config.scripts && config.scripts.length > 0) {
-      const name = config.name;
-      log$1.step(`Running external command ${pc.gray(`(${name})`)}`);
       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 } });
@@ -55704,7 +55546,6 @@ async function installAdders({
           );
         }
       }
-      log$1.success(`Finished running ${name}`);
     }
   }
   return Array.from(filesToFormat);
@@ -55713,7 +55554,7 @@ function transformAliases(ids) {
   const set = /* @__PURE__ */ new Set();
   for (const id of ids) {
     if (aliases.includes(id)) {
-      const adder = adderDetails.find((a) => a.alias === id);
+      const adder = officialAdders.find((a) => a.alias === id);
       set.add(adder.id);
     } else {
       set.add(id);
@@ -55723,7 +55564,8 @@ function transformAliases(ids) {
 }
 function getAdderOptionFlags() {
   const options = [];
-  for (const id of adderIds) {
+  for (const adder of officialAdders) {
+    const id = adder.id;
     const details = getAdderDetails(id);
     if (Object.values(details.options).length === 0) continue;
     const { defaults, groups } = getOptionChoices(details);
@@ -55838,7 +55680,7 @@ async function createProject(cwd, options) {
         });
       },
       force: async ({ results: { directory: directory2 } }) => {
-        if (fs$3.existsSync(directory2) && fs$3.readdirSync(directory2).length > 0) {
+        if (fs$3.existsSync(directory2) && fs$3.readdirSync(directory2).filter((x) => !x.startsWith(".git")).length > 0) {
           const force = await confirm({
             message: "Directory not empty. Continue?",
             initialValue: false
@@ -55852,8 +55694,8 @@ async function createProject(cwd, options) {
       template: () => {
         if (options.template) return Promise.resolve(options.template);
         return select({
-          message: "Which Svelte app template",
-          initialValue: "skeleton",
+          message: "Which template would you like?",
+          initialValue: "minimal",
           options: templates.map((t) => ({ label: t.title, value: t.name, hint: t.description }))
         });
       },
@@ -55888,10 +55730,11 @@ async function createProject(cwd, options) {
   initSpinner.stop("Project created");
   if (options.adders) {
     await runAddCommand(
-      { cwd: projectPath, install: options.install, preconditions: true, community: [] },
+      { cwd: projectPath, install: false, preconditions: true, community: [] },
       []
     );
-  } else if (options.install) {
+  }
+  if (options.install) {
     await suggestInstallingDependencies(projectPath);
   }
   return {