tablevu 0.2.22 → 0.3.0-beta.1

package/package.json

@@ -1,34 +1,53 @@
 {
 	"name": "tablevu",
-	"version": "0.2.22",
-	"description": "vue 3 data table",
-	"main": "index.js",
-	"directories": {
-		"dist": "dist"
+	"version": "0.3.0-beta.1",
+	"type": "module",
+	"description": "Vue 3 data table component",
+	"main": "dist/tablevu-index.umd.cjs.js",
+	"module": "dist/tablevu-index.esm.js",
+	"types": "dist/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./dist/tablevu-index.esm.js",
+			"require": "./dist/tablevu-index.umd.cjs.js",
+			"types": "./dist/index.d.ts"
+		},
+		"./table": {
+			"import": "./dist/tablevu-table.esm.js",
+			"require": "./dist/tablevu-table.umd.cjs.js",
+			"types": "./dist/table.d.ts"
+		},
+		"./odata": {
+			"import": "./dist/tablevu-odata.esm.js",
+			"require": "./dist/tablevu-odata.umd.cjs.js",
+			"types": "./dist/odata.d.ts"
+		},
+		"./webapi": {
+			"import": "./dist/tablevu-webapi.esm.js",
+			"require": "./dist/tablevu-webapi.umd.cjs.js",
+			"types": "./dist/webapi.d.ts"
+		}
 	},
+	"files": ["dist"],
 	"scripts": {
-		"build": "echo \"Error: no build specified\" && exit 1",
+		"build": "rollup -c",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/endb/tablevu.git"
-	},
-	"keywords": [
-		"table",
-		"datatable",
-		"vue3 table",
-		"vue3 datatable",
-		"vue 3 table",
-		"vue 3 datatable"
-	],
-	"author": "endb <ender.boz@gmail.com>",
+	"keywords": ["table", "datatable", "vue3 table", "vue3 datatable", "vue 3 table", "vue 3 datatable"],
+	"author": "Ender Boz <ender.boz@gmail.com>",
 	"license": "MIT",
-	"bugs": {
-		"url": "https://github.com/endb/tablevu/issues"
-	},
+	"repository": { "type": "git", "url": "git+https://github.com/endb/tablevu.git" },
+	"bugs": { "url": "https://github.com/endb/tablevu/issues" },
 	"homepage": "https://github.com/endb/tablevu#readme",
+	"dependencies": { "vue": ">=3.0.0" },
 	"devDependencies": {
-		"vue": ">=3.0.0"
+		"@rollup/plugin-typescript": "^12.3.0",
+		"@types/node": "^20.14.2",
+		"@vitejs/plugin-vue": "^6.0.9",
+		"rollup": "^4.20.0",
+		"rollup-plugin-visualizer": "^5.12.0",
+		"rollup-plugin-vue": "^6.0.0",
+		"tslib": "^2.8.1",
+		"typescript": "^5.5.0"
 	}
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Ender Boz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/array.js

@@ -1 +0,0 @@
-export default function(props,data){let d=[];if(Array.isArray(data))d=data;return new Promise((resolve,reject)=>{if(props.pageSize){d=d.slice((props.currPage-1)*props.pageSize,props.currPage*props.pageSize)}if(props.sort&&props.sort.length>0){for(let i=props.sort.length-1;i>=0;i--){let f=null;if(props.sort[i].index>-1)f=props.cols[props.sort[i].index].name;else f=props.sort[i].name;if(props.sort[i].dir=="desc")d.sort((a,b)=>a[f]<b[f]?1:b[f]<a[f]?-1:0);else d.sort((a,b)=>a[f]>b[f]?1:b[f]>a[f]?-1:0)}}resolve({rows:d,count:d.length})})}

package/dist/get.js

