@naturalcycles/nodejs-lib 15.133.0 → 15.135.0

package/dist/fs/fs2.d.ts

@@ -25,15 +25,15 @@ declare class FS2 {
     writeFile(filePath: string, data: string | Uint8Array, opt?: WriteFileOptions): void;
     writeFileAsync(filePath: string, data: string | Uint8Array, opt?: WriteFileOptions): Promise<void>;
     writePrettyJson(filePath: string, data: any): void;
-    writeJson(filePath: string, data: any, opt?: JsonOptions): void;
+    writeJson(filePath: string, data: any): void;
     writePrettyJsonAsync(filePath: string, data: any): Promise<void>;
-    writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
+    writeJsonAsync(filePath: string, data: any): Promise<void>;
     appendFile(filePath: string, data: string | Uint8Array): void;
     appendFileAsync(filePath: string, data: string | Uint8Array): Promise<void>;
     outputPrettyJson(filePath: string, data: any): void;
-    outputJson(filePath: string, data: any, opt?: JsonOptions): void;
+    outputJson(filePath: string, data: any): void;
     outputPrettyJsonAsync(filePath: string, data: any): Promise<void>;
-    outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void>;
+    outputJsonAsync(filePath: string, data: any): Promise<void>;
     outputFile(filePath: string, data: string | Uint8Array): void;
     outputFileAsync(filePath: string, data: string | Uint8Array): Promise<void>;
     pathExists(filePath: string): boolean;
@@ -79,7 +79,4 @@ declare class FS2 {
     createReadStream: typeof fs.createReadStream;
 }
 export declare const fs2: FS2;
-export interface JsonOptions {
-    spaces?: number;
-}
 export {};

package/dist/fs/fs2.js

@@ -62,17 +62,19 @@ class FS2 {
         await fsp.writeFile(filePath, data, opt);
     }
     writePrettyJson(filePath, data) {
-        this.writeJson(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        fs.writeFileSync(filePath, str);
     }
-    writeJson(filePath, data, opt) {
-        const str = stringify(data, opt);
+    writeJson(filePath, data) {
+        const str = JSON.stringify(data);
         fs.writeFileSync(filePath, str);
     }
     async writePrettyJsonAsync(filePath, data) {
-        await this.writeJsonAsync(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        await fsp.writeFile(filePath, str);
     }
-    async writeJsonAsync(filePath, data, opt) {
-        const str = stringify(data, opt);
+    async writeJsonAsync(filePath, data) {
+        const str = JSON.stringify(data);
         await fsp.writeFile(filePath, str);
     }
     appendFile(filePath, data) {
@@ -82,17 +84,19 @@ class FS2 {
         await fsp.appendFile(filePath, data);
     }
     outputPrettyJson(filePath, data) {
-        this.outputJson(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        this.outputFile(filePath, str);
     }
-    outputJson(filePath, data, opt) {
-        const str = stringify(data, opt);
+    outputJson(filePath, data) {
+        const str = JSON.stringify(data);
         this.outputFile(filePath, str);
     }
     async outputPrettyJsonAsync(filePath, data) {
-        await this.outputJsonAsync(filePath, data, prettyJsonOptions);
+        const str = stringifyPretty(data);
+        await this.outputFileAsync(filePath, str);
     }
-    async outputJsonAsync(filePath, data, opt) {
-        const str = stringify(data, opt);
+    async outputJsonAsync(filePath, data) {
+        const str = JSON.stringify(data);
         await this.outputFileAsync(filePath, str);
     }
     outputFile(filePath, data) {
@@ -276,8 +280,7 @@ class FS2 {
     createReadStream = fs.createReadStream;
 }
 export const fs2 = new FS2();
-const prettyJsonOptions = { spaces: 2 };
-function stringify(data, opt) {
-    // If pretty-printing is enabled (spaces) - also add a newline at the end (to match our prettier config)
-    return JSON.stringify(data, null, opt?.spaces) + (opt?.spaces ? '\n' : '');
+function stringifyPretty(data) {
+    // Add a newline at the end (to match our prettier config)
+    return JSON.stringify(data, null, 2) + '\n';
 }

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

@@ -1,6 +1,6 @@
 import type { ValidationFunction, ValidationFunctionResult } from '@naturalcycles/js-lib';
 import type { Set2 } from '@naturalcycles/js-lib/object';
-import type { AnyObject, BaseDBEntity, IANATimezone, Inclusiveness, IsoDate, IsoDateTime, IsoMonth, Enum, NumberEnum, StringEnum, StringMap, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
+import type { AnyObject, BaseDBEntity, IANATimezone, Inclusiveness, IsoDate, IsoDateTime, IsoMonth, Enum, NonEmptyArray, NumberEnum, StringEnum, StringMap, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib/types';
 import type { StandardJSONSchemaV1, StandardSchemaV1 } from '@standard-schema/spec';
 import type { Ajv, ValidateFunction } from 'ajv';
 import { AjvValidationError } from './ajvValidationError.js';
@@ -408,13 +408,17 @@ export declare class JObjectInfer<PROPS extends Record<string, JSchema<any, any>
         updated: JNumber<UnixTimestamp, false>;
     }[K] : K extends keyof PROPS ? PROPS[K] : never; }, Opt>;
 }
-export declare class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
+export declare class JArray<OUT, Opt, ARR extends OUT[] = OUT[]> extends JBuilder<ARR, Opt> {
     constructor(itemsSchema: JSchema<OUT, Opt>);
     minLength(minItems: number): this;
     maxLength(maxItems: number): this;
     length(exactLength: number): this;
     length(minItems: number, maxItems: number): this;
     exactLength(length: number): this;
+    /**
+     * Same as `minLength(1)`, but also narrows the output type to `NonEmptyArray`.
+     */
+    nonEmpty(): JArray<OUT, Opt, NonEmptyArray<OUT>>;
     unique(): this;
 }
 declare class JSet2Builder<OUT, Opt> extends JBuilder<Set2<OUT>, Opt> {

package/dist/validation/ajv/jSchema.js

@@ -942,6 +942,12 @@ export class JArray extends JBuilder {
     exactLength(length) {
         return this.minLength(length).maxLength(length);
     }
+    /**
+     * Same as `minLength(1)`, but also narrows the output type to `NonEmptyArray`.
+     */
+    nonEmpty() {
+        return this.minLength(1);
+    }
     unique() {
         return this.cloneAndUpdateSchema({ uniqueItems: true });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.133.0",
+  "version": "15.135.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -14,7 +14,7 @@
     "yaml": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "20.68.0",
+    "@naturalcycles/dev-lib": "0.0.0",
     "typescript": "^7"
   },
   "exports": {

package/src/fs/fs2.ts

@@ -78,20 +78,22 @@ class FS2 {
   }
 
   writePrettyJson(filePath: string, data: any): void {
-    this.writeJson(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    fs.writeFileSync(filePath, str)
   }
 
-  writeJson(filePath: string, data: any, opt?: JsonOptions): void {
-    const str = stringify(data, opt)
+  writeJson(filePath: string, data: any): void {
+    const str = JSON.stringify(data)
     fs.writeFileSync(filePath, str)
   }
 
   async writePrettyJsonAsync(filePath: string, data: any): Promise<void> {
-    await this.writeJsonAsync(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    await fsp.writeFile(filePath, str)
   }
 
-  async writeJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
-    const str = stringify(data, opt)
+  async writeJsonAsync(filePath: string, data: any): Promise<void> {
+    const str = JSON.stringify(data)
     await fsp.writeFile(filePath, str)
   }
 
@@ -104,20 +106,22 @@ class FS2 {
   }
 
   outputPrettyJson(filePath: string, data: any): void {
-    this.outputJson(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    this.outputFile(filePath, str)
   }
 
-  outputJson(filePath: string, data: any, opt?: JsonOptions): void {
-    const str = stringify(data, opt)
+  outputJson(filePath: string, data: any): void {
+    const str = JSON.stringify(data)
     this.outputFile(filePath, str)
   }
 
   async outputPrettyJsonAsync(filePath: string, data: any): Promise<void> {
-    await this.outputJsonAsync(filePath, data, prettyJsonOptions)
+    const str = stringifyPretty(data)
+    await this.outputFileAsync(filePath, str)
   }
 
-  async outputJsonAsync(filePath: string, data: any, opt?: JsonOptions): Promise<void> {
-    const str = stringify(data, opt)
+  async outputJsonAsync(filePath: string, data: any): Promise<void> {
+    const str = JSON.stringify(data)
     await this.outputFileAsync(filePath, str)
   }
 
@@ -324,13 +328,7 @@ class FS2 {
 
 export const fs2 = new FS2()
 
-const prettyJsonOptions: JsonOptions = { spaces: 2 }
-
-export interface JsonOptions {
-  spaces?: number
-}
-
-function stringify(data: any, opt?: JsonOptions): string {
-  // If pretty-printing is enabled (spaces) - also add a newline at the end (to match our prettier config)
-  return JSON.stringify(data, null, opt?.spaces) + (opt?.spaces ? '\n' : '')
+function stringifyPretty(data: any): string {
+  // Add a newline at the end (to match our prettier config)
+  return JSON.stringify(data, null, 2) + '\n'
 }

package/src/validation/ajv/jSchema.ts

@@ -20,6 +20,7 @@ import type {
   IsoDateTime,
   IsoMonth,
   Enum,
+  NonEmptyArray,
   NumberEnum,
   StringEnum,
   StringMap,
@@ -1290,7 +1291,7 @@ export class JObjectInfer<
   }
 }
 
-export class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
+export class JArray<OUT, Opt, ARR extends OUT[] = OUT[]> extends JBuilder<ARR, Opt> {
   constructor(itemsSchema: JSchema<OUT, Opt>) {
     super({
       type: 'array',
@@ -1317,6 +1318,13 @@ export class JArray<OUT, Opt> extends JBuilder<OUT[], Opt> {
     return this.minLength(length).maxLength(length)
   }
 
+  /**
+   * Same as `minLength(1)`, but also narrows the output type to `NonEmptyArray`.
+   */
+  nonEmpty(): JArray<OUT, Opt, NonEmptyArray<OUT>> {
+    return this.minLength(1) as any as JArray<OUT, Opt, NonEmptyArray<OUT>>
+  }
+
   unique(): this {
     return this.cloneAndUpdateSchema({ uniqueItems: true })
   }