@webqit/oohtml 2.1.45 → 2.1.47

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "2.1.45",
+  "version": "2.1.47",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -38,13 +38,13 @@
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/observer": "^2.1.4",
+    "@webqit/contract": "^2.1.48",
+    "@webqit/observer": "^2.1.5",
     "@webqit/realdom": "^2.1.12",
-    "@webqit/subscript": "^2.1.41",
     "@webqit/util": "^0.8.11"
   },
   "devDependencies": {
-    "@webqit/oohtml-ssr": "^1.2.8",
+    "@webqit/oohtml-ssr": "^1.2.13",
     "chai": "^4.3.4",
     "coveralls": "^3.1.1",
     "esbuild": "^0.14.43",

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/Compiler.js

@@ -54,7 +54,7 @@ export default class Compiler {
     // Compile scipt
     compile( script, thisContext ) {
         const _static = this.constructor;
-        const { webqit: { oohtml, SubscriptFunction } } = this.window;
+        const { webqit: { oohtml, ContractFunction } } = this.window;
         const cache = oohtml.Script.compileCache[ script.contract ? 0 : 1 ];
         const sourceHash = _static.toHash( script.textContent );
         // Script instances are parsed only once
@@ -76,8 +76,8 @@ export default class Compiler {
             if ( script.contract ) {
                 parserParams = { ...parserParams, allowAwaitOutsideFunction: script.type === 'module' };
                 runtimeParams = { ...runtimeParams, async: script.type === 'module' };
-                _Function = SubscriptFunction( source, { compilerParams, parserParams, runtimeParams, } );
-                Object.defineProperty( script, 'properties', { configurable: true, value: SubscriptFunction.inspect( _Function, 'properties' ) } );
+                _Function = ContractFunction( source, { compilerParams, parserParams, runtimeParams, } );
+                Object.defineProperty( script, 'properties', { configurable: true, value: ContractFunction.inspect( _Function, 'properties' ) } );
             } else {
                 const isAsync = script.type === 'module'//meta.topLevelAwait || imports.length;
                 const _FunctionConstructor = isAsync ? Object.getPrototypeOf( async function() {} ).constructor : Function;

package/src/scoped-js/index.js

@@ -3,8 +3,8 @@
  * @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 { resolveParams } from '@webqit/contract/src/params.js';
+import ContractFunction from '@webqit/contract/src/ContractFunctionLite.js';
 import Observer from '@webqit/observer';
 import Compiler from './Compiler.js';
 import { _init } from '../util.js';
@@ -28,13 +28,13 @@ export default function init( { advanced = {}, ...$config } ) {
         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.ContractFunction = ContractFunction;
     window.webqit.Observer = Observer;
     realtime.call( window, config );
 }
 
 export {
-    SubscriptFunction,
+    ContractFunction,
     Observer,
 }
 
@@ -56,11 +56,11 @@ export function execute( compiledScript, thisContext, script ) {
             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 => {
+                    return Observer.reduce( _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 => {
+                return Observer.reduce( globalThis, path, Observer.observe, record_s => {
                     script.rerender( ...getPaths( [], record_s ) );
                 } );
             } );

package/test/index.js

@@ -21,7 +21,7 @@ export function createDocument( head = '', body = '', callback = null, ) {
     <!DOCTYPE html>
     <html>
         <head>
-        <meta name="subscript-compiler-url" content="../subscript/dist/compiler.js">
+        <meta name="contract-compiler-url" content="../contract/dist/compiler.js">
         <script ssr src="/dist/main.js"></script>
         ${ head }
         </head>

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 );

package/test/scoped-css.test.js

@@ -21,7 +21,7 @@ describe(`Test: Scoped CSS`, function() {
             </div>`;
 
             const window = createDocument( head, body );
-            await delay( 160 ); // Takes time to dynamically load Subscript compiler
+            await delay( 160 ); // Takes time to dynamically load Contract compiler
             const styleElement = window.document.querySelector( 'style' );
 
             expect( styleElement.textContent.substring( 0, 13 ) ).to.eq( '@scope from (' );

package/test/scoped-js.test.js

@@ -19,7 +19,7 @@ describe(`Test: Scoped JS`, function() {
 
             const window = createDocument( head, body );
             window.testRecords = [];
-            await delay( 160 ); // Takes time to dynamically load Subscript compiler
+            await delay( 160 ); // Takes time to dynamically load Contract compiler
 
             expect( window.testRecords ).to.have.length( 1 );
             expect( window.testRecords[ 0 ] ).to.eql( window.document.body );