@@ -1 +0,0 @@
-export default function get(req){return new Promise((resolve,reject)=>{fetch(req).then(res=>res.json()).then(res=>{let r;let c=0;if(res){if(res.hasOwnProperty("value"))r=res.value;else r=res;if(res.hasOwnProperty("@odata.count")){c=parseInt(res["@odata.count"])}else if(res.hasOwnProperty("count"))c=parseInt(res["count"]);else c=0;resolve({rows:r,count:c})}else resolve({rows:null,count:null})}).catch(err=>{console.error(err);reject(err)})})}

package/dist/odata.js

@@ -1 +0,0 @@
-import get from"./get.js";function filter(q){function fuval(q){if(q===null){return"null"}else if(typeof q==="string"){if(q.length==10&&q[4]=="-"&&q[7]=="-"&&Date.parse(q)){return q}else return"'"+q+"'"}else{if(typeof q==="number"||typeof q==="boolean")return q.toString();else{if(q.getMonth&&typeof q.getMonth==="function")return q.toISOString();else return q.func+"("+q.params.join(",")+")"}}}let s="";if(q&&q.filters)for(let i=0;i<q.filters.length;i++){if(i>0)s=s+` ${q.type||"and"} `;if(q.filters[i].child){if(q.filters[i].operator=="any"||q.filters[i].operator=="all"){s=s+q.filters[i].child+"/"+q.filters[i].operator+"(i:"+filter(q.filters[i],"i")+")"}}else if(q.filters[i].column){if(q.filters[i].operator=="in")s=s+fuval(q.filters[i].value)+" "+q.filters[i].operator+" "+q.filters[i].column;else s=s+q.filters[i].column+" "+q.filters[i].operator+" "+fuval(q.filters[i].value)}else{if(q.filters[i].func)s=s+q.filters[i].func+"("+q.filters[i].params.map(m=>fuval(m)).join(",")+")";else if(q.filters[i])s=s+"("+filter(q.filters[i])+")"}}return s}function sefs(url,query,seperator){let r="";if(query.select&&query.select.length>0){if(seperator)r+="$select="+query.select.join(",");else url.searchParams.append("$select",query.select.join(","))}if(query.expand&&query.expand.length>0){let a=[];query.expand.forEach(e=>{let q=sefs(null,e,";");if(q)a.push(e.name+"("+q+")");else a.push(e.name)});if(seperator)r+=(r.length>0?seperator:"")+"$expand="+a.join(",");else url.searchParams.append("$expand",a.join(","))}if(query.orderby){if(seperator)r+="$orderby="+query.orderby;else url.searchParams.append("$orderby",query.orderby)}if(query.top&&parseInt(query.top)>=0){if(seperator)r+="$top="+query.top;else url.searchParams.append("$top",query.top)}if(query.skip&&parseInt(query.skip)>=0){if(seperator)r+="$skip="+query.skip;else url.searchParams.append("$skip",query.skip)}if(query.count){if(seperator)r+="$count=true";else url.searchParams.append("$count",true)}return r}export default class odata{constructor(req,features){this.adapter=props=>{const u=new URL(req.url);if(props.pageSize){u.searchParams.append("$skip",props.pageSize*(props.currPage-1));u.searchParams.append("$top",props.pageSize)}sefs(u,features);let f=[];if(features.filter){if(typeof features.filter=="string")f.push(features.filter);else if(Object.prototype.hasOwnProperty.call(features.filter,"filters")){let l=filter(features.filter);if(l)f.push(l)}}if(props.filter){if(typeof props.filter=="string")f.push(props.filter);else if(props.filter&&Object.prototype.hasOwnProperty.call(props.filter,"filters")){let l=filter(props.filter);if(l)f.push(l)}}if(props.search){let l=props.cols.filter(q=>q.searchable==undefined||q.searchable==true).map(q=>"contains("+q.name.replaceAll(".","/")+",'"+props.search+"')").join(" or ");if(l)f.push("("+l+")")}if(f&&f.length>0)u.searchParams.append("$filter",f.join(" and "));if(props.sort&&props.sort.length>0)u.searchParams.append("$orderby",props.sort.map(m=>{let n={index:-1,name:"",dir:null};if(Object.prototype.hasOwnProperty.call(m,"index")){n.index=m.index}else{n.name=m.name}n.dir=m.dir;return n}).map(m=>{return(m.index>-1?props.cols[m.index].name:m.name).replaceAll(".","/")+(m.dir?" "+m.dir:"")}).join(","));let r=null;if(features&&features.onfetch&&typeof features.onfetch=="function")r=features.onfetch(new Request(u,req));else r=new Request(u,req);return get(r)}}}

