kreftjs 0.0.2-beta → 0.0.4-beta

package/bin/backend/model.js

@@ -61,7 +61,7 @@ class ModelNotFoundError extends Error {
   }
 }
 
-// where the project's backend is (for factories); set by kreftjs dev / kreftjs serve / the kreftjs commands
+// where the project's backend is (for factories); set by kreft dev / kreft serve / the kreftjs commands
 let baseDir = null;
 const setBaseDir = (dir) => { baseDir = dir; };
 const getBaseDir = () => baseDir;
@@ -454,7 +454,7 @@ class Model {
     if ((await fire(C, 'saving', this)) === false) return false;
     if ((await fire(C, creating ? 'creating' : 'updating', this)) === false) return false;
     if (!(await tableExists(C.table))) {
-      throw new Error(`Table "${C.table}" does not exist in the database. Run "kreftjs migrate" to create it.`);
+      throw new Error(`Table "${C.table}" does not exist in the database. Run "kreft migrate" to create it.`);
     }
     const cols = await columnsOf(C.table);
     const has = (c) => cols.some((x) => x.name === c);

package/bin/backend/notifications.js

@@ -16,7 +16,7 @@
  *
  *   await user.notify(new InvoicePaid(invoice))
  *   await Notification.send(users, new InvoicePaid(invoice))
- *   const list = await user.notifications().get()           // the notifications table (kreftjs notifications:table)
+ *   const list = await user.notifications().get()           // the notifications table (kreft notifications:table)
  *   await user.unreadNotifications().update({ read_at: new Date() })
  */
 const crypto = require('crypto');

package/bin/backend/queue.js

@@ -15,7 +15,7 @@
  *   await dispatch(new SendWelcomeEmail(user), { delay: 60 })        // in a minute
  *   await dispatchSync(new SendWelcomeEmail(user))                   // now
  *
- * QUEUE_CONNECTION in .env: database (the jobs table; kreftjs dev and `kreftjs queue:work` run them) or sync (at once).
+ * QUEUE_CONNECTION in .env: database (the jobs table; kreft dev and `kreft queue:work` run them) or sync (at once).
  */
 const crypto = require('crypto');
 const fs = require('fs');
@@ -377,7 +377,7 @@ async function workOne({ queues = ['default'], log = () => {} } = {}) {
   }
 }
 
