@alpha.consultings/eloquent-orm.js 1.0.10 → 1.1.0

package/esm/Factory.mjs

@@ -1,143 +1,120 @@
-import { faker } from "@faker-js/faker";
-
-export class Factory {
-  faker = faker;
-
-  async create(attrs = {}, index = 0) {
-    const base = this.definition(index);
-    const merged = { ...base, ...attrs };
-
-    if (this.beforeCreate) {
-      const modified = await this.beforeCreate(merged, index);
-      if (modified && typeof modified === "object") {
-        Object.assign(merged, modified);
-      }
-    }
-
-    let instance = new this.model();
-
-    if (this.#hasInstanceCreate(instance)) {
-      const created = await instance.create(merged);
-      if (created) {
-        instance = created;
-      }
-    } else if (this.#hasStaticCreate(this.model)) {
-      return this.model.create(merged);
-    } else if (this.#hasInstanceSave(instance)) {
-      Object.assign(instance, merged);
-      await instance.save();
-    } else {
-      throw new Error(`Model '${this.model.name}' has no valid create/save method.`);
+import { createRequire } from "node:module";
+const require = createRequire(import.meta.url);
+let cachedFaker;
+function getFaker() {
+    if (!cachedFaker) {
+        cachedFaker = require("@faker-js/faker").faker;
     }
-
-    if (this.afterCreate) {
-      await this.afterCreate(instance);
-    }
-
-    return instance;
-  }
-
-  async createMany(count, callback, concurrency = 1) {
-    const results = [];
-
-    const executeCreate = async (index) => {
-      const model = await this.create({}, index);
-      if (callback) {
-        await callback(model, index);
-      }
-      results[index] = model;
-    };
-
-    if (concurrency <= 1) {
-      for (let index = 0; index < count; index += 1) {
-        await executeCreate(index);
-      }
-      return results;
+    return cachedFaker;
+}
+export class Factory {
+    get faker() {
+        return getFaker();
     }
-
-    let active = 0;
-    let index = 0;
-    let settled = false;
-
-    return new Promise((resolve, reject) => {
-      const maybeResolve = () => {
-        if (!settled && index >= count && active === 0) {
-          settled = true;
-          resolve(results);
+    async create(attrs = {}, index = 0) {
+        const base = this.definition(index);
+        const merged = { ...base, ...attrs };
+        if (this.beforeCreate) {
+            const modified = await this.beforeCreate(merged, index);
+            if (modified && typeof modified === "object") {
+                Object.assign(merged, modified);
+            }
+        }
+        let instance = new this.model();
+        if (this.hasInstanceCreate(instance)) {
+            const created = await instance.create(merged);
+            if (created) {
+                instance = created;
+            }
+        }
+        else if (this.hasStaticCreate(this.model)) {
+            return this.model.create(merged);
+        }
+        else if (this.hasInstanceSave(instance)) {
+            Object.assign(instance, merged);
+            await instance.save();
         }
-      };
-
-      const next = () => {
-        if (settled) {
-          return;
+        else {
+            throw new Error(`Model '${this.model.name}' has no valid create/save method.`);
         }
-
-        while (active < concurrency && index < count && !settled) {
-          const currentIndex = index++;
-          active += 1;
-
-          void executeCreate(currentIndex)
-            .catch((error) => {
-              if (settled) {
-                return;
-              }
-              settled = true;
-              reject(error);
-            })
-            .finally(() => {
-              active -= 1;
-              if (settled) {
-                return;
-              }
-              next();
-            });
+        if (this.afterCreate) {
+            await this.afterCreate(instance);
         }
-
-        maybeResolve();
-      };
-
-      next();
-    });
-  }
-
-  async related(factoryOrCtor, count = 1) {
-    const factory =
-      typeof factoryOrCtor === "function"
-        ? new factoryOrCtor()
-        : factoryOrCtor;
-
-    if (count === 1) {
-      return factory.create();
+        return instance;
+    }
+    async createMany(count, callback, concurrency = 1) {
+        const results = [];
+        const executeCreate = async (itemIndex) => {
+            const model = await this.create({}, itemIndex);
+            if (callback) {
+                await callback(model, itemIndex);
+            }
+            results[itemIndex] = model;
+        };
+        if (concurrency <= 1) {
+            for (let itemIndex = 0; itemIndex < count; itemIndex += 1) {
+                await executeCreate(itemIndex);
+            }
+            return results;
+        }
+        let active = 0;
+        let itemIndex = 0;
+        let settled = false;
+        return new Promise((resolve, reject) => {
+            const maybeResolve = () => {
+                if (!settled && itemIndex >= count && active === 0) {
+                    settled = true;
+                    resolve(results);
+                }
+            };
+            const next = () => {
+                if (settled) {
+                    return;
+                }
+                while (active < concurrency && itemIndex < count && !settled) {
+                    const currentIndex = itemIndex++;
+                    active += 1;
+                    void executeCreate(currentIndex)
+                        .catch((error) => {
+                        if (settled) {
+                            return;
+                        }
+                        settled = true;
+                        reject(error);
+                    })
+                        .finally(() => {
+                        active -= 1;
+                        if (settled) {
+                            return;
+                        }
+                        next();
+                    });
+                }
+                maybeResolve();
+            };
+            next();
+        });
+    }
+    async related(factoryOrCtor, count = 1) {
+        const factory = typeof factoryOrCtor === "function"
+            ? new factoryOrCtor()
+            : factoryOrCtor;
+        if (count === 1) {
+            return factory.create();
+        }
+        return factory.createMany(count);
+    }
+    async relatedPivot(factory, pivotTable, foreignKey, relatedKey, foreignId, relatedIds, extraPivotAttrs) {
+        await factory.createPivot(foreignId, relatedIds, extraPivotAttrs);
+        console.log(`[Pivot Attached] Table "${pivotTable}" (${foreignKey} -> ${relatedKey})`);
+    }
+    hasInstanceCreate(obj) {
+        return typeof obj.create === "function";
+    }
+    hasStaticCreate(ctor) {
+        return typeof ctor.create === "function";
+    }
+    hasInstanceSave(obj) {
+        return typeof obj.save === "function";
     }
-
-    return factory.createMany(count);
-  }
-
-  async relatedPivot(
-    factory,
-    pivotTable,
-    foreignKey,
-    relatedKey,
-    foreignId,
-    relatedIds,
-    extraPivotAttrs
-  ) {
-    await factory.createPivot(foreignId, relatedIds, extraPivotAttrs);
-
-    console.log(
-      `[Pivot Attached] Table "${pivotTable}" (${foreignKey} -> ${relatedKey})`
-    );
-  }
-
-  #hasInstanceCreate(obj) {
-    return typeof obj?.create === "function";
-  }
-
-  #hasStaticCreate(ctor) {
-    return typeof ctor?.create === "function";
-  }
-
-  #hasInstanceSave(obj) {
-    return typeof obj?.save === "function";
-  }
 }

package/esm/Model.mjs

@@ -0,0 +1,4 @@
+import cjsModelPackage from "../dist/Model.js";
+const { SqlModel, MongoModel, } = cjsModelPackage;
+export { SqlModel, MongoModel, };
+export default cjsModelPackage;

package/esm/index.mjs

@@ -1,32 +1,27 @@
 import cjsPackage from "../dist/index.js";
 import { Factory } from "./Factory.mjs";
-
-export { Factory };
-
-export const {
-  BaseModel,
-  Model,
-  SqlModel,
-  MongoModel,
-  MorphRegistry,
-  PivotHelperMixin,
-  CoreModel,
-  column,
-  validate,
-  relation,
-  mixin,
-  validateSchema,
-  SchemaValidator,
-  SchemaBuilder,
-  CacheManager,
-  setupCache,
-  registerModels,
-  isModelRegistered,
-  setModelRegistryStrictMode,
-  isModelRegistryStrictMode,
-} = cjsPackage;
-
+const { BaseModel, Model, SqlModel, MongoModel, MorphRegistry, PivotHelperMixin, CoreModel, column, validate, relation, mixin, validateSchema, SchemaValidator, SchemaBuilder, CacheManager, setupCache, registerModels, isModelRegistered, setModelRegistryStrictMode, isModelRegistryStrictMode, } = cjsPackage;
+export { BaseModel, Model, SqlModel, MongoModel, MorphRegistry, PivotHelperMixin, CoreModel, column, validate, relation, mixin, validateSchema, SchemaValidator, SchemaBuilder, CacheManager, setupCache, registerModels, isModelRegistered, setModelRegistryStrictMode, isModelRegistryStrictMode, Factory, };
 export default {
-  ...cjsPackage,
-  Factory,
+    BaseModel,
+    Model,
+    SqlModel,
+    MongoModel,
+    MorphRegistry,
+    PivotHelperMixin,
+    CoreModel,
+    column,
+    validate,
+    relation,
+    mixin,
+    validateSchema,
+    SchemaValidator,
+    SchemaBuilder,
+    CacheManager,
+    setupCache,
+    registerModels,
+    isModelRegistered,
+    setModelRegistryStrictMode,
+    isModelRegistryStrictMode,
+    Factory,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alpha.consultings/eloquent-orm.js",
-  "version": "1.0.10",
+  "version": "1.1.0",
   "description": "A Laravel Eloquent-inspired ORM Multi Driver SQL & NoSQL and Cache System and Artisan CLI like for Node.js Lovers",
   "keywords": [
     "orm",
@@ -58,8 +58,9 @@
     },
     "./Model": {
       "types": "./dist/Model.d.ts",
+      "import": "./esm/Model.mjs",
       "require": "./dist/Model.js",
-      "default": "./dist/Model.js"
+      "default": "./esm/Model.mjs"
     },
     "./package.json": "./package.json"
   },
@@ -78,9 +79,11 @@
     "docs:sync-package-metadata": "node scripts/sync-package-metadata.cjs",
     "docs:sync-supported": "node scripts/sync-supported-versions.cjs",
     "docs:sync-config": "node scripts/sync-mintlify-configs.cjs",
-    "clean": "node -e \"require('fs').rmSync('dist', { recursive: true, force: true })\"",
-    "build": "npm run docs:sync-package-metadata && npm run docs:sync-supported && npm run clean && tsc -p tsconfig.build.json && node scripts/patch-dist-cjs-factory-entry.cjs",
+    "audit:nodenext-blockers": "node scripts/generate-nodenext-blocker-inventory.cjs",
+    "clean": "node -e \"const fs=require('fs'); fs.rmSync('dist', { recursive: true, force: true }); fs.rmSync('esm', { recursive: true, force: true })\"",
+    "build": "npm run docs:sync-package-metadata && npm run docs:sync-supported && npm run clean && tsc -p tsconfig.build.json && tsc -p tsconfig.esm.json && node scripts/patch-dist-cjs-factory-entry.cjs",
     "typecheck": "tsc -p . --noEmit --skipLibCheck",
+    "typecheck:nodenext": "tsc -p . --noEmit --skipLibCheck",
     "docs:dev": "npm run docs:sync-package-metadata && npm run docs:sync-config && node scripts/run-mintlify.cjs dev",
     "docs:build": "npm run docs:sync-package-metadata && npm run docs:sync-supported && npm run docs:sync-config && node scripts/run-mintlify.cjs validate",
     "docs:validate": "npm run docs:sync-package-metadata && npm run docs:sync-supported && npm run docs:sync-config && node scripts/run-mintlify.cjs validate",
@@ -91,7 +94,8 @@
     "coverage:misses": "npm run test:coverage && node scripts/coverage-misses.cjs",
     "test:critical": "jest --runInBand src/lab_test/cli.integration.scenario.lifecycle.test.ts src/lab_test/cli.integration.make-migration.targeting.test.ts src/lab_test/cli.integration.migrate.targeting.test.ts src/lab_test/cli.integration.seed-and-demo.targeting.test.ts src/lab_test/cli.integration.factory-status.targeting.test.ts src/lab_test/migration.tracker.logic.test.ts src/lab_test/cache.commands.logic.test.ts",
     "test:pack-smoke": "npm run build && node scripts/pack-smoke.js",
-    "test:pack-smoke:docker": "docker compose -f docker-compose.coverage-debug.yml run --rm pack-smoke",
+    "test:coverage:docker": "docker compose -f docker-compose.coverage-debug.yml build --no-cache coverage-debug && docker compose -f docker-compose.coverage-debug.yml run --rm coverage-debug",
+    "test:pack-smoke:docker": "docker compose -f docker-compose.coverage-debug.yml build --no-cache pack-smoke && docker compose -f docker-compose.coverage-debug.yml run --rm pack-smoke",
     "dev": "ts-node src/index.ts",
     "cli": "ts-node bin/eloquent.ts",
     "release": "npm run docs:sync-package-metadata && npm run docs:sync-supported && semantic-release"
@@ -128,5 +132,10 @@
     "jest": "^30.2.0",
     "semantic-release": "^24.2.9",
     "ts-jest": "^29.4.5"
+  },
+  "overrides": {
+    "@mintlify/link-rot": {
+      "@mintlify/scraping": "4.0.688"
+    }
   }
 }

package/src/cli/templates/factory.tpl

@@ -1,5 +1,5 @@
 import { Factory } from "{{packageImportPath}}";
-import { {{ModelName}} } from "../../models/{{ModelName}}";
+import { {{ModelName}} } from "{{modelImportPath}}";
 
 export class {{FactoryName}} extends Factory<{{ModelName}}> {
   model = {{ModelName}};

package/src/cli/templates/seed.tpl

@@ -5,7 +5,7 @@
  * Created at: {{Timestamp}}
  */
 
-import { {{FactoryName}} } from "../factories/{{FactoryName}}";
+import { {{FactoryName}} } from "{{factoryImportPath}}";
 
 export async function {{SeederName}}() {
   console.log("Running seeder: {{SeederName}}");