xjs-node 2.2.1 → 3.0.0-alpha.1

package/build/func/u-file.d.ts

@@ -10,36 +10,35 @@ interface FileStatus {
 }
 export declare namespace UFile {
     function mkdir(p: MaybeArray<string>): boolean;
-    function write(p: MaybeArray<string>, c: string): void;
+    function write(p: MaybeArray<string>, c: string): Promise<void>;
     /**
      * remove a file. default is no error if the file to be removed doesn't exist.
      * @param p path of the file. if passed as an array those are joined.
      * @param errorIfAbsent raise an error if the file to be removed doesn't exist.
      */
-    function rm(p: MaybeArray<string>, errorIfAbsent?: boolean): void;
+    function rm(p: MaybeArray<string>, errorIfAbsent?: boolean): Promise<void>;
     function exists(p: MaybeArray<string>): boolean;
     /**
      * return a file status. if the file of the status doesn't exist, this returns `null`.
      */
     function status(p: MaybeArray<string>): FileStatus;
-    function read(p: MaybeArray<string>): Buffer;
-    function read(p: MaybeArray<string>, encoding: BufferEncoding): string;
+    function read(p: MaybeArray<string>): Promise<Buffer>;
+    function read(p: MaybeArray<string>, encoding: BufferEncoding): Promise<string>;
     /**
      * read specified file path as a json object.
      * @param p file path
      * @param d default value if the file path doesn't exist. default of this is `{}`.
      * @param encoding encoding used by file reading. default is `utf-8`.
      */
-    function readAsJson<T>(p: MaybeArray<string>, d?: any, encoding?: BufferEncoding): T;
-    function cp(from: MaybeArray<string>, to: MaybeArray<string>): void;
-    function mv(from: MaybeArray<string>, to: MaybeArray<string>): void;
+    function readAsJson<T>(p: MaybeArray<string>, d?: any, encoding?: BufferEncoding): Promise<T>;
+    function cp(from: MaybeArray<string>, to: MaybeArray<string>): Promise<void>;
+    function mv(from: MaybeArray<string>, to: MaybeArray<string>): Promise<void>;
     function ls(p: MaybeArray<string>): string[];
     /**
      * check availability to export a file with specified directory and file name.
-     * if it doesn't, retry to check after appending incremental number (e.g. `.1`) to the filename.
+     * if it doesn't, this retries to check after appending incremental number to the filename excluding an extension (e.g. `aaa_1.txt`).
      * @param dir destination directory path.
      * @param fname file name wanna export to.
-     * @returns exportable file path.
      */
     function reserveFilePath(dir: MaybeArray<string>, fname: string): string;
     /**

package/build/func/u-file.js

@@ -52,7 +52,7 @@ var UFile;
     }
     UFile.mkdir = mkdir;
     function write(p, c) {
-        fs.writeFileSync((0, u_1.joinPath)(p), c);
+        return new Promise((rs, rj) => fs.writeFile((0, u_1.joinPath)(p), c, e => e ? rj(e) : rs()));
     }
     UFile.write = write;
     /**
@@ -61,7 +61,7 @@ var UFile;
      * @param errorIfAbsent raise an error if the file to be removed doesn't exist.
      */
     function rm(p, errorIfAbsent) {
-        fs.rmSync((0, u_1.joinPath)(p), { recursive: true, force: !errorIfAbsent });
+        return new Promise((rs, rj) => fs.rm((0, u_1.joinPath)(p), { recursive: true, force: !errorIfAbsent }, e => e ? rj(e) : rs()));
     }
     UFile.rm = rm;
     function exists(p) {
@@ -77,10 +77,13 @@ var UFile;
     }
     UFile.status = status;
     function read(p, encoding) {
-        const f = (0, u_1.joinPath)(p);
-        if (!fs.existsSync(f))
-            throw new xjs_common_1.XjsErr(s_errCode, `No file found => ${f}`);
-        return fs.readFileSync(f, encoding);
+        return new Promise((rs, rj) => {
+            const f = (0, u_1.joinPath)(p);
+            if (fs.existsSync(f))
+                fs.readFile(f, encoding, (e, d) => e ? rj(e) : rs(d));
+            else
+                rj(new xjs_common_1.XjsErr(s_errCode, `No file found => ${f}`));
+        });
     }
     UFile.read = read;
     /**
@@ -89,22 +92,28 @@ var UFile;
      * @param d default value if the file path doesn't exist. default of this is `{}`.
      * @param encoding encoding used by file reading. default is `utf-8`.
      */
-    function readAsJson(p, d = {}, encoding = "utf-8") {
-        return UFile.exists(p) ? JSON.parse(UFile.read(p, encoding)) : d;
+    async function readAsJson(p, d = {}, encoding = "utf-8") {
+        return UFile.exists(p) ? JSON.parse(await UFile.read(p, encoding)) : d;
     }
     UFile.readAsJson = readAsJson;
     function cp(from, to) {
-        const f = (0, u_1.joinPath)(from), t = (0, u_1.joinPath)(to);
-        if (!fs.existsSync(f))
-            throw new xjs_common_1.XjsErr(s_errCode, `No file found => ${f}`);
-        fs.copyFileSync(f, t);
+        return new Promise((rs, rj) => {
+            const f = (0, u_1.joinPath)(from), t = (0, u_1.joinPath)(to);
+            if (fs.existsSync(f))
+                fs.copyFile(f, t, e => e ? rj(e) : rs());
+            else
+                rj(new xjs_common_1.XjsErr(s_errCode, `No file found => ${f}`));
+        });
     }
     UFile.cp = cp;
     function mv(from, to) {
-        const f = (0, u_1.joinPath)(from), t = (0, u_1.joinPath)(to);
-        if (!fs.existsSync(f))
-            throw new xjs_common_1.XjsErr(s_errCode, `No file found => ${f}`);
-        fs.renameSync(f, t);
+        return new Promise((rs, rj) => {
+            const f = (0, u_1.joinPath)(from), t = (0, u_1.joinPath)(to);
+            if (fs.existsSync(f))
+                fs.rename(f, t, e => e ? rj(e) : rs());
+            else
+                rj(new xjs_common_1.XjsErr(s_errCode, `No file found => ${f}`));
+        });
     }
     UFile.mv = mv;
     function ls(p) {
@@ -116,10 +125,9 @@ var UFile;
     UFile.ls = ls;
     /**
      * check availability to export a file with specified directory and file name.
-     * if it doesn't, retry to check after appending incremental number (e.g. `.1`) to the filename.
+     * if it doesn't, this retries to check after appending incremental number to the filename excluding an extension (e.g. `aaa_1.txt`).
      * @param dir destination directory path.
      * @param fname file name wanna export to.
-     * @returns exportable file path.
      */
     function reserveFilePath(dir, fname) {
         const pt = (0, u_1.joinPath)(dir);
@@ -128,8 +136,10 @@ var UFile;
         if (!fname || fname.match(/[\\/:*?"<>|]/))
             throw new xjs_common_1.XjsErr(s_errCode, "Specified filename is invalid due to empty or including disallowed characters.");
         let dest = (0, u_1.joinPath)(pt, fname), i = 1;
-        while (fs.existsSync(dest))
-            dest = (0, u_1.joinPath)(pt, `${fname}.${i++}`);
+        while (fs.existsSync(dest)) {
+            const ext = fname.match(/^(.+)(\.[^\.]+)$/);
+            dest = (0, u_1.joinPath)(pt, `${ext ? ext[1] : fname}_${i++}${ext ? ext[2] : ""}`);
+        }
         return dest;
     }
     UFile.reserveFilePath = reserveFilePath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xjs-node",
-  "version": "2.2.1",
+  "version": "3.0.0-alpha.1",
   "description": "library modules for nodejs + typescript that bundled general-purpose implementations.",
   "repository": {
     "type": "git",