kreftjs 0.0.6-beta → 0.0.9-beta

package/README.md

@@ -2,12 +2,12 @@
 
 **A small reactive framework with its own component language, and a full Node.js backend to go with it.**
 
-You write components in `.kreftjs` files in plain words: `state`, `derive`, `action`. The same project also gives you routing, controllers, an Active Record ORM, migrations, queues, mail, sign-in pages with two-factor codes, and a development server with hot reload that keeps your state.
+You write components in `.kreft` files in plain words: `state`, `derive`, `action`. The same project also gives you routing, controllers, an Active Record ORM, migrations, queues, mail, sign-in pages with two-factor codes, and a development server with hot reload that keeps your state.
 
 📖 **[Read the documentation](docs/README.md)** · run `npm run dev` and open `/demo/docs` for the searchable version.
 
 ```html
-<!-- Counter.kreftjs -->
+<!-- Counter.kreft -->
 state count = 0
 derive double = count * 2
 action add() { count++ }
@@ -34,7 +34,7 @@ Open the address in the terminal (normally `http://localhost:8000`). A new proje
 
 | | |
 |---|---|
-| **The `.kreftjs` language** | `state`, `derive`, `action`, `watch`, `prop`, `event`, slots, stores, `saved` data, `load` for APIs, forms with validation, animations. |
+| **The `.kreft` language** | `state`, `derive`, `action`, `watch`, `prop`, `event`, slots, stores, `saved` data, `load` for APIs, forms with validation, animations. |
 | **Router** | Nested routes, layouts, guards, error pages, clean URLs. |
 | **Backend** | `Route`, controllers, form requests, policies, models with relations, soft deletes and scopes, migrations, seeders, factories, jobs, mail, notifications, cache, Redis, file storage, scheduling. |
 | **Authentication** | Cookie sessions with CSRF protection, API tokens with permissions, device list, two-factor codes, email verification, account lockout. |
@@ -63,9 +63,9 @@ server.js, server.d.ts    the backend entry point: require('kreftjs/server')
 bin/                      the `kreft` command and the backend modules (bin/backend/)
 tools/                    hot reload client, DevTools, Vite plugin
 templates/app/            the project that `kreft new` creates
-editors/vscode/           syntax colours and snippets for .kreftjs files
+editors/vscode/           syntax colours and snippets for .kreft files
 demo/                     the interactive demo
