@naturalcycles/dev-lib 13.28.1 → 13.28.3

package/dist/bin/commitlint-def.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cp = require("node:child_process");
 const fs = require("node:fs");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const git_util_1 = require("../util/git.util");
 const editMsg = process.argv[process.argv.length - 1] || '.git/COMMIT_EDITMSG';
 // console.log(editMsg)
 const cwd = process.cwd();
@@ -13,7 +13,7 @@ const sharedConfig = `${paths_cnst_1.cfgDir}/commitlint.config.js`;
 const config = fs.existsSync(localConfig) ? localConfig : sharedConfig;
 const env = {
     ...process.env,
-    GIT_BRANCH: (0, git_util_1.gitCurrentBranchName)(),
+    GIT_BRANCH: (0, nodejs_lib_1.gitCurrentBranchName)(),
 };
 // await execWithArgs(`commitlint`, [`--edit`, editMsg, `--config`, config], { env })
 execSync(`node ./node_modules/.bin/commitlint --edit ${editMsg} --config ${config}`, {

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

@@ -4,7 +4,7 @@ exports.lintAllCommand = void 0;
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const yargs = require("yargs");
-const git_util_1 = require("../util/git.util");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const prettier_util_1 = require("../util/prettier.util");
 const stylelint_util_1 = require("../util/stylelint.util");
 const eslint_all_command_1 = require("./eslint-all.command");
@@ -22,7 +22,7 @@ async function lintAllCommand() {
             default: false,
         },
     }).argv;
-    const hadChangesBefore = (0, git_util_1.gitHasUncommittedChanges)();
+    const hadChangesBefore = (0, nodejs_lib_1.gitHasUncommittedChanges)();
     (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 = (0, git_util_1.gitHasUncommittedChanges)();
+        const hasChanges = (0, nodejs_lib_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)((0, git_util_1.getLastGitCommitMsg)()), 60) +
+                    (0, js_lib_1._truncate)((0, nodejs_lib_1.commitMessageToTitleMessage)((0, nodejs_lib_1.getLastGitCommitMsg)()), 60) +
                     '\n\n[skip ci]';
                 // pull, commit, push changes
