@getxflow/cli 0.30.0 → 0.31.0

package/dist/commands/projects.js

@@ -49,27 +49,38 @@ async function templates() {
     }
     (0, ui_1.table)(list.map((t) => [t.id, t.name, t.is_default ? 'default' : '', t.description ?? '']));
 }
-/**
- * A function name out of the project name: the platform takes lowercase latin
- * letters, digits and dashes, and the folder it lives in gives it its name.
- */
-function functionNameFrom(name) {
-    const slug = name
+function slugify(name) {
+    return name
         .toLowerCase()
         .replace(/[^a-z0-9-]+/g, '-')
         .replace(/^-+|-+$/g, '')
         .slice(0, 41);
-    if (!/^[a-z0-9][a-z0-9-]{0,40}$/.test(slug)) {
-        throw new errors_1.CliError(`Cannot make a function name out of "${name}"`, 'Name it in latin letters, digits and dashes: xflow init my-fn --function');
-    }
-    return slug;
+}
+/**
+ * A function name out of the project name: the platform takes lowercase latin
+ * letters, digits and dashes, and the folder it lives in gives it its name.
+ *
+ * The folder name is the fallback, so a project called in Russian still gets a
+ * function: the name a person reads and the name the cloud takes are different
+ * things, and the folder already holds a usable one.
+ */
+function functionNameFrom(name, folder) {
+    const usable = /^[a-z0-9][a-z0-9-]{0,40}$/;
+    const slug = slugify(name);
+    if (usable.test(slug))
+        return slug;
+    const fromFolder = folder ? slugify(folder) : '';
+    if (usable.test(fromFolder))
+        return fromFolder;
+    throw new errors_1.CliError(`Cannot make a function name out of "${name}"`, 'The name comes from the project name, and the folder is the fallback: name either of them in latin ' +
+        'letters, digits and dashes (xflow init my-fn --function)');
 }
 /**
  * Create a standalone function: a shared backend of the organization, a project
  * without a site. No template is fetched — there is no frontend to fetch.
  */
 async function initFunction(args, client, target, name) {
-    const functionName = functionNameFrom(name);
+    const functionName = functionNameFrom(name, (0, node_path_1.basename)(target));
     (0, ui_1.step)('Creating the function on the platform');
     const project = await (0, api_1.apiJson)(client, '/api/v1/projects', {
         method: 'POST',

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 = '0.30.0';
+exports.CLI_VERSION = '0.31.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": "0.30.0",
+  "version": "0.31.0",
   "description": "CLI for the XFlow platform: source sync, deployment and publishing of applications",
   "license": "UNLICENSED",
   "engines": {

package/skills/xflow/SKILL.md

@@ -22,7 +22,7 @@ contains the fix.
 
 ## Keeping these instructions current
 
-These instructions ship with xflow CLI 0.30.0, so the copy you are reading can be older than
+These instructions ship with xflow CLI 0.31.0, so the copy you are reading can be older than
 the CLI answering your commands.
 
 When the CLI says this file does not match it, run `xflow skills --refresh` and then **read
@@ -223,7 +223,8 @@ application, in that order. `xflow functions list` shows what is live. The handl
 `{ statusCode, body }` where `body` is a JSON string.
 
 A function that belongs to no single application is created on its own: `xflow init <dir>
---function` makes a project without a site, with one handler and no template. It is a shared
+--function` makes a project without a site, with one handler and no template. The function name
+comes from the project name, or from the folder when the project name is not latin. It is a shared
 backend of the organization, and any application of that organization calls it; who is let in
 is decided by `minRole` inside the function. Deploy builds and releases it the same way, but it
 has no pages, so `xflow publish` and `xflow rollback` do not apply; an earlier version comes back