jails-js 5.0.0-beta.7 → 5.0.0

package/package.json

@@ -1,41 +1,44 @@
 {
-  "name": "jails-js",
-  "version": "5.0.0-beta.7",
-  "description": "A Modern Javascript Library",
-  "main": "dist/jails.js",
-  "scripts": {
-    "start": "webpack --watch --mode=development",
-    "build": "webpack --mode=production",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jails-org/Jails.git"
-  },
-  "keywords": [
-    "Jails",
-    "Javascript",
-    "Component",
-    "Micro-Library"
-  ],
-  "author": "javiani",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/jails-org/Jails/issues"
-  },
-  "homepage": "https://github.com/jails-org/Jails",
-  "devDependencies": {
-    "@babel/core": "^7.2.2",
-    "@babel/preset-env": "^7.2.3",
-    "babel-loader": "^8.0.5",
-    "babel-preset-env": "^1.7.0",
-    "ts-loader": "^9.2.6",
-    "typescript": "^4.5.4",
-    "webpack": "^5.59.1",
-    "webpack-cli": "^3.2.1"
-  },
-  "dependencies": {
-    "morphdom": "^2.6.1",
-    "sodajs": "^0.4.10"
-  }
+	"name": "jails-js",
+	"version": "5.0.0",
+	"description": "Jails | A Functional Component Library",
+	"main": "dist/index.js",
+	"types": "types/index.d.ts",
+	"scripts": {
+		"start": "webpack --watch --mode=development",
+		"build": "webpack --mode=production",
+		"publish-beta": "yarn build && npm version prerelease --preid=beta && npm publish --tag beta",
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/jails-org/Jails.git"
+	},
+	"keywords": [
+		"Jails",
+		"Javascript",
+		"Component",
+		"Micro-Library"
+	],
+	"author": "javiani",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/jails-org/Jails/issues"
+	},
+	"homepage": "https://github.com/jails-org/Jails",
+	"devDependencies": {
+		"@babel/core": "^7.2.2",
+		"@babel/preset-env": "^7.2.3",
+		"babel-loader": "^8.0.5",
+		"babel-plugin-transform-custom-element-classes": "^0.1.0",
+		"babel-preset-env": "^1.7.0",
+		"ts-loader": "^9.2.6",
+		"typescript": "^4.5.4",
+		"webpack": "^5.59.1",
+		"webpack-cli": "^3.2.1"
+	},
+	"dependencies": {
+		"morphdom": "^2.6.1",
+		"squirrelly": "^8.0.8"
+	}
 }

package/src/component.ts

