svelte-realtime 0.4.0 → 0.4.2

package/cli-utils.js

@@ -0,0 +1,77 @@
+// @ts-check
+
+const VALID_NAME_RE = /^[a-zA-Z0-9_-]+$/;
+const VALID_TEMPLATES = ['minimal', 'example', 'demo'];
+
+/**
+ * @param {string} [ua]
+ * @returns {'npm' | 'pnpm' | 'yarn' | 'bun'}
+ */
+export function detectAgent(ua) {
+	const agent = ua ?? '';
+	if (agent.startsWith('pnpm')) return 'pnpm';
+	if (agent.startsWith('yarn')) return 'yarn';
+	if (agent.startsWith('bun')) return 'bun';
+	return 'npm';
+}
+
+/**
+ * Parse and validate CLI arguments. Returns an object or an error string.
+ * Parses in one pass so that flag values (e.g. --template minimal) are consumed
+ * and not mistaken for positional args.
+ * @param {string[]} argv - arguments (without node/script prefix)
+ * @param {{ dirExists?: (name: string) => boolean }} [opts]
+ * @returns {{ help: true } | { error: string } | { name?: string, template?: string }}
+ */
+export function parseArgs(argv, opts) {
+	const positional = [];
+	let template;
+
+	for (let i = 0; i < argv.length; i++) {
+		const arg = argv[i];
+
+		if (arg === '--help' || arg === '-h') {
+			return { help: true };
+		}
+
+		if (arg === '--template') {
+			const next = argv[i + 1];
+			if (next === undefined || next.startsWith('-')) {
+				if (next === '--help' || next === '-h') return { help: true };
+				return { error: '--template requires a value: minimal, example, or demo.' };
+			}
+			template = argv[++i];
+			if (!VALID_TEMPLATES.includes(template)) {
+				return { error: `Unknown template: "${template}". Use minimal, example, or demo.` };
+			}
+			continue;
+		}
+
+		if (arg.startsWith('--template=')) {
+			template = arg.slice('--template='.length);
+			if (!template) {
+				return { error: '--template requires a value: minimal, example, or demo.' };
+			}
+			if (!VALID_TEMPLATES.includes(template)) {
+				return { error: `Unknown template: "${template}". Use minimal, example, or demo.` };
+			}
+			continue;
+		}
+
+		if (arg.startsWith('-')) continue;
+
+		positional.push(arg);
+	}
+
+	const name = positional[0];
+	if (name !== undefined) {
+		if (!VALID_NAME_RE.test(name)) {
+			return { error: `Invalid project name: "${name}". Use only letters, numbers, hyphens, and underscores.` };
+		}
+		if (opts?.dirExists?.(name)) {
+			return { error: `Directory "${name}" already exists.` };
+		}
+	}
+
+	return { name, template };
+}

package/cli.js

@@ -83,33 +83,26 @@ if (p.isCancel(template)) {
 const agent = detectAgent(process.env.npm_config_user_agent);
 
 if (template === 'demo') {
-	const s = p.spinner();
-	s.start('Cloning demo repository');
+	p.log.step('Cloning demo repository');
 	run(`git clone ${DEMO_REPO} "${name}"`);
-	s.stop('Cloned.');
 
-	s.start('Installing dependencies');
+	p.log.step('Installing dependencies');
 	run(`${agent} install`, dest);
-	s.stop('Installed.');
 
 	p.outro(`Done. cd ${name} && ${agent} run dev`);
 	process.exit(0);
 }
 
-const s = p.spinner();
+p.log.step('Creating SvelteKit project');
+run(`npx -y sv create "${name}" --template minimal --types ts --no-add-ons --no-install`);
 
-s.start('Creating SvelteKit project');
-run(`npx -y sv create "${name}" --template minimal --types ts`);
-s.stop('Project created.');
-
-s.start('Installing dependencies');
+p.log.step('Installing dependencies');
 const add = agent === 'npm' ? 'install' : 'add';
 run(`${agent} ${add} svelte-adapter-uws svelte-realtime`, dest);
 run(`${agent} ${add} uNetworking/uWebSockets.js#v20.60.0`, dest);
 run(`${agent} ${add} -D ws`, dest);
-s.stop('Dependencies installed.');
 
-s.start('Configuring svelte-realtime');
+p.log.step('Configuring svelte-realtime');
 
 writeFileSync(
 	join(dest, 'svelte.config.js'),
@@ -189,17 +182,22 @@ export const counter = live.stream('count', () => {
 	);
 }
 
-s.stop('Configured.');
+p.log.success('Configured.');
 
 p.outro(`Done. cd ${name} && ${agent} run dev`);
 
 // ---------------------------------------------------------------------------
 
+/** @param {string} cmd @param {string} [cwd] */
 function run(cmd, cwd) {
 	try {
-		execSync(cmd, { cwd, stdio: 'pipe' });
+		execSync(cmd, {
+			cwd,
+			stdio: 'inherit',
+			env: { ...process.env, NODE_ENV: undefined }
+		});
 	} catch (e) {
-		p.cancel(`Command failed: ${cmd}\n${e.stderr || e.message}`);
+		p.cancel(`Command failed: ${cmd}\n${/** @type {any} */ (e).stderr || /** @type {any} */ (e).message}`);
 		process.exit(1);
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-realtime",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Realtime RPC and reactive subscriptions for SvelteKit, built on svelte-adapter-uws",
   "author": "Kevin Radziszewski",
   "license": "MIT",
@@ -52,6 +52,7 @@
     "devtools.js",
     "devtools.d.ts",
     "cli.js",
+    "cli-utils.js",
     "LICENSE",
     "README.md"
   ],