w-web-api 1.0.2 → 1.0.5

package/docs/WWebApi.html

@@ -71,7 +71,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WWebApi.mjs.html">WWebApi.mjs</a>, <a href="WWebApi.mjs.html#line36">line 36</a>
+        <a href="WWebApi.mjs.html">WWebApi.mjs</a>, <a href="WWebApi.mjs.html#line64">line 64</a>
     </li></ul></dd>
     
 
@@ -124,7 +124,7 @@
 
     <h5>Example</h5>
     
-    <pre class="prettyprint"><code></code></pre>
+    <pre class="prettyprint"><code>import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs' //自行選擇引用ORM, 使用Mongodb測試
    getUserById: null,
    bCheckUser: false,
    bExcludeWhenNotAdmin: false,
    serverPort: 11005,
    webName: {
        'eng': 'API Service',
        'cht': 'API管理系統'
    },
    .catch((err) => {
        console.log(err)
    })</code></pre>
 
 
 
@@ -604,7 +604,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 13:48:44 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 14:36:03 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebApi.mjs.html

@@ -74,7 +74,35 @@ import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
  * @example
  *
-
+ * import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs' //自行選擇引用ORM, 使用Mongodb測試
+ * import getSettings from './server/getSettings.mjs'
+ * import WWebApi from './server/WWebApi.mjs'
+ *
+ * //st
+ * let st = getSettings()
+ *
+ * let url = `mongodb://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}` //使用Mongodb測試
+ * let db = st.dbName
+ * let opt = {
+ *
+ *     getUserById: null,
+ *     bCheckUser: false,
+ *     bExcludeWhenNotAdmin: false,
+ *
+ *     serverPort: 11005,
+ *
+ *     webName: {
+ *         'eng': 'API Service',
+ *         'cht': 'API管理系統'
+ *     },
+ *
+ * }
+ *
+ * //WWebApi
+ * WWebApi(url, db, WOrm, opt)
+ *     .catch((err) => {
+ *         console.log(err)
+ *     })
  *
  */
 async function WWebApi(url, db, WOrm, opt = {}) {
@@ -217,6 +245,7 @@ async function WWebApi(url, db, WOrm, opt = {}) {
     if (fsIsFolder(npmPathStaticFiles)) {
         pathStaticFiles = npmPathStaticFiles
     }
+    // console.log('pathStaticFiles', pathStaticFiles)
 
 
     //apis
@@ -317,6 +346,7 @@ async function WWebApi(url, db, WOrm, opt = {}) {
         },
         hookBefores: null,
         hookAfters: null,
+        fnTableTags: 'tableTags-web-api.json',
     })
 
 
@@ -339,7 +369,7 @@ export default WWebApi
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 13:48:44 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 14:36:02 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -68,7 +68,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 13:48:44 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.10</a> on Thu Apr 14 2022 14:36:03 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "w-web-api",
-  "version": "1.0.2",
-  "description": "",
+  "version": "1.0.5",
   "main": "dist/w-web-api.umd.js",
   "dependencies": {
     "@mdi/js": "^6.6.96",
@@ -10,7 +9,7 @@
     "w-component-vue": "^2.2.6",
     "w-data-collector": "^1.0.13",
     "w-orm-mongodb": "^1.1.26",
-    "w-serv-hapi": "^1.0.5",
+    "w-serv-hapi": "^1.0.6",
     "w-serv-orm": "^1.0.0",
     "wsemi": "^1.6.55"
   },
@@ -40,8 +39,9 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "test": "mocha --parallel --timeout 60000 --experimental-modules --es-module-specifier-resolution=node",
     "lint": "vue-cli-service lint",
-    "start": "node --experimental-modules --es-module-specifier-resolution=node server/srv.mjs"
+    "deploy": "gh-pages -d docs"
   },
   "eslintConfig": {
     "root": true,
@@ -66,16 +66,9 @@
     "url": "https://github.com/yuda-lyu/w-web-api"
   },
   "keywords": [
-    "lodash",
-    "color",
-    "crypto",
-    "fuzzy",
-    "xss",
-    "xlsx",
-    "tool",
-    "package ",
-    "browser",
-    "developer"
+    "web",
+    "service",
+    "api"
   ],
   "author": "yuda-lyu(semisphere)",
   "license": "MIT"

package/server/WWebApi.mjs

@@ -30,7 +30,35 @@ import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
  * @example
  *
-
+ * import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs' //自行選擇引用ORM, 使用Mongodb測試
+ * import getSettings from './server/getSettings.mjs'
+ * import WWebApi from './server/WWebApi.mjs'
+ *
+ * //st
+ * let st = getSettings()
+ *
+ * let url = `mongodb://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}` //使用Mongodb測試
+ * let db = st.dbName
+ * let opt = {
+ *
+ *     getUserById: null,
+ *     bCheckUser: false,
+ *     bExcludeWhenNotAdmin: false,
+ *
+ *     serverPort: 11005,
+ *
+ *     webName: {
+ *         'eng': 'API Service',
+ *         'cht': 'API管理系統'
+ *     },
+ *
+ * }
+ *
+ * //WWebApi
+ * WWebApi(url, db, WOrm, opt)
+ *     .catch((err) => {
+ *         console.log(err)
+ *     })
  *
  */
 async function WWebApi(url, db, WOrm, opt = {}) {
@@ -173,6 +201,7 @@ async function WWebApi(url, db, WOrm, opt = {}) {
     if (fsIsFolder(npmPathStaticFiles)) {
         pathStaticFiles = npmPathStaticFiles
     }
+    // console.log('pathStaticFiles', pathStaticFiles)
 
 
     //apis
@@ -273,6 +302,7 @@ async function WWebApi(url, db, WOrm, opt = {}) {
         },
         hookBefores: null,
         hookAfters: null,
+        fnTableTags: 'tableTags-web-api.json',
     })
 
 

package/srv.mjs

@@ -1,4 +1,4 @@
-import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs'
+import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs' //自行選擇引用ORM, 使用Mongodb測試
 import getSettings from './server/getSettings.mjs'
 import WWebApi from './server/WWebApi.mjs'
 
@@ -6,7 +6,7 @@ import WWebApi from './server/WWebApi.mjs'
 //st
 let st = getSettings()
 
-let url = `mongodb://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}`
+let url = `mongodb://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}` //使用Mongodb測試
 let db = st.dbName
 let opt = {
 

package/tableTags-web-api.json

@@ -0,0 +1 @@
+{"apis":"c36gPY"}

package/toolg/gDistRollup.mjs

@@ -1,12 +1,14 @@
-import rollupFiles from 'w-package-tools/src/rollupFiles.mjs'
+// import rollupFiles from 'w-package-tools/src/rollupFiles.mjs'
+import rollupFile from 'w-package-tools/src/rollupFile.mjs' //因只有1檔案且不需刪除dsit故改用rollupFile
 
 
 let fdSrc = './server' //'./src'
 let fdTar = './dist'
 
 
-rollupFiles({
-    fns: ['WWebApi.mjs'],
+rollupFile({
+    // fns: ['WWebApi.mjs'],
+    fn: 'WWebApi.mjs',
     fdSrc,
     fdTar,
     nameDistType: 'kebabCase',

package/tableTags.json

@@ -1 +0,0 @@
-{"apis":"gertCD"}