x4js 1.4.52 → 1.4.53

package/src/request.ts

@@ -1,300 +0,0 @@
-/**
-*  ___   ___ __
-*  \  \_/  /  / _
-*   \     /  /_| |_
-*   /  _  \____   _|  
-*  /__/ \__\   |_|
-*        
-* @file request.ts
-* @author Etienne Cochard 
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* 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.
-**/
-
-
-/**
- * TODO: use fetch api
- * 
-
-async function xx( resp, cb ) {
-	cb( await resp.json() ); 
-}
-
-async function getToto( cb ) {
-    fetch('home/toto', { method: 'GET' }).then( (resp) => { xx(resp,cb); } );
-}
-
-function dump( resp ) {
-	console.log( resp );
-}
-
-getToto( dump );
-
-*/
-
-
-import { isArray, isLiteralObject, isString, NetworkError } from './tools'
-
-const DEFAULT_TIMEOUT = 10000;
-
-export interface RequestProps
-{
-	url: string;
-	method?: 'GET' | 'POST';
-	headers?: string[];
-	params?: any;
-	timeout?: number;
-	responseType?: 'text' | 'json' | 'arraybuffer';
-	userData?: any;
-
-	success: ( data: any, userData: any ) => void;
-	failure?: ( status: number, statusText: string, userData: any ) => void;
-	progress?: ( length: number, total: number, display: string ) => void;
-}
-
-
-export function ajaxRequest( cfg: RequestProps ) : Function {
-	
-	let params,
-		url = cfg.url,
-		method = cfg.method || 'GET',
-		formdata = false;
-
-	if( cfg.params instanceof FormData ) {
-		params = cfg.params;
-		formdata = true;
-	}
-	else if( method=='POST' ) {
-		params = buildQuery( cfg.params, false );
-	}
-	else {
-		url += buildQuery( cfg.params, true );
-	}
-
-	url = encodeURI( url );
-
-	let xhr = new XMLHttpRequest( );
-	xhr.open( method, url );
-
-	xhr.upload.addEventListener( 'progress', progress, false);
-	xhr.addEventListener( 'timeout', failure );
-	xhr.addEventListener( 'error', failure );
-	xhr.addEventListener( 'load', success );
-	
-	if( !formdata ) {
-		xhr.setRequestHeader( "Content-type", "application/x-www-form-urlencoded; charset=UTF-8" );
-	}
-	
-	if( method!='POST' ) {
-		xhr.responseType = cfg.responseType || 'json';
-		xhr.timeout = cfg.timeout || DEFAULT_TIMEOUT;
-	}
-
-	if( cfg.headers ) {
-		for( let h in cfg.headers) {
-			xhr.setRequestHeader( h, cfg.headers[h] );
-		}
-	}
-
-	function progress( ev: ProgressEvent<EventTarget> ) {
-		console.log( ev );
-		if( cfg.progress ) {
-			try {
-				if( ev.lengthComputable ) {
-					let disp = humanSize( ev.loaded ) + ' / ' + humanSize( ev.total );
-					cfg.progress( ev.loaded, ev.total, disp );
-				}
-			}
-			catch( e ) {
-				console.error( 'unhandled exception:', e );
-			}
-		}
-	}
-
-	function humanSize( bytes: number ) {
-
-		let unit, value: number;
-
-		if( bytes>=1e9 ) {
-			unit = 'Gb';
-			value = bytes/1e9;	
-		}
-		else if( bytes>=1e6 ) {
-			unit = 'Mb';
-			value = bytes/1e6;	
-		}
-		else if( bytes>=1e3 ) {
-			unit = 'Kb';
-			value = bytes/1e3;	
-		}
-		else {
-			unit = 'bytes';
-			value = bytes;	
-		}
-
-		return value.toFixed( 2 ) + unit;
-	}
-
-	function failure(  ) {
-		if( cfg.failure ) {
-			cfg.failure( xhr.status, xhr.statusText, cfg.userData );
-		}
-	}
-
-	function success( ) {
-		if( xhr.status>=200 && xhr.status<300 ) {
-			if( cfg.success ) {
-				try {
-					cfg.success( xhr.response, cfg.userData );
-				}
-				catch( e ) {
-					console.error( 'unhandled exception:', e );
-				}
-			}
-		}
-		else {
-			failure( );
-		}	
-	}
-
-	if( formdata || method=='POST' ) {
-		xhr.send( params );
-	}
-	else {
-		xhr.send( );
-	}
-
-	return function( ) {
-		xhr.abort( );
-	};
-}
-
-function  buildQuery( params: any, getMethod: boolean ) {
-
-	if( !params ) {
-		return '';
-	}
-
-	let query = [];
-	for( let key in params ) {
-
-		let param = params[key];
-
-		// array
-		if( isArray(param) ) {
-			for( let i=0, n=param.length; i<n; i++ ) {
-				query.push( encodeURIComponent(key) + '[]=' + encodeURIComponent( ''+param[i] ) );
-			}
-		}
-		// simple string ...
-		else {
-
-			if( param===undefined ) {
-				param = '';
-			}
-			query.push( encodeURIComponent(key) + '=' + encodeURIComponent(''+param) );
-		}
-	}
-
-	let result = query.join( '&' );
-	if( getMethod ) {
-		return '?' + result;
-	}
-	else {
-		return result;
-	}
-}
-
-
-//type Identity<T> = { [P in keyof T]: T[P] }
-//type Replace<T, K extends keyof T, TReplace> = Identity<Pick<T, Exclude<keyof T, K>> & {
-//    [P in K] : TReplace
-//}>
-//type AjaxRequestInit = Replace< RequestInit, 'body', BodyInit | null | object | undefined >;
-
-
-interface AjaxRequestInit extends Omit<RequestInit,'body'> {
-	body?: BodyInit | null | object;
-	noGenX?: boolean;	// donot generate exception on error
-}
-
-
-export async function ajaxAsJSON( url: string, init?: AjaxRequestInit ) : Promise<any> {
-	let response = await ajax( url, init, 'application/json' );
-	return response.json( );
-}
-
-export async function ajaxAsText( url: string, init?: AjaxRequestInit ) : Promise<any> {
-	let response = await ajax( url, init, 'text/plain' );
-	return response.text( );
-}
-
-/**
- * use encodeURIComponent for elements in url
- */
-
-export async function ajax( url: string, init?: AjaxRequestInit, type?: string ) : Promise<Response> {
-
-	let options: AjaxRequestInit = { 
-		method: 'GET',
-		headers: {
-			'X-Requested-With': 'XMLHttpRequest'
-		}
-	}
-
-	if( type ) {
-		options.headers['Content-Type'] = type;
-	}
-
-	if( init ) {
-		options = { ...options, ...init };
-
-		if( init.body && !isString(init.body) ) {
-			let cvt = false;
-			if( isLiteralObject(init.body) ) {
-				cvt = true;
-			}
-			else if( !(init.body instanceof Blob) && !(init.body instanceof ArrayBuffer) && !(init.body instanceof FormData) &&
-				!(init.body instanceof URLSearchParams) && !(init.body instanceof ReadableStream) )
-			{
-				cvt = true;
-			}
-
-			if( cvt ) {
-				options.body = JSON.stringify( init.body );
-			}
-			else {
-				options.body = init.body;
-			}
-		}
-	}
-
-	let response = await fetch( url, options as RequestInit );
-
-	if( init && init.noGenX ) {
-		return response;
-	}
-	else {
-		if( !response.ok ) {
-			throw new NetworkError( response );
-		}
-
-		return response;
-	}
-}

