@medyll/idae-idbql 0.66.0 → 0.67.0

package/dist/idbqlCore/idbqlCore.d.ts

@@ -1,76 +1,11 @@
-import { CollectionCore } from "../collection/collection.svelte.js";
-import { type CollectionState } from "../state/idbstate.svelte.js";
-export declare enum enumPrimitive {
-    id = "id",
-    any = "any",
-    date = "date",
-    text = "text",
-    number = "number",// IdbqModelCollectionTemplate
-    boolean = "boolean",
-    datetime = "datetime",
-    url = "url",
-    email = "email",
-    phone = "phone",
-    time = "time",
-    password = "password"
-}
-export declare enum TplProperties {
-    private = "private",
-    readonly = "readonly",
-    required = "required"
-}
-type CombineElements<T extends string, U extends string = T> = T extends any ? T | `${T} ${CombineElements<Exclude<U, T>>}` : never;
-type CombinedArgs = CombineElements<TplProperties>;
-type IdbObjectify<T extends string> = `array-of-${T}` | `object-${T}`;
-export type TplCollectionFields = Record<string, string>;
-export type TplFieldPrimitive<T = {}> = keyof typeof enumPrimitive | `text-${"tiny" | "short" | "medium" | "long" | "area"}` | `${string}.${string}` | `fk-${string}.${string}`;
-export type TplObjectFieldPrimitive = IdbObjectify<TplFieldPrimitive>;
-export type TplFieldFk = `fk-${string}.${string}`;
-export type TplFkObject = IdbObjectify<TplFieldFk>;
-export type TplTypes = TplFieldPrimitive | TplObjectFieldPrimitive | TplFieldFk | TplFkObject;
-export type TplFieldArgs = `${TplTypes} (${CombinedArgs})`;
-/** rules */
-export type TplFieldRules = TplFieldArgs | TplTypes;
-export type TplFieldType = TplFieldArgs | TplTypes;
-export type IDbForge = {
-    collection?: TplCollectionName;
-    fieldName?: keyof TplFields;
-    fieldType?: TplFieldType;
-    fieldRule?: TplFieldRules;
-    fieldArgs?: [keyof typeof TplProperties] | undefined;
-    is: any;
-};
-export type IdbqModel<T = Record<string, Record<string, any>>> = {
-    readonly [K in keyof T]: CollectionModel<T[K]>;
-};
-export type TplCollectionName<T = TplCollectionFields> = keyof IdbqModel<T>;
-export type Tpl<T = TplCollectionFields> = CollectionModel<T>["template"];
-export type TplFields<T = TplCollectionFields> = CollectionModel<T>["template"]["fields"];
-export type CollectionModel<T = TplCollectionFields> = {
-    keyPath: string | any;
-    /** @deprecated use ts instead */
-    model: any;
-    ts: any;
-    template: {
-        index: string;
-        presentation: CombineElements<keyof CollectionModel<T>["ts"]>;
-        fields: {
-            [K in keyof T]: TplFieldRules;
-        };
-        fks: {
-            [K in TplCollectionName]?: {
-                code: K;
-                multiple: boolean;
-                rules: CombinedArgs;
-            };
-        };
-    };
-};
-type ReadonlyCollections<T extends IdbqModel> = {
-    [K in keyof T]: CollectionCore<T[K]["ts"]>;
+import { CollectionCore } from '../collection/collection.svelte.js';
+import { CollectionState } from '../state/idbstate.svelte.js';
+import type { IdbqModel } from './types.js';
+export type ReadonlyCollections<T extends IdbqModel> = {
+    [K in keyof T]: CollectionCore<T[K]['ts']>;
 };
-type StateCollections<T extends IdbqModel> = {
-    [K in keyof T]: CollectionState<T[K]["ts"]>;
+export type StateCollections<T extends IdbqModel> = {
+    [K in keyof T]: CollectionState<T[K]['ts']>;
 };
 /**
  * Represents the IndexedDB wrapper for managing database operations.
@@ -89,7 +24,7 @@ export declare class IdbqlIndexedCore<T = any> {
     get schema(): Record<string, any>;
     get idbqModel(): IdbqModel<Record<string, Record<string, any>>>;
     /**
-     * Sets the version of the database.
+     * return a database, with the version is provided
      * @param {number} version - The version number of the database.
      * @returns {object} - An object with a `stores` method to define the object stores.
      */
@@ -98,6 +33,7 @@ export declare class IdbqlIndexedCore<T = any> {
     private createCollections;
 }
 /**
+ * Main entrance function to create an IndexedDB database store schema.
  * Creates an IndexedDB database store schema for the given model and version.
  *
  * @param model - The IdbqModel representing the structure of the store.
@@ -125,4 +61,3 @@ export declare const idbqBase: <T extends IdbqModel>(model: T, version: number)
         idbqModel: T;
     };
 };
-export {};

package/dist/idbqlCore/idbqlCore.js

@@ -1,29 +1,7 @@
 /* src\lib\scripts\idbqlCore\idbqlCore.ts */
-import { Collection, CollectionCore } from "../collection/collection.svelte.js";
-import { createIdbqlState, } from "../state/idbstate.svelte.js";
-import { Schema } from "./idbqlSchema.js";
-export var enumPrimitive;
-(function (enumPrimitive) {
-    enumPrimitive["id"] = "id";
-    enumPrimitive["any"] = "any";
-    enumPrimitive["date"] = "date";
-    enumPrimitive["text"] = "text";
-    enumPrimitive["number"] = "number";
-    enumPrimitive["boolean"] = "boolean";
-    enumPrimitive["datetime"] = "datetime";
-    enumPrimitive["url"] = "url";
-    enumPrimitive["email"] = "email";
-    enumPrimitive["phone"] = "phone";
-    enumPrimitive["time"] = "time";
-    enumPrimitive["password"] = "password";
-})(enumPrimitive || (enumPrimitive = {}));
-export var TplProperties;
-(function (TplProperties) {
-    TplProperties["private"] = "private";
-    TplProperties["readonly"] = "readonly";
-    TplProperties["required"] = "required";
-})(TplProperties || (TplProperties = {}));
-const a = "object-any (readonly private)";
+import { Collection, CollectionCore } from '../collection/collection.svelte.js';
+import { CollectionState, createIdbqlState } from '../state/idbstate.svelte.js';
+import { Schema } from './idbqlSchema.js';
 /**
  * Represents the IndexedDB wrapper for managing database operations.
  * @template T - The type of data stored in the IndexedDB.
@@ -45,13 +23,13 @@ export class IdbqlIndexedCore {
         const stores = {};
         Object.keys(idbqModel).forEach((modelName) => {
             const modelInfo = idbqModel[modelName];
-            stores[modelName] = modelInfo.keyPath || "";
+            stores[modelName] = modelInfo.keyPath || '';
             Object.defineProperty(this, modelName, {
                 // @ts-ignore
                 value: undefined,
                 writable: true,
                 enumerable: true,
-                configurable: true,
+                configurable: true
             });
         });
         this.stores(stores);
@@ -63,12 +41,12 @@ export class IdbqlIndexedCore {
         return this.#idbqModel;
     }
     /**
-     * Sets the version of the database.
+     * return a database, with the version is provided
      * @param {number} version - The version number of the database.
      * @returns {object} - An object with a `stores` method to define the object stores.
      */
     async stores(args) {
-        if (typeof indexedDB !== "undefined") {
+        if (typeof indexedDB !== 'undefined') {
             return new Promise((resolve, reject) => {
                 this.#schema = args;
                 const dbConnection = indexedDB.open(this.databaseName, this.dbVersion);
@@ -80,11 +58,14 @@ export class IdbqlIndexedCore {
                     };
                     dbConnection.onupgradeneeded = async (event) => {
                         const db = event.target.result;
+                        console.log('upgrading db', db);
                         if (db) {
                             const m = new Schema();
-                            m.createSchema(db, args);
+                            console.log('schema', m);
+                            await m.createSchema(db, args);
                         }
                         else {
+                            console.log('no db');
                             reject(true);
                         }
                     };
@@ -98,7 +79,7 @@ export class IdbqlIndexedCore {
     }
     async transaction(storeNames, mode, callback) {
         if (!this.idbDatabase) {
-            throw new Error("Database not initialized");
+            throw new Error('Database not initialized');
         }
         return new Promise((resolve, reject) => {
             const tx = this.idbDatabase.transaction(storeNames, mode);
@@ -120,16 +101,17 @@ export class IdbqlIndexedCore {
                 // @ts-ignore
                 value: new Collection(storeName, this.#schema[storeName], {
                     dbName: this.databaseName,
-                    version, // @ts-ignore
+                    version // @ts-ignore
                 }),
                 writable: true,
                 enumerable: true,
-                configurable: true,
+                configurable: true
             });
         });
     }
 }
 /**
+ * Main entrance function to create an IndexedDB database store schema.
  * Creates an IndexedDB database store schema for the given model and version.
  *
  * @param model - The IdbqModel representing the structure of the store.
@@ -149,9 +131,9 @@ export const createIdbqDb = (model, version) => {
                 idbql: idb_,
                 idbqlState: idbqlState.collectionState,
                 qolie: idbqlState.qolie,
-                idbqModel: model,
+                idbqModel: model
             };
-        },
+        }
     };
 };
 // main export is here ?

package/dist/idbqlCore/idbqlSchema.js

@@ -15,6 +15,10 @@ export class Schema {
      * @returns The created object store or null if creation fails.
      */
     createStore(db, storeName, keyPath, autoIncrement = false) {
+        if (db.objectStoreNames.contains(storeName)) {
+            console.warn(`Store ${storeName} already exists, skipping creation.`);
+            return db.transaction(storeName, 'readwrite').objectStore(storeName);
+        }
         try {
             return db.createObjectStore(storeName, { keyPath, autoIncrement });
         }
@@ -37,7 +41,14 @@ export class Schema {
             const declaredIndex = fields.find((field) => field.startsWith('&'))?.replace('&', '');
             const keyPath = incrementField || declaredIndex || fields[0];
             const increment = Boolean(incrementField);
-            const store = this.createStore(db, storeName, keyPath, increment);
+            let store;
+            if (db.objectStoreNames.contains(storeName)) {
+                console.warn(`Store ${storeName} already exists, skipping creation.`);
+                store = db.transaction(storeName, 'readwrite').objectStore(storeName);
+            }
+            else {
+                store = this.createStore(db, storeName, keyPath, increment);
+            }
             if (store) {
                 for (const field of fields) {
                     await this.createIndexes(store, field, field);

package/dist/idbqlCore/types.d.ts

@@ -0,0 +1,69 @@
+export type ExpandProps<T> = T extends infer O ? {
+    [K in keyof O]: O[K];
+} : never;
+export declare enum enumPrimitive {
+    id = "id",
+    any = "any",
+    date = "date",
+    text = "text",
+    number = "number",// IdbqModelCollectionTemplate
+    boolean = "boolean",
+    datetime = "datetime",
+    url = "url",
+    email = "email",
+    phone = "phone",
+    time = "time",
+    password = "password"
+}
+export declare enum TplProperties {
+    private = "private",
+    readonly = "readonly",
+    required = "required"
+}
+export type CombineElements<T extends string, U extends string = T> = T extends any ? T | `${T} ${CombineElements<Exclude<U, T>>}` : never;
+export type CombinedArgs = CombineElements<TplProperties>;
+export type IdbObjectify<T extends string> = `array-of-${T}` | `object-${T}`;
+export type TplCollectionFields = Record<string, string>;
+export type TplFieldPrimitive<T = {}> = keyof typeof enumPrimitive | `text-${'tiny' | 'short' | 'medium' | 'long' | 'area'}` | `${string}.${string}` | `fk-${string}.${string}`;
+export type TplObjectFieldPrimitive = IdbObjectify<TplFieldPrimitive>;
+export type TplFieldFk = `fk-${string}.${string}`;
+export type TplFkObject = IdbObjectify;
+export type TplTypes = TplFieldPrimitive | TplObjectFieldPrimitive | TplFieldFk | TplFkObject;
+export type TplFieldArgs = `${TplTypes} (${CombinedArgs})`;
+/** rules */
+export type TplFieldRules = TplFieldArgs | TplTypes;
+export type TplFieldType = TplFieldArgs | TplTypes;
+export type IDbForge = {
+    collection?: TplCollectionName;
+    fieldName?: keyof TplFields;
+    fieldType?: TplFieldType;
+    fieldRule?: TplFieldRules;
+    fieldArgs?: [keyof typeof TplProperties] | undefined;
+    is: any;
+};
+export type IdbqModel<T = Record<string, Record<string, any>>> = {
+    readonly [K in keyof T]: CollectionModel<T[K]>;
+};
+export type TplCollectionName<T = TplCollectionFields> = keyof IdbqModel<T>;
+export type Tpl<T = TplCollectionFields> = CollectionModel<T>['template'];
+export type TplFields<T = TplCollectionFields> = CollectionModel<T>['template']['fields'];
+export type CollectionModel<T = TplCollectionFields> = {
+    keyPath: string | any;
+    /** @deprecated use ts instead */
+    model: any;
+    ts: any;
+    template: {
+        index: string;
+        presentation: CombineElements<keyof CollectionModel<T>['ts']>;
+        fields: {
+            [K in keyof T]: TplFieldRules;
+        };
+        fks: {
+            [K in TplCollectionName]?: {
+                code: K;
+                multiple: boolean;
+                rules: CombinedArgs;
+            };
+        };
+    };
+};

package/dist/idbqlCore/types.js

@@ -0,0 +1,23 @@
+export var enumPrimitive;
+(function (enumPrimitive) {
+    enumPrimitive["id"] = "id";
+    enumPrimitive["any"] = "any";
+    enumPrimitive["date"] = "date";
+    enumPrimitive["text"] = "text";
+    enumPrimitive["number"] = "number";
+    enumPrimitive["boolean"] = "boolean";
+    enumPrimitive["datetime"] = "datetime";
+    enumPrimitive["url"] = "url";
+    enumPrimitive["email"] = "email";
+    enumPrimitive["phone"] = "phone";
+    enumPrimitive["time"] = "time";
+    enumPrimitive["password"] = "password";
+})(enumPrimitive || (enumPrimitive = {}));
+export var TplProperties;
+(function (TplProperties) {
+    TplProperties["private"] = "private";
+    TplProperties["readonly"] = "readonly";
+    TplProperties["required"] = "required";
+})(TplProperties || (TplProperties = {}));
+(TplFieldFk);
+const a = 'object-any (readonly private)';

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './state/idbstate.svelte.js';
 export * from './state/idbqlEvent.svelte.js';
 export * from './scripts/types.js';
 export * from './path/pathResolver.js';
+export * from './idbqlCore/types.js';
 export * from './idbqlCore/idbqlSchema.js';
 export * from './idbqlCore/idbqlCore.js';
 export * from './collection/collection.svelte.js';

package/dist/index.js

@@ -3,6 +3,7 @@ export * from './state/idbstate.svelte.js';
 export * from './state/idbqlEvent.svelte.js';
 export * from './scripts/types.js';
 export * from './path/pathResolver.js';
+export * from './idbqlCore/types.js';
 export * from './idbqlCore/idbqlSchema.js';
 export * from './idbqlCore/idbqlCore.js';
 export * from './collection/collection.svelte.js';

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@medyll/idae-idbql",
 	"scope": "@medyll",
-	"version": "0.66.0",
+	"version": "0.67.0",
 	"description": "A powerful and flexible IndexedDB query library for TypeScript and JavaScript applications, offering a MongoDB-like query interface, strong TypeScript support, reactive state management, and easy integration with front-end frameworks like Svelte.",
 	"scripts": {
 		"dev": "vite dev",
@@ -44,6 +44,6 @@
 	"types": "./dist/index.d.ts",
 	"type": "module",
 	"dependencies": {
-		"@medyll/idae-query": "^0.67.0"
+		"@medyll/idae-query": "^0.68.0"
 	}
 }