@naturalcycles/nodejs-lib 15.81.0 → 15.82.0

package/dist/exec2/exec2.js

@@ -146,10 +146,13 @@ class Exec2 {
                     ...env,
                 },
             });
-            p.on('close', code => {
-                const isSuccessful = !code;
+            p.on('close', (code, signal) => {
+                const isSuccessful = code === 0;
                 this.logFinish(cmd, opt, started, isSuccessful);
-                if (code) {
+                if (signal) {
+                    return reject(new Error(`spawnAsync killed by signal ${signal}: ${cmd}`));
+                }
+                if (!isSuccessful) {
                     return reject(new Error(`spawnAsync exited with code ${code}: ${cmd}`));
                 }
                 resolve();
@@ -217,16 +220,19 @@ class Exec2 {
                     process.stderr.write(data);
                 }
             });
-            p.on('close', code => {
-                const isSuccessful = !code;
+            p.on('close', (code, signal) => {
+                const isSuccessful = code === 0;
                 this.logFinish(cmd, opt, started, isSuccessful);
-                const exitCode = code || 0;
+                const exitCode = code ?? -1;
                 const o = {
                     exitCode,
                     stdout: stdout.trim(),
                     stderr: stderr.trim(),
                 };
-                if (throwOnNonZeroCode && code) {
+                if (signal) {
+                    return reject(new SpawnError(`spawnAsyncAndReturn killed by signal ${signal}: ${cmd}`, o));
+                }
+                if (throwOnNonZeroCode && !isSuccessful) {
                     return reject(new SpawnError(`spawnAsyncAndReturn exited with code ${code}: ${cmd}`, o));
                 }
                 resolve(o);

package/dist/slack/slack.service.model.d.ts

@@ -42,7 +42,9 @@ export interface SlackMessage<CTX = any> extends SlackMessageProps {
      */
     kv?: AnyObject;
     /**
-     * If specified - adds `@name1`, `@name2` in the end of the message
+     * Slack Member IDs to mention at the end of the message.
+     * Use Member IDs (e.g., 'U1234567890'), not usernames.
+     * To find a Member ID: click on their profile in Slack → "..." → "Copy member ID".
      */
     mentions?: string[];
     /**

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

@@ -49,6 +49,11 @@ export declare class AjvSchema<IN = unknown, OUT = IN> {
     private getAJVValidateFunction;
     private static requireValidJsonSchema;
     private applyImprovementsOnErrorMessages;
+    private getErrorMessageForInstancePath;
+    private traverseSchemaPath;
+    private getChildSchema;
+    private getArrayItemSchema;
+    private getObjectPropertySchema;
 }
 export declare const HIDDEN_AJV_SCHEMA: unique symbol;
 export type WithCachedAjvSchema<Base, IN, OUT> = Base & {

package/dist/validation/ajv/ajvSchema.js

@@ -162,12 +162,56 @@ export class AjvSchema {
             return;
         const { errorMessages } = this.schema;
         for (const error of errors) {
-            if (errorMessages?.[error.keyword]) {
+            const errorMessage = this.getErrorMessageForInstancePath(this.schema, error.instancePath, error.keyword);
+            if (errorMessage) {
+                error.message = errorMessage;
+            }
+            else if (errorMessages?.[error.keyword]) {
                 error.message = errorMessages[error.keyword];
             }
             error.instancePath = error.instancePath.replaceAll(/\/(\d+)/g, `[$1]`).replaceAll('/', '.');
         }
     }
+    getErrorMessageForInstancePath(schema, instancePath, keyword) {
+        if (!schema || !instancePath)
+            return undefined;
+        const segments = instancePath.split('/').filter(Boolean);
+        return this.traverseSchemaPath(schema, segments, keyword);
+    }
+    traverseSchemaPath(schema, segments, keyword) {
+        if (!segments.length)
+            return undefined;
+        const [currentSegment, ...remainingSegments] = segments;
+        const nextSchema = this.getChildSchema(schema, currentSegment);
+        if (!nextSchema)
+            return undefined;
+        if (nextSchema.errorMessages?.[keyword]) {
+            return nextSchema.errorMessages[keyword];
+        }
+        if (remainingSegments.length) {
+            return this.traverseSchemaPath(nextSchema, remainingSegments, keyword);
+        }
+        return undefined;
+    }
+    getChildSchema(schema, segment) {
+        if (!segment)
+            return undefined;
+        if (/^\d+$/.test(segment) && schema.items) {
+            return this.getArrayItemSchema(schema, segment);
+        }
+        return this.getObjectPropertySchema(schema, segment);
+    }
+    getArrayItemSchema(schema, indexSegment) {
+        if (!schema.items)
+            return undefined;
+        if (Array.isArray(schema.items)) {
+            return schema.items[Number(indexSegment)];
+        }
+        return schema.items;
+    }
+    getObjectPropertySchema(schema, segment) {
+        return schema.properties?.[segment];
+    }
 }
 const separator = '\n';
 export const HIDDEN_AJV_SCHEMA = Symbol('HIDDEN_AJV_SCHEMA');

package/package.json

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

package/src/exec2/exec2.ts

@@ -174,10 +174,13 @@ class Exec2 {
         },
       })
 
-      p.on('close', code => {
-        const isSuccessful = !code
+      p.on('close', (code, signal) => {
+        const isSuccessful = code === 0
         this.logFinish(cmd, opt, started, isSuccessful)
-        if (code) {
+        if (signal) {
+          return reject(new Error(`spawnAsync killed by signal ${signal}: ${cmd}`))
+        }
+        if (!isSuccessful) {
           return reject(new Error(`spawnAsync exited with code ${code}: ${cmd}`))
         }
         resolve()
@@ -259,16 +262,19 @@ class Exec2 {
         }
       })
 
-      p.on('close', code => {
-        const isSuccessful = !code
+      p.on('close', (code, signal) => {
+        const isSuccessful = code === 0
         this.logFinish(cmd, opt, started, isSuccessful)
-        const exitCode = code || 0
+        const exitCode = code ?? -1
         const o: SpawnOutput = {
           exitCode,
           stdout: stdout.trim(),
           stderr: stderr.trim(),
         }
-        if (throwOnNonZeroCode && code) {
+        if (signal) {
+          return reject(new SpawnError(`spawnAsyncAndReturn killed by signal ${signal}: ${cmd}`, o))
+        }
+        if (throwOnNonZeroCode && !isSuccessful) {
           return reject(new SpawnError(`spawnAsyncAndReturn exited with code ${code}: ${cmd}`, o))
         }
         resolve(o)

package/src/slack/slack.service.model.ts

@@ -51,7 +51,9 @@ export interface SlackMessage<CTX = any> extends SlackMessageProps {
   kv?: AnyObject
 
   /**
-   * If specified - adds `@name1`, `@name2` in the end of the message
+   * Slack Member IDs to mention at the end of the message.
+   * Use Member IDs (e.g., 'U1234567890'), not usernames.
+   * To find a Member ID: click on their profile in Slack → "..." → "Copy member ID".
    */
   mentions?: string[]
 

package/src/validation/ajv/ajvSchema.ts

@@ -229,13 +229,78 @@ export class AjvSchema<IN = unknown, OUT = IN> {
     const { errorMessages } = this.schema
 
     for (const error of errors) {
-      if (errorMessages?.[error.keyword]) {
+      const errorMessage = this.getErrorMessageForInstancePath(
+        this.schema,
+        error.instancePath,
+        error.keyword,
+      )
+
+      if (errorMessage) {
+        error.message = errorMessage
+      } else if (errorMessages?.[error.keyword]) {
         error.message = errorMessages[error.keyword]
       }
 
       error.instancePath = error.instancePath.replaceAll(/\/(\d+)/g, `[$1]`).replaceAll('/', '.')
     }
   }
+
+  private getErrorMessageForInstancePath(
+    schema: JsonSchema<IN, OUT> | undefined,
+    instancePath: string,
+    keyword: string,
+  ): string | undefined {
+    if (!schema || !instancePath) return undefined
+
+    const segments = instancePath.split('/').filter(Boolean)
+    return this.traverseSchemaPath(schema, segments, keyword)
+  }
+
+  private traverseSchemaPath<IN = unknown, OUT = IN>(
+    schema: JsonSchema<IN, OUT>,
+    segments: string[],
+    keyword: string,
+  ): string | undefined {
+    if (!segments.length) return undefined
+
+    const [currentSegment, ...remainingSegments] = segments
+
+    const nextSchema = this.getChildSchema(schema, currentSegment)
+    if (!nextSchema) return undefined
+
+    if (nextSchema.errorMessages?.[keyword]) {
+      return nextSchema.errorMessages[keyword]
+    }
+
+    if (remainingSegments.length) {
+      return this.traverseSchemaPath(nextSchema, remainingSegments, keyword)
+    }
+
+    return undefined
+  }
+
+  private getChildSchema(schema: JsonSchema, segment: string | undefined): JsonSchema | undefined {
+    if (!segment) return undefined
+    if (/^\d+$/.test(segment) && schema.items) {
+      return this.getArrayItemSchema(schema, segment)
+    }
+
+    return this.getObjectPropertySchema(schema, segment)
+  }
+
+  private getArrayItemSchema(schema: JsonSchema, indexSegment: string): JsonSchema | undefined {
+    if (!schema.items) return undefined
+
+    if (Array.isArray(schema.items)) {
+      return schema.items[Number(indexSegment)]
+    }
+
+    return schema.items
+  }
+
+  private getObjectPropertySchema(schema: JsonSchema, segment: string): JsonSchema | undefined {
+    return schema.properties?.[segment as keyof typeof schema.properties]
+  }
 }
 
 const separator = '\n'