kreftjs 0.0.6-beta → 0.0.9-beta

package/bin/build.js

@@ -11,7 +11,7 @@
  *   kreft build --no-htaccess    do not write dist/.htaccess (the Apache / Hostinger page-address rules)
  *
  * What it does:
- *   1. Compiles every .kreftjs file ahead of time into app.js (no .kreftjs files are downloaded in production).
+ *   1. Compiles every .kreft file ahead of time into app.js (no .kreft files are downloaded in production).
  *   2. Turns every expression in the views into a real function, so the app runs without
  *      eval / new Function — it works under a strict Content-Security-Policy.
  *   3. Collects all <style> blocks (scoped ones already scoped) into app.css.
@@ -28,10 +28,10 @@ const { expandBlocks, prepareTemplate, splitKreft, splitInterp, exactBrace, stri
   scopeCss, hashString, propType, simplePathRE, fnExpRE, forAliasRE, stripTypeScript } = Kreftjs.__internal;
 
 const deps = require('./deps.js');
-// component files: .kreftjs, or .kreft / .som in an older project
-const isComp = (f) => /\.(?:kreftjs|kreft|som)$/i.test(f);
+// component files: .kreft, or .kreftjs in a project from the 0.0.x betas
+const isComp = (f) => /\.(?:kreftjs|kreft)$/i.test(f);
 const SERVER_DIRS = new Set();
