@aromix/core 0.3.2 → 0.4.0

package/dist/index.d.ts

@@ -1,82 +1,70 @@
 import { AnySchema } from '@aromix/validator';
+import { Db, InsertOneOptions, InsertOneResult, BulkWriteOptions, InsertManyResult, Filter, FindOptions, UpdateFilter, UpdateOptions, UpdateResult, ReplaceOptions, DeleteOptions, DeleteResult, FindOneAndUpdateOptions, FindOneAndDeleteOptions, FindOneAndReplaceOptions, CountDocumentsOptions, DistinctOptions, AggregateOptions, AggregationCursor, BulkWriteResult, CreateIndexesOptions, DropIndexesOptions } from 'mongodb';
 
-interface KvAdapter {
-    get(key: string): Promise<unknown>;
-    set(key: string, value: unknown): Promise<void>;
-    delete(key: string): Promise<void>;
-    has(key: string): Promise<boolean>;
-}
-declare function KvAdapter(adapter: KvAdapter): KvAdapter;
-
-interface KvEntityInput<Schema extends AnySchema> {
+interface KvEntityUserInput<Schema extends AnySchema> {
     name: string;
-    adapter: KvAdapter;
     model: Schema;
 }
-interface KvEntityOutput<Schema extends AnySchema> {
-    get(key: string): Promise<Schema['$infer']>;
-    set(key: string, value: Schema['$infer']): Promise<void>;
+declare class KvEntity<Schema extends AnySchema> {
+    readonly state: KvEntityUserInput<Schema>;
+    private adapter;
+    constructor(userProvided: KvEntityUserInput<Schema>, internal: EntityBuilder.KvAdapter);
+    get(key: string): Promise<Schema['$select']>;
+    set(key: string, value: Schema['$insert']): Promise<void>;
     delete(key: string): Promise<void>;
     has(key: string): Promise<boolean>;
-    state: {
-        name: string;
-        adapter: KvAdapter;
-        model: Schema;
-    };
 }
-declare function KvEntity<Schema extends AnySchema>(input: KvEntityInput<Schema>): KvEntityOutput<Schema>;
 
-interface MongoCollectionAdapter {
-    insertOne(doc: any): Promise<any>;
-    insertMany(docs: any): Promise<any>;
-    findOne(filter: any): Promise<any>;
-    find(filter: any): Promise<any>;
-    updateOne(filter: any, update: any): Promise<any>;
-    updateMany(filter: any, update: any): Promise<any>;
-    deleteOne(filter: any): Promise<any>;
-    deleteMany(filter: any): Promise<any>;
-    countDocuments(filter?: any): Promise<any>;
-}
-interface MongoAdapter {
-    collection(name: string): MongoCollectionAdapter;
-}
-declare function MongoAdapter(adapter: MongoAdapter): MongoAdapter;
-
-interface MongoEntityInput<Schema extends AnySchema> {
+interface MongoEntityUserInput<Schema extends AnySchema> {
     name: string;
-    adapter: MongoAdapter;
     model: Schema;
 }
-interface MongoEntityOutput<Schema extends AnySchema> {
-    insertOne(doc: Schema['$infer']): Promise<{
-        insertedId: unknown;
-    }>;
-    insertMany(docs: Schema['$infer'][]): Promise<{
-        insertedIds: unknown[];
-    }>;
-    findOne(filter: Record<string, unknown>): Promise<Schema['$infer'] | null>;
-    find(filter: Record<string, unknown>): Promise<Schema['$infer'][]>;
-    updateOne(filter: Record<string, unknown>, update: Record<string, unknown>): Promise<{
-        matchedCount: number;
-        modifiedCount: number;
-    }>;
-    updateMany(filter: Record<string, unknown>, update: Record<string, unknown>): Promise<{
-        matchedCount: number;
-        modifiedCount: number;
-    }>;
-    deleteOne(filter: Record<string, unknown>): Promise<{
-        deletedCount: number;
-    }>;
-    deleteMany(filter: Record<string, unknown>): Promise<{
-        deletedCount: number;
-    }>;
-    countDocuments(filter?: Record<string, unknown>): Promise<number>;
-    state: {
-        name: string;
-        adapter: MongoAdapter;
-        model: Schema;
+declare class MongoEntity<Schema extends AnySchema> {
+    readonly states: MongoEntityUserInput<Schema>;
+    private readonly collection;
+    constructor(userInput: MongoEntityUserInput<Schema>, db: Db);
+    insertOne(doc: Schema['$insert'], options?: InsertOneOptions): Promise<InsertOneResult>;
+    insertMany(docs: Schema['$insert'][], options?: BulkWriteOptions): Promise<InsertManyResult>;
+    findOne(filter: Filter<Schema['$select']>, options?: FindOptions): Promise<Schema['$select'] | null>;
+    find(filter: Filter<Schema['$select']>, options?: FindOptions): Promise<Schema['$select'][]>;
+    updateOne(filter: Filter<Schema['$select']>, update: UpdateFilter<Schema['$update']>, options?: UpdateOptions): Promise<UpdateResult>;
+    updateMany(filter: Filter<Schema['$select']>, update: UpdateFilter<Schema['$update']>, options?: UpdateOptions): Promise<UpdateResult>;
+    replaceOne(filter: Filter<Schema['$select']>, replacement: Schema['$select'], options?: ReplaceOptions): Promise<UpdateResult>;
+    deleteOne(filter: Filter<Schema['$select']>, options?: DeleteOptions): Promise<DeleteResult>;
+    deleteMany(filter: Filter<Schema['$select']>, options?: DeleteOptions): Promise<DeleteResult>;
+    findOneAndUpdate(filter: Filter<Schema['$select']>, update: UpdateFilter<Schema['$update']>, options?: FindOneAndUpdateOptions): Promise<Schema['$select'] | null>;
+    findOneAndDelete(filter: Filter<Schema['$select']>, options?: FindOneAndDeleteOptions): Promise<Schema['$select'] | null>;
+    findOneAndReplace(filter: Filter<Schema['$select']>, replacement: Schema['$select'], options?: FindOneAndReplaceOptions): Promise<Schema['$select'] | null>;
+    countDocuments(filter: Filter<Schema['$select']>, options?: CountDocumentsOptions): Promise<number>;
+    estimatedDocumentCount(): Promise<number>;
+    distinct<Field extends keyof Schema['$select'] & string>(field: Field, filter: Filter<Schema['$select']>, options?: DistinctOptions): Promise<Array<Schema['$select'][Field]>>;
+    aggregate(pipeline: any[], options?: AggregateOptions): AggregationCursor;
+    bulkWrite(operations: any[], options?: BulkWriteOptions): Promise<BulkWriteResult>;
+    createIndex(indexSpec: any, options?: CreateIndexesOptions): Promise<string>;
+    dropIndex(indexName: string, options?: DropIndexesOptions): Promise<void>;
+}
+
+declare namespace EntityBuilder {
+    interface KvAdapter {
+        get(key: string): Promise<unknown>;
+        set(key: string, value: unknown): Promise<void>;
+        delete(key: string): Promise<void>;
+        has(key: string): Promise<boolean>;
+    }
+    interface KvInput {
+        transport: 'http';
+        adapter(): KvAdapter;
+    }
+    function kv(builderInput: KvInput): {
+        entity<Schema extends AnySchema>(entityInput: KvEntityUserInput<Schema>): KvEntity<Schema>;
+    };
+    interface MongoInput {
+        adapter(): Db;
+        transport: 'http';
+    }
+    function mongo(builderInput: MongoInput): {
+        entity<Schema extends AnySchema>(entityInput: MongoEntityUserInput<Schema>): MongoEntity<Schema>;
     };
 }
-declare function MongoEntity<Schema extends AnySchema>(input: MongoEntityInput<Schema>): MongoEntityOutput<Schema>;
 
-export { KvAdapter, KvEntity, type KvEntityInput, type KvEntityOutput, MongoAdapter, type MongoCollectionAdapter, MongoEntity, type MongoEntityInput, type MongoEntityOutput };
+export { EntityBuilder, KvEntity, type KvEntityUserInput, MongoEntity, type MongoEntityUserInput };

package/dist/index.js

@@ -1,88 +1,123 @@
-// src/kv/adapter.ts
-function KvAdapter(adapter) {
-  return adapter;
-}
-
-// src/kv/entity.ts
-function KvEntity(input) {
-  const adapter = input.adapter;
-  return {
-    async get(key) {
-      const formattedKey = `${input.name}:${key}`;
-      const raw = await adapter.get(formattedKey);
-      return input.model.parse(raw);
-    },
-    async set(key, value) {
-      const formattedKey = `${input.name}:${key}`;
-      const validated = input.model.parse(value);
-      await adapter.set(formattedKey, validated);
-    },
-    async delete(key) {
-      const formattedKey = `${input.name}:${key}`;
-      await adapter.delete(formattedKey);
-    },
-    async has(key) {
-      const formattedKey = `${input.name}:${key}`;
-      return await adapter.has(formattedKey);
-    },
-    state: {
-      adapter,
-      model: input.model,
-      name: input.name
-    }
-  };
-}
+// src/entity/platforms/kv.ts
+var KvEntity = class {
+  state;
+  adapter;
+  constructor(userProvided, internal) {
+    this.state = userProvided;
+    this.adapter = internal;
+  }
+  async get(key) {
+    const formattedKey = `${this.state.name}:${key}`;
+    const raw = await this.adapter.get(formattedKey);
+    return raw;
+  }
+  async set(key, value) {
+    const formattedKey = `${this.state.name}:${key}`;
+    await this.adapter.set(formattedKey, value);
+  }
+  async delete(key) {
+    const formattedKey = `${this.state.name}:${key}`;
+    await this.adapter.delete(formattedKey);
+  }
+  async has(key) {
+    const formattedKey = `${this.state.name}:${key}`;
+    return this.adapter.has(formattedKey);
+  }
+};
 
-// src/mongo/adapter.ts
-function MongoAdapter(adapter) {
-  return adapter;
-}
+// src/entity/platforms/mongo.ts
+var MongoEntity = class {
+  states;
+  collection;
+  constructor(userInput, db) {
+    this.states = userInput;
+    this.collection = db.collection(userInput.name);
+  }
+  async insertOne(doc, options) {
+    return this.collection.insertOne(doc, options);
+  }
+  async insertMany(docs, options) {
+    return this.collection.insertMany(docs, options);
+  }
+  async findOne(filter, options) {
+    return this.collection.findOne(filter, options);
+  }
+  async find(filter, options) {
+    return this.collection.find(filter, options).toArray();
+  }
+  async updateOne(filter, update, options) {
+    return this.collection.updateOne(filter, update, options);
+  }
+  async updateMany(filter, update, options) {
+    return this.collection.updateMany(filter, update, options);
+  }
+  async replaceOne(filter, replacement, options) {
+    return this.collection.replaceOne(filter, replacement, options);
+  }
+  async deleteOne(filter, options) {
+    return this.collection.deleteOne(filter, options);
+  }
+  async deleteMany(filter, options) {
+    return this.collection.deleteMany(filter, options);
+  }
+  async findOneAndUpdate(filter, update, options) {
+    return this.collection.findOneAndUpdate(filter, update, options);
+  }
+  async findOneAndDelete(filter, options) {
+    return this.collection.findOneAndDelete(filter, options);
+  }
+  async findOneAndReplace(filter, replacement, options) {
+    return this.collection.findOneAndReplace(filter, replacement, options);
+  }
+  async countDocuments(filter, options) {
+    return this.collection.countDocuments(filter, options);
+  }
+  async estimatedDocumentCount() {
+    return this.collection.estimatedDocumentCount();
+  }
+  async distinct(field, filter, options) {
+    return this.collection.distinct(field, filter, options);
+  }
+  aggregate(pipeline, options) {
+    return this.collection.aggregate(pipeline, options);
+  }
+  async bulkWrite(operations, options) {
+    return this.collection.bulkWrite(operations, options);
+  }
+  async createIndex(indexSpec, options) {
+    return this.collection.createIndex(indexSpec, options);
+  }
+  async dropIndex(indexName, options) {
+    return this.collection.dropIndex(indexName, options);
+  }
+};
 
-// src/mongo/entity.ts
-function MongoEntity(input) {
-  const collection = input.adapter.collection(input.name);
-  return {
-    async insertOne(doc) {
-      const validated = input.model.parse(doc);
-      const result = await collection.insertOne(validated);
-      return { insertedId: result.insertedId };
-    },
-    async insertMany(docs) {
-      const validated = docs.map((d) => input.model.parse(d));
-      const result = await collection.insertMany(validated);
-      return { insertedIds: Object.values(result.insertedIds) };
-    },
-    async findOne(filter) {
-      const raw = await collection.findOne(filter);
-      return raw === null ? null : input.model.parse(raw);
-    },
-    async find(filter) {
-      const raw = await collection.find(filter);
-      return raw.map((r) => input.model.parse(r));
-    },
-    async updateOne(filter, update) {
-      const result = await collection.updateOne(filter, update);
-      return { matchedCount: result.matchedCount, modifiedCount: result.modifiedCount };
-    },
-    async updateMany(filter, update) {
-      const result = await collection.updateMany(filter, update);
-      return { matchedCount: result.matchedCount, modifiedCount: result.modifiedCount };
-    },
-    async deleteOne(filter) {
-      const result = await collection.deleteOne(filter);
-      return { deletedCount: result.deletedCount };
-    },
-    async deleteMany(filter) {
-      const result = await collection.deleteMany(filter);
-      return { deletedCount: result.deletedCount };
-    },
-    countDocuments: (filter) => collection.countDocuments(filter),
-    state: { name: input.name, adapter: input.adapter, model: input.model }
-  };
-}
+// src/entity/builder.ts
+var EntityBuilder;
+((EntityBuilder2) => {
+  function kv(builderInput) {
+    const adapter = builderInput.adapter();
+    const result = {
+      entity(entityInput) {
+        return new KvEntity(entityInput, adapter);
+      }
+    };
+    return result;
+  }
+  EntityBuilder2.kv = kv;
+  function mongo(builderInput) {
+    const db = builderInput.adapter();
+    const result = {
+      entity(entityInput) {
+        return new MongoEntity(entityInput, db);
+      }
+    };
+    return result;
+  }
+  EntityBuilder2.mongo = mongo;
+})(EntityBuilder || (EntityBuilder = {}));
 export {
-  KvAdapter,
+  EntityBuilder,
   KvEntity,
-  MongoAdapter,
   MongoEntity
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aromix/core",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "The Core Package For Aromix",
   "type": "module",
   "license": "MIT",
@@ -41,12 +41,19 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@aromix/validator": "^0.2.0"
+    "@aromix/validator": "^0.3.0",
+    "mongodb": "^7.3.0"
   },
   "devDependencies": {
-    "@aromix/validator": "^0.2.0",
+    "@aromix/validator": "^0.3.0",
     "@types/node": "^22.10.2",
+    "mongodb": "^7.3.0",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2"
+  },
+  "peerDependenciesMeta": {
+    "mongodb": {
+      "optional": true
+    }
   }
 }