implab/implabjs-djx Commit - r101:bb6b1db1b430

Testing nested watch, release candidate

cin -

r101:bb6b1db1b430 v1.3

parent child

Context file:

r101:bb6b1db1b430

Collapse all files

gradle.properties created 644 +1 0

	@@ -0,0 +1,1
				1	symbols=local No newline at end of file

djx/gradle.properties 0 -1

             group=org.implab.implabjs
             version=
             author=Implab team
             description=Create HyperText with Typescript, integrate Dojo1 widgets in your .tsx scripts.
             license=BSD-2-Clause
             repository=http://hg.code.sf.net/p/implabjs/djx
             npmScope=implab
-            symbols=pack
  No newline at end of file

djx/src/main/ts/observable.ts +3 -3

             import { IDestroyable } from "@implab/core-amd/interfaces";
             export interface Sink<T> {
                 next: (value: T) => void;
                 error: (e: unknown) => void;
                 complete: () => void;
             }
             export type Consumer<T> = Partial<Sink<T>>;
             export type Producer<T> = (sink: Sink<T>) => (void | (() => void));
             export interface Observable<T> {
                 on(consumer: Partial<Sink<T>>): IDestroyable;
             }
             const noop = () => {};
             const sink = <T>(consumer: Consumer<T>) => {
                 const { next = noop, error = noop, complete = noop } = consumer;
                 let done = false;
                 return {
-                    next: (value: T) => done && next(value),
+                    next: (value: T) => !done && next(value),
-                    error: (e: unknown) => done && (done = true, error(e)),
+                    error: (e: unknown) => !done && (done = true, error(e)),
-                    complete: () => done && (done = true, complete())
+                    complete: () => !done && (done = true, complete())
                 };
             }
             export const observe = <T>(producer: Producer<T>) : Observable<T> => ({
                 on: (consumer: Consumer<T>) => ({
                     destroy: producer(sink(consumer)) ?? noop
                 })
             });

djx/src/main/ts/tsx.ts +2 0

             import { Constructor } from "@implab/core-amd/interfaces";
             import { HtmlRendition } from "./tsx/HtmlRendition";
             import { WidgetRendition } from "./tsx/WidgetRendition";
             import { isWidgetConstructor, Rendition } from "./tsx/traits";
             import { FunctionRendition } from "./tsx/FunctionRendition";
             import Stateful = require("dojo/Stateful");
             import _WidgetBase = require("dijit/_WidgetBase");
             import { DjxWidgetBase } from "./tsx/DjxWidgetBase";
             import { WatchRendition } from "./tsx/WatchRendition";
             import { observe } from "./observable";
             export function createElement<T extends Constructor | string | ((props: any) => Element)>(elementType: T, ...args: any[]): Rendition {
                 if (typeof elementType === "string") {
                     const ctx = new HtmlRendition(elementType);
                     if (args)
                         args.forEach(x => ctx.visitNext(x));
                     return ctx;
                 } else if (isWidgetConstructor(elementType)) {
                     const ctx = new WidgetRendition(elementType);
                     if (args)
                         args.forEach(x => ctx.visitNext(x));
                     return ctx;
                 } else if (typeof elementType === "function") {
                     const ctx = new FunctionRendition(elementType as (props: any) => Element);
                     if (args)
                         args.forEach(x => ctx.visitNext(x));
                     return ctx;
                 } else {
                     throw new Error(`The element type '${elementType}' is unsupported`);
                 }
             }
             export interface EventDetails<T = any> {
                 detail: T;
             }
             export interface EventSelector {
                 selectorTarget: HTMLElement;
                 target: HTMLElement;
             }
             export type DojoMouseEvent<T = any> = MouseEvent & EventSelector & EventDetails<T>;
             type StatefulProps<T> = T extends Stateful<infer A> ? A : never;
             /**
              * Observers the property and calls render callback each change.
              *
              * @param target The target object which property will be observed.
              * @param prop The name of the property.
              * @param render The callback which will be called every time the value is changed
              * @returns Rendition which is created instantly
              */
             export function watch<W extends _WidgetBase, K extends keyof W>(
                 target: W,
                 prop: K,
                 render: (model: W[K]) => any
             ): Rendition;
             /**
              * Observers the property and calls render callback each change.
              *
              * @param target The target object which property will be observed.
              * @param prop The name of the property.
              * @param render The callback which will be called every time the value is changed
              * @returns Rendition which is created instantly
              */
             export function watch<T extends Stateful, K extends keyof StatefulProps<T>>(
                 target: T,
                 prop: K,
                 render: (model: StatefulProps<T>[K]) => any
             ): Rendition;
             export function watch<T extends Stateful, K extends keyof StatefulProps<T> & string>(
                 target: T,
                 prop: K,
                 render: (model: StatefulProps<T>[K]) => any
             ) {
                 return new WatchRendition(
                     render,
                     observe(({next}) => {
                         const h = target.watch(
                             prop,
                             (_prop, oldValue, newValue) => oldValue !== newValue && next(newValue)
                         );
+                        next(target.get(prop));
                         return () => h.remove();
                     })
                 )
             }
             /** Decorates the method which will be registered as the handle for the specified event.
              * This decorator can be applied to DjxWidgetBase subclass methods.
              *
              * ```
              *  @on("click")
              *  _onClick(eventObj: MouseEvent) {
              *      // ...
              *  }
              * ```
              */
             export const on = <E extends string>(...eventNames: E[]) =>
                 <K extends string,
                     T extends DjxWidgetBase<any, { [p in E]: EV }>,
                     EV extends Event
                 >(
                     target: T,
                     key: K,
                     _descriptor: TypedPropertyDescriptor<(eventObj: EV) => void> | TypedPropertyDescriptor<() => void>
                 ): any => {
                     const handlers = eventNames.map(eventName => ({ eventName, handlerMethod: key }));
                     target._eventHandlers = target._eventHandlers ? target._eventHandlers.concat(handlers) : handlers;
                 };

