neopg 2.0.8 → 2.1.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

@@ -6,13 +6,13 @@ const serialId = makeId.serialId
 
 // 提取常量定义
 const INT_TYPES = new Set([
-    'int', 'integer', 'smallint', 'bigint', 
+    'int', 'integer', 'smallint', 'bigint',
     'serial', 'bigserial', 'smallserial',
     'int2', 'int4', 'int8'
 ])
 
 const FLOAT_TYPES = new Set([
-    'float', 'double', 'numeric', 'decimal', 'real', 
+    'float', 'double', 'numeric', 'decimal', 'real',
     'money', 'double precision', 'float4', 'float8'
 ])
 
@@ -65,13 +65,13 @@ class ModelChain {
   clone() {
     this._ensureActive()
     const copy = new ModelChain(this.ctx, this.def, this.schema)
-    
+
     // 拷贝状态
     copy._conditions = [...this._conditions]
     copy._joins = [...this._joins]
     copy._group = [...this._group]
     copy._order = [...this._order]
-    
+
     copy._limit = this._limit
     copy._offset = this._offset
     copy._lock = this._lock
@@ -180,7 +180,7 @@ class ModelChain {
         this._conditions.push(arg1)
         return this
       }
-      
+
       if (typeof arg1 === 'object' && !Array.isArray(arg1)) {
         for (const k of Object.keys(arg1)) {
           const v = arg1[k]
@@ -266,8 +266,10 @@ class ModelChain {
 
   _buildSelectQuery() {
     const t = this.sql(this.def.tableName)
-    const c = this._columns ? this.sql(this._columns) : this.sql`*`
-    
+    const c = this._columns
+              ? ((this._columns.length===1 && this._columns[0] === '*') ? this.sql`*` : this.sql(this._columns))
+              : this.sql`*`
+
     const w = this._buildWhere()
     const o = this._buildOrder()
     const j = this._buildJoins()
@@ -277,7 +279,7 @@ class ModelChain {
     const off = this._offset ? this.sql`OFFSET ${this._offset}` : this.sql``
     const lck = this._lock || this.sql``
     const ft = this.sql`${this.sql(this.schema)}.${t}`
-    
+
     return this.sql`SELECT ${c} FROM ${ft} ${j} ${w} ${g} ${o} ${l} ${off} ${lck}`
   }
 
@@ -314,7 +316,7 @@ class ModelChain {
       const j = this._buildJoins()
       const g = this._buildGroup()
       const ft = this.sql`${this.sql(this.schema)}.${t}`
-      
+
       let countPromise
 
       if (this._group.length > 0) {
@@ -342,7 +344,7 @@ class ModelChain {
       const j = this._buildJoins()
       const g = this._buildGroup()
       const ft = this.sql`${this.sql(this.schema)}.${t}`
-      
+
       let query;
       if (this._group.length > 0) {
         query = this.sql`SELECT count(*) as total FROM (SELECT 1 FROM ${ft} ${j} ${w} ${g}) as temp`
@@ -388,17 +390,17 @@ class ModelChain {
     this._ensureActive()
     try {
       if (!data || Object.keys(data).length === 0) throw new Error('[NeoPG] Update data cannot be empty')
-      
+
         if (!this._isRaw) {
         this._prepareDataForUpdate(data)
       }
 
       if (this._conditions.length === 0) throw new Error('[NeoPG] UPDATE requires a WHERE condition')
-      
+
       const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.def.tableName)}`
       const whereFragment = this._buildWhere()
       const retFragment = this._buildReturning()
-      
+
       const result = await this.sql`UPDATE ${fullTable} SET ${this.sql(data)} ${whereFragment} ${retFragment}`
 
       if (this._returning && this._returning.length > 0) {
@@ -418,7 +420,7 @@ class ModelChain {
       const fullTable = this.sql`${this.sql(this.schema)}.${this.sql(this.def.tableName)}`
       const whereFragment = this._buildWhere()
       const retFragment = this._buildReturning()
-        
+
       return await this.sql`DELETE FROM ${fullTable} ${whereFragment} ${retFragment}`
     } finally {
       this._destroy()
@@ -450,9 +452,9 @@ class ModelChain {
         } else {
             colFragment = this.sql(field)
         }
-        
+
         const query = this.sql`
-            SELECT ${this.sql.unsafe(func)}(${colFragment}) as val 
+            SELECT ${this.sql.unsafe(func)}(${colFragment}) as val
             FROM ${ft} ${j} ${w}
         `
 
@@ -558,4 +560,4 @@ class ModelChain {
   }
 }
 
-module.exports = ModelChain
+module.exports = ModelChain

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/package.json

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

package/test/test-db.js

@@ -258,7 +258,7 @@ db.add(User)
     console.log('update', data)
 
     let result = await tx.model('User').where(tx.sql`level > 10`).returning('*').update(data)
-    console.log(result)
+    console.log('test update returning *', result)
 
     let sex = 3
     console.log(
@@ -266,6 +266,16 @@ db.add(User)
       await tx.model('User').where(tx.sql`(sex = ${sex} or level > 10)`).select(['id', 'level', 'username', 'sex']).find()
     )
 
+    console.log(
+      'test select *',
+      await tx.model('User').select().find()
+    )
+
+    console.log(
+      'test select * count',
+      await tx.model('User').select('*').findAndCount()
+    )
+
     console.log(
       'test avg',
       await tx.model('User').avg('level')
@@ -304,4 +314,4 @@ db.add(User)
   })
 
   db.close()
-})();
+})();