-// kreftjs queue:work — runs jobs as they come (stop with Ctrl+C)
+// kreft queue:work — runs jobs as they come (stop with Ctrl+C)
 async function work({ queues = ['default'], once = false, sleep = 1, maxJobs = Infinity, log = console.log, stopWhenEmpty = false } = {}) {
   const workerStartedAt = Date.now();
   let n = 0;

package/bin/backend/schedule.js

@@ -7,7 +7,7 @@
  *   Schedule.command('cache:clear').hourly()
  *   Schedule.call(fn).cron('* /15 * * * *')     (no space: every 15 minutes)
  *
- * kreftjs dev runs them while it is on; for a real server: kreftjs schedule:work (or `kreftjs schedule:run` from cron each minute).
+ * kreft dev runs them while it is on; for a real server: kreft schedule:work (or `kreft schedule:run` from cron each minute).
  */
 const tasks = [];
 
@@ -96,7 +96,7 @@ function loadSchedule(baseDir) {
   require(file);
   return file;
 }
-// kreftjs dev / kreftjs schedule:work: check every minute, on the minute
+// kreft dev / kreftjs schedule:work: check every minute, on the minute
 function startScheduler(baseDir, log = console.log) {
   let timer = null;
   const tick = async () => {

package/bin/backend/seo-pages.js

@@ -12,7 +12,7 @@
  *       if (!post) return null                       // answered as 404 (and noindex)
  *       return { title: post.title, description: post.excerpt, og: { image: post.image }, schema: { '@type': 'Article', headline: post.title } }
  *     },
- *     // the addresses of your data pages, for `kreftjs sitemap`: '/path' or { path, lastmod }
+ *     // the addresses of your data pages, for `kreft sitemap`: '/path' or { path, lastmod }
  *     urls: async () => (await Post.all()).map((p) => ({ path: '/posts/' + p.slug, lastmod: p.updated_at })),
  *   }
  *

package/bin/backend/storage.js

@@ -5,7 +5,7 @@
  *   const data = await req.validate({ avatar: 'required|image|max:2048' })    // KB
  *   const file = req.file('avatar')            // { name, size, type, extension() }
  *   const stored = await file.store('avatars') // 'avatars/3f9c…e1.jpg' on the public disk
- *   Storage.url(stored)                        // '/storage/avatars/3f9c…e1.jpg' — kreftjs dev and kreftjs serve send it
+ *   Storage.url(stored)                        // '/storage/avatars/3f9c…e1.jpg' — kreft dev and kreft serve send it
  *
  *   await Storage.put('reports/today.txt', 'hello')          // the local disk: backend/storage/app (private)
  *   await Storage.get('reports/today.txt')   Storage.exists(…)   Storage.delete(…)   Storage.files('reports')

package/bin/backend/support.js

@@ -98,11 +98,11 @@ function appKey() {
   if (k) {
     const buf = k.startsWith('base64:') ? Buffer.from(k.slice(7), 'base64') : Buffer.from(k);
     if (buf.length >= 16) return buf;
-    if (production) throw new Error('APP_KEY is shorter than 16 bytes. Run `kreftjs key:generate` and put the new key in .env.');
-    console.warn('  APP_KEY in .env is shorter than 16 bytes; run `kreftjs key:generate` for a 256-bit key.');
+    if (production) throw new Error('APP_KEY is shorter than 16 bytes. Run `kreft key:generate` and put the new key in .env.');
+    console.warn('  APP_KEY in .env is shorter than 16 bytes; run `kreft key:generate` for a 256-bit key.');
     return buf;
   }
-  if (production) throw new Error('APP_KEY is not set. Run `kreftjs key:generate` and put the key in .env (production needs one that every process shares).');
+  if (production) throw new Error('APP_KEY is not set. Run `kreft key:generate` and put the key in .env (production needs one that every process shares).');
   if (!fallbackKey) {
     fallbackKey = crypto.randomBytes(32);
     console.warn('  No APP_KEY in .env: signed links stop working when the server restarts.');
@@ -170,7 +170,7 @@ const Mail = {
       if (!transport) {
         let nodemailer;
         try { nodemailer = require(require.resolve('nodemailer', { paths: [process.cwd()] })); } catch (_) {
-          throw new Error('MAIL_URL is set: install the mailer with  kreftjs add nodemailer');
+          throw new Error('MAIL_URL is set: install the mailer with  kreft add nodemailer');
         }
         transport = nodemailer.createTransport(process.env.MAIL_URL);
       }

package/bin/backend/typescript.js

@@ -2,7 +2,7 @@
  * TypeScript support across backend and frontend:
  *   - Backend: routes/api.ts, config/*.ts, server/*.ts, and every .ts file in app/ and database/ load like .js files.
  *   - Frontend: .ts modules (e.g. frontend/logic/*.ts) and .kreftjs components with TypeScript syntax work natively in
- *     both `kreftjs dev` and `kreftjs build`.
+ *     both `kreft dev` and `kreft build`.
  *
  * Uses `esbuild` when installed in the project, or falls back to Kreft's built-in zero-dependency TypeScript
  * compiler (`Kreftjs.stripTypeScript` + ESM-to-CJS transform) so TypeScript projects work out of the box with zero setup.

package/bin/build.js

@@ -1,13 +1,13 @@
 /*
- * kreftjs build — turns a Kreft app into production files.
+ * kreft build — turns a Kreft app into production files.
  *
- *   kreftjs build                  build this folder into ./dist
- *   kreftjs build ./site           build another folder
- *   kreftjs build --out public     choose the output folder
- *   kreftjs build --base /         change <base href> in index.html
- *   kreftjs build --prerender      also save every page as ready HTML (needs: npm i -D jsdom)
- *   kreftjs build --prerender --urls urls.js   ... and the addresses in that file (pages that come from your data)
- *   kreftjs build --include docs   also copy another folder into the output
+ *   kreft build                  build this folder into ./dist
+ *   kreft build ./site           build another folder
+ *   kreft build --out public     choose the output folder
+ *   kreft build --base /         change <base href> in index.html
+ *   kreft build --prerender      also save every page as ready HTML (needs: npm i -D jsdom)
+ *   kreft build --prerender --urls urls.js   ... and the addresses in that file (pages that come from your data)
+ *   kreft build --include docs   also copy another folder into the output
  *
  * What it does:
  *   1. Compiles every .kreftjs file ahead of time into app.js (no .kreftjs files are downloaded in production).
@@ -113,7 +113,7 @@ module.exports = function build(args) {
   const langInject = Object.keys(langData).length ? `Kreftjs.translations(${JSON.stringify(langData)});\n` : '';
 
   const precompiled = [...fns].map(([key, src]) => `F[${JSON.stringify(key)}] = ${src};`).join('\n');
-  const appJs = `/* Built by kreftjs build — do not edit. Rebuild from your .kreftjs files instead. */
+  const appJs = `/* Built by kreft build — do not edit. Rebuild from your .kreftjs files instead. */
 ${env.envScript(env.publicEnv())}
 (function (Kreftjs) {
   if (!Kreftjs) throw new Error('Load kreftjs.js before app.js');
@@ -204,7 +204,7 @@ ${indent(components.join('\n\n'))}
   const links = cssLinks.map(({ spec, local }) => {
     if (local) return spec;
     const file = deps.packageFile(project, spec);
-    if (!file) fail(`The CSS file "${spec}" was not found in node_modules. Run:  kreftjs add ${(spec.match(deps.NAME) || [spec])[0]}`);
+    if (!file) fail(`The CSS file "${spec}" was not found in node_modules. Run:  kreft add ${(spec.match(deps.NAME) || [spec])[0]}`);
     const info = deps.packageJson(project, spec);
     copyCss(file, info.dir, path.join(dist, 'vendor', info.name));
     return toUrlPath(path.join('vendor', info.name, path.relative(info.dir, file)));
@@ -237,7 +237,7 @@ ${indent(components.join('\n\n'))}
       ...files.sort().map(([f, n]) => `  ${cyan(kb(n))}  ${toUrlPath(f)}`),
       '---',
       `  ${bold('Output:')}  ${dist}`,
-      `  ${bold('Preview:')} kreftjs dev ${path.relative(process.cwd(), dist) || '.'}`,
+      `  ${bold('Preview:')} kreft dev ${path.relative(process.cwd(), dist) || '.'}`,
     ];
     console.log('\n' + renderBox(lines, { width: 66, borderColor: green }) + '\n');
   };

package/bin/db-api.js

@@ -1,5 +1,5 @@
 /*
- * A REST API made from the tables of a database (used by `kreftjs dev --db` and `kreftjs serve --db`).
+ * A REST API made from the tables of a database (used by `kreft dev --db` and `kreft serve --db`).
  *
  *   GET    /api                    the tables you can use
  *   GET    /api/posts              rows   ?userId=3  ?title_like=som  ?likes_gte=5  ?q=text
@@ -15,7 +15,7 @@
  *
  * Which tables, and what each allows, comes from `tables` (kreftjs.config.json):
  *   { "posts": true, "users": { "write": false, "hidden": ["password"] }, "logs": false }
- * `kreftjs dev` shows every table unless you list them; `kreftjs serve` shows only the tables you list.
+ * `kreft dev` shows every table unless you list them; `kreft serve` shows only the tables you list.
  */
 const { validate } = require('../kreftjs.js'); // the same rules as Kreftjs.validate in the browser
 const MAX_BODY = 1024 * 1024;
@@ -48,7 +48,7 @@ function createDbApi(db, { tables: allow = null, production = false, prefix = '/
     }
     return out;
   };
-  // `kreftjs serve` reads the tables once; `kreftjs dev` looks again every 2 s, so a new table shows up by itself
+  // `kreft serve` reads the tables once; `kreft dev` looks again every 2 s, so a new table shows up by itself
   let loadedAt = 0;
   const tables = async () => {
     if (schema && (production || Date.now() - loadedAt < 2000)) return schema;

package/bin/db.js

@@ -33,7 +33,7 @@ function parseUrl(url) {
 function driver(name, root) {
   const paths = [root || process.cwd(), process.cwd(), __dirname];
   try { return require(require.resolve(name, { paths })); }
-  catch (_) { throw new Error(`To use this database, install its driver in your project:\n\n    kreftjs add ${name}\n`); }
+  catch (_) { throw new Error(`To use this database, install its driver in your project:\n\n    kreft add ${name}\n`); }
 }
 
 const TEXT = /char|text|clob|string|uuid|enum|json/i;

package/bin/deps.js

@@ -5,10 +5,10 @@
  *   import { debounce } from 'lodash'
  *   import 'bootstrap/dist/css/bootstrap.min.css'
  *
- * kreftjs dev answers /__kreft/deps/<package> with the package as one browser-ready ES module, made by
+ * kreft dev answers /__kreft/deps/<package> with the package as one browser-ready ES module, made by
  * esbuild (npm i -D esbuild), and adds an import map so the browser knows where 'dayjs' is.
- * kreftjs build writes the same files into dist/deps/. Without esbuild, packages that already ship
- * ES modules still work in kreftjs dev; older CommonJS ones (like lodash) need esbuild.
+ * kreft build writes the same files into dist/deps/. Without esbuild, packages that already ship
+ * ES modules still work in kreft dev; older CommonJS ones (like lodash) need esbuild.
  */
 const fs = require('fs');
 const path = require('path');
@@ -57,14 +57,14 @@ function isEsm(root, spec) {
 
 const cache = new Map();
 // one package (or a file inside it) as a single ES module for the browser.
-// bundle() is async (kreftjs dev); bundleSync() is the same for kreftjs build.
+// bundle() is async (kreft dev); bundleSync() is the same for kreft build.
 function prepare(root, spec, minify) {
   const esbuild = loadEsbuild(root);
-  if (!esbuild) throw Object.assign(new Error(`To use "${spec}" in the browser, install esbuild once:  kreftjs add -D esbuild`), { code: 'NO_ESBUILD' });
+  if (!esbuild) throw Object.assign(new Error(`To use "${spec}" in the browser, install esbuild once:  kreft add -D esbuild`), { code: 'NO_ESBUILD' });
   // only packages by name: never a path that would bundle (and show) one of your own server files
   if (!isBare(spec) || spec.split('/').some((p) => p === '..' || p === '.')) throw Object.assign(new Error(`"${spec}" is not a package name.`), { code: 'MISSING' });
   const file = resolveFrom(root, spec);
-  if (!file) throw Object.assign(new Error(`The package "${spec}" is not installed. Run:  kreftjs add ${(spec.match(NAME) || [spec])[0]}`), { code: 'MISSING' });
+  if (!file) throw Object.assign(new Error(`The package "${spec}" is not installed. Run:  kreft add ${(spec.match(NAME) || [spec])[0]}`), { code: 'MISSING' });
   const key = spec + '|' + fs.statSync(file).mtimeMs + '|' + minify + '|' + root;
   const s = JSON.stringify(spec);
   let tries;

package/bin/electron.js

@@ -2,16 +2,16 @@
  * Electron.js Desktop Support for Kreft
  *
  * Commands:
- *   kreftjs electron:init     Add Electron files to an existing project (alias: kreftjs make:electron)
- *   kreftjs electron:dev      Run the app in an Electron desktop window with hot reload (alias: kreftjs electron)
- *   kreftjs electron:build    Build static bundle (kreftjs build) and package desktop installer (electron-builder)
+ *   kreft electron:init     Add Electron files to an existing project (alias: kreft make:electron)
+ *   kreft electron:dev      Run the app in an Electron desktop window with hot reload (alias: kreft electron)
+ *   kreft electron:build    Build static bundle (kreft build) and package desktop installer (electron-builder)
  *
  * CLI flag:
- *   kreftjs new my-app --electron
+ *   kreft new my-app --electron
  */
 const fs = require('fs');
 const path = require('path');
-const { spawn } = require('child_process');
+const { start: spawn } = require('./win-spawn.js');
 
 function getProjectRoot(start = process.cwd()) {
   const lay = require('./layout.js').layout(start);
@@ -286,9 +286,9 @@ function init(args = []) {
   const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf8'));
   pkg.main = 'electron/main.js';
   pkg.scripts = pkg.scripts || {};
-  pkg.scripts['electron'] = 'kreftjs electron';
-  pkg.scripts['electron:dev'] = 'kreftjs electron:dev';
-  pkg.scripts['electron:build'] = 'kreftjs electron:build';
+  pkg.scripts['electron'] = 'kreft electron';
+  pkg.scripts['electron:dev'] = 'kreft electron:dev';
+  pkg.scripts['electron:build'] = 'kreft electron:build';
 
   pkg.devDependencies = pkg.devDependencies || {};
   if (!pkg.devDependencies['electron']) pkg.devDependencies['electron'] = '^34.2.0';
@@ -317,8 +317,8 @@ function init(args = []) {
 
   Next:
     npm install            (install electron & electron-builder)
-    kreftjs electron:dev       (start dev server & launch desktop window)
-    kreftjs electron:build     (build production installer)
+    kreft electron:dev       (start dev server & launch desktop window)
+    kreft electron:build     (build production installer)
 `);
 }
 
@@ -433,7 +433,7 @@ function startDev(args, port) {
 
     electronProcess.on('error', (err) => {
       if (err.code === 'ENOENT') {
-        console.error('\n  Electron is not installed locally. Run:  kreftjs add -D electron\n');
+        console.error('\n  Electron is not installed locally. Run:  kreft add -D electron\n');
       } else {
         console.error('  Electron launch error: ' + err.message);
       }
@@ -489,7 +489,7 @@ function build(args = []) {
 
     packProc.on('error', (err) => {
       if (err.code === 'ENOENT') {
-        console.error('\n  electron-builder is not installed. Run:  kreftjs add -D electron-builder\n');
+        console.error('\n  electron-builder is not installed. Run:  kreft add -D electron-builder\n');
       } else {
         console.error('  Packaging error: ' + err.message);
       }

package/bin/env.js

@@ -1,13 +1,13 @@
 /*
  * .env files and environment management.
  *
- *   # .env  (never sent to the browser, never copied by kreftjs build)
+ *   # .env  (never sent to the browser, never copied by kreft build)
  *   APP_NAME="My shop"
  *   DATABASE_URL=sqlite:database/app.db
  *   MAIL_PASSWORD=secret
  *   PUBLIC_APP_NAME=${APP_NAME}            ← PUBLIC_ values also reach the browser: env.PUBLIC_APP_NAME
  *
- * Read by kreftjs dev, kreftjs serve, kreftjs build and kreftjs db. Values already set in the real environment win,
+ * Read by kreft dev, kreft serve, kreft build and kreft db. Values already set in the real environment win,
  * so a server can override the file. In server/*.js: process.env.MAIL_PASSWORD (or ctx.env).
  */
 const fs = require('fs');

package/bin/guard.js

@@ -2,11 +2,11 @@
  * Folder guard: Kreft notices when the folder it works in is deleted, moved or put in the Trash.
  *
  * A running process keeps working on a folder that was moved away (the files are still there, under a new
- * name), so `kreftjs dev` would carry on serving a project you thought was gone, and a terminal opened in the
+ * name), so `kreft dev` would carry on serving a project you thought was gone, and a terminal opened in the
  * old folder would run commands against the Trash. The operating system cannot be asked to refuse the
  * delete, so Kreft says it loudly instead:
  *   - every command first checks that the folder it runs in is not deleted or in the Trash;
- *   - `kreftjs dev`, `kreftjs serve` and the queue / schedule workers check every second and stop with a message.
+ *   - `kreft dev`, `kreft serve` and the queue / schedule workers check every second and stop with a message.
  */
 const fs = require('fs');
 const path = require('path');

package/bin/kreftjs-config.js

@@ -1,6 +1,6 @@
 /*
  * kreftjs.config.json: { "db": "sqlite:database/app.db", "tables": { "posts": true, "users": { "write": false, "hidden": ["password"] } } }
- * Looked for in the folder being served, then its parents (so `kreftjs serve dist` finds the project's file).
+ * Looked for in the folder being served, then its parents (so `kreft serve dist` finds the project's file).
  * "${NAME}" in a value is replaced with that value from .env or the environment.
  */
 const fs = require('fs');