@naturalcycles/dev-lib 13.25.10 → 13.27.0

package/dist/bin/commitlint-def.js

@@ -1,18 +1,30 @@
 #!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cp = require("node:child_process");
 const fs = require("node:fs");
-const exec_1 = require("@naturalcycles/nodejs-lib/dist/exec");
-const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 const git_util_1 = require("../util/git.util");
-(0, script_1.runScript)(async () => {
-    const editMsg = process.argv[process.argv.length - 1] || '.git/COMMIT_EDITMSG';
-    console.log(editMsg);
-    const cwd = process.cwd();
-    const localConfig = `${cwd}/commitlint.config.js`;
-    const sharedConfig = `${paths_cnst_1.cfgDir}/commitlint.config.js`;
-    const config = fs.existsSync(localConfig) ? localConfig : sharedConfig;
-    const env = { GIT_BRANCH: await (0, git_util_1.gitCurrentBranchName)() };
-    await (0, exec_1.execWithArgs)(`commitlint`, [`--edit`, editMsg, `--config`, config], { env });
+const editMsg = process.argv[process.argv.length - 1] || '.git/COMMIT_EDITMSG';
+// console.log(editMsg)
+const cwd = process.cwd();
+const localConfig = `${cwd}/commitlint.config.js`;
+const sharedConfig = `${paths_cnst_1.cfgDir}/commitlint.config.js`;
+const config = fs.existsSync(localConfig) ? localConfig : sharedConfig;
+const env = { GIT_BRANCH: (0, git_util_1.gitCurrentBranchName)() };
+// await execWithArgs(`commitlint`, [`--edit`, editMsg, `--config`, config], { env })
+execSync(`node ./node_modules/.bin/commitlint --edit ${editMsg} --config ${config}`, {
+    env,
 });
+function execSync(cmd, opt) {
+    try {
+        cp.execSync(cmd, {
+            ...opt,
+            encoding: 'utf8',
+            stdio: 'inherit',
+        });
+    }
+    catch {
+        process.exit(1);
+    }
+}

package/dist/cmd/generate-build-info.command.js

@@ -12,7 +12,7 @@ async function generateBuildInfoCommand() {
             desc: 'Output directory',
         },
     }).argv;
-    const buildInfo = await (0, __1.generateBuildInfo)();
+    const buildInfo = (0, __1.generateBuildInfo)();
     console.log(buildInfo);
     if (dir)
         fs.mkdirSync(dir, { recursive: true });

package/dist/cmd/lint-all.command.js

@@ -22,7 +22,7 @@ async function lintAllCommand() {
             default: false,
         },
     }).argv;
