@webqit/oohtml 2.1.34 → 2.1.35

package/src/scoped-js/index.js

@@ -1,112 +1,112 @@
-
-/**
- * @imports
- */
-import { _isTypeObject } from '@webqit/util/js/index.js';
-import { resolveParams } from '@webqit/subscript/src/params.js';
-import SubscriptFunction from '@webqit/subscript/src/SubscriptFunctionLite.js';
-import Observer from '@webqit/observer';
-import Compiler from './Compiler.js';
-import { _init } from '../util.js';
-
-/**
- * @init
- * 
- * @param Object $config
- */
-export default function init( { advanced = {}, ...$config } ) {
-    const { config, window } = _init.call( this, 'scoped-js', $config, {
-        script: { retention: 'retain', mimeType: '' },
-        advanced: resolveParams( advanced, {
-            parserParams: { allowReturnOutsideFunction: false, allowSuperOutsideMethod: false },
-            compilerParams: { globalsNoObserve: [ 'alert' ] },
-            runtimeParams: { apiVersion: 2 },
-        } ),
-    } );
-	config.scriptSelector = ( Array.isArray( config.script.mimeType ) ? config.script.mimeType : [ config.script.mimeType ] ).reduce( ( selector, mm ) => {
-        const qualifier = mm ? `[type=${ window.CSS.escape( mm ) }]` : '';
-        return selector.concat( `script${ qualifier }[scoped],script${ qualifier }[contract]` );
-    }, [] ).join( ',' );
-    window.webqit.oohtml.Script = { compileCache: [ new Map, new Map, ] };
-    window.webqit.SubscriptFunction = SubscriptFunction;
-    window.webqit.Observer = Observer;
-    realtime.call( window, config );
-}
-
-export {
-    SubscriptFunction,
-    Observer,
-}
-
-// ------------------
-// Script runner
-export function execute( compiledScript, thisContext, script ) {
-    if ( !compiledScript.function ) throw new Error( `Input script must already be compiled!` );
-    const _try = ( callback, isRerender = false ) => {
-        return callback();
-    };
-    // Execute...
-    const returnValue = compiledScript.function.call( thisContext );
-    if ( script.contract ) {
-        // Rerending processes,,,
-        Object.defineProperty( script, 'rerender', { value: ( ...args ) => _await( returnValue, ( [ , rerender ] ) => rerender( ...args ) ) } );
-        _await( script.properties, properties => {
-            properties.processes = properties.dependencies.map( path => {
-                const _env = { 'this': thisContext, 'globalThis': globalThis, 'window': globalThis.window, 'self': globalThis.self };
-                const getPaths = ( base, record_s ) => ( Array.isArray( record_s ) ? record_s : [ record_s ] ).map( record => [ ...base, ...( record.path || [ record.key ] ) ] );
-                properties.processes = properties.dependencies.map( path => {
-                    if ( _isTypeObject( _env[ path[ 0 ] ] ) ) {
-                        return Observer.deep( _env[ path[ 0 ] ], path.slice( 1 ), Observer.observe, record_s => {
-                            script.rerender( ...getPaths( [ path[ 0 ] ], record_s ) );
-                        } );
-                    }
-                    return Observer.deep( globalThis, path, Observer.observe, record_s => {
-                        script.rerender( ...getPaths( [], record_s ) );
-                    } );
-                } );
-            } );
-        } );
-    }
-    const window = this, { realdom } = window.webqit;
-    realdom.realtime( window.document ).observe( thisContext, () => {
-        if ( script.contract ) {
-            // Rerending processes,,,
-            _await( script.properties, properties => {
-                properties.processes.forEach( process => process.abort() );
-            } );
-        }
-        thisContext.dispatchEvent( new window.CustomEvent( 'remove' ) );
-        thisContext.scripts.delete( script );
-    }, { subtree: true, timing: 'sync', generation: 'exits' } );
-    return script;
-}
-
-/**
- * Performs realtime capture of elements and builds their relationships.
- *
- * @param Object config
- *
- * @return Void
- */
-function realtime( config ) {
-	const window = this, { realdom } = window.webqit;
-    if ( !window.HTMLScriptElement.supports ) { window.HTMLScriptElement.supports = () => false; }
-    const potentialManualTypes = [ 'module' ].concat( config.script.mimeType || [] );
-    const compiler = new Compiler( window, config, execute ), handled = () => {};
-	realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.scriptSelector, record => {
-        record.entrants.forEach( script => {
-            if ( 'contract' in script ) return handled( script );
-            Object.defineProperty( script, 'contract', { value: script.hasAttribute( 'contract' ) } ); 
-            if ( 'scoped' in script ) return handled( script );
-            Object.defineProperty( script, 'scoped', { value: script.hasAttribute( 'scoped' ) } ); 
-            if ( record.type === 'query' || ( potentialManualTypes.includes( script.type ) && !window.HTMLScriptElement.supports( script.type ) ) ) {
-                Object.defineProperty( script, 'handling', { value: 'manual' } ); 
-            }
-            const thisContext = script.scoped ? record.target : ( script.type === 'module' ? undefined : window );
-            compiler.compile( script, thisContext );
-        } );
-	}, { live: true, timing: 'intercept', generation: 'entrants' } );
-    // ---
-}
-
-const _await = ( value, callback ) => value instanceof Promise ? value.then( callback ) : callback( value );
+
+/**
+ * @imports
+ */
+import { _isTypeObject } from '@webqit/util/js/index.js';
+import { resolveParams } from '@webqit/subscript/src/params.js';
+import SubscriptFunction from '@webqit/subscript/src/SubscriptFunctionLite.js';
+import Observer from '@webqit/observer';
+import Compiler from './Compiler.js';
+import { _init } from '../util.js';
+
+/**
+ * @init
+ * 
+ * @param Object $config
+ */
+export default function init( { advanced = {}, ...$config } ) {
+    const { config, window } = _init.call( this, 'scoped-js', $config, {
+        script: { retention: 'retain', mimeType: '' },
+        advanced: resolveParams( advanced, {
+            parserParams: { allowReturnOutsideFunction: false, allowSuperOutsideMethod: false },
+            compilerParams: { globalsNoObserve: [ 'alert' ] },
+            runtimeParams: { apiVersion: 2 },
+        } ),
+    } );
+	config.scriptSelector = ( Array.isArray( config.script.mimeType ) ? config.script.mimeType : [ config.script.mimeType ] ).reduce( ( selector, mm ) => {
+        const qualifier = mm ? `[type=${ window.CSS.escape( mm ) }]` : '';
+        return selector.concat( `script${ qualifier }[scoped],script${ qualifier }[contract]` );
+    }, [] ).join( ',' );
+    window.webqit.oohtml.Script = { compileCache: [ new Map, new Map, ] };
+    window.webqit.SubscriptFunction = SubscriptFunction;
+    window.webqit.Observer = Observer;
+    realtime.call( window, config );
+}
+
+export {
+    SubscriptFunction,
+    Observer,
+}
+
+// ------------------
+// Script runner
+export function execute( compiledScript, thisContext, script ) {
+    if ( !compiledScript.function ) throw new Error( `Input script must already be compiled!` );
+    const _try = ( callback, isRerender = false ) => {
+        return callback();
+    };
+    // Execute...
+    const returnValue = compiledScript.function.call( thisContext );
+    if ( script.contract ) {
+        // Rerending processes,,,
+        Object.defineProperty( script, 'rerender', { value: ( ...args ) => _await( returnValue, ( [ , rerender ] ) => rerender( ...args ) ) } );
+        _await( script.properties, properties => {
+            properties.processes = properties.dependencies.map( path => {
+                const _env = { 'this': thisContext, 'globalThis': globalThis, 'window': globalThis.window, 'self': globalThis.self };
+                const getPaths = ( base, record_s ) => ( Array.isArray( record_s ) ? record_s : [ record_s ] ).map( record => [ ...base, ...( record.path || [ record.key ] ) ] );
+                properties.processes = properties.dependencies.map( path => {
+                    if ( _isTypeObject( _env[ path[ 0 ] ] ) ) {
+                        return Observer.deep( _env[ path[ 0 ] ], path.slice( 1 ), Observer.observe, record_s => {
+                            script.rerender( ...getPaths( [ path[ 0 ] ], record_s ) );
+                        } );
+                    }
+                    return Observer.deep( globalThis, path, Observer.observe, record_s => {
+                        script.rerender( ...getPaths( [], record_s ) );
+                    } );
+                } );
+            } );
+        } );
+    }
+    const window = this, { realdom } = window.webqit;
+    realdom.realtime( window.document ).observe( thisContext, () => {
+        if ( script.contract ) {
+            // Rerending processes,,,
+            _await( script.properties, properties => {
+                properties.processes.forEach( process => process.abort() );
+            } );
+        }
+        thisContext.dispatchEvent( new window.CustomEvent( 'remove' ) );
+        thisContext.scripts.delete( script );
+    }, { subtree: true, timing: 'sync', generation: 'exits' } );
+    return script;
+}
+
+/**
+ * Performs realtime capture of elements and builds their relationships.
+ *
+ * @param Object config
+ *
+ * @return Void
+ */
+function realtime( config ) {
+	const window = this, { realdom } = window.webqit;
+    if ( !window.HTMLScriptElement.supports ) { window.HTMLScriptElement.supports = () => false; }
+    const potentialManualTypes = [ 'module' ].concat( config.script.mimeType || [] );
+    const compiler = new Compiler( window, config, execute ), handled = () => {};
+	realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.scriptSelector, record => {
+        record.entrants.forEach( script => {
+            if ( 'contract' in script ) return handled( script );
+            Object.defineProperty( script, 'contract', { value: script.hasAttribute( 'contract' ) } ); 
+            if ( 'scoped' in script ) return handled( script );
+            Object.defineProperty( script, 'scoped', { value: script.hasAttribute( 'scoped' ) } ); 
+            if ( record.type === 'query' || ( potentialManualTypes.includes( script.type ) && !window.HTMLScriptElement.supports( script.type ) ) ) {
+                Object.defineProperty( script, 'handling', { value: 'manual' } ); 
+            }
+            const thisContext = script.scoped ? script.parentNode || record.target : ( script.type === 'module' ? undefined : window );
+            compiler.compile( script, thisContext );
+        } );
+	}, { live: true, timing: 'intercept', generation: 'entrants', eventDetails: true } );
+    // ---
+}
+
+const _await = ( value, callback ) => value instanceof Promise ? value.then( callback ) : callback( value );

