@webqit/oohtml 2.1.26 → 2.1.28

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "2.1.26",
+  "version": "2.1.28",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -34,17 +34,17 @@
     "test:coverage": "c8 --reporter=text-lcov npm run test | coveralls",
     "build": "esbuild main=src/targets.browser.js bindings-api=src/bindings-api/targets.browser.js context-api=src/context-api/targets.browser.js namespace-api=src/namespace-api/targets.browser.js html-modules=src/html-modules/targets.browser.js html-imports=src/html-imports/targets.browser.js scoped-js=src/scoped-js/targets.browser.js --bundle --minify --sourcemap --outdir=dist",
     "preversion": "npm run test && npm run build && git add -A dist",
-    "postversion": "npm publish",
+    "postversion": "npm publish --tag next",
     "postpublish": "git push && git push --tags"
   },
   "dependencies": {
-    "@webqit/dom": "^2.0.8",
     "@webqit/observer": "^2.0.7",
+    "@webqit/realdom": "^2.1.3",
     "@webqit/subscript": "^2.1.40",
     "@webqit/util": "^0.8.11"
   },
   "devDependencies": {
-    "@webqit/oohtml-ssr": "^1.2.7",
+    "@webqit/oohtml-ssr": "^1.2.8",
     "chai": "^4.3.4",
     "coveralls": "^3.1.1",
     "esbuild": "^0.14.43",

package/src/html-imports/_HTMLImportElement.js

@@ -14,7 +14,7 @@ import { _ } from '../util.js';
  * @return HTMLImportElement
  */
 export default function( config ) {
-    const window = this, { dom } = window.webqit;
+    const window = this, { realdom } = window.webqit;
     const BaseElement = config.import.tagName.includes( '-' ) ? window.HTMLElement : class {};
     return class HTMLImportElement extends BaseElement {
         
@@ -89,7 +89,7 @@ export default function( config ) {
                     priv.anchorNode.replaceWith( this.el );
                     return;
                 }
-                const autoRestoreRealtime = dom.realtime( window.document ).observe( [ ...priv.slottedElements ], record => {
+                const autoRestoreRealtime = realdom.realtime( window.document ).observe( [ ...priv.slottedElements ], record => {
                     record.exits.forEach( outgoingNode => {
                         _( outgoingNode ).delete( 'slot@imports' );
                         priv.slottedElements.delete( outgoingNode );
@@ -110,7 +110,7 @@ export default function( config ) {
                 // Totally initialize this instance?
                 if ( !priv.anchorNode ) { priv.setAnchorNode( this.createAnchorNode() ); }
                 if ( priv.moduleRefRealtime ) return;
-                priv.moduleRefRealtime = dom.realtime( this.el ).attr( config.import.attr.moduleref, ( record, { signal } ) => {
+                priv.moduleRefRealtime = realdom.realtime( this.el ).attr( config.import.attr.moduleref, ( record, { signal } ) => {
                     priv.moduleRef = record.value;
                     ;
                     // Below, we ignore first restore from hydration

package/src/html-imports/index.js

@@ -13,14 +13,14 @@ import { _, _init } from '../util.js';
  * @return Void
  */
 export default function init( $config = {} ) {
-    const { config, dom, window } = _init.call( this, 'html-imports', $config, {
+    const { config, realdom, window } = _init.call( this, 'html-imports', $config, {
         import: { tagName: 'import', attr: { moduleref: 'module' }, },
         export: { attr: { exportid: 'exportid' }, },
         isomorphic: true,
     } );
     config.slottedElementsSelector = `[${ window.CSS.escape( config.export.attr.exportid ) }]`;
     window.webqit.HTMLImportElement = _HTMLImportElement.call( window, config );
-    dom.ready( () => hydration.call( window, config ) );
+    realdom.ready( () => hydration.call( window, config ) );
     realtime.call( window, config );
 }
 
@@ -33,8 +33,8 @@ export default function init( $config = {} ) {
  * @return Void
  */
 function realtime( config ) {
-    const window = this, { dom, HTMLImportElement } = window.webqit;
-    dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.import.tagName, record => {
+    const window = this, { realdom, HTMLImportElement } = window.webqit;
+    realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.import.tagName, record => {
         record.entrants.forEach( node => handleRealtime( node, true, record ) );
         record.exits.forEach( node => handleRealtime( node, false, record ) );
     }, { live: true, timing: 'sync' } );

package/src/html-modules/HTMLExportsManager.js

@@ -29,14 +29,14 @@ export default class HTMLExportsManager {
         this.modules = getModulesObject( this.host );
         this.exportId = ( this.host.getAttribute( this.config.template?.attr.exportid ) || '' ).trim();
         this.validateExportId( this.exportId );
-        const dom = this.window.webqit.dom;
+        const realdom = this.window.webqit.realdom;
         // ----------
-        this.realtimeA = dom.realtime( this.host.content ).children( record => {
+        this.realtimeA = realdom.realtime( this.host.content ).children( record => {
             this.export( record.entrants, true );
             this.export( record.exits, false );
         }, { live: true, timing: 'sync' } );
         // ----------
-        this.realtimeB = dom.realtime( this.host ).attr( [ 'src', 'loading' ], ( ...args ) => this.evaluateLoading( ...args ), {
+        this.realtimeB = realdom.realtime( this.host ).attr( [ 'src', 'loading' ], ( ...args ) => this.evaluateLoading( ...args ), {
             live: true,
             atomic: true,
             timing: 'sync',

package/src/html-modules/_HTMLImportsContext.js

@@ -74,8 +74,8 @@ export default class _HTMLImportsContext extends HTMLContext {
         if ( !this.host.matches || !$config.context.attr.importscontext ) return;
         // Any existing this.refdSourceController? Abort!
         this.refdSourceController?.disconnect();
-        const dom = this.host.ownerDocument.defaultView.webqit.dom;
-        this.refdSourceController = dom.realtime( this.host ).attr( $config.context.attr.importscontext, ( record, { signal } ) => {
+        const realdom = this.host.ownerDocument.defaultView.webqit.realdom;
+        this.refdSourceController = realdom.realtime( this.host ).attr( $config.context.attr.importscontext, ( record, { signal } ) => {
             // No importscontext attr set. But we're still watching
             if ( !record.value ) {
                 this.altModules = undefined;

package/src/html-modules/index.js

@@ -88,7 +88,7 @@ function exposeModulesObjects( config ) {
  * @return Void
  */
 function realtime( config ) {
-    const window = this, { dom, HTMLImportsContext } = window.webqit;
+    const window = this, { realdom, HTMLImportsContext } = window.webqit;
     // ------------
     const attachImportsContext = host => {
         const contextId = HTMLImportsContext.createId( host );
@@ -101,7 +101,7 @@ function realtime( config ) {
         } );
     };
     // ------------
-    dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( [ config.templateSelector, config.ownerContextSelector ], record => {
+    realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( [ config.templateSelector, config.ownerContextSelector ], record => {
         record.entrants.forEach( entry => {
             if ( entry.matches( config.templateSelector ) ) {
                 Object.defineProperty( entry, 'scoped', { value: entry.hasAttribute( 'scoped' ) } ); 

package/src/namespace-api/index.js

@@ -85,7 +85,7 @@ function getNamespaceObject( node, config ) {
  * @return Void
  */
 function realtime( config ) {
-	const window = this, { dom } = window.webqit;
+	const window = this, { realdom } = window.webqit;
 	// ----------------
 	const handle = ( target, entry, incoming ) => {
 		const identifier = entry.getAttribute( config.attr.id );
@@ -101,13 +101,13 @@ function realtime( config ) {
 			Observer.deleteProperty( namespaceObj, identifier );
 		}
 	};
-	dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.idSelector, record => {
+	realdom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.idSelector, record => {
         record.entrants.forEach( entry => handle( record.target, entry, true ) );
         record.exits.forEach( entry => handle( record.target, entry, false ) );
 	}, { live: true, timing: 'sync', staticSensitivity: config.staticsensitivity } );
 	// ----------------
 	if ( config.staticsensitivity ) {
-		dom.realtime( window.document, 'attr' ).observe( config.namespaceSelector, record => {
+		realdom.realtime( window.document, 'attr' ).observe( config.namespaceSelector, record => {
 			const ownerRoot = record.target.parentNode?.closest( config.namespaceSelector ) || _( record.target ).get( 'ownerNamespace' ) || window.document;
 			const ownerRootNamespaceObj = getNamespaceObject.call( window, ownerRoot, config );
 			const namespaceObj = getNamespaceObject.call( window, record.target, config );

package/src/scoped-js/index.js

@@ -67,8 +67,8 @@ export function execute( compiledScript, thisContext, script ) {
             } );
         } );
     }
-    const window = this, { dom } = window.webqit;
-    dom.realtime( window.document ).observe( thisContext, () => {
+    const window = this, { realdom } = window.webqit;
+    realdom.realtime( window.document ).observe( thisContext, () => {
         if ( script.contract ) {
             // Rerending processes,,,
             _await( script.properties, properties => {
@@ -89,11 +89,11 @@ export function execute( compiledScript, thisContext, script ) {
  * @return Void
  */
 function realtime( config ) {
-	const window = this, { dom } = window.webqit;
+	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 = () => {};
-	dom.realtime( window.document ).subtree/*instead of observe(); reason: jsdom timing*/( config.scriptSelector, record => {
+	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' ) } ); 

package/src/targets.browser.js

@@ -2,7 +2,7 @@
 /**
  * @imports
  */
-import init, { Observer } from './index.js';
+import init from './index.js';
 
 /**
  * @init

package/src/util.js

@@ -2,7 +2,7 @@
 /**
  * @imports
  */
-import webqitDom from '@webqit/dom';
+import realdomInit from '@webqit/realdom';
 import { _internals } from '@webqit/util/js/index.js';
 import { _merge } from '@webqit/util/obj/index.js';
 
@@ -10,15 +10,15 @@ export const _ = ( ...args ) => _internals( 'oohtml', ...args );
 
 export function _init( name, $config, $defaults ) {
     const _name = name.toUpperCase().replace( '-', '_' );
-    const window = this, dom = webqitDom.call( window );
+    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, dom.meta( name ).json() );
+    _merge( 2, window.webqit.oohtml.configs[ _name ], $defaults, $config, realdom.meta( name ).json() );
     // ---------------------
-    return { config: window.webqit.oohtml.configs[ _name ], dom, window };
+    return { config: window.webqit.oohtml.configs[ _name ], realdom, window };
 }
 
 export function _compare( a, b, depth = 1, objectSizing = false ) {