-docs/                     the manual (README.md) and its viewer (Docs.kreftjs)
+docs/                     the manual (README.md) and its viewer (Docs.kreft)
 test/                     security regression tests: npm test
 ```
 
@@ -73,32 +73,6 @@ test/                     security regression tests: npm test
 
 Views are escaped, logins use HttpOnly cookies with CSRF protection, passwords use scrypt, and `kreft dev` only answers your own computer. The manual has a [Security overview](docs/README.md#security-overview) and a [Production checklist](docs/README.md#production-checklist). Run `npm test` to run the security regression tests.
 
-## Migrating from Som.js
-
-Kreft is Som.js under a new name: the package is `kreftjs` (version 0.0.6-beta), the command is `kreft` (`kreftjs` works too), the global is `Kreftjs` and component files end in `.kreftjs`. The old names keep working, so an existing project runs without edits. New files and everything the tools write use the new names. Move over when it suits you. (`kreft` was an earlier spelling of the new name; it is accepted in the same places.)
-
-| Som.js | Kreft | Still works? |
-|---|---|---|
-| `npm i -g somjs` | `npm i -g kreftjs` | `kreftjs` is another name for `kreft`. Kreft does not install a `som` command, so it does not clash with an old Som.js (remove that with `npm rm -g somjs`). |
-| `som dev`, `som build`, `som make:page` … | `kreft dev`, `kreft build`, `kreft make:page` … | Replace `som` with `kreftjs`. |
-| `Counter.som` (and `Counter.kreft`) | `Counter.kreftjs` | Yes. All three extensions compile; a name that is missing with one extension is tried with the others (`layouts/app.kreftjs` finds `layouts/app.som`). |
-| `s-if`, `s-each`, `s-model` … (every `s-` directive) | `k-if`, `k-each`, `k-model` … | Yes. Both prefixes are read in templates. |
-| `<som-view>`, `<som-link>`, `<som-wait>`, `<som-component>`, `<som-yield>`, `<som-section>`, `<som-portal>` | `<kreft-view>`, `<kreft-link>` … | Yes. Both tag names work. |
-| `Som` (global object) | `Kreftjs` | `Som` and `Kreft` point to the same object. `Som` is deprecated. |
-| `Som.compileSom(source)` | `Kreftjs.compile(source)` | `compileSom` is kept as an alias. |
-| `window.somDesktop` | `window.kreftDesktop` | Same object under both names. |
-| `som.js`, `som.d.ts` in your project | `kreftjs.js`, `kreftjs.d.ts` | An existing `som.js` (or `kreft.js`) keeps working; `kreft update` rewrites it in place with the new runtime. |
-| `som.config.json`, `config/som.json` | `kreftjs.config.json`, `config/kreftjs.json` | Yes: `kreft.config.json` and `som.config.json` are read too (the new name wins). |
-| `require('somjs/server')` | `require('kreftjs/server')` | Also accepted: `kreft/server`, `@kreft/server`, `somjs/server`, `som/server`, `@somjs/server`. |
-| `som_session`, `som_2fa`, `som_bypass` cookies | `kreft_session`, `kreft_2fa`, `kreft_bypass` | `app/Auth/Session.js` belongs to your project, so an existing project keeps its `som_` names until you edit that file. The framework's CSRF check and the maintenance-mode bypass accept both. New projects use the new names. |
-| `SOM_ALLOWED_HOSTS`, `SOM_SSR`, `SOM_SSR_TTL`, `SOM_MCP_TOKEN`, `SOM_CLI`, `SOM_ELECTRON_DEVTOOLS` | `KREFT_…` with the same ending | Yes: the `KREFT_` name is read first, then the `SOM_` one. |
-| `window.__SOM_ENV__`, `__SOM_DEV__`, `__SOM_LANG__`, `__SOM_VITE__` | `__KREFT_ENV__` … | Read by the runtime under both names. |
-| `/__som/…` dev-server addresses | `/__kreft/…` | The dev server answers both. |
-| Vite: `import som from 'somjs/vite'` | `import kreftjs from 'kreftjs/vite'` | The plugin also exports `kreft`, `som` and `somPlugin`, and handles `.kreft` and `.som` files. |
-| VS Code extension `.som` language | `.kreftjs` language | The new extension colours `.kreft` and `.som` files as well. Run `kreft vscode` to install it. |
-
-Kept on purpose, with a TODO for 3.1: the `som_migrations` table (renaming it would lose the migration history of every deployed database), the `som:` prefix of `saved`/`Kreftjs.storage` keys in `localStorage`, and the `som:queue:` / `som:delayed:` Redis keys of the queue. Renaming them needs a migration with a fallback read, so it waits for a minor release.
-
 ## License
 
 Kreft is released under the [Elastic License 2.0](LICENSE). You may use it, including to build and sell your own applications, copy it and change it. You may not offer Kreft itself to others as a hosted or managed service, and you may not remove or hide its license notices.

package/bin/artisan-more.js

@@ -364,7 +364,9 @@ commands['sitemap'] = async function (args) {
   // a route with a :param or * is a family of pages, not one address: it cannot be listed as it is
   const add = (p) => { if (p && p.startsWith('/') && !/[:*]/.test(p) && !routes.includes(p)) routes.push(p); };
   const webKreft = [
+    path.join(ctx.frontend, 'routes', 'web.kreft'),
     path.join(ctx.frontend, 'routes', 'web.kreftjs'),
+    path.join(ctx.project, 'routes', 'web.kreft'),
     path.join(ctx.project, 'routes', 'web.kreftjs'),
   ].find((f) => fs.existsSync(f));
 

package/bin/artisan.js

@@ -20,6 +20,11 @@
 const fs = require('fs');
 const path = require('path');
 
+// Component files are .kreft; projects from the 0.0.x betas have .kreftjs. A path asked for as .kreft
+// also tries .kreftjs, so every command keeps working in an older project.
+const altExts = (f) => (/\.kreft$/.test(f) ? [f, f.replace(/\.kreft$/, '.kreftjs')] : [f]);
+const existingKreft = (f) => altExts(f).find((x) => fs.existsSync(x)) || f;
+
 function options(args) {
   const flatArgs = (Array.isArray(args) ? args.flat(Infinity) : []).map((x) => (typeof x === 'string' ? x : String(x ?? '')));
   const o = { _: [], flags: new Set() };
@@ -214,11 +219,11 @@ function write(file, content, base) {
 }
 
 const stubs = {
-  webRoutes: (name) => `// The ${name} pages. index.html loads it: Kreftjs.router({ routes: ['routes/web.kreftjs', 'routes/${name}.kreftjs'] })
-// Route.view(address, page) · .name() · .title() · .layout() · .middleware()   — see routes/web.kreftjs
+  webRoutes: (name) => `// The ${name} pages. index.html loads it: Kreftjs.router({ routes: ['routes/web.kreft', 'routes/${name}.kreft'] })
+// Route.view(address, page) · .name() · .title() · .layout() · .middleware()   — see routes/web.kreft
 
 Route.prefix('/${name}').name('${name}.').middleware('auth').group(() => {
-  // Route.view('/', 'pages/${name}/Index.kreftjs').name('index').title('${name[0].toUpperCase() + name.slice(1)}')
+  // Route.view('/', 'pages/${name}/Index.kreft').name('index').title('${name[0].toUpperCase() + name.slice(1)}')
 })
 `,
   apiRoutes: (name) => `// The ${name} API, a route file of its own. routes/api.js loads it with require('./${name}'), so every address starts with /api.
@@ -526,8 +531,8 @@ ${fields}
 }))
 `;
   },
