@appright/funnelshift 0.15.0 → 0.16.0

package/dist/cli/index.js

@@ -8,11 +8,11 @@ import { join } from 'node:path';
 const argv = process.argv;
 const arg = (n) => argArg(argv, n);
 const opt = (n) => optArg(argv, n);
-const git = (c) => { try {
+const git = (c, none = 'unknown') => { try {
     return execSync(`git ${c}`, { stdio: ['ignore', 'pipe', 'ignore'] }).toString().trim();
 }
 catch {
-    return 'unknown';
+    return none;
 } };
 const commit = process.env.GITHUB_SHA || git('rev-parse HEAD');
 const branch = process.env.GITHUB_HEAD_REF || process.env.GITHUB_REF_NAME || git('rev-parse --abbrev-ref HEAD');
@@ -24,13 +24,15 @@ async function main() {
         return;
     }
     if (cmd !== 'build' && cmd !== 'upload')
-        throw new Error('usage: funnel-kit init --project <slug> [--dir <path>] [--force] | build|upload --funnel <slug> [--api <url>] [--project <slug>]');
+        throw new Error('usage: funnel-kit init --project <slug> [--dir <path>] [--force] | build --funnel <slug> | upload --funnel <slug> [--api <url>] [--project <slug>] [--message <text>]');
     const funnel = arg('funnel');
     if (cmd === 'build') {
         console.log(await buildFunnel(process.cwd(), funnel, { commit, branch }));
     }
     else {
-        const lines = await runUpload({ dir: join(process.cwd(), 'dist', funnel), funnel, commit, branch, env: process.env, api: opt('api'), project: opt('project') });
+        // the build's name in the service: --message, else the subject of the commit (none outside git)
+        const message = opt('message') ?? git('log -1 --format=%s', '');
+        const lines = await runUpload({ dir: join(process.cwd(), 'dist', funnel), funnel, commit, branch, message, env: process.env, api: opt('api'), project: opt('project') });
         for (const l of lines)
             console.log(l);
     }

package/dist/cli/upload.d.ts

@@ -1,3 +1,4 @@
+export declare function commitSubject(msg: string | undefined): string;
 export declare function uploadBuild(o: {
     dir: string;
     api: string;
@@ -5,6 +6,7 @@ export declare function uploadBuild(o: {
     funnel: string;
     commit: string;
     branch: string;
+    message?: string;
     token: string;
     fetchImpl?: typeof fetch;
 }): Promise<{
@@ -22,6 +24,7 @@ export declare function runUpload(o: {
     funnel: string;
     commit: string;
     branch: string;
+    message?: string;
     env: Record<string, string | undefined>;
     api?: string;
     project?: string;

package/dist/cli/upload.js

@@ -17,6 +17,12 @@ function files(root, rel = '') {
         throw new Error(`not a regular file in build dir: ${r}`);
     });
 }
+// commitSubject is the commit message the build is named by in the service («#14 · Новый текст пейвола»): its first line, or '' for
+// none. The merge commit GitHub makes for a pull request («Merge <sha> into <sha>») says nothing about the build and is left out.
+export function commitSubject(msg) {
+    const s = (msg ?? '').split(/\r?\n/)[0].trim();
+    return /^Merge [0-9a-f]{40} into [0-9a-f]{40}$/.test(s) ? '' : s;
+}
 export async function uploadBuild(o) {
     const list = files(o.dir);
     for (const need of ['index.html', 'manifest.json']) {
@@ -33,6 +39,10 @@ export async function uploadBuild(o) {
     const form = new FormData();
     for (const k of ['project', 'funnel', 'commit', 'branch'])
         form.set(k, o[k]);
+    // the commit subject names the build (kit 0.16.0); a server before it ignores the field
+    const message = commitSubject(o.message);
+    if (message)
+        form.set('message', message);
     form.set('artifact', new Blob([art], { type: 'application/gzip' }), 'build.tgz');
     const r = await (o.fetchImpl ?? fetch)(`${o.api.replace(/\/+$/, '')}/api/builds`, { method: 'POST', body: form, headers: { Authorization: `Bearer ${o.token}` } });
     const text = await r.text();
@@ -85,6 +95,6 @@ export async function runUpload(o) {
         throw new Error('the service address is not set: use FUNNELS_API_URL or --api <url>');
     const fetchImpl = o.fetchImpl ?? fetch;
     const project = o.project || o.env.FUNNELS_PROJECT || await projectOfToken(api, token, fetchImpl);
-    const res = await uploadBuild({ dir: o.dir, api, project, funnel: o.funnel, commit: o.commit, branch: o.branch, token, fetchImpl });
+    const res = await uploadBuild({ dir: o.dir, api, project, funnel: o.funnel, commit: o.commit, branch: o.branch, message: o.message, token, fetchImpl });
     return uploadLines(res);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appright/funnelshift",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",