@webqit/oohtml 2.1.18 → 2.1.20

package/package.json

@@ -14,7 +14,7 @@
     "wicg-proposal"
   ],
   "homepage": "https://webqit.io/tooling/oohtml",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/html-imports/_HTMLImportElement.js

@@ -50,7 +50,7 @@ export default function( config ) {
             };
 
             priv.importRequest = ( callback, signal = null ) => {
-                const detail = priv.moduleRef && !priv.moduleRef.includes( '#' ) ? `${ priv.moduleRef }#default` : priv.moduleRef;
+                const detail = priv.moduleRef && !priv.moduleRef.includes( '#' ) && !priv.moduleRef.includes( '.' ) ? `${ priv.moduleRef }#default` : priv.moduleRef;
                 const request = _HTMLImportsContext.createRequest( { detail, live: signal && true, signal } );
                 HTMLContextManager.instance( this.el.isConnected ? this.el.parentNode : priv.anchorNode.parentNode ).ask( request, response => {
                     callback( ( response instanceof Set ? new Set( response ) : response ) || [] );

package/src/html-modules/_HTMLImportsContext.js

@@ -40,7 +40,7 @@ export default class _HTMLImportsContext extends HTMLContext {
         // Parse and translate detail
         if ( ( event.request.detail || '' ).trim() === '/' ) return event.respondWith( this.modules );
         const $config = this.constructor.config;
-        let path = ( event.request.detail || '' ).split( /\/|(?<=\w)(?=\W)/g ).map( x => x.trim() ).filter( x => x );
+        let path = ( event.request.detail || '' ).split( /\/|(?<=\w)(?=#)/g ).map( x => x.trim() ).filter( x => x );
         if ( path.length ) { path = path.join( `/${ $config.template.api.modules }/` )?.split( '/' ) || []; }
         // No detail?
         if ( !path.length ) return event.respondWith();

package/src/scoped-js/index.js

@@ -19,7 +19,7 @@ export default function init( { advanced = {}, ...$config } ) {
         advanced: resolveParams( advanced, {
             parserParams: { allowReturnOutsideFunction: false, allowSuperOutsideMethod: false },
             compilerParams: { globalsNoObserve: [ 'alert' ] },
-            runtimeParams: { apiVersion: 2 },
+            runtimeParams: { apiVersion: 2, compileFunction: this.webqit.compileFunctionCallback },
         } ),
     } );
 	config.scriptSelector = ( Array.isArray( config.script.mimeType ) ? config.script.mimeType : [ config.script.mimeType ] ).reduce( ( selector, mm ) => {
@@ -27,7 +27,7 @@ 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 = config.SubscriptFunction/* allow for injection, e.g. from test runner */ || SubscriptFunction;
+    window.webqit.SubscriptFunction/* if already injected */ || ( window.webqit.SubscriptFunction = SubscriptFunction );
     window.webqit.Observer = Observer;
     realtime.call( window, config );
 }

package/test/index.js

@@ -55,16 +55,13 @@ export function createDocumentForScopedJS( head = '', body = '', callback = null
             window.testRecords = [];
             createContext( window );
             // Running advanced scripts
-            init.call( window, { SCOPED_JS: {
+            window.webqit = {
                 SubscriptFunction,
-                advanced: {
-                    runtimeParams: {
-                        compileFunction: ( code, parameters ) => compileFunction( code, parameters, {
-                            parsingContext: window,
-                        } ),
-                    }
-                }
-            } } );
+                compileFunctionCallback: ( code, parameters ) => compileFunction( code, parameters, {
+                    parsingContext: window,
+                } ),
+            };
+            init.call( window );
             // Running basic scripts
             const dom = webqitDom.call( window );
             if ( params.runScripts !== 'dangerously' ) {