-    const hadChangesBefore = await (0, git_util_1.gitHasUncommittedChanges)();
+    const hadChangesBefore = (0, git_util_1.gitHasUncommittedChanges)();
     await (0, eslint_all_command_1.eslintAllCommand)();
     if (fs.existsSync(`node_modules/stylelint`) &&
         fs.existsSync(`node_modules/stylelint-config-standard-scss`)) {
@@ -35,19 +35,19 @@ async function lintAllCommand() {
     }
     if (commitOnChanges || failOnChanges) {
         // detect changes
-        const hasChanges = await (0, git_util_1.gitHasUncommittedChanges)();
+        const hasChanges = (0, git_util_1.gitHasUncommittedChanges)();
         if (hasChanges) {
             if (hadChangesBefore) {
                 console.log(`lint-all: there are changes before running lint-all, will not commit`);
             }
             else {
                 const msg = 'style(ci): ' +
-                    (0, js_lib_1._truncate)((0, git_util_1.commitMessageToTitleMessage)(await (0, git_util_1.getLastGitCommitMsg)()), 60) +
+                    (0, js_lib_1._truncate)((0, git_util_1.commitMessageToTitleMessage)((0, git_util_1.getLastGitCommitMsg)()), 60) +
                     '\n\n[skip ci]';
                 // pull, commit, push changes
-                await (0, git_util_1.gitPull)();
-                await (0, git_util_1.gitCommitAll)(msg);
-                await (0, git_util_1.gitPush)();
+                (0, git_util_1.gitPull)();
+                (0, git_util_1.gitCommitAll)(msg);
+                (0, git_util_1.gitPush)();
             }
             // fail on changes
             if (failOnChanges) {

package/dist/util/buildInfo.util.d.ts

@@ -1,2 +1,2 @@
 import type { BuildInfo } from './buildInfo.model';
-export declare function generateBuildInfo(dev?: boolean): Promise<BuildInfo>;
+export declare function generateBuildInfo(dev?: boolean): BuildInfo;

package/dist/util/buildInfo.util.js

@@ -3,18 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBuildInfo = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const git_util_1 = require("./git.util");
-async function generateBuildInfo(dev = false) {
+function generateBuildInfo(dev = false) {
     const now = (0, js_lib_1.localTime)();
-    const [rev, branchName, repoName, tsCommit] = dev
-        ? ['devRev', 'devBranch', 'devRepo', now.unix()]
-        : await Promise.all([
-            (0, git_util_1.gitCurrentCommitSha)(),
-            (0, git_util_1.gitCurrentBranchName)(),
-            (0, git_util_1.gitCurrentRepoName)(),
-            (0, git_util_1.gitCurrentCommitTimestamp)(),
-        ]);
     const ts = now.unix();
     const tsStr = now.toPretty();
+    const rev = dev ? 'devRev' : (0, git_util_1.gitCurrentCommitSha)();
+    const branchName = dev ? 'devBranch' : (0, git_util_1.gitCurrentBranchName)();
+    const repoName = dev ? 'devRepo' : (0, git_util_1.gitCurrentRepoName)();
+    const tsCommit = dev ? now.unix() : (0, git_util_1.gitCurrentCommitTimestamp)();
     const ver = [now.toStringCompact(), repoName, branchName, rev].join('_');
     return {
         ts,

package/dist/util/git.util.d.ts

@@ -1,17 +1,18 @@
-export declare function getLastGitCommitMsg(): Promise<string>;
+import type { UnixTimestampNumber } from '@naturalcycles/js-lib';
+export declare function getLastGitCommitMsg(): string;
 export declare function commitMessageToTitleMessage(msg: string): string;
-export declare function gitHasUncommittedChanges(): Promise<boolean>;
+export declare function gitHasUncommittedChanges(): boolean;
 /**
  * @returns true if there were changes
  */
-export declare function gitCommitAll(msg: string): Promise<boolean>;
+export declare function gitCommitAll(msg: string): boolean;
 /**
  * @returns true if there are not pushed commits.
  */
-export declare function gitIsAhead(): Promise<boolean>;
-export declare function gitPull(): Promise<void>;
-export declare function gitPush(): Promise<void>;
-export declare function gitCurrentCommitSha(full?: boolean): Promise<string>;
-export declare function gitCurrentCommitTimestamp(): Promise<number>;
-export declare function gitCurrentBranchName(): Promise<string>;
-export declare function gitCurrentRepoName(): Promise<string>;
+export declare function gitIsAhead(): boolean;
+export declare function gitPull(): void;
+export declare function gitPush(): void;
+export declare function gitCurrentCommitSha(full?: boolean): string;
+export declare function gitCurrentCommitTimestamp(): UnixTimestampNumber;
+export declare function gitCurrentBranchName(): string;
+export declare function gitCurrentRepoName(): string;

package/dist/util/git.util.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gitCurrentRepoName = exports.gitCurrentBranchName = exports.gitCurrentCommitTimestamp = exports.gitCurrentCommitSha = exports.gitPush = exports.gitPull = exports.gitIsAhead = exports.gitCommitAll = exports.gitHasUncommittedChanges = exports.commitMessageToTitleMessage = exports.getLastGitCommitMsg = void 0;
+const cp = require("node:child_process");
 const path = require("node:path");
-const exec_util_1 = require("@naturalcycles/nodejs-lib/dist/exec/exec.util");
-const execa = require("execa");
-async function getLastGitCommitMsg() {
-    // git log -1 --pretty=%B
-    const cmd = 'git';
-    const args = ['log', '-1', '--pretty=%B'];
-    const { stdout: msg } = await execa(cmd, args);
-    return msg;
+const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
+function getLastGitCommitMsg() {
+    return execSync('git log -1 --pretty=%B');
 }
 exports.getLastGitCommitMsg = getLastGitCommitMsg;
 function commitMessageToTitleMessage(msg) {
@@ -18,102 +14,95 @@ function commitMessageToTitleMessage(msg) {
     return title || preTitle;
 }
 exports.commitMessageToTitleMessage = commitMessageToTitleMessage;
-async function gitHasUncommittedChanges() {
+function gitHasUncommittedChanges() {
     // git diff-index --quiet HEAD -- || echo "untracked"
-    const cmd = 'git diff-index --quiet HEAD --';
-    const { exitCode } = await execa(cmd, {
-        shell: true,
-        reject: false,
-    });
-    // console.log(code)
-    return !!exitCode;
+    try {
+        cp.execSync('git diff-index --quiet HEAD --', {
+            encoding: 'utf8',
+        });
+        return false;
+    }
+    catch {
+        return true;
+    }
 }
 exports.gitHasUncommittedChanges = gitHasUncommittedChanges;
 /**
  * @returns true if there were changes
  */
-async function gitCommitAll(msg) {
+function gitCommitAll(msg) {
     // git commit -a -m "style(lint-all): $GIT_MSG" || true
-    // const cmd = `git commit -a --no-verify -m "${msg}"`
-    const cmd = `git`;
-    const args = ['commit', '-a', '--no-verify', '-m', msg];
-    (0, exec_util_1.logExec)(cmd, args);
-    const { exitCode } = await execa(cmd, args, {
-        // shell: true,
-        stdio: 'inherit',
-        reject: false,
-    });
-    // console.log(`gitCommitAll code: ${code}`)
-    return !exitCode;
+    const cmd = `git commit -a --no-verify -m "${msg}"`;
+    // const cmd = `git`
+    // const args = ['commit', '-a', '--no-verify', '-m', msg]
+    console.log((0, colors_1.grey)(cmd));
+    try {
+        cp.execSync(cmd, {
+            stdio: 'inherit',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 exports.gitCommitAll = gitCommitAll;
 /**
  * @returns true if there are not pushed commits.
  */
-async function gitIsAhead() {
+function gitIsAhead() {
     // ahead=`git rev-list HEAD --not --remotes | wc -l | awk '{print $1}'`
     const cmd = `git rev-list HEAD --not --remotes | wc -l | awk '{print $1}'`;
-    const { stdout } = await execa(cmd, { shell: true });
+    const stdout = execSync(cmd);
     // console.log(`gitIsAhead: ${stdout}`)
     return Number(stdout) > 0;
 }
 exports.gitIsAhead = gitIsAhead;
-async function gitPull() {
-    const cmd = 'git';
-    const args = ['pull'];
-    await execa(cmd, args, {
-        reject: false,
-        stdio: 'inherit',
-    });
+function gitPull() {
+    const cmd = 'git pull';
+    try {
+        cp.execSync(cmd, {
+            stdio: 'inherit',
+        });
+    }
+    catch { }
 }
 exports.gitPull = gitPull;
-async function gitPush() {
+function gitPush() {
     // git push --set-upstream origin $CIRCLE_BRANCH && echo "pushed, exiting" && exit 0
-    const cmd = 'git';
-    const args = ['push'];
-    const { CIRCLE_BRANCH } = process.env;
-    const branchName = CIRCLE_BRANCH || (await gitCurrentBranchName());
+    let cmd = 'git push';
+    const branchName = gitCurrentBranchName();
     if (branchName) {
-        args.push('--set-upstream', 'origin', branchName);
+        cmd += ` --set-upstream origin ${branchName}`;
     }
-    (0, exec_util_1.logExec)(cmd, args);
-    await execa(cmd, args, {
+    console.log((0, colors_1.grey)(cmd));
+    cp.execSync(cmd, {
         stdio: 'inherit',
     });
 }
 exports.gitPush = gitPush;
-async function gitCurrentCommitSha(full = false) {
-    // git rev-parse HEAD
-    const cmd = 'git';
-    const args = ['rev-parse', 'HEAD'];
-    const { stdout: commitSha } = await execa(cmd, args);
-    return full ? commitSha.trim() : commitSha.trim().slice(0, 7);
+function gitCurrentCommitSha(full = false) {
+    const sha = execSync('git rev-parse HEAD');
+    return full ? sha : sha.slice(0, 7);
 }
 exports.gitCurrentCommitSha = gitCurrentCommitSha;
-async function gitCurrentCommitTimestamp() {
-    // git log -1 --format=%ct
-    const cmd = 'git';
-    const args = ['log', '-1', '--format=%ct'];
-    const { stdout: ts } = await execa(cmd, args);
-    return Number(ts);
+function gitCurrentCommitTimestamp() {
+    return Number(execSync('git log -1 --format=%ct'));
 }
 exports.gitCurrentCommitTimestamp = gitCurrentCommitTimestamp;
-async function gitCurrentBranchName() {
-    // git rev-parse --abbrev-ref HEAD
-    const cmd = 'git';
-    const args = ['rev-parse', '--abbrev-ref', 'HEAD'];
-    const { stdout: branchName } = await execa(cmd, args);
-    // console.log(`gitCurrentBranchName: ${branchName}`)
-    return branchName.trim();
+function gitCurrentBranchName() {
+    return execSync('git rev-parse --abbrev-ref HEAD');
 }
 exports.gitCurrentBranchName = gitCurrentBranchName;
-async function gitCurrentRepoName() {
-    // basename -s .git `git config --get remote.origin.url`
-    const cmd = 'git';
-    const args = ['config', '--get', 'remote.origin.url'];
-    const { stdout: originUrl } = await execa(cmd, args);
-    const repoName = path.basename(originUrl, '.git');
-    // console.log(`gitCurrentRepoName: ${repoName}`)
-    return repoName;
+function gitCurrentRepoName() {
+    const originUrl = execSync('git config --get remote.origin.url');
+    return path.basename(originUrl, '.git');
 }
 exports.gitCurrentRepoName = gitCurrentRepoName;
+function execSync(cmd) {
+    return cp
+        .execSync(cmd, {
+        encoding: 'utf8',
+    })
+        .trim();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.25.10",
+  "version": "13.27.0",
   "scripts": {
     "prepare": "husky install",
     "tsn-debug": "tsn testScript.ts",
@@ -47,7 +47,6 @@
     "eslint-plugin-unicorn": "^47.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "eslint-plugin-vue": "^9.0.0",
-    "execa": "^5.0.0",
     "expect-type": "^0.16.0",
     "husky": "^8.0.1",
     "jest-junit": "^16.0.0",