create-kosh-erp 0.1.1 → 0.1.3

package/README.md

@@ -3,12 +3,14 @@
 Install [Kosh](https://www.npmjs.com/package/kosh-erp) and set it up in one command:
 
 ```sh
-npm create kosh-erp@latest my-erp
+npm create kosh-erp@latest my-erp   # the project my-erp
+npm create kosh-erp@latest          # asks for the project name first
 ```
 
-It creates the folder, installs `kosh-erp` (Shutro comes with it), then asks for:
+It creates the project folder, installs `kosh-erp` (Shutro comes with it), then asks for:
 
-- the PostgreSQL database (your server, or one started in Docker for you; a missing database is created)
+- the PostgreSQL database: your server (username, password, port, host, database name; a missing database is
+  created), or one started in Docker for you
 - the company (name, currency, language, time zone)
 - the administrator (login, name, email, password) and its authenticator app
 - the apps (roles and approvals, reports and documents, chatter and attachments)

package/index.js

@@ -18,15 +18,16 @@ import { createInterface } from 'node:readline/promises';
 
 const own = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'));
 /** What to install: kosh-erp of the same minor version (KOSH_ERP_SPEC overrides it, e.g. a local tarball). */
-const spec = process.env.KOSH_ERP_SPEC ?? `kosh-erp@^${own.version}`;
+const [major, minor] = own.version.split('.');
+const spec = process.env.KOSH_ERP_SPEC ?? `kosh-erp@^${major}.${minor}.0`;
 
-const argv = process.argv.slice(2);
-const dashes = argv.indexOf('--');
-const ours = dashes === -1 ? argv : argv.slice(0, dashes);
-const forInit = dashes === -1 ? argv.filter((a) => a.startsWith('-')) : argv.slice(dashes + 1);
-const positional = ours.find((a) => !a.startsWith('-'));
+// `npm create kosh-erp my-erp -- --yes …` reaches us without the `--` (npm consumes it); `npx create-kosh-erp`
+// keeps it. Either way: an optional folder first, everything else is for kosh init.
+const argv = process.argv.slice(2).filter((a, i, all) => !(a === '--' && all.indexOf('--') === i));
+const positional = argv[0] !== undefined && !argv[0].startsWith('-') ? argv[0] : undefined;
+const forInit = positional === undefined ? argv : argv.slice(1);
 
-if (ours.includes('--help') || ours.includes('-h')) {
+if (forInit.length === argv.length && (argv[0] === '--help' || argv[0] === '-h')) {
   process.stdout.write(`Usage: npm create kosh-erp@latest [folder] [-- kosh init options]
 
 Creates a Kosh installation in [folder]: installs kosh-erp, then asks for the database, the company, the
@@ -62,13 +63,30 @@ const add = (cwd, what) =>
 const installAll = (cwd) =>
   run(pm, pm === 'npm' ? ['install', '--no-audit', '--no-fund'] : ['install'], cwd);
 
+/** A project name: a folder name and a valid package name (lower-case letters, digits, - and _). */
+const validName = (name) => /^[a-z0-9][a-z0-9._-]{0,213}$/.test(name);
+
+/** The project name: `npm create kosh-erp my-erp`, else asked (Enter: my-erp). */
 async function folder() {
-  if (positional !== undefined) return positional;
+  if (positional !== undefined) {
+    if (!validName(basename(resolve(positional)))) {
+      process.stderr.write(
+        `"${positional}" is not a project name: lower-case letters, digits, - and _ (e.g. my-erp).\n`,
+      );
+      process.exit(2);
+    }
+    return positional;
+  }
   if (!process.stdin.isTTY) return 'my-erp';
   const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = (await rl.question('Project folder [my-erp]: ')).trim();
-  rl.close();
-  return answer === '' ? 'my-erp' : answer;
+  for (;;) {
+    const answer = (await rl.question('Project name [my-erp]: ')).trim() || 'my-erp';
+    if (validName(answer)) {
+      rl.close();
+      return answer;
+    }
+    process.stdout.write('  Lower-case letters, digits, - and _ (e.g. my-erp, padma-traders).\n');
+  }
 }
 
 const target = resolve(await folder());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kosh-erp",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "npm create kosh-erp: install Kosh and set it up in one command (database, company, administrator, apps, port)",
   "keywords": [
     "kosh",