package/src/router.ts

@@ -1,185 +0,0 @@
-/**
-*  ___   ___ __
-*  \  \_/  /  / _
-*   \     /  /_| |_
-*   /  _  \____   _|  
-*  /__/ \__\   |_|
-*        
-* @file router.ts
-* @author Etienne Cochard 
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* 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.
-**/
-
-import { x4document } from './x4dom'
-
-import { EventSource, EvError, EventMap } from "./x4events"
-
-type RouteHandler = ( params: any, path: string ) => void;
-
-interface Segment {
-	keys: string[],
-	pattern: RegExp;
-}
-
-interface Route {
-	keys: string[],
-	pattern: RegExp;
-	handler: RouteHandler;
-}
-
-function parseRoute(str: string | RegExp, loose = false): Segment {
-
-	if (str instanceof RegExp) {
-		return {
-			keys: null,
-			pattern: str
-		};
-	}
-
-	const arr = str.split('/');
-
-	let keys = [];
-	let pattern = '';
-
-	if( arr[0]=='' ) {
-		arr.shift();
-	}
-
-	for (const tmp of arr) {
-		const c = tmp[0];
-
-		if (c === '*') {
-			keys.push('wild');
-			pattern += '/(.*)';
-		}
-		else if (c === ':') {
-			const o = tmp.indexOf('?', 1);
-			const ext = tmp.indexOf('.', 1);
-
-			keys.push(tmp.substring(1, o >= 0 ? o : ext >= 0 ? ext : tmp.length));
-			pattern += o >= 0 && ext < 0 ? '(?:/([^\/]+?))?' : '/([^\/]+?)';
-			if (ext >= 0) {
-				pattern += (o >= 0 ? '?' : '') + '\\' + tmp.substring(ext);
-			}
-		}
-		else {
-			pattern += '/' + tmp;
-		}
-	}
-
-	return {
-		keys,
-		pattern: new RegExp( `^${pattern}${loose ? '(?=$|\/)' : '\/?$'}`, 'i' )
-	};
-}
-
-interface RouterEventMap extends EventMap {
-	error: EvError;
-}
-   
-export class Router extends EventSource< RouterEventMap > {
-
-	private routes: Route[];
-
-	constructor() {
-		super( );
-
-		this.routes = [];
-
-		window.addEventListener('popstate', (event) => {
-			const url = x4document.location.pathname;
-			const found = this._find(url);
-		
-			found.handlers.forEach(h => {
-				h(found.params,url);
-			});
-		});
-	}
-
-	get(uri: string | RegExp, handler: RouteHandler ) {
-		let { keys, pattern } = parseRoute(uri);
-		this.routes.push({ keys, pattern, handler });
-	}
-
-	init() {
-		this.navigate( window.location.pathname );
-	}
-
-	navigate( uri: string, notify = true ) {
-
-		const found = this._find( uri );
-
-		if( !found || found.handlers.length==0 ) {
-			//window.history.pushState({}, '', 'error')
-			console.log( 'route not found: '+uri );
-			this.signal( "error", EvError( 404, "route not found" ) );
-			return;
-		}
-
-		window.history.pushState({}, '', uri )
-
-		if( notify ) {
-			found.handlers.forEach( h => {
-				h( found.params, uri );
-			} );
-		}
-	}
-
-	private _find( url: string ): { params: any, handlers: RouteHandler[] } {
-		
-		let matches = [];
-		let params = {};
-		let handlers = [];
-
-		for (const tmp of this.routes ) {
-			if (!tmp.keys ) {
-				matches = tmp.pattern.exec(url);
-				if (!matches) {
-					continue;
-				}
-
-				if (matches['groups']) {
-					for (const k in matches['groups']) {
-						params[k] = matches['groups'][k];
-					}
-				}
-
-				handlers = [...handlers, tmp.handler];
-			} 
-			else if (tmp.keys.length > 0) {
-				matches = tmp.pattern.exec(url);
-				if (matches === null) {
-					continue;
-				}
-
-				for ( let j = 0; j < tmp.keys.length;) {
-					params[tmp.keys[j]] = matches[++j];
-				}
-
-				handlers = [...handlers, tmp.handler];
-			} 
-			else if (tmp.pattern.test(url)) {
-				handlers = [...handlers, tmp.handler];
-			}
-		}
-
-		return { params, handlers };
-	}
-}

