@naturalcycles/nodejs-lib 12.42.0 → 12.45.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +29 -0
- package/dist/colors/colors.d.ts +1 -0
- package/dist/colors/colors.js +10 -0
- package/dist/diff/tableDiff.d.ts +2 -1
- package/dist/got/got.model.d.ts +2 -1
- package/dist/index.d.ts +4 -2
- package/dist/index.js +8 -2
- package/dist/security/hash.util.d.ts +2 -0
- package/dist/security/hash.util.js +9 -1
- package/dist/stream/ndjson/ndjsonMap.d.ts +10 -8
- package/dist/stream/ndjson/ndjsonMap.js +3 -18
- package/dist/stream/ndjson/transformJsonParse.d.ts +3 -2
- package/dist/stream/ndjson/transformToNDJson.d.ts +4 -2
- package/dist/stream/transform/transformBuffer.d.ts +1 -1
- package/dist/stream/transform/transformLogProgress.d.ts +4 -3
- package/dist/stream/transform/transformLogProgress.js +3 -2
- package/dist/stream/transform/transformMap.d.ts +4 -3
- package/dist/stream/transform/worker/transformMultiThreaded.d.ts +2 -1
- package/dist/validation/joi/joi.validation.error.d.ts +3 -0
- package/dist/validation/joi/joi.validation.util.js +8 -2
- package/package.json +2 -3
- package/src/colors/colors.ts +6 -0
- package/src/diff/tableDiff.ts +2 -6
- package/src/got/got.model.ts +2 -1
- package/src/index.ts +8 -0
- package/src/security/hash.util.ts +8 -0
- package/src/stream/ndjson/ndjsonMap.ts +14 -38
- package/src/stream/ndjson/transformJsonParse.ts +3 -2
- package/src/stream/ndjson/transformToNDJson.ts +4 -2
- package/src/stream/transform/transformBuffer.ts +1 -3
- package/src/stream/transform/transformLogProgress.ts +8 -7
- package/src/stream/transform/transformMap.ts +4 -3
- package/src/stream/transform/worker/transformMultiThreaded.ts +2 -2
- package/src/validation/joi/joi.validation.error.ts +3 -0
- package/src/validation/joi/joi.validation.util.ts +11 -3
- package/dist/bin/ndjson-map.d.ts +0 -2
- package/dist/bin/ndjson-map.js +0 -48
- package/src/bin/ndjson-map.ts +0 -57
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,32 @@
|
|
|
1
|
+
## [12.45.1](https://github.com/NaturalCycles/nodejs-lib/compare/v12.45.0...v12.45.1) (2021-10-25)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* make JoiValidationError.annotation non-enumerable ([9337fd3](https://github.com/NaturalCycles/nodejs-lib/commit/9337fd3e1a60deb0d9e91b17cf5e7b42f72b5459))
|
|
7
|
+
|
|
8
|
+
# [12.45.0](https://github.com/NaturalCycles/nodejs-lib/compare/v12.44.0...v12.45.0) (2021-10-22)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* ndjsonMap to take mapper as option ([eb06ae1](https://github.com/NaturalCycles/nodejs-lib/commit/eb06ae1e6ff02ef0338e764e5f7d39142ede4760))
|
|
14
|
+
|
|
15
|
+
# [12.44.0](https://github.com/NaturalCycles/nodejs-lib/compare/v12.43.0...v12.44.0) (2021-10-22)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Features
|
|
19
|
+
|
|
20
|
+
* hashAsBuffer, md5AsBuffer ([67bd66b](https://github.com/NaturalCycles/nodejs-lib/commit/67bd66b3a9bdf85016970b7a49d78eca703ec071))
|
|
21
|
+
* remove `ndjson-map` bin ([5ee734b](https://github.com/NaturalCycles/nodejs-lib/commit/5ee734bcaf9ace2bf9a18ffef9f8d09cca6cc315))
|
|
22
|
+
|
|
23
|
+
# [12.43.0](https://github.com/NaturalCycles/nodejs-lib/compare/v12.42.0...v12.43.0) (2021-10-20)
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
### Features
|
|
27
|
+
|
|
28
|
+
* hasColors, transformLogProgress to use it ([d5f7244](https://github.com/NaturalCycles/nodejs-lib/commit/d5f724488a8ee3239cf49c29ec9f9ffad5b95340))
|
|
29
|
+
|
|
1
30
|
# [12.42.0](https://github.com/NaturalCycles/nodejs-lib/compare/v12.41.0...v12.42.0) (2021-10-19)
|
|
2
31
|
|
|
3
32
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function hasColors(): boolean;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.hasColors = void 0;
|
|
4
|
+
const supporsColorLib = require('supports-color');
|
|
5
|
+
function hasColors() {
|
|
6
|
+
if (process.env['NO_COLOR'])
|
|
7
|
+
return false; // https://no-color.org/
|
|
8
|
+
return !!supporsColorLib.stdout;
|
|
9
|
+
}
|
|
10
|
+
exports.hasColors = hasColors;
|
package/dist/diff/tableDiff.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AnyObject } from '@naturalcycles/js-lib';
|
|
1
2
|
export interface TableDiffOptions {
|
|
2
3
|
/**
|
|
3
4
|
* @default false
|
|
@@ -29,4 +30,4 @@ export interface TableDiffOptions {
|
|
|
29
30
|
*
|
|
30
31
|
* Function is located in nodejs-lib (not js-lib), because it's planned to improve in the future and add e.g colors (via chalk).
|
|
31
32
|
*/
|
|
32
|
-
export declare function tableDiff(a:
|
|
33
|
+
export declare function tableDiff(a: AnyObject, b: AnyObject, opt?: TableDiffOptions): void;
|
package/dist/got/got.model.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AnyObject } from '@naturalcycles/js-lib';
|
|
1
2
|
import type { Options } from 'got';
|
|
2
3
|
export interface GetGotOptions extends Options {
|
|
3
4
|
/**
|
|
@@ -33,7 +34,7 @@ export interface GetGotOptions extends Options {
|
|
|
33
34
|
*/
|
|
34
35
|
maxResponseLength?: number;
|
|
35
36
|
}
|
|
36
|
-
export interface GotRequestContext extends
|
|
37
|
+
export interface GotRequestContext extends AnyObject {
|
|
37
38
|
/**
|
|
38
39
|
* Millisecond-timestamp of when the request was started. To be able to count "time spent".
|
|
39
40
|
*/
|
package/dist/index.d.ts
CHANGED
|
@@ -8,14 +8,16 @@ import { getGot } from './got/getGot';
|
|
|
8
8
|
import { GetGotOptions } from './got/got.model';
|
|
9
9
|
import { memoryUsage, memoryUsageFull, processSharedUtil } from './infra/process.util';
|
|
10
10
|
import { Debug, DebugLogLevel, IDebug, IDebugger } from './log/debug';
|
|
11
|
-
import { base64ToBuffer, base64ToString, bufferToBase64, hash, md5, stringToBase64 } from './security/hash.util';
|
|
11
|
+
import { base64ToBuffer, base64ToString, bufferToBase64, hash, md5, hashAsBuffer, md5AsBuffer, stringToBase64 } from './security/hash.util';
|
|
12
12
|
import { ALPHABET_ALPHANUMERIC, ALPHABET_ALPHANUMERIC_LOWERCASE, ALPHABET_ALPHANUMERIC_UPPERCASE, ALPHABET_LOWERCASE, ALPHABET_NUMBER, ALPHABET_UPPERCASE, stringId, stringIdAsync, stringIdUnsafe } from './security/id.util';
|
|
13
13
|
import { getSecretMap, loadSecretsFromEnv, loadSecretsFromJsonFile, removeSecretsFromEnv, secret, secretOptional, setSecretMap } from './security/secret.util';
|
|
14
|
+
import { hasColors } from './colors/colors';
|
|
14
15
|
import { slackDefaultMessagePrefixHook, SlackService } from './slack/slack.service';
|
|
15
16
|
import { SlackApiBody, SlackMessage, SlackMessagePrefixHook, SlackMessageProps, SlackServiceCfg } from './slack/slack.service.model';
|
|
16
17
|
import { NDJsonStats } from './stream/ndjson/ndjson.model';
|
|
17
18
|
import { ndJsonFileRead } from './stream/ndjson/ndJsonFileRead';
|
|
18
19
|
import { ndJsonFileWrite } from './stream/ndjson/ndJsonFileWrite';
|
|
20
|
+
import { ndjsonMap } from './stream/ndjson/ndjsonMap';
|
|
19
21
|
import { ndjsonStreamForEach, NDJSONStreamForEachOptions } from './stream/ndjson/ndjsonStreamForEach';
|
|
20
22
|
import { pipelineFromNDJsonFile, PipelineFromNDJsonFileOptions } from './stream/ndjson/pipelineFromNDJsonFile';
|
|
21
23
|
import { pipelineToNDJsonFile, PipelineToNDJsonFileOptions } from './stream/ndjson/pipelineToNDJsonFile';
|
|
@@ -63,4 +65,4 @@ import { anyObjectSchema, anySchema, arraySchema, oneOfSchema, binarySchema, boo
|
|
|
63
65
|
import { JoiValidationError, JoiValidationErrorData } from './validation/joi/joi.validation.error';
|
|
64
66
|
import { convert, getValidationResult, isValid, JoiValidationResult, undefinedIfInvalid, validate } from './validation/joi/joi.validation.util';
|
|
65
67
|
export type { JoiValidationErrorData, JoiValidationResult, ValidationErrorItem, ExtendedJoi, SchemaTyped, AnySchema, AnySchemaTyped, ArraySchemaTyped, BooleanSchemaTyped, NumberSchemaTyped, ObjectSchemaTyped, StringSchemaTyped, IDebug, IDebugger, SlackServiceCfg, SlackMessage, SlackMessageProps, SlackApiBody, SlackMessagePrefixHook, ReadableTyped, WritableTyped, TransformTyped, PipelineFromNDJsonFileOptions, PipelineToNDJsonFileOptions, TransformJsonParseOptions, TransformToNDJsonOptions, TransformMapOptions, TransformMapSyncOptions, NDJSONStreamForEachOptions, TransformOptions, TransformLogProgressOptions, TransformMultiThreadedOptions, WorkerClassInterface, WorkerInput, WorkerOutput, TableDiffOptions, InspectAnyOptions, Got, GetGotOptions, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AjvValidationOptions, AjvSchemaCfg, AjvValidationErrorData, };
|
|
66
|
-
export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, booleanSchema, booleanDefaultToFalseSchema, stringSchema, numberSchema, integerSchema, percentageSchema, dateStringSchema, arraySchema, binarySchema, objectSchema, oneOfSchema, anySchema, anyObjectSchema, baseDBEntitySchema, savedDBEntitySchema, idSchema, unixTimestampSchema, verSchema, emailSchema, SEM_VER_PATTERN, semVerSchema, userAgentSchema, utcOffsetSchema, ipAddressSchema, slugSchema, urlSchema, processSharedUtil, zipBuffer, gzipBuffer, unzipBuffer, gunzipBuffer, zipString, gzipString, unzipToString, gunzipToString, requireEnvKeys, requireFileToExist, LRUMemoCache, stringId, stringIdAsync, stringIdUnsafe, ALPHABET_NUMBER, ALPHABET_LOWERCASE, ALPHABET_UPPERCASE, ALPHABET_ALPHANUMERIC_LOWERCASE, ALPHABET_ALPHANUMERIC_UPPERCASE, ALPHABET_ALPHANUMERIC, md5, hash, stringToBase64, base64ToString, bufferToBase64, base64ToBuffer, Debug, DebugLogLevel, getSecretMap, setSecretMap, loadSecretsFromEnv, loadSecretsFromJsonFile, removeSecretsFromEnv, secret, secretOptional, memoryUsage, memoryUsageFull, SlackService, slackDefaultMessagePrefixHook, readableCreate, readableFrom, readableFromArray, readableToArray, readableForEach, readableForEachSync, readableMap, readableMapToArray, _pipeline, transformBuffer, ndJsonFileRead, ndJsonFileWrite, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformFilter, transformFilterSync, transformMap, transformMapSync, transformMapSimple, transformNoOp, writableForEach, writablePushToArray, transformSplit, transformToString, transformToArray, transformTap, transformLogProgress, transformLimit, writableVoid, writableFork, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, getGot, HTTPError, TimeoutError, _chunkBuffer, Ajv, getAjv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, };
|
|
68
|
+
export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, booleanSchema, booleanDefaultToFalseSchema, stringSchema, numberSchema, integerSchema, percentageSchema, dateStringSchema, arraySchema, binarySchema, objectSchema, oneOfSchema, anySchema, anyObjectSchema, baseDBEntitySchema, savedDBEntitySchema, idSchema, unixTimestampSchema, verSchema, emailSchema, SEM_VER_PATTERN, semVerSchema, userAgentSchema, utcOffsetSchema, ipAddressSchema, slugSchema, urlSchema, processSharedUtil, zipBuffer, gzipBuffer, unzipBuffer, gunzipBuffer, zipString, gzipString, unzipToString, gunzipToString, requireEnvKeys, requireFileToExist, LRUMemoCache, stringId, stringIdAsync, stringIdUnsafe, ALPHABET_NUMBER, ALPHABET_LOWERCASE, ALPHABET_UPPERCASE, ALPHABET_ALPHANUMERIC_LOWERCASE, ALPHABET_ALPHANUMERIC_UPPERCASE, ALPHABET_ALPHANUMERIC, md5, hash, hashAsBuffer, md5AsBuffer, stringToBase64, base64ToString, bufferToBase64, base64ToBuffer, Debug, DebugLogLevel, getSecretMap, setSecretMap, loadSecretsFromEnv, loadSecretsFromJsonFile, removeSecretsFromEnv, secret, secretOptional, memoryUsage, memoryUsageFull, SlackService, slackDefaultMessagePrefixHook, readableCreate, readableFrom, readableFromArray, readableToArray, readableForEach, readableForEachSync, readableMap, readableMapToArray, _pipeline, transformBuffer, ndjsonMap, ndJsonFileRead, ndJsonFileWrite, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformFilter, transformFilterSync, transformMap, transformMapSync, transformMapSimple, transformNoOp, writableForEach, writablePushToArray, transformSplit, transformToString, transformToArray, transformTap, transformLogProgress, transformLimit, writableVoid, writableFork, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, getGot, HTTPError, TimeoutError, _chunkBuffer, Ajv, getAjv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, hasColors, };
|
package/dist/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ALPHABET_LOWERCASE = exports.ALPHABET_NUMBER = exports.stringIdUnsafe = exports.stringIdAsync = exports.stringId = exports.LRUMemoCache = exports.requireFileToExist = exports.requireEnvKeys = exports.gunzipToString = exports.unzipToString = exports.gzipString = exports.zipString = exports.gunzipBuffer = exports.unzipBuffer = exports.gzipBuffer = exports.zipBuffer = exports.processSharedUtil = exports.urlSchema = exports.slugSchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_PATTERN = exports.emailSchema = exports.verSchema = exports.unixTimestampSchema = exports.idSchema = exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.binarySchema = exports.arraySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = void 0;
|
|
4
|
-
exports.
|
|
5
|
-
exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.getAjv = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.HTTPError = exports.getGot = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.writableFork = exports.writableVoid = exports.transformLimit = exports.transformLogProgress = exports.transformTap = exports.transformToArray = exports.transformToString = exports.transformSplit = exports.writablePushToArray = void 0;
|
|
4
|
+
exports.transformMapSync = exports.transformMap = exports.transformFilterSync = exports.transformFilter = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.ndJsonFileWrite = exports.ndJsonFileRead = exports.ndjsonMap = exports.transformBuffer = exports._pipeline = exports.readableMapToArray = exports.readableMap = exports.readableForEachSync = exports.readableForEach = exports.readableToArray = exports.readableFromArray = exports.readableFrom = exports.readableCreate = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.memoryUsageFull = exports.memoryUsage = exports.secretOptional = exports.secret = exports.removeSecretsFromEnv = exports.loadSecretsFromJsonFile = exports.loadSecretsFromEnv = exports.setSecretMap = exports.getSecretMap = exports.DebugLogLevel = exports.Debug = exports.base64ToBuffer = exports.bufferToBase64 = exports.base64ToString = exports.stringToBase64 = exports.md5AsBuffer = exports.hashAsBuffer = exports.hash = exports.md5 = exports.ALPHABET_ALPHANUMERIC = exports.ALPHABET_ALPHANUMERIC_UPPERCASE = exports.ALPHABET_ALPHANUMERIC_LOWERCASE = exports.ALPHABET_UPPERCASE = void 0;
|
|
5
|
+
exports.hasColors = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.getAjv = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.HTTPError = exports.getGot = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.writableFork = exports.writableVoid = exports.transformLimit = exports.transformLogProgress = exports.transformTap = exports.transformToArray = exports.transformToString = exports.transformSplit = exports.writablePushToArray = exports.writableForEach = exports.transformNoOp = exports.transformMapSimple = void 0;
|
|
6
6
|
const ajv_1 = require("ajv");
|
|
7
7
|
exports.Ajv = ajv_1.default;
|
|
8
8
|
const got_1 = require("got");
|
|
@@ -27,6 +27,8 @@ Object.defineProperty(exports, "base64ToString", { enumerable: true, get: functi
|
|
|
27
27
|
Object.defineProperty(exports, "bufferToBase64", { enumerable: true, get: function () { return hash_util_1.bufferToBase64; } });
|
|
28
28
|
Object.defineProperty(exports, "hash", { enumerable: true, get: function () { return hash_util_1.hash; } });
|
|
29
29
|
Object.defineProperty(exports, "md5", { enumerable: true, get: function () { return hash_util_1.md5; } });
|
|
30
|
+
Object.defineProperty(exports, "hashAsBuffer", { enumerable: true, get: function () { return hash_util_1.hashAsBuffer; } });
|
|
31
|
+
Object.defineProperty(exports, "md5AsBuffer", { enumerable: true, get: function () { return hash_util_1.md5AsBuffer; } });
|
|
30
32
|
Object.defineProperty(exports, "stringToBase64", { enumerable: true, get: function () { return hash_util_1.stringToBase64; } });
|
|
31
33
|
const id_util_1 = require("./security/id.util");
|
|
32
34
|
Object.defineProperty(exports, "ALPHABET_ALPHANUMERIC", { enumerable: true, get: function () { return id_util_1.ALPHABET_ALPHANUMERIC; } });
|
|
@@ -46,6 +48,8 @@ Object.defineProperty(exports, "removeSecretsFromEnv", { enumerable: true, get:
|
|
|
46
48
|
Object.defineProperty(exports, "secret", { enumerable: true, get: function () { return secret_util_1.secret; } });
|
|
47
49
|
Object.defineProperty(exports, "secretOptional", { enumerable: true, get: function () { return secret_util_1.secretOptional; } });
|
|
48
50
|
Object.defineProperty(exports, "setSecretMap", { enumerable: true, get: function () { return secret_util_1.setSecretMap; } });
|
|
51
|
+
const colors_1 = require("./colors/colors");
|
|
52
|
+
Object.defineProperty(exports, "hasColors", { enumerable: true, get: function () { return colors_1.hasColors; } });
|
|
49
53
|
const slack_service_1 = require("./slack/slack.service");
|
|
50
54
|
Object.defineProperty(exports, "slackDefaultMessagePrefixHook", { enumerable: true, get: function () { return slack_service_1.slackDefaultMessagePrefixHook; } });
|
|
51
55
|
Object.defineProperty(exports, "SlackService", { enumerable: true, get: function () { return slack_service_1.SlackService; } });
|
|
@@ -55,6 +59,8 @@ const ndJsonFileRead_1 = require("./stream/ndjson/ndJsonFileRead");
|
|
|
55
59
|
Object.defineProperty(exports, "ndJsonFileRead", { enumerable: true, get: function () { return ndJsonFileRead_1.ndJsonFileRead; } });
|
|
56
60
|
const ndJsonFileWrite_1 = require("./stream/ndjson/ndJsonFileWrite");
|
|
57
61
|
Object.defineProperty(exports, "ndJsonFileWrite", { enumerable: true, get: function () { return ndJsonFileWrite_1.ndJsonFileWrite; } });
|
|
62
|
+
const ndjsonMap_1 = require("./stream/ndjson/ndjsonMap");
|
|
63
|
+
Object.defineProperty(exports, "ndjsonMap", { enumerable: true, get: function () { return ndjsonMap_1.ndjsonMap; } });
|
|
58
64
|
const ndjsonStreamForEach_1 = require("./stream/ndjson/ndjsonStreamForEach");
|
|
59
65
|
Object.defineProperty(exports, "ndjsonStreamForEach", { enumerable: true, get: function () { return ndjsonStreamForEach_1.ndjsonStreamForEach; } });
|
|
60
66
|
const pipelineFromNDJsonFile_1 = require("./stream/ndjson/pipelineFromNDJsonFile");
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
export declare function md5(s: string | Buffer): string;
|
|
3
|
+
export declare function md5AsBuffer(s: string | Buffer): Buffer;
|
|
3
4
|
export declare function hash(s: string | Buffer, algorithm: string): string;
|
|
5
|
+
export declare function hashAsBuffer(s: string | Buffer, algorithm: string): Buffer;
|
|
4
6
|
export declare function stringToBase64(s: string): string;
|
|
5
7
|
export declare function base64ToString(strBase64: string): string;
|
|
6
8
|
export declare function bufferToBase64(b: Buffer): string;
|
|
@@ -1,15 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.base64ToBuffer = exports.bufferToBase64 = exports.base64ToString = exports.stringToBase64 = exports.hash = exports.md5 = void 0;
|
|
3
|
+
exports.base64ToBuffer = exports.bufferToBase64 = exports.base64ToString = exports.stringToBase64 = exports.hashAsBuffer = exports.hash = exports.md5AsBuffer = exports.md5 = void 0;
|
|
4
4
|
const crypto = require("crypto");
|
|
5
5
|
function md5(s) {
|
|
6
6
|
return hash(s, 'md5');
|
|
7
7
|
}
|
|
8
8
|
exports.md5 = md5;
|
|
9
|
+
function md5AsBuffer(s) {
|
|
10
|
+
return hashAsBuffer(s, 'md5');
|
|
11
|
+
}
|
|
12
|
+
exports.md5AsBuffer = md5AsBuffer;
|
|
9
13
|
function hash(s, algorithm) {
|
|
10
14
|
return crypto.createHash(algorithm).update(s).digest('hex');
|
|
11
15
|
}
|
|
12
16
|
exports.hash = hash;
|
|
17
|
+
function hashAsBuffer(s, algorithm) {
|
|
18
|
+
return crypto.createHash(algorithm).update(s).digest();
|
|
19
|
+
}
|
|
20
|
+
exports.hashAsBuffer = hashAsBuffer;
|
|
13
21
|
function stringToBase64(s) {
|
|
14
22
|
return Buffer.from(s, 'utf8').toString('base64');
|
|
15
23
|
}
|
|
@@ -1,21 +1,23 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { AsyncMapper } from '@naturalcycles/js-lib';
|
|
2
|
+
import { TransformMapOptions, TransformLogProgressOptions } from '../..';
|
|
3
|
+
export interface NDJSONMapOptions<IN = any, OUT = IN> extends TransformMapOptions<IN, OUT>, TransformLogProgressOptions<IN> {
|
|
3
4
|
inputFilePath: string;
|
|
4
5
|
outputFilePath: string;
|
|
5
|
-
mapperFilePath: string;
|
|
6
6
|
limitInput?: number;
|
|
7
7
|
limitOutput?: number;
|
|
8
|
-
/**
|
|
9
|
-
* @default 1000
|
|
10
|
-
*/
|
|
11
|
-
logEveryInput?: number;
|
|
12
8
|
/**
|
|
13
9
|
* @default 100_000
|
|
14
10
|
*/
|
|
15
11
|
logEveryOutput?: number;
|
|
12
|
+
/**
|
|
13
|
+
* Defaults to `true` for ndjsonMap
|
|
14
|
+
*
|
|
15
|
+
* @default true
|
|
16
|
+
*/
|
|
17
|
+
flattenArrayOutput?: boolean;
|
|
16
18
|
}
|
|
17
19
|
/**
|
|
18
20
|
* Unzips input file automatically, if it ends with `.gz`.
|
|
19
21
|
* Zips output file automatically, if it ends with `.gz`.
|
|
20
22
|
*/
|
|
21
|
-
export declare function ndjsonMap<IN = any, OUT = any>(opt: NDJSONMapOptions<IN, OUT>): Promise<void>;
|
|
23
|
+
export declare function ndjsonMap<IN = any, OUT = any>(mapper: AsyncMapper<IN, OUT>, opt: NDJSONMapOptions<IN, OUT>): Promise<void>;
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ndjsonMap = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
|
-
const path = require("path");
|
|
6
5
|
const zlib_1 = require("zlib");
|
|
7
6
|
const js_lib_1 = require("@naturalcycles/js-lib");
|
|
8
7
|
const __1 = require("../..");
|
|
@@ -10,27 +9,13 @@ const __1 = require("../..");
|
|
|
10
9
|
* Unzips input file automatically, if it ends with `.gz`.
|
|
11
10
|
* Zips output file automatically, if it ends with `.gz`.
|
|
12
11
|
*/
|
|
13
|
-
async function ndjsonMap(opt) {
|
|
14
|
-
const { inputFilePath, outputFilePath,
|
|
12
|
+
async function ndjsonMap(mapper, opt) {
|
|
13
|
+
const { inputFilePath, outputFilePath, logEveryOutput = 100000, limitInput, limitOutput } = opt;
|
|
15
14
|
(0, __1.requireFileToExist)(inputFilePath);
|
|
16
|
-
(0, __1.requireFileToExist)(mapperFilePath);
|
|
17
|
-
const resolvedMapperPath = path.resolve(mapperFilePath);
|
|
18
15
|
console.log({
|
|
19
16
|
inputFilePath,
|
|
20
17
|
outputFilePath,
|
|
21
|
-
mapperFilePath,
|
|
22
|
-
resolvedMapperPath,
|
|
23
18
|
});
|
|
24
|
-
// This is to allow importing *.ts mappers
|
|
25
|
-
try {
|
|
26
|
-
require('ts-node/register/transpile-only');
|
|
27
|
-
require('tsconfig-paths/register');
|
|
28
|
-
}
|
|
29
|
-
catch { } // require if exists
|
|
30
|
-
const { mapper } = require(resolvedMapperPath);
|
|
31
|
-
if (!mapper) {
|
|
32
|
-
throw new Error(`Mapper file should export "mapper" function`);
|
|
33
|
-
}
|
|
34
19
|
const transformUnzip = inputFilePath.endsWith('.gz') ? [(0, zlib_1.createUnzip)()] : [];
|
|
35
20
|
const transformZip = outputFilePath.endsWith('.gz') ? [(0, zlib_1.createGzip)()] : [];
|
|
36
21
|
await (0, __1._pipeline)([
|
|
@@ -39,7 +24,7 @@ async function ndjsonMap(opt) {
|
|
|
39
24
|
(0, __1.transformSplit)(),
|
|
40
25
|
(0, __1.transformJsonParse)(),
|
|
41
26
|
(0, __1.transformLimit)(limitInput),
|
|
42
|
-
(0, __1.transformLogProgress)({ metric: 'read',
|
|
27
|
+
(0, __1.transformLogProgress)({ metric: 'read', ...opt }),
|
|
43
28
|
(0, __1.transformMap)(mapper, {
|
|
44
29
|
flattenArrayOutput: true,
|
|
45
30
|
errorMode: js_lib_1.ErrorMode.SUPPRESS,
|
|
@@ -3,8 +3,9 @@ import { Reviver } from '@naturalcycles/js-lib';
|
|
|
3
3
|
import { TransformTyped } from '../stream.model';
|
|
4
4
|
export interface TransformJsonParseOptions {
|
|
5
5
|
/**
|
|
6
|
-
* @default true
|
|
7
6
|
* If true - will throw an error on JSON.parse / stringify error
|
|
7
|
+
*
|
|
8
|
+
* @default true
|
|
8
9
|
*/
|
|
9
10
|
strict?: boolean;
|
|
10
11
|
reviver?: Reviver;
|
|
@@ -23,5 +24,5 @@ export interface TransformJsonParseOptions {
|
|
|
23
24
|
* consumeYourStream...
|
|
24
25
|
* [)
|
|
25
26
|
*/
|
|
26
|
-
export declare function transformJsonParse<OUT =
|
|
27
|
+
export declare function transformJsonParse<OUT = any>(opt?: TransformJsonParseOptions): TransformTyped<string | Buffer, OUT>;
|
|
27
28
|
export declare const bufferReviver: Reviver;
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { TransformTyped } from '../stream.model';
|
|
2
2
|
export interface TransformToNDJsonOptions {
|
|
3
3
|
/**
|
|
4
|
-
* @default true
|
|
5
4
|
* If true - will throw an error on JSON.parse / stringify error
|
|
5
|
+
*
|
|
6
|
+
* @default true
|
|
6
7
|
*/
|
|
7
8
|
strict?: boolean;
|
|
8
9
|
/**
|
|
9
|
-
* @default false
|
|
10
10
|
* If true - will run `sortObjectDeep()` on each object to achieve deterministic sort
|
|
11
|
+
*
|
|
12
|
+
* @default false
|
|
11
13
|
*/
|
|
12
14
|
sortObjects?: boolean;
|
|
13
15
|
/**
|
|
@@ -7,4 +7,4 @@ export interface TransformBufferOptions extends TransformOptions {
|
|
|
7
7
|
*
|
|
8
8
|
* @default batchSize is 10
|
|
9
9
|
*/
|
|
10
|
-
export declare function transformBuffer<IN =
|
|
10
|
+
export declare function transformBuffer<IN = any>(opt: TransformBufferOptions): TransformTyped<IN, IN[]>;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AnyObject } from '@naturalcycles/js-lib';
|
|
1
2
|
import { TransformOptions, TransformTyped } from '../stream.model';
|
|
2
3
|
export interface TransformLogProgressOptions<IN = any> extends TransformOptions {
|
|
3
4
|
/**
|
|
@@ -9,7 +10,7 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
|
|
|
9
10
|
/**
|
|
10
11
|
* Include `heapUsed` in log.
|
|
11
12
|
*
|
|
12
|
-
* @default
|
|
13
|
+
* @default false
|
|
13
14
|
*/
|
|
14
15
|
heapUsed?: boolean;
|
|
15
16
|
/**
|
|
@@ -27,7 +28,7 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
|
|
|
27
28
|
/**
|
|
28
29
|
* Incude Peak RSS in log.
|
|
29
30
|
*
|
|
30
|
-
* @default
|
|
31
|
+
* @default true
|
|
31
32
|
*/
|
|
32
33
|
peakRSS?: boolean;
|
|
33
34
|
/**
|
|
@@ -73,7 +74,7 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
|
|
|
73
74
|
*
|
|
74
75
|
* chunk is undefined for "final" stats, otherwise is defined.
|
|
75
76
|
*/
|
|
76
|
-
extra?: (chunk: IN | undefined, index: number) =>
|
|
77
|
+
extra?: (chunk: IN | undefined, index: number) => AnyObject;
|
|
77
78
|
}
|
|
78
79
|
/**
|
|
79
80
|
* Pass-through transform that optionally logs progress.
|
|
@@ -6,15 +6,16 @@ const util_1 = require("util");
|
|
|
6
6
|
const js_lib_1 = require("@naturalcycles/js-lib");
|
|
7
7
|
const time_lib_1 = require("@naturalcycles/time-lib");
|
|
8
8
|
const colors_1 = require("../../colors");
|
|
9
|
+
const colors_2 = require("../../colors/colors");
|
|
9
10
|
const inspectOpt = {
|
|
10
|
-
colors:
|
|
11
|
+
colors: (0, colors_2.hasColors)(),
|
|
11
12
|
breakLength: 300,
|
|
12
13
|
};
|
|
13
14
|
/**
|
|
14
15
|
* Pass-through transform that optionally logs progress.
|
|
15
16
|
*/
|
|
16
17
|
function transformLogProgress(opt = {}) {
|
|
17
|
-
const { metric = 'progress', heapTotal: logHeapTotal = false, heapUsed: logHeapUsed =
|
|
18
|
+
const { metric = 'progress', heapTotal: logHeapTotal = false, heapUsed: logHeapUsed = false, rss: logRss = true, peakRSS: logPeakRSS = true, logRPS = true, logEvery = 1000, extra, } = opt;
|
|
18
19
|
const logProgress = opt.logProgress !== false && logEvery !== 0; // true by default
|
|
19
20
|
const logEvery10 = logEvery * 10;
|
|
20
21
|
const started = Date.now();
|
|
@@ -2,17 +2,18 @@ import { AsyncMapper, AsyncPredicate, ErrorMode } from '@naturalcycles/js-lib';
|
|
|
2
2
|
import { TransformTyped } from '../stream.model';
|
|
3
3
|
export interface TransformMapOptions<IN = any, OUT = IN> {
|
|
4
4
|
/**
|
|
5
|
-
* @default false
|
|
6
5
|
* Set true to support "multiMap" - possibility to return [] and emit 1 result for each item in the array.
|
|
6
|
+
*
|
|
7
|
+
* @default false
|
|
7
8
|
*/
|
|
8
9
|
flattenArrayOutput?: boolean;
|
|
9
10
|
/**
|
|
10
11
|
* Predicate to filter outgoing results (after mapper).
|
|
11
12
|
* Allows to not emit all results.
|
|
12
13
|
*
|
|
13
|
-
* @default to filter out undefined/null values, but pass anything else
|
|
14
|
-
*
|
|
15
14
|
* Set to `r => r` (passthrough predicate) to pass ANY value (including undefined/null)
|
|
15
|
+
*
|
|
16
|
+
* @default to filter out undefined/null values, but pass anything else
|
|
16
17
|
*/
|
|
17
18
|
predicate?: AsyncPredicate<OUT>;
|
|
18
19
|
/**
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AnyObject } from '@naturalcycles/js-lib';
|
|
1
2
|
import { TransformTyped } from '../../stream.model';
|
|
2
3
|
export interface TransformMultiThreadedOptions {
|
|
3
4
|
/**
|
|
@@ -19,7 +20,7 @@ export interface TransformMultiThreadedOptions {
|
|
|
19
20
|
/**
|
|
20
21
|
* Passed to the Worker as `workerData` property (initial data).
|
|
21
22
|
*/
|
|
22
|
-
workerData?:
|
|
23
|
+
workerData?: AnyObject;
|
|
23
24
|
}
|
|
24
25
|
/**
|
|
25
26
|
* Spawns a pool of Workers (threads).
|
|
@@ -17,6 +17,9 @@ export interface JoiValidationErrorData extends ErrorData {
|
|
|
17
17
|
/**
|
|
18
18
|
* Error "annotation" is stripped in Error.message.
|
|
19
19
|
* This field contains the "full" annotation.
|
|
20
|
+
*
|
|
21
|
+
* This field is non-enumerable, won't be printed or included in JSON by default,
|
|
22
|
+
* but still accessible programmatically (via `err.data.annotation`) when needed!
|
|
20
23
|
*/
|
|
21
24
|
annotation?: string;
|
|
22
25
|
}
|
|
@@ -122,10 +122,16 @@ function createError(value, err, objectName) {
|
|
|
122
122
|
tokens.push(annotation);
|
|
123
123
|
}
|
|
124
124
|
const msg = tokens.join('\n');
|
|
125
|
-
|
|
125
|
+
const data = {
|
|
126
126
|
joiValidationErrorItems: err.details,
|
|
127
127
|
...(objectName && { joiValidationObjectName: objectName }),
|
|
128
128
|
...(objectId && { joiValidationObjectId: objectId }),
|
|
129
|
-
|
|
129
|
+
};
|
|
130
|
+
// Make annotation non-enumerable, to not get it automatically printed,
|
|
131
|
+
// but still accessible
|
|
132
|
+
Object.defineProperty(data, 'annotation', {
|
|
133
|
+
enumerable: false,
|
|
134
|
+
value: annotation,
|
|
130
135
|
});
|
|
136
|
+
return new joi_validation_error_1.JoiValidationError(msg, data);
|
|
131
137
|
}
|
package/package.json
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@naturalcycles/nodejs-lib",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.45.1",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"prepare": "husky install",
|
|
6
6
|
"docs-serve": "vuepress dev docs",
|
|
7
7
|
"docs-build": "vuepress build docs",
|
|
8
|
-
"ndjson-map-debug": "tsn ./src/bin/ndjson-map.ts --in ./tmp/ndjsonMapIn.ndjson --out ./tmp/ndjsonMapOut.ndjson --mapper ./src/test/ndjson/ndjsonMapper.ts",
|
|
9
8
|
"slack-this-debug": "tsn ./src/bin/slack-this.ts --channel test --msg 'Hello slack!'",
|
|
10
9
|
"secrets-gen-key-debug": "tsn ./src/bin/secrets-gen-key.ts",
|
|
11
10
|
"secrets-encrypt-debug": "tsn ./src/bin/secrets-encrypt.ts",
|
|
@@ -36,6 +35,7 @@
|
|
|
36
35
|
"lru-cache": "^6.0.0",
|
|
37
36
|
"move-file": "^2.0.0",
|
|
38
37
|
"nanoid": "^3.0.0",
|
|
38
|
+
"supports-color": "^8.0.0",
|
|
39
39
|
"through2-concurrent": "^2.0.0",
|
|
40
40
|
"yargs": "^17.0.0"
|
|
41
41
|
},
|
|
@@ -60,7 +60,6 @@
|
|
|
60
60
|
"del": "dist/bin/del.js",
|
|
61
61
|
"kpy": "dist/bin/kpy.js",
|
|
62
62
|
"json2env": "dist/bin/json2env.js",
|
|
63
|
-
"ndjson-map": "dist/bin/ndjson-map.js",
|
|
64
63
|
"slack-this": "dist/bin/slack-this.js",
|
|
65
64
|
"secrets-gen-key": "dist/bin/secrets-gen-key.js",
|
|
66
65
|
"secrets-encrypt": "dist/bin/secrets-encrypt.js",
|
package/src/diff/tableDiff.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { StringMap, _truncate } from '@naturalcycles/js-lib'
|
|
1
|
+
import { StringMap, _truncate, AnyObject } from '@naturalcycles/js-lib'
|
|
2
2
|
|
|
3
3
|
export interface TableDiffOptions {
|
|
4
4
|
/**
|
|
@@ -35,11 +35,7 @@ export interface TableDiffOptions {
|
|
|
35
35
|
*
|
|
36
36
|
* Function is located in nodejs-lib (not js-lib), because it's planned to improve in the future and add e.g colors (via chalk).
|
|
37
37
|
*/
|
|
38
|
-
export function tableDiff(
|
|
39
|
-
a: Record<string, any>,
|
|
40
|
-
b: Record<string, any>,
|
|
41
|
-
opt: TableDiffOptions = {},
|
|
42
|
-
): void {
|
|
38
|
+
export function tableDiff(a: AnyObject, b: AnyObject, opt: TableDiffOptions = {}): void {
|
|
43
39
|
const { maxFieldLen, aTitle = 'a', bTitle = 'b' } = opt
|
|
44
40
|
const diff: StringMap<any> = {}
|
|
45
41
|
|
package/src/got/got.model.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AnyObject } from '@naturalcycles/js-lib'
|
|
1
2
|
import type { Options } from 'got'
|
|
2
3
|
|
|
3
4
|
export interface GetGotOptions extends Options {
|
|
@@ -40,7 +41,7 @@ export interface GetGotOptions extends Options {
|
|
|
40
41
|
maxResponseLength?: number
|
|
41
42
|
}
|
|
42
43
|
|
|
43
|
-
export interface GotRequestContext extends
|
|
44
|
+
export interface GotRequestContext extends AnyObject {
|
|
44
45
|
/**
|
|
45
46
|
* Millisecond-timestamp of when the request was started. To be able to count "time spent".
|
|
46
47
|
*/
|
package/src/index.ts
CHANGED
|
@@ -14,6 +14,8 @@ import {
|
|
|
14
14
|
bufferToBase64,
|
|
15
15
|
hash,
|
|
16
16
|
md5,
|
|
17
|
+
hashAsBuffer,
|
|
18
|
+
md5AsBuffer,
|
|
17
19
|
stringToBase64,
|
|
18
20
|
} from './security/hash.util'
|
|
19
21
|
import {
|
|
@@ -36,6 +38,7 @@ import {
|
|
|
36
38
|
secretOptional,
|
|
37
39
|
setSecretMap,
|
|
38
40
|
} from './security/secret.util'
|
|
41
|
+
import { hasColors } from './colors/colors'
|
|
39
42
|
import { slackDefaultMessagePrefixHook, SlackService } from './slack/slack.service'
|
|
40
43
|
import {
|
|
41
44
|
SlackApiBody,
|
|
@@ -47,6 +50,7 @@ import {
|
|
|
47
50
|
import { NDJsonStats } from './stream/ndjson/ndjson.model'
|
|
48
51
|
import { ndJsonFileRead } from './stream/ndjson/ndJsonFileRead'
|
|
49
52
|
import { ndJsonFileWrite } from './stream/ndjson/ndJsonFileWrite'
|
|
53
|
+
import { ndjsonMap } from './stream/ndjson/ndjsonMap'
|
|
50
54
|
import {
|
|
51
55
|
ndjsonStreamForEach,
|
|
52
56
|
NDJSONStreamForEachOptions,
|
|
@@ -274,6 +278,8 @@ export {
|
|
|
274
278
|
ALPHABET_ALPHANUMERIC,
|
|
275
279
|
md5,
|
|
276
280
|
hash,
|
|
281
|
+
hashAsBuffer,
|
|
282
|
+
md5AsBuffer,
|
|
277
283
|
stringToBase64,
|
|
278
284
|
base64ToString,
|
|
279
285
|
bufferToBase64,
|
|
@@ -301,6 +307,7 @@ export {
|
|
|
301
307
|
readableMapToArray,
|
|
302
308
|
_pipeline,
|
|
303
309
|
transformBuffer,
|
|
310
|
+
ndjsonMap,
|
|
304
311
|
ndJsonFileRead,
|
|
305
312
|
ndJsonFileWrite,
|
|
306
313
|
ndjsonStreamForEach,
|
|
@@ -341,4 +348,5 @@ export {
|
|
|
341
348
|
AjvValidationError,
|
|
342
349
|
readJsonSchemas,
|
|
343
350
|
readAjvSchemas,
|
|
351
|
+
hasColors,
|
|
344
352
|
}
|
|
@@ -4,10 +4,18 @@ export function md5(s: string | Buffer): string {
|
|
|
4
4
|
return hash(s, 'md5')
|
|
5
5
|
}
|
|
6
6
|
|
|
7
|
+
export function md5AsBuffer(s: string | Buffer): Buffer {
|
|
8
|
+
return hashAsBuffer(s, 'md5')
|
|
9
|
+
}
|
|
10
|
+
|
|
7
11
|
export function hash(s: string | Buffer, algorithm: string): string {
|
|
8
12
|
return crypto.createHash(algorithm).update(s).digest('hex')
|
|
9
13
|
}
|
|
10
14
|
|
|
15
|
+
export function hashAsBuffer(s: string | Buffer, algorithm: string): Buffer {
|
|
16
|
+
return crypto.createHash(algorithm).update(s).digest()
|
|
17
|
+
}
|
|
18
|
+
|
|
11
19
|
export function stringToBase64(s: string): string {
|
|
12
20
|
return Buffer.from(s, 'utf8').toString('base64')
|
|
13
21
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { createReadStream, createWriteStream } from 'fs'
|
|
2
|
-
import * as path from 'path'
|
|
3
2
|
import { createGzip, createUnzip } from 'zlib'
|
|
4
3
|
import { AsyncMapper, ErrorMode } from '@naturalcycles/js-lib'
|
|
5
4
|
import {
|
|
@@ -12,28 +11,29 @@ import {
|
|
|
12
11
|
transformSplit,
|
|
13
12
|
transformToNDJson,
|
|
14
13
|
_pipeline,
|
|
14
|
+
TransformLogProgressOptions,
|
|
15
15
|
} from '../..'
|
|
16
16
|
|
|
17
|
-
interface
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
export interface NDJSONMapOptions<IN = any, OUT = IN> extends TransformMapOptions<IN, OUT> {
|
|
17
|
+
export interface NDJSONMapOptions<IN = any, OUT = IN>
|
|
18
|
+
extends TransformMapOptions<IN, OUT>,
|
|
19
|
+
TransformLogProgressOptions<IN> {
|
|
22
20
|
inputFilePath: string
|
|
23
21
|
outputFilePath: string
|
|
24
|
-
|
|
22
|
+
|
|
25
23
|
limitInput?: number
|
|
26
24
|
limitOutput?: number
|
|
27
25
|
|
|
28
26
|
/**
|
|
29
|
-
* @default
|
|
27
|
+
* @default 100_000
|
|
30
28
|
*/
|
|
31
|
-
|
|
29
|
+
logEveryOutput?: number
|
|
32
30
|
|
|
33
31
|
/**
|
|
34
|
-
*
|
|
32
|
+
* Defaults to `true` for ndjsonMap
|
|
33
|
+
*
|
|
34
|
+
* @default true
|
|
35
35
|
*/
|
|
36
|
-
|
|
36
|
+
flattenArrayOutput?: boolean
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
/**
|
|
@@ -41,42 +41,18 @@ export interface NDJSONMapOptions<IN = any, OUT = IN> extends TransformMapOption
|
|
|
41
41
|
* Zips output file automatically, if it ends with `.gz`.
|
|
42
42
|
*/
|
|
43
43
|
export async function ndjsonMap<IN = any, OUT = any>(
|
|
44
|
+
mapper: AsyncMapper<IN, OUT>,
|
|
44
45
|
opt: NDJSONMapOptions<IN, OUT>,
|
|
45
46
|
): Promise<void> {
|
|
46
|
-
const {
|
|
47
|
-
inputFilePath,
|
|
48
|
-
outputFilePath,
|
|
49
|
-
mapperFilePath,
|
|
50
|
-
logEveryInput = 1000,
|
|
51
|
-
logEveryOutput = 100_000,
|
|
52
|
-
limitInput,
|
|
53
|
-
limitOutput,
|
|
54
|
-
} = opt
|
|
47
|
+
const { inputFilePath, outputFilePath, logEveryOutput = 100_000, limitInput, limitOutput } = opt
|
|
55
48
|
|
|
56
49
|
requireFileToExist(inputFilePath)
|
|
57
|
-
requireFileToExist(mapperFilePath)
|
|
58
|
-
|
|
59
|
-
const resolvedMapperPath = path.resolve(mapperFilePath)
|
|
60
50
|
|
|
61
51
|
console.log({
|
|
62
52
|
inputFilePath,
|
|
63
53
|
outputFilePath,
|
|
64
|
-
mapperFilePath,
|
|
65
|
-
resolvedMapperPath,
|
|
66
54
|
})
|
|
67
55
|
|
|
68
|
-
// This is to allow importing *.ts mappers
|
|
69
|
-
try {
|
|
70
|
-
require('ts-node/register/transpile-only')
|
|
71
|
-
require('tsconfig-paths/register')
|
|
72
|
-
} catch {} // require if exists
|
|
73
|
-
|
|
74
|
-
const { mapper } = require(resolvedMapperPath) as NDJSONMapperFile<IN, OUT>
|
|
75
|
-
|
|
76
|
-
if (!mapper) {
|
|
77
|
-
throw new Error(`Mapper file should export "mapper" function`)
|
|
78
|
-
}
|
|
79
|
-
|
|
80
56
|
const transformUnzip = inputFilePath.endsWith('.gz') ? [createUnzip()] : []
|
|
81
57
|
const transformZip = outputFilePath.endsWith('.gz') ? [createGzip()] : []
|
|
82
58
|
|
|
@@ -86,7 +62,7 @@ export async function ndjsonMap<IN = any, OUT = any>(
|
|
|
86
62
|
transformSplit(), // splits by \n
|
|
87
63
|
transformJsonParse(),
|
|
88
64
|
transformLimit(limitInput),
|
|
89
|
-
transformLogProgress({ metric: 'read',
|
|
65
|
+
transformLogProgress({ metric: 'read', ...opt }),
|
|
90
66
|
transformMap(mapper, {
|
|
91
67
|
flattenArrayOutput: true,
|
|
92
68
|
errorMode: ErrorMode.SUPPRESS,
|
|
@@ -4,8 +4,9 @@ import { TransformTyped } from '../stream.model'
|
|
|
4
4
|
|
|
5
5
|
export interface TransformJsonParseOptions {
|
|
6
6
|
/**
|
|
7
|
-
* @default true
|
|
8
7
|
* If true - will throw an error on JSON.parse / stringify error
|
|
8
|
+
*
|
|
9
|
+
* @default true
|
|
9
10
|
*/
|
|
10
11
|
strict?: boolean
|
|
11
12
|
|
|
@@ -26,7 +27,7 @@ export interface TransformJsonParseOptions {
|
|
|
26
27
|
* consumeYourStream...
|
|
27
28
|
* [)
|
|
28
29
|
*/
|
|
29
|
-
export function transformJsonParse<OUT =
|
|
30
|
+
export function transformJsonParse<OUT = any>(
|
|
30
31
|
opt: TransformJsonParseOptions = {},
|
|
31
32
|
): TransformTyped<string | Buffer, OUT> {
|
|
32
33
|
const { strict = true, reviver } = opt
|
|
@@ -4,14 +4,16 @@ import { TransformTyped } from '../stream.model'
|
|
|
4
4
|
|
|
5
5
|
export interface TransformToNDJsonOptions {
|
|
6
6
|
/**
|
|
7
|
-
* @default true
|
|
8
7
|
* If true - will throw an error on JSON.parse / stringify error
|
|
8
|
+
*
|
|
9
|
+
* @default true
|
|
9
10
|
*/
|
|
10
11
|
strict?: boolean
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
|
-
* @default false
|
|
14
14
|
* If true - will run `sortObjectDeep()` on each object to achieve deterministic sort
|
|
15
|
+
*
|
|
16
|
+
* @default false
|
|
15
17
|
*/
|
|
16
18
|
sortObjects?: boolean
|
|
17
19
|
|
|
@@ -10,9 +10,7 @@ export interface TransformBufferOptions extends TransformOptions {
|
|
|
10
10
|
*
|
|
11
11
|
* @default batchSize is 10
|
|
12
12
|
*/
|
|
13
|
-
export function transformBuffer<IN =
|
|
14
|
-
opt: TransformBufferOptions,
|
|
15
|
-
): TransformTyped<IN, IN[]> {
|
|
13
|
+
export function transformBuffer<IN = any>(opt: TransformBufferOptions): TransformTyped<IN, IN[]> {
|
|
16
14
|
const { batchSize } = opt
|
|
17
15
|
|
|
18
16
|
let buf: IN[] = []
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Transform } from 'stream'
|
|
2
2
|
import { inspect, InspectOptions } from 'util'
|
|
3
|
-
import { SimpleMovingAverage, _mb, _since } from '@naturalcycles/js-lib'
|
|
3
|
+
import { SimpleMovingAverage, _mb, _since, AnyObject } from '@naturalcycles/js-lib'
|
|
4
4
|
import { dayjs } from '@naturalcycles/time-lib'
|
|
5
5
|
import { boldWhite, dimGrey, white, yellow } from '../../colors'
|
|
6
|
+
import { hasColors } from '../../colors/colors'
|
|
6
7
|
import { TransformOptions, TransformTyped } from '../stream.model'
|
|
7
8
|
|
|
8
9
|
export interface TransformLogProgressOptions<IN = any> extends TransformOptions {
|
|
@@ -16,7 +17,7 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
|
|
|
16
17
|
/**
|
|
17
18
|
* Include `heapUsed` in log.
|
|
18
19
|
*
|
|
19
|
-
* @default
|
|
20
|
+
* @default false
|
|
20
21
|
*/
|
|
21
22
|
heapUsed?: boolean
|
|
22
23
|
|
|
@@ -37,7 +38,7 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
|
|
|
37
38
|
/**
|
|
38
39
|
* Incude Peak RSS in log.
|
|
39
40
|
*
|
|
40
|
-
* @default
|
|
41
|
+
* @default true
|
|
41
42
|
*/
|
|
42
43
|
peakRSS?: boolean
|
|
43
44
|
|
|
@@ -90,11 +91,11 @@ export interface TransformLogProgressOptions<IN = any> extends TransformOptions
|
|
|
90
91
|
*
|
|
91
92
|
* chunk is undefined for "final" stats, otherwise is defined.
|
|
92
93
|
*/
|
|
93
|
-
extra?: (chunk: IN | undefined, index: number) =>
|
|
94
|
+
extra?: (chunk: IN | undefined, index: number) => AnyObject
|
|
94
95
|
}
|
|
95
96
|
|
|
96
97
|
const inspectOpt: InspectOptions = {
|
|
97
|
-
colors:
|
|
98
|
+
colors: hasColors(),
|
|
98
99
|
breakLength: 300,
|
|
99
100
|
}
|
|
100
101
|
|
|
@@ -107,9 +108,9 @@ export function transformLogProgress<IN = any>(
|
|
|
107
108
|
const {
|
|
108
109
|
metric = 'progress',
|
|
109
110
|
heapTotal: logHeapTotal = false,
|
|
110
|
-
heapUsed: logHeapUsed =
|
|
111
|
+
heapUsed: logHeapUsed = false,
|
|
111
112
|
rss: logRss = true,
|
|
112
|
-
peakRSS: logPeakRSS =
|
|
113
|
+
peakRSS: logPeakRSS = true,
|
|
113
114
|
logRPS = true,
|
|
114
115
|
logEvery = 1000,
|
|
115
116
|
extra,
|
|
@@ -12,8 +12,9 @@ import { TransformTyped } from '../stream.model'
|
|
|
12
12
|
|
|
13
13
|
export interface TransformMapOptions<IN = any, OUT = IN> {
|
|
14
14
|
/**
|
|
15
|
-
* @default false
|
|
16
15
|
* Set true to support "multiMap" - possibility to return [] and emit 1 result for each item in the array.
|
|
16
|
+
*
|
|
17
|
+
* @default false
|
|
17
18
|
*/
|
|
18
19
|
flattenArrayOutput?: boolean
|
|
19
20
|
|
|
@@ -21,9 +22,9 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
|
|
|
21
22
|
* Predicate to filter outgoing results (after mapper).
|
|
22
23
|
* Allows to not emit all results.
|
|
23
24
|
*
|
|
24
|
-
* @default to filter out undefined/null values, but pass anything else
|
|
25
|
-
*
|
|
26
25
|
* Set to `r => r` (passthrough predicate) to pass ANY value (including undefined/null)
|
|
26
|
+
*
|
|
27
|
+
* @default to filter out undefined/null values, but pass anything else
|
|
27
28
|
*/
|
|
28
29
|
predicate?: AsyncPredicate<OUT>
|
|
29
30
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Worker } from 'worker_threads'
|
|
2
|
-
import { DeferredPromise, pDefer, _range } from '@naturalcycles/js-lib'
|
|
2
|
+
import { DeferredPromise, pDefer, _range, AnyObject } from '@naturalcycles/js-lib'
|
|
3
3
|
import through2Concurrent = require('through2-concurrent')
|
|
4
4
|
import { TransformTyped } from '../../stream.model'
|
|
5
5
|
import { WorkerInput, WorkerOutput } from './transformMultiThreaded.model'
|
|
@@ -30,7 +30,7 @@ export interface TransformMultiThreadedOptions {
|
|
|
30
30
|
/**
|
|
31
31
|
* Passed to the Worker as `workerData` property (initial data).
|
|
32
32
|
*/
|
|
33
|
-
workerData?:
|
|
33
|
+
workerData?: AnyObject
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
const workerProxyFilePath = `${__dirname}/workerClassProxy.js`
|
|
@@ -18,6 +18,9 @@ export interface JoiValidationErrorData extends ErrorData {
|
|
|
18
18
|
/**
|
|
19
19
|
* Error "annotation" is stripped in Error.message.
|
|
20
20
|
* This field contains the "full" annotation.
|
|
21
|
+
*
|
|
22
|
+
* This field is non-enumerable, won't be printed or included in JSON by default,
|
|
23
|
+
* but still accessible programmatically (via `err.data.annotation`) when needed!
|
|
21
24
|
*/
|
|
22
25
|
annotation?: string
|
|
23
26
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import { _hb, _isObject, _truncateMiddle } from '@naturalcycles/js-lib'
|
|
10
10
|
import { ValidationError, ValidationOptions } from 'joi'
|
|
11
11
|
import { AnySchemaTyped } from './joi.model'
|
|
12
|
-
import { JoiValidationError } from './joi.validation.error'
|
|
12
|
+
import { JoiValidationError, JoiValidationErrorData } from './joi.validation.error'
|
|
13
13
|
|
|
14
14
|
// todo: consider replacing with Tuple of [error, value]
|
|
15
15
|
export interface JoiValidationResult<T = any> {
|
|
@@ -163,10 +163,18 @@ function createError(value: any, err: ValidationError, objectName?: string): Joi
|
|
|
163
163
|
|
|
164
164
|
const msg = tokens.join('\n')
|
|
165
165
|
|
|
166
|
-
|
|
166
|
+
const data: JoiValidationErrorData = {
|
|
167
167
|
joiValidationErrorItems: err.details,
|
|
168
168
|
...(objectName && { joiValidationObjectName: objectName }),
|
|
169
169
|
...(objectId && { joiValidationObjectId: objectId }),
|
|
170
|
-
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
// Make annotation non-enumerable, to not get it automatically printed,
|
|
173
|
+
// but still accessible
|
|
174
|
+
Object.defineProperty(data, 'annotation', {
|
|
175
|
+
enumerable: false,
|
|
176
|
+
value: annotation,
|
|
171
177
|
})
|
|
178
|
+
|
|
179
|
+
return new JoiValidationError(msg, data)
|
|
172
180
|
}
|
package/dist/bin/ndjson-map.d.ts
DELETED
package/dist/bin/ndjson-map.js
DELETED
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
"use strict";
|
|
3
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
const yargs = require("yargs");
|
|
5
|
-
const script_1 = require("../script");
|
|
6
|
-
const ndjsonMap_1 = require("../stream/ndjson/ndjsonMap");
|
|
7
|
-
(0, script_1.runScript)(async () => {
|
|
8
|
-
const { in: inputFilePath, out: outputFilePath, mapper: mapperFilePath, logEveryInput, logEveryOutput, limitInput, limitOutput, } = yargs.options({
|
|
9
|
-
in: {
|
|
10
|
-
type: 'string',
|
|
11
|
-
demandOption: true,
|
|
12
|
-
desc: 'Input ndjson file path',
|
|
13
|
-
},
|
|
14
|
-
out: {
|
|
15
|
-
type: 'string',
|
|
16
|
-
desc: 'Output ndjson file path',
|
|
17
|
-
demandOption: true,
|
|
18
|
-
},
|
|
19
|
-
mapper: {
|
|
20
|
-
type: 'string',
|
|
21
|
-
desc: 'Mapper file path',
|
|
22
|
-
demandOption: true,
|
|
23
|
-
},
|
|
24
|
-
logEveryInput: {
|
|
25
|
-
type: 'number',
|
|
26
|
-
default: 1000,
|
|
27
|
-
},
|
|
28
|
-
logEveryOutput: {
|
|
29
|
-
type: 'number',
|
|
30
|
-
default: 100000,
|
|
31
|
-
},
|
|
32
|
-
limitInput: {
|
|
33
|
-
type: 'number',
|
|
34
|
-
},
|
|
35
|
-
limitOutput: {
|
|
36
|
-
type: 'number',
|
|
37
|
-
},
|
|
38
|
-
}).argv;
|
|
39
|
-
await (0, ndjsonMap_1.ndjsonMap)({
|
|
40
|
-
inputFilePath,
|
|
41
|
-
outputFilePath,
|
|
42
|
-
mapperFilePath,
|
|
43
|
-
logEveryInput,
|
|
44
|
-
logEveryOutput,
|
|
45
|
-
limitInput,
|
|
46
|
-
limitOutput,
|
|
47
|
-
});
|
|
48
|
-
});
|
package/src/bin/ndjson-map.ts
DELETED
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
import * as yargs from 'yargs'
|
|
4
|
-
import { runScript } from '../script'
|
|
5
|
-
import { ndjsonMap } from '../stream/ndjson/ndjsonMap'
|
|
6
|
-
|
|
7
|
-
runScript(async () => {
|
|
8
|
-
const {
|
|
9
|
-
in: inputFilePath,
|
|
10
|
-
out: outputFilePath,
|
|
11
|
-
mapper: mapperFilePath,
|
|
12
|
-
logEveryInput,
|
|
13
|
-
logEveryOutput,
|
|
14
|
-
limitInput,
|
|
15
|
-
limitOutput,
|
|
16
|
-
} = yargs.options({
|
|
17
|
-
in: {
|
|
18
|
-
type: 'string',
|
|
19
|
-
demandOption: true,
|
|
20
|
-
desc: 'Input ndjson file path',
|
|
21
|
-
},
|
|
22
|
-
out: {
|
|
23
|
-
type: 'string',
|
|
24
|
-
desc: 'Output ndjson file path',
|
|
25
|
-
demandOption: true,
|
|
26
|
-
},
|
|
27
|
-
mapper: {
|
|
28
|
-
type: 'string',
|
|
29
|
-
desc: 'Mapper file path',
|
|
30
|
-
demandOption: true,
|
|
31
|
-
},
|
|
32
|
-
logEveryInput: {
|
|
33
|
-
type: 'number',
|
|
34
|
-
default: 1000,
|
|
35
|
-
},
|
|
36
|
-
logEveryOutput: {
|
|
37
|
-
type: 'number',
|
|
38
|
-
default: 100_000,
|
|
39
|
-
},
|
|
40
|
-
limitInput: {
|
|
41
|
-
type: 'number',
|
|
42
|
-
},
|
|
43
|
-
limitOutput: {
|
|
44
|
-
type: 'number',
|
|
45
|
-
},
|
|
46
|
-
}).argv
|
|
47
|
-
|
|
48
|
-
await ndjsonMap({
|
|
49
|
-
inputFilePath,
|
|
50
|
-
outputFilePath,
|
|
51
|
-
mapperFilePath,
|
|
52
|
-
logEveryInput,
|
|
53
|
-
logEveryOutput,
|
|
54
|
-
limitInput,
|
|
55
|
-
limitOutput,
|
|
56
|
-
})
|
|
57
|
-
})
|