djx/src/main/ts/tsx/FunctionRendition.ts +3 -6

             import { argumentNotNull } from "@implab/core-amd/safe";
             import { getItemDom } from "./render";
             import { RenditionBase } from "./RenditionBase";
-            import { IScope } from "./Scope";
             export class FunctionRendition extends RenditionBase<Node> {
                 private _component: (...args: any[]) => any;
                 private _node: Node | undefined;
                 constructor(component: (...args: any[]) => any) {
                     super();
                     argumentNotNull(component, "component");
                     this._component = component;
                 }
-                protected _create(attrs: object, children: any[], scope: IScope) {
+                protected _create(attrs: object, children: any[]) {
                     const _attrs: any = attrs || {};
-                    const _children = children.map(x => getItemDom(x, scope));
+                    const _children = children.map(x => getItemDom(x));
                     this._node = getItemDom(
-                        this._component.call(null, { ..._attrs, children: _children }),
+                        this._component.call(null, { ..._attrs, children: _children }));
-                        scope
-                    );
                 }
                 protected _getDomNode() {
                     if (!this._node)
                         throw new Error("The instance of the widget isn't created");
                     return this._node;
                 }
             }

djx/src/main/ts/tsx/HtmlRendition.ts +19 -7

-            import dom = require("dojo/dom-construct");
+            import djDom = require("dojo/dom-construct");
+            import djAttr = require("dojo/dom-attr");
             import { argumentNotEmptyString } from "@implab/core-amd/safe";
             import { RenditionBase } from "./RenditionBase";
             import { placeAt } from "./traits";
             import { IScope } from "./Scope";