package/dist/table.js

@@ -1 +0,0 @@
-import{h,onMounted,reactive,ref,watch,isReactive,isRef}from"vue";import adaptarr from"./array.js";const tablevuStatuses={Error:-1,Ready:0,Loading:1};const tablevu={props:{settings:{type:Object,default:null},data:{type:[Array,Function]},group:{type:[String,Object]},search:{type:String},filter:{type:[Array,Object]},command:{type:Array,default:[]},rowid:{type:String},onRowClick:{type:Function},onRowDblClick:{type:Function},class:{type:String,default:"table"},style:{type:String,default:null}},emits:["onRowClick","onRowDblClick"],setup(props,{attrs,slots,emit,expose}){let rows=[];let rowg=[];let grps=[];let adapter=null;let timer=null;const spec=reactive({caption:null,group:{value:props.settings&&props.settings.group?props.settings.group.value:props.group?props.group:null,content:props.settings&&props.settings.group?props.settings.group.content:null,expandAll:true,class:"table-light"},page:{count:0,size:props.settings&&props.settings.page?props.settings.page.size:0,current:0,type:null},sort:props.settings&&props.settings.sort?props.settings.sort:[],columns:props.settings&&props.settings.columns?props.settings.columns:[],footer:{button:{class:"btn"}}});if(props.data){if(Array.isArray(props.data)){adapter=adaptarr}else{adapter=props.data}}if(props.search)spec.search=props.search;watch(()=>props.search,(n,o)=>{const x=parseInt(props.settings.searchMinChar)||3;if(timer){clearTimeout(timer);timer=null}if(n&&n.length>x){spec.search=n;timer=setTimeout(()=>{refresh();timer=null},444)}else if(o&&o.length>x&&(n==undefined||n==null||n.length<=x)){spec.search=null;timer=setTimeout(()=>{refresh();timer=null},444)}});if(props.filter)spec.filter=props.filter;watch(()=>props.filter,()=>{if(props.filter)spec.filter=props.filter;else spec.filter=null;refresh()},{deep:true});watch(()=>props.command,(n,o)=>{if(n&&n.length>0){const c=props.command[n.length-1];if(c&&c.name){if(c.name.toLowerCase()=="refresh")refresh();else if(c.name.toLowerCase()=="first")first();else if(c.name.toLowerCase()=="prior")prior();else if(c.name.toLowerCase()=="next")next();else if(c.name.toLowerCase()=="last")last();else console.log("Unknown command")}props.command.length=0}},{deep:true});function prepareGroup(g,r){grps=[];rowg=[];for(let i=0;i<r.length;i++){let v=null;let c=null;const o=r[i];if(g.value){if(typeof g.value=="function")v=g.value(o);else v=o[g.value]}else if(typeof g=="function")v=g(o);else{if(typeof g=="bigint"||typeof g=="number"){const l=parseFloat(g);if(l)v=o[l]}else if(typeof g=="string")v=o[g]}if(g.content){if(typeof g.content=="function")c=g.content(o);else c=o[g.content]}let n=grps.findIndex(f=>f.group==v);if(n==-1){n=grps.push({group:v,content:c,expand:spec.group.expandAll})-1}rowg.push(n)}}function first(){page(1)}function prior(){if(spec.page.current>1){page(spec.page.current-1)}else{page(spec.page.current)}}function next(){page(spec.page.current+1)}function last(){page(spec.page.count)}function go(){let p;let g=spec.page.current;do{p=prompt(undefined,spec.page.current);g=parseInt(p)}while(p&&isNaN(g));if(g&&g>0&&g!=spec.page.current)page(g)}function refresh(){page(spec.page.current)}function orderby(ind,dir){if(spec.sort&&spec.sort.length>0){let l=spec.sort.findIndex(f=>f.index==ind);if(l<0){let n=spec.columns[ind].name;l=spec.sort.findIndex(f=>f.name==n)}if(l==0){spec.sort[l].dir=dir?dir:spec.sort[0].dir?null:"desc"}else if(l>0){spec.sort.splice(l,1)}if(l!=0){spec.sort.unshift({index:ind,dir:dir?dir:null})}if(spec.sort.length>2){spec.sort.pop()}}else{spec.sort.push({index:ind,dir:dir?dir:null})}page(spec.page.current)}function page(currentPage){let dat=null;if(props.data){if(Array.isArray(props.data))dat=props.data}else return;spec.status=tablevuStatuses.Loading;if(adapter){adapter({pageSize:spec.page.size,currPage:currentPage,sort:spec.sort,cols:spec.columns,filter:spec.filter,search:spec.search},dat).then(ada=>{if(spec.onData)rows=spec.onData(ada.rows);else rows=ada.rows;if(spec.group&&(typeof spec.group=="string"||typeof spec.group=="bigint"||typeof spec.group=="object"&&spec.group.value))prepareGroup(spec.group,rows);spec.page.count=ada.count>0&&spec.page.size>0?Math.ceil(ada.count/spec.page.size):0;spec.page.current=currentPage;spec.status=tablevuStatuses.Ready;spec.time=Date.now()})}}function renderValue(col,val){if(val){let v;if(col.type=="datetime"||col.type=="date"||col.type=="time"){let t=new Date(val);if(col.type=="date")v=t.toLocaleDateString();else if(col.type=="time")v=t.toLocaleTimeString();else v=t.toLocaleString()}else{if(col.type=="numeric"){v=parseFloat(val)}else{if(col.type=="integer"){v=parseInt(val)}else v=val}}return v}else return""}function renderCell(col,val){const o={style:{}};if(col.colspan&&col.colspan>1){o.colspan=col.colspan}if(col.style){o.style=col.style}if(col.align){o.style["text-align"]=col.align}if(col.width){o.style["max-width"]=col.width}const v=renderValue(col,val);return h("td",o,v)}function renderCustomCell(col,row){const o={style:{}};if(col.colspan&&col.colspan>1){o.colspan=col.colspan}if(col.style){o.style=col.style}if(col.align){o.style["text-align"]=col.align}if(col.width){o.style["max-width"]=col.width}let f=col.render(row);return h("td",o,f)}function renderGroup(grp){const b=h("button",{title:grp.expand,onClick:event=>{grp.expand=grp.expand?false:true;event.currentTarget.value=grp.expand?"▼":"►";spec.time=Date.now();event.preventDefault()},style:{padding:0,margin:"0 6px 0 0",width:"12px",height:"100%",border:"none",outline:0,backgroundColor:"transparent"}},grp.expand?"▼":"►");const v=grp.content||grp.group;return h("tr",{},h("td",{colspan:spec.columns.length,class:spec.group.class},[b,v]))}function renderRow(index,row){const o={};const r=[];o.key=index;o.index=index;if(props.rowid){o.rowid=row[props.rowid]}for(let i=0;i<spec.columns.length;i+=1){let v;const c=spec.columns[i];if(c.render){v=renderCustomCell(c,row);r.push(v)}else{if(c.depth){v=row;for(let j=0;j<c.depth.length;j+=1){if(v)v=v[c.depth[j]]}}else{v=row[c.name]}r.push(renderCell(c,v))}}o.ondblclick=event=>{const r=rows[event.currentTarget.attributes.index.value];emit("onRowDblClick",event,r)};if(props.onRowClick){o.onClick=event=>{const r=rows[event.currentTarget.attributes.index.value];props.onRowClick(event,r)}}return h("tr",o,r)}function renderHeader(){let ar=[];let sp=1;for(let i=0;i<spec.columns.length;i+=1){if(sp>1){sp--;continue}const cl=[];if(spec.columns[i].label){cl.push(h("span",spec.columns[i].label))}else{cl.push(h("span",spec.columns[i].name))}if(spec.sort&&spec.sort.length>0&&spec.sort[0].index==i){if(spec.sort[0].dir=="desc")cl.push(h("span",{style:{float:"right"}},"▼"));else cl.push(h("span",{style:{float:"right"}},"▲"))}let ch={position:"relative"};if(spec.columns[i].width){ch.width=spec.columns[i].width;ch.minWidth=spec.columns[i].width;ch.maxWidth=spec.columns[i].width}let cy={display:"block","font-weight":500,textDecoration:"none",textAlign:"center"};if(spec.columns[i].header){if(spec.columns[i].header.colspan)sp=parseInt(spec.columns[i].header.colspan)||1;if(spec.columns[i].header.style)ch.style=spec.columns[i].header.style;if(spec.columns[i].header.align)ch.textAlign=spec.columns[i].header.align}let a;let f;if(spec.columns[i].popup){const r=ref(null);let c=[h("a",{href:"#",onClick(event){orderby(i);event.preventDefault()},style:{display:"block",textDecoration:"none",color:"black",fontWeight:"initial",padding:".25rem"}},"Order by Ascending"),h("a",{href:"#",onClick(event){orderby(i,"desc");event.preventDefault()},style:{display:"block",textDecoration:"none",color:"black",fontWeight:"initial",padding:".25rem"}},"Order by Descending")];a=h("a",{href:"#",onClick(event){if(r.value&&r.value.style&&r.value.style.display&&r.value.style.display=="block")r.value.style.display="none";else r.value.style.display="block";event.preventDefault()},style:cy},cl);f=h("div",{ref:r,style:{position:"absolute",display:"none",width:spec.columns[i].width||"12rem",height:"fit-content",border:"1px solid lightgray",backgroundColor:"whitesmoke",zIndex:1,left:0,top:"2rem",bottom:0,right:0,padding:".25rem"}},c)}else a=h("a",{href:"#",onClick(event){orderby(i);event.preventDefault()},style:cy},cl);if(spec.columns[i].filter){}ar.push(h("th",{colspan:sp>1?sp:null,style:ch},[a,f]))}const tr=h("tr",{},ar);return[tr]}function renderBody(){const dr=[];if(rows&&rows.length>0){if(grps&&grps.length>0){let r=[];for(let g=0;g<grps.length;g++)r.push({index:g,childs:[]});for(let i=0;i<rows.length;i++){const x=rowg[i];r[x].childs.push(renderRow(i,rows[i]))}for(let g=0;g<grps.length;g++){dr.push(renderGroup(grps[g]));if(grps[g].expand)dr.push(r[g].childs)}}else{for(let i=0;i<rows.length;i++){dr.push(renderRow(i,rows[i]))}}}return dr}function renderFooter(){const fr=h("button",{class:spec.footer.button.class,style:"font: initial; margin-right: .5rem",onClick:first,disabled:spec.page.current==1},"◀◀");const ls=h("button",{class:spec.footer.button.class,style:"font: initial; margin-right: .5rem",onClick:last,disabled:spec.page.count==0||spec.page.current==spec.page.count},"▶▶");const pg=h("button",{class:spec.footer.button.class,style:"font: initial; margin-right: .5rem",onClick:go},spec.page.current+(spec.page.count>0?" / "+spec.page.count:""));const pr=h("button",{class:spec.footer.button.class,style:"font: initial; margin-right: .5rem",onClick:prior,disabled:spec.page.current==1},"◀");const nx=h("button",{class:spec.footer.button.class,style:"font: initial; margin-right: .5rem",onClick:next,disabled:spec.page.count>0&&spec.page.current==spec.page.count},"▶");const td=h("td",{colspan:spec.columns.length,align:"center"},[fr,pr,pg,nx,ls]);const tr=h("tr",{},[td]);return[tr]}function renderCaption(){return null}if(spec.columns.length==0){alert("Columns not defined !")}for(let i=0;i<spec.columns.length;i++)if(spec.columns[i].name&&spec.columns[i].name.indexOf(".")>-1){spec.columns[i].depth=spec.columns[i].name.split(".")}page(1);onMounted(()=>{});return{spec:spec,renderHeader:renderHeader,renderBody:renderBody,renderFooter:renderFooter,renderCaption:renderCaption}},render(props){let prps={class:"tablevu"};if(props.class)prps.class="tablevu "+props.class;if(props.style)prps.style=props.style;let cntn=[];cntn.push(h("thead",{},this.renderHeader()));if(this.spec.status==tablevuStatuses.Ready)cntn.push(h("tbody",{"data-time":this.spec.time},this.renderBody()));if(this.spec.caption)cntn.push(h("caption",{},this.renderCaption()));if(this.spec.status==tablevuStatuses.Ready)if(this.spec.page.size>0)cntn.push(h("tfoot",{},this.renderFooter()));return h("table",prps,cntn)}};export default tablevu;