-  page: (name, endpoint, dirs = [], isTs = false) => `<!-- frontend/pages/${[...dirs, name].join('/')}.kreftjs -->
-layout 'layouts/app.kreftjs'
+  page: (name, endpoint, dirs = [], isTs = false) => `<!-- frontend/pages/${[...dirs, name].join('/')}.kreft -->
+layout 'layouts/app.kreft'
 ${isTs ? `
 interface ${name}Item {
   id: number
@@ -856,7 +861,7 @@ function addApiRoute(ctx, name, dirs, { route, auth }) {
 
   if (!text.includes(controllerName)) {
     if (text.includes("require('kreftjs/server')") || text.includes("from 'kreftjs/server'")) {
-      text = text.replace(/((?:const \{[^}]+\} = require\('(?:kreftjs|kreft|somjs|som)\/server'\)|import \{[^}]+\} from '(?:kreftjs|kreft|somjs|som)\/server')[^\n]*\n)/, `$1${requireLine}`);
+      text = text.replace(/((?:const \{[^}]+\} = require\('(?:kreftjs|kreft)\/server'\)|import \{[^}]+\} from '(?:kreftjs|kreft)\/server')[^\n]*\n)/, `$1${requireLine}`);
     } else {
       text = requireLine + text;
     }
@@ -869,7 +874,7 @@ function addApiRoute(ctx, name, dirs, { route, auth }) {
 }
 
 function addSidebarLink(ctx, routeNameTag, label) {
-  const layoutFile = path.join(ctx.frontend, 'layouts', 'app.kreftjs');
+  const layoutFile = existingKreft(path.join(ctx.frontend, 'layouts', 'app.kreft'));
   if (!fs.existsSync(layoutFile)) return;
   let text = fs.readFileSync(layoutFile, 'utf8');
   if (text.includes(`'${routeNameTag}'`) || text.includes(`"${routeNameTag}"`)) return;
@@ -884,17 +889,17 @@ function addSidebarLink(ctx, routeNameTag, label) {
 }
 
 function addWebRoute(ctx, name, dirs, { route, auth }) {
-  const routeName = route ? String(route).replace(/\.(kreftjs|kreft|som|js)$/, '').replace(/^[\\/]+/, '') : 'web';
+  const routeName = route ? String(route).replace(/\.(kreftjs|kreft|js)$/, '').replace(/^[\\/]+/, '') : 'web';
   const routeBaseName = routeName.split(/[\\/]/).pop();
   const fileTargetName = routeBaseName === 'api' ? 'web' : routeBaseName;
-  const routeFile = path.join(ctx.frontend, 'routes', fileTargetName + '.kreftjs');
+  const routeFile = existingKreft(path.join(ctx.frontend, 'routes', fileTargetName + '.kreft'));
 
   if (!fs.existsSync(routeFile)) {
     write(routeFile, stubs.webRoutes(fileTargetName));
   }
 
   const endpoint = '/' + [...(dirs.length ? dirs.map((d) => snake(d).replace(/_/g, '-')) : []), plural(snake(name)).replace(/_/g, '-')].join('/');
-  const pageRel = `pages/${[...dirs, name].join('/')}.kreftjs`;
+  const pageRel = `pages/${[...dirs, name].join('/')}.kreft`;
   let text = fs.readFileSync(routeFile, 'utf8');
 
   if (text.includes(`'${endpoint}'`) || text.includes(`"${endpoint}"`)) {
@@ -1007,29 +1012,29 @@ function removeApiRoute(ctx, name, dirs, { route, dryRun = false }) {
 }
 
 function removeWebRoute(ctx, name, dirs, { route, dryRun = false }) {
-  const routeName = route ? String(route).replace(/\.(kreftjs|kreft|som|js)$/, '').replace(/^[\\/]+/, '') : 'web';
+  const routeName = route ? String(route).replace(/\.(kreftjs|kreft|js)$/, '').replace(/^[\\/]+/, '') : 'web';
   const routeBaseName = routeName.split(/[\\/]/).pop();
   const fileTargetName = routeBaseName === 'api' ? 'web' : routeBaseName;
   const routeFiles = [
-    path.join(ctx.frontend, 'routes', fileTargetName + '.kreftjs'),
-    path.join(ctx.project, 'frontend', 'routes', fileTargetName + '.kreftjs'),
-    path.join(ctx.frontend, 'routes', 'web.kreftjs'),
-    path.join(ctx.project, 'frontend', 'routes', 'web.kreftjs'),
-    path.join(ctx.project, 'routes', fileTargetName + '.kreftjs'),
-    path.join(ctx.project, 'routes', 'web.kreftjs')
-  ];
+    path.join(ctx.frontend, 'routes', fileTargetName + '.kreft'),
+    path.join(ctx.project, 'frontend', 'routes', fileTargetName + '.kreft'),
+    path.join(ctx.frontend, 'routes', 'web.kreft'),
+    path.join(ctx.project, 'frontend', 'routes', 'web.kreft'),
+    path.join(ctx.project, 'routes', fileTargetName + '.kreft'),
+    path.join(ctx.project, 'routes', 'web.kreft')
+  ].flatMap(altExts);
 
   const seenFiles = new Set();
   const removals = [];
 
   const ep1 = '/' + [...(dirs.length ? dirs.map((d) => snake(d).replace(/_/g, '-')) : []), plural(snake(name)).replace(/_/g, '-')].join('/');
   const ep2 = '/' + plural(snake(name)).replace(/_/g, '-');
-  const pageRel1 = `pages/${[...dirs, name].join('/')}.kreftjs`;
-  const pageRel2 = `pages/${name}.kreftjs`;
+  const pageRel1 = `pages/${[...dirs, name].join('/')}.kreft`;
+  const pageRel2 = `pages/${name}.kreft`;
   const routeNameTag1 = [...dirs.map(snake), plural(snake(name)).replace(/_/g, '-')].join('.');
   const routeNameTag2 = plural(snake(name)).replace(/_/g, '-');
 
-  const matchTargets = [ep1, ep2, ep1.replace(/^\//, ''), ep2.replace(/^\//, ''), pageRel1, pageRel2, routeNameTag1, routeNameTag2];
+  const matchTargets = [ep1, ep2, ep1.replace(/^\//, ''), ep2.replace(/^\//, ''), ...altExts(pageRel1), ...altExts(pageRel2), routeNameTag1, routeNameTag2];
 
   for (const f of routeFiles) {
     if (!f || seenFiles.has(f) || !fs.existsSync(f)) continue;
@@ -1064,10 +1069,10 @@ function removeWebRoute(ctx, name, dirs, { route, dryRun = false }) {
 
 function removeSidebarLink(ctx, name, dirs, { dryRun = false }) {
   const layoutFiles = [
-    path.join(ctx.frontend, 'layouts', 'app.kreftjs'),
-    path.join(ctx.project, 'frontend', 'layouts', 'app.kreftjs'),
-    path.join(ctx.project, 'layouts', 'app.kreftjs')
-  ];
+    path.join(ctx.frontend, 'layouts', 'app.kreft'),
+    path.join(ctx.project, 'frontend', 'layouts', 'app.kreft'),
+    path.join(ctx.project, 'layouts', 'app.kreft')
+  ].flatMap(altExts);
 
   const seenFiles = new Set();
   const removals = [];
@@ -1257,13 +1262,13 @@ const make = {
     const auth = o.flags.has('auth');
     const hasRoute = o.flags.has('r') || o.flags.has('route') || Boolean(o.route);
 
-    const pageFile = path.join(ctx.frontend, 'pages', ...dirs, name + '.kreftjs');
+    const pageFile = path.join(ctx.frontend, 'pages', ...dirs, name + '.kreft');
     const isTs = isTsProject(pageFile);
     if (write(pageFile, stubs.page(name, endpoint, dirs, isTs))) {
       if (hasRoute) {
         addWebRoute(ctx, name, dirs, { route: o.route, auth });
       } else {
-        console.log(dim(`  Add to frontend/routes/web.kreftjs:  Route.view('/${endpoint}', 'pages/${[...dirs, name].join('/')}.kreftjs')${auth ? ".middleware('auth')" : ''}`));
+        console.log(dim(`  Add to frontend/routes/web.kreft:  Route.view('/${endpoint}', 'pages/${[...dirs, name].join('/')}.kreft')${auth ? ".middleware('auth')" : ''}`));
       }
     }
   },
@@ -1494,7 +1499,7 @@ const make = {
     console.log(dim(`  Use in frontend: { __('auth.failed') } or { t('Sign In') }`));
   },
 };
-// kreft make:errors — the error pages (errors/404.kreftjs, 403, 500…)
+// kreft make:errors — the error pages (errors/404.kreft, 403, 500…)
 make.errors = function (args) {
   const o = options(args), ctx = context(o);
   const from = path.join(__dirname, '..', 'templates', 'errors');
@@ -1504,18 +1509,18 @@ make.errors = function (args) {
   const index = path.join(o.dir ? path.resolve(o.dir) : ctx.frontend, 'index.html');
   if (fs.existsSync(index)) {
     const html = fs.readFileSync(index, 'utf8');
-    if (!/errors\s*:/.test(html) && /(?:Kreftjs|Kreft|Som)\.router\(\{/.test(html)) {
-      fs.writeFileSync(index, html.replace(/(?:Kreftjs|Kreft|Som)\.router\(\{/, (m) => `${m}\n      errors: '${path.relative(path.dirname(index), to).split(path.sep).join('/')}', // error pages: errors/404.kreftjs, abort(403) → errors/403.kreftjs`));
+    if (!/errors\s*:/.test(html) && /(?:Kreftjs|Kreft)\.router\(\{/.test(html)) {
+      fs.writeFileSync(index, html.replace(/(?:Kreftjs|Kreft)\.router\(\{/, (m) => `${m}\n      errors: '${path.relative(path.dirname(index), to).split(path.sep).join('/')}', // error pages: errors/404.kreft, abort(403) → errors/403.kreft`));
       console.log(`  ${green('UPDATED')}  ${path.relative(process.cwd(), index) || 'index.html'}  (errors: '${path.relative(path.dirname(index), to).split(path.sep).join('/')}' in Kreftjs.router)`);
     }
   }
 };
 
-// kreft make:routes admin        → frontend/routes/admin.kreftjs (pages), listed in Kreftjs.router({ routes: […] }) in index.html
+// kreft make:routes admin        → frontend/routes/admin.kreft (pages), listed in Kreftjs.router({ routes: […] }) in index.html
 // kreft make:routes admin --api  → backend/routes/admin.js (API), loaded by routes/api.js
 make.routes = function (args) {
   const o = options(args), ctx = context(o);
-  const name = String(o._[0] || '').replace(/\.(kreftjs|kreft|som|js)$/, '').replace(/[^\w-]/g, '');
+  const name = String(o._[0] || '').replace(/\.(kreftjs|kreft|js)$/, '').replace(/[^\w-]/g, '');
   if (!name) return console.error('  kreft make:routes admin        (pages)\n  kreft make:routes admin --api  (API)');
   if (o.flags.has('api')) {
     const file = path.join(ctx.base, 'routes', name + '.js');
@@ -1526,20 +1531,20 @@ make.routes = function (args) {
       const isTs = api.endsWith('.ts');
       if (!text.includes(`require('./${name}')`) && !text.includes(`import './${name}'`)) {
         const updated = isTs
-          ? text.replace(/(import \{[^}]*Route[^}]*\} from ['"](?:kreftjs|kreft|somjs|som)\/server['"][^\n]*\n)/, `$1\n// ${name} routes (routes/${name}.ts)\nimport './${name}'\n`)
-          : text.replace(/(const \{ Route \} = require\('(?:kreftjs|kreft|somjs|som)\/server'\)\n)/, `$1\n// ${name} routes (routes/${name}.js)\nrequire('./${name}')\n`);
+          ? text.replace(/(import \{[^}]*Route[^}]*\} from ['"](?:kreftjs|kreft)\/server['"][^\n]*\n)/, `$1\n// ${name} routes (routes/${name}.ts)\nimport './${name}'\n`)
+          : text.replace(/(const \{ Route \} = require\('(?:kreftjs|kreft)\/server'\)\n)/, `$1\n// ${name} routes (routes/${name}.js)\nrequire('./${name}')\n`);
         fs.writeFileSync(api, updated !== text ? updated : text + `\n${isTs ? `import './${name}'` : `require('./${name}')`}\n`);
         console.log(`  ${green('UPDATED')}  ${path.relative(process.cwd(), api)}  (${isTs ? `import './${name}'` : `require('./${name}')`})`);
       }
     }
     return;
   }
-  const file = path.join(ctx.frontend, 'routes', name + '.kreftjs');
+  const file = path.join(ctx.frontend, 'routes', name + '.kreft');
   if (!write(file, stubs.webRoutes(name))) return;
   const index = path.join(ctx.frontend, 'index.html');
   if (!fs.existsSync(index)) return;
   const html = fs.readFileSync(index, 'utf8');
-  const entry = `'routes/${name}.kreftjs'`;
+  const entry = `'routes/${name}.kreft'`;
   if (html.includes(entry)) return;
   let next = html;
   if (/routes:\s*\[\s*'routes\//.test(html)) next = html.replace(/(routes:\s*\[[^\]]*?)(\s*\])/, (_, list, end) => `${list.replace(/,\s*$/, '')}, ${entry}${end}`);
@@ -1645,7 +1650,7 @@ async function removeModel(args) {
   // Collect candidate files to delete
   const filesToDelete = new Set();
   const checkFile = (p) => {
-    if (p && fs.existsSync(p)) filesToDelete.add(p);
+    for (const f of altExts(p || '')) if (f && fs.existsSync(f)) filesToDelete.add(f);
   };
 
   // 1. Model
@@ -1722,17 +1727,17 @@ async function removeModel(args) {
 
   // 6. Page
   if (wantsPage) {
-    checkFile(path.join(ctx.frontend, 'pages', ...otherDirs, `${name}.kreftjs`));
+    checkFile(path.join(ctx.frontend, 'pages', ...otherDirs, `${name}.kreft`));
     if (dirs.length && dirs.join('/') !== otherDirs.join('/')) {
-      checkFile(path.join(ctx.frontend, 'pages', ...dirs, `${name}.kreftjs`));
+      checkFile(path.join(ctx.frontend, 'pages', ...dirs, `${name}.kreft`));
     }
-    checkFile(path.join(ctx.frontend, 'pages', `${name}.kreftjs`));
-    checkFile(path.join(ctx.project, 'frontend', 'pages', ...otherDirs, `${name}.kreftjs`));
-    checkFile(path.join(ctx.project, 'frontend', 'pages', ...dirs, `${name}.kreftjs`));
-    checkFile(path.join(ctx.project, 'frontend', 'pages', `${name}.kreftjs`));
-    checkFile(path.join(ctx.project, 'pages', ...otherDirs, `${name}.kreftjs`));
-    checkFile(path.join(ctx.project, 'pages', ...dirs, `${name}.kreftjs`));
-    checkFile(path.join(ctx.project, 'pages', `${name}.kreftjs`));
+    checkFile(path.join(ctx.frontend, 'pages', `${name}.kreft`));
+    checkFile(path.join(ctx.project, 'frontend', 'pages', ...otherDirs, `${name}.kreft`));
+    checkFile(path.join(ctx.project, 'frontend', 'pages', ...dirs, `${name}.kreft`));
+    checkFile(path.join(ctx.project, 'frontend', 'pages', `${name}.kreft`));
+    checkFile(path.join(ctx.project, 'pages', ...otherDirs, `${name}.kreft`));
+    checkFile(path.join(ctx.project, 'pages', ...dirs, `${name}.kreft`));
+    checkFile(path.join(ctx.project, 'pages', `${name}.kreft`));
   }
 
   // 7. Migration
@@ -1868,9 +1873,6 @@ commands['remove'] = async function (args) {
   return await remove.model(args);
 };
 commands['kreft:remove'] = commands['remove'];
-// the Som.js names
-commands['som:remove:model'] = remove.model;
-commands['som:remove'] = commands['remove'];
 
 module.exports = { commands, stubs, make, remove, helpers: { options, context, withDb, write, nested, green, red, yellow, dim, migrationsOf, nextStamp, up, pascal, runSeed } };
 // the rest of the commands (queues, schedule, cache, tinker, make:job …) add themselves here

package/bin/backend/config.js

@@ -145,8 +145,8 @@ class ConfigRepository {
     }
 
     // 2. Load and merge kreftjs.config.json if present
-    // (kreft.config.json and som.config.json are the earlier names, read when there is no kreftjs.config.json)
-    const kreftConfigPath = ['kreftjs.config.json', 'kreft.config.json', 'som.config.json'].map((n) => path.join(root, n)).find((p) => fs.existsSync(p)) || path.join(root, 'kreftjs.config.json');
+    // (kreft.config.json is the earlier name, read when there is no kreftjs.config.json)
+    const kreftConfigPath = ['kreftjs.config.json', 'kreft.config.json'].map((n) => path.join(root, n)).find((p) => fs.existsSync(p)) || path.join(root, 'kreftjs.config.json');
     if (fs.existsSync(kreftConfigPath)) {
       try {
         delete require.cache[require.resolve(kreftConfigPath)];

package/bin/backend/http.js

@@ -198,7 +198,7 @@ class Request {
       return this._locale;
     }
     // 2. Cookie locale / lang / kreft_locale
-    const c = this.cookie('locale') || this.cookie('lang') || this.cookie('kreft_locale') || this.cookie('som_locale'); // som_*: the Som.js cookie names, still read
+    const c = this.cookie('locale') || this.cookie('lang') || this.cookie('kreft_locale'); 
     if (c && typeof c === 'string') {
       this._locale = c.toLowerCase().trim();
       return this._locale;
@@ -231,7 +231,7 @@ class Request {
   // CSRF token helpers
   csrfToken() {
     if (this._csrfToken) return this._csrfToken;
-    const cookieToken = this.cookie('XSRF-TOKEN') || this.cookie('kreft_xsrf') || this.cookie('som_xsrf');
+    const cookieToken = this.cookie('XSRF-TOKEN') || this.cookie('kreft_xsrf');
     if (cookieToken) {
       this._csrfToken = cookieToken;
       return this._csrfToken;
@@ -247,7 +247,7 @@ class Request {
       || this.header('csrf-token')
       || this.input('_token')
       || this.input('csrf_token');
-    const expected = this.cookie('XSRF-TOKEN') || this.cookie('kreft_xsrf') || this.cookie('som_xsrf') || this._csrfToken;
+    const expected = this.cookie('XSRF-TOKEN') || this.cookie('kreft_xsrf') || this._csrfToken;
     return same(candidate, expected);
   }
 
@@ -538,9 +538,9 @@ class VerifyCsrfToken {
         || req.header('csrf-token')
         || req.input('_token')
         || req.input('csrf_token');
-      const expected = req.cookie('XSRF-TOKEN') || req.cookie('kreft_xsrf') || req.cookie('som_xsrf') || req._csrfToken;
+      const expected = req.cookie('XSRF-TOKEN') || req.cookie('kreft_xsrf') || req._csrfToken;
       const bearer = req.bearerToken();
-      const hasCookieAuth = Boolean(req.cookie('kreft_session') || req.cookie('som_session') || req.cookie('XSRF-TOKEN') || req.cookie('kreft_xsrf') || req.cookie('som_xsrf')); // som_*: Som.js cookies still count as cookie auth
+      const hasCookieAuth = Boolean(req.cookie('kreft_session') || req.cookie('XSRF-TOKEN') || req.cookie('kreft_xsrf'))
 
       // If accessing via session/cookies or standard browser form requests, enforce CSRF:
       if (hasCookieAuth || !bearer) {

package/bin/backend/index.js

@@ -31,8 +31,8 @@ function installAlias() {
   const original = Module._resolveFilename;
   require('./typescript.js').registerTypeScript(process.cwd()); // .ts files in routes/, app/, database/
   Module._resolveFilename = function (request, ...rest) {
-    // kreft/server and @kreft/server are the earlier Kreft names; somjs/server, som/server and @somjs/server the Som.js ones: older projects still require them
-    if (['kreftjs/server', '@kreftjs/server', 'kreft/server', '@kreft/server', 'somjs/server', 'som/server', '@somjs/server'].includes(request)) return SERVER_ENTRY;
+    // kreft/server and @kreft/server are the earlier Kreft names: older projects still require them
+    if (['kreftjs/server', '@kreftjs/server', 'kreft/server', '@kreft/server'].includes(request)) return SERVER_ENTRY;
     return original.call(this, request, ...rest);
   };
 }

package/bin/backend/mcp.js

@@ -159,16 +159,15 @@ class McpServer {
       };
     });
 
-    // 4. Resource: kreft://routes   (som://routes is the Som.js address, still answered)
+    // 4. Resource: kreft://routes
     const routesResource = async () => {
       const { Route } = require('./index.js');
       const routes = Route.list();
       return JSON.stringify(routes, null, 2);
     };
     this.registerResource('kreft://routes', 'Active Kreft Routes', 'application/json', routesResource);
-    this.registerResource('som://routes', 'Active Kreft Routes (Som.js address)', 'application/json', routesResource);
 
-    // 5. Resource: kreft://schema   (som://schema likewise)
+    // 5. Resource: kreft://schema
     const schemaResource = async () => {
       try {
         const migrator = require('./migrator.js');
@@ -179,7 +178,6 @@ class McpServer {
       }
     };
     this.registerResource('kreft://schema', 'Database Schema', 'application/json', schemaResource);
-    this.registerResource('som://schema', 'Database Schema (Som.js address)', 'application/json', schemaResource);
   }
 
   async handleMessage(reqObj) {
@@ -324,7 +322,7 @@ class McpServer {
     const hostName = String(req.headers.host || '').replace(/:\d+$/, '').replace(/^\[|\]$/g, '').toLowerCase();
     const isLocalHost = hostName === 'localhost' || hostName === '127.0.0.1' || hostName === '::1';
     const isProd = process.env.NODE_ENV === 'production' || process.env.APP_ENV === 'production';
-    const requiredToken = process.env.MCP_TOKEN || (process.env.KREFT_MCP_TOKEN || process.env.SOM_MCP_TOKEN) || null;
+    const requiredToken = process.env.MCP_TOKEN || process.env.KREFT_MCP_TOKEN || null;
     const deny = (status, message) => {
       res.writeHead(status, { 'Content-Type': 'application/json' });
       return res.end(JSON.stringify({ jsonrpc: '2.0', id: null, error: { code: -32000, message } }));

package/bin/backend/migrator.js

@@ -17,9 +17,7 @@ const { createSchema } = require('./schema.js');
 const { setConnection } = require('./query.js');
 const { forgetTables } = require('./model.js');
 
-// TODO(3.1): the table keeps its Som.js name so deployed databases keep their history. Rename it to kreft_migrations
-// in a migration of its own, and read the old table as a fallback until every database has moved.
-const TABLE = 'som_migrations';
+const TABLE = 'kreft_migrations';
 
 async function ensureTable(db) {
   const text = db.kind === 'postgres' ? 'TEXT' : 'VARCHAR(255)';

package/bin/backend/query.js

@@ -216,7 +216,7 @@ class Builder {
     const { sql, params } = this.toSql();
     const rows = await this.db.query(sql, params);
     const maxWarn = Number(process.env.MAX_QUERY_ROWS) || 10000;
-    const isCliOrMigrate = (process.env.KREFT_CLI || process.env.SOM_CLI) === '1' || process.argv.some((a) => /artisan|migrate|seed/i.test(a));
+    const isCliOrMigrate = process.env.KREFT_CLI === '1' || process.argv.some((a) => /artisan|migrate|seed/i.test(a));
     const hardLimit = this._unlimited || isCliOrMigrate ? 0 : (Number(process.env.HARD_QUERY_LIMIT) || (process.env.NODE_ENV === 'production' ? 50000 : 0));
     if (rows && rows.length >= maxWarn && this._limit == null && !this._unlimited) {
       console.warn(`[Kreft Query Warning] Query on "${this._table}" returned ${rows.length} rows without an explicit limit(). Consider using paginate(), chunk(), or limit() to prevent high memory usage.`);

package/bin/backend/queue.js

@@ -219,13 +219,12 @@ async function push(kind, className, data, { delay = 0, queue } = {}) {
   const payload = payloadOf(kind, className, data);
 
   if (conn === 'redis') {
-    // TODO(3.1): the 'som:queue:' / 'som:delayed:' key names keep their Som.js spelling so waiting jobs survive the rename
     const { Redis } = require('./redis.js');
     const redis = Redis.connection('queue');
     if (delay > 0) {
-      await redis.zadd('som:delayed:' + qName, now() + Math.max(0, Number(delay) || 0), payload);
+      await redis.zadd('kreft:delayed:' + qName, now() + Math.max(0, Number(delay) || 0), payload);
     } else {
-      await redis.lpush('som:queue:' + qName, payload);
+      await redis.lpush('kreft:queue:' + qName, payload);
     }
     return true;
   }
@@ -291,17 +290,17 @@ async function workOne({ queues = ['default'], log = () => {} } = {}) {
     for (const qName of targetQueues) {
       // Move delayed jobs that became ready into the main list
       try {
-        const due = await redis.zrangebyscore('som:delayed:' + qName, '-inf', now());
+        const due = await redis.zrangebyscore('kreft:delayed:' + qName, '-inf', now());
         if (Array.isArray(due) && due.length > 0) {
           for (const item of due) {
-            const removed = await redis.zrem('som:delayed:' + qName, item);
-            if (removed) await redis.lpush('som:queue:' + qName, item);
+            const removed = await redis.zrem('kreft:delayed:' + qName, item);
+            if (removed) await redis.lpush('kreft:queue:' + qName, item);
           }
         }
       } catch (_) {}
 
       let raw = null;
-      try { raw = await redis.rpop('som:queue:' + qName); } catch (_) {}
+      try { raw = await redis.rpop('kreft:queue:' + qName); } catch (_) {}
       if (!raw) continue;
       const p = parseJson(raw);
       const C = require('./app.js').find(p.class);
@@ -317,8 +316,8 @@ async function workOne({ queues = ['default'], log = () => {} } = {}) {
           const backoff = [].concat((C && C.backoff) || 0);
           const waitSec = Number(backoff[Math.min(attempts - 1, backoff.length - 1)] || 0);
           const retryPayload = JSON.stringify({ ...p, attempts });
-          if (waitSec > 0) await redis.zadd('som:delayed:' + qName, now() + waitSec, retryPayload);
-          else await redis.lpush('som:queue:' + qName, retryPayload);
+          if (waitSec > 0) await redis.zadd('kreft:delayed:' + qName, now() + waitSec, retryPayload);
+          else await redis.lpush('kreft:queue:' + qName, retryPayload);
           log(`  ${new Date().toISOString().slice(11, 19)} ${p.class} ${'.'.repeat(Math.max(2, 40 - p.class.length))} RETRY (${attempts}/${tries}): ${e.message}`);
           return 'released';
         }

package/bin/backend/redis.js

@@ -26,7 +26,7 @@
  *   REDIS_PORT=6379
  *   REDIS_PASSWORD=
  *   REDIS_DB=0
- *   REDIS_PREFIX=som:
+ *   REDIS_PREFIX=kreft:
  *
  * Zero mandatory dependencies: works out of the box with Node's native net module (RESP protocol).
  * Seamlessly wraps ioredis or redis npm packages when installed.

package/bin/backend/typescript.js

@@ -1,7 +1,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
+ *   - Frontend: .ts modules (e.g. frontend/logic/*.ts) and .kreft components with TypeScript syntax work natively in
  *     both `kreft dev` and `kreft build`.
  *
  * Uses `esbuild` when installed in the project, or falls back to Kreft's built-in zero-dependency TypeScript