inibase 1.0.0-rc.16 → 1.0.0-rc.18

package/dist/file.js

@@ -1,4 +1,4 @@
-import { open, stat, writeFile } from "node:fs/promises";
+import { open, rename, stat, writeFile } from "node:fs/promises";
 import { createInterface } from "node:readline";
 import { detectFieldType, isArrayOfArrays, isNumber } from "./utils.js";
 import { encodeID, comparePassword } from "./utils.server.js";
@@ -119,9 +119,9 @@ export const decode = (input, fieldType, fieldChildrenType, secretKey) => {
 };
 export const get = async (filePath, lineNumbers, fieldType, fieldChildrenType, secretKey) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let lines = new Map(), lineCount = 0;
@@ -154,12 +154,12 @@ export const get = async (filePath, lineNumbers, fieldType, fieldChildrenType, s
 };
 export const replace = async (filePath, replacements) => {
     if (await isExists(filePath)) {
-        const fileHandle = await open(filePath, "r+"), rl = doesSupportReadLines()
+        const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
             ? fileHandle.readLines({ autoClose: false })
             : createInterface({
                 input: fileHandle.createReadStream({ autoClose: false }),
                 crlfDelay: Infinity,
-            }), writeStream = fileHandle.createWriteStream();
+            }), fileTempPath = `${filePath.replace(".inib", "")}-${Date.now()}.tmp`, fileTempHandle = await open(fileTempPath, "w+"), writeStream = fileTempHandle.createWriteStream({ autoClose: false });
         if (typeof replacements === "object" && !Array.isArray(replacements)) {
             if (!(replacements instanceof Map))
                 replacements = new Map(Object.entries(replacements));
@@ -181,7 +181,10 @@ export const replace = async (filePath, replacements) => {
         else
             for await (const _line of rl)
                 writeStream.write(replacements + "\n");
-        writeStream.end(async () => await fileHandle.close());
+        // writeStream.end(async () => await rename(fileTempPath, filePath));
+        await fileHandle.close();
+        await fileTempHandle.close();
+        await rename(fileTempPath, filePath);
     }
     else if (typeof replacements === "object" && !Array.isArray(replacements)) {
         if (!(replacements instanceof Map))
@@ -195,7 +198,7 @@ export const replace = async (filePath, replacements) => {
 };
 export const append = async (filePath, data, startsAt = 1) => {
     const doesFileExists = await isExists(filePath);
-    const fileHandle = await open(filePath, "a"), writeStream = fileHandle.createWriteStream();
+    const fileHandle = await open(filePath, "a"), writeStream = fileHandle.createWriteStream({ autoClose: false });
     if (doesFileExists) {
         const currentNumberOfLines = await count(filePath);
         if (startsAt - currentNumberOfLines - 1 > 0)
@@ -221,25 +224,28 @@ export const append = async (filePath, data, startsAt = 1) => {
 };
 export const remove = async (filePath, linesToDelete) => {
     let lineCount = 0;
-    const linesToDeleteArray = new Set(Array.isArray(linesToDelete) ? linesToDelete : [linesToDelete]), fileHandle = await open(filePath, "r+"), rl = doesSupportReadLines()
+    const linesToDeleteArray = new Set(Array.isArray(linesToDelete) ? linesToDelete : [linesToDelete]), fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
         ? fileHandle.readLines({ autoClose: false })
         : createInterface({
             input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
-        }), writeStream = fileHandle.createWriteStream();
+        }), fileTempPath = `${filePath.replace(".inib", "")}-${Date.now()}.tmp`, fileTempHandle = await open(fileTempPath, "w+"), writeStream = fileTempHandle.createWriteStream({ autoClose: false });
     for await (const line of rl) {
         lineCount++;
         if (!linesToDeleteArray.has(lineCount))
             writeStream.write(`${line}\n`);
     }
-    writeStream.end(async () => await fileHandle.close()); // Rename the temp file to the original file name
+    // writeStream.end(async () => await rename(fileTempPath, filePath));
+    await fileHandle.close();
+    await fileTempHandle.close();
+    await rename(fileTempPath, filePath);
 };
 export const count = async (filePath) => {
     let lineCount = 0;
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     for await (const line of rl)
@@ -301,9 +307,9 @@ const handleComparisonOperator = (operator, originalValue, comparedAtValue, fiel
 export const search = async (filePath, operator, comparedAtValue, logicalOperator, fieldType, fieldChildrenType, limit, offset, readWholeFile, secretKey) => {
     let RETURN = new Map(), lineCount = 0, foundItems = 0;
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     for await (const line of rl) {
@@ -335,9 +341,9 @@ export const search = async (filePath, operator, comparedAtValue, logicalOperato
 };
 export const sum = async (filePath, lineNumbers) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let sum = 0;
@@ -357,14 +363,13 @@ export const sum = async (filePath, lineNumbers) => {
     else
         for await (const line of rl)
             sum += +decode(line, "number");
-    await fileHandle.close();
     return sum;
 };
 export const max = async (filePath, lineNumbers) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let max = 0;
@@ -389,14 +394,13 @@ export const max = async (filePath, lineNumbers) => {
             if (lineContentNum > max)
                 max = lineContentNum;
         }
-    await fileHandle.close();
     return max;
 };
 export const min = async (filePath, lineNumbers) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let min = 0;
@@ -421,21 +425,18 @@ export const min = async (filePath, lineNumbers) => {
             if (lineContentNum < min)
                 min = lineContentNum;
         }
-    await fileHandle.close();
     return min;
 };
 export const sort = async (filePath, sortDirection, lineNumbers, _lineNumbersPerChunk = 100000) => {
     const fileHandle = await open(filePath, "r"), rl = doesSupportReadLines()
-        ? fileHandle.readLines()
+        ? fileHandle.readLines({ autoClose: false })
         : createInterface({
-            input: fileHandle.createReadStream(),
+            input: fileHandle.createReadStream({ autoClose: false }),
             crlfDelay: Infinity,
         });
     let lineCount = 0;
-    for await (const line of rl) {
+    for await (const line of rl)
         lineCount++;
-    }
-    await fileHandle.close();
 };
 export default class File {
     static get = get;

package/dist/index.d.ts

@@ -2,8 +2,8 @@
 export interface Data {
     id?: number | string;
     [key: string]: any;
-    createdAt?: Date;
-    updatedAt?: Date;
+    createdAt?: number;
+    updatedAt?: number;
 }
 export type FieldType = "string" | "number" | "boolean" | "date" | "email" | "url" | "table" | "object" | "array" | "password" | "html" | "ip" | "id";
 type FieldDefault = {
@@ -75,8 +75,12 @@ export default class Inibase {
     private joinPathesContents;
     get(tableName: string, where?: string | number | (string | number)[] | Criteria | undefined, options?: Options | undefined, onlyOne?: true, onlyLinesNumbers?: undefined): Promise<Data | null>;
     get(tableName: string, where?: string | number | (string | number)[] | Criteria | undefined, options?: Options | undefined, onlyOne?: boolean | undefined, onlyLinesNumbers?: true): Promise<number[] | null>;
-    post<DataType extends Data | Data[]>(tableName: string, data: DataType, options?: Options, returnPostedData?: boolean): Promise<DataType extends Data ? Data | null | void : Data[] | null | void>;
-    put<returnPostedDataType extends boolean = true>(tableName: string, data: Data | Data[], where?: number | string | (number | string)[] | Criteria, options?: Options, returnPostedData?: returnPostedDataType): Promise<(returnPostedDataType extends true ? Data | Data[] : void) | null>;
+    post(tableName: string, data: Data | Data[], options: Options | undefined, returnPostedData?: false): Promise<void | null>;
+    post(tableName: string, data: Data, options: Options | undefined, returnPostedData: true): Promise<Data | null>;
+    post(tableName: string, data: Data[], options: Options | undefined, returnPostedData: true): Promise<Data[] | null>;
+    put(tableName: string, data: Data | Data[], where?: number | string | (number | string)[] | Criteria | undefined, options?: Options | undefined, returnPostedData?: false): Promise<void | null>;
+    put(tableName: string, data: Data, where: number | string | (number | string)[] | Criteria | undefined, options: Options | undefined, returnPostedData: true): Promise<Data | null>;
+    put(tableName: string, data: Data[], where: number | string | (number | string)[] | Criteria | undefined, options: Options | undefined, returnPostedData: true): Promise<Data[] | null>;
     delete(tableName: string, where?: number | string | (number | string)[] | Criteria, _id?: string | string[]): Promise<string | string[] | null>;
     sum(tableName: string, columns: string, where?: number | string | (number | string)[] | Criteria): Promise<number>;
     sum(tableName: string, columns: string[], where?: number | string | (number | string)[] | Criteria): Promise<Record<string, number>>;

package/dist/index.js

@@ -505,7 +505,9 @@ export default class Inibase {
             if (!lineNumbers)
                 throw this.throwError("INVALID_ID", where);
             if (onlyLinesNumbers)
-                return Object.keys(lineNumbers).map(Number);
+                return Object.keys(lineNumbers).length
+                    ? Object.keys(lineNumbers).map(Number)
+                    : null;
             RETURN = Object.values((await getItemsFromSchema(join(this.folder, this.database, tableName), schema, Object.keys(lineNumbers).map(Number))) ?? {});
             if (RETURN.length && !Array.isArray(where))
                 RETURN = RETURN[0];
@@ -695,13 +697,13 @@ export default class Inibase {
             RETURN = data.map(({ id, updatedAt, createdAt, ...rest }) => ({
                 id: ++last_id,
                 ...rest,
-                createdAt: new Date(),
+                createdAt: new Date().getTime(),
             }));
         else
             RETURN = (({ id, updatedAt, createdAt, ...rest }) => ({
                 id: ++last_id,
                 ...rest,
-                createdAt: new Date(),
+                createdAt: new Date().getTime(),
             }))(data);
         if (!RETURN)
             throw this.throwError("NO_DATA");
@@ -742,11 +744,11 @@ export default class Inibase {
                 const pathesContents = this.joinPathesContents(join(this.folder, this.database, tableName), Utils.isArrayOfObjects(data)
                     ? data.map((item) => ({
                         ...(({ id, ...restOfData }) => restOfData)(item),
-                        updatedAt: new Date(),
+                        updatedAt: new Date().getTime(),
                     }))
                     : {
                         ...(({ id, ...restOfData }) => restOfData)(data),
-                        updatedAt: new Date(),
+                        updatedAt: new Date().getTime(),
                     });
                 for await (const [path, content] of Object.entries(pathesContents))
                     await File.replace(path, content);
@@ -769,9 +771,9 @@ export default class Inibase {
                 const pathesContents = Object.fromEntries(Object.entries(this.joinPathesContents(join(this.folder, this.database, tableName), Utils.isArrayOfObjects(data)
                     ? data.map((item) => ({
                         ...item,
-                        updatedAt: new Date(),
+                        updatedAt: new Date().getTime(),
                     }))
-                    : { ...data, updatedAt: new Date() })).map(([path, content]) => [
+                    : { ...data, updatedAt: new Date().getTime() })).map(([path, content]) => [
                     path,
                     [...(Array.isArray(where) ? where : [where])].reduce((obj, lineNum, index) => ({
                         ...obj,
@@ -784,9 +786,9 @@ export default class Inibase {
                     return this.get(tableName, where, options, !Array.isArray(where));
             }
         }
-        else if (typeof where === "object") {
-            const lineNumbers = this.get(tableName, where, undefined, undefined, true);
-            if (!lineNumbers || !Array.isArray(lineNumbers) || !lineNumbers.length)
+        else if (Utils.isObject(where)) {
+            const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+            if (!lineNumbers || !lineNumbers.length)
                 throw this.throwError("NO_ITEMS", tableName);
             return this.put(tableName, data, lineNumbers);
         }
@@ -823,16 +825,18 @@ export default class Inibase {
                 const files = await readdir(join(this.folder, this.database, tableName));
                 if (files.length) {
                     if (!_id)
-                        _id = Object.values((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0]).map((id) => UtilsServer.encodeID(Number(id), this.salt));
+                        _id = Object.values((await File.get(join(this.folder, this.database, tableName, "id.inib"), where, "number", undefined, this.salt))[0] ?? {}).map((id) => UtilsServer.encodeID(Number(id), this.salt));
+                    if (!_id.length)
+                        throw this.throwError("NO_ITEMS", tableName);
                     for (const file of files.filter((fileName) => fileName.endsWith(".inib")))
                         await File.remove(join(this.folder, this.database, tableName, file), where);
                     return Array.isArray(_id) && _id.length === 1 ? _id[0] : _id;
                 }
             }
         }
-        else if (typeof where === "object" && !Array.isArray(where)) {
-            const lineNumbers = this.get(tableName, where, undefined, undefined, true);
-            if (!lineNumbers || !Array.isArray(lineNumbers) || !lineNumbers.length)
+        else if (Utils.isObject(where)) {
+            const lineNumbers = await this.get(tableName, where, undefined, undefined, true);
+            if (!lineNumbers || !lineNumbers.length)
                 throw this.throwError("NO_ITEMS", tableName);
             return this.delete(tableName, lineNumbers);
         }

package/dist/utils.js

@@ -81,7 +81,8 @@ export const isBoolean = (input) => typeof input === "boolean" ||
     input === true ||
     input === false;
 export const isPassword = (input) => input.length === 161;
-export const isDate = (input) => !isNaN(Date.parse(String(input))) && Date.parse(String(input)) >= 0;
+export const isDate = (input) => (isNumber(input) && new Date(input).getTime() > 0) ||
+    (!isNaN(Date.parse(String(input))) && Date.parse(String(input)) >= 0);
 export const isValidID = (input) => {
     return typeof input === "string" && input.length === 32;
 };
@@ -198,7 +199,7 @@ export const objectToDotNotation = (input) => {
                     // If the property is an array of strings or numbers, keep the array as is
                     result[newKey] = value;
                 }
-                else if (typeof value === "object" && value !== null) {
+                else if (isObject(value)) {
                     // If the property is an object, push it onto the stack for further processing
                     stack.push({ obj: value, parentKey: newKey });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.16",
+  "version": "1.0.0-rc.18",
   "description": "File-based Relational Database for large data",
   "main": "./dist/index.js",
   "types": "./dist",