sv 0.5.3 → 0.5.4

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.3";
+var version = "0.5.4";
 var type = "module";
 var description = "A CLI for creating and updating SvelteKit projects";
 var license = "MIT";
@@ -45201,56 +45201,59 @@ function __extends(d, b) {
   }
   d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 }
+typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+var whitespace = /\s/;
+var number = /-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/;
+function spaces(n) {
+  var result2 = "";
+  while (n--)
+    result2 += " ";
+  return result2;
+}
+function rangeContains(range, index2) {
+  return range.start <= index2 && index2 < range.end;
+}
 function getLocator$2(source, options2) {
   if (options2 === void 0) {
     options2 = {};
   }
-  var offsetLine = options2.offsetLine || 0;
-  var offsetColumn = options2.offsetColumn || 0;
-  var originalLines = source.split("\n");
+  var _a2 = options2.offsetLine, offsetLine = _a2 === void 0 ? 0 : _a2, _b = options2.offsetColumn, offsetColumn = _b === void 0 ? 0 : _b;
   var start = 0;
-  var lineRanges = originalLines.map(function(line, i2) {
+  var ranges = source.split("\n").map(function(line, i2) {
     var end = start + line.length + 1;
     var range = { start, end, line: i2 };
     start = end;
     return range;
   });
   var i = 0;
-  function rangeContains(range, index2) {
-    return range.start <= index2 && index2 < range.end;
-  }
-  function getLocation(range, index2) {
-    return { line: offsetLine + range.line, column: offsetColumn + index2 - range.start, character: index2 };
-  }
-  function locate2(search, startIndex) {
+  function locator(search, index2) {
     if (typeof search === "string") {
-      search = source.indexOf(search, startIndex || 0);
+      search = source.indexOf(search, index2 !== null && index2 !== void 0 ? index2 : 0);
     }
-    var range = lineRanges[i];
+    if (search === -1)
+      return void 0;
+    var range = ranges[i];
     var d = search >= range.end ? 1 : -1;
     while (range) {
-      if (rangeContains(range, search))
-        return getLocation(range, search);
+      if (rangeContains(range, search)) {
+        return {
+          line: offsetLine + range.line,
+          column: offsetColumn + search - range.start,
+          character: search
+        };
+      }
       i += d;
-      range = lineRanges[i];
+      range = ranges[i];
     }
   }
-  return locate2;
+  return locator;
 }
 function locate(source, search, options2) {
-  if (typeof options2 === "number") {
-    throw new Error("locate takes a { startIndex, offsetLine, offsetColumn } object as the third argument");
-  }
   return getLocator$2(source, options2)(search, options2 && options2.startIndex);
 }
-var whitespace = /\s/;
-var number = /-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/;
-function spaces(n) {
-  var result2 = "";
-  while (n--)
-    result2 += " ";
-  return result2;
-}
 function parse(str, opts) {
   var parser2 = new Parser3(str, opts);
   return parser2.value;
@@ -45535,7 +45538,7 @@ function stringifyValue(value, indentation, indentString, newlines) {
       return stringifyValue(element, indentation + indentString, indentString);
     });
     {
-      return "[\n".concat(indentation + indentString) + elements.join(",\n".concat(indentation + indentString)) + "\n".concat(indentation, "]");
+      return "[".concat(indentation + indentString) + elements.join(",".concat(indentation + indentString)) + "".concat(indentation, "]");
     }
   } else if (type === "object") {
     var keys = Object.keys(value);
@@ -50478,11 +50481,11 @@ ${sessionType}`);
     // DEMO
     // login/register
     {
-      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/login/+page.server.${typescript ? "ts" : "js"}`,
+      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/lucia/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"}`;
+          const filePath = `${kit2.routesDirectory}/demo/lucia/login/+page.server.${typescript ? "ts" : "js"}`;
           log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
           return content;
         }
@@ -50500,7 +50503,7 @@ ${sessionType}`);
 `)}
 					export const load${ts(": PageServerLoad")} = async (event) => {
 						if (event.locals.user) {
-							return redirect(302, '/demo');
+							return redirect(302, '/demo/lucia');
 						}
 						return {};
 					};
@@ -50547,7 +50550,7 @@ ${sessionType}`);
 								secure: !dev
 							});
 
-							return redirect(302, '/demo');
+							return redirect(302, '/demo/lucia');
 						},
 						register: async (event) => {
 							const formData = await event.request.formData();
@@ -50584,7 +50587,7 @@ ${sessionType}`);
 							} catch (e) {
 								return fail(500, { message: 'An error has occurred' });
 							}