package/src/settings.ts

@@ -1,77 +0,0 @@
-/**
-*  ___   ___ __
-*  \  \_/  /  / _
-*   \     /  /_| |_
-*   /  _  \____   _|  
-*  /__/ \__\   |_|
-*        
-* @file local_storage.ts
-* @author Etienne Cochard 
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* 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.
-**/
-
-export class Settings {
-
-	private m_data: any;
-	private m_name: string;
-
-	constructor( name?: string ) {
-		this.m_data = null;
-		this.m_name = name ?? 'settings';
-	}
-
-	set( name: string, value: any ) {
-		this._load( );
-		this.m_data[name] = value;
-		this._save( );
-	}
-
-	get( name: string, defValue? ) : any {
-		this._load( );
-		return this.m_data[name] ?? defValue;
-	}
-
-	private _save( ) {
-		let data = JSON.stringify(this.m_data);
-		localStorage.setItem( this.m_name, data );
-	}
-
-	private _load( ) {
-		if( this.m_data ) {
-			return;
-		}
-
-		this.m_data = {};
-
-		let data = localStorage.getItem( this.m_name );
-		if( data!==null ) {
-			data = JSON.parse( data );
-			if( data ) {
-				this.m_data = data;
-			}
-			else {
-				console.info('There was an error attempting to read your settings.');
-				
-			}
-		}
-		// console.info('There was an error attempting to read your settings.');
-	}
-}
-

