@naturalcycles/nodejs-lib 15.99.0 → 15.101.0

package/dist/fs/yaml2.d.ts

@@ -1,8 +1,9 @@
 import type { CreateNodeOptions, DocumentOptions, ParseOptions, SchemaOptions, ToStringOptions } from 'yaml';
+export type YamlParseOptions = ParseOptions & DocumentOptions & SchemaOptions;
 export type YamlStringifyOptions = DocumentOptions & SchemaOptions & ParseOptions & CreateNodeOptions & ToStringOptions;
 declare class Yaml2 {
-    readYaml<T = unknown>(filePath: string): T;
-    readYamlAsync<T = unknown>(filePath: string): Promise<T>;
+    readYaml<T = unknown>(filePath: string, opt?: YamlParseOptions): T;
+    readYamlAsync<T = unknown>(filePath: string, opt?: YamlParseOptions): Promise<T>;
     writeYaml(filePath: string, data: any, opt?: YamlStringifyOptions): void;
     writeYamlAsync(filePath: string, data: any, opt?: YamlStringifyOptions): Promise<void>;
     outputYaml(filePath: string, data: any, opt?: YamlStringifyOptions): void;

package/dist/fs/yaml2.js

@@ -3,11 +3,11 @@ import fsp from 'node:fs/promises';
 import { parse, stringify } from 'yaml';
 import { fs2 } from './fs2.js';
 class Yaml2 {
-    readYaml(filePath) {
-        return parse(fs.readFileSync(filePath, 'utf8'));
+    readYaml(filePath, opt) {
+        return parse(fs.readFileSync(filePath, 'utf8'), opt);
     }
-    async readYamlAsync(filePath) {
-        return parse(await fsp.readFile(filePath, 'utf8'));
+    async readYamlAsync(filePath, opt) {
+        return parse(await fsp.readFile(filePath, 'utf8'), opt);
     }
     writeYaml(filePath, data, opt) {
         const str = stringify(data, opt);

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

@@ -336,11 +336,11 @@ export declare class JObject<OUT extends AnyObject, Opt extends boolean = false>
      * When set, the validation will not strip away properties that are not specified explicitly in the schema.
      */
     allowAdditionalProperties(): this;
-    extend<P extends Record<string, JSchema<any, any>>>(props: P): JObject<Override<OUT, {
+    extend<P extends Record<string, JSchema<any, any>>>(props: P): JObject<Expand<Override<OUT, {
         [K in keyof P as P[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? never : K : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never;
     } & {
         [K in keyof P as P[K] extends JSchema<any, infer IsOpt> ? IsOpt extends true ? K : never : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never;
-    }>, false>;
+    }>>, false>;
     /**
      * Concatenates another schema to the current schema.
      *
@@ -352,11 +352,11 @@ export declare class JObject<OUT extends AnyObject, Opt extends boolean = false>
     /**
      * Extends the current schema with `id`, `created` and `updated` according to NC DB conventions.
      */
-    dbEntity(): JObject<Override<OUT, {
+    dbEntity(): JObject<Expand<Override<OUT, {
         id: string;
         created: UnixTimestamp;
         updated: UnixTimestamp;
-    } & {}>, false>;
+    } & {}>>, false>;
     minProperties(minProperties: number): this;
     maxProperties(maxProperties: number): this;
     exclusiveProperties(propNames: readonly (keyof OUT & string)[]): this;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.99.0",
+  "version": "15.101.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",

package/src/fs/yaml2.ts

@@ -10,6 +10,8 @@ import type {
 import { parse, stringify } from 'yaml'
 import { fs2 } from './fs2.js'
 
+export type YamlParseOptions = ParseOptions & DocumentOptions & SchemaOptions
+
 export type YamlStringifyOptions = DocumentOptions &
   SchemaOptions &
   ParseOptions &
@@ -17,12 +19,12 @@ export type YamlStringifyOptions = DocumentOptions &
   ToStringOptions
 
 class Yaml2 {
-  readYaml<T = unknown>(filePath: string): T {
-    return parse(fs.readFileSync(filePath, 'utf8')) as T
+  readYaml<T = unknown>(filePath: string, opt?: YamlParseOptions): T {
+    return parse(fs.readFileSync(filePath, 'utf8'), opt) as T
   }
 
-  async readYamlAsync<T = unknown>(filePath: string): Promise<T> {
-    return parse(await fsp.readFile(filePath, 'utf8')) as T
+  async readYamlAsync<T = unknown>(filePath: string, opt?: YamlParseOptions): Promise<T> {
+    return parse(await fsp.readFile(filePath, 'utf8'), opt) as T
   }
 
   writeYaml(filePath: string, data: any, opt?: YamlStringifyOptions): void {

package/src/validation/ajv/jSchema.ts

@@ -1071,23 +1071,25 @@ export class JObject<OUT extends AnyObject, Opt extends boolean = false> extends
   extend<P extends Record<string, JSchema<any, any>>>(
     props: P,
   ): JObject<
-    Override<
-      OUT,
-      {
-        // required keys
-        [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
-          ? IsOpt extends true
-            ? never
-            : K
-          : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
-      } & {
-        // optional keys
-        [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
-          ? IsOpt extends true
-            ? K
-            : never
-          : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
-      }
+    Expand<
+      Override<
+        OUT,
+        {
+          // required keys
+          [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
+            ? IsOpt extends true
+              ? never
+              : K
+            : never]: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
+        } & {
+          // optional keys
+          [K in keyof P as P[K] extends JSchema<any, infer IsOpt>
+            ? IsOpt extends true
+              ? K
+              : never
+            : never]?: P[K] extends JSchema<infer OUT2, any> ? OUT2 : never
+        }
+      >
     >,
     false
   > {