-                (0, git_util_1.gitPull)();
-                (0, git_util_1.gitCommitAll)(msg);
-                (0, git_util_1.gitPush)();
+                (0, nodejs_lib_1.gitPull)();
+                (0, nodejs_lib_1.gitCommitAll)(msg);
+                (0, nodejs_lib_1.gitPush)();
             }
             // fail on changes
             if (failOnChanges) {

package/dist/index.d.ts

@@ -1,4 +1 @@
 export * from './cmd/build-prod.command';
-export * from './util/buildInfo.model';
-export * from './util/buildInfo.util';
-export * from './util/git.util';

package/dist/index.js

@@ -2,6 +2,3 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./cmd/build-prod.command"), exports);
-tslib_1.__exportStar(require("./util/buildInfo.model"), exports);
-tslib_1.__exportStar(require("./util/buildInfo.util"), exports);
-tslib_1.__exportStar(require("./util/git.util"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.28.1",
+  "version": "13.28.3",
   "scripts": {
     "prepare": "husky install",
     "tsn-debug": "tsn testScript.ts",
@@ -12,7 +12,6 @@
     "build-copy": "tsn ./src/bin/build-copy.ts",
     "build-prod": "tsn ./src/bin/build-prod.ts",
     "build-prod-esm-cjs": "tsn ./src/bin/build-prod-esm-cjs.ts",
-    "generate-build-info": "tsn ./src/bin/generate-build-info.ts",
     "test": "tsn ./src/bin/test.ts",
     "test-ci": "tsn ./src/bin/test-ci.ts",
     "test-leaks": "tsn ./src/bin/test-leaks.ts",
@@ -80,7 +79,6 @@
     "build-prod-esm-cjs": "dist/bin/build-prod-esm-cjs.js",
     "commitlint-def": "dist/bin/commitlint-def.js",
     "eslint-all": "dist/bin/eslint-all.js",
-    "generate-build-info": "dist/bin/generate-build-info.js",
     "init-from-dev-lib": "dist/bin/init-from-dev-lib.js",
     "lint-all": "dist/bin/lint-all.js",
     "lint-staged-def": "dist/bin/lint-staged-def.js",

package/readme.md

@@ -170,9 +170,6 @@ Install it **locally** in you project by adding
 
 - `init-from-dev-lib`: copy config files from `dev-lib/cfg/init` to the project
 - `update-from-dev-lib`: copy config files from `dev-lib/cfg/overwrite` to the project
-- `generate-build-info`: generate `buildInfo.json`
-  - `--dir <someDir>` will save it to given dir
-  - `--shell` will also generate `buildInfo.sh`
 
 ## Non-extendable config files
 

package/dist/bin/generate-build-info.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/bin/generate-build-info.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
-const generate_build_info_command_1 = require("../cmd/generate-build-info.command");
-(0, script_1.runScript)(generate_build_info_command_1.generateBuildInfoCommand);

package/dist/cmd/generate-build-info.command.d.ts

@@ -1 +0,0 @@
-export declare function generateBuildInfoCommand(): void;

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

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateBuildInfoCommand = void 0;
-const fs = require("node:fs");
-const path = require("node:path");
-const yargs = require("yargs");
-const __1 = require("..");
-function generateBuildInfoCommand() {
-    const { dir } = yargs.options({
-        dir: {
-            type: 'string',
-            desc: 'Output directory',
-        },
-    }).argv;
-    const buildInfo = (0, __1.generateBuildInfo)();
-    console.log(buildInfo);
-    if (dir)
-        fs.mkdirSync(dir, { recursive: true });
-    const buildInfoPath = dir ? path.resolve(dir, 'buildInfo.json') : 'buildInfo.json';
-    fs.writeFileSync(buildInfoPath, JSON.stringify(buildInfo, null, 2));
-}
-exports.generateBuildInfoCommand = generateBuildInfoCommand;

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

@@ -1,40 +0,0 @@
-import { UnixTimestampNumber } from '@naturalcycles/js-lib';
-export interface BuildInfo {
-    /**
-     * Unix timestamp of when the build was made.
-     */
-    ts: UnixTimestampNumber;
-    /**
-     * Unix timestamp of commit ("committer date", not "author date")
-     */
-    tsCommit: UnixTimestampNumber;
-    /**
-     * Human-readable time of the build. E.g:
-     * 2019-06-21 18:35:19
-     */
-    tsStr: string;
-    repoName: string;
-    branchName: string;
-    /**
-     * GIT sha revision (first 7 characters)
-     */
-    rev: string;
-    /**
-     * "Version string" in the following format:
-     * yyyyMMdd_HHmm_$repoName_$branch_$rev
-     *
-     * E.g:
-     * 20190419_1728_myrepo_master_21aecf5
-     */
-    ver: string;
-    /**
-     * Build during development.
-     */
-    dev?: boolean;
-    /**
-     * Build "environment".
-     * Normally taken from process.env.APP_ENV
-     * Can be undefined.
-     */
-    env?: string;
-}

package/dist/util/buildInfo.model.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,2 +0,0 @@
-import type { BuildInfo } from './buildInfo.model';
-export declare function generateBuildInfo(): BuildInfo;

package/dist/util/buildInfo.util.js

@@ -1,27 +0,0 @@
-"use strict";
-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");
-function generateBuildInfo() {
-    const { APP_ENV } = process.env;
-    const now = (0, js_lib_1.localTime)();
-    const ts = now.unix();
-    const tsStr = now.toPretty();
-    const rev = (0, git_util_1.gitCurrentCommitSha)();
-    const branchName = (0, git_util_1.gitCurrentBranchName)();
-    const repoName = (0, git_util_1.gitCurrentRepoName)();
-    const tsCommit = (0, git_util_1.gitCurrentCommitTimestamp)();
-    const ver = [now.toStringCompact(), repoName, branchName, rev].join('_');
-    return {
-        ts,
-        tsCommit,
-        tsStr,
-        repoName,
-        branchName,
-        rev,
-        ver,
-        env: APP_ENV,
-    };
-}
-exports.generateBuildInfo = generateBuildInfo;

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

@@ -1,18 +0,0 @@
-import type { UnixTimestampNumber } from '@naturalcycles/js-lib';
-export declare function getLastGitCommitMsg(): string;
-export declare function commitMessageToTitleMessage(msg: string): string;
-export declare function gitHasUncommittedChanges(): boolean;
-/**
- * @returns true if there were changes
- */
-export declare function gitCommitAll(msg: string): boolean;
-/**
- * @returns true if there are not pushed commits.
- */
-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,109 +0,0 @@
-"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 colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-function getLastGitCommitMsg() {
-    return execSync('git log -1 --pretty=%B');
-}
-exports.getLastGitCommitMsg = getLastGitCommitMsg;
-function commitMessageToTitleMessage(msg) {
-    const firstLine = msg.split('\n')[0];
-    const [preTitle, title] = firstLine.split(': ');
-    return title || preTitle;
-}
-exports.commitMessageToTitleMessage = commitMessageToTitleMessage;
-function gitHasUncommittedChanges() {
-    // git diff-index --quiet HEAD -- || echo "untracked"
-    try {
-        cp.execSync('git diff-index --quiet HEAD --', {
-            encoding: 'utf8',
-        });
-        return false;
-    }
-    catch {
-        return true;
-    }
-}
-exports.gitHasUncommittedChanges = gitHasUncommittedChanges;
-/**
- * @returns true if there were changes
- */
-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]
-    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.
- */
-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 = execSync(cmd);
-    // console.log(`gitIsAhead: ${stdout}`)
-    return Number(stdout) > 0;
-}
-exports.gitIsAhead = gitIsAhead;
-function gitPull() {
-    const cmd = 'git pull';
-    try {
-        cp.execSync(cmd, {
-            stdio: 'inherit',
-        });
-    }
-    catch { }
-}
-exports.gitPull = gitPull;
-function gitPush() {
-    // git push --set-upstream origin $CIRCLE_BRANCH && echo "pushed, exiting" && exit 0
-    let cmd = 'git push';
-    const branchName = gitCurrentBranchName();
-    if (branchName) {
-        cmd += ` --set-upstream origin ${branchName}`;
-    }
-    console.log((0, colors_1.grey)(cmd));
-    cp.execSync(cmd, {
-        stdio: 'inherit',
-    });
-}
-exports.gitPush = gitPush;
-function gitCurrentCommitSha(full = false) {
-    const sha = execSync('git rev-parse HEAD');
-    return full ? sha : sha.slice(0, 7);
-}
-exports.gitCurrentCommitSha = gitCurrentCommitSha;
-function gitCurrentCommitTimestamp() {
-    return Number(execSync('git log -1 --format=%ct'));
-}
-exports.gitCurrentCommitTimestamp = gitCurrentCommitTimestamp;
-function gitCurrentBranchName() {
-    return execSync('git rev-parse --abbrev-ref HEAD');
-}
-exports.gitCurrentBranchName = gitCurrentBranchName;
-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',
-        // stdio: 'inherit', // no, otherwise we don't get the output returned
-    })
-        .trim();
-}