@naturalcycles/nodejs-lib 12.46.0 → 12.47.3

package/dist/stream/pipeline/pipeline.d.ts

@@ -3,4 +3,4 @@ import { pipeline } from 'stream';
 /**
  * Promisified stream.pipeline()
  */
-export declare const _pipeline: typeof pipeline.__promisify__;
+export declare let _pipeline: typeof pipeline.__promisify__;

package/dist/stream/pipeline/pipeline.js

@@ -7,3 +7,9 @@ const util_1 = require("util");
  * Promisified stream.pipeline()
  */
 exports._pipeline = (0, util_1.promisify)(stream_1.pipeline);
+// Workaround https://github.com/nodejs/node/issues/40191
+// todo: remove it when fix is released in 16.x and in AppEngine 16.x
+if (process.version > 'v16.13') {
+    const { pipeline } = require('stream/promises');
+    exports._pipeline = ((streams) => pipeline(...streams));
+}

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

@@ -17,7 +17,7 @@ export declare function oneOfSchema<T = any>(...schemas: AnySchemaTyped<any>[]):
 export declare const anySchema: import("joi").AnySchema;
 export declare const anyObjectSchema: import("joi").ObjectSchema<any>;
 /**
- * [a-z0-9_]*
+ * [a-zA-Z0-9_]*
  * 6-64 length
  */
 export declare const idSchema: import("./string.extensions").ExtendedStringSchema;

package/dist/validation/joi/joi.shared.schemas.js

@@ -28,13 +28,10 @@ exports.anySchema = joi_extensions_1.Joi.any();
 exports.anyObjectSchema = joi_extensions_1.Joi.object().options({ stripUnknown: false });
 // 1g498efj5sder3324zer
 /**
- * [a-z0-9_]*
+ * [a-zA-Z0-9_]*
  * 6-64 length
  */
-exports.idSchema = exports.stringSchema
-    .regex(/^[a-z0-9_]*$/)
-    .min(6)
-    .max(64);
+exports.idSchema = exports.stringSchema.regex(/^[a-zA-Z0-9_]{6,64}$/);
 /**
  * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
  */
@@ -42,7 +39,7 @@ exports.SLUG_PATTERN = /^[a-z0-9-]*$/;
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-exports.slugSchema = exports.stringSchema.regex(exports.SLUG_PATTERN).min(1).max(255);
+exports.slugSchema = exports.stringSchema.regex(/^[a-z0-9-]{1,255}$/);
 // 16725225600 is 2500-01-01
 exports.unixTimestampSchema = exports.numberSchema.integer().min(0).max(16725225600);
 // 2

package/dist/validation/joi/joi.validation.util.js

@@ -130,6 +130,7 @@ function createError(value, err, objectName) {
     // Make annotation non-enumerable, to not get it automatically printed,
     // but still accessible
     Object.defineProperty(data, 'annotation', {
+        configurable: true,
         enumerable: false,
         value: annotation,
     });

package/dist/validation/joi/string.extensions.js

@@ -87,13 +87,15 @@ function stringExtensions(joi) {
                     },
                 ],
                 validate(v, helpers, args) {
-                    console.log('!!! stripHTML', args, v);
-                    const { strict = false } = args;
+                    // console.log('!!! stripHTML', args, v)
                     const r = sanitize(v, {
-                        allowedTags: [], // no html tags allowed at all
+                        allowedTags: [],
                         // disallowedTagsMode: 'discard' // discard is default
+                        parser: {
+                            decodeEntities: false, // prevent decoding/changing of &<>"'
+                        },
                     });
-                    if (strict && r !== v) {
+                    if (args.strict && r !== v) {
                         return helpers.error('string.stripHTML', args);
                     }
                     return r; // return converted value (or the same, if there was nothing to sanitize)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.46.0",
+  "version": "12.47.3",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/stream/pipeline/pipeline.ts

@@ -1,7 +1,16 @@
 import { pipeline } from 'stream'
 import { promisify } from 'util'
 
+type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream
+
 /**
  * Promisified stream.pipeline()
  */
-export const _pipeline = promisify(pipeline)
+export let _pipeline = promisify(pipeline)
+
+// Workaround https://github.com/nodejs/node/issues/40191
+// todo: remove it when fix is released in 16.x and in AppEngine 16.x
+if (process.version > 'v16.13') {
+  const { pipeline } = require('stream/promises')
+  _pipeline = ((streams: AnyStream[]) => pipeline(...streams)) as any
+}

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

@@ -42,13 +42,10 @@ export const anyObjectSchema = Joi.object().options({ stripUnknown: false })
 
 // 1g498efj5sder3324zer
 /**
- * [a-z0-9_]*
+ * [a-zA-Z0-9_]*
  * 6-64 length
  */
-export const idSchema = stringSchema
-  .regex(/^[a-z0-9_]*$/)
-  .min(6)
-  .max(64)
+export const idSchema = stringSchema.regex(/^[a-zA-Z0-9_]{6,64}$/)
 
 /**
  * `_` should NOT be allowed to be able to use slug-ids as part of natural ids with `_` separator.
@@ -58,7 +55,7 @@ export const SLUG_PATTERN = /^[a-z0-9-]*$/
 /**
  * "Slug" - a valid URL, filename, etc.
  */
-export const slugSchema = stringSchema.regex(SLUG_PATTERN).min(1).max(255)
+export const slugSchema = stringSchema.regex(/^[a-z0-9-]{1,255}$/)
 
 // 16725225600 is 2500-01-01
 export const unixTimestampSchema = numberSchema.integer().min(0).max(16725225600)

package/src/validation/joi/joi.validation.util.ts

@@ -172,6 +172,7 @@ function createError(value: any, err: ValidationError, objectName?: string): Joi
   // Make annotation non-enumerable, to not get it automatically printed,
   // but still accessible
   Object.defineProperty(data, 'annotation', {
+    configurable: true,
     enumerable: false,
     value: annotation,
   })

package/src/validation/joi/string.extensions.ts

@@ -109,15 +109,17 @@ export function stringExtensions(joi: typeof Joi): Extension {
           },
         ],
         validate(v: string, helpers, args: JoiStripHTMLOptions) {
-          console.log('!!! stripHTML', args, v)
-          const { strict = false } = args
+          // console.log('!!! stripHTML', args, v)
 
           const r = sanitize(v, {
             allowedTags: [], // no html tags allowed at all
             // disallowedTagsMode: 'discard' // discard is default
+            parser: {
+              decodeEntities: false, // prevent decoding/changing of &<>"'
+            },
           })
 
-          if (strict && r !== v) {
+          if (args.strict && r !== v) {
             return helpers.error('string.stripHTML', args)
           }