@getxflow/cli 0.34.2 → 1.0.0

package/README.md

@@ -18,7 +18,7 @@ else's code belongs next to it.
 |---|---|
 | `login` / `logout` / `whoami` | sign in through the browser, sign out, whose key this is and what it can do |
 | `org` / `org switch` | organizations with a stored key, and which one this folder works with |
-| `init` / `link` / `templates` | new project, link a folder to an existing one, which templates there are |
+| `init` / `link` | new project, link a folder to an existing one |
 | `status` / `pull` | state of the sources on the server and fetching them back |
 | `deploy` / `publish` / `rollback` / `deployments` | build, publish, serve earlier pages, version history |
 | `db status` / `db migrate` | migrations from `migrations/*.sql` with a gate on destructive ones |

package/dist/api.js

@@ -4,7 +4,7 @@ exports.ApiError = void 0;
 exports.isOlder = isOlder;
 exports.newerVersionSeen = newerVersionSeen;
 exports.apiJson = apiJson;
-exports.apiBinary = apiBinary;
+exports.apiForward = apiForward;
 exports.apiUpload = apiUpload;
 exports.downloadUrl = downloadUrl;
 const version_1 = require("./version");
@@ -61,6 +61,8 @@ function assertProtocol(response) {
     const latest = response.headers.get('x-xflow-cli-latest');
     if (latest && isOlder(version_1.CLI_VERSION, latest))
         newerVersion = latest;
+    // The platform refuses an outdated CLI itself (outdated_cli) before doing any work;
+    // this check keeps the same words for a platform that only sends the header.
     const required = response.headers.get('x-xflow-cli-min');
     if (required && isOlder(version_1.CLI_VERSION, required)) {
         throw new ApiError(`The platform requires CLI ${required} or newer, ${version_1.CLI_VERSION} is installed`, 'outdated_cli', response.status, 'Run: xflow update');
@@ -141,11 +143,24 @@ async function apiJson(client, path, options = {}) {
         throw await readError(response, client);
     return (await response.json());
 }
-async function apiBinary(client, path) {
-    const response = await send(client, path, { timeoutMs: TRANSFER_TIMEOUT_MS });
-    if (!response.ok)
-        throw await readError(response, client);
-    return Buffer.from(await response.arrayBuffer());
+/**
+ * A function call through the platform: the answer of the function comes back as it
+ * is (X-Xflow-Fn-Forwarded), whatever its status. A refusal of the platform itself is
+ * an ordinary error.
+ */
+async function apiForward(client, path, options = {}) {
+    const response = await send(client, path, options);
+    if (response.headers.get('x-xflow-fn-forwarded') !== '1') {
+        if (!response.ok)
+            throw await readError(response, client);
+        throw new ApiError('The platform did not forward the call', 'unknown', response.status);
+    }
+    return {
+        status: response.status,
+        body: await response.text(),
+        elapsedMs: Number(response.headers.get('x-xflow-elapsed-ms') ?? 0),
+        hint: response.headers.get('x-xflow-hint') ?? undefined,
+    };
 }
 async function apiUpload(client, path, body, headers = {}) {
     return apiJson(client, path, { method: 'POST', body, headers, timeoutMs: TRANSFER_TIMEOUT_MS });

package/dist/args.js

@@ -8,7 +8,7 @@ exports.flagBool = flagBool;
 exports.flagNumber = flagNumber;
 /** Flags that never take a value, so `--force ./dir` keeps the path as a word. */
 exports.BOOLEAN_FLAGS = new Set([
-    'function',
+    'no-app',
     'force',
     'yes',
     'json',

package/dist/bin.js

@@ -64,9 +64,6 @@ async function run(args) {
                 return;
             }
             throw new errors_1.CliError(`Unknown command: org ${second}`, 'Available: list, members and switch');
-        case 'templates':
-            await (0, projects_1.templates)();
-            return;
         case 'init':
             await (0, projects_1.init)(rest);
             return;
@@ -83,6 +80,16 @@ async function run(args) {
                 return;
             }
             throw new errors_1.CliError(`Unknown command: projects ${second}`, 'Available: list and get');
+        case 'apps':
+            if (second === 'add') {
+                await (0, projects_1.appsAdd)({ ...args, words: args.words.slice(2) });
+                return;
+            }
+            if (second === undefined || second === 'list') {
+                await (0, projects_1.appsList)(rest);
+                return;
+            }
+            throw new errors_1.CliError(`Unknown command: apps ${second}`, 'Available: list and add');
         case 'skills':
             await (0, skills_1.skills)(rest);
             return;

package/dist/commands/connections.js

@@ -21,11 +21,11 @@ function state(row) {
         return 'linked but switched off, the functions get nothing';
     switch (row.health) {
         case 'expiring':
-            return `linked, token expires in ${row.days_left} days, any build renews it`;
+            return `linked, token expires in ${row.days_left} days, xflow deploy functions renews it`;
         case 'expired':
             return 'linked, access has expired, reconnect the account';
         case 'revoked':
-            return 'linked, access was revoked by the provider, a rebuild will not help';
+            return 'linked, access was revoked by the provider, another deploy will not help';
         case 'ok':
             return row.days_left === null ? 'linked' : `linked, token valid ${row.days_left} days`;
         default:
@@ -83,7 +83,7 @@ async function connectionsList(args) {
     const variables = data.connections.flatMap((row) => row.env);
     if (variables.length > 0) {
         (0, ui_1.note)((0, ui_1.dim)(`  The functions get: ${variables.join(', ')}`));
-        (0, ui_1.note)((0, ui_1.dim)('  A change reaches a function on its next deploy: xflow deploy'));
+        (0, ui_1.note)((0, ui_1.dim)('  A change reaches a function on its next deploy: xflow deploy functions'));
     }
     if (data.connections.some((row) => placeholders(row))) {
         (0, ui_1.note)((0, ui_1.dim)('  The fourth column is what a call fills in: xflow connections call <name> <path>'));
@@ -111,7 +111,7 @@ async function connectionsLink(args) {
     (0, ui_1.ok)(`${(0, ui_1.bold)(result.label)} linked as ${result.alias}`);
     if (result.env.length > 0)
         (0, ui_1.note)((0, ui_1.dim)(`  The functions will get: ${result.env.join(', ')}`));
-    (0, ui_1.note)((0, ui_1.dim)('  The values arrive on the next deploy: xflow deploy'));
+    (0, ui_1.note)((0, ui_1.dim)('  The values arrive on the next deploy: xflow deploy functions'));
 }
 async function connectionsUnlink(args) {
     const target = args.words[1];

package/dist/commands/db.js

@@ -7,7 +7,6 @@ exports.dbQuery = dbQuery;
 exports.dbMove = dbMove;
 exports.dbMigrate = dbMigrate;
 const node_fs_1 = require("node:fs");
-const node_crypto_1 = require("node:crypto");
 const node_path_1 = require("node:path");
 const api_1 = require("../api");
 const args_1 = require("../args");
@@ -16,6 +15,7 @@ const errors_1 = require("../errors");
 const session_1 = require("../session");
 const text_file_1 = require("../text-file");
 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) {
@@ -53,9 +53,12 @@ function printMoving(place) {
     (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'));
 }
-function checksum(sql) {
-    return (0, node_crypto_1.createHash)('sha256').update(sql).digest('hex').slice(0, 16);
-}
+const STATE_LABEL = {
+    pending: 'waiting',
+    applied: 'applied',
+    changed: 'applied, file changed',
+    missing: 'applied, file missing',
+};
 /** File-name order is the queue. */
 function readMigrations(root) {
     const dir = (0, node_path_1.join)(root, MIGRATIONS_DIR);
@@ -100,35 +103,18 @@ async function dbStatus(args) {
     const place = await projectDatabase(client, config.projectId);
     if (place && moving(place.move))
         return printMoving(place);
-    const history = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/db/migrate`);
-    const applied = new Map(history.applied.map((row) => [row.name, row]));
-    printPlace(history, place);
-    if (local.length === 0 && applied.size === 0) {
+    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);
+    if (status.migrations.length === 0) {
         (0, ui_1.note)(`No migrations. The first one: ${MIGRATIONS_DIR}/0001_init.sql`);
         return;
     }
-    const rows = [];
-    for (const migration of local) {
-        const row = applied.get(migration.name);
-        if (!row) {
-            rows.push([migration.name, 'waiting', '']);
-            continue;
-        }
-        const changed = row.checksum !== checksum(migration.sql);
-        rows.push([
-            migration.name,
-            changed ? 'applied, file changed' : 'applied',
-            (0, ui_1.formatAge)(row.applied_at),
-        ]);
-    }
-    // Applied but missing locally: usually another project on the same logical database.
-    const localNames = new Set(local.map((migration) => migration.name));
-    for (const row of history.applied) {
-        if (!localNames.has(row.name))
-            rows.push([row.name, 'applied, file missing', (0, ui_1.formatAge)(row.applied_at)]);
-    }
-    (0, ui_1.table)(rows);
-    if (rows.some((row) => row[1] === 'applied, file changed')) {
+    (0, ui_1.table)(status.migrations.map((row) => [row.name, STATE_LABEL[row.state], row.applied_at ? (0, ui_1.formatAge)(row.applied_at) : '']));
+    if (status.migrations.some((row) => row.state === 'changed')) {
         (0, ui_1.out)('');
         (0, ui_1.warn)('A changed file is never applied again and db migrate refuses it: write a new migration');
     }
@@ -145,19 +131,7 @@ function serverRow(server) {
         `${server.databases} ${server.databases === 1 ? 'database' : 'databases'}`,
     ];
 }
-function attachedProjects(database) {
-    const names = database.projects.map((project) => project.name);
-    if (database.hidden_projects > 0)
-        names.push(`+${database.hidden_projects} without access`);
-    return names.length === 0 ? 'no projects' : names.join(', ');
-}
-/**
- * Logical databases of the organization, and who is attached to them.
- *
- * The identifier is what `xflow init --database <id>` asks for, and the list of
- * projects is not decoration: a database can be shared, so a migration written
- * for one application lands in the others too.
- */
+/** The databases of the projects of the organization, and the servers they can live on. */
 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');
@@ -174,19 +148,10 @@ 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) => [
-        database.name,
-        database.id,
-        database.schema ?? '-',
-        serverLabel(database.server),
-        attachedProjects(database),
-    ]));
+    (0, ui_1.table)(databases.map((database) => [database.name, database.id, database.schema ?? '-', serverLabel(database.server)]));
     if (truncated)
         (0, ui_1.note)((0, ui_1.dim)(`  Shown ${databases.length} of ${total}`));
     for (const database of databases) {
-        const attached = database.projects.length + database.hidden_projects;
-        if (attached > 1)
-            (0, ui_1.note)((0, ui_1.dim)(`  ${database.name} is shared by ${attached} projects: a migration affects all of them`));
         if (database.move)
             (0, ui_1.note)((0, ui_1.dim)(`  ${database.name}: ${moveLine(database.move)}`));
     }
@@ -196,7 +161,7 @@ function printDatabases(databases, total, truncated) {
             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 "Data" section of the web interface'));
+            '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. */
@@ -206,7 +171,7 @@ function printServers(servers) {
     (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 database goes to the platform server. To put it on another: xflow init --server <name>, or xflow db move --to <name> for one that already exists'));
+    (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'));
 }
 /** Long values would tear the columns apart; the cut is marked, never silent. */
 const CELL_LIMIT = 60;
@@ -219,13 +184,7 @@ function cell(value) {
     const text = plain(value);
     return text.length > CELL_LIMIT ? `${text.slice(0, CELL_LIMIT - 1)}…` : text;
 }
-/**
- * What the database looks like right now.
- *
- * Not the same question as the migrations/ directory: one logical database is
- * shared by several projects, so the files answer "what did I do", not "what is
- * in there".
- */
+/** What the database looks like right now, as opposed to what the migrations/ files say was done. */
 async function dbSchema(args) {
     const { projectId, client } = await (0, session_1.projectTarget)(args);
     const wanted = args.words[0];
@@ -342,7 +301,7 @@ async function dbMove(args) {
         // 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') {
             const found = await projectDatabase(client, projectId).catch(() => null);
-            const name = found?.database?.name ?? '<database>';
+            const name = found?.database?.name ?? '<project name>';
             throw new errors_1.CliError(e.message, `To move it: xflow db move --to "${to}" --confirm "${name}"`);
         }
         throw e;
@@ -376,6 +335,10 @@ async function dbMigrate(args) {
     const client = await (0, session_1.connectProject)(config.projectId, root, config);
     const migrations = requireMigrations(root);
     const dryRun = (0, args_1.flagBool)(args, 'dry-run');
+    // Migrations live in the revisions of the project root: without this a project
+    // without functions would lose them from its history, and a clone would miss them.
+    if (!dryRun)
+        await (0, sources_1.pushSources)({ kind: 'project', root, projectId: config.projectId }, client, { force: false });
     (0, ui_1.step)(dryRun ? `Checking the migrations (${migrations.length} in the directory)` : `Applying the migrations (${migrations.length} in the directory)`);
     const result = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/db/migrate`, {
         method: 'POST',