@@ -0,0 +1,146 @@
+import morphdom from 'morphdom'
+
+import { rAF, dup, buildtemplates } from './utils'
+import { on, off, trigger } from './utils/events'
+import { publish, subscribe } from './utils/pubsub'
+
+export default function Component( elm, { module, dependencies, templates, components }) {
+
+	const options = getOptions( module )
+	buildtemplates( elm, components, templates )
+
+	const tplid = elm.getAttribute('tplid')
+	const template = tplid ? templates[tplid] : null
+	const state = { data: module.model ? dup(module.model) : {} }
+
+	const base = {
+		template,
+		elm,
+		dependencies,
+		publish,
+		subscribe,
+
+		main(fn) {
+			options.main = fn
+		},
+
+		unmount(fn) {
+			options.unmount = fn
+		},
+
+		onupdate(fn) {
+			options.onupdate = fn
+		},
+
+		on(eventName, selectorOrCallback, callback) {
+			on(elm, eventName, selectorOrCallback, callback)
+		},
+
+		off(eventName, callback) {
+			off(elm, eventName, callback)
+		},
+
+		trigger(eventName, target, args) {
+			if (target.constructor === String) {
+				Array
+					.from(elm.querySelectorAll(target))
+					.forEach( children => trigger(children, eventName, { args: args }) )
+			}
+			else trigger(elm, eventName, { args: target })
+		},
+
+		emit: ( ...args ) => {
+			trigger(elm, args.shift(), { args: args })
+		},
+
+		state: {
+			set( data ) {
+				if (data.constructor === Function) {
+					const newstate = dup(state.data)
+					data(newstate)
+					base.render(newstate)
+				} else {
+					base.render(data)
+				}
+				return new Promise((resolve) => rAF(_ => rAF(resolve)))
+			},
+			get() {
+				return dup(state.data)
+			}
+		},
+
+		render(data = state.data) {
+
+			if (!document.body.contains(elm)) {
+				return
+			}
+
+			state.data = Object.assign(state.data, data)
+
+			const newdata = dup(state.data)
+			const newhtml = base.template(options.view(newdata))
+
+			morphdom(elm, newhtml, morphdomOptions(elm, options))
+
+			rAF(_ => {
+				Array
+					.from(elm.querySelectorAll('[tplid]'))
+					.forEach((child: any) => {
+						child.options.onupdate(newdata)
+						child.base.render(newdata)
+					})
+			})
+		}
+	}
+
+	return { base, options }
+}
+
+const getOptions = (module) => ({
+	main: (a) => a,
+	unmount: (a) => a,
+	onupdate: (a) => a,
+	view: module.view ? module.view : (a) => a
+})
+
+const morphdomOptions = (_parent, options ) => ({
+
+	onNodeAdded: onUpdates(_parent, options),
+	onElUpdated: onUpdates(_parent, options),
+	onBeforeElChildrenUpdated: checkStatic,
+	onBeforeElUpdated: checkStatic,
+
+	getNodeKey(node) {
+		if (node.nodeType === 1 && node.getAttribute('tplid')){
+			return 'key' in node.attributes? node.attributes.key.value : node.getAttribute('tplid')
+		}
+		return false
+	}
+})
+
+const checkStatic = (node) => {
+	if ('html-static' in node.attributes) {
+		return false
+	}
+}
+
+const onUpdates = (_parent, options) => (node) => {
+
+	if (node.nodeType === 1) {
+
+		if (node.getAttribute && node.getAttribute('scope')) {
+			const json = node.getAttribute('scope')
+			const scope = (new Function(`return ${json}`))()
+			Array.from(node.querySelectorAll('[tplid]'))
+				.map((el) => {
+					const data = Object.assign({}, _parent.base.state.get(), scope)
+					options.onupdate(data)
+					el.base.render(data)
+				})
+
+			node.removeAttribute('scope')
+		}
+	}
+
+	return node
+}

package/src/element.ts

@@ -0,0 +1,52 @@
+import Component from './component'
+import { purge } from './utils'
+
+export default function Element(module, dependencies, templates, components) {
+
+	return class extends HTMLElement {
+
+		base: any
+		options: any
+		returns : any
+		__events: any
+
+		constructor() {
+
+			super()
+
+			const { base, options } = Component(this, { module, dependencies, templates, components })
+
+			this.base = base
+			this.options = options
+			this.returns = module.default(base)
+		}
+
+		connectedCallback() {
+			this.base.render()
+
+			if( this.returns && this.returns.constructor === Promise ) {
+				this.returns.then( _ => {
+					if( this.base  ) {
+						this.options.main().forEach(f => f(this.base))
+					}
+				})
+			}else {
+				this.options.main().forEach(f => f(this.base))
+			}
+		}
+
+		disconnectedCallback() {
+			this.options.unmount(this.base)
+			if(!document.body.contains(this) ) {
+				this.__events = null
+				this.base.elm = null
+				this.base = null
+				purge(this)
+			}
+		}
+
+		attributeChangedCallback() {
+			//TODO
+		}
+	}
+}

package/src/index.ts

@@ -1,62 +1,29 @@
-import { Element } from './Element'
-import { Scanner } from './Scanner'
-import { Component } from './Component'
-import { Instances } from './Instances'
-import { stripTemplateTag, dup } from './utils'
 