-							return redirect(302, '/demo');
+							return redirect(302, '/demo/lucia');
 						},
 					};
 
@@ -50614,11 +50617,11 @@ ${sessionType}`);
       }
     },
     {
-      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/login/+page.svelte`,
+      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/lucia/login/+page.svelte`,
       condition: ({ options: options2 }) => options2.demo,
       content({ content, dependencyVersion, typescript, kit: kit2 }) {
         if (content) {
-          const filePath = `${kit2.routesDirectory}/demo/login/+page.svelte`;
+          const filePath = `${kit2.routesDirectory}/demo/lucia/login/+page.svelte`;
           log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
           return content;
         }
@@ -50630,11 +50633,11 @@ ${sessionType}`);
     },
     // logout
     {
-      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/+page.server.${typescript ? "ts" : "js"}`,
+      name: ({ kit: kit2, typescript }) => `${kit2.routesDirectory}/demo/lucia/+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"}`;
+          const filePath = `${kit2.routesDirectory}/demo/lucia/+page.server.${typescript ? "ts" : "js"}`;
           log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
           return content;
         }
@@ -50646,7 +50649,7 @@ ${sessionType}`);
 `)}
 					export const load${ts(": PageServerLoad")} = async (event) => {
 						if (!event.locals.user) {
-							return redirect(302, '/demo/login');
+							return redirect(302, '/demo/lucia/login');
 						}
 						return { user: event.locals.user };
 					};
