jails-js 5.0.0-beta.11 → 5.0.0-beta.14

package/src/component.ts

@@ -2,19 +2,15 @@ import morphdom from 'morphdom'
 
 import { rAF, dup, buildtemplates } from './utils'
 import { on, off, trigger } from './utils/events'
-import { publish, subscribe, unsubscribe } from './utils/pubsub'
+import { publish, subscribe } from './utils/pubsub'
 
-type MainArgs = () => Array<Function>
+export default function Component( elm, { module, dependencies, templates, components }) {
 
-export default function Component(elm, { module, dependencies, templates, components }) {
-
-	const options = getOptions(module)
-
-	buildtemplates(elm, components, templates)
+	const options = getOptions( module )
+	buildtemplates( elm, components, templates )
 
 	const tplid = elm.getAttribute('tplid')
-
-	const template = templates[tplid]
+	const template = tplid ? templates[tplid] : null
 	const state = { data: module.model ? dup(module.model) : {} }
 
 	const base = {
@@ -23,9 +19,8 @@ export default function Component(elm, { module, dependencies, templates, compon
 		dependencies,
 		publish,
 		subscribe,
-		unsubscribe,
 
-		main(fn: MainArgs) {
+		main(fn) {
 			options.main = fn
 		},
 
@@ -37,26 +32,29 @@ export default function Component(elm, { module, dependencies, templates, compon
 			options.onupdate = fn
 		},
 
-		on(eventName: string, selectorOrCallback: object | Function, callback: Function) {
+		on(eventName, selectorOrCallback, callback) {
 			on(elm, eventName, selectorOrCallback, callback)
 		},
 
-		off(eventName: string, callback: Function) {
+		off(eventName, callback) {
 			off(elm, eventName, callback)
 		},
 
-		trigger(eventName: string, target: string, args: any) {
-			if (target.constructor === String)
-				trigger(elm.querySelector(target), eventName, { args: args })
+		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) => {
+		emit: ( ...args ) => {
 			trigger(elm, args.shift(), { args: args })
 		},
 
 		state: {
-			set(data: any) {
+			set( data ) {
 				if (data.constructor === Function) {
 					const newstate = dup(state.data)
 					data(newstate)
@@ -71,7 +69,7 @@ export default function Component(elm, { module, dependencies, templates, compon
 			}
 		},
 
-		render(data: object = state.data) {
+		render(data = state.data) {
 
 			if (!document.body.contains(elm))
 				return
@@ -84,17 +82,13 @@ export default function Component(elm, { module, dependencies, templates, compon
 			morphdom(elm, newhtml, morphdomOptions(elm, options))
 
 			rAF(_ => {
-				rAF(_ => {
-					Array
-						.from(elm.querySelectorAll('[tplid]'))
-						.forEach(child => {
-							child.options.onupdate(newdata)
-							child.base.render(newdata)
-						})
-				})
-
+				Array
+					.from(elm.querySelectorAll('[tplid]'))
+					.forEach((child: any) => {
+						child.options.onupdate(newdata)
+						child.base.render(newdata)
+					})
 			})
-
 		}
 	}
 
@@ -102,13 +96,13 @@ export default function Component(elm, { module, dependencies, templates, compon
 }
 
 const getOptions = (module) => ({
-	main: _ => _,
-	unmount: _ => _,
-	onupdate: _ => _,
-	view: module.view ? module.view : _ => _
+	main: (a) => a,
+	unmount: (a) => a,
+	onupdate: (a) => a,
+	view: module.view ? module.view : (a) => a
 })
 
-const morphdomOptions = (_parent, options) => ({
+const morphdomOptions = (_parent, options ) => ({
 
 	onNodeAdded: onUpdates(_parent, options),
 	onElUpdated: onUpdates(_parent, options),
@@ -123,7 +117,7 @@ const morphdomOptions = (_parent, options) => ({
 })
 
 const checkStatic = (node) => {
-	if ('static' in node.dataset) {
+	if ('static' in node.dataset || 'html-static' in node.attributes) {
 		return false
 	}
 }
@@ -134,10 +128,10 @@ const onUpdates = (_parent, options) => (node) => {
 
 		if (node.getAttribute && node.getAttribute('scope')) {
 
-			const scope = JSON.parse(node.getAttribute('scope').replace(/\'/g, '\"'))
+			const scope = JSON.parse((node.getAttribute('scope') ||'').replace(/\'/g, '\"'))
 
 			Array.from(node.querySelectorAll('[tplid]'))
-				.map(el => {
+				.map((el) => {
 					const data = Object.assign({}, _parent.base.state.get(), scope)
 					options.onupdate(data)
 					el.base.render(data)
@@ -146,4 +140,6 @@ const onUpdates = (_parent, options) => (node) => {
 			node.removeAttribute('scope')
 		}
 	}
+
+	return node
 }

package/src/element.ts

@@ -4,6 +4,10 @@ export default function Element(module, dependencies, templates, components) {
 
 	return class extends HTMLElement {
 
+		base: any
+		options: any
+		__events: any
+
 		constructor() {
 
 			super()

package/src/index.ts

@@ -1,26 +1,28 @@
+
 import { buildtemplates } from './utils'
 import Element from './element'
 
-export const templates = {}
-export const components = {}
+const templates = {}
+const components = {}
 
 export default {
 
-	register(name: string, module: any, dependencies: object = {}) {
+	register( name:string, module:any, dependencies: object ) {
 		components[name] = { name, module, dependencies }
 	},
 
 	start() {
 		const body = document.body
-		buildtemplates(body, components, templates)
+		buildtemplates( body, components, templates )
 		registerComponents()
 	}
 }
 
 const registerComponents = () => {
 	Object
-		.values(components)
-		.forEach(({ name, module, dependencies }) => {
+		.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

@@ -1,13 +1,10 @@
 import { compile, defaultConfig, filters } from 'squirrelly'
 import { decodeHtmlEntities } from './utils'
 
-const defaultOptions = {
-	...defaultConfig,
-	tags: ['{', '}'],
-	useWith: true
-}
+defaultConfig.tags = ['{', '}']
+defaultConfig.useWith = true
 
-export default function templateSystem(element) {
+export default function templateSystem( element ) {
 
 	const tree = document.createElement('template')
 
@@ -21,10 +18,10 @@ export default function templateSystem(element) {
 			.replace(/html-/g, '')
 	)
 
-	const template = compile(html, defaultOptions)
+	const template = compile(html, defaultConfig)
 
-	return (data) => {
-		return template(data, defaultOptions)
+	return ( data ) => {
+		return template(data, defaultConfig)
 	}
 }
 
@@ -38,10 +35,10 @@ const directives = (vdom) => {
 
 	if (nodes.length) {
 
-		nodes.forEach(node => {
+		nodes.forEach(( node ) => {
 			if (node.getAttribute('html-foreach')) {
-				const instruction = node.getAttribute('html-foreach')
-				const split = instruction.match(/(.*)\sin\s(.*)/)
+				const instruction = node.getAttribute('html-foreach') || ''
+				const split = instruction.match(/(.*)\sin\s(.*)/) || ''
 				const varname = split[1]
 				const object = split[2]
 				node.removeAttribute('html-foreach')
@@ -50,8 +47,8 @@ const directives = (vdom) => {
 				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 instruction = node.getAttribute('html-for') || ''
+				const split = instruction.match(/(.*)\sin\s(.*)/) || ''
 				const varname = split[1]
 				const object = split[2]
 				node.removeAttribute('html-for')
@@ -75,7 +72,7 @@ const directives = (vdom) => {
 filters.define('JSON', (scope, index, varname) => {
 
 	const key = index.constructor == String ? '$key' : '$index'
-	const newobject = { $index: index }
+	const newobject = { $index: index } as any
 
 	newobject[varname] = scope
 	newobject[key] = index
@@ -84,6 +81,6 @@ filters.define('JSON', (scope, index, varname) => {
 })
 
 const wrap = (open, node, close) => {
-	node.parentNode.insertBefore(open, node)
-	node.parentNode.insertBefore(close, node.nextSibling)
+	node.parentNode?.insertBefore(open, node)
+	node.parentNode?.insertBefore(close, node.nextSibling)
 }

package/src/utils/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

@@ -3,7 +3,10 @@ import templateSystem from '../template-system'
 const textarea = document.createElement('textarea')
 
 export const rAF = (fn) => {
-	(requestAnimationFrame || setTimeout)(fn, 1000 / 60)
+	if (requestAnimationFrame)
+		return requestAnimationFrame(fn)
+	else
+		return setTimeout(fn, 1000 / 60)
 }
 
 export const uuid = () => {
@@ -13,11 +16,11 @@ export const uuid = () => {
 	})
 }
 
-export const stripTemplateTag = (element) => {
+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)
+	templates.forEach((template) => {
+		template.parentNode?.replaceChild(template.content, template)
 		stripTemplateTag(template.content)
 	})
 }
@@ -26,7 +29,7 @@ export const dup = (o) => {
 	return JSON.parse(JSON.stringify(o))
 }
 
-export const createTemplateId = (element, templates) => {
+export const createTemplateId = (element, templates ) => {
 
 	const tplid = element.getAttribute('tplid')
 
@@ -37,21 +40,21 @@ export const createTemplateId = (element, templates) => {
 	}
 }
 
-export const buildtemplates = (target, components, templates) => {
+export const buildtemplates = ( target, components, templates ) => {
 
 	return Array
 		.from(target.querySelectorAll('*'))
-		.filter(node => node.tagName.toLowerCase() in components)
+		.filter((node) => node.tagName.toLowerCase() in components)
 		.reverse()
-		.map(node => {
+		.map((node) => {
 			Array.from(node.querySelectorAll('template'))
-				.map(template => buildtemplates(template.content, components, templates))
+				.map((template) => buildtemplates(template.content, components, templates))
 			createTemplateId(node, templates)
 			return node
 		})
 }
 
-export const decodeHtmlEntities = (str) => {
+export const decodeHtmlEntities = ( str ) => {
 	textarea.innerHTML = str
 	return textarea.value
 }

package/src/utils/pubsub.ts

@@ -1,5 +1,5 @@
-const topics = {}
-const _async = {}
+const topics: any = {}
+const _async: any = {}
 
 export const publish = (name, params) => {
 	_async[name] = Object.assign({}, _async[name], params)
@@ -13,13 +13,8 @@ export const subscribe = (name, method) => {
 	if (name in _async) {
 		method(_async[name])
 	}
-}
-
-export const unsubscribe = (topic) => {
-	topics[topic.name] = (topics[topic.name] || [])
-		.filter(t => t != topic.method)
-	if (!topics[topic.name].length) {
-		delete topics[topic.name]
-		delete _async[topic.name]
+	return () => {
+		topics[name] = topics[name].filter( fn => fn != method )
 	}
 }
+

package/tsconfig.json

@@ -1,16 +1,106 @@
 {
-	"compilerOptions": {
-		"baseUrl": "./src",
-		"outDir": "./dist/",
-		"target": "es6",
-		"allowJs": true,
-		"moduleResolution": "node",
-		"allowSyntheticDefaultImports": true,
-		"lib": [
-			"dom"
-		]
-	},
-	"exclude": [
-		"./node_modules"
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */
+
+    /* Projects */
+    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
+    /* Language and Environment */
+    "target": "ES2015",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "lib": ["es2015", "dom"],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+
+    /* Modules */
+    "module":"CommonJS",                                /* Specify what module code is generated. */
+    // "rootDir": "./src",                                  /* Specify the root folder within your source files. */
+    "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+
+    /* JavaScript Support */
+    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+
+    /* Emit */
+    "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "outFile": "types/index.d.ts",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+    "outDir": "types",                                   /* Specify an output folder for all emitted files. */
+    // "removeComments": true,                           /* Disable emitting comments. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+    // "declarationDir": "./dist/types",                 /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+
+    /* Type Checking */
+    // "strict": true,                                      /* Enable all strict type-checking options. */
+    "noImplicitAny": false,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+  },
+	"files": [
+		"src/index.ts"
 	]
 }

package/types/component.d.ts

@@ -0,0 +1,32 @@
+export default function Component(elm: any, { module, dependencies, templates, components }: {
+    module: any;
+    dependencies: any;
+    templates: any;
+    components: any;
+}): {
+    base: {
+        template: any;
+        elm: any;
+        dependencies: any;
+        publish: (name: any, params: any) => void;
+        subscribe: (name: any, method: any) => () => void;
+        main(fn: any): void;
+        unmount(fn: any): void;
+        onupdate(fn: any): void;
+        on(eventName: any, selectorOrCallback: any, callback: any): void;
+        off(eventName: any, callback: any): void;
+        trigger(eventName: any, target: any, args: any): void;
+        emit: (...args: any[]) => void;
+        state: {
+            set(data: any): Promise<unknown>;
+            get(): any;
+        };
+        render(data?: any): void;
+    };
+    options: {
+        main: (a: any) => any;
+        unmount: (a: any) => any;
+        onupdate: (a: any) => any;
+        view: any;
+    };
+};