neopg 2.0.9 → 2.2.0

package/README.cn.md

@@ -231,6 +231,9 @@ const db = new NeoPG(config)
 await db.loadModels('./models')
 
 
+//加载ESM模块
+await db.loadModels('./esmodels', 'esm')
+
 // 加载文件列表
 await db.loadFiles(['./models2/WxUser.js', './models2/Role.js'])
 

package/README.md

@@ -229,6 +229,9 @@ const db = new NeoPG(config)
 // This is asynchronous because it supports .mjs dynamic imports
 await db.loadModels('./models')
 
+//load esm modules
+await db.loadModels('./esmodels', 'esm')
+
 //load files
 await db.loadFiles(['./models2/WxUser.js', './models2/Role.js'])
 

package/lib/ModelChain.js

@@ -49,8 +49,13 @@ class ModelChain {
   _ensureActive() {
     if (this._executed) {
       throw new Error(
-        `[NeoPG] ModelChain for '${this.def.tableName}' has already been executed. ` +
-        `Do NOT reuse the chain variable. Use .clone() if you need to fork queries.`
+        `[NeoPG] Security Error: This query chain for \x1b[36m'${this.def.tableName}'\x1b[0m has already been executed to prevent state pollution.\n` +
+        `❌ Do NOT reuse the same variable for multiple executions.\n` +
+        `✅ If you need to execute multiple queries based on the same conditions, use .clone() before execution.\n\x1b[35m` +
+        `   Example: \n` +
+        `   const q = model.where(...);\n` +
+        `   const data = await q.clone().find();\n` +
+        `   await q.clone().update(...);\x1b[0m`
       )
     }
   }

package/lib/NeoPG.js

@@ -10,6 +10,7 @@ const dataTypes = require('./dataTypes.js')
 const path = require('node:path')
 const fs = require('node:fs')
 const { pathToFileURL } = require('node:url')
+const process = require('node:process')
 
 /**
  * 将下划线命名转换为大驼峰命名 (e.g. shop_order -> ShopOrder)
@@ -219,8 +220,9 @@ class NeoPG {
    * 3. 跳过以 '!' 开头的文件 (视为保留或禁用文件)
    * 
    * @param {string} dirPath - 目录路径 (相对 process.cwd() 或绝对路径)
+   * @param {stirng} modtype - 模块类型 cjs或esm
    */
-  async loadModels(dirPath) {
+  async loadModels(dirPath, modtype='cjs') {
     // 解析绝对路径
     const absPath = path.isAbsolute(dirPath) 
       ? dirPath 
@@ -244,7 +246,7 @@ class NeoPG {
       let modelExport
 
       try {
-        if (ext === '.mjs') {
+        if (ext === '.mjs' || modtype === 'esm') {
           // 处理 ESM 动态导入
           // Windows 下 import() 需要 file:// 协议路径
           const fileUrl = pathToFileURL(fullFilePath).href
@@ -278,9 +280,10 @@ class NeoPG {
 
   /**
    * 
-   * @param {array} mlist 
+   * @param {array} mlist - 文件列表
+   * @param {stirng} modtype - 模块类型 cjs或esm
    */
-  async loadFiles(mlist) {
+  async loadFiles(mlist, modtype='cjs') {
     if (typeof mlist === 'string') {
       mlist = [mlist]
     }
@@ -289,14 +292,17 @@ class NeoPG {
       throw new Error(`[NeoPG] mlist is not [string]`)
     }
 
+    let absPath
     let modelExport
 
     for (let m of mlist) {
-      if (m.endsWith('.mjs')) {
-        const imported = await import(m)
-        modelExport = imported.default 
+      absPath = path.isAbsolute(m) ? m : path.resolve(process.cwd(), m)
+
+      if (m.endsWith('.mjs') || modtype === 'esm') {
+        const imported = await import(pathToFileURL(absPath).href)
+        modelExport = imported.default
       } else if (m.endsWith('.js')) {
-        modelExport = require(m)
+        modelExport = require(absPath)
       } else {
         continue
       }

package/lib/TransactionScope.js

@@ -9,14 +9,24 @@ class TransactionScope {
 
   table(tableName, schema = null) {
     const target = schema || this.parent.defaultSchema
-    return new this.parent.ModelChain(this, {tableName, isRaw: true}, target)
+    let m = new this.parent.ModelChain(this, {tableName, isRaw: true}, target)
+    m._isRaw = true
+    return m
   }
 
   model(name, schema = null) {
     const item = this.parent.registry.get(name)
     if (!item) throw new Error(`[NeoPG] Model '${name}' not found.`)
     const target = schema || this.parent.defaultSchema
-    return new item.Class(this, item.def, target)
+    let m = new item.Class(this, item.def, target)
+    if (!m.def) {
+      m.def = item.def
+      m.ctx = this.parent
+      m.sql = this.sql
+      m.schema = target
+    }
+
+    return m
   }
 
   async transaction(callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neopg",
-  "version": "2.0.9",
+  "version": "2.2.0",
   "description": "orm for postgres",
   "keywords": [
     "neopg",