@naturalcycles/nodejs-lib 15.62.0 → 15.63.0

package/dist/util/git2.d.ts

@@ -20,6 +20,7 @@ declare class Git2 {
     getCurrentCommitTimestamp(): UnixTimestamp;
     getCurrentBranchName(): string;
     getCurrentRepoName(): string;
+    getAllBranchesNames(): string[];
 }
 export declare const git2: Git2;
 export {};

package/dist/util/git2.js

@@ -86,5 +86,30 @@ class Git2 {
         const originUrl = exec2.exec('git config --get remote.origin.url');
         return basename(originUrl, '.git');
     }
+    getAllBranchesNames() {
+        /**
+         * Raw output example from this repository:
+         * $ git branch -r
+         * origin/DEV-22569-zod-isoDate-params
+         * origin/DEV-23052-git2-add-method
+         * origin/HEAD -> origin/main
+         * origin/add-requiredpick-type-helper
+         * origin/better-object-keys
+         * origin/feat/immutable-j-1
+         * origin/feat/immutable-j-2
+         * origin/feat/random-string-util
+         * origin/fix-vsc-red-line
+         * origin/generic-cachekey-function-2
+         * origin/gh-pages
+         * origin/main
+         * origin/stringify-or-undefined
+         */
+        return exec2
+            .exec('git branch -r')
+            .split('\n')
+            .map(s => s.trim())
+            .filter(s => !s.includes(' -> '))
+            .map(s => s.split('/')[1]);
+    }
 }
 export const git2 = new Git2();

package/dist/validation/ajv/jsonSchemaBuilder.d.ts

@@ -242,7 +242,9 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
     /**
      * Concatenates another schema to the current schema.
      *
-     * It expects a type to be passed in as a generic, and this type should be the expected final type.
+     * It expects 2 types to be passed in as a generic:
+     * 1) the expected final type,
+     * 2) the type of the passed in schema.
      *
      * ```ts
      *  interface Foo { foo: string }
@@ -252,11 +254,11 @@ export declare class JsonSchemaObjectBuilder<IN extends AnyObject, OUT extends A
      *  const barSchema = j.object<Bar>({ bar: j.number() })
      *
      *  interface Shu { foo: string, bar: number }
-     *  const shuSchema = fooSchema.concat<Shu>(barSchema)
+     *  const shuSchema = fooSchema.concat<Shu, Bar>(barSchema)
      * ```
      */
     concat(other: any): never;
-    concat<FINAL extends AnyObject>(other: JsonSchemaObjectBuilder<any, any, any>): JsonSchemaObjectBuilder<FINAL, FINAL, false>;
+    concat<NEW_TYPE extends AnyObject, OUT2 extends AnyObject>(other: JsonSchemaObjectBuilder<any, OUT2, any>): ExactMatch<NEW_TYPE, OUT & OUT2> extends true ? JsonSchemaObjectBuilder<NEW_TYPE, NEW_TYPE, false> : never;
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.62.0",
+  "version": "15.63.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@types/js-yaml": "^4",

package/src/util/git2.ts

@@ -99,6 +99,32 @@ class Git2 {
     const originUrl = exec2.exec('git config --get remote.origin.url')
     return basename(originUrl, '.git')
   }
+
+  getAllBranchesNames(): string[] {
+    /**
+     * Raw output example from this repository:
+     * $ git branch -r
+     * origin/DEV-22569-zod-isoDate-params
+     * origin/DEV-23052-git2-add-method
+     * origin/HEAD -> origin/main
+     * origin/add-requiredpick-type-helper
+     * origin/better-object-keys
+     * origin/feat/immutable-j-1
+     * origin/feat/immutable-j-2
+     * origin/feat/random-string-util
+     * origin/fix-vsc-red-line
+     * origin/generic-cachekey-function-2
+     * origin/gh-pages
+     * origin/main
+     * origin/stringify-or-undefined
+     */
+    return exec2
+      .exec('git branch -r')
+      .split('\n')
+      .map(s => s.trim())
+      .filter(s => !s.includes(' -> '))
+      .map(s => s.split('/')[1]!)
+  }
 }
 
 export const git2 = new Git2()

package/src/validation/ajv/jsonSchemaBuilder.ts

@@ -851,7 +851,9 @@ export class JsonSchemaObjectBuilder<
   /**
    * Concatenates another schema to the current schema.
    *
-   * It expects a type to be passed in as a generic, and this type should be the expected final type.
+   * It expects 2 types to be passed in as a generic:
+   * 1) the expected final type,
+   * 2) the type of the passed in schema.
    *
    * ```ts
    *  interface Foo { foo: string }
@@ -861,13 +863,15 @@ export class JsonSchemaObjectBuilder<
    *  const barSchema = j.object<Bar>({ bar: j.number() })
    *
    *  interface Shu { foo: string, bar: number }
-   *  const shuSchema = fooSchema.concat<Shu>(barSchema)
+   *  const shuSchema = fooSchema.concat<Shu, Bar>(barSchema)
    * ```
    */
   concat(other: any): never
-  concat<FINAL extends AnyObject>(
-    other: JsonSchemaObjectBuilder<any, any, any>,
-  ): JsonSchemaObjectBuilder<FINAL, FINAL, false>
+  concat<NEW_TYPE extends AnyObject, OUT2 extends AnyObject>(
+    other: JsonSchemaObjectBuilder<any, OUT2, any>,
+  ): ExactMatch<NEW_TYPE, OUT & OUT2> extends true
+    ? JsonSchemaObjectBuilder<NEW_TYPE, NEW_TYPE, false>
+    : never
   concat(other: any): any {
     const clone = this.clone()
     mergeJsonSchemaObjects(clone.schema as any, other.schema)