package/src/sidebarview.ts

@@ -1,103 +0,0 @@
-/**
-*  ___   ___ __
-*  \  \_/  /  / _
-*   \     /  /_| |_
-*   /  _  \____   _|  
-*  /__/ \__\   |_|
-*        
-* @file sidebarview.ts
-* @author Etienne Cochard 
-*
-* Copyright (c) 2019-2022 R-libre ingenierie
-*
-* 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.
-**/
-
-import { Component, CProps, Flex, Separator } from './component'
-import { HLayout, VLayout } from './layout'
-import { Button } from './button'
-import { CardView, CardViewProps, ICardViewItem } from './cardview'
-
-export interface SideBarItem extends ICardViewItem {
-}
-
-export interface SideBarProps extends CardViewProps {
-	bar_sizable?: boolean;
-	bar_width?: number;
-}
-
-/**
- * 
- */
-
-export class SideBarView extends CardView<SideBarProps> {
-	m_sidebar: VLayout;
-	m_content: Component;
-
-	constructor( props: SideBarProps ) {
-
-		super( props );
-
-		this.addClass( '@hlayout' );
-
-		this.m_sidebar = new VLayout( {
-			cls: '@side-bar',
-			width: props.bar_width ?? undefined,
-		});
-
-		this.m_content = new HLayout( { flex: 1, cls: '@tab-container' } );
-	}
-
-	/** @ignore */
-	render() {
-
-		let tabs = [];
-		
-		this.m_cards.forEach( (p) => {
-			tabs.push( p.selector );
-		} );
-
-		this.m_sidebar.setContent( new VLayout( {
-			flex: 1,
-			cls: 'content',
-			content: tabs
-		}) );
-
-		this.setContent( [
-			this.m_sidebar,
-			this.m_props.bar_sizable ? new Separator( { orientation: "horizontal", sizing: "before" }) : undefined,
-			this.m_content
-		] );
-	}
-
-	protected _prepareSelector( card: ICardViewItem ): Component {
-		return new Button( {
-			text: card.title,
-			icon: card.icon,
-			tooltip: card.title,
-			click: ( ) => { this.switchTo( card.name); }
-		});
-	}
-
-	protected _preparePage( page: Component ) {
-		super._preparePage( page );
-		
-		if( !page.dom ) {
-			this.m_content.appendChild( page );
-		}
-	}
-}