package/dist/webapi.js

@@ -1 +0,0 @@
-import get from"./get.js";export default class webapi{constructor(req,data,events){this.adapter=props=>{const u=new URL(req.url);if(props.pageSize){u.searchParams.append("skip",props.pageSize*(props.currPage-1));u.searchParams.append("top",props.pageSize)}if(props.search)u.searchParams.append("search",props.search);if(props.sort&&props.sort.length>0){u.searchParams.append("orderby",props.sort.map(m=>{let n={index:-1,name:""};if(Object.prototype.hasOwnProperty.call(m,"index")){n.index=m.index}else{n.name=m.name}return n}).map(m=>{return m.index>-1?props.cols[m.index].name:m.name}))}let r=null;if(events&&events.onfetch&&typeof events.onfetch=="function")r=events.onfetch(new Request(u,req));else r=new Request(u,req);return get(r)}}}

package/index.js

@@ -1,5 +0,0 @@
-import tablevu from './dist/table'
-import odata from './dist/odata'
-import webapi from './dist/webapi'
-
-export { tablevu, odata, webapi };

package/src/array.js

@@ -1,78 +0,0 @@
-export default function (props, data) {
-	let d = [];
-
-	if (Array.isArray(data))
-		d = data;
-
-	return new Promise((resolve, reject) => {
-		// Paging //
-		if (props.pageSize) {
-			d = d.slice((props.currPage - 1) * props.pageSize, props.currPage * props.pageSize);
-		}
-
-		// Sort //
-		if (props.sort && props.sort.length > 0) {
-			for (let i = props.sort.length - 1; i >= 0; i--) {
-				let f = null;
-				
-				if (props.sort[i].index > -1)
-					f = props.cols[props.sort[i].index].name;
-				else
-					f = props.sort[i].name;
-
-				if (props.sort[i].dir == 'desc')
-					d.sort((a,b) => (a[f] < b[f]) ? 1 : ((b[f] < a[f]) ? -1 : 0));
-				else
-					d.sort((a,b) => (a[f] > b[f]) ? 1 : ((b[f] > a[f]) ? -1 : 0));
-			}
-		};
-
-
-		resolve({ rows: d, count: d.length })
-	})
-}
-/*
-export default function adapter(params, data) {
-	debugger;
-	const rsl = data;
-
-	// Filter & Search //
-	if (params.filter || params.search) {
-		const cls = params.cols.map((m,i) => ({ index: i, searchable: q.searchable == undefined || q.searchable == true})).filter(q => q.searchable == true).map(m => m.index);
-
-		if (cls.length > 0 && (params.filter || params.search)) {
-			if (params.filter) {
-
-			}
-
-			if (params.search) {
-				rsl = rsl.filter(f => {
-					return Object.values(f).filter((l,x) => cls.indexOf(x) > -1).some(s => s.indexOf(params.search) > -1) 
-				  })
-			}
-		}
-	}
-
-	// Sort //
-	if (params.sort && params.sort.length > 0) {
-		for (let i = params.sort.length - 1; i >= 0; i--) {
-			let s = params.sort[i];
-			if (s.dir == 'desc')
-				rsl.sort((a,b) => (a[s.name] < b[s.name]) ? 1 : ((b[s.name] < a[s.name]) ? -1 : 0));
-			else
-				rsl.sort((a,b) => (a[s.name] > b[s.name]) ? 1 : ((b[s.name] > a[s.name]) ? -1 : 0));
-		}
-	}
-		
-	// Paging //
-	if (params.pageSize && rsl.length > params.pageSize) {
-		rsl = rsl.filter((v,i,s) => i >= params.pageSize * (params.currPage - 1) && i < params.pageSize * params.currPage);
-	}
-
-	// Select - None //
-
-	// Expand - None //
-
-	return { rows: rsl, count: data.length };
-}
-*/