-            import { getItemDom } from "./render";
+            import { getItemDom, renderHook } from "./render";
-            export class HtmlRendition extends RenditionBase<HTMLElement> {
+            export class HtmlRendition extends RenditionBase<Element> {
                 elementType: string;
-                _element: HTMLElement | undefined;
+                _element: Element | undefined;
                 constructor(elementType: string) {
                     argumentNotEmptyString(elementType, "elementType");
                     super();
                     this.elementType = elementType;
                 }
                 _addChild(child: unknown, scope: IScope): void {
                     if (!this._element)
                         throw new Error("The HTML element isn't created");
-                    placeAt(getItemDom(child, scope), this._element);
+                    placeAt(getItemDom(child), this._element);
                 }
-                _create(attrs: object, children: unknown[], scope: IScope) {
+                _create({ xmlns, ref, ...attrs }: { xmlns?: string, ref?: JSX.Ref<Element> }, children: unknown[], scope: IScope) {
-                    this._element = dom.create(this.elementType, attrs);
+                    if (xmlns) {
+                        this._element = document.createElementNS(xmlns, this.elementType);
+                        djAttr.set(this._element, attrs);
+                    } else {
+                        this._element = djDom.create(this.elementType, attrs);
+                    }
                     children.forEach(v => this._addChild(v, scope));
+                    const element =  this._element;
+                    if (ref)
+                        renderHook(() => ref(element));
                 }
                 _getDomNode() {
                     if (!this._element)
                         throw new Error("The HTML element isn't created");
                     return this._element;
                 }
             }

djx/src/main/ts/tsx/WatchRendition.ts +8 -8

             import { id as mid } from "module";
             import { TraceSource } from "@implab/core-amd/log/TraceSource";
             import { argumentNotNull } from "@implab/core-amd/safe";
-            import { getItemDom, render } from "./render";
+            import { getScope, render } from "./render";
             import { RenditionBase } from "./RenditionBase";
-            import { IScope, Scope } from "./Scope";
+            import { Scope } from "./Scope";
             import { Observable } from "../observable";
+            import { destroy } from "./traits";
             const trace = TraceSource.get(mid);
             export class WatchRendition<T> extends RenditionBase<Node> {
                 private readonly _component: (arg: T) => unknown;
                 private _node: Node;
                 private readonly _scope = new Scope();
                 private readonly _subject: Observable<T>;
                 constructor(component: (arg: T) => unknown, subject: Observable<T>) {
                     super();
                     argumentNotNull(component, "component");
                     this._component = component;
                     this._subject = subject;
                     this._node = document.createComment("WatchRendition placeholder");
                 }
-                protected _create(attrs: object, children: any[], scope: IScope) {
+                protected _create(attrs: object, children: any[]) {
+                    const scope = getScope();
                     scope.own(this._scope);
                     scope.own(this._subject.on({ next: this._onValue }));
                 }
                 private _onValue = (value: T) =>
                     void this._render(value).catch( e => trace.error(e));
                 private async _render(value: T) {
-                    const prevNode = this._node;
                     this._scope.clean();
+                    const [refNode, ...rest] = await render(this._component(value), this._node, "replace", this._scope);
-                    this._node = await render(this._component(value), this._scope);
+                    this._node = refNode;
+                    this._scope.own(() => rest.forEach(destroy));
-                    this.placeAt(prevNode, "replace");
                 }
                 protected _getDomNode() {
                     if (!this._node)
                         throw new Error("The instance of the widget isn't created");
                     return this._node;
                 }
             }

djx/src/main/ts/tsx/WidgetRendition.ts +15 -10

             import { argumentNotNull } from "@implab/core-amd/safe";
             import { RenditionBase } from "./RenditionBase";
             import { DojoNodePosition, isElementNode, isInPage, isWidget, placeAt } from "./traits";
             import registry = require("dijit/registry");
             import ContentPane = require("dijit/layout/ContentPane");
             import { IScope } from "./Scope";
-            import { getItemDom, getScope } from "./render";
+            import { getItemDom, getScope, renderHook } from "./render";
             // tslint:disable-next-line: class-name
             export interface _Widget {
                 domNode: Node;
                 containerNode?: Node;
                 placeAt?(refNode: string | Node, position?: DojoNodePosition): void;
                 startup?(): void;
-                addChild?(widget: any, index?: number): void;
+                addChild?(widget: unknown, index?: number): void;
             }
-            export type _WidgetCtor = new (attrs: any, srcNode?: string | Node) => _Widget;
+            export type _WidgetCtor = new (attrs: {}, srcNode?: string | Node) => _Widget;
             export class WidgetRendition extends RenditionBase<Node> {
                 readonly widgetClass: _WidgetCtor;
                 _instance: _Widget | undefined;
                 constructor(widgetClass: _WidgetCtor) {
                     super();
                     argumentNotNull(widgetClass, "widgetClass");
                     this.widgetClass = widgetClass;
                 }
-                _addChild(child: any, scope: IScope): void {
+                _addChild(child: unknown, scope: IScope): void {
                     const instance = this._getInstance();
                     if (instance.addChild) {
                         if (child instanceof WidgetRendition) {
                             // layout containers add custom logic to addChild methods
                             instance.addChild(child.getWidgetInstance(scope));
                         } else if (isWidget(child)) {
                             instance.addChild(child);
                         } else {
-                            const childDom = getItemDom(child, scope);
+                            const childDom = getItemDom(child);
                             const w = isElementNode(childDom) ? registry.byNode(childDom) : undefined;
                             if (w) {
                                 instance.addChild(w);
                             } else {
                                 if (!instance.containerNode)
                                     throw new Error("Failed to add DOM content. The widget doesn't have a containerNode");
                                 // the current widget isn't started, it's children shouldn't start too
-                                placeAt(getItemDom(child,scope), instance.containerNode, "last");
+                                placeAt(getItemDom(child), instance.containerNode, "last");
                             }
                         }
                     } else {
                         if (!instance.containerNode)
                             throw new Error("The widget doesn't have neither addChild nor containerNode");
                         // the current widget isn't started, it's children shouldn't start too
-                        placeAt(getItemDom(child, scope), instance.containerNode, "last");
+                        placeAt(getItemDom(child), instance.containerNode, "last");
                     }
                 }
-                protected _create(attrs: any, children: any[], scope: IScope) {
+                protected _create({ref, ...attrs}: {ref?: JSX.Ref<_Widget>}, children: unknown[], scope: IScope) {
                     if (this.widgetClass.prototype instanceof ContentPane) {
                         // a special case for the ContentPane this is for
-                        // the compatibility with this heavy widget, all
+                        // compatibility with that heavy widget, all
                         // regular containers could be easily manipulated
                         // through `containerNode` property or `addChild` method.
                         // render children to the DocumentFragment
                         const content = document.createDocumentFragment();
-                        children.forEach(child => content.appendChild(getItemDom(child, scope)));
+                        children.forEach(child => content.appendChild(getItemDom(child)));
                         // set the content property to the parameters of the widget
                         const _attrs = { ...attrs, content };
                         this._instance = new this.widgetClass(_attrs);
                     } else {
                         this._instance = new this.widgetClass(attrs);
                         children.forEach(x => this._addChild(x, scope));
                     }
+                    if (ref) {
+                        const instance = this._instance;
+                        renderHook(() => ref(instance));
+                    }
                 }
                 private _getInstance() {
                     if (!this._instance)
                         throw new Error("The instance of the widget isn't created");
                     return this._instance;
                 }
                 protected _getDomNode() {
                     if (!this._instance)
                         throw new Error("The instance of the widget isn't created");
                     return this._instance.domNode;
                 }
                 /** Overrides default placeAt implementation. Calls placeAt of the
                  * widget and then starts it.
                  *
                  * @param refNode A node or id of the node where the widget should be placed.
                  * @param position A position relative to refNode.
                  */
                 placeAt(refNode: string | Node, position?: DojoNodePosition) {
                     this.ensureCreated(getScope());
                     const instance = this._getInstance();
                     if (typeof instance.placeAt === "function") {
                         instance.placeAt(refNode, position);
                         // fix the dojo startup behavior when the widget is placed
                         // directly to the document and doesn't have any enclosing widgets
                         const parentWidget = instance.domNode.parentNode ?
                             registry.getEnclosingWidget(instance.domNode.parentNode) : null;
                         if (!parentWidget && isInPage(instance.domNode) && typeof instance.startup === "function")
                             instance.startup();
                     } else {
                         // the widget doesn't have a placeAt method, strange but whatever
                         super.placeAt(refNode, position);
                     }
                 }
                 getWidgetInstance(scope?: IScope) {
                     this.ensureCreated(scope || getScope());
                     return this._getInstance();
                 }
             }

djx/src/main/ts/tsx/render.ts +54 -10

-            import { IScope, Scope } from "./Scope";
+            import { TraceSource } from "@implab/core-amd/log/TraceSource";
-            import { destroy, isNode, isRendition, isWidget, Rendition } from "./traits";
+            import { isPromise } from "@implab/core-amd/safe";
+            import { id as mid } from "module";
+            import { Scope } from "./Scope";
+            import { autostartWidgets, collectNodes, DojoNodePosition, isDocumentFragmentNode, isNode, isRendition, isWidget, placeAt } from "./traits";
+            const trace = TraceSource.get(mid);
             let _scope = Scope.dummy;
-            const beginRender = async () => {
+            let renderCount = 0;
+            const hooks: (() => void)[] = [];
+            const guard = (cb: () => unknown) => {
+                try {
+                    const result = cb()
+                    if (isPromise(result)) {
+                        const warn = (ret: unknown) => trace.error("The callback {0} competed asynchronously. result = {1}", cb, ret);
+                        result.then(warn, warn);
+                    }
+                } catch (e) {
+                    trace.error(e);
+                }
             }
+            /**
+             * Schedules rendering micro task
+             * @returns Promise
+             */
+            const beginRender = () => {
+                renderCount++;
+                return Promise.resolve();
+            }
+            /**
+             * Completes render operation
+             */
             const endRender = () => {
+                if (!--renderCount) {
+                    hooks.forEach(guard);
+                    hooks.length = 0;
+                }
+            }
+            export const renderHook = (hook: () => void) => {
+                if (renderCount)
+                    hooks.push(hook);
+                else
+                    guard(hook);
             }
             /** Returns the current scope */
             export const getScope = () => _scope;
             /** Schedules the rendition to be rendered to the DOM Node
              * @param rendition The rendition to be rendered
              * @param scope The scope
              */
-            export const render = async (rendition: unknown, scope = Scope.dummy) => {
+            export const render = async (rendition: unknown, refNode: Node, position: DojoNodePosition = "last", scope = Scope.dummy) => {
                 await beginRender();
                 const prev = _scope;
                 _scope = scope;
                 try {
-                    const node = getItemDom(rendition, scope);
+                    const domNode = getItemDom(rendition);
-                    scope.own(() => destroy(node));
+                    const startupPending = isDocumentFragmentNode(domNode) ? collectNodes(domNode.children) : [domNode];
-                    return node;
+                    placeAt(domNode, refNode, position);
+                    startupPending.forEach(autostartWidgets);
+                    return startupPending;
                 } finally {
                     _scope = prev;
                     endRender();
                 }
             }
             /** Renders DOM element for different types of the argument. */
-            export const getItemDom = (v: unknown, scope: IScope) => {
+            export const getItemDom = (v: unknown) => {
                 if (typeof v === "string" || typeof v === "number" || v instanceof RegExp || v instanceof Date) {
                     // primitive types converted to the text nodes
                     return document.createTextNode(v.toString());
                 } else if (isNode(v)) {
                     // nodes are kept as is
                     return v;
                 } else if (isRendition(v)) {
                     // renditions are instantiated
-                    return v.getDomNode(scope);
+                    return v.getDomNode();
                 } else if (isWidget(v)) {
                     // widgets are converted to it's markup
                     return v.domNode;
                 } else if (typeof v === "boolean" || v === null || v === undefined) {
                     // null | undefined | boolean are removed, converted to comments
                     return document.createComment(`[${typeof v} ${String(v)}]`);
                 } else if (v instanceof Array) {
                     // arrays will be translated to document fragments
                     const fragment = document.createDocumentFragment();
-                    v.map(item => getItemDom(item, scope))
+                    v.map(item => getItemDom(item))
                         .forEach(node => fragment.appendChild(node));
                     return fragment;
                 } else {
                     // bug: explicit error otherwise
                     throw new Error("Invalid parameter: " + v);
                 }
             }

djx/src/main/ts/tsx/traits.ts +3 -4

             import { IDestroyable } from "@implab/core-amd/interfaces";
             import { isDestroyable } from "@implab/core-amd/safe";
             import _WidgetBase = require("dijit/_WidgetBase");
             import registry = require("dijit/registry");
-            import { IScope } from "./Scope";
             interface _WidgetBaseConstructor {
                 new <A = {}, E extends { [k in keyof E]: Event } = {}>(params?: Partial<_WidgetBase<E> & A>, srcNodeRef?: dojo.NodeOrString): _WidgetBase<E> & dojo._base.DeclareCreatedObject;
                 prototype: _WidgetBase<any>;
             }
             export type DojoNodePosition = "first" | "after" | "before" | "last" | "replace" | "only" | number;
             export type DojoNodeLocation = [Node, DojoNodePosition];
             export interface Rendition<TNode extends Node = Node> {
-                getDomNode(scope?: IScope): TNode;
+                getDomNode(): TNode;
                 placeAt(refNode: string | Node, position?: DojoNodePosition): void;
             }
             /**
              * @deprecated use Rendition
              */
             export type BuildContext<TNode extends Node = Node> = Rendition<TNode>;
             export interface IRecursivelyDestroyable {
                 destroyRecursive(): void;
             }
             export const isNode = (el: unknown): el is Node => !!(el && (el as Node).nodeName && (el as Node).nodeType);
             export const isElementNode = (el: unknown): el is Element => isNode(el) && el.nodeType === 1;
             export const isTextNode = (el: unknown): el is Text => isNode(el) && el.nodeType === 3;
             export const isProcessingInstructionNode = (el: unknown): el is ProcessingInstruction => isNode(el) && el.nodeType === 7;
             export const isCommentNode = (el: unknown): el is Comment => isNode(el) && el.nodeType === 8;
             export const isDocumentNode = (el: unknown): el is Document => isNode(el) && el.nodeType === 9;
             export const isDocumentTypeNode = (el: unknown): el is DocumentType => isNode(el) && el.nodeType === 10;
             export const isDocumentFragmentNode = (el: any): el is DocumentFragment => isNode(el) && el.nodeType === 11;
             export const isWidget = (v: unknown): v is _WidgetBase => !!(v && "domNode" in (v as _WidgetBase));
             export const isRendition = (v: unknown): v is Rendition => !!(v && typeof (v as Rendition).getDomNode === "function");
             /**
              * @deprecated use isRendition
              */
             export const isBuildContext = isRendition;
             export const isPlainObject = (v: object) => {
                 if (typeof v !== "object")
                     return false;
                 const vp = Object.getPrototypeOf(v);
                 return !vp || vp === Object.prototype;
             }
             export const isWidgetConstructor = (v: unknown): v is _WidgetBaseConstructor =>
                 typeof v === "function" && v.prototype && (
                     "domNode" in v.prototype ||
                     "buildRendering" in v.prototype
                 );
             /** Tests whether the specified node is placed in visible dom.
              *  @param {Node} node The node to test
              */
             export const isInPage = (node: Node) => node === document.body ? false : document.body.contains(node);
             export const isRecursivelyDestroyable = (target: unknown): target is IRecursivelyDestroyable =>
                 !!(target && typeof (target as IRecursivelyDestroyable).destroyRecursive === "function");
             /** Destroys DOM Node with all contained widgets.
              * If the specified node is the root node of a widget, then the
              * widget will be destroyed.
              *
              * @param target DOM Node or widget to destroy
              */
             export const destroy = (target: Node | IDestroyable | IRecursivelyDestroyable) => {
                 if (isRecursivelyDestroyable(target)) {
                     target.destroyRecursive();
                 } else if (isDestroyable(target)) {
                     target.destroy();
                 } else if (isNode(target)) {
                     if (isElementNode(target)) {
                         const w = registry.byNode(target);
                         if (w) {
                             w.destroyRecursive();
                         } else {
                             emptyNode(target);
                             const parent = target.parentNode;
                             if (parent)
                                 parent.removeChild(target);
                         }
                     }
                 }
             }
             /** Empties a content of the specified node and destroys all contained widgets.
              *
              * @param target DOM node to empty.
              */
             export const emptyNode = (target: Node) => {
                 registry.findWidgets(target).forEach(destroy);
-                for(let c; c = target.lastChild;){ // intentional assignment
+                for (let c; c = target.lastChild;) { // intentional assignment
                     target.removeChild(c);
                 }
             }
             /** This function starts all widgets inside the DOM node if the target is a node
              * or starts widget itself if the target is the widget. If the specified node
              * associated with the widget that widget will be started.
              *
              * @param target DOM node to find and start widgets or the widget itself.
              */
             export const startupWidgets = (target: Node | _WidgetBase, skipNode?: Node) => {
                 if (isNode(target)) {
                     if (isElementNode(target)) {
                         const w = registry.byNode(target);
                         if (w) {
                             if (w.startup)
                                 w.startup();
                         } else {
                             registry.findWidgets(target, skipNode).forEach(x => x.startup());
                         }
                     }
                 } else {
                     if (target.startup)
                         target.startup();
                 }
             }
             /** Places the specified DOM node at the specified location.
              *
              * @param node The node which should be placed
              * @param refNodeOrId The reference node where the created
              *  DOM should be placed.
              * @param position  Optional parameter, specifies the
              *  position relative to refNode. Default is "last" (i.e. last child).
              */
             export const placeAt = (node: Node, refNodeOrId: string | Node, position: DojoNodePosition = "last") => {
                 const ref = typeof refNodeOrId == "string" ? document.getElementById(refNodeOrId) : refNodeOrId;
                 if (!ref)
                     return;
                 const parent = ref.parentNode;
                 if (typeof position == "number") {
                     if (ref.childNodes.length <= position) {
                         ref.appendChild(node);
                     } else {
                         ref.insertBefore(node, ref.childNodes[position]);
                     }
                 } else {
                     switch (position) {
                         case "before":
                             parent && parent.insertBefore(node, ref);
                             break;
                         case "after":
                             parent && parent.insertBefore(node, ref.nextSibling);
                             break;
                         case "first":
-                            ref.insertBefore(node,ref.firstChild);
+                            ref.insertBefore(node, ref.firstChild);
                             break;
                         case "last":
                             ref.appendChild(node);
                             break;
                         case "only":
                             emptyNode(ref);
                             ref.appendChild(node);
                             break;
                         case "replace":
                             if (parent)
                                 parent.replaceChild(node, ref);
                             destroy(ref);
                             break;
                     }
                 }
             }
             /** Collects nodes from collection to an array.
              *
              * @param collection The collection of nodes.
              * @returns The array of nodes.
              */
             export const collectNodes = (collection: HTMLCollection) => {
                 const items = [];
                 for (let i = 0, n = collection.length; i < n; i++) {
                     items.push(collection[i]);
                 }
                 return items;
             };
             /** Starts widgets if the node contained in the document or in the started widget.
              *
              * @param node The node to start.
             */
             export const autostartWidgets = (node: Node) => {
                 if (node.parentNode) {
                     const parentWidget = registry.getEnclosingWidget(node.parentNode);
                     if (parentWidget && parentWidget._started)
                         return startupWidgets(node);
                 }
                 if (isInPage(node))
                     startupWidgets(node);
             };

djx/src/main/typings/index.d.ts +2 -1

             /// <reference path="./css-plugin.d.ts"/>
             declare namespace JSX {
                 type Ref<T> = (value: T) => void;
                 interface DjxIntrinsicAttributes<E> {
                     /** alias for className */
                     class: string;
                     /** specifies the name of the property in the widget where the the
                      * reference to the current object will be stored
                      */
                     "data-dojo-attach-point": string;
                     /** specifies handlers map for the events */
                     "data-dojo-attach-event": string;
                     ref: Ref<E>;
                     /** @deprecated */
                     [attr: string]: any;
                 }
                 interface DjxIntrinsicElements {
                 }
                 type RecursivePartial<T> = T extends string | number | boolean | null | undefined | Function ?
                     T :
                     { [k in keyof T]?: RecursivePartial<T[k]> };
                 type MatchingMemberKeys<T, U> = {
                     [K in keyof T]: T[K] extends U ? K : never;
                 }[keyof T];
                 type NotMatchingMemberKeys<T, U> = {
                     [K in keyof T]: T[K] extends U ? never : K;
                 }[keyof T];
                 type ExtractMembers<T, U> = Pick<T, MatchingMemberKeys<T, U>>;
                 type ExcludeMembers<T, U> = Pick<T, NotMatchingMemberKeys<T, U>>;
                 type ElementAttrNames<E> = NotMatchingMemberKeys<E, (...args: any[]) => any>;
                 type ElementAttrType<E, K extends keyof any> = K extends keyof E ? RecursivePartial<E[K]> : string;
                 type ElementAttrNamesBlacklist = "children" | "getRootNode" | keyof EventTarget;
                 /** This type extracts keys of the specified parameter E by the following rule:
                  *  1. skips all ElementAttrNamesBlacklist
                  *  2. skips all methods except with the signature of event handlers
                  */
                 type AssignableElementAttrNames<E> = {
                     [K in keyof E]: K extends ElementAttrNamesBlacklist ? never :
                         ((evt: Event) => any) extends E[K] ? K :
                         E[K] extends ((...args: any[]) => any) ? never :
                         K;
                 }[keyof E];
                 type LaxElement<E extends object> =
                     Pick<E, AssignableElementAttrNames<E>> &
                     DjxIntrinsicAttributes<E>;
                 type LaxIntrinsicElementsMap = {
                     [tag in keyof HTMLElementTagNameMap]: LaxElement<HTMLElementTagNameMap[tag]>
                 } & DjxIntrinsicElements;
                 type IntrinsicElements = {
                     [tag in keyof LaxIntrinsicElementsMap]: RecursivePartial<LaxIntrinsicElementsMap[tag]>;
                 }
                 interface ElementChildrenAttribute {
                     children: {};
                 }
                 interface IntrinsicClassAttributes<T> {
-                    ref: (value: T) => void;
+                    ref?: (value: T) => void;
+                    children?: unknown;
                 }
             }

playground/build.gradle +15 0

             plugins {
                 id "org.implab.gradle-typescript" version "1.3.4"
                 id "ivy-publish"
             }
+            def container = "djx-playground"
             configurations {
                 npmLocal
             }
             dependencies {
                 npmLocal project(":djx")
             }
             def bundleDir = fileTree(layout.buildDirectory.dir("bundle")) {
                 builtBy "bundle"
             }
             typescript {
                 compilerOptions {
                     lib = ["es5", "dom", "scripthost", "es2015.promise", "es2015.symbol", "es2015.iterable"]
                     // listFiles = true
                     strict = true
                     types = ["requirejs", "@implab/dojo-typings", "@implab/djx"]
                     module = "amd"
                     it.target = "es5"
                     experimentalDecorators = true
                     noUnusedLocals = false
                     jsx = "react"
                     jsxFactory = "createElement"
                     moduleResolution = "node"
                     // dojo-typings are sick
                     skipLibCheck = true
                     // traceResolution = true
                     // baseUrl = "./"
                     // paths = [ "*": [ "$projectDir/src/typings/*" ] ]
                     // baseUrl = "$projectDir/src/typings"
                     // typeRoots = ["$projectDir/src/typings"]
                 }
                 tscCmd = "$projectDir/node_modules/.bin/tsc"
                 tsLintCmd = "$projectDir/node_modules/.bin/tslint"
             	esLintCmd = "$projectDir/node_modules/.bin/eslint"
             }
             tasks.matching{ it.name =~ /^configureTs/ }.configureEach {
                 compilerOptions {
                     if (symbols != 'none') {
                         sourceMap = true
                         switch(symbols) {
                             case "local":
                                 sourceRoot = ( isWindows ? "file:///" : "file://" ) + it.rootDir
                             break;
                         }
                     }
                 }
             }
             npmInstall {
                 //npmInstall.dependsOn it
                 dependsOn configurations.npmLocal
                 doFirst {
                     configurations.npmLocal.each { f ->
                         exec {
                             commandLine "npm", "install", f, "--save-dev"
                         }
                     }
                 }
             }
             clean {
                 doFirst {
                     delete "$buildDir/bundle"
                 }
             }
             task processResourcesBundle(type: Copy) {
                 from "src/bundle"
                 into layout.buildDirectory.dir("bundle")
             }
             task copyModules(type: Copy) {
                 dependsOn npmInstall
                 into layout.buildDirectory.dir("bundle/js");
                 def pack = { String jsmod ->
                     into(jsmod) {
                         from npm.module(jsmod)
                     }
                 }
                 pack("@implab/djx")
                 pack("@implab/core-amd")
                 pack("dojo")
                 pack("dijit")
                 from npm.module("requirejs/require.js")
             }
             task copyApp(type: Copy) {
                 dependsOn assemble
                 from typescript.assemblyDir
                 into layout.buildDirectory.dir("bundle/js/app")
             }
             task bundle {
                 dependsOn copyModules, processResourcesBundle, copyApp
+            }
+            task up(type: Exec) {
+                dependsOn bundle
+                commandLine "podman", "run", "--rm", "-d",
+                    "--name", container,
+                    "-p", "2078:80",
+                    "-v", "$buildDir/bundle:/srv/www/htdocs",
+                    "registry.implab.org/implab/apache2:latest"
+            }
+            task stop(type: Exec) {
+                commandLine "podman", "stop", container
             }

playground/src/main/ts/MainWidget.tsx +31 -3

@@ -1,21 +1,49
1	import { djbase, djclass } from "@implab/djx/declare";	1	import { djbase, djclass } from "@implab/djx/declare";
2	import { DjxWidgetBase } from "@implab/djx/tsx/DjxWidgetBase";	2	import { DjxWidgetBase } from "@implab/djx/tsx/DjxWidgetBase";
3	import { createElement } from "@implab/djx/tsx";	3	import { createElement, watch } from "@implab/djx/tsx";
4	import ProgressBar from "./ProgressBar";	4	import ProgressBar from "./ProgressBar";
		5	import Button = require("dijit/form/Button");
5		6
6	const ref = <W extends DjxWidgetBase, K extends keyof W>(target: W, name: K) => (v: W[K]) => target.set(name, v);	7	const ref = <W extends DjxWidgetBase, K extends keyof W>(target: W, name: K) => (v: W[K]) => target.set(name, v);
7		8
8	@djclass	9	@djclass
9	export default class MainWidget extends djbase(DjxWidgetBase) {	10	export default class MainWidget extends djbase(DjxWidgetBase) {
10		11
11	titleNode?: HTMLHeadingElement;	12	titleNode?: HTMLHeadingElement;
12		13
13	progressBar?: ProgressBar;	14	progressBar?: ProgressBar;
14		15
		16	count = 0;
		17
		18	showCounter = false;
		19
15	render() {	20	render() {
16	return <div>	21	return <div className="tundra">
17	<h2 ref={ref(this, "titleNode")}>Hi!</h2>	22	<h2 ref={ref(this, "titleNode")}>Hi!</h2>
18	<ProgressBar ref={ref(this, "progressBar")}/>	23	<ProgressBar ref={ref(this, "progressBar")} />
		24	{watch(this, "showCounter", flag => flag &&
		25	<section style={{padding: "10px"}}>
		26	<label>
		27	Counter: {watch(this, "count", v => [<span>{v}</span>, " ", <span>sec</span>])}
		28	</label>
		29	</section>
		30	)}
		31	<Button onClick={this._onToggleCounterClick}>Toggle counter</Button>
19	</div>;	32	</div>;
20	}	33	}
		34
		35	postCreate(): void {
		36	super.postCreate();
		37
		38	const inc = () => {
		39	this.set("count", this.count + 1);
		40	this.defer(inc, 1000);
		41	}
		42
		43	inc();
		44	}
		45
		46	private _onToggleCounterClick = () => {
		47	this.set("showCounter", !this.showCounter);
		48	}
21	}	49	}

playground/src/main/ts/main.ts +3 0

             import MainWidget from "./MainWidget";
+            import "@implab/djx/css!dojo/resources/dojo.css"
+            import "@implab/djx/css!dijit/themes/dijit.css"
+            import "@implab/djx/css!dijit/themes/tundra/tundra.css"
             const w = new MainWidget();
             w.placeAt(document.body);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages