@webqit/oohtml 2.1.47 → 2.1.49

package/package.json

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

package/src/scoped-js/Compiler.js

@@ -54,8 +54,8 @@ export default class Compiler {
     // Compile scipt
     compile( script, thisContext ) {
         const _static = this.constructor;
-        const { webqit: { oohtml, ContractFunction } } = this.window;
-        const cache = oohtml.Script.compileCache[ script.contract ? 0 : 1 ];
+        const { webqit: { oohtml, ReflexFunction } } = this.window;
+        const cache = oohtml.Script.compileCache[ script.reflex ? 0 : 1 ];
         const sourceHash = _static.toHash( script.textContent );
         // Script instances are parsed only once
         let source = script.textContent, compiledScript;
@@ -64,7 +64,7 @@ export default class Compiler {
             let imports = [], meta = {};
             let targetKeywords = [];
             if ( script.type === 'module' ) targetKeywords.push( 'import ' );
-            if ( script.type === 'module' && !script.contract ) targetKeywords.push( 'await ' );
+            if ( script.type === 'module' && !script.reflex ) targetKeywords.push( 'await ' );
             if ( targetKeywords.length && ( new RegExp( targetKeywords.join( '|' ) ) ).test( source ) ) {
                 [ imports, source, meta ] = this.parse( source );
                 if ( imports.length ) {
@@ -73,11 +73,11 @@ export default class Compiler {
             }
             // Let's obtain a material functions
             let _Function, { parserParams, compilerParams, runtimeParams } = this.config.advanced;
-            if ( script.contract ) {
+            if ( script.reflex ) {
                 parserParams = { ...parserParams, allowAwaitOutsideFunction: script.type === 'module' };
                 runtimeParams = { ...runtimeParams, async: script.type === 'module' };
-                _Function = ContractFunction( source, { compilerParams, parserParams, runtimeParams, } );
-                Object.defineProperty( script, 'properties', { configurable: true, value: ContractFunction.inspect( _Function, 'properties' ) } );
+                _Function = ReflexFunction( source, { compilerParams, parserParams, runtimeParams, } );
+                Object.defineProperty( script, 'properties', { configurable: true, value: ReflexFunction.inspect( _Function ) } );
             } else {
                 const isAsync = script.type === 'module'//meta.topLevelAwait || imports.length;
                 const _FunctionConstructor = isAsync ? Object.getPrototypeOf( async function() {} ).constructor : Function;
@@ -89,7 +89,7 @@ export default class Compiler {
             // Save material function to compile cache
             compiledScript = Object.defineProperty( script.cloneNode(), 'function', { value: _Function } );
             script.scoped && Object.defineProperty( compiledScript, 'scoped', Object.getOwnPropertyDescriptor( script, 'scoped') );
-            script.contract && Object.defineProperty( compiledScript, 'contract', Object.getOwnPropertyDescriptor( script, 'contract') );
+            script.reflex && Object.defineProperty( compiledScript, 'reflex', Object.getOwnPropertyDescriptor( script, 'reflex') );
             cache.set( sourceHash, compiledScript );
         }
         const execHash = _static.toHash( { script, compiledScript, thisContext } );

package/src/scoped-js/index.js

@@ -3,8 +3,8 @@
  * @imports
  */
 import { _isTypeObject } from '@webqit/util/js/index.js';
-import { resolveParams } from '@webqit/contract/src/params.js';
-import ContractFunction from '@webqit/contract/src/ContractFunctionLite.js';
+import { resolveParams } from '@webqit/reflex-functions/src/params.js';
+import ReflexFunction from '@webqit/reflex-functions/src/ReflexFunctionLite.js';
 import Observer from '@webqit/observer';
 import Compiler from './Compiler.js';
 import { _init } from '../util.js';
@@ -25,16 +25,16 @@ export default function init( { advanced = {}, ...$config } ) {
     } );
 	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]` );
+        return selector.concat( `script${ qualifier }[scoped],script${ qualifier }[reflex]` );
     }, [] ).join( ',' );
     window.webqit.oohtml.Script = { compileCache: [ new Map, new Map, ] };
-    window.webqit.ContractFunction = ContractFunction;
+    window.webqit.ReflexFunction = ReflexFunction;
     window.webqit.Observer = Observer;
     realtime.call( window, config );
 }
 
 export {
-    ContractFunction,
+    ReflexFunction,
     Observer,
 }
 
@@ -47,9 +47,9 @@ export function execute( compiledScript, thisContext, script ) {
     };
     // Execute...
     const returnValue = compiledScript.function.call( thisContext );
-    if ( script.contract ) {
+    if ( script.reflex ) {
         // Rerending processes,,,
-        Object.defineProperty( script, 'rerender', { value: ( ...args ) => _await( returnValue, ( [ , rerender ] ) => rerender( ...args ) ) } );
+        Object.defineProperty( script, 'reflect', { value: ( ...args ) => _await( returnValue, ( [ , reflect ] ) => reflect( ...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 ] ) ] );
@@ -57,11 +57,11 @@ export function execute( compiledScript, thisContext, script ) {
                 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 ) );
+                        script.reflect( ...getPaths( [ path[ 0 ] ], record_s ) );
                     } );
                 }
                 return Observer.reduce( globalThis, path, Observer.observe, record_s => {
-                    script.rerender( ...getPaths( [], record_s ) );
+                    script.reflect( ...getPaths( [], record_s ) );
                 } );
             } );
         } );
@@ -69,7 +69,7 @@ export function execute( compiledScript, thisContext, script ) {
     const window = this, { realdom } = window.webqit;
     if ( !( thisContext instanceof window.Node ) ) return script;
     realdom.realtime( window.document ).observe( thisContext, () => {
-        if ( script.contract ) {
+        if ( script.reflex ) {
             // Rerending processes,,,
             _await( script.properties, properties => {
                 properties.processes.forEach( process => process?.abort() );
@@ -95,8 +95,8 @@ function realtime( config ) {
     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 ( 'reflex' in script ) return handled( script );
+            Object.defineProperty( script, 'reflex', { value: script.hasAttribute( 'reflex' ) } ); 
             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 ) ) ) {

package/test/index.js

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

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 Contract compiler
+            await delay( 160 ); // Takes time to dynamically load Reflex compiler
             const styleElement = window.document.querySelector( 'style' );
 
             expect( styleElement.textContent.substring( 0, 13 ) ).to.eq( '@scope from (' );

package/test/scoped-js.test.js

@@ -12,14 +12,14 @@ describe(`Test: Scoped JS`, function() {
         it(`Should do basic observe`, async function() {
             const head = '', body = `            
             <h1>Hello World!</h1>
-            <script scoped contract>
+            <script scoped reflex>
                 testRecords.push( this );
                 console.log('-------scoped JS here.');
             </script>`;
 
             const window = createDocument( head, body );
             window.testRecords = [];
-            await delay( 160 ); // Takes time to dynamically load Contract compiler
+            await delay( 160 ); // Takes time to dynamically load Reflex compiler
 
             expect( window.testRecords ).to.have.length( 1 );
             expect( window.testRecords[ 0 ] ).to.eql( window.document.body );