w-orm-postgresql 1.0.0 → 1.0.2

package/g-basic.mjs

@@ -1,5 +1,5 @@
-import wo from './src/WOrmPostgresql.mjs'
-//import wo from './dist/w-orm-postgresql.umd.js'
+import WOrm from './src/WOrmPostgresql.mjs'
+//import WOrm from './dist/w-orm-postgresql.umd.js'
 
 
 let opt = {
@@ -76,7 +76,7 @@ let rs = [
     },
 ]
 
-let rsm = [
+let rsm = [
     { //相同
         time: '2025-01-01T00:09:00Z',
         name: 'peter',
@@ -100,16 +100,23 @@ let rsm = [
     { //無time須新增且新增數據無value
         time: '2025-01-01T00:13:00Z',
         name: 'sandler',
-    },
-]
-
-async function test() {
+    },
+]
+
+let rsa = [
+    {
+        time: '2025-01-01T00:13:00Z',
+        name: 'sandler',
+    },
+]
+
+async function test() {
 
-    //w
-    let w = wo(opt)
-    // console.log('w', w)
+    //wo
+    let wo = WOrm(opt)
+    // console.log('wo', wo)
 
-    await w.createTable(opt.cl, 'time', {
+    await wo.createTable(opt.cl, 'time', {
         time: '2000-01-01T00:00:00Z', //time
         name: 'abc', //string
         value: 0.1, //float
@@ -122,12 +129,12 @@ async function test() {
         })
 
     //on
-    w.on('change', function(mode, data, res) {
+    wo.on('change', function(mode, data, res) {
         console.log('change', mode)
     })
 
     //delAll
-    await w.delAll()
+    await wo.delAll()
         .then(function(msg) {
             console.log('delAll then', msg)
         })
@@ -136,7 +143,7 @@ async function test() {
         })
 
     //insert
-    await w.insert(rs)
+    await wo.insert(rs)
         .then(function(msg) {
             console.log('insert then', msg)
         })
@@ -144,56 +151,66 @@ async function test() {
             console.log('insert catch', msg)
         })
 
-    //save
-    await w.save(rsm, { autoInsert: true })
-        .then(function(msg) {
-            console.log('save then', msg)
-        })
-        .catch(function(msg) {
-            console.log('save catch', msg)
-        })
-
-    //select all
-    let ss = await w.select()
-    console.log('select all', ss)
+    //save
+    await wo.save(rsm, { autoInsert: false })
+        .then(function(msg) {
+            console.log('save then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save catch', msg)
+        })
+
+    //select all
+    let ss = await wo.select()
+    console.log('select all', ss)
 
     //select
-    let so = await w.select({ name: 'rosemary' })
+    let so = await wo.select({ name: 'rosemary' })
     console.log('select by name', so)
 
     //select by $and, $gt, $lt
-    let spa = await w.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
+    let spa = await wo.select({ '$and': [{ value: { '$gt': 123 } }, { value: { '$lt': 200 } }] })
     console.log('select by $and, $gt, $lt', spa)
 
     //select by $or, $gte, $lte
-    let spb = await w.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
+    let spb = await wo.select({ '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 200 } }] })
     console.log('select by $or, $gte, $lte', spb)
 
     //select by $or, $and, $ne, $in, $nin
-    let spc = await w.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] })
+    let spc = await wo.select({ '$or': [{ '$and': [{ value: { '$ne': 123 } }, { value: { '$in': [123, 321, 123.456, 456] } }, { value: { '$nin': [456, 654] } }] }, { '$or': [{ value: { '$lte': -1 } }, { value: { '$gte': 400 } }] }] })
     console.log('select by $or, $and, $ne, $in, $nin', spc)
 
-    // //select by regex
-    // let sr = await w.select({ name: { $regex: 'PeT', $options: '$i' } })
-    // console.log('selectReg', sr)
-
-    //del
-    let d = {
-        time: '2024-01-01T00:00:00Z',
+    // //select by regex
+    // let sr = await wo.select({ name: { $regex: 'PeT', $options: '$i' } })
+    // console.log('selectReg', sr)
+
+    //save
+    await wo.save(rsa, { autoInsert: true })
+        .then(function(msg) {
+            console.log('save then', msg)
+        })
+        .catch(function(msg) {
+            console.log('save catch', msg)
+        })
+
+    //del
+    let d = {
+        time: '2024-01-01T00:00:00Z',
     }
-    await w.del(d)
+    await wo.del(d)
         .then(function(msg) {
             console.log('del then', msg)
         })
         .catch(function(msg) {
             console.log('del catch', msg)
-        })
-
-    //del
-    let ds = ss.filter(function(v) {
-        return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
-    })
-    await w.del(ds)
+        })
+
+    //del
+    let ssDel = await wo.select()
+    let ds = ssDel.filter(function(v) {
+        return v.name.indexOf('peter') >= 0 || v.name.indexOf('kettle') >= 0 || v.name.indexOf('sandler') >= 0
+    })
+    await wo.del(ds)
         .then(function(msg) {
             console.log('del then', msg)
         })
@@ -202,7 +219,7 @@ async function test() {
         })
 
     //select all final
-    let ss2 = await w.select()
+    let ss2 = await wo.select()
     console.log('select all final', ss2)
 
 }
@@ -213,13 +230,13 @@ test()
 // insert then { n: 13, nInserted: 13, ok: 1 }
 // change save
 // save then [
-//   { n: 1, nModified: 0, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nModified: 1, ok: 1 },
-//   { n: 1, nInserted: 1, ok: 1 }
-// ]
-// select all [
+//   { n: 1, nModified: 0, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 1, nModified: 1, ok: 1 },
+//   { n: 0, nModified: 0, ok: 1 }
+// ]
+// select all [
 //   { time: 2025-01-01T00:00:00.000Z, name: 'peter', value: 123 },
 //   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
 //   { time: 2025-01-01T00:02:00.000Z, name: 'kettle', value: 456 },
@@ -238,11 +255,10 @@ test()
 //   {
 //     time: 2025-01-01T00:11:00.000Z,
 //     name: 'kettle(modify)',
-//     value: 447
-//   },
-//   { time: 2025-01-01T00:12:00.000Z, name: 'peter', value: 99 },
-//   { time: 2025-01-01T00:13:00.000Z, name: 'sandler', value: null }
-// ]
+//     value: 447
+//   },
+//   { time: 2025-01-01T00:12:00.000Z, name: 'peter', value: 99 }
+// ]
 // select by name [
 //   { time: 2025-01-01T00:01:00.000Z, name: 'rosemary', value: 123.456 },
 //   { time: 2025-01-01T00:04:00.000Z, name: 'rosemary', value: 123.1236 },
@@ -274,11 +290,13 @@ test()
 //   {
 //     time: 2025-01-01T00:11:00.000Z,
 //     name: 'kettle(modify)',
-//     value: 447
-//   }
-// ]
-// change del
-// del then [ { n: 1, nDeleted: 0, ok: 1 } ]
+//     value: 447
+//   }
+// ]
+// change save
+// save then [ { n: 1, nInserted: 1, ok: 1 } ]
+// change del
+// del then [ { n: 1, nDeleted: 0, ok: 1 } ]
 // change del
 // del then [
 //   { n: 1, nDeleted: 1, ok: 1 },
@@ -303,4 +321,4 @@ test()
 //   }
 // ]
 
-//node --experimental-modules g-basic.mjs
+//node g-basic.mjs

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "w-orm-postgresql",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/w-orm-postgresql.umd.js",
   "dependencies": {
     "mongo-sql": "^6.2.0",
-    "pg": "^8.14.1",
-    "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.72"
+    "pg": "^8.20.0",
+    "lodash-es": "^4.18.1",
+    "wsemi": "^1.8.52"
   },
   "devDependencies": {
-    "w-package-tools": "^1.0.82"
+    "w-package-tools": "^1.1.5"
   },
   "scripts": {
-    "test": "mocha --parallel --timeout 60000 --experimental-modules",
+    "test": "mocha --parallel --timeout 60000",
     "deploy": "gh-pages -d docs"
   },
   "repository": {

package/script.txt

@@ -1,10 +1,10 @@
-#node --experimental-modules toolg/addVersion.mjs
-node --experimental-modules toolg/modifyReadme.mjs
+#node toolg/addVersion.mjs
+node toolg/modifyReadme.mjs
 
-node --experimental-modules toolg/cleanFolder.mjs
+node toolg/cleanFolder.mjs
 ./node_modules/.bin/jsdoc -c .jsdoc
 
-node --experimental-modules toolg/gDistRollup.mjs
+node toolg/gDistRollup.mjs
 
 git add .  -A
 git commit -m 'modify: '
@@ -15,4 +15,3 @@ npm run deploy
 #npm test
 
 #npm publish
-