package/src/scoped-js/targets.browser.js

@@ -1,10 +1,10 @@
-
-/**
- * @imports
- */
-import init from './index.js';
-
-/**
- * @init
- */
-init.call( window );
+
+/**
+ * @imports
+ */
+import init from './index.js';
+
+/**
+ * @init
+ */
+init.call( window );

package/src/targets.browser.js

@@ -1,10 +1,10 @@
-
-/**
- * @imports
- */
-import init from './index.js';
-
-/**
- * @init
- */
+
+/**
+ * @imports
+ */
+import init from './index.js';
+
+/**
+ * @init
+ */
 init.call( window );

package/src/util.js

@@ -1,35 +1,35 @@
-
-/**
- * @imports
- */
-import realdomInit from '@webqit/realdom';
-import { _internals } from '@webqit/util/js/index.js';
-import { _merge } from '@webqit/util/obj/index.js';
-
-export const _ = ( ...args ) => _internals( 'oohtml', ...args );
-
-export function _init( name, $config, $defaults ) {
-    const _name = name.toUpperCase().replace( '-', '_' );
-    const window = this, realdom = realdomInit.call( window );
-    window.webqit || ( window.webqit = {} );
-    window.webqit.oohtml || ( window.webqit.oohtml = {} );
-    window.webqit.oohtml.configs || ( window.webqit.oohtml.configs = {} );
-    window.webqit.oohtml.configs[ _name ] || ( window.webqit.oohtml.configs[ _name ] = {} );
-    // ---------------------
-    _merge( 2, window.webqit.oohtml.configs[ _name ], $defaults, $config, realdom.meta( name ).json() );
-    // ---------------------
-    return { config: window.webqit.oohtml.configs[ _name ], realdom, window };
-}
-
-export function _compare( a, b, depth = 1, objectSizing = false ) {
-    if ( depth && typeof a === 'object' && a && typeof b === 'object' && b && ( !objectSizing || Object.keys( a ).length === Object.keys( b ).length ) ) {
-        for ( let key in a ) {
-            if ( !_compare( a[ key ], b[ key ], depth - 1, objectSizing ) ) return false;
-        }
-        return true;
-    }
-    if ( Array.isArray( a ) && Array.isArray( b ) && a.length === b.length ) {
-        return ( b = b.slice( 0 ).sort() ) && a.slice( 0 ).sort().every( ( valueA, i ) => valueA === b[ i ] );
-    }
-    return a === b;
+
+/**
+ * @imports
+ */
+import realdomInit from '@webqit/realdom';
+import { _internals } from '@webqit/util/js/index.js';
+import { _merge } from '@webqit/util/obj/index.js';
+
+export const _ = ( ...args ) => _internals( 'oohtml', ...args );
+
+export function _init( name, $config, $defaults ) {
+    const _name = name.toUpperCase().replace( '-', '_' );
+    const window = this, realdom = realdomInit.call( window );
+    window.webqit || ( window.webqit = {} );
+    window.webqit.oohtml || ( window.webqit.oohtml = {} );
+    window.webqit.oohtml.configs || ( window.webqit.oohtml.configs = {} );
+    window.webqit.oohtml.configs[ _name ] || ( window.webqit.oohtml.configs[ _name ] = {} );
+    // ---------------------
+    _merge( 2, window.webqit.oohtml.configs[ _name ], $defaults, $config, realdom.meta( name ).json() );
+    // ---------------------
+    return { config: window.webqit.oohtml.configs[ _name ], realdom, window };
+}
+
+export function _compare( a, b, depth = 1, objectSizing = false ) {
+    if ( depth && typeof a === 'object' && a && typeof b === 'object' && b && ( !objectSizing || Object.keys( a ).length === Object.keys( b ).length ) ) {
+        for ( let key in a ) {
+            if ( !_compare( a[ key ], b[ key ], depth - 1, objectSizing ) ) return false;
+        }
+        return true;
+    }
+    if ( Array.isArray( a ) && Array.isArray( b ) && a.length === b.length ) {
+        return ( b = b.slice( 0 ).sort() ) && a.slice( 0 ).sort().every( ( valueA, i ) => valueA === b[ i ] );
+    }
+    return a === b;
 };

package/test/bindings-api.test.js

@@ -1,42 +1,42 @@
-
-/**
- * @imports
- */
-import { expect } from 'chai';
-import { createDocument } from './index.js';
-
-describe(`Bindings API`, function() {
-
-    describe( `Basic...`, function() {
-        
-        const head = ``;
-        const body = ``;
-        const { document, window } = createDocument( head, body );
-
-        it ( `The document object and elements should expose a "bindings" property each...`, async function() {
-            expect( document ).to.have.property( 'bindings' );
-            expect( document.body ).to.have.property( 'bindings' );
-        } );
-
-        it ( `Bindings objects should be observable...`, async function() {
-            const { webqit: { Observer } } = window;
-            let idReceived = null;
-            Observer.observe( document.bindings, records => {
-                idReceived = records[ 0 ].key;
-            } );
-            document.bindings.someKey = 'someValue'; // new
-            expect( idReceived ).to.eq( 'someKey' );
-            // -------------
-            let changes = [];
-            Observer.observe( document.bindings, records => {
-                changes.push( ...records );
-            } );
-            document.bindings.someKey2 = 'someValue2'; // new
-            document.bind( { someKey: 'someValue'/* update */, someKey3: 'someValue3'/* new */ } );
-            expect( changes ).to.an( 'array' ).with.length( 4 ); // (1) sets: someKey2, (2) deletes: someKey2, (3) updates: someKey, (4) sets: someKey3;
-        } );
-
-    } );
-
-} );
-
+
+/**
+ * @imports
+ */
+import { expect } from 'chai';
+import { createDocument } from './index.js';
+
+describe(`Bindings API`, function() {
+
+    describe( `Basic...`, function() {
+        
+        const head = ``;
+        const body = ``;
+        const { document, window } = createDocument( head, body );
+
+        it ( `The document object and elements should expose a "bindings" property each...`, async function() {
+            expect( document ).to.have.property( 'bindings' );
+            expect( document.body ).to.have.property( 'bindings' );
+        } );
+
+        it ( `Bindings objects should be observable...`, async function() {
+            const { webqit: { Observer } } = window;
+            let idReceived = null;
+            Observer.observe( document.bindings, records => {
+                idReceived = records[ 0 ].key;
+            } );
+            document.bindings.someKey = 'someValue'; // new
+            expect( idReceived ).to.eq( 'someKey' );
+            // -------------
+            let changes = [];
+            Observer.observe( document.bindings, records => {
+                changes.push( ...records );
+            } );
+            document.bindings.someKey2 = 'someValue2'; // new
+            document.bind( { someKey: 'someValue'/* update */, someKey3: 'someValue3'/* new */ } );
+            expect( changes ).to.an( 'array' ).with.length( 4 ); // (1) sets: someKey2, (2) deletes: someKey2, (3) updates: someKey, (4) sets: someKey3;
+        } );
+
+    } );
+
+} );
+