inibase 1.0.0-rc.33 → 1.0.0-rc.35

package/dist/file.js

@@ -1,4 +1,4 @@
-import { open, access, writeFile, readFile, constants as fsConstants, unlink, } from "node:fs/promises";
+import { open, access, writeFile, readFile, constants as fsConstants, unlink, stat, } from "node:fs/promises";
 import { createInterface } from "node:readline";
 import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
@@ -367,7 +367,7 @@ export const replace = async (filePath, replacements) => {
  */
 export const append = async (filePath, data) => {
     const fileTempPath = filePath.replace(/([^/]+)\/?$/, `.tmp/$1`);
-    if (await isExists(filePath)) {
+    if ((await isExists(filePath)) && (await stat(filePath)).size) {
         let fileHandle, fileTempHandle, rl;
         try {
             fileHandle = await open(filePath, "r");
@@ -406,25 +406,18 @@ export const append = async (filePath, data) => {
  * Note: Creates a temporary file during the process and replaces the original file with it after removing lines.
  */
 export const remove = async (filePath, linesToDelete) => {
-    let linesCount = 0, deletedCount = 0;
+    let linesCount = 0;
     const fileHandle = await open(filePath, "r"), fileTempPath = filePath.replace(/([^/]+)\/?$/, `.tmp/$1`), fileTempHandle = await open(fileTempPath, "w"), linesToDeleteArray = new Set(Array.isArray(linesToDelete)
         ? linesToDelete.map(Number)
         : [Number(linesToDelete)]), rl = readLineInternface(fileHandle);
     await _pipeline(rl, fileTempHandle.createWriteStream(), new Transform({
         transform(line, encoding, callback) {
             linesCount++;
-            if (linesToDeleteArray.has(linesCount)) {
-                deletedCount++;
+            if (linesToDeleteArray.has(linesCount))
                 return callback();
-            }
             else
                 return callback(null, `${line}\n`);
         },
-        final(callback) {
-            if (deletedCount === linesCount)
-                this.push("\n");
-            return callback();
-        },
     }));
     await fileTempHandle.close();
     await fileHandle.close();

package/dist/index.d.ts

@@ -77,6 +77,7 @@ export default class Inibase {
     private getItemsFromSchema;
     private applyCriteria;
     private _filterSchemaByColumns;
+    clearCache(tablePath: string): Promise<void>;
     get(tableName: string, where?: string | number | (string | number)[] | Criteria | undefined, options?: Options | undefined, onlyOne?: true, onlyLinesNumbers?: undefined, tableSchema?: Schema): Promise<Data | null>;
     get(tableName: string, where?: string | number | (string | number)[] | Criteria | undefined, options?: Options | undefined, onlyOne?: boolean | undefined, onlyLinesNumbers?: true, tableSchema?: Schema): Promise<number[] | null>;
     post(tableName: string, data: Data | Data[], options?: Options, returnPostedData?: boolean): Promise<void | null>;

package/dist/index.js

@@ -589,6 +589,11 @@ export default class Inibase {
         })
             .filter((i) => i);
     }
+    async clearCache(tablePath) {
+        await Promise.all((await readdir(join(tablePath, ".tmp")))
+            ?.filter((fileName) => !["pagination.inib", "locked.inib"].includes(fileName))
+            .map(async (file) => unlink(join(tablePath, ".tmp", file))));
+    }
     async get(tableName, where, options = {
         page: 1,
         perPage: 15,
@@ -632,6 +637,7 @@ export default class Inibase {
         }
         else if ((Array.isArray(where) && where.every(Utils.isNumber)) ||
             (Utils.isNumber(where) && !onlyLinesNumbers)) {
+            // "where" in this case, is the lineNumbers instead of IDs
             let lineNumbers = where;
             if (!Array.isArray(lineNumbers))
                 lineNumbers = [lineNumbers];
@@ -752,12 +758,12 @@ export default class Inibase {
             await Promise.all(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(await File.append(path, content))));
             await Promise.all(renameList.map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
             renameList = [];
-            if (Config.isCacheEnabled)
+            if (Config.isCacheEnabled) {
+                await this.clearCache(tablePath);
                 await File.write(join(tablePath, ".tmp", "pagination.inib"), `${lastId},${totalItems + (Array.isArray(RETURN) ? RETURN.length : 1)}`, true);
+            }
             if (returnPostedData)
-                return this.get(tableName, Utils.isArrayOfObjects(RETURN)
-                    ? RETURN.map((data) => Number(data.id))
-                    : RETURN.id, options, !Utils.isArrayOfObjects(data), // return only one item if data is not array of objects
+                return this.get(tableName, Array.isArray(RETURN) ? RETURN.map((_, index) => index + 1) : 1, options, !Utils.isArrayOfObjects(data), // return only one item if data is not array of objects
                 undefined, schema);
         }
         finally {
@@ -806,9 +812,7 @@ export default class Inibase {
                     await Promise.all(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(await File.replace(path, content))));
                     await Promise.all(renameList.map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
                     if (Config.isCacheEnabled)
-                        await Promise.all((await readdir(join(tablePath, ".tmp")))
-                            ?.filter((fileName) => !["pagination.inib", "locked.inib"].includes(fileName))
-                            .map(async (file) => unlink(join(tablePath, ".tmp", file))));
+                        await this.clearCache(join(tablePath, ".tmp"));
                     if (returnPostedData)
                         return this.get(tableName, where, options, undefined, undefined, schema);
                 }
@@ -849,9 +853,7 @@ export default class Inibase {
                     await Promise.all(renameList.map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
                     renameList = [];
                     if (Config.isCacheEnabled)
-                        await Promise.all((await readdir(join(tablePath, ".tmp")))
-                            ?.filter((fileName) => !["pagination.inib", "locked.inib"].includes(fileName))
-                            .map(async (file) => unlink(join(tablePath, ".tmp", file))));
+                        await this.clearCache(tablePath);
                     if (returnPostedData)
                         return this.get(tableName, where, options, !Array.isArray(where), undefined, schema);
                 }
@@ -886,9 +888,7 @@ export default class Inibase {
                     ?.filter((fileName) => fileName.endsWith(".inib"))
                     .map(async (file) => unlink(join(tablePath, file))));
                 if (Config.isCacheEnabled)
-                    await Promise.all((await readdir(join(tablePath, ".tmp")))
-                        ?.filter((fileName) => !["pagination.inib", "locked.inib"].includes(fileName))
-                        .map(async (file) => unlink(join(tablePath, ".tmp", file))));
+                    await this.clearCache(tablePath);
             }
             finally {
                 await File.unlock(join(tablePath, ".tmp"));
@@ -920,9 +920,7 @@ export default class Inibase {
                         await Promise.all(files.map(async (file) => renameList.push(await File.remove(join(tablePath, file), where))));
                         await Promise.all(renameList.map(async ([tempPath, filePath]) => rename(tempPath, filePath)));
                         if (Config.isCacheEnabled) {
-                            await Promise.all((await readdir(join(tablePath, ".tmp")))
-                                ?.filter((fileName) => !["pagination.inib", "locked.inib"].includes(fileName))
-                                .map(async (file) => unlink(join(tablePath, ".tmp", file))));
+                            await this.clearCache(tablePath);
                             if (await File.isExists(join(tablePath, ".tmp", "pagination.inib"))) {
                                 let [lastId, totalItems] = (await File.read(join(tablePath, ".tmp", "pagination.inib"), true))
                                     .split(",")
@@ -960,7 +958,7 @@ export default class Inibase {
         if (!Array.isArray(columns))
             columns = [columns];
         for await (const column of columns) {
-            const columnPath = join(this.folder, this.database, tableName, column + ".inib");
+            const columnPath = join(tablePath, column + ".inib");
             if (await File.isExists(columnPath)) {
                 if (where) {
                     const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
@@ -984,7 +982,7 @@ export default class Inibase {
         if (!Array.isArray(columns))
             columns = [columns];
         for await (const column of columns) {
-            const columnPath = join(this.folder, this.database, tableName, column + ".inib");
+            const columnPath = join(tablePath, column + ".inib");
             if (await File.isExists(columnPath)) {
                 if (where) {
                     const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);
@@ -1008,7 +1006,7 @@ export default class Inibase {
         if (!Array.isArray(columns))
             columns = [columns];
         for await (const column of columns) {
-            const columnPath = join(this.folder, this.database, tableName, column + ".inib");
+            const columnPath = join(tablePath, column + ".inib");
             if (await File.isExists(columnPath)) {
                 if (where) {
                     const lineNumbers = await this.get(tableName, where, undefined, undefined, true, schema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.33",
+  "version": "1.0.0-rc.35",
   "author": {
     "name": "Karim Amahtil",
     "email": "karim.amahtil@gmail.com"