@getxflow/cli 1.4.0 → 1.6.0

package/dist/bin.js

@@ -25,7 +25,6 @@ const schedules_1 = require("./commands/schedules");
 const skills_1 = require("./commands/skills");
 const sources_1 = require("./commands/sources");
 const storage_1 = require("./commands/storage");
-const pages_1 = require("./commands/pages");
 const deploy_1 = require("./commands/deploy");
 const dev_1 = require("./commands/dev");
 const update_1 = require("./commands/update");
@@ -180,15 +179,11 @@ async function run(args) {
                 await (0, db_1.dbExec)({ ...args, words: args.words.slice(2) });
                 return;
             }
-            if (second === 'move') {
-                await (0, db_1.dbMove)(rest);
-                return;
-            }
             if (second === undefined || second === 'status') {
                 await (0, db_1.dbStatus)({ ...args, words: args.words.slice(2) });
                 return;
             }
-            throw new errors_1.CliError(`Unknown command: db ${second}`, 'Available: status, list, schema, query, exec, migrate and move');
+            throw new errors_1.CliError(`Unknown command: db ${second}`, 'Available: status, list, schema, query, exec and migrate');
         case 'storage':
             if (second === 'push') {
                 await (0, storage_1.storagePush)(rest);
@@ -203,32 +198,6 @@ async function run(args) {
                 return;
             }
             throw new errors_1.CliError(`Unknown command: storage ${second}`, 'Available: ls, push and rm');
-        case 'pages':
-            if (second === 'create') {
-                await (0, pages_1.pagesCreate)(rest);
-                return;
-            }
-            if (second === 'deploy') {
-                await (0, pages_1.pagesDeploy)(rest);
-                return;
-            }
-            if (second === 'status') {
-                await (0, pages_1.pagesStatus)(rest);
-                return;
-            }
-            if (second === 'rollback') {
-                await (0, pages_1.pagesRollback)(rest);
-                return;
-            }
-            if (second === 'rm' || second === 'remove') {
-                await (0, pages_1.pagesRemove)(rest);
-                return;
-            }
-            if (second === undefined || second === 'list') {
-                await (0, pages_1.pagesList)(rest);
-                return;
-            }
-            throw new errors_1.CliError(`Unknown command: pages ${second}`, 'Available: list, create, deploy, status, rollback and rm');
         case 'status':
             await (0, sources_1.status)();
             return;
@@ -338,7 +307,7 @@ async function main() {
                 // XFLOW_TOKEN is taken as given and no organization is looked for, so a
                 // project of another one answers "not found" with nothing else to say.
                 if (process.env.XFLOW_TOKEN?.trim()) {
-                    (0, ui_1.fatalNote)((0, ui_1.dim)('  XFLOW_TOKEN is set: it is the key of one organization and is used as it comes, so a project or a page of another one is not found'));
+                    (0, ui_1.fatalNote)((0, ui_1.dim)('  XFLOW_TOKEN is set: it is the key of one organization and is used as it comes, so a project of another one is not found'));
                 }
                 else if (e.apiUrl && (0, credentials_1.listOrgs)(e.apiUrl).length > 1) {
                     (0, ui_1.fatalNote)((0, ui_1.dim)('  Several organizations are signed in: the answer may live in another one, see xflow org'));

package/dist/commands/db.js

@@ -5,7 +5,6 @@ exports.dbList = dbList;
 exports.dbSchema = dbSchema;
 exports.dbQuery = dbQuery;
 exports.dbExec = dbExec;
-exports.dbMove = dbMove;
 exports.dbMigrate = dbMigrate;
 exports.migrateBeforeDeploy = migrateBeforeDeploy;
 const node_fs_1 = require("node:fs");
@@ -20,41 +19,6 @@ const ui_1 = require("../ui");
 const sources_1 = require("./sources");
 /** Migration files live in the repo; the applied history lives in the database. */
 const MIGRATIONS_DIR = 'migrations';
-function serverLabel(server) {
-    if (server === undefined)
-        return '-';
-    if (server === null)
-        return 'platform';
-    return server.status === 'active' ? `own "${server.name}"` : `own "${server.name}", ${server.status}`;
-}
-const moving = (move) => move?.status === 'copying' || move?.status === 'switching';
-/** Asked apart from the history: during a move the database does not answer, this does. */
-async function projectDatabase(client, projectId) {
-    try {
-        return await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/db/move`);
-    }
-    catch (e) {
-        if (e instanceof api_1.ApiError && e.code === 'not_deployed')
-            return null;
-        throw e;
-    }
-}
-function printPlace(history, place) {
-    (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
-    if (history.server !== undefined)
-        (0, ui_1.out)(`Server: ${serverLabel(history.server)}`);
-    if (place?.move)
-        (0, ui_1.out)(`Move:   ${moveLine(place.move)}`);
-    (0, ui_1.out)('');
-}
-/** Mid-move the history cannot be read, so the answer is the move itself. */
-function printMoving(place) {
-    if (place.database)
-        (0, ui_1.out)(`Database: ${(0, ui_1.bold)(place.database.name)}`);
-    (0, ui_1.out)(`Server:   ${serverLabel(place.server)}`);
-    (0, ui_1.out)(`Move:     ${place.move?.note ?? ''}`);
-    (0, ui_1.note)((0, ui_1.dim)('  Migrations and queries wait until it is over; the platform finishes it on its own'));
-}
 const STATE_LABEL = {
     pending: 'waiting',
     applied: 'applied',
@@ -86,11 +50,9 @@ async function dbStatus(args) {
     // is the applied history alone, which does not depend on any working copy.
     if ((0, args_1.flagString)(args, 'project') !== undefined) {
         const { projectId, client } = await (0, session_1.projectTarget)(args);
-        const place = await projectDatabase(client, projectId);
-        if (place && moving(place.move))
-            return printMoving(place);
         const history = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/db/migrate`);
-        printPlace(history, place);
+        (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
+        (0, ui_1.out)('');
         if (history.applied.length === 0) {
             (0, ui_1.note)('No migrations have been applied yet');
             return;
@@ -102,15 +64,13 @@ async function dbStatus(args) {
     const { root, config } = (0, config_1.requireProject)();
     const client = await (0, session_1.connectProject)(config.projectId, root, config);
     const local = readMigrations(root);
-    const place = await projectDatabase(client, config.projectId);
-    if (place && moving(place.move))
-        return printMoving(place);
     const status = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/db/status`, {
         method: 'POST',
         body: { migrations: local },
         timeoutMs: 60_000,
     });
-    printPlace({ schema: status.schema, server: status.server, applied: [] }, place);
+    (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(status.schema)}`);
+    (0, ui_1.out)('');
     if (status.migrations.length === 0) {
         (0, ui_1.note)(`No migrations. The first one: ${MIGRATIONS_DIR}/0001_init.sql`);
         return;
@@ -121,65 +81,23 @@ async function dbStatus(args) {
         (0, ui_1.warn)('A changed file is never applied again and db migrate refuses it: write a new migration');
     }
 }
-function serverRow(server) {
-    const room = server.used_bytes !== null && server.space_bytes !== null
-        ? `${(0, ui_1.formatBytes)(server.used_bytes)} of ${(0, ui_1.formatBytes)(server.space_bytes)} used`
-        : '';
-    return [
-        server.id === null ? 'platform' : `own "${server.name}"`,
-        server.id === null ? 'plan space' : server.tier ?? '',
-        server.status === 'active' ? '' : server.status,
-        room,
-        `${server.databases} ${server.databases === 1 ? 'database' : 'databases'}`,
-    ];
-}
-/** The databases of the projects of the organization, and the servers they can live on. */
+/** The databases of the projects of the organization, largest first. */
 async function dbList() {
     const client = (0, session_1.connect)((0, config_1.localConfig)());
     const data = await (0, api_1.apiJson)(client, '/api/v1/org/databases');
     if (data.databases.length === 0) {
         (0, ui_1.note)('The organization has no databases');
         (0, ui_1.note)((0, ui_1.dim)('  One is created with the first project: xflow init'));
+        return;
     }
-    else {
-        printDatabases(data.databases, data.total, data.truncated);
-    }
-    printServers(data.servers);
-}
-function moveLine(move) {
-    return move.finished_at ? `${move.note} (${(0, ui_1.formatAge)(move.finished_at)})` : move.note;
-}
-function printDatabases(databases, total, truncated) {
-    (0, ui_1.table)(databases.map((database) => [
+    (0, ui_1.table)(data.databases.map((database) => [
         database.name,
         database.id,
-        database.schema ?? '-',
-        serverLabel(database.server),
-        typeof database.bytes === 'number' ? (0, ui_1.formatBytes)(database.bytes) : '',
+        database.schema_name,
+        database.bytes === null ? '' : (0, ui_1.formatBytes)(database.bytes),
     ]));
-    if (truncated)
-        (0, ui_1.note)((0, ui_1.dim)(`  Shown ${databases.length} of ${total}`));
-    for (const database of databases) {
-        if (database.move)
-            (0, ui_1.note)((0, ui_1.dim)(`  ${database.name}: ${moveLine(database.move)}`));
-    }
-    const down = new Map();
-    for (const { server } of databases)
-        if (server && server.status !== 'active')
-            down.set(server.id, server);
-    for (const server of down.values()) {
-        (0, ui_1.note)((0, ui_1.dim)(`  Server "${server.name}" is not running (${server.status}): its databases do not answer until it is back. ` +
-            'Not fixable from the code: tell the person, the server state is in the «Базы данных» (Databases) section of the web interface'));
-    }
-}
-/** Where a new or a moved database can go, with the room on each. Only the platform: no choice to show. */
-function printServers(servers) {
-    if (!servers || servers.length < 2)
-        return;
-    (0, ui_1.out)('');
-    (0, ui_1.out)((0, ui_1.bold)('Servers'));
-    (0, ui_1.table)(servers.map(serverRow));
-    (0, ui_1.note)((0, ui_1.dim)('  Without --server a new project keeps its database on the platform server. To put it on another: xflow init --server <name>, or xflow db move --to <name> for one that already exists'));
+    if (data.truncated)
+        (0, ui_1.note)((0, ui_1.dim)(`  Shown ${data.databases.length} of ${data.total}`));
 }
 /** Long values would tear the columns apart; the cut is marked, never silent. */
 const CELL_LIMIT = 60;
@@ -328,64 +246,6 @@ async function dbExec(args) {
             (0, ui_1.note)((0, ui_1.dim)(`  The first ${data.rows.length} returned rows: the rest are saved but not sent back`));
     }
 }
-const MOVE_POLL_MS = 3_000;
-/** Past this the command lets go: the move carries on, db status follows it. */
-const MOVE_FOLLOW_MS = 10 * 60_000;
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-/**
- * Moving the project database to another server of the organization. The platform
- * runs the move by itself; this command starts it and follows it to the end.
- */
-async function dbMove(args) {
-    const to = (0, args_1.flagString)(args, 'to');
-    if (!to) {
-        throw new errors_1.CliError('Name the server: --to <name>', 'The servers and their names: xflow db list ("platform" is the common one)');
-    }
-    const { projectId, client } = await (0, session_1.projectTarget)(args);
-    const path = `/api/v1/projects/${projectId}/db/move`;
-    let place;
-    // The platform takes the project name as the yes; --yes looks it up.
-    const confirm = (0, args_1.flagBool)(args, 'yes')
-        ? (await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}`)).name
-        : undefined;
-    try {
-        place = await (0, api_1.apiJson)(client, path, {
-            method: 'POST',
-            body: { to, confirm },
-            timeoutMs: 60_000,
-        });
-    }
-    catch (e) {
-        // Said in the words of this command: the flag, and the name that goes in it.
-        if (e instanceof api_1.ApiError && e.code === 'confirm_required') {
-            throw new errors_1.CliError(e.message, `To move it: xflow db move --to "${to}" --yes`);
-        }
-        throw e;
-    }
-    (0, ui_1.note)((0, ui_1.dim)('  The platform carries the move through by itself: stopping this command does not stop it'));
-    const deadline = Date.now() + MOVE_FOLLOW_MS;
-    let shown = '';
-    while (moving(place.move)) {
-        const line = place.move?.note ?? '';
-        if (line !== shown)
-            (0, ui_1.step)(line);
-        shown = line;
-        if (Date.now() > deadline) {
-            (0, ui_1.note)('Still going: xflow db status follows it');
-            return;
-        }
-        await sleep(MOVE_POLL_MS);
-        place = await (0, api_1.apiJson)(client, path);
-    }
-    const { move } = place;
-    if (move?.status === 'failed')
-        throw new errors_1.CliError(move.note);
-    if (move && (move.functions_done ?? 0) < (move.functions_total ?? 0)) {
-        (0, ui_1.warn)(move.note);
-        return;
-    }
-    (0, ui_1.ok)(move?.note ?? `The database is on ${serverLabel(place.server)}`);
-}
 async function dbMigrate(args) {
     const { root, config } = (0, config_1.requireProject)();
     const client = await (0, session_1.connectProject)(config.projectId, root, config);

package/dist/commands/deploy.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.versionComment = versionComment;
 exports.statedRevision = statedRevision;
 exports.deploy = deploy;
 exports.publish = publish;
@@ -70,7 +69,7 @@ async function startBuild(client, base, revision, allowRemovals, comment) {
 const MAX_COMMENT_LENGTH = 200;
 /** Control and bidi-override characters: they spoof terminals, not comments. */
 const COMMENT_CONTROL_CHARS = /[\u0000-\u001f\u007f-\u009f\u200e\u200f\u202a-\u202e\u2066-\u2069]/g;
-/** The version comment as typed after -m, cleaned; empty when there is none. Pages take the same. */
+/** The version comment as typed after -m, cleaned; empty when there is none. */
 function versionComment(raw) {
     const comment = (raw ?? '').replace(/\s+/g, ' ').replace(COMMENT_CONTROL_CHARS, '').trim();
     if (comment.length > MAX_COMMENT_LENGTH) {

package/dist/commands/env.js

@@ -8,14 +8,12 @@ exports.envRemove = envRemove;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const api_1 = require("../api");
-const args_1 = require("../args");
 const config_1 = require("../config");
 const errors_1 = require("../errors");
 const session_1 = require("../session");
 const ui_1 = require("../ui");
 const SCOPE_LABEL = {
-    organization: 'the whole organization',
-    project: 'this project only',
+    project: 'this project',
     connection: 'from a connected service, read-only',
 };
 const FUNCTIONS_DIR = 'functions';
@@ -101,7 +99,7 @@ async function envList(args) {
         (0, ui_1.note)((0, ui_1.dim)('  To store one: xflow env set SMTP_PASSWORD=secret'));
         return;
     }
-    (0, ui_1.table)(rows.map((row) => [row.name, SCOPE_LABEL[row.scope] ?? SCOPE_LABEL.organization]));
+    (0, ui_1.table)(rows.map((row) => [row.name, SCOPE_LABEL[row.scope]]));
     (0, ui_1.note)((0, ui_1.dim)('  The platform never returns values: they are visible only inside the function'));
 }
 /** Check that every referenced variable is stored. */
@@ -172,12 +170,9 @@ async function envSet(args) {
     const value = pair.slice(pair.indexOf('=') + 1);
     const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/env`, {
         method: 'POST',
-        // The word goes to the platform as typed: it knows the two scopes and
-        // refuses a third. Guessing here would have made --scope proj mean the
-        // whole organization, which is the opposite of what such a typo means.
-        body: { name, value, scope: (0, args_1.flagString)(args, 'scope') },
+        body: { name, value },
     });
-    (0, ui_1.ok)(`${(0, ui_1.bold)(result.name)} stored (${result.scope === 'project' ? 'this project only' : 'the whole organization'})`);
+    (0, ui_1.ok)(`${(0, ui_1.bold)(result.name)} stored`);
     // Values reach a function on its next deploy.
     const users = referencedByFunctions(root).needed.get(name);
     if (users && users.length > 0) {

package/dist/commands/projects.js

@@ -83,7 +83,7 @@ async function init(args) {
     (0, ui_1.step)(orgName ? `Creating the project in "${orgName}"` : 'Creating the project on the platform');
     const project = await (0, api_1.apiJson)(client, '/api/v1/projects', {
         method: 'POST',
-        body: { name, app: folder ? { name } : null, server: (0, args_1.flagString)(args, 'server') ?? null },
+        body: { name, app: folder ? { name } : null },
         timeoutMs: 60_000,
     });
     try {
@@ -105,8 +105,6 @@ async function init(args) {
     }
     (0, skills_1.installSkillQuietly)(target);
     (0, ui_1.ok)(`Project "${project.name}" created`);
-    if (project.server)
-        (0, ui_1.note)((0, ui_1.dim)(`  Its database goes to the own server "${project.server.name}"`));
     (0, ui_1.out)('');
     (0, ui_1.out)(`  ${(0, ui_1.bold)('Next:')}`);
     (0, ui_1.out)(`    cd ${(0, node_path_1.basename)(target)}`);
@@ -265,7 +263,7 @@ async function get(args) {
     if (card.description)
         (0, ui_1.out)(card.description);
     (0, ui_1.out)('');
-    (0, ui_1.out)(`Database: ${card.database.schema}${card.database.server_id ? ' (own server)' : ''}`);
+    (0, ui_1.out)(`Database: ${card.database.schema}`);
     (0, ui_1.out)('');
     (0, ui_1.out)('Apps:');
     if (card.apps.length === 0)

package/dist/commands/storage.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contentTypeFor = contentTypeFor;
-exports.collectMedia = collectMedia;
 exports.planBatches = planBatches;
 exports.caseCollisions = caseCollisions;
 exports.storageList = storageList;
@@ -75,7 +74,7 @@ function contentTypeFor(name) {
  * what one is asked to put there so it stays out of the 10 MB archive.
  *
  * Dot entries and symlinks are skipped: pointing push at a working copy should
- * not upload .git, and a link is not ours to follow. Pages walk a site the same way.
+ * not upload .git, and a link is not ours to follow.
  */
 function collectMedia(root, prefix = '') {
     const found = [];

package/dist/flags.js

@@ -44,7 +44,7 @@ exports.KNOWN = {
     'org list': [],
     'org members': [],
     'org switch': [],
-    init: ['name', 'app', 'no-app', 'server', 'org'],
+    init: ['name', 'app', 'no-app', 'org'],
     link: [],
     projects: [],
     'projects list': [],
@@ -60,7 +60,7 @@ exports.KNOWN = {
     logs: ['limit', 'project', 'app'],
     env: ['project'],
     'env list': ['project'],
-    'env set': ['scope'],
+    'env set': [],
     'env rm': ['project'],
     'env remove': ['project'],
     'env check': [],
@@ -81,21 +81,12 @@ exports.KNOWN = {
     'db query': ['json', 'project'],
     'db exec': ['allow-destructive', 'json', 'project'],
     'db migrate': ['dry-run', 'allow-destructive'],
-    'db move': ['to', 'yes', 'project'],
     storage: ['json', 'project'],
     'storage ls': ['json', 'project'],
     'storage list': ['json', 'project'],
     'storage push': ['to', 'replace', 'json', 'project'],
     'storage rm': ['folder', 'yes', 'project'],
     'storage remove': ['folder', 'yes', 'project'],
-    pages: ['json'],
-    'pages list': ['json'],
-    'pages create': ['slug'],
-    'pages deploy': ['message'],
-    'pages status': ['json'],
-    'pages rollback': [],
-    'pages rm': ['yes'],
-    'pages remove': ['yes'],
     status: [],
     dev: [],
     pull: ['into', 'force', 'revision'],
@@ -145,7 +136,6 @@ const NAMESPACES = new Set([
     'schedules',
     'db',
     'storage',
-    'pages',
 ]);
 /** The command these words name, as far as the table knows it. */
 function commandOf(words) {

package/dist/help.js

@@ -91,24 +91,12 @@ ${(0, ui_1.bold)('Functions')}
 
 ${(0, ui_1.bold)('Database')}
   xflow db status                 which migrations are applied and which are waiting
-  xflow db list                   databases of the projects and the servers of the organization
+  xflow db list                   databases of the projects of the organization, with sizes
   xflow db schema [table]         tables of the project, or the columns of one
   xflow db query 'select ...'     read data, in a read-only transaction
   xflow db exec 'update ...'      a one-off data change, outside the migration history
   xflow db migrate [--dry-run] [--allow-destructive]
                                   apply the migrations from migrations/*.sql
-  xflow db move --to <server> --yes
-                                  move the project database to another server
-
-${(0, ui_1.bold)('Pages')}
-  xflow pages                     public sites of the organization at <name>.xflowpage.ru
-  xflow pages create <title> <folder|.zip|.html> [--slug name]
-                                  a new page with the site on it, live at once
-  xflow pages deploy <page> <folder|.zip|.html> [-m "what changed"]
-                                  upload the site: live at once, there is no publish step
-  xflow pages status <page>       the page and its versions
-  xflow pages rollback <page> <N> put an earlier version back on the address
-  xflow pages rm <page> --yes     delete the page for good: the address empties
 
 ${(0, ui_1.bold)('Reference')}
   xflow logs [--limit N]          browser errors of the published apps
@@ -173,7 +161,7 @@ no working copy of its own:
   xflow db query --project 3f2a… 'select id, title from tasks where done = false'
   xflow functions invoke kanban --project 3f2a… --data-file card.json
 
-Which commands: ${(0, ui_1.bold)('db status')}, ${(0, ui_1.bold)('db query')}, ${(0, ui_1.bold)('db exec')}, ${(0, ui_1.bold)('db schema')}, ${(0, ui_1.bold)('db move')}, ${(0, ui_1.bold)('functions list')},
+Which commands: ${(0, ui_1.bold)('db status')}, ${(0, ui_1.bold)('db query')}, ${(0, ui_1.bold)('db exec')}, ${(0, ui_1.bold)('db schema')}, ${(0, ui_1.bold)('functions list')},
 ${(0, ui_1.bold)('functions invoke')}, ${(0, ui_1.bold)('functions logs')}, ${(0, ui_1.bold)('logs')}, ${(0, ui_1.bold)('env')}, ${(0, ui_1.bold)('env rm')},
 ${(0, ui_1.bold)('connections')}, ${(0, ui_1.bold)('connections link')}, ${(0, ui_1.bold)('connections unlink')}, ${(0, ui_1.bold)('schedules')},
 ${(0, ui_1.bold)('schedules set')}, ${(0, ui_1.bold)('schedules rm')}, ${(0, ui_1.bold)('storage ls')}, ${(0, ui_1.bold)('storage push')},
@@ -264,53 +252,6 @@ how they differ, ${(0, ui_1.bold)('xflow pull --into ./server-copy')} fetches th
 
 In a folder that is already linked, the command points xflow.json at the other project and
 keeps the rest of the file. A new project instead of an existing one: ${(0, ui_1.bold)('xflow init')}.`,
-    pages: `${(0, ui_1.bold)('xflow pages')}: public sites of the organization
-
-A page is a static site at https://<name>.xflowpage.ru: a landing page, a presentation, an
-invoice for people outside the organization. It opens by its address for anyone, without
-signing in, and has no build, no publish step and no database. An app is the opposite: code
-the platform builds, with versions, access levels and a database through functions.
-
-  xflow pages                          the pages, their state and address
-  xflow pages create <title> <path>    a new page with its first version: there are no
-                                       empty pages
-      --slug <name>                    the name in the address; without it the name is made
-                                       from the title, with a random tail
-  xflow pages deploy <page> <path>     upload a new version
-      -m <text>                        what changed, one short line: it names the version
-  xflow pages status <page>            the page and its versions
-  xflow pages rollback <page> <N>      put version N back on the address
-  xflow pages rm <page>                delete the page
-      --yes                            without it the command names what goes and stops
-
-${(0, ui_1.bold)('<path>')} is a folder with index.html at the top, its .zip, or one .html file.
-${(0, ui_1.bold)('<page>')} is the name from the address or the id. ${(0, ui_1.bold)('--json')} on list and status
-prints the answer as JSON. A page belongs to the organization, not to a project, so there is
-no ${(0, ui_1.bold)('--project')}: the key is picked as for every other command (${(0, ui_1.bold)('xflow help org')}).
-
-${(0, ui_1.bold)('An upload is live at once.')} There is no draft and no publish step: anyone with the
-address sees the new version within seconds. Uploading the same files again changes nothing.
-The files of the last 5 versions are kept, so a rollback takes seconds and needs no upload.
-
-What goes up is the built site: HTML, CSS, JS, images, fonts, PDF, audio and video. No code
-runs on the platform side, and a folder with package.json is refused as the sources of a site:
-build it and upload what the build writes. Dot entries are skipped. At most 5 MB zipped, 25 MB
-unpacked and 1000 files.
-
-The page is public, so a file holding a secret key is refused whole: every visitor would read
-it. A page has no backend: a form or a lookup belongs in an app with access "anyone". The one
-key a page may hold is a function key, and it opens that function to every visitor: an HTML
-form can post to its webhook address with ${(0, ui_1.bold)('?key=')}, while fetch cannot read the answer
-(no CORS). Search engines are asked not to index pages, so do not promise SEO.
-
-${(0, ui_1.bold)('Deleting is final.')} The address goes empty and every version of the page is gone: there
-is no undo and no copy on the platform side. The name stays reserved for the organization, so
-the same ${(0, ui_1.bold)('--slug')} is free for the next page of yours and taken for everyone else. A
-throwaway page put up to try something is worth deleting the same way it was made.
-
-A page takes the key of the whole organization, the one ${(0, ui_1.bold)('xflow login')} issues: a key
-scoped to projects is refused. A page is deleted by whoever made it, or by the owner of the
-organization. Switching a page off for a while is for a person, in the platform interface.`,
     update: `${(0, ui_1.bold)('xflow update')}: bring the CLI up to date
 
 Installs the published version and, if anything changed, rewrites the platform
@@ -336,8 +277,8 @@ is a hard gate on a changed contract, and until you run this command nothing els
 will work.`,
     db: `${(0, ui_1.bold)('xflow db')}: schema, data, migrations
 
-  xflow db status                  what is applied, what is waiting, the server
-  xflow db list                    databases of the projects, the servers of the organization
+  xflow db status                  what is applied, what is waiting
+  xflow db list                    databases of the projects of the organization, with sizes
   xflow db schema [table]          tables of the project, or the columns of one
   xflow db query 'select ...'      read data (rows: the query's own limit, 50 without
                                    one, 300 at most; --json prints the values whole)
@@ -345,26 +286,10 @@ will work.`,
   xflow db exec 'update ...'       a one-off data change: one INSERT, UPDATE, DELETE or MERGE
                                    (or <file>.sql; --allow-destructive, --json)
   xflow db migrate                 store the project root, then apply migrations/*.sql
-  xflow db move --to <server> --yes
-                                   move the project database to another server
 
 Every project has exactly one database of its own, shared by all of its apps and functions,
 and every command here works from any folder of the project. ${(0, ui_1.bold)('list')} is about the
-organization: one database per project, and where each lives: ${(0, ui_1.bold)('platform')} is the common
-server, ${(0, ui_1.bold)('own "<name>"')} an own server of the organization. While an own server is not
-running, its databases do not answer, and that is not fixable from the code. An organization
-with own servers also gets them listed, with the room used on each: that is the choice for
-${(0, ui_1.bold)('xflow init --server')} and ${(0, ui_1.bold)('db move')}.
-
-${(0, ui_1.bold)('move')} takes the database of this project to another server of the organization:
-${(0, ui_1.bold)('platform')} or an own server by name (or id, when two share a name). The platform copies
-the tables, switches the functions of the project and removes the old copy; nothing needs a
-deploy. While it copies, the apps read data but cannot save anything new, usually for a
-couple of minutes, which is why it asks for ${(0, ui_1.bold)('--yes')}. It also needs the
-right to move databases on the key: off by default, only its owner turns it on, in the
-platform settings where the key permissions live. The command follows the move to the end;
-stopping it does not stop the move, and ${(0, ui_1.bold)('xflow db status')} shows where it stands. A move
-that fails is rolled back. Buying, paying for and deleting servers stay with the person.
+organization: one database per project, largest first, to see which project takes the room.
 
 ${(0, ui_1.bold)('schema')} answers a different question than the ${(0, ui_1.bold)('migrations/')} directory: the files say
 what you did, the schema says what is actually in there. ${(0, ui_1.bold)('query')} runs inside a READ ONLY transaction, so
@@ -481,11 +406,7 @@ the function. So keep your own copy wherever you got it from.
   xflow env set SMTP_PASSWORD=…    store
   xflow env rm SMTP_PASSWORD       delete
 
-  --scope project                  visible to this project only
-  --scope organization             visible to every project of the organization (the default)
-
-Those two words are the whole list: a third is refused rather than read as the default,
-because a value meant for one project would have gone out to all of them.
+A variable belongs to this project: functions of other projects never see it.
 
 ${(0, ui_1.bold)('check')} reads the sources in ${(0, ui_1.bold)('functions/')} and looks for ${(0, ui_1.bold)('process.env.NAME')}
 references. The same rule applies on deploy: a function receives only the variables it
@@ -627,8 +548,7 @@ Who may call a function is its callers, in the root xflow.json:
 
   { "projectId": "…", "functions": { "book-slot": { "callers": ["zapis"] } } }
 
-A caller is an app folder of this project (apps/zapis is "zapis"); pages are static and call
-nothing. A function nobody lists has no callers: a workflow, woken by a schedule, by a service
+A caller is an app folder of this project (apps/zapis is "zapis"). A function nobody lists has no callers: a workflow, woken by a schedule, by a service
 holding a key a person issued, or by ${(0, ui_1.bold)('invoke')}. ${(0, ui_1.bold)('open')} in the list means a caller is an app
 anyone with the link opens, so anyone on the internet can call it. The address in the note
 under the table is for webhooks and other functions, with a key; apps call ${(0, ui_1.bold)('/_fn/<name>')} on
@@ -776,8 +696,6 @@ change them, restyle them or delete what you do not use.
   --name <name>       project name (the folder name by default)
   --app <folder>      the folder of the first app (made from the name by default)
   --no-app            a project without apps: its functions are workflows
-  --server <name>     the database of the project, right away on that server:
-                      platform, or an own server of the organization (xflow db list)
   --org <name>        the organization that gets the project; required when you are
                       signed in to several (xflow org)
 

package/dist/limits.js

@@ -4,12 +4,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.limitLine = limitLine;
 exports.quotaRows = quotaRows;
 const DENIAL_LABELS = {
-    limit_projects: 'projects, the platform cap',
+    limit_projects: 'new projects today, the platform cap (resets at 00:00 UTC)',
     limit_apps: 'apps',
     plan_app_access: 'access levels of apps',
     functions_stopped: 'function minutes, the functions of the organization are stopped',
     limit_connections: 'active connector connections',
-    limit_pages: 'public pages',
     limit_functions: 'cloud functions',
     limit_builds: 'builds this month',
     limit_builds_concurrent: 'builds running at once',
@@ -32,12 +31,12 @@ function limitLine(detail) {
         : detail.code === 'limit_schedule_interval'
             ? `, every ${detail.used} min against a ${detail.limit} min minimum`
             : `, ${detail.used} of ${detail.limit} used`;
-    return `Plan limit: ${label}${numbers}. Repeating the same command will not help.`;
+    const tail = detail.code === 'limit_projects' ? 'Repeating it before then will not help.' : 'Repeating the same command will not help.';
+    return `Plan limit: ${label}${numbers}. ${tail}`;
 }
 const QUOTA_ORDER = [
     'apps',
     'connections',
-    'pages',
     'functions',
     'schedules',
     'people',
@@ -49,7 +48,6 @@ const QUOTA_ORDER = [
 const QUOTA_LABELS = {
     apps: 'Apps',
     connections: 'Active connections',
-    pages: 'Public pages',
     functions: 'Cloud functions',
     schedules: 'Schedules',
     people: 'People',

package/dist/version.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_API_URL = exports.CLI_VERSION = void 0;
 /** Keep in sync with cli/package.json. */
-exports.CLI_VERSION = '1.4.0';
+exports.CLI_VERSION = '1.6.0';
 /** Overridden by XFLOW_API_URL or the `api` field in xflow.json. */
 exports.DEFAULT_API_URL = 'https://app.getxflow.com';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getxflow/cli",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "CLI for the XFlow platform: projects with apps, functions and a database; source sync, deployment and publishing",
   "license": "UNLICENSED",
   "engines": {