simplyview 3.0.4 → 3.0.6

package/src/route.mjs

@@ -1,34 +1,45 @@
-export function routes(options) {
-	return new SimplyRoute(options)
+export function routes(options, optionsCompat)
+{
+    if (optionsCompat) {
+        let app = options
+        options = optionsCompat
+        options.app = options
+    }
+    return new SimplyRoute(options)
 }
 
-class SimplyRoute {
-	constructor(options={}) {
-		this.root = options.root || '/'
-        this.app = options.app
+class SimplyRoute
+{
+    constructor(options={})
+    {
+        this.root = options.root || '/'
+        this.app = options.app || {}
         this.addMissingSlash = !!options.addMissingSlash
         this.matchExact = !!options.matchExact
-		this.clear()
-		if (options.routes) {
-			this.load(options.routes)
-		}
-	}
-
-	load(routes) {
-		parseRoutes(routes, this.routeInfo, this.matchExact)
-	}
-
-	clear() {
-		this.routeInfo = []
-		this.listeners = {
-			match: {},
-			call: {},
-			finish: {}
-		}
-	}
-
-	match(path, options) {
-		let args = {
+        this.clear()
+        if (options.routes) {
+            this.load(options.routes)
+        }
+    }
+
+    load(routes)
+    {
+        parseRoutes(routes, this.routeInfo, this.matchExact)
+    }
+
+    clear()
+    {
+        this.routeInfo = []
+        this.listeners = {
+            match: {},
+            call: {},
+            finish: {}
+        }
+    }
+
+    match(path, options)
+    {
+        let args = {
             path,
             options
         }
@@ -68,15 +79,16 @@ class SimplyRoute {
                 args.params = params
                 args = this.runListeners('call', args)
                 params = args.params ? args.params : params
-                args.result = route.action.call(route, params)
+                args.result = route.action.call(this.app, params)
                 this.runListeners('finish', args)
                 return args.result
             }
         }
         return false
-	}
+    }
 
-	runListeners(action, params) {
+    runListeners(action, params)
+    {
         if (!Object.keys(this.listeners[action])) {
             return
         }
@@ -95,55 +107,58 @@ class SimplyRoute {
         return params
     }
 
-    handleEvents() {
+    handleEvents()
+    {
         globalThis.addEventListener('popstate', () => {
             if (this.match(getPath(document.location.pathname + document.location.hash, this.root)) === false) {
                 this.match(getPath(document.location.pathname, this.root))
             }
         })
         this.app.container.addEventListener('click', (evt) => {
-	        if (evt.ctrlKey) {
-	            return;
-	        }
-	        if (evt.which != 1) {
-	            return; // not a 'left' mouse click
-	        }
-	        var link = evt.target;
-	        while (link && link.tagName!='A') {
-	            link = link.parentElement;
-	        }
-	        if (link 
-	            && link.pathname 
-	            && link.hostname==globalThis.location.hostname 
-	            && !link.link
-	            && !link.dataset.simplyCommand
-	        ) {
-	            let path = getPath(link.pathname+link.hash, this.root);
-	            if ( !this.has(path) ) {
-	                path = getPath(link.pathname, this.root);
-	            }
-	            if ( this.has(path) ) {
-	                let params = this.runListeners('goto', { path: path});
-	                if (params.path) {
-	                    if (this.goto(params.path)) {
+            if (evt.ctrlKey) {
+                return;
+            }
+            if (evt.which != 1) {
+                return; // not a 'left' mouse click
+            }
+            var link = evt.target;
+            while (link && link.tagName!='A') {
+                link = link.parentElement;
+            }
+            if (link 
+                && link.pathname 
+                && link.hostname==globalThis.location.hostname 
+                && !link.link
+                && !link.dataset.simplyCommand
+            ) {
+                let path = getPath(link.pathname+link.hash, this.root);
+                if ( !this.has(path) ) {
+                    path = getPath(link.pathname, this.root);
+                }
+                if ( this.has(path) ) {
+                    let params = this.runListeners('goto', { path: path});
+                    if (params.path) {
+                        if (this.goto(params.path)) {
                             // now cancel the browser navigation, since a route handler was found
                             evt.preventDefault();
                             return false;
                         }
-	                }
-	            }
-	        }
-	    })
+                    }
+                }
+            }
+        })
     }
 
-    goto(path) {
+    goto(path)
+    {
         history.pushState({},'',getURL(path))
         return this.match(path)
     }
 
-    has(path) {
-    	path = getPath(path, this.root)
-    	for (let route of this.routeInfo) {
+    has(path)
+    {
+        path = getPath(path, this.root)
+        for (let route of this.routeInfo) {
             var matches = route.match.exec(path)
             if (matches && matches.length) {
                 return true
@@ -152,7 +167,8 @@ class SimplyRoute {
         return false
     }
 
-    addListener(action, route, callback) {
+    addListener(action, route, callback)
+    {
         if (['goto','match','call','finish'].indexOf(action)==-1) {
             throw new Error('Unknown action '+action)
         }
@@ -162,7 +178,8 @@ class SimplyRoute {
         this.listeners[action][route].push(callback)
     }
 
-    removeListener(action, route, callback) {
+    removeListener(action, route, callback)
+    {
         if (['match','call','finish'].indexOf(action)==-1) {
             throw new Error('Unknown action '+action)
         }
@@ -174,14 +191,16 @@ class SimplyRoute {
         })
     }
 
-    init(options) {
-    	if (options.root) {
-    		this.root = options.root
-    	}
+    init(options)
+    {
+        if (options.root) {
+            this.root = options.root
+        }
     }
 }
 
-function getPath(path, root='/') {
+function getPath(path, root='/')
+{
     if (path.substring(0,root.length)==root
         ||
         ( root[root.length-1]=='/' 
@@ -197,7 +216,8 @@ function getPath(path, root='/') {
     return path
 }
 
-function getURL(path, root) {
+function getURL(path, root)
+{
     path = getPath(path, root)
     if (root[root.length-1]==='/' && path[0]==='/') {
         path = path.substring(1)
@@ -205,14 +225,16 @@ function getURL(path, root) {
     return root + path;
 }
 
-function getRegexpFromRoute(route, exact=false) {
+function getRegexpFromRoute(route, exact=false)
+{
     if (exact) {
         return new RegExp('^'+route.replace(/:\w+/g, '([^/]+)').replace(/:\*/, '(.*)')+'(\\?|$)')
     }
     return new RegExp('^'+route.replace(/:\w+/g, '([^/]+)').replace(/:\*/, '(.*)'))
 }
 
-function parseRoutes(routes, routeInfo, exact=false) {
+function parseRoutes(routes, routeInfo, exact=false)
+{
     const paths = Object.keys(routes)
     const matchParams = /:(\w+|\*)/g
     for (let path of paths) {
@@ -231,4 +253,4 @@ function parseRoutes(routes, routeInfo, exact=false) {
         })
     }
     return routeInfo
-}
+}

package/src/view.mjs

@@ -1,4 +1,9 @@
-export function view(options) {
+export function view(options, optionsCompat) {
+	if (optionsCompat) {
+		let app = options
+		options = optionsCompat
+		options.app = options
+	}
 	if (options.app) {
 		options.app.view = options.view || {}