@jinntec/fore 2.7.2 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "2.7.2",
+  "version": "2.9.0",
   "description": "Fore - declarative user interfaces in plain HTML",
   "module": "./index.js",
   "publishConfig": {

package/resources/fore.css

@@ -109,6 +109,9 @@
         background: rgba(0, 0, 0, 0.5);
         z-index: 10;
         transition: opacity 0.4s linear;
+        position: fixed;
+        top: 0;
+        left: 0;
     }
 
     fx-dialog.show .dialog-content {

package/src/functions/fx-functionlib.js

@@ -1,10 +1,45 @@
 import ForeElementMixin from '../ForeElementMixin.js';
 import registerFunction from './registerFunction.js';
 
-/**
- * Allows to extend a form with remote custom functions.
- *
- */
+const LOCAL_FUNCTIONS_NS = 'http://www.w3.org/2005/xquery-local-functions';
+
+// Global per-page cache to prevent registering the same library multiple times.
+// Keyed by resolved URL + prefix + mode.
+const _functionLibLoadCache = new Map();
+
+function looksLikeModuleSrc(src) {
+  return /\.m?js($|\?)/i.test(src);
+}
+
+function applyPrefixToSignature(signature, prefix) {
+  if (!signature || !prefix) return signature;
+
+  const s = signature.trim();
+  const paren = s.indexOf('(');
+  if (paren < 0) return s;
+
+  const namePart = s.slice(0, paren).trim();
+  const rest = s.slice(paren);
+
+  const localName = namePart.includes(':') ? namePart.split(':').pop().trim() : namePart;
+  if (!localName) return s;
+
+  return `${prefix}:${localName}${rest}`;
+}
+
+function normalizeModuleExportToList(mod, src) {
+  const lib = mod.functions ?? mod.fxFunctions;
+  if (!lib) {
+    console.error(
+      `fx-functionlib: Module ${src} must export a named \`functions\` (or \`fxFunctions\`).`,
+    );
+    return [];
+  }
+  if (Array.isArray(lib)) return lib;
+  if (typeof lib === 'object') return Object.values(lib);
+  return [];
+}
+
 export class FxFunctionlib extends ForeElementMixin {
   constructor() {
     super();
@@ -24,20 +59,112 @@ export class FxFunctionlib extends ForeElementMixin {
     this.style.display = 'none';
 
     const src = this.getAttribute('src');
+    if (!src) {
+      console.error('fx-functionlib: Missing required @src.');
+      this._resolveLoading(undefined);
+      return;
+    }
+
+    const prefix = (this.getAttribute('prefix') || '').trim();
+
+    const typeAttr = (this.getAttribute('type') || '').trim().toLowerCase();
+    const isModule = typeAttr === 'module' || (!typeAttr && looksLikeModuleSrc(src));
+
+    const resolvedUrl = new URL(src, this.baseURI).href;
+
+    if (prefix) this._ensurePrefixDeclared(prefix);
+
+    const mode = isModule ? 'module' : 'html';
+    const cacheKey = `${mode}|${resolvedUrl}|${prefix}`;
+
+    const existing = _functionLibLoadCache.get(cacheKey);
+    if (existing) {
+      try {
+        await existing;
+      } finally {
+        this._resolveLoading(undefined);
+      }
+      return;
+    }
+
+    const loadPromise = (async () => {
+      if (isModule) {
+        await this._loadModuleLibrary(resolvedUrl, src, prefix);
+      } else {
+        await this._loadHtmlLibrary(resolvedUrl, src, prefix);
+      }
+    })();
 
-    const result = await fetch(src);
+    _functionLibLoadCache.set(cacheKey, loadPromise);
+
+    try {
+      await loadPromise;
+    } catch (e) {
+      _functionLibLoadCache.delete(cacheKey);
+      console.error(`fx-functionlib: Loading function library at ${src} failed.`, e);
+    } finally {
+      this._resolveLoading(undefined);
+    }
+  }
+
+  _ensurePrefixDeclared(prefix) {
+    const ownerForm =
+        (typeof this.getOwnerForm === 'function' && this.getOwnerForm()) || this.closest('fx-fore');
+
+    if (!ownerForm) return;
+
+    const attrName = `xmlns:${prefix}`;
+    if (!ownerForm.getAttribute(attrName)) {
+      ownerForm.setAttribute(attrName, LOCAL_FUNCTIONS_NS);
+    }
+  }
+
+  _register(functionObject, prefix) {
+    if (!functionObject || typeof functionObject.signature !== 'string') return;
+
+    // If prefix is given: register ONLY the prefixed signature (no unprefixed alias).
+    const sig = prefix
+        ? applyPrefixToSignature(functionObject.signature, prefix)
+        : functionObject.signature;
+
+    registerFunction({ ...functionObject, signature: sig }, this);
+  }
+
+  async _loadModuleLibrary(resolvedUrl, src, prefix) {
+    const mod = await import(/* @vite-ignore */ resolvedUrl);
+
+    const items = normalizeModuleExportToList(mod, src);
+
+    for (const item of items) {
+      if (typeof item === 'function') {
+        const { signature } = item;
+        if (typeof signature !== 'string' || !signature.trim()) continue;
+
+        this._register(
+            {
+              type: 'text/javascript',
+              signature: signature.trim(),
+              implementation: item,
+            },
+            prefix,
+        );
+      } else if (item && typeof item === 'object' && typeof item.signature === 'string') {
+        this._register(item, prefix);
+      }
+    }
+  }
+
+  async _loadHtmlLibrary(resolvedUrl, src, prefix) {
+    const result = await fetch(resolvedUrl);
     if (!result.ok) {
       console.error(`Loading function library at ${src} failed.`);
+      return;
     }
 
     const body = await result.text();
     const document = new DOMParser().parseFromString(body, 'text/html');
 
-    /**
-     * @type {HTMLElement[]}
-     */
     const functions = Array.from(document.querySelectorAll('fx-function'));
-    // TODO: also recurse into new function libraries here?
     for (const func of functions) {
       const functionObject = {
         type: func.getAttribute('type'),
@@ -45,12 +172,11 @@ export class FxFunctionlib extends ForeElementMixin {
         functionBody: func.innerText,
       };
 
-      registerFunction(functionObject, this);
+      this._register(functionObject, prefix);
     }
-    this._resolveLoading(undefined);
   }
 }
 
 if (!customElements.get('fx-functionlib')) {
   customElements.define('fx-functionlib', FxFunctionlib);
-}
+}

package/src/functions/mylib.js

@@ -0,0 +1,13 @@
+export function myfunc(node) {
+  // simple: true if node is present
+  return !!node;
+}
+myfunc.signature = 'myfunc($node as item()?) as xs:boolean';
+
+export function hasText(s) {
+  return s != null && String(s).trim() !== '';
+}
+hasText.signature = 'hasText($s as xs:string?) as xs:boolean';
+
+// Named export is the default convention for fx-functionlib
+export const functions = [myfunc, hasText];

package/src/functions/registerFunction.js

@@ -1,5 +1,5 @@
 import { createTypedValueFactory, registerCustomXPathFunction } from 'fontoxpath';
-import { evaluateXPath, globallyDeclaredFunctionLocalNames } from '../xpath-evaluation';
+import { evaluateXPath, globallyDeclaredFunctionLocalNames } from '../xpath-evaluation.js';
 
 /**
  * @param functionObject {{signature: string, type: string|null, functionBody: string}}
@@ -53,6 +53,20 @@ export default function registerFunction(functionObject, formElement) {
 
   switch (type) {
     case 'text/javascript': {
+      // NEW: if a real JS function is provided (module libs), register it directly.
+      if (typeof functionObject.implementation === 'function') {
+        const impl = functionObject.implementation;
+        registerCustomXPathFunction(
+          functionIdentifier,
+          paramParts.map(paramPart => paramPart.variableType),
+          returnType || 'item()*',
+          (domFacade, ...values) =>
+            impl.apply(formElement.getInScopeContext(), [...values, formElement.getOwnerForm()]),
+        );
+        break;
+      }
+
+      // Existing behavior: compile from functionBody
       // eslint-disable-next-line no-new-func
       const fun = new Function(
         '_domFacade',
@@ -69,7 +83,6 @@ export default function registerFunction(functionObject, formElement) {
       );
       break;
     }
-
     case 'text/xquf':
     case 'text/xquery':
     case 'text/xpath': {

package/src/fx-bind.js

@@ -94,7 +94,7 @@ export class FxBind extends ForeElementMixin {
     }
 
     // ✅ only the repeat item gets the _<opNum> suffix; children do not.
-    const basePath = XPathUtil.getPath(node, instanceId);
+    const basePath = getPath(node, instanceId);
     const path = opNum ? `${basePath}_${opNum}` : basePath;
 
     // const path = XPathUtil.getPath(node, instanceId);