@webqit/oohtml 2.1.44 → 2.1.46

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "2.1.44",
+  "version": "2.1.46",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,9 +38,9 @@
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/observer": "^2.1.4",
-    "@webqit/realdom": "^2.1.11",
-    "@webqit/subscript": "^2.1.40",
+    "@webqit/observer": "^2.1.5",
+    "@webqit/realdom": "^2.1.12",
+    "@webqit/subscript": "^2.1.41",
     "@webqit/util": "^0.8.11"
   },
   "devDependencies": {

package/src/html-imports/_HTMLExportsManager.js

@@ -175,7 +175,7 @@ export default class _HTMLExportsManager {
         const realtimes = [];
         const parentExportsObj = getModulesObject( this.parent );
         if ( extendedId ) {
-            realtimes.push( Observer.deep( parentExportsObj, [ extendedId, this.config.template.api.modules, Infinity ], Observer.get, handleInherited, { live: true } ) );
+            realtimes.push( Observer.reduce( parentExportsObj, [ extendedId, this.config.template.api.modules, Infinity ], Observer.get, handleInherited, { live: true } ) );
         }
         if ( ( inheritedIds = inheritedIds.split( ' ' ).map( id => id.trim() ).filter( x => x ) ).length ) {
             realtimes.push( Observer.get( parentExportsObj, inheritedIds, handleInherited, { live: true } ) );

package/src/html-imports/_HTMLImportsProvider.js

@@ -56,13 +56,13 @@ export default class _HTMLImportsProvider extends HTMLContextProvider {
         // We'll now fulfill request
         const options = { live: event.request.live, descripted: true };
         // Find a way to resolve request against two sources
-        event.request.controller = Observer.deep( this.localModules, path, Observer.get, ( result, { signal } = {} ) => {
+        event.request.controller = Observer.reduce( this.localModules, path, Observer.get, ( result, { signal } = {} ) => {
             const _result = Array.isArray( result ) ? result : result.value;
             const _isValidResult = Array.isArray( result ) ? result.length : result.value;
             if ( !_isValidResult && this.host.isConnected === false ) return; // Subtree is being disposed
             if ( _isValidResult || !this.contextModules ) return event.respondWith( _result );
             // This superModules binding is automatically aborted by the injected control.signal; see below
-            return Observer.deep( this.contextModules, path, Observer.get, result => {
+            return Observer.reduce( this.contextModules, path, Observer.get, result => {
                 return event.respondWith( Array.isArray( result ) ? result : result.value );
             }, { signal, ...options } );
         }, options );

package/src/scoped-js/index.js

@@ -51,29 +51,28 @@ export function execute( compiledScript, thisContext, script ) {
         // Rerending processes,,,
         Object.defineProperty( script, 'rerender', { value: ( ...args ) => _await( returnValue, ( [ , rerender ] ) => rerender( ...args ) ) } );
         _await( script.properties, properties => {
+            const _env = { 'this': thisContext };
+            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 => {
-                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 ] ] ) ) {
-                        if ( path.length === 1 ) return;
-                        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 ) );
+                if ( _isTypeObject( _env[ path[ 0 ] ] ) ) {
+                    if ( path.length === 1 ) return;
+                    return Observer.reduce( _env[ path[ 0 ] ], path.slice( 1 ), Observer.observe, record_s => {
+                        script.rerender( ...getPaths( [ path[ 0 ] ], record_s ) );
                     } );
+                }
+                return Observer.reduce( globalThis, path, Observer.observe, record_s => {
+                    script.rerender( ...getPaths( [], record_s ) );
                 } );
             } );
         } );
     }
     const window = this, { realdom } = window.webqit;
+    if ( !( thisContext instanceof window.Node ) ) return script;
     realdom.realtime( window.document ).observe( thisContext, () => {
         if ( script.contract ) {
             // Rerending processes,,,
             _await( script.properties, properties => {
-                properties.processes.forEach( process => process.abort() );
+                properties.processes.forEach( process => process?.abort() );
             } );
         }
         thisContext.dispatchEvent( new window.CustomEvent( 'remove' ) );

package/test/modules.test.js

@@ -57,14 +57,14 @@ describe(`HTML Modules`, function() {
             document.import( 'temp0', temp0 => {
                 expect( temp0 ).to.have.property( 'modules' );
                 expect( temp0.modules[ '#' ] ).to.have.length( 2 );
-                const temp2 = Observer.deep( temp0.modules, getQueryPath( 'temp2' ), Observer.get );
+                const temp2 = Observer.reduce( temp0.modules, getQueryPath( 'temp2' ), Observer.get );
                 expect( temp2 ).to.have.property( 'modules' );
                 // -------
-                const temp1Inherited = Observer.deep( temp0.modules, getQueryPath( 'temp2/temp1' ), Observer.get );
+                const temp1Inherited = Observer.reduce( temp0.modules, getQueryPath( 'temp2/temp1' ), Observer.get );
                 expect( temp1Inherited ).to.have.property( 'modules' );
                 // -------
                 const temp3Observed = [];
-                Observer.deep( temp0.modules, getQueryPath( 'temp2/temp3' ), Observer.observe, record => {
+                Observer.reduce( temp0.modules, getQueryPath( 'temp2/temp3' ), Observer.observe, record => {
                     temp3Observed.push( record.value );
                 } );
                 // -------
@@ -75,7 +75,7 @@ describe(`HTML Modules`, function() {
                 expect( temp3Observed ).to.be.an( 'array' ).with.length( 1 );
                 expect( temp3Observed[ 0 ] ).to.have.property( 'modules' );
                 // -------
-                const temp3Inherited = Observer.deep( temp0.modules, getQueryPath( 'temp2/temp3' ), Observer.get );
+                const temp3Inherited = Observer.reduce( temp0.modules, getQueryPath( 'temp2/temp3' ), Observer.get );
                 expect( temp3Inherited ).to.have.property( 'modules' );
                 // -------
             } );
@@ -117,15 +117,15 @@ describe(`HTML Modules`, function() {
                 expect( temp0 ).to.have.property( 'modules' );
                 await delay( 2100 );
                 // temp1 shouldn't have been automatically loaded still
-                const hasTemp1 = Observer.deep( temp0.modules, getQueryPath( 'temp1' ), Observer.has );
+                const hasTemp1 = Observer.reduce( temp0.modules, getQueryPath( 'temp1' ), Observer.has );
                 expect( hasTemp1 ).to.be.false;
                 // Try access temp1 to trigger loading and await
-                const _temp1 = await Observer.deep( temp0.modules, getQueryPath( 'temp1' ), Observer.get );
+                const _temp1 = await Observer.reduce( temp0.modules, getQueryPath( 'temp1' ), Observer.get );
                 expect( _temp1 ).to.have.property( 'modules' );
                 // -------
                 // Receive updates
                 const temp3Observed = [];
-                Observer.deep( temp0.modules, getQueryPath( 'temp1/temp2/temp3' ), Observer.observe, ( record, lifecycle ) => {
+                Observer.reduce( temp0.modules, getQueryPath( 'temp1/temp2/temp3' ), Observer.observe, ( record, lifecycle ) => {
                     temp3Observed.push( record.value );
                 } );
                 await delay( 2100 );