inibase 1.0.0-rc.110 → 1.0.0-rc.112

package/dist/index.js

@@ -111,9 +111,9 @@ export default class Inibase {
                 await writeFile(join(tablePath, ".prepend.config"), "");
         }
         if (schema) {
-            const lastSchemaId = 0;
-            await writeFile(join(tablePath, "schema.json"), JSON.stringify(UtilsServer.addIdToSchema(schema, lastSchemaId, this.salt), null, 2));
-            await writeFile(join(tablePath, `${lastSchemaId}.schema`), "");
+            const lastSchemaID = { value: 0 };
+            await writeFile(join(tablePath, "schema.json"), JSON.stringify(UtilsServer.addIdToSchema(schema, lastSchemaID, this.salt), null, 2));
+            await writeFile(join(tablePath, `${lastSchemaID.value}.schema`), "");
         }
         else
             await writeFile(join(tablePath, "0.schema"), "");
@@ -140,14 +140,14 @@ export default class Inibase {
             // remove id from schema
             schema = schema.filter(({ key }) => !["id", "createdAt", "updatedAt"].includes(key));
             let schemaIdFilePath;
-            for await (const filePath of glob("*.schema", { cwd: this.databasePath }))
-                schemaIdFilePath = filePath;
-            const lastSchemaId = schemaIdFilePath
-                ? Number(parse(schemaIdFilePath).name)
-                : 0;
+            for await (const fileName of glob("*.schema", { cwd: tablePath }))
+                schemaIdFilePath = join(tablePath, fileName);
+            const lastSchemaID = {
+                value: schemaIdFilePath ? Number(parse(schemaIdFilePath).name) : 0,
+            };
             if (await File.isExists(join(tablePath, "schema.json"))) {
                 // update columns files names based on field id
-                schema = UtilsServer.addIdToSchema(schema, lastSchemaId, this.salt);
+                schema = UtilsServer.addIdToSchema(schema, lastSchemaID, this.salt);
                 if (table.schema?.length) {
                     const replaceOldPathes = Utils.findChangedProperties(this._schemaToIdsPath(tableName, table.schema), this._schemaToIdsPath(tableName, schema));
                     if (replaceOldPathes)
@@ -158,12 +158,12 @@ export default class Inibase {
                 }
             }
             else
-                schema = UtilsServer.addIdToSchema(schema, lastSchemaId, this.salt);
+                schema = UtilsServer.addIdToSchema(schema, lastSchemaID, this.salt);
             await writeFile(join(tablePath, "schema.json"), JSON.stringify(schema, null, 2));
             if (schemaIdFilePath)
-                await rename(schemaIdFilePath, join(tablePath, `${lastSchemaId}.schema`));
+                await rename(schemaIdFilePath, join(tablePath, `${lastSchemaID.value}.schema`));
             else
-                await writeFile(join(tablePath, `${lastSchemaId}.schema`), "");
+                await writeFile(join(tablePath, `${lastSchemaID.value}.schema`), "");
         }
         if (config) {
             if (config.compression !== undefined &&
@@ -553,21 +553,10 @@ export default class Inibase {
     }
     // Helper function to determine if a field is simple
     isSimpleField(fieldType) {
-        const simpleTypes = [
-            "string",
-            "number",
-            "boolean",
-            "date",
-            "email",
-            "password",
-            "html",
-            "ip",
-            "json",
-            "id",
-        ];
+        const complexTypes = ["array", "object", "table"];
         if (Array.isArray(fieldType))
-            return fieldType.every((type) => typeof type === "string" && simpleTypes.includes(type));
-        return simpleTypes.includes(fieldType);
+            return fieldType.every((type) => typeof type === "string" && !complexTypes.includes(type));
+        return !complexTypes.includes(fieldType);
     }
     // Process a simple field (non-recursive)
     async processSimpleField(tableName, field, linesNumber, RETURN, _options, prefix) {
@@ -911,10 +900,10 @@ export default class Inibase {
         if (!schema)
             throw this.Error("NO_SCHEMA", tableName);
         let pagination;
-        for await (const paginationFilePath of glob("*.pagination", {
+        for await (const paginationFileName of glob("*.pagination", {
             cwd: tablePath,
         }))
-            pagination = parse(paginationFilePath).name.split("-").map(Number);
+            pagination = parse(paginationFileName).name.split("-").map(Number);
         if (!pagination[1])
             return null;
         if (options.columns?.length)
@@ -1131,8 +1120,8 @@ export default class Inibase {
         try {
             await File.lock(join(tablePath, ".tmp"), keys);
             let paginationFilePath;
-            for await (const filePath of glob("*.pagination", { cwd: tablePath }))
-                paginationFilePath = filePath;
+            for await (const fileName of glob("*.pagination", { cwd: tablePath }))
+                paginationFilePath = join(tablePath, fileName);
             [lastId, this.totalItems[`${tableName}-*`]] = parse(paginationFilePath)
                 .name.split("-")
                 .map(Number);
@@ -1166,7 +1155,7 @@ export default class Inibase {
             this.totalItems[`${tableName}-*`] += Array.isArray(data)
                 ? data.length
                 : 1;
-            await rename(join(tablePath, paginationFilePath), join(tablePath, `${lastId}-${this.totalItems[`${tableName}-*`]}.pagination`));
+            await rename(paginationFilePath, join(tablePath, `${lastId}-${this.totalItems[`${tableName}-*`]}.pagination`));
             if (returnPostedData)
                 return this.get(tableName, this.tables[tableName].config.prepend
                     ? Array.isArray(data)
@@ -1213,10 +1202,10 @@ export default class Inibase {
             });
             try {
                 await File.lock(join(tablePath, ".tmp"));
-                for await (const paginationFilePath of glob("*.pagination", {
+                for await (const paginationFileName of glob("*.pagination", {
                     cwd: tablePath,
                 }))
-                    this.totalItems[`${tableName}-*`] = parse(paginationFilePath)
+                    this.totalItems[`${tableName}-*`] = parse(paginationFileName)
                         .name.split("-")
                         .map(Number)[1];
                 await Promise.allSettled(Object.entries(pathesContents).map(async ([path, content]) => renameList.push(await File.replace(path, content, this.totalItems[`${tableName}-*`]))));
@@ -1299,18 +1288,20 @@ export default class Inibase {
                 await File.lock(join(tablePath, ".tmp"));
                 let paginationFilePath;
                 let pagination;
-                for await (const filePath of glob("*.pagination", {
+                for await (const paginationFileName of glob("*.pagination", {
                     cwd: tablePath,
                 })) {
-                    paginationFilePath = filePath;
-                    pagination = parse(filePath).name.split("-").map(Number);
+                    paginationFilePath = join(tablePath, paginationFileName);
+                    pagination = parse(paginationFileName)
+                        .name.split("-")
+                        .map(Number);
                 }
                 await Promise.all((await readdir(tablePath))
                     ?.filter((fileName) => fileName.endsWith(this.getFileExtension(tableName)))
                     .map(async (file) => unlink(join(tablePath, file))));
                 if (this.tables[tableName].config.cache)
                     await this.clearCache(tableName);
-                await rename(join(tablePath, paginationFilePath), join(tablePath, `${pagination[0]}-0.pagination`));
+                await rename(paginationFilePath, join(tablePath, `${pagination[0]}-0.pagination`));
                 return true;
             }
             finally {
@@ -1332,11 +1323,13 @@ export default class Inibase {
                     await File.lock(join(tablePath, ".tmp"));
                     let paginationFilePath;
                     let pagination;
-                    for await (const filePath of glob("*.pagination", {
+                    for await (const paginationFileName of glob("*.pagination", {
                         cwd: tablePath,
                     })) {
-                        paginationFilePath = filePath;
-                        pagination = parse(filePath).name.split("-").map(Number);
+                        paginationFilePath = join(tablePath, paginationFileName);
+                        pagination = parse(paginationFileName)
+                            .name.split("-")
+                            .map(Number);
                     }
                     if (pagination[1] &&
                         pagination[1] - (Array.isArray(where) ? where.length : 1) > 0) {
@@ -1351,7 +1344,7 @@ export default class Inibase {
                             .map(async (file) => unlink(join(tablePath, file))));
                     if (this.tables[tableName].config.cache)
                         await this.clearCache(tableName);
-                    await rename(join(tablePath, paginationFilePath), join(tablePath, `${pagination[0]}-${pagination[1] - (Array.isArray(where) ? where.length : 1)}.pagination`));
+                    await rename(paginationFilePath, join(tablePath, `${pagination[0]}-${pagination[1] - (Array.isArray(where) ? where.length : 1)}.pagination`));
                     return true;
                 }
                 finally {

package/dist/utils.server.d.ts

@@ -35,12 +35,14 @@ export declare const findLastIdNumber: (schema: Schema, secretKeyOrSalt: string
  * Adds or updates IDs in a schema, encoding them using a provided secret key or salt.
  *
  * @param schema - The schema to update, defined as an array of schema objects.
- * @param oldIndex - The starting index for generating new IDs, defaults to 0.
+ * @param startWithID - An object containing the starting ID for generating new IDs.
  * @param secretKeyOrSalt - The secret key or salt for encoding IDs, can be a string, number, or Buffer.
  * @param encodeIDs - If true, IDs will be encoded, else they will remain as numbers.
  * @returns The updated schema with encoded IDs.
  */
-export declare const addIdToSchema: (schema: Schema, startWithID: number, secretKeyOrSalt: string | number | Buffer, encodeIDs?: boolean) => Field[];
+export declare const addIdToSchema: (schema: Schema, startWithID: {
+    value: number;
+}, secretKeyOrSalt: string | number | Buffer, encodeIDs?: boolean) => Field[];
 export declare const encodeSchemaID: (schema: Schema, secretKeyOrSalt: string | number | Buffer) => Schema;
 export declare const hashString: (str: string) => string;
 /**

package/dist/utils.server.js

@@ -88,7 +88,7 @@ export const findLastIdNumber = (schema, secretKeyOrSalt) => Math.max(...extract
  * Adds or updates IDs in a schema, encoding them using a provided secret key or salt.
  *
  * @param schema - The schema to update, defined as an array of schema objects.
- * @param oldIndex - The starting index for generating new IDs, defaults to 0.
+ * @param startWithID - An object containing the starting ID for generating new IDs.
  * @param secretKeyOrSalt - The secret key or salt for encoding IDs, can be a string, number, or Buffer.
  * @param encodeIDs - If true, IDs will be encoded, else they will remain as numbers.
  * @returns The updated schema with encoded IDs.
@@ -96,10 +96,10 @@ export const findLastIdNumber = (schema, secretKeyOrSalt) => Math.max(...extract
 export const addIdToSchema = (schema, startWithID, secretKeyOrSalt, encodeIDs) => {
     function _addIdToField(field) {
         if (!field.id) {
-            startWithID++;
+            startWithID.value++;
             field.id = encodeIDs
-                ? encodeID(startWithID, secretKeyOrSalt)
-                : startWithID;
+                ? encodeID(startWithID.value, secretKeyOrSalt)
+                : startWithID.value;
         }
         else {
             if (isValidID(field.id)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inibase",
-  "version": "1.0.0-rc.110",
+  "version": "1.0.0-rc.112",
   "type": "module",
   "author": {
     "name": "Karim Amahtil",