+import { buildtemplates } from './utils'
+import Element from './element'
+
+const templates = {}
 const components = {}
 
 export default {
 
-	start() {
-
-		const body: HTMLElement = document.body
-
-		stripTemplateTag( body )
-
-		Scanner.observe( body, createElement, disposeElement )
-		Scanner.scan( body, createElement )
+	register( name:string, module:any, dependencies: object ) {
+		components[name] = { name, module, dependencies }
 	},
 
-	register( name, module, dependencies = {} ) {
-		components[name] = { name, module, dependencies }
+	start() {
+		const body = document.body
+		buildtemplates( body, components, templates )
+		registerComponents()
 	}
 }
 
-const createElement = ( element: HTMLElement ) => {
-
-	const ElementInterface = Element( element )
-	const names = element.dataset.component.split(/\s/)
-
-	names.forEach( name => {
-
-		const C = components[name]
-
-		if( !C ) {
-			console.warn(`Jails - Module ${name} not registered`)
-			return
-		}
-
-		const { module, dependencies } = C
-		ElementInterface.model = Object.assign({}, module.model? dup(module.model) : null, ElementInterface.model )
-
-		const base = Component({ name, element, dependencies, ElementInterface })
-		const promise = module.default(base)
-
-		if( promise && promise.then ) {
-			ElementInterface.promises.push(promise)
-		}
-
-		base.__initialize()
-		ElementInterface.view = module.view || ElementInterface.view
-		ElementInterface.instances[name] = { methods: {} }
-	})
-
-	ElementInterface.update()
-}
-
-const disposeElement = ( node ) => {
-	const instance = Instances.get(node)
-	if( Instances.get(node) )
-		instance.dispose()
+const registerComponents = () => {
+	Object
+		.values( components )
+		.forEach( (component) => {
+			const { name, module, dependencies } = component
+			const Base = Element(module, dependencies, templates, components)
+			customElements.define(name, Base)
+		})
 }

package/src/template-system.ts

@@ -0,0 +1,86 @@
+import { compile, defaultConfig, filters } from 'squirrelly'
+import { decodeHtmlEntities } from './utils'
+
+defaultConfig.tags = ['{', '}']
+defaultConfig.useWith = true
+
+export default function templateSystem( element ) {
+
+	const tree = document.createElement('template')
+
+	tree.innerHTML = element.outerHTML.replace(/<\/?template[^>]*>/g, '')
+
+	directives(tree.content)
+
+	const html = decodeHtmlEntities(
+		tree.innerHTML
+			.replace(/html-(selected|checked|readonly|disabled|autoplay)=\"(.*)\"/g, `{@if ($2) }$1{/if}`)
+			.replace(/html-/g, '')
+	)
+
+	const template = compile(html, defaultConfig)
+
+	return ( data ) => {
+		return template(data, defaultConfig)
+	}
+}
+
+/**@Directives */
+
+const directives = (vdom) => {
+
+	const nodes = Array
+		.from(vdom.querySelectorAll('[html-for],[html-if],[html-foreach]'))
+		.reverse()
+
+	if (nodes.length) {
+
+		nodes.forEach(( node ) => {
+			if (node.getAttribute('html-foreach')) {
+				const instruction = node.getAttribute('html-foreach') || ''
+				const split = instruction.match(/(.*)\sin\s(.*)/) || ''
+				const varname = split[1]
+				const object = split[2]
+				node.removeAttribute('html-foreach')
+				node.setAttribute('scope', `{${varname} | JSON($key, '${varname}')}`)
+				const open = document.createTextNode(`{@foreach(${object}) => $key, ${varname}}`)
+				const close = document.createTextNode('{/foreach}')
+				wrap(open, node, close)
+			} else if (node.getAttribute('html-for')) {
+				const instruction = node.getAttribute('html-for') || ''
+				const split = instruction.match(/(.*)\sin\s(.*)/) || ''
+				const varname = split[1]
+				const object = split[2]
+				node.removeAttribute('html-for')
+				node.setAttribute('scope', `{${varname} | JSON($index, '${varname}')}`)
+				const open = document.createTextNode(`{@each(${object}) => ${varname}, $index}`)
+				const close = document.createTextNode('{/each}')
+				wrap(open, node, close)
+			} else if (node.getAttribute('html-if')) {
+				const instruction = node.getAttribute('html-if')
+				node.removeAttribute('html-if')
+				const open = document.createTextNode(`{@if (${instruction}) }`)
+				const close = document.createTextNode('{/if}')
+				wrap(open, node, close)
+			}
+		})
+	}
+
+	return vdom
+}
+
+filters.define('JSON', (scope, index, varname) => {
+
+	const key = index.constructor == String ? '$key' : '$index'
+	const newobject = { $index: index } as any
+
+	newobject[varname] = scope
+	newobject[key] = index
+
+	return JSON.stringify(newobject)
+})
+
+const wrap = (open, node, close) => {
+	node.parentNode?.insertBefore(open, node)
+	node.parentNode?.insertBefore(close, node.nextSibling)
+}

package/src/utils/{events.js → events.ts}

@@ -41,7 +41,7 @@ const delegate = (node, selector, callback) => {
 				e.delegateTarget = parent
 				callback.apply(element, [e].concat(detail.args))
 			}
-			if( parent === node ) break
+			if (parent === node) break
 			parent = parent.parentNode
 		}
 	}

package/src/utils/index.ts

@@ -0,0 +1,80 @@
+import templateSystem from '../template-system'
+
+const textarea = document.createElement('textarea')
+
+export const rAF = (fn) => {
+	if (requestAnimationFrame)
+		return requestAnimationFrame(fn)
+	else
+		return setTimeout(fn, 1000 / 60)
+}
+
+export const uuid = () => {
+	return 'xxxxxxxx'.replace(/[xy]/g, (c) => {
+		const r = Math.random() * 8 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8)
+		return v.toString(8)
+	})
+}
+
+export const stripTemplateTag = ( element ) => {
+	const templates = Array.from(element.querySelectorAll('template'))
+	// https://gist.github.com/harmenjanssen/07e425248779c65bc5d11b02fb913274
+	templates.forEach((template) => {
+		template.parentNode?.replaceChild(template.content, template)
+		stripTemplateTag(template.content)
+	})
+}
+
+export const dup = (o) => {
+	return JSON.parse(JSON.stringify(o))
+}
+
+export const createTemplateId = (element, templates ) => {
+
+	const tplid = element.getAttribute('tplid')
+
+	if (!tplid) {
+		const id = uuid()
+		element.setAttribute('tplid', id)
+		templates[id] = templateSystem(element)
+	}
+}
+
+export const buildtemplates = ( target, components, templates ) => {
+
+	return Array
+		.from(target.querySelectorAll('*'))
+		.filter((node) => node.tagName.toLowerCase() in components)
+		.reverse()
+		.map((node) => {
+			Array.from(node.querySelectorAll('template'))
+				.map((template) => buildtemplates(template.content, components, templates))
+			createTemplateId(node, templates)
+			return node
+		})
+}
+
+export const decodeHtmlEntities = ( str ) => {
+	textarea.innerHTML = str
+	return textarea.value
+}
+
+// http://crockford.com/javascript/memory/leak.html
+export const purge = (d) => {
+	var a = d.attributes, i, l, n
+	if (a) {
+		for (i = a.length - 1; i >= 0; i -= 1) {
+			n = a[i].name
+			if (typeof d[n] === 'function') {
+				d[n] = null
+			}
+		}
+	}
+	a = d.childNodes
+	if (a) {
+		l = a.length
+		for (i = 0; i < l; i += 1) {
+			purge(d.childNodes[i])
+		}
+	}
+}

package/src/utils/pubsub.ts

@@ -0,0 +1,20 @@
+const topics: any = {}
+const _async: any = {}
+
+export const publish = (name, params) => {
+	_async[name] = Object.assign({}, _async[name], params)
+	if (topics[name])
+		topics[name].forEach(topic => topic(params))
+}
+
+export const subscribe = (name, method) => {
+	topics[name] = topics[name] || []
+	topics[name].push(method)
+	if (name in _async) {
+		method(_async[name])
+	}
+	return () => {
+		topics[name] = topics[name].filter( fn => fn != method )
+	}
+}
+