@getxflow/cli 1.3.0 → 1.4.0

package/README.md

@@ -10,7 +10,7 @@ cd my-app/apps/my-app && npm install && xflow dev
 xflow deploy -m "First version"
 ```
 
-Requires Node 20+. The package has no dependencies: it holds an access key, and nobody
+Requires Node 22+. The package has no dependencies: it holds an access key, and nobody
 else's code belongs next to it.
 
 | Command | What it does |

package/dist/commands/org.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.orgList = orgList;
 exports.orgMembers = orgMembers;
+exports.findOrg = findOrg;
 exports.orgSwitch = orgSwitch;
 const api_1 = require("../api");
 const config_1 = require("../config");
@@ -47,6 +48,19 @@ async function orgMembers() {
     const count = data.truncated ? `${data.members.length} of ${data.total}` : String(data.total);
     (0, ui_1.note)((0, ui_1.dim)(`  ${count} in "${org ? label(org) : 'the organization'}". Inviting and removing people happens in the platform interface`));
 }
+/** An organization by id, or by name ignoring case; a name shared by several asks for the id. */
+function findOrg(orgs, wanted) {
+    const byId = orgs.find((org) => org.organizationId === wanted);
+    if (byId)
+        return byId;
+    const byName = orgs.filter((org) => (org.name ?? '').toLowerCase() === wanted.toLowerCase());
+    if (byName.length > 1) {
+        throw new errors_1.CliError(`Several organizations are named "${wanted}"`, `Use the id instead: ${byName.map((org) => org.organizationId).join(', ')}`);
+    }
+    if (!byName[0])
+        throw new errors_1.CliError(`No stored key for "${wanted}"`, 'The list: xflow org. To add one: xflow login');
+    return byName[0];
+}
 /** Local switch of the active organization: a pointer move, no browser. */
 function orgSwitch(args) {
     const wanted = args.words[0];
@@ -57,15 +71,7 @@ function orgSwitch(args) {
     if (orgs.length === 0) {
         throw new errors_1.CliError(`No keys for ${apiUrl}`, 'Sign in: xflow login');
     }
-    const byId = orgs.find((org) => org.organizationId === wanted);
-    const byName = orgs.filter((org) => (org.name ?? '').toLowerCase() === wanted.toLowerCase());
-    if (!byId && byName.length > 1) {
-        throw new errors_1.CliError(`Several organizations are named "${wanted}"`, `Use the id instead: ${byName.map((org) => org.organizationId).join(', ')}`);
-    }
-    const target = byId ?? byName[0];
-    if (!target) {
-        throw new errors_1.CliError(`No stored key for "${wanted}"`, 'The list: xflow org. To add one: xflow login');
-    }
+    const target = findOrg(orgs, wanted);
     if (target.active) {
         (0, ui_1.ok)(`"${label(target)}" is already the active organization`);
         return;

package/dist/commands/projects.js

@@ -13,6 +13,7 @@ const args_1 = require("../args");
 const config_1 = require("../config");
 const credentials_1 = require("../credentials");
 const errors_1 = require("../errors");
+const org_1 = require("./org");
 const session_1 = require("../session");
 const skills_1 = require("./skills");
 const sources_1 = require("./sources");
@@ -61,12 +62,25 @@ async function init(args) {
     const target = (0, node_path_1.resolve)(args.words[0] ?? '.');
     const name = (0, args_1.flagString)(args, 'name') ?? (0, node_path_1.basename)(target);
     const noApp = (0, args_1.flagBool)(args, 'no-app');
-    const client = (0, session_1.connect)();
+    let client = (0, session_1.connect)();
+    // A person in several organizations names the one that gets the project: the active one may be a client's.
+    const orgs = client.source === 'env' ? [] : (0, credentials_1.listOrgs)(client.apiUrl);
+    const wanted = (0, args_1.flagString)(args, 'org');
+    if (wanted) {
+        if (client.source === 'env')
+            throw new errors_1.CliError('--org does not apply to a key from XFLOW_TOKEN', 'That key belongs to one organization: drop --org');
+        const org = (0, org_1.findOrg)(orgs, wanted);
+        client = { apiUrl: client.apiUrl, token: org.token, source: 'folder', organizationId: org.organizationId };
+    }
+    else if (orgs.length > 1) {
+        throw new errors_1.CliError(`You are signed in to ${orgs.length} organizations: name the one that gets the project`, `xflow init ${args.words[0] ?? '.'} --org <name>. The list: xflow org`);
+    }
+    const orgName = orgs.find((org) => org.organizationId === client.organizationId)?.name;
     if (!isEmptyEnough(target)) {
         throw new errors_1.CliError(`The directory ${target} is not empty`, 'Create the project in an empty folder: xflow init my-project. To link an existing folder to a project: xflow link <id>');
     }
     const folder = noApp ? null : checkFolder((0, args_1.flagString)(args, 'app') ?? (0, sources_1.appFolderName)(name, new Set(), 'app'));
-    (0, ui_1.step)('Creating the project on the platform');
+    (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 },

package/dist/flags.js

@@ -44,7 +44,7 @@ exports.KNOWN = {
     'org list': [],
     'org members': [],
     'org switch': [],
-    init: ['name', 'app', 'no-app', 'server'],
+    init: ['name', 'app', 'no-app', 'server', 'org'],
     link: [],
     projects: [],
     'projects list': [],
@@ -118,7 +118,7 @@ exports.KNOWN = {
  * line here, or a refusal nobody prints any more stays behind as a lie.
  */
 exports.WORKING_COPY = {
-    pull: 'it writes the sources next to it',
+    pull: 'it writes the sources next to it. A project without a folder comes down whole with xflow link <id> in an empty one',
     status: 'it compares the folder with the revision on the platform',
     dev: 'it runs the dev server of the app folder it stands in',
     'apps add': 'it lays the template into apps/',

package/dist/help.js

@@ -778,6 +778,8 @@ change them, restyle them or delete what you do not use.
   --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)
 
 More apps later: ${(0, ui_1.bold)('xflow apps add <folder>')}. If writing the files fails, the project stays
 on the platform and the CLI says how to pick it up with the link command.`,

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.3.0';
+exports.CLI_VERSION = '1.4.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,10 +1,10 @@
 {
   "name": "@getxflow/cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "CLI for the XFlow platform: projects with apps, functions and a database; source sync, deployment and publishing",
   "license": "UNLICENSED",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "bin": {
     "xflow": "dist/bin.js"