jails-js 5.0.0-beta.6 → 5.0.0-beta.9

package/package.json

@@ -1,41 +1,43 @@
 {
-  "name": "jails-js",
-  "version": "5.0.0-beta.6",
-  "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-beta.9",
+	"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-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",
+		"template7": "^1.4.2"
+	}
 }

package/src/component.ts

@@ -0,0 +1,158 @@
+import morphdom from 'morphdom'
+
+import { rAF, dup, buildtemplates } from './utils'
+import { on, off, trigger } from './utils/events'
+import { publish, subscribe, unsubscribe } from './utils/pubsub'
+
+type MainArgs = () => Array<Function>
+
+export default function Component(elm, { module, dependencies, templates, components }) {
+
+	const options = getOptions(module)
+
+	buildtemplates(elm, components, templates)
+
+	const tplid = elm.getAttribute('tplid')
+	const template = templates[tplid]
+	const state = { data: module.model ? dup(module.model) : {} }
+
+	let batchUpdates = []
+
+	const base = {
+		template,
+		elm,
+		dependencies,
+		publish,
+		subscribe,
+		unsubscribe,
+
+		main(fn: MainArgs) {
+			options.main = fn
+		},
+
+		unmount(fn) {
+			options.unmount = fn
+		},
+
+		onupdate(fn) {
+			options.onupdate = fn
+		},
+
+		on(eventName: string, selectorOrCallback: object | Function, callback: Function) {
+			on(elm, eventName, selectorOrCallback, callback)
+		},
+
+		off(eventName: string, callback: Function) {
+			off(elm, eventName, callback)
+		},
+
+		trigger(eventName: string, target: string, args: any) {
+			if (target.constructor === String)
+				trigger(elm.querySelector(target), eventName, { args: args })
+			else trigger(elm, eventName, { args: target })
+		},
+
+		emit: (...args) => {
+			trigger(elm, args.shift(), { args: args })
+		},
+
+		state: {
+			set(data: any) {
+				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: object = state.data) {
+
+			if (!document.body.contains(elm))
+				return
+
+			batchUpdates.push(data)
+
+			rAF(() => {
+				rAF(() => {
+					if (batchUpdates.length) {
+
+						const batchData = {}
+						batchUpdates.forEach(d => Object.assign(batchData, d))
+						batchUpdates = []
+
+						state.data = Object.assign(state.data, batchData)
+
+						const newdata = dup(state.data)
+						const newhtml = base.template(options.view(newdata))
+
+						morphdom(elm, newhtml, morphdomOptions(elm, options))
+
+						Array
+							.from(elm.querySelectorAll('[tplid]'))
+							.map(child => {
+								child.options.onupdate(newdata)
+								child.base.render(newdata)
+								return child
+							})
+					}
+				})
+			})
+		}
+	}
+
+	return { base, options }
+}
+
+const getOptions = (module) => ({
+	main: _ => _,
+	unmount: _ => _,
+	onupdate: _ => _,
+	view: module.view ? module.view : _ => _
+})
+
+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 node.dataset.key || node.getAttribute('tplid')
+		return false
+	}
+})
+
+const checkStatic = (node) => {
+	if ('static' in node.dataset) {
+		return false
+	}
+}
+
+const onUpdates = (_parent, options) => (node) => {
+
+	if (node.nodeType === 1) {
+
+		if (node.getAttribute && node.getAttribute('scope')) {
+
+			const scope = JSON.parse(node.getAttribute('scope').replace(/\'/g, '\"'))
+
+			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')
+		}
+	}
+}

package/src/element.ts

@@ -0,0 +1,35 @@
+import Component from './component'
+
+export default function Element(module, dependencies, templates, components) {
+
+	return class extends HTMLElement {
+
+		constructor() {
+
+			super()
+
+			const { base, options } = Component(this, { module, dependencies, templates, components })
+
+			this.base = base
+			this.options = options
+
+			module.default(base)
+		}
+
+		connectedCallback() {
+			this.base.render()
+			this.options.main().forEach(f => f(this.base))
+		}
+
+		disconnectedCallback() {
+			this.options.unmount(this.base)
+			delete this.options
+			delete this.base
+			delete this.__events
+		}
+
+		attributeChangedCallback() {
+			//TODO
+		}
+	}
+}

package/src/index.ts

@@ -1,62 +1,28 @@
-import { Element } from './Element'
-import { Scanner } from './Scanner'
-import { Component } from './Component'
-import { Instances } from './Instances'
-import { stripTemplateTag, dup } from './utils'
+import { buildtemplates, stripTemplateTag } from './utils'
+import Element from './element'
 
-const components = {}
+export const templates = {}
+export 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
+		stripTemplateTag(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(({ name, module, dependencies }) => {
+			const Base = Element(module, dependencies, templates, components)
+			customElements.define(name, Base)
+		})
 }

package/src/template-system.ts

@@ -0,0 +1,89 @@
+import { compile, defaultConfig, filters } from 'squirrelly'
+import { stripTemplateTag, decodeHtmlEntities } from './utils'
+
+const defaultOptions = {
+	...defaultConfig,
+	tags: ['{', '}'],
+	useWith: true
+}
+
+export default function templateSystem(element) {
+
+	const vdom = element.cloneNode(true)
+
+	stripTemplateTag(vdom)
+
+	const newvdom = directives(vdom)
+
+	const html = decodeHtmlEntities(
+		newvdom.outerHTML
+			.replace(/html-(selected|checked|readonly|disabled|autoplay)=\"(.*)\"/g, `{@if ($2) }$1{/if}`)
+			.replace(/html-/g, '')
+	)
+
+	const template = compile(html, defaultOptions)
+
+	return (data) => {
+		return template(data, defaultOptions)
+	}
+}
+
+/**@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 }
+
+	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/index.ts

@@ -0,0 +1,58 @@
+import templateSystem from '../template-system'
+
+const textarea = document.createElement('textarea')
+
+export const rAF = (fn) => {
+	(requestAnimationFrame || 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)
+		return templates[id]
+	}
+
+	return templates[tplid]
+}
+
+export const buildtemplates = (target, components, templates) => {
+
+	return Array
+		.from(target.querySelectorAll('*'))
+		.filter(node => node.tagName.toLocaleLowerCase() in components)
+		.reverse()
+		.map(node => {
+			createTemplateId(node, templates)
+			return node
+		})
+}
+
+export const decodeHtmlEntities = (str) => {
+	textarea.innerHTML = str
+	return textarea.value
+}

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

@@ -3,14 +3,14 @@ const _async = {}
 
 export const publish = (name, params) => {
 	_async[name] = Object.assign({}, _async[name], params)
-	if( topics[name] )
+	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 ) {
+	if (name in _async) {
 		method(_async[name])
 	}
 }

package/tsconfig.json

@@ -1,6 +1,16 @@
 {
 	"compilerOptions": {
-		"lib": [ "dom" ],
-		"sourceMap": true
-	}
+		"baseUrl": "./src",
+		"outDir": "./dist/",
+		"target": "es6",
+		"allowJs": true,
+		"moduleResolution": "node",
+		"allowSyntheticDefaultImports": true,
+		"lib": [
+			"dom"
+		]
+	},
+	"exclude": [
+		"./node_modules"
+	]
 }

package/src/Component.ts

@@ -1,123 +0,0 @@
-import * as Pubsub from './utils/pubsub'
-import { on, off, trigger } from './utils/events'
-import { rAF } from './utils'
-import { Instances } from './Instances'
-
-export const Component = ({
-
-	name,
-	element,
-	dependencies,
-	ElementInterface
-
-}) => {
-
-	const subscriptions = []
-
-	let stateSubscriptions = []
-	let resolver
-	let promise = new Promise(resolve => resolver = resolve)
-
-	const base = {
-
-		name,
-		dependencies,
-		elm: element,
-		publish: Pubsub.publish,
-		unsubscribe: Pubsub.unsubscribe,
-
-		__initialize() {
-			resolver(base)
-		},
-
-		main(fn) {
-			promise
-				.then( _ => fn().forEach(lambda => lambda(base)))
-				.catch( err => console.error( err) )
-		},
-
-		expose(methods) {
-			ElementInterface.instances[name].methods = methods
-		},
-
-		state: {
-			set( state ) {
-				if( state.constructor === Function ){
-					const model = ElementInterface.model
-					state(model)
-					ElementInterface.update(model)
-				} else {
-					ElementInterface.update(state)
-				}
-				stateSubscriptions.forEach( fn => fn(ElementInterface.model) )
-				return new Promise((resolve) => rAF(_ => rAF(resolve) ))
-			},
-			get() {
-				return ElementInterface.model
-			},
-			subscribe(fn){
-				stateSubscriptions.push(fn)
-			},
-			unsubscribe(fn){
-				stateSubscriptions = stateSubscriptions.filter( item => item !== fn )
-			}
-		},
-
-		destroy(callback) {
-			ElementInterface.destroyers.push(callback)
-		},
-
-		on(name, selectorOrCallback, callback) {
-			on(element, name, selectorOrCallback, callback)
-		},
-
-		off(name, callback) {
-			off(element, name, callback)
-		},
-
-		trigger(ev, target, args) {
-			if (target.constructor === String)
-				trigger(element.querySelector(target), ev, { args: args })
-			else trigger(element, ev, { args: target })
-		},
-
-		emit(n, params) {
-			const args = Array.prototype.slice.call(arguments)
-			trigger(element, args.shift(), { args: args })
-		},
-
-		update(fn) {
-			ElementInterface.parentUpdate = fn
-		},
-
-		get(name, query) {
-
-			return function () {
-				const args = Array.prototype.slice.call(arguments),
-				method = args.shift(),
-				selector = `[data-component*=${name}]`
-				query = query ? selector + query : selector
-
-				Array.from(element.querySelectorAll(query))
-					.forEach(el => {
-						const instance = Instances.get(el).instances[name]
-						if (instance && (method in instance.methods))
-							instance.methods[method].apply(null, args)
-					})
-
-				if (element.matches(query)) {
-					const instance = Instances.get(element).instances[name]
-					if (instance && method in instance.methods)
-						instance.methods[method].apply(null, args)
-				}
-			}
-		},
-
-		subscribe(name, method) {
-			subscriptions.push({ name, method })
-			Pubsub.subscribe(name, method)
-		}
-	}
-
-	return base
-}