core-3nweb-client-lib 0.47.2 → 0.47.4

package/build/injected-globals/platform-devfs.d.ts

@@ -1,5 +1,5 @@
 import { Abortable } from 'events';
-import type { BufferEncodingOption, Dirent, promises as fsFns, MakeDirectoryOptions, Mode, ObjectEncodingOptions, OpenMode, RmDirOptions, StatOptions, Stats } from 'fs';
+import type { BufferEncodingOption, promises as fsFns, Mode, ObjectEncodingOptions, OpenMode, RmDirOptions, StatOptions, Stats } from 'fs';
 import { FlagAndOpenMode } from 'fs/promises';
 import type Stream = require('stream');
 export type { Stats } from 'fs';
@@ -51,45 +51,17 @@ declare function writeFile(file: string, data: string | NodeJS.ArrayBufferView |
 declare function appendFile(path: string, data: string | Uint8Array, options?: (ObjectEncodingOptions & FlagAndOpenMode & {
     flush?: boolean | undefined;
 }) | BufferEncoding | null): Promise<void>;
-declare function mkdir(path: string, options: MakeDirectoryOptions & {
-    recursive: true;
+declare function mkdir(path: string, options?: {
+    recursive?: boolean;
 }): Promise<string | undefined>;
-declare function mkdir(path: string, options?: Mode | (MakeDirectoryOptions & {
-    recursive?: false | undefined;
-}) | null): Promise<void>;
-declare function mkdir(path: string, options?: Mode | MakeDirectoryOptions | null): Promise<string | undefined>;
 declare function open(path: string, flags?: string | number, mode?: Mode): Promise<FileHandle>;
 declare function symlink(target: string, path: string, type?: string | null): Promise<void>;
 declare function readlink(path: string, options?: ObjectEncodingOptions | BufferEncoding | null): Promise<string>;
 declare function readlink(path: string, options: BufferEncodingOption): Promise<Buffer>;
 declare function readlink(path: string, options?: ObjectEncodingOptions | string | null): Promise<string | Buffer>;
-declare function lstat(path: string, opts?: StatOptions & {
-    bigint?: false | undefined;
-}): Promise<Stats>;
 declare function lstat(path: string, opts?: StatOptions): Promise<Stats>;
 declare function stat(path: string, opts?: StatOptions): Promise<Stats>;
-declare function readdir(path: string, options?: (ObjectEncodingOptions & {
-    withFileTypes?: false | undefined;
-    recursive?: boolean | undefined;
-}) | BufferEncoding | null): Promise<string[]>;
-declare function readdir(path: string, options: {
-    encoding: "buffer";
-    withFileTypes?: false | undefined;
-    recursive?: boolean | undefined;
-} | "buffer"): Promise<Buffer[]>;
-declare function readdir(path: string, options?: (ObjectEncodingOptions & {
-    withFileTypes?: false | undefined;
-    recursive?: boolean | undefined;
-}) | BufferEncoding | null): Promise<string[] | Buffer[]>;
-declare function readdir(path: string, options: ObjectEncodingOptions & {
-    withFileTypes: true;
-    recursive?: boolean | undefined;
-}): Promise<Dirent[]>;
-declare function readdir(path: string, options: {
-    encoding: "buffer";
-    withFileTypes: true;
-    recursive?: boolean | undefined;
-}): Promise<Dirent<Buffer>[]>;
+declare function readdir(path: string): Promise<string[]>;
 declare function rmdir(path: string, options?: RmDirOptions): Promise<void>;
 declare function unlink(path: string): Promise<void>;
 declare function rename(oldPath: string, newPath: string): Promise<void>;

package/build/lib-client/local-files/device-fs.js

@@ -43,31 +43,26 @@ async function makeFolder(root, path, exclusive = false) {
     if (path.length === 0) {
         throw new Error('Invalid file path');
     }
-    let pathStr = root;
-    const lastIndex = path.length - 1;
-    for (let i = 0; i < path.length; i += 1) {
-        pathStr += '/' + path[i];
-        const stats = await fs.lstat(pathStr).catch((exc) => {
+    const pathStr = pathMod.join(root, ...path);
+    if (exclusive) {
+        const stats = await fs.lstat(pathStr).catch(async (exc) => {
             if (exc.code !== file_1.Code.notFound) {
                 throw (0, file_1.maskPathInExc)(root.length, exc);
             }
-            return fs.mkdir(pathStr)
-                .catch((exc) => {
-                if (!exc.alreadyExists) {
-                    throw exc;
-                }
-            }); // resolves to undefined, leading to !stats
         });
         if (!stats) {
-            continue;
+            await fs.mkdir(pathStr, { recursive: true });
         }
-        if (!stats.isDirectory()) {
-            throw (0, file_1.makeFileException)('notDirectory', path.slice(0, i + 1).join('/'));
+        else if (!stats.isDirectory()) {
+            throw (0, file_1.makeFileException)('notDirectory', path.join('/'));
         }
-        else if ((i === lastIndex) && exclusive) {
+        else {
             throw (0, file_1.makeFileException)('alreadyExists', path.join('/'));
         }
     }
+    else {
+        await fs.mkdir(pathStr, { recursive: true });
+    }
 }
 async function checkPresence(type, root, path, throwIfMissing) {
     try {

package/build/lib-common/async-fs-node.d.ts

@@ -7,20 +7,9 @@ export type { FileHandle, FileException, Stats } from '../injected-globals/platf
  */
 export declare const appendFile: (path: string, data: string | Uint8Array, options?: (import("fs").ObjectEncodingOptions & import("fs/promises").FlagAndOpenMode & {
     flush?: boolean | undefined;
-}) | BufferEncoding | null) => Promise<void>, lstat: {
-    (path: string, opts?: import("fs").StatOptions & {
-        bigint?: false | undefined;
-    }): Promise<import("fs").Stats>;
-    (path: string, opts?: import("fs").StatOptions): Promise<import("fs").Stats>;
-}, mkdir: {
-    (path: string, options: import("fs").MakeDirectoryOptions & {
-        recursive: true;
-    }): Promise<string | undefined>;
-    (path: string, options?: import("fs").Mode | (import("fs").MakeDirectoryOptions & {
-        recursive?: false | undefined;
-    }) | null): Promise<void>;
-    (path: string, options?: import("fs").Mode | import("fs").MakeDirectoryOptions | null): Promise<string | undefined>;
-}, open: (path: string, flags?: string | number, mode?: import("fs").Mode) => Promise<FileHandle>, readFile: {
+}) | BufferEncoding | null) => Promise<void>, lstat: (path: string, opts?: import("fs").StatOptions) => Promise<import("fs").Stats>, mkdir: (path: string, options?: {
+    recursive?: boolean;
+}) => Promise<string | undefined>, open: (path: string, flags?: string | number, mode?: import("fs").Mode) => Promise<FileHandle>, readFile: {
     (path: string, options?: ({
         encoding?: null | undefined;
         flag?: import("fs").OpenMode | undefined;
@@ -32,30 +21,7 @@ export declare const appendFile: (path: string, data: string | Uint8Array, optio
     (path: string, options?: (import("fs").ObjectEncodingOptions & import("events").Abortable & {
         flag?: import("fs").OpenMode | undefined;
     }) | BufferEncoding | null): Promise<string | Buffer>;
-}, readdir: {
-    (path: string, options?: (import("fs").ObjectEncodingOptions & {
-        withFileTypes?: false | undefined;
-        recursive?: boolean | undefined;
-    }) | BufferEncoding | null): Promise<string[]>;
-    (path: string, options: {
-        encoding: "buffer";
-        withFileTypes?: false | undefined;
-        recursive?: boolean | undefined;
-    } | "buffer"): Promise<Buffer[]>;
-    (path: string, options?: (import("fs").ObjectEncodingOptions & {
-        withFileTypes?: false | undefined;
-        recursive?: boolean | undefined;
-    }) | BufferEncoding | null): Promise<string[] | Buffer[]>;
-    (path: string, options: import("fs").ObjectEncodingOptions & {
-        withFileTypes: true;
-        recursive?: boolean | undefined;
-    }): Promise<import("fs").Dirent[]>;
-    (path: string, options: {
-        encoding: "buffer";
-        withFileTypes: true;
-        recursive?: boolean | undefined;
-    }): Promise<import("fs").Dirent<Buffer>[]>;
-}, readlink: {
+}, readdir: (path: string) => Promise<string[]>, readlink: {
     (path: string, options?: import("fs").ObjectEncodingOptions | BufferEncoding | null): Promise<string>;
     (path: string, options: import("fs").BufferEncodingOption): Promise<Buffer>;
     (path: string, options?: import("fs").ObjectEncodingOptions | string | null): Promise<string | Buffer>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.47.2",
+  "version": "0.47.4",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",