@@ -50659,18 +50662,18 @@ ${sessionType}`);
 							await auth.invalidateSession(event.locals.session.id);
 							event.cookies.delete(auth.sessionCookieName, { path: '/' });
 
-							return redirect(302, '/demo/login');
+							return redirect(302, '/demo/lucia/login');
 						},
 					};
 				`;
       }
     },
     {
-      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/+page.svelte`,
+      name: ({ kit: kit2 }) => `${kit2.routesDirectory}/demo/lucia/+page.svelte`,
       condition: ({ options: options2 }) => options2.demo,
       content({ content, dependencyVersion, typescript, kit: kit2 }) {
         if (content) {
-          const filePath = `${kit2.routesDirectory}/demo/+page.svelte`;
+          const filePath = `${kit2.routesDirectory}/demo/lucia/+page.svelte`;
           log.warn(`Existing ${picocolors.yellow(filePath)} file. Could not update.`);
           return content;
         }
@@ -50684,7 +50687,7 @@ ${sessionType}`);
   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`);
+      steps.push(`Visit ${highlighter.route("/demo/lucia")} route to view the demo`);
     }
     return steps;
   }
@@ -50835,7 +50838,7 @@ const DEFAULT_INLANG_PROJECT = {
 };
 const options$1 = defineAdderOptions({
   availableLanguageTags: {
-    question: `Which language tags would you like to support? ${picocolors.gray("(e.g. en,de-ch)")}`,
+    question: `Which languages would you like to support? ${picocolors.gray("(e.g. en,de-ch)")}`,
     type: "string",
     default: "en",
     validate(input) {
@@ -50855,7 +50858,7 @@ const options$1 = defineAdderOptions({
   },
   demo: {
     type: "boolean",
-    default: false,
+    default: true,
     question: "Do you want to include a demo?"
   }
 });
@@ -51007,7 +51010,7 @@ var paraglide = defineAdder({
     },
     {
       // add usage example
-      name: ({ kit: kit2 }) => `${kit2?.routesDirectory}/+page.svelte`,
+      name: ({ kit: kit2 }) => `${kit2?.routesDirectory}/demo/paraglide/+page.svelte`,
       condition: ({ options: options2 }) => options2.demo,
       content({ content, options: options2, typescript }) {
         const { script, template, generateCode } = parseSvelte(content, { typescript });
@@ -51066,10 +51069,16 @@ ${links}
       fs$3.writeFileSync(fullFilePath, JSON.stringify(jsonData, null, 2) + "\n");
     }
   },
-  nextSteps: ({ highlighter }) => [
-    `Edit your messages in ${highlighter.path("messages/en.json")}`,
-    "Consider installing the Sherlock IDE Extension"
-  ]
+  nextSteps: ({ highlighter }) => {
+    const steps = [
+      `Edit your messages in ${highlighter.path("messages/en.json")}`,
+      "Consider installing the Sherlock IDE Extension"
+    ];
+    if (options$1.demo) {
+      steps.push(`Visit ${highlighter.route("/demo/paraglide")} route to view the demo`);
+    }
+    return steps;
+  }
 });
 const isValidLanguageTag = (languageTag) => (
   // Regex vendored in from https://github.com/opral/monorepo/blob/94c2298cc1da5378b908e4c160b0fa71a45caadb/inlang/source-code/versioned-interfaces/language-tag/src/interface.ts#L16
@@ -51358,11 +51367,43 @@ function addImports(ast, imports) {
   return nodes;
 }
 
+const plugins = [
+  {
+    id: "typography",
+    package: "@tailwindcss/typography",
+    version: "^0.5.15",
+    identifier: "typography"
+  },
+  {
+    id: "forms",
+    package: "@tailwindcss/forms",
+    version: "^0.5.9",
+    identifier: "forms"
+  },
+  {
+    id: "container-queries",
+    package: "@tailwindcss/container-queries",
+    version: "^0.1.1",
+    identifier: "containerQueries"
+  },
+  {
+    id: "aspect-ratio",
+    package: "@tailwindcss/aspect-ratio",
+    version: "^0.4.2",
+    identifier: "aspectRatio"
+  }
+];
+const pluginPackages = plugins.map((x) => ({
+  name: x.package,
+  version: x.version,
+  dev: true,
+  condition: ({ options: options2 }) => options2.plugins.includes(x.id)
+}));
 const options = defineAdderOptions({
   plugins: {
     type: "multiselect",
     question: "Which plugins would you like to add?",
-    options: [{ value: "typography", label: "Typography" }],
+    options: plugins.map((p) => ({ value: p.id, label: p.id, hint: p.package })),
     default: []
   }
 });
@@ -51375,18 +51416,13 @@ var tailwindcss = defineAdder({
   packages: [
     { name: "tailwindcss", version: "^3.4.9", dev: true },
     { name: "autoprefixer", version: "^10.4.20", dev: true },
-    {
-      name: "@tailwindcss/typography",
-      version: "^0.5.14",
-      dev: true,
-      condition: ({ options: options2 }) => options2.plugins.includes("typography")
-    },
     {
       name: "prettier-plugin-tailwindcss",
       version: "^0.6.5",
       dev: true,
       condition: ({ dependencyVersion }) => Boolean(dependencyVersion("prettier"))
-    }
+    },
+    ...pluginPackages
   ],
   files: [
     {
@@ -51399,17 +51435,23 @@ var tailwindcss = defineAdder({
           imports.addNamed(ast, "tailwindcss", { Config: "Config" }, true);
           root = common.typeAnnotateExpression(rootExport, "Config");
         }
-        const { astNode: exportDeclaration } = exports.defaultExport(ast, root ?? rootExport);
-        if (!typescript)
+        const { astNode: exportDeclaration, value: node } = exports.defaultExport(
+          ast,
+          root ?? rootExport
+        );
+        const config = node.type === "TSAsExpression" ? node.expression : node;
+        if (!typescript) {
           common.addJsDocTypeComment(exportDeclaration, "import('tailwindcss').Config");
-        const contentArray = object.property(rootExport, "content", array.createEmpty());
+        }
+        const contentArray = object.property(config, "content", array.createEmpty());
         array.push(contentArray, "./src/**/*.{html,js,svelte,ts}");
-        const themeObject = object.property(rootExport, "theme", object.createEmpty());
+        const themeObject = object.property(config, "theme", object.createEmpty());
         object.property(themeObject, "extend", object.createEmpty());
-        const pluginsArray = object.property(rootExport, "plugins", array.createEmpty());
-        if (options2.plugins.includes("typography")) {
-          const requireCall = _function.call("require", ["@tailwindcss/typography"]);
-          array.push(pluginsArray, requireCall);
+        const pluginsArray = object.property(config, "plugins", array.createEmpty());
+        for (const plugin of plugins) {
+          if (!options2.plugins.includes(plugin.id)) continue;
+          imports.addDefault(ast, plugin.package, plugin.identifier);
+          array.push(pluginsArray, { type: "Identifier", name: plugin.identifier });
         }
         return generateCode();
       }
@@ -51474,8 +51516,8 @@ var tailwindcss = defineAdder({
         const { data, generateCode } = parseJson(content);
         const PLUGIN_NAME = "prettier-plugin-tailwindcss";
         data.plugins ?? (data.plugins = []);
-        const plugins = data.plugins;
-        if (!plugins.includes(PLUGIN_NAME)) plugins.push(PLUGIN_NAME);
+        const plugins2 = data.plugins;
+        if (!plugins2.includes(PLUGIN_NAME)) plugins2.push(PLUGIN_NAME);
         return generateCode();
       },
       condition: ({ dependencyVersion }) => Boolean(dependencyVersion("prettier"))
@@ -51711,13 +51753,17 @@ function getGlobalPreconditions(cwd, projectType, adders) {
             if (projectType === "svelte" && !supportedEnvironments.svelte) return true;
             return false;
           });
-          if (addersForInvalidEnvironment.length == 0) {
+          if (addersForInvalidEnvironment.length === 0) {
             return { success: true, message: void 0 };
           }
-          const messages = addersForInvalidEnvironment.map(
-            (a) => `"${a.id}" does not support "${projectType}"`
-          );
-          return { success: false, message: messages.join(" / ") };
+          const messages = addersForInvalidEnvironment.map((a) => {
+            if (projectType === "kit") {
+              return `'${a.id}' does not support SvelteKit`;
+            } else {
+              return `'${a.id}' requires SvelteKit`;
+            }
+          });
+          throw new Error(messages.join("\n"));
         }
       }
     ]
@@ -55178,7 +55224,7 @@ const addersOptions = getAdderOptionFlags();
 const communityDetails = [];
 const defaultPkgPath = up();
 const defaultCwd = defaultPkgPath ? path$3.dirname(defaultPkgPath) : void 0;
-const add = new Command("add").description("applies specified adders into a project").argument("[adder...]", "adders to install").option("-C, --cwd <path>", "path to working directory", defaultCwd).option("--no-install", "skips installing dependencies").option("--no-preconditions", "skips validating preconditions").configureHelp(helpConfig).action((adderArgs, opts) => {
+const add = new Command("add").description("applies specified integrations into a project").argument("[integration...]", "integrations to install").option("-C, --cwd <path>", "path to working directory", defaultCwd).option("--no-install", "skips installing dependencies").option("--no-preconditions", "skips validating preconditions").configureHelp(helpConfig).action((adderArgs, opts) => {
   if (opts.cwd === void 0) {
     console.error(
       "Invalid workspace: Please verify that you are inside of a Svelte project. You can also specify the working directory with `--cwd <path>`"
@@ -55379,7 +55425,7 @@ Available options: ${communityAdderIds.join(", ")}`
       );
       if (installed) continue;
       const install = await confirm({
-        message: `The ${pc.bold(pc.cyan(adder.id))} adder requires ${pc.bold(pc.cyan(depId))} to also be installed. ${pc.green("Install it?")}`
+        message: `The ${pc.bold(pc.cyan(adder.id))} integration requires ${pc.bold(pc.cyan(depId))} to also be setup. ${pc.green("Include it?")}`
       });
       if (install !== true) {
         cancel("Operation cancelled.");
@@ -55573,7 +55619,7 @@ function getAdderOptionFlags() {
     const preset = defaults.join(", ") || "none";
     const option = new Option(
       `--${id} [options...]`,
-      `${id} adder options ${pc.dim(`(preset: ${preset})`)}
+      `${id} integration options ${pc.dim(`(preset: ${preset})`)}
 ${choices}`
     ).preset(preset).argParser((value, prev) => {
       prev ?? (prev = []);
@@ -55634,11 +55680,11 @@ const templateOption = new Option("--template <type>", "template to scaffold").c
 const ProjectPathSchema = string();
 const OptionsSchema = strictObject({
   checkTypes: optional(picklist(langs)),
-  adders: boolean(),
+  integrations: boolean(),
   install: boolean(),
   template: optional(picklist(templateChoices))
 });
-const create = new Command("create").description("scaffolds a new SvelteKit project").argument("[path]", "where the project will be created", process$1$1.cwd()).addOption(langOption).addOption(templateOption).option("--no-adders", "skips interactive adder installer").option("--no-install", "skips installing dependencies").configureHelp(helpConfig).action((projectPath, opts) => {
+const create = new Command("create").description("scaffolds a new SvelteKit project").argument("[path]", "where the project will be created", process$1$1.cwd()).addOption(langOption).addOption(templateOption).option("--no-integrations", "skips interactive integration installer").option("--no-install", "skips installing dependencies").configureHelp(helpConfig).action((projectPath, opts) => {
   const cwd = parse$8(ProjectPathSchema, projectPath);
   const options = parse$8(OptionsSchema, opts);
   runCommand(async () => {
@@ -55728,7 +55774,7 @@ async function createProject(cwd, options) {
     types: language
   });
   initSpinner.stop("Project created");
-  if (options.adders) {
+  if (options.integrations) {
     await runAddCommand(
       { cwd: projectPath, install: false, preconditions: true, community: [] },
       []