@naturalcycles/nodejs-lib 13.40.0 → 13.41.1

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

@@ -4,5 +4,9 @@ export interface GenerateBuildInfoOptions {
      * If set - this timestamp will be used, instead of "current time".
      */
     overrideTimestamp?: UnixTimestamp;
+    /**
+     * Defaults to currently checked out git branch.
+     */
+    overrideBranchName?: string;
 }
 export declare function generateBuildInfo(opt?: GenerateBuildInfoOptions): BuildInfo;

package/dist/util/buildInfo.util.js

@@ -8,7 +8,7 @@ function generateBuildInfo(opt = {}) {
     const now = js_lib_1.localTime.orNow(opt.overrideTimestamp);
     const ts = now.unix;
     const rev = git2_1.git2.getCurrentCommitSha();
-    const branchName = git2_1.git2.getCurrentBranchName();
+    const branchName = opt.overrideBranchName || git2_1.git2.getCurrentBranchName();
     const repoName = git2_1.git2.getCurrentRepoName();
     const tsCommit = git2_1.git2.getCurrentCommitTimestamp();
     const ver = [now.toStringCompact(), repoName, branchName, rev].join('_');

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import { BaseDBEntity, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib';
+import { BaseDBEntity, IANATimezone, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib';
 import { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
 import { NumberSchema } from './number.extensions';
 import { StringSchema } from './string.extensions';
@@ -92,7 +92,7 @@ export declare const SEM_VER_REGEX: RegExp;
 export declare const semVerSchema: StringSchema<string>;
 export declare const userAgentSchema: StringSchema<string>;
 export declare const utcOffsetSchema: NumberSchema<number>;
-export declare const ianaTimezoneSchema: StringSchema<string>;
+export declare const ianaTimezoneSchema: StringSchema<IANATimezone>;
 export declare const ipAddressSchema: StringSchema<string>;
 export declare const baseDBEntitySchema: ObjectSchema<BaseDBEntity>;
 export declare const macAddressSchema: StringSchema<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.40.0",
+  "version": "13.41.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/util/buildInfo.util.ts

@@ -13,6 +13,11 @@ export interface GenerateBuildInfoOptions {
    * If set - this timestamp will be used, instead of "current time".
    */
   overrideTimestamp?: UnixTimestamp
+
+  /**
+   * Defaults to currently checked out git branch.
+   */
+  overrideBranchName?: string
 }
 
 export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo {
@@ -20,7 +25,7 @@ export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo
   const ts = now.unix
 
   const rev = git2.getCurrentCommitSha()
-  const branchName = git2.getCurrentBranchName()
+  const branchName = opt.overrideBranchName || git2.getCurrentBranchName()
   const repoName = git2.getCurrentRepoName()
   const tsCommit = git2.getCurrentCommitTimestamp()
 

package/src/validation/joi/joi.shared.schemas.ts

@@ -4,6 +4,7 @@ import {
   _stringEnumKeys,
   _stringEnumValues,
   BaseDBEntity,
+  IANATimezone,
   IsoDateTime,
   NumberEnum,
   StringEnum,
@@ -177,7 +178,7 @@ export const ianaTimezoneSchema = stringSchema
   .valid(...Intl.supportedValuesOf('timeZone'), 'UTC')
   .messages({
     'any.only': `must be a valid IANA timezone string`,
-  })
+  }) as StringSchema<IANATimezone>
 
 export const ipAddressSchema = stringSchema.ip()