-const SKIP = new Set(['node_modules', '.git', '.vscode', '.idea', 'package.json', 'package-lock.json', '.DS_Store']);
+const SKIP = new Set(['node_modules', 'dist', 'dist-electron', '.git', '.vscode', '.idea', 'package.json', 'package-lock.json', '.DS_Store']);
 
 module.exports = function build(args) {
   let folder = null, out = null, base = null, prerender = null, urlsFile = null, htaccess = true;
@@ -59,9 +59,9 @@ module.exports = function build(args) {
   // server code never goes into the built site: server/, backend app/ and routes/
   if (!lay.split) for (const dir of [root, project]) ['server', 'app', 'routes'].forEach((d) => SERVER_DIRS.add(path.join(dir, d)));
   SERVER_DIRS.add(lay.backend === lay.project ? path.join(project, 'server') : lay.backend);
-  const bare = new Set(), cssLinks = [];    // npm packages used by the .kreftjs files, and imported CSS files
+  const bare = new Set(), cssLinks = [];    // npm packages used by the .kreft files, and imported CSS files
 
-  // ---- 1. find and compile every .kreftjs file
+  // ---- 1. find and compile every .kreft file
   const kreftFiles = walk(root, dist).filter((f) => isComp(f));
   const fns = new Map();             // precompiled expression functions: key → source
   const components = [];
@@ -70,7 +70,7 @@ module.exports = function build(args) {
 
   addRouterTemplates(fns);           // the router's own <kreft-link> and <kreft-view> templates
 
-  // .kreftjs files in --include folders too: they land in the output as <folder>/…, so that is their path there
+  // .kreft files in --include folders too: they land in the output as <folder>/…, so that is their path there
   const jobs = kreftFiles.map((file) => [file, toUrlPath(path.relative(root, file)), root]);
   for (const dir of include) {
     const from = path.resolve(dir);
@@ -84,7 +84,7 @@ module.exports = function build(args) {
   const templateBar = createProgressBar(jobs.length, { label: 'Compiling templates' });
   for (const [file, rel, base] of jobs) {
     templateBar.tick(rel);
-    // routes/web.kreftjs and other route files: plain JavaScript with Route in scope, kept as a function
+    // routes/web.kreft and other route files: plain JavaScript with Route in scope, kept as a function
     if (/^routes\//.test(rel)) {
       const src = stripTypeScript(fs.readFileSync(file, 'utf8'));
       try { new Function('Route', src); } catch (e) { errors.push(`  ${rel}: ${e.message}`); continue; }
@@ -115,7 +115,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 kreft build — do not edit. Rebuild from your .kreftjs files instead. */
+  const appJs = `/* Built by kreft build — do not edit. Rebuild from your .kreft files instead. */
 ${env.envScript(env.publicEnv())}
 (function (Kreftjs) {
   if (!Kreftjs) throw new Error('Load kreftjs.js before app.js');
@@ -168,7 +168,7 @@ ${indent(components.join('\n\n'))}
 
   // ---- 3. index.html: kreftjs.js + app.js + app.css, inline scripts moved to main.js
   let html = fs.readFileSync(path.join(root, 'index.html'), 'utf8');
-  // an included folder that sits next to the app ('../docs/Docs.kreftjs') is inside the output: 'docs/Docs.kreftjs'
+  // an included folder that sits next to the app ('../docs/Docs.kreft') is inside the output: 'docs/Docs.kreft'
   for (const dir of include) {
     const up = toUrlPath(path.relative(root, path.resolve(dir)));
     if (up.startsWith('../')) html = html.split(`'${up}/`).join(`'${path.basename(up)}/`).split(`"${up}/`).join(`"${path.basename(up)}/`);
@@ -177,7 +177,7 @@ ${indent(components.join('\n\n'))}
   let sawKreft = false, placedMain = false;
   html = html.replace(/<script\b([^>]*)>([\s\S]*?)<\/script>/gi, (tag, attrs, body) => {
     const src = (attrs.match(/\bsrc\s*=\s*["']([^"']+)["']/i) || [])[1];
-    if (src && /(^|\/)(?:kreftjs|kreft|som)(\.min)?\.js$/i.test(src)) {
+    if (src && /(^|\/)(?:kreftjs|kreft)(\.min)?\.js$/i.test(src)) {
       sawKreft = true;
       return '<script src="kreftjs.js"></script>\n  <script src="app.js"></script>';
     }
@@ -252,8 +252,10 @@ ${indent(components.join('\n\n'))}
   report();
 };
 
-// Apache (Hostinger, cPanel …) answers /docs with a 404, because only index.html exists on disk. These rules send every address
-// that is not a real file or folder to index.html, so reloading a page works. An .htaccess you keep in public/ is left alone;
+// Apache (Hostinger, cPanel …) answers /docs with a 404, because only index.html exists on disk. These rules send every page address
+// (no file extension, not under /api/) that is not a real file or folder to index.html, so reloading a page works. A missing file such as
+// app.js, or an /api/ address the host cannot answer, stays a real 404: sending it index.html would hand the page's HTML to code
+// that expects data (a list, JSON). An .htaccess you keep in public/ is left alone;
 // a relative base (./, as the desktop build uses) has no server and gets no file.
 function writeHtaccess(dist, html) {
   const m = /<base\b[^>]*\bhref="([^"]*)"/i.exec(html);
@@ -266,6 +268,8 @@ function writeHtaccess(dist, html) {
   RewriteRule ^index\\.html$ - [L]
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_URI} !^${base}api/
+  RewriteCond %{REQUEST_URI} !\\.[A-Za-z0-9]+$
   RewriteRule . ${base}index.html [L]
 </IfModule>
 `);
@@ -278,12 +282,12 @@ function tsToJs(file, project) {
   return code.replace(/((?:from|import)\s*\(?\s*['"])(\.{1,2}\/[^'"]+?)\.ts(['"])/g, '$1$2.js$3');
 }
 
-/* ------------------------------------------------------------------ one .kreftjs file → JS */
+/* ------------------------------------------------------------------ one .kreft file → JS */
 function compileFile(file, rel, root) {
   const sp = splitKreft(fs.readFileSync(file, 'utf8'), rel);
   const name = sp.name;
 
-  // the script must parse; report the .kreftjs line if it doesn't
+  // the script must parse; report the .kreft line if it doesn't
   const run = `function ($scope, $h) { with ($scope) {\n${sp.code}\n} }`;
   try { new Function('return ' + run); } catch (e) { throw new Error(`script error: ${e.message}`); }
 
@@ -297,13 +301,13 @@ function compileFile(file, rel, root) {
     return `${JSON.stringify(p)}: { ${type ? `type: ${type.name}, ` : ''}default: function () { return (${expr}); } }`;
   });
 
-  // imports: other .kreftjs files become component references; .js modules load with import()
+  // imports: other .kreft files become component references; .js modules load with import()
   const comps = [], values = [], bare = [], cssImports = [];
   for (const stmt of sp.imports) {
     const m = stmt.match(/^import\s+(?:([\s\S]+?)\s+from\s+)?(['"])(.+?)\2/);
     if (!m) throw new Error(`can't read import: ${stmt}`);
     const [, what, , spec] = m;
-    if (/^(?:kreftjs|kreft|som)(\.js)?$/.test(spec)) continue;
+    if (/^(?:kreftjs|kreft)(\.js)?$/.test(spec)) continue;
     let target = /^\.{1,2}\//.test(spec) ? toUrlPath(path.relative(root, path.resolve(path.dirname(file), spec))) : spec;
     if (/^\.{1,2}\//.test(spec) && /\.ts$/i.test(spec)) target = target.replace(/\.ts$/i, '.js'); // TypeScript files are built into .js
     if (isComp(spec)) {
@@ -351,7 +355,7 @@ function compileFile(file, rel, root) {
 // `import { a, b as c } from './x.js'` → loaded with import() when the component is first used
 function loadValuesSource(values) {
   const lines = values.map(({ what, target, local }, i) => {
-    // files in the app resolve from <base href>, like .kreftjs paths; URLs and package names stay as written
+    // files in the app resolve from <base href>, like .kreft paths; URLs and package names stay as written
     const url = local ? `new URL(${JSON.stringify(target)}, document.baseURI).href` : JSON.stringify(target);
     const picks = [];
     if (what) what.split(/,(?![^{]*\})/).map((s) => s.trim()).forEach((part) => {
@@ -540,7 +544,7 @@ function walk(dir, exclude) {
     if (SKIP.has(entry.name)) continue;
     if (entry.name === 'storage' && (entry.isSymbolicLink() || entry.isDirectory())) continue;
     // the database, its settings and its migrations stay on the server, never in the built site
-    if (/\.(db|sqlite3?)(-wal|-shm)?$/i.test(entry.name) || entry.name === 'kreftjs.config.json' || entry.name === 'kreft.config.json' || entry.name === 'som.config.json' || (entry.isDirectory() && entry.name === 'database')) continue;
+    if (/\.(db|sqlite3?)(-wal|-shm)?$/i.test(entry.name) || entry.name === 'kreftjs.config.json' || entry.name === 'kreft.config.json' || (entry.isDirectory() && entry.name === 'database')) continue;
     const full = path.join(dir, entry.name);
     if (exclude && full === exclude) continue;
     if (SERVER_DIRS.has(full)) continue; // server/ code runs on the server only

package/bin/db-api.js

@@ -2,7 +2,7 @@
  * 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
+ *   GET    /api/posts              rows   ?userId=3  ?title_like=news  ?likes_gte=5  ?q=text
  *                                         ?_sort=-created_at,title  ?_limit=20&_page=2   (header X-Total-Count)
  *   GET    /api/posts/1            one row
  *   POST   /api/posts              create (201, the new row)
@@ -28,7 +28,7 @@ function createDbApi(db, { tables: allow = null, production = false, prefix = '/
     const all = await db.tables();
     const out = new Map();
     for (const t of all) {
-      if (t.name === 'som_migrations') continue;
+      if (t.name === 'kreft_migrations') continue;
       let rules = allow ? allow[t.name] : true;
       if (rules == null || rules === false) continue;
       if (rules === true) rules = {};

package/bin/db.js

@@ -250,14 +250,14 @@ function splitSql(sql) {
 
 /* ---------------------------------------------------------------- migrations
  * database/migrations/001_create_posts.sql, 002_add_likes.sql …  run once each, in name order,
- * remembered in the table som_migrations (TODO 3.1: rename to kreft_migrations, reading the old name as a fallback).
+ * remembered in the table kreft_migrations .
  * database/seed.sql fills in starting data.
  */
 async function migrate(db, dir, log = () => {}) {
   if (!fs.existsSync(dir)) return [];
   const idType = db.kind === 'postgres' ? 'TEXT' : 'VARCHAR(255)';
-  await db.exec(`CREATE TABLE IF NOT EXISTS som_migrations (name ${idType} PRIMARY KEY, ran_at ${idType} NOT NULL)`);
-  const done = new Set((await db.query('SELECT name FROM som_migrations')).map((r) => r.name));
+  await db.exec(`CREATE TABLE IF NOT EXISTS kreft_migrations (name ${idType} PRIMARY KEY, ran_at ${idType} NOT NULL)`);
+  const done = new Set((await db.query('SELECT name FROM kreft_migrations')).map((r) => r.name));
   const files = fs.readdirSync(dir).filter((f) => f.endsWith('.sql')).sort();
   const ran = [];
   for (const f of files) {
@@ -265,7 +265,7 @@ async function migrate(db, dir, log = () => {}) {
     const sql = fs.readFileSync(path.join(dir, f), 'utf8');
     try { await db.exec(sql); }
     catch (e) { throw new Error(`Migration ${f} failed: ${e.message}`); }
-    await db.run('INSERT INTO som_migrations (name, ran_at) VALUES (?, ?)', [f, new Date().toISOString()]);
+    await db.run('INSERT INTO kreft_migrations (name, ran_at) VALUES (?, ?)', [f, new Date().toISOString()]);
     log(f);
     ran.push(f);
   }

package/bin/deps.js

@@ -1,7 +1,7 @@
 /*
  * npm packages in the browser.
  *
- *   import dayjs from 'dayjs'                        (in a .kreftjs file)
+ *   import dayjs from 'dayjs'                        (in a .kreft file)
  *   import { debounce } from 'lodash'
  *   import 'bootstrap/dist/css/bootstrap.min.css'
  *

package/bin/electron.js

@@ -38,7 +38,7 @@ function getDevToolsConfig() {
     (process.argv.includes('--devtools') ? 'right' : null) ||
     (process.argv.includes('--no-devtools') ? 'false' : null) ||
     process.env.ELECTRON_DEVTOOLS ||
-    (process.env.KREFT_ELECTRON_DEVTOOLS || process.env.SOM_ELECTRON_DEVTOOLS) ||
+    process.env.KREFT_ELECTRON_DEVTOOLS ||
     '';
   const val = String(raw).trim().toLowerCase();
   if (!val) return { show: false, mode: 'right' };
@@ -225,7 +225,7 @@ app.on('window-all-closed', () => {
 
   preload: () => `const { contextBridge, ipcRenderer } = require('electron');
 
-// Expose safe desktop bridge onto window.kreftDesktop (window.somDesktop is the same object: the Som.js name)
+// Expose safe desktop bridge onto window.kreftDesktop
 const desktop = {
   isElectron: true,
   getInfo: () => ipcRenderer.invoke('kreft:app-info'),
@@ -240,10 +240,8 @@ const desktop = {
   showSaveDialog: (options) => ipcRenderer.invoke('kreft:dialog:save', options),
 };
 contextBridge.exposeInMainWorld('kreftDesktop', desktop);
-contextBridge.exposeInMainWorld('somDesktop', desktop);
 
 contextBridge.exposeInMainWorld('__KREFT_ELECTRON__', true);
-contextBridge.exposeInMainWorld('__SOM_ELECTRON__', true);
 `,
 };
 
@@ -388,7 +386,7 @@ function startDev(args, port) {
   const bin = resolveElectronBinary(root);
 
   // Extract devtools settings from CLI args or environment
-  let devToolsEnv = process.env.ELECTRON_DEVTOOLS || (process.env.KREFT_ELECTRON_DEVTOOLS || process.env.SOM_ELECTRON_DEVTOOLS) || '';
+  let devToolsEnv = process.env.ELECTRON_DEVTOOLS || process.env.KREFT_ELECTRON_DEVTOOLS || '';
   const devToolsArg = args.find((a) => a === '--devtools' || a.startsWith('--devtools=') || a === '--no-devtools');
   if (devToolsArg) {
     if (devToolsArg === '--devtools') devToolsEnv = 'right';

package/bin/kreftjs-config.js

@@ -14,17 +14,12 @@ function readConfig(start) {
       path.join(dir, 'config', 'kreftjs.json'),
       path.join(dir, 'Config', 'kreftjs.config.json'),
       path.join(dir, 'Config', 'kreftjs.json'),
-      // the earlier names: kreft.config.json, then Som.js's som.config.json
+      // the earlier name: kreft.config.json
       path.join(dir, 'kreft.config.json'),
       path.join(dir, 'config', 'kreft.config.json'),
       path.join(dir, 'config', 'kreft.json'),
       path.join(dir, 'Config', 'kreft.config.json'),
       path.join(dir, 'Config', 'kreft.json'),
-      path.join(dir, 'som.config.json'),
-      path.join(dir, 'config', 'som.config.json'),
-      path.join(dir, 'config', 'som.json'),
-      path.join(dir, 'Config', 'som.config.json'),
-      path.join(dir, 'Config', 'som.json'),
     ];
     for (const file of candidates) {
       if (fs.existsSync(file)) {

package/bin/kreftjs.js

@@ -7,7 +7,7 @@
  *   kreft dev --port 3000       another port
  *   kreft dev ./site            another folder
  *   kreft build                 build this folder for production into ./dist
- *   kreft vscode                install colors and snippets for .kreftjs files in VS Code
+ *   kreft vscode                install colors and snippets for .kreft files in VS Code
  *   kreft serve dist            run the built app in production (with --db: its database API)
  *   kreft db migrate            run new database/migrations/*.sql   (also: seed, tables, sql "…")
  *   kreft help                  show this help
@@ -87,7 +87,7 @@ function help() {
         --no-auth           …without login, register, profile and users (--auth: with them, the default)
         --redis             …configure Redis for caching, background queues and pub/sub
         --ui <library>      …with a CSS library from a CDN: tailwind, bootstrap, bulma or pico
-        --ts                …use TypeScript across frontend (.kreftjs, .ts) and backend (.ts)
+        --ts                …use TypeScript across frontend (.kreft, .ts) and backend (.ts)
         --js                …use JavaScript (default when non-interactive)
         --electron          …with Electron desktop app support (main.js, preload.js, packaging)
         --vite              …with Vite.js bundling & instant HMR (vite.config.js, npm run vite)
@@ -140,7 +140,7 @@ function help() {
     kreft make:request StorePostRequest    app/Http/Requests/StorePostRequest.js (--model Post)
     kreft make:resource PostResource     app/Http/Resources/PostResource.js
     kreft make:rule Uppercase          app/Rules/Uppercase.js
-    kreft make:page Post    frontend/pages/Post.kreftjs (--model Post, -r, --route=file, --auth)
+    kreft make:page Post    frontend/pages/Post.kreft (--model Post, -r, --route=file, --auth)
     kreft make:factory PostFactory database/factories/PostFactory.js (--model Post)
     kreft make:migration create_posts_table
     kreft make:seeder PostSeeder
@@ -155,7 +155,7 @@ function help() {
     kreft make:command SendReport      app/Console/Commands/SendReport.js (--command report:send)
     kreft make:errors       The error pages in errors/ (401, 403, 404, 419, 429, 500, 503…)
     kreft make:admin <email>    Let that user open the admin panel at /admin (--remove: take it away)
-    kreft make:routes admin     A new route file for pages: frontend/routes/admin.kreftjs (--api: backend/routes/admin.js)
+    kreft make:routes admin     A new route file for pages: frontend/routes/admin.kreft (--api: backend/routes/admin.js)
     kreft db tables         List tables and columns
     kreft db sql "<SQL>"    Run one SQL statement and print the result
     kreft build [folder]    Build for production (default: this folder)
@@ -175,7 +175,7 @@ function help() {
         --check             Check for outdated packages (npm outdated)
         --core              Update only Kreft runtime files (kreftjs.js, kreftjs.d.ts, server.d.ts)
         --npm               Update only npm dependencies
-    kreft vscode            Install .kreftjs colors and snippets in VS Code (also Cursor, VSCodium)
+    kreft vscode            Install .kreft colors and snippets in VS Code (also Cursor, VSCodium)
 
   Examples:
     kreft new shop
@@ -256,7 +256,7 @@ async function createProject(args) {
   fs.copyFileSync(path.join(__dirname, '..', 'kreftjs.js'), path.join(front, 'kreftjs.js'));
   fs.copyFileSync(path.join(__dirname, '..', 'kreftjs.d.ts'), path.join(front, 'kreftjs.d.ts')); // editor hints
   fs.copyFileSync(path.join(__dirname, '..', 'server.d.ts'), path.join(target, 'backend', 'server.d.ts')); // hints for require('kreftjs/server')
-  // the documentation pages, in their own folder: docs/Docs.kreftjs, its Markdown reader and the README.md manual
+  // the documentation pages, in their own folder: docs/Docs.kreft, its Markdown reader and the README.md manual
   copyFolder(path.join(__dirname, '..', 'docs'), path.join(front, 'docs'));
 
   const projectName = path.basename(target).toLowerCase().replace(/[^a-z0-9-]+/g, '-');
@@ -307,7 +307,7 @@ ${auth ? `  Then log in as test@example.com with the password "password", or reg
 ` : '  Created without authentication (--no-auth): there is no login, registration or users table.\n'}`);
 }
 
-// kreft new my-app --ts  →  TypeScript across backend (.ts) and frontend (.kreftjs, .ts), tsconfig.json, and npm run typecheck
+// kreft new my-app --ts  →  TypeScript across backend (.ts) and frontend (.kreft, .ts), tsconfig.json, and npm run typecheck
 function toTypeScript(target, projectPkg) {
   const { toTs, TSCONFIG } = require('./to-ts.js');
   const walk = (dir) => {
@@ -323,8 +323,8 @@ function toTypeScript(target, projectPkg) {
   projectPkg.devDependencies = { esbuild: '^0.25.0', typescript: '^5.8.0', '@types/node': '^22.13.0' };
   projectPkg.allowScripts = { esbuild: true };
   // Shared TypeScript interfaces for the frontend
-  fs.writeFileSync(path.join(target, 'frontend', 'types.ts'), `// Shared TypeScript interfaces for your .kreftjs pages and frontend modules.
-// Import in any .kreftjs file or .ts module:  import type { User } from '../types.ts'
+  fs.writeFileSync(path.join(target, 'frontend', 'types.ts'), `// Shared TypeScript interfaces for your .kreft pages and frontend modules.
+// Import in any .kreft file or .ts module:  import type { User } from '../types.ts'
 
 export interface User {
   id: number
@@ -355,10 +355,10 @@ export function ago(date: string | Date): string {
   return 'just now'
 }
 `);
-  // Upgrade Counter.kreftjs to showcase TypeScript in .kreftjs components
-  const counterKreft = path.join(target, 'frontend', 'tests', 'components', 'Counter.kreftjs');
+  // Upgrade Counter.kreft to showcase TypeScript in .kreft components
+  const counterKreft = path.join(target, 'frontend', 'tests', 'components', 'Counter.kreft');
   if (fs.existsSync(counterKreft)) {
-    fs.writeFileSync(counterKreft, `<!-- A TypeScript .kreftjs component: a button that counts. Used by tests/pages/Test.kreftjs as <counter>. -->
+    fs.writeFileSync(counterKreft, `<!-- A TypeScript .kreft component: a button that counts. Used by tests/pages/Test.kreft as <counter>. -->
 prop start: number = 0
 
 state count: number = start
@@ -377,8 +377,8 @@ button { font-variant-numeric: tabular-nums; justify-self: start; }
 </style>
 `);
   }
-  // If --db created Todos.kreftjs, upgrade it with TypeScript interfaces & typed actions
-  const todosKreft = path.join(target, 'frontend', 'pages', 'Todos.kreftjs');
+  // If --db created Todos.kreft, upgrade it with TypeScript interfaces & typed actions
+  const todosKreft = path.join(target, 'frontend', 'pages', 'Todos.kreft');
   if (fs.existsSync(todosKreft)) {
     const src = fs.readFileSync(todosKreft, 'utf8');
     fs.writeFileSync(todosKreft, src
@@ -391,9 +391,9 @@ button { font-variant-numeric: tabular-nums; justify-self: start; }
 
 // kreft new my-app --ui bootstrap  →  the library's CDN links in index.html
 function uiKits() { return {
-  tailwind: ['<!-- Tailwind CSS: use its classes in any .kreftjs file -->', '<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>'],
-  bootstrap: ['<!-- Bootstrap: its classes and components (data-bs-toggle…) work in any .kreftjs file -->', '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" defer></script>'],
-  bulma: ['<!-- Bulma: its classes work in any .kreftjs file -->', '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.2/css/bulma.min.css">'],
+  tailwind: ['<!-- Tailwind CSS: use its classes in any .kreft file -->', '<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>'],
+  bootstrap: ['<!-- Bootstrap: its classes and components (data-bs-toggle…) work in any .kreft file -->', '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css">', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" defer></script>'],
+  bulma: ['<!-- Bulma: its classes work in any .kreft file -->', '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@1.0.2/css/bulma.min.css">'],
   pico: ['<!-- Pico CSS: plain HTML gets styled by itself -->', '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css">'],
 }; }
 function addUiKit(target, ui) {
@@ -508,7 +508,7 @@ module.exports = TodoSeeder
   const setUrl = (f, u) => fs.writeFileSync(f, fs.readFileSync(f, 'utf8').replace(/^DATABASE_URL=.*$/m, () => 'DATABASE_URL=' + u));
   setUrl(path.join(target, '.env'), url);
   setUrl(path.join(target, '.env.example'), url.replace(/\/\/[^:@\s]+:[^@\s]+@/, '//user:password@'));
-  fs.writeFileSync(path.join(front, 'pages', 'Todos.kreftjs'), `<!-- the todos table, through routes/api.js and app/Http/Controllers/TodoController.js -->
+  fs.writeFileSync(path.join(front, 'pages', 'Todos.kreft'), `<!-- the todos table, through routes/api.js and app/Http/Controllers/TodoController.js -->
 load todos = api.get('/api/todos')
 // rules are checked here first, so a todo with mistakes is never sent; the server's 422 errors land here too
 state draft = form({ title: '' }, { title: 'required|max:200' })
@@ -565,9 +565,9 @@ label { display: flex; align-items: center; gap: 10px; }
 .done { color: var(--muted); text-decoration: line-through; }
 </style>
 `);
-  const webFile = path.join(front, 'routes', 'web.kreftjs');
-  fs.writeFileSync(webFile, fs.readFileSync(webFile, 'utf8').replace(/(  Route\.view\('\/profile'[^\n]*\n)/, "$1  Route.view('/todos', 'pages/Todos.kreftjs').name('todos').title('Todos')\n"));
-  const layout = path.join(front, 'layouts', 'app.kreftjs');
+  const webFile = path.join(front, 'routes', 'web.kreft');
+  fs.writeFileSync(webFile, fs.readFileSync(webFile, 'utf8').replace(/(  Route\.view\('\/profile'[^\n]*\n)/, "$1  Route.view('/todos', 'pages/Todos.kreft').name('todos').title('Todos')\n"));
+  const layout = path.join(front, 'layouts', 'app.kreft');
   fs.writeFileSync(layout, fs.readFileSync(layout, 'utf8').replace(/(<kreft-link k-if="\$store\.auth\.token" to="\/dashboard"[^>]*>[^<]*<\/kreft-link>)/, '$1\n        <kreft-link k-if="$store.auth.token" to="/todos" exact-class="here">Todos</kreft-link>'));
 }
 function copyFolder(from, to) {
@@ -591,11 +591,11 @@ function installVscode() {
   for (const home of homes) {
     const dir = path.join(home, 'extensions');
     fs.mkdirSync(dir, { recursive: true });
-    fs.readdirSync(dir).filter((n) => n.startsWith('kreft.kreftjs-') || n.startsWith('kreft.kreft-') || n.startsWith('somjs.som-')) /* the older extensions go too */.forEach((n) => fs.rmSync(path.join(dir, n), { recursive: true, force: true }));
+    fs.readdirSync(dir).filter((n) => n.startsWith('kreft.kreftjs-') || n.startsWith('kreft.kreft-')) /* the older extensions go too */.forEach((n) => fs.rmSync(path.join(dir, n), { recursive: true, force: true }));
     copyFolder(from, path.join(dir, `kreft.kreftjs-${ext.version}`));
     console.log(`  Installed in ${path.join(dir, `kreft.kreftjs-${ext.version}`)}`);
   }
-  // Ensure current project .vscode/settings.json maps .kreftjs files to Kreft and configures formatter
+  // Ensure current project .vscode/settings.json maps .kreft files to Kreft and configures formatter
   const settingsDir = path.join(process.cwd(), '.vscode');
   const settings = path.join(settingsDir, 'settings.json');
   fs.mkdirSync(settingsDir, { recursive: true });
@@ -603,11 +603,11 @@ function installVscode() {
   if (fs.existsSync(settings)) {
     try { cfg = JSON.parse(fs.readFileSync(settings, 'utf8')); } catch {}
   }
-  cfg['files.associations'] = { ...(cfg['files.associations'] || {}), '*.kreftjs': 'kreftjs' };
+  cfg['files.associations'] = { ...(cfg['files.associations'] || {}), '*.kreft': 'kreftjs', '*.kreftjs': 'kreftjs' };
   cfg['[kreftjs]'] = { ...(cfg['[kreftjs]'] || {}), 'editor.defaultFormatter': 'kreft.kreftjs' };
   fs.writeFileSync(settings, JSON.stringify(cfg, null, 2) + '\n');
-  console.log('  Updated .vscode/settings.json: .kreftjs files use Kreft language and kreft.kreftjs formatter');
-  console.log('\n  Restart VS Code (or run "Reload Window") to see updated colors and formatting in .kreftjs files.\n');
+  console.log('  Updated .vscode/settings.json: .kreft files use Kreft language and kreft.kreftjs formatter');
+  console.log('\n  Restart VS Code (or run "Reload Window") to see updated colors and formatting in .kreft files.\n');
 }
 
 /* ------------------------------------------------------------------ kreft dev */
@@ -670,7 +670,7 @@ async function devServer(args, { production = false } = {}) {
         installAlias(); // require('kreftjs/server') and .ts files work in migrations and seeders
         require('./backend/model.js').setBaseDir(backendDir);
         const dir = migrations || migrationsDir(backendDir, config.dir, root);
-        const isNew = !(await db.tables()).some((t) => t.name === 'som_migrations'); // nothing migrated yet
+        const isNew = !(await db.tables()).some((t) => t.name === 'kreft_migrations'); // nothing migrated yet
         const ran = dir ? await migrator.migrate(db, dir, (f) => console.log(`  migrated  ${f}`)) : [];
         // --seed: a brand-new database gets database/seeders/DatabaseSeeder.js
         if (seedNew && isNew && ran.length) await migrator.seed(db, backendDir, { log: (n) => console.log(`  seeded    ${n}`) });
@@ -731,7 +731,7 @@ async function devServer(args, { production = false } = {}) {
   const npmMap = () => (production ? null : deps.importMap(project));
 
   const types = {
-    '.html': 'text/html', '.js': 'text/javascript', '.mjs': 'text/javascript', '.kreftjs': 'text/plain', '.kreft': 'text/plain', '.som': 'text/plain',
+    '.html': 'text/html', '.js': 'text/javascript', '.mjs': 'text/javascript', '.kreft': 'text/plain', '.kreftjs': 'text/plain',
     '.css': 'text/css', '.json': 'application/json', '.svg': 'image/svg+xml', '.png': 'image/png',
     '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.gif': 'image/gif', '.webp': 'image/webp',
     '.ico': 'image/x-icon', '.woff2': 'font/woff2', '.woff': 'font/woff', '.txt': 'text/plain', '.md': 'text/markdown',
@@ -830,8 +830,8 @@ async function devServer(args, { production = false } = {}) {
       if (!isFile(full)) return;
       const urlPath = '/' + rel.split(path.sep).join('/');
       const ext = path.extname(full).toLowerCase();
-      const isComp = ext === '.kreftjs' || ext === '.kreft' || ext === '.som'; // .kreft / .som: files of an older project
-      const routeFile = isComp && /^routes[\/\\]/.test(rel); // routes/web.kreftjs: the whole page loads again
+      const isComp = ext === '.kreft' || ext === '.kreftjs'; // .kreftjs: files of a project from the 0.0.x betas
+      const routeFile = isComp && /^routes[\/\\]/.test(rel); // routes/web.kreft: the whole page loads again
       const msg = { type: isComp && !routeFile ? 'kreft' : ext === '.css' ? 'css' : 'reload', path: urlPath };
       clients.forEach((c) => c.write(`data: ${JSON.stringify(msg)}\n\n`));
       if (clients.size) console.log(`  ${msg.type === 'reload' ? 'reload' : 'update'}  ${urlPath}`);
@@ -862,7 +862,7 @@ async function devServer(args, { production = false } = {}) {
         if (!isFile(full)) return;
         const urlPath = '/admin/' + rel.split(path.sep).join('/');
         const ext = path.extname(full).toLowerCase();
-        const isComp = ext === '.kreftjs' || ext === '.kreft' || ext === '.som';
+        const isComp = ext === '.kreft' || ext === '.kreftjs';
         const routeFile = /^routes[\/\\]/.test(rel);
         const msg = { type: isComp && !routeFile ? 'kreft' : ext === '.css' ? 'css' : 'reload', path: urlPath };
         clients.forEach((c) => c.write(`data: ${JSON.stringify(msg)}\n\n`));
@@ -904,7 +904,7 @@ async function devServer(args, { production = false } = {}) {
     clients.forEach((c) => c.write(`data: ${JSON.stringify({ type: 'reload', path: '/.env' })}\n\n`));
   });
   // files a browser must never get: the database itself, its settings and password, hidden files, locks, dumps
-  const secret = (p) => /(^|\/)\.|\.(db|sqlite3?|db-wal|db-shm|sqlite-wal|sqlite-shm|sql|bak|dump|key|pem|crt)$|(^|\/)((?:kreftjs|kreft|som)\.config\.json|package(-lock)?\.json|pnpm-lock\.yaml|yarn\.lock|bun\.lockb|composer\.(json|lock)|docker-compose.*\.ya?ml|Dockerfile|node_modules|vendor)(\/|$)/i.test(p)
+  const secret = (p) => /(^|\/)\.|\.(db|sqlite3?|db-wal|db-shm|sqlite-wal|sqlite-shm|sql|bak|dump|key|pem|crt)$|(^|\/)((?:kreftjs|kreft)\.config\.json|package(-lock)?\.json|pnpm-lock\.yaml|yarn\.lock|bun\.lockb|composer\.(json|lock)|docker-compose.*\.ya?ml|Dockerfile|node_modules|vendor)(\/|$)/i.test(p)
     || (production && /(^|\/)(database|app|routes)\//i.test(p));
   setInterval(() => clients.forEach((c) => c.write(': ping\n\n')), 25000).unref();
   // a page of the app: index.html, with the SEO tags of backend/routes/seo.js for this address (and its status)
@@ -989,7 +989,7 @@ async function devServer(args, { production = false } = {}) {
     const down = downInfo();
     if (!down) return false;
     const { same, cookieSecure } = require('./backend/http.js');
-    const cookie = (req.headers.cookie || '').match(/(?:^|;\s*)(?:kreft|som)_bypass=([^;]+)/); // som_bypass: set before the rename, still accepted
+    const cookie = (req.headers.cookie || '').match(/(?:^|;\s*)kreft_bypass=([^;]+)/);
     let cookieVal = null;
     if (cookie) { try { cookieVal = decodeURIComponent(cookie[1]); } catch (_) { cookieVal = cookie[1]; } }
     if (down.secret && cookieVal && same(cookieVal, String(down.secret))) return false;
@@ -1018,7 +1018,7 @@ async function devServer(args, { production = false } = {}) {
   // therefore only answers the names of this computer (add more with KREFT_ALLOWED_HOSTS=my-tunnel.example).
   const hostOnly = (h) => String(h || '').toLowerCase().replace(/:\d+$/, '').replace(/^\[|\]$/g, '');
   const isLocalName = (n) => n === 'localhost' || n === '127.0.0.1' || n === '::1' || n.endsWith('.localhost');
-  const allowedHosts = new Set(String((process.env.KREFT_ALLOWED_HOSTS || process.env.SOM_ALLOWED_HOSTS) || '').split(',').map((x) => x.trim().toLowerCase()).filter(Boolean));
+  const allowedHosts = new Set(String(process.env.KREFT_ALLOWED_HOSTS || '').split(',').map((x) => x.trim().toLowerCase()).filter(Boolean));
   const loopbackBind = !production && (host === 'localhost' || host === '::1' || /^127\./.test(host));
   // a request from another web site (Origin) that changes data in the unauthenticated API (--api, --db)
   const crossSiteWrite = (req) => {
@@ -1068,7 +1068,6 @@ async function devServer(args, { production = false } = {}) {
       let urlPath;
       try { urlPath = decodeURIComponent(new URL(req.url, 'http://x').pathname); }
       catch (_) { res.writeHead(400); return res.end('Bad request'); }
-      if (urlPath.startsWith('/__som/')) urlPath = '/__kreft/' + urlPath.slice('/__som/'.length); // the Som.js address of the dev files
       // a backslash or a NUL in the path is never a real page, and on Windows a backslash would act as a folder separator
       if (/[\\\0]/.test(urlPath)) { res.writeHead(400); return res.end('Bad request'); }
       if (maintenance(req, res, urlPath)) return;

package/bin/layout.js

@@ -2,7 +2,7 @@
  * Where a project's parts are.
  *
  * New projects (kreft new) keep frontend and backend apart:
- *   frontend/   the only folder a browser can reach: index.html, pages, components, routes/web.kreftjs …
+ *   frontend/   the only folder a browser can reach: index.html, pages, components, routes/web.kreft …
  *   backend/    never served: routes/api.js, app/, database/ (and server/)
  *   .env, package.json, node_modules/   at the top, next to both
  *

package/bin/no-auth.js

@@ -11,8 +11,8 @@ const path = require('path');
 
 const TO_REMOVE = [
   // frontend: the sign-in pages, the profile, the admin pages and what only they use
-  'frontend/pages/auth', 'frontend/pages/Profile.kreftjs', 'frontend/pages/Users.kreftjs', 'frontend/pages/Dashboard.kreftjs',
-  'frontend/components/profile', 'frontend/components/StatCard.kreftjs', 'frontend/layouts/guest.kreftjs',
+  'frontend/pages/auth', 'frontend/pages/Profile.kreft', 'frontend/pages/Users.kreft', 'frontend/pages/Dashboard.kreft',
+  'frontend/components/profile', 'frontend/components/StatCard.kreft', 'frontend/layouts/guest.kreft',
   // backend: the auth routes, controllers, middleware, models and the users table
   'backend/routes/auth.js', 'backend/app/Auth',
   'backend/app/Http/Controllers/Auth', 'backend/app/Http/Controllers/Admin', 'backend/app/Http/Controllers/ProfileController.js',
@@ -62,19 +62,21 @@ module.exports = DatabaseSeeder
 const WEB = (todos) => `// Application Web Routes (this app was created without sign-in: --no-auth).
 
 // Welcome page
-Route.view('/', 'pages/Home.kreftjs').layout('none').name('home').title('Welcome')
-Route.view('/welcome', 'pages/Home.kreftjs').layout('none').name('welcome').title('Welcome')
-${todos ? "\nRoute.view('/todos', 'pages/Todos.kreftjs').name('todos').title('Todos')\n" : ''}
+Route.view('/', 'pages/Home.kreft').layout('none').name('home').title('Welcome')
+Route.view('/welcome', 'pages/Home.kreft').layout('none').name('welcome').title('Welcome')
+${todos ? "\nRoute.view('/todos', 'pages/Todos.kreft').name('todos').title('Todos')\n" : ''}
 // Documentation (docs/) and test suite (tests/)
-Route.view('/docs', 'docs/Docs.kreftjs').name('docs').title('Documentation').layout('docs')   // its own slim bar
-Route.view('/error-monitor', 'pages/ErrorMonitor.kreftjs').name('error-monitor').title('Error Monitor')
+Route.view('/docs', 'docs/Docs.kreft').name('docs').title('Documentation').layout('docs')   // its own slim bar
+Route.view('/error-monitor', 'pages/ErrorMonitor.kreft').name('error-monitor').title('Error Monitor')
 Route.prefix('/tests').name('tests.').group(() => {
-  Route.view('/', 'tests/pages/Test.kreftjs').name('index').title('Test Suite')
-  Route.view('/about', 'tests/pages/About.kreftjs').name('about').title('About · Tests')
+  Route.view('/', 'tests/pages/Test.kreft').name('index').title('Test Suite')
+  Route.view('/about', 'tests/pages/About.kreft').name('about').title('About · Tests')
 })
 `;
 
 const LAYOUT = (todos) => `<!-- The default layout: a slim bar and the page. Every route without .layout(…) uses it (see index.html). -->
+state docs = (Kreftjs.env.PUBLIC_DOCS_URL || 'http://kreftjs.com').replace(/\\/+$/, '')   // where "Documentation" links go: PUBLIC_DOCS_URL in .env
+
 <view>
   <header>
     <kreft-link to="/" class="brand"><span class="mark" aria-hidden="true"></span>{env.PUBLIC_APP_NAME || 'My app'}</kreft-link>
@@ -83,7 +85,7 @@ const LAYOUT = (todos) => `<!-- The default layout: a slim bar and the page. Eve
       <kreft-link to="/todos" exact-class="here">Todos</kreft-link>` : ''}
       <kreft-link to="/error-monitor" exact-class="here">Error monitor</kreft-link>
       <kreft-link to="/tests" exact-class="here">Tests</kreft-link>
-      <kreft-link to="/docs" exact-class="here">Docs</kreft-link>
+      <a href={docs + '/docs'} target="_blank" rel="noopener">Docs</a>
       <button type="button" class="theme" @click="theme.toggle()" aria-label="Toggle theme" title="Toggle theme">
         <span k-if="theme.dark">☀</span><span k-else>🌙</span>
       </button>
@@ -125,18 +127,18 @@ function removeAuth(target) {
   write('backend/routes/api.js', API(todos));
   write('backend/app/Providers/AppServiceProvider.js', PROVIDER);
   write('backend/database/seeders/DatabaseSeeder.js', SEEDER(todos));
-  write('frontend/routes/web.kreftjs', WEB(todos));
-  write('frontend/layouts/app.kreftjs', LAYOUT(todos));
+  write('frontend/routes/web.kreft', WEB(todos));
+  write('frontend/layouts/app.kreft', LAYOUT(todos));
 
   // index.html: no auth store, no guards, no "signed out" handling; the router keeps its pages and layout
   let html = read('frontend/index.html');
   const from = html.indexOf('    // Who is signed in.');
-  const to = html.indexOf("    Kreftjs.app('App.kreftjs')");
+  const to = html.indexOf("    Kreftjs.app('App.kreft')");
   if (from >= 0 && to > from) {
     html = html.slice(0, from) + `    const router = Kreftjs.router({
-      routes: ['routes/web.kreftjs'], // the pages are in routes/web.kreftjs; add more files: kreft make:routes admin
-      layout: 'app',              // every page goes inside layouts/app.kreftjs…
-      errors: 'errors',           // error pages: errors/404.kreftjs for unknown addresses, abort(403) → errors/403.kreftjs
+      routes: ['routes/web.kreft'], // the pages are in routes/web.kreft; add more files: kreft make:routes admin
+      layout: 'app',              // every page goes inside layouts/app.kreft…
+      errors: 'errors',           // error pages: errors/404.kreft for unknown addresses, abort(403) → errors/403.kreft
     })
 
 ` + html.slice(to);
@@ -145,12 +147,12 @@ function removeAuth(target) {
   write('frontend/index.html', html);
 
   // the welcome page loses its Log in / Sign up / Dashboard links
-  const home = read('frontend/pages/Home.kreftjs')
+  const home = read('frontend/pages/Home.kreft')
     .replace(/[ \t]*<kreft-link k-if="!?\$store\.auth\.user"[^>]*>[\s\S]*?<\/kreft-link>[ \t]*\r?\n/g, '');
-  write('frontend/pages/Home.kreftjs', home);
+  write('frontend/pages/Home.kreft', home);
 
   // the docs bar went back to "the app" when signed in
-  write('frontend/layouts/docs.kreftjs', read('frontend/layouts/docs.kreftjs')
+  write('frontend/layouts/docs.kreft', read('frontend/layouts/docs.kreft')
     .replace(/<kreft-link to=\{\$store\.auth\.user \? '\/dashboard' : '\/'\} class="back">← \{\$store\.auth\.user \? 'Back to the app' : 'Home'\}<\/kreft-link>/,
       '<kreft-link to="/" class="back">← Home</kreft-link>'));
 

package/bin/prerender.js

@@ -131,7 +131,7 @@ function createRenderer({ jsdom, origin, basePath, maxWait = 10000, userAgent, e
       return {
         problems,
         path: router ? router.route.path : route,
-        errorStatus: router && router.route.error ? Number(router.route.error.status) || 500 : 0, // the app showed errors/404.kreftjs (or another)
+        errorStatus: router && router.route.error ? Number(router.route.error.status) || 500 : 0, // the app showed errors/404.kreft (or another)
         title: w.document.title,
         tags: seoTags(w.document, origin),
         htmlAttrs: ['lang', 'dir', 'data-kreft-orig-lang', 'data-kreft-orig-dir'].filter((a) => w.document.documentElement.hasAttribute(a)).map((a) => [a, w.document.documentElement.getAttribute(a)]),