package/src/get.js

@@ -1,28 +0,0 @@
-export default function get(req) {
-	return new Promise((resolve, reject) => {
-		fetch(req).then(res => res.json()).then(res => {
-			let r;
-			let c = 0;
-
-			if (res) {
-				if (res.hasOwnProperty('value'))
-					r = res.value;
-				else
-					r = res;
-
-				if (res.hasOwnProperty('@odata.count')) {
-					c = parseInt(res['@odata.count']);
-				} else if (res.hasOwnProperty('count'))
-					c = parseInt(res['count']);
-				else
-					c = 0;
-
-				resolve({ rows: r, count: c })
-			} else
-				resolve({ rows: null, count: null })
-		}).catch(err => {
-			console.error(err);
-			reject(err);
-		})
-	})
-}

package/src/odata.js

@@ -1,179 +0,0 @@
-import get from './get.js';
-
-function filter(q) {
-
-	function fuval(q) {
-		if (q === null) {
-			return 'null'
-		} else if (typeof(q) === 'string') {
-			if (q.length == 10 && q[4] == '-' && q[7] == '-' && Date.parse(q)) { // input date return iso string
-				return q;
-			} else
-				return '\'' + q + '\'';
-		} else {
-            if (typeof(q) === 'number' || typeof(q) === 'boolean')
-                return q.toString();
-				else {
-					if (q.getMonth && typeof q.getMonth === "function")
-						return q.toISOString()
-					else
-						return q.func + '(' + q.params.join(',') + ')';
-				}
-		}
-	}
-
-	let s = '';
-
-    if (q && q.filters)
-        for (let i = 0; i < q.filters.length; i++) {
-            if (i > 0)
-                s = s + ` ${q.type || 'and'} `;
-
-            if (q.filters[i].child) {
-                if (q.filters[i].operator == 'any' || q.filters[i].operator == 'all') {
-                    s = s + q.filters[i].child + '/' + q.filters[i].operator + '(i:' + filter(q.filters[i], 'i') + ')';
-                }
-            } else
-			if (q.filters[i].column) {
-				if (q.filters[i].operator == 'in')
-					s = s + fuval(q.filters[i].value) + ' ' + q.filters[i].operator + ' ' + q.filters[i].column;
-				else
-					s = s + q.filters[i].column + ' ' + q.filters[i].operator + ' ' + fuval(q.filters[i].value);
-			} else {
-				if (q.filters[i].func)
-					s = s + q.filters[i].func + '(' + q.filters[i].params.map(m => fuval(m)).join(',') + ')';
-				else
-				if (q.filters[i])
-					s = s + '(' + filter(q.filters[i]) + ')';
-			}
-		}
-
-	return s;
-}
-
-function sefs(url, query, seperator) {
-	let r = '';
-
-	if (query.select && query.select.length > 0) {
-		if (seperator)
-			r += '$select=' + query.select.join(',');
-		else
-			url.searchParams.append('$select', query.select.join(','));
-	};
-
-	if (query.expand && query.expand.length > 0) {
-		let a = [];
-
-		query.expand.forEach(e => {
-			let q = sefs(null, e, ';');
-
-			if (q)
-				a.push(e.name + '(' + q + ')');
-			else
-				a.push(e.name);
-		});
-
-		if (seperator)
-			r += (r.length > 0 ? seperator: '') + '$expand=' + a.join(',');
-		else
-			url.searchParams.append('$expand', a.join(','));
-	};
-
-	if (query.orderby) {
-		if (seperator)
-			r += '$orderby=' + query.orderby;
-		else
-			url.searchParams.append('$orderby', query.orderby);
-	};
-
-	if (query.top && parseInt(query.top) >= 0) {
-		if (seperator)
-			r += '$top=' + query.top;
-		else
-			url.searchParams.append('$top', query.top);
-	};
-
-	if (query.skip && parseInt(query.skip) >= 0) {
-		if (seperator)
-			r += '$skip=' + query.skip;
-		else
-			url.searchParams.append('$skip', query.skip);
-	};
-
-	if (query.count) {
-		if (seperator)
-			r += '$count=true';
-		else
-			url.searchParams.append('$count', true);
-	};
-
-	return r;
-}
-
-export default class odata {
-	constructor(req, features) {
-		this.adapter = (props) => {
-			const u = new URL(req.url);
-
-			// Paging //
-			if (props.pageSize) {
-				u.searchParams.append('$skip', props.pageSize * (props.currPage - 1));
-				u.searchParams.append('$top', props.pageSize);
-			}
-
-			sefs(u, features);
-
-			// Filter //
-			let f = [];
-		
-			// Static filter //
-			if (features.filter) {
-				if (typeof(features.filter) == 'string')
-					f.push(features.filter);
-				else
-					if (Object.prototype.hasOwnProperty.call(features.filter, 'filters')) {
-						let l = filter(features.filter);
-
-						if (l)
-							f.push(l);
-					}
-			}
-
-			// Dynamic filter //
-			if (props.filter) {
-				if (typeof(props.filter) == 'string')
-					f.push(props.filter);
-				else
-					if (props.filter && Object.prototype.hasOwnProperty.call(props.filter, 'filters')) {
-						let l = filter(props.filter);
-
-						if (l)
-							f.push(l);
-					}
-			}
-
-			// Search //
-			if (props.search) {
-				let l = props.cols.filter(q => q.searchable == undefined || q.searchable == true).map(q => "contains(" + q.name.replaceAll('.', '/') + ",'" + props.search + "')").join(" or ");
-		
-				if (l)
-					f.push('(' + l + ')');
-			}
-		
-			if (f && f.length > 0)
-				u.searchParams.append('$filter', f.join(' and '));
-
-			// Sort //
-			if (props.sort && props.sort.length > 0)
-				u.searchParams.append('$orderby', props.sort.map(m => { let n = { index: -1, name: '', dir: null }; if (Object.prototype.hasOwnProperty.call(m, 'index')) { n.index = m.index } else { n.name = m.name }; n.dir = m.dir; return n; }).map(m => { return (m.index > -1 ? props.cols[m.index].name : m.name).replaceAll('.', '/') + (m.dir ? (' ' + m.dir): '') }).join(','));
-
-			let r = null;
-			if (features && features.onfetch && typeof features.onfetch == 'function')
-				r = features.onfetch(new Request(u, req))
-			else
-				r = new Request(u, req);
-
-			return get(r);
-		}
-	}
-}