pome-ui 2.0.0-preview60 → 2.0.0-preview62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pome-ui",
-  "version": "2.0.0-preview60",
+  "version": "2.0.0-preview62",
   "description": "Front-end MVC library",
   "main": "pome-ui.js",
   "bin": {

package/pome-commonjs.js

@@ -21,7 +21,36 @@ var PomeloModule = (function (exports) {
     var _cache = {};
     var _alias = {};
     var _singleton = {};
-    var useRelativePath = window.location.protocol != 'http:' && window.location.protocol != 'https:'
+    var useRelativePath = window.location.protocol != 'http:' && window.location.protocol != 'https:';
+
+    function normalizePath(url) {
+        if (!url) return url;
+        var prefix = '';
+        var protocolIdx = url.indexOf('://');
+        if (protocolIdx >= 0) {
+            prefix = url.substring(0, protocolIdx + 3);
+            url = url.substring(protocolIdx + 3);
+        }
+
+        var segments = url.split('/');
+        var result = [];
+
+        for (var i = 0; i < segments.length; i++) {
+            if (segments[i] === '.') {
+                continue;
+            } else if (segments[i] === '..') {
+                if (result.length > 0 && result[result.length - 1] !== '' && result[result.length - 1] !== '..') {
+                    result.pop();
+                } else if (result.length === 0) {
+                    result.push('..');
+                }
+            } else {
+                result.push(segments[i]);
+            }
+        }
+
+        return prefix + result.join('/');
+    }
 
     function _httpGetSync(url) {
         if (useRelativePath) {
@@ -41,6 +70,9 @@ var PomeloModule = (function (exports) {
         var xhr = new XMLHttpRequest();
         xhr.open('get', url, false);
         xhr.send();
+        if (xhr.status !== 0 && xhr.status !== 200) {
+            throw new Error('Failed to load module: ' + url + ' (HTTP ' + xhr.status + ')');
+        }
         return xhr.responseText;
     }
 
@@ -65,46 +97,16 @@ var PomeloModule = (function (exports) {
         return ret;
     }
 
-    function resolveRelativePathPlain(url) {
-        if (url.indexOf('./') == -1 && url.indexOf('../') == -1) {
-            return url;
-        }
-
-        var index = url.lastIndexOf('../');
-        if (index == 0) {
-            return url;
-        }
-
-        url = url.replaceAll('/./', '/');
-        if (url.indexOf('./') == 0) {
-            url = url.substr(2);
-        }
-
-        if (index) {
-            var w = url.substr(0, index);
-            var f = url.substr(index);
-            return resolveRelativePath(f, w);
-        }
-    }
-
     function resolveRelativePath(file, workingDirectory) {
-        if (file.length && (file[0] == '/') || file.indexOf('http') == 0) {
-            return resolveRelativePathPlain(file);
-        }
-
-        if (file.length && file[0] != '.') {
-            return resolveRelativePathPlain(workingDirectory + file);
-        }
+        if (!file) return normalizePath(workingDirectory);
 
-        if (file.indexOf('./') == 0) {
-            return resolveRelativePath(file.substr(2), workingDirectory);
+        // Absolute path or full URL
+        if (file[0] === '/' || file.indexOf('http') === 0) {
+            return normalizePath(file);
         }
 
-        if (file.indexOf('../') == 0) {
-            file = file.substr(3);
-            workingDirectory = getContainingFolder(workingDirectory.substr(0, workingDirectory.length - 1));
-            return resolveRelativePath(file, workingDirectory);
-        }
+        // Relative path (./xxx, ../xxx, or plain name)
+        return normalizePath(workingDirectory + file);
     }
 
     var supportedExtensions = ['.js', '.json', '.cjs'];
@@ -136,7 +138,7 @@ var PomeloModule = (function (exports) {
             }
 
             var url = resolveRelativePath(script, workingDirectory);
-            var url = ensureRequiredJsPath(url);
+            url = ensureRequiredJsPath(url);
             if (_alias[url]) {
                 url = _alias[url];
             }
@@ -147,11 +149,8 @@ var PomeloModule = (function (exports) {
 
             var js = _cache[url];
 
-            if (url.length >= '.json'.length) {
-                var jsonExt = url.substr(url.length - '.json'.length);
-                if (jsonExt == '.json') {
-                    return JSON.parse(js);
-                }
+            if (url.length >= '.json'.length && url.substring(url.length - '.json'.length) === '.json') {
+                return JSON.parse(js);
             }
 
             if (mode == 'singleton' && _singleton[url]) {
@@ -162,6 +161,13 @@ var PomeloModule = (function (exports) {
                 exports: {}
             };
 
+            // Pre-register singleton to handle circular dependencies
+            if (mode == 'singleton') {
+                _singleton[url] = module.exports;
+            }
+
+            var __filename = url;
+            var __dirname = getContainingFolder(url);
             var self = this;
 
             with (module) {
@@ -169,15 +175,14 @@ var PomeloModule = (function (exports) {
                     _workingDirectory = _workingDirectory || getContainingFolder(url);
                     return self.require(script, _workingDirectory, mode);
                 };
-                js = js.replaceAll('export default', 'exports.default =');
+                js = js.replace(/\bexport\s+default\b/g, 'exports.default =');
                 eval(js + '\r\n//# sourceURL=' + url);
+                // Update singleton with final exports (handles module.exports reassignment)
                 if (mode == 'singleton') {
                     _singleton[url] = exports;
                 }
                 return exports;
             }
-
-            return module.exports;
         },
         alias(url, alias) {
             _alias[alias] = url;

package/pome-commonjs.min.js

@@ -1 +1 @@
-if(window.Pomelo){Pomelo.Module={}}if(!window.PomeloCommonJsConfig){window.PomeloCommonJsConfig={}}function SetPomeloCommonJsConfig(e){window.PomeloCommonJsConfig=e}var PomeloModule=function(exports){if(exports.module){return}var _cache={};var _alias={};var _singleton={};var useRelativePath=window.location.protocol!="http:"&&window.location.protocol!="https:";function _httpGetSync(e){if(useRelativePath){if(e.length&&e[0]=="/"){e=e.substr(1)}}if(window.PomeloCommonJsConfig.version){if(e.indexOf("?")>0){e+="&v="+window.PomeloCommonJsConfig.version}else{e+="?v="+window.PomeloCommonJsConfig.version}}var r=new XMLHttpRequest;r.open("get",e,false);r.send();return r.responseText}var validModes=["singleton","transient"];function getContainingFolder(e){if(!e){console.warn("getContainingFolder: absolutePath is invalid")}var r=e.lastIndexOf("/");if(r<0){return useRelativePath?"":"/"}var o=e.substr(0,r)+"/";if(useRelativePath&&o.length&&o[0]=="/"){o=o.substr(1)}return o}function resolveRelativePathPlain(e){if(e.indexOf("./")==-1&&e.indexOf("../")==-1){return e}var r=e.lastIndexOf("../");if(r==0){return e}e=e.replaceAll("/./","/");if(e.indexOf("./")==0){e=e.substr(2)}if(r){var o=e.substr(0,r);var t=e.substr(r);return resolveRelativePath(t,o)}}function resolveRelativePath(e,r){if(e.length&&e[0]=="/"||e.indexOf("http")==0){return resolveRelativePathPlain(e)}if(e.length&&e[0]!="."){return resolveRelativePathPlain(r+e)}if(e.indexOf("./")==0){return resolveRelativePath(e.substr(2),r)}if(e.indexOf("../")==0){e=e.substr(3);r=getContainingFolder(r.substr(0,r.length-1));return resolveRelativePath(e,r)}}var supportedExtensions=[".js",".json",".cjs"];function ensureRequiredJsPath(e){var r=e.lastIndexOf("/");var o=r<0?e:e.substr(r+1);var t=o.lastIndexOf(".");var n=o.substr(t);if(t<0){return e+".js"}if(supportedExtensions.some(e=>e==n.toLowerCase())){return e}return e+".js"}var module={require(script,workingDirectory,mode){mode=mode||"singleton";workingDirectory=workingDirectory||"/";if(validModes.indexOf(mode)==-1){throw"Invalid require mode"}var url=resolveRelativePath(script,workingDirectory);var url=ensureRequiredJsPath(url);if(_alias[url]){url=_alias[url]}if(!_cache[url]){_cache[url]=_httpGetSync(url)}var js=_cache[url];if(url.length>=".json".length){var jsonExt=url.substr(url.length-".json".length);if(jsonExt==".json"){return JSON.parse(js)}}if(mode=="singleton"&&_singleton[url]){return _singleton[url]}var module={exports:{}};var self=this;with(module){var require=function(e,r,o){r=r||getContainingFolder(url);return self.require(e,r,o)};js=js.replaceAll("export default","exports.default =");eval(js+"\r\n//# sourceURL="+url);if(mode=="singleton"){_singleton[url]=exports}return exports}return module.exports},alias(e,r){_alias[r]=e}};exports.require=module.require;exports.alias=module.alias;exports.getContainingFolder=getContainingFolder;return exports}(window);
+if(window.Pomelo){Pomelo.Module={}}if(!window.PomeloCommonJsConfig){window.PomeloCommonJsConfig={}}function SetPomeloCommonJsConfig(e){window.PomeloCommonJsConfig=e}var PomeloModule=function(exports){if(exports.module){return}var _cache={};var _alias={};var _singleton={};var useRelativePath=window.location.protocol!="http:"&&window.location.protocol!="https:";function normalizePath(e){if(!e)return e;var o="";var r=e.indexOf("://");if(r>=0){o=e.substring(0,r+3);e=e.substring(r+3)}var n=e.split("/");var t=[];for(var i=0;i<n.length;i++){if(n[i]==="."){continue}else if(n[i]===".."){if(t.length>0&&t[t.length-1]!==""&&t[t.length-1]!==".."){t.pop()}else if(t.length===0){t.push("..")}}else{t.push(n[i])}}return o+t.join("/")}function _httpGetSync(e){if(useRelativePath){if(e.length&&e[0]=="/"){e=e.substr(1)}}if(window.PomeloCommonJsConfig.version){if(e.indexOf("?")>0){e+="&v="+window.PomeloCommonJsConfig.version}else{e+="?v="+window.PomeloCommonJsConfig.version}}var o=new XMLHttpRequest;o.open("get",e,false);o.send();if(o.status!==0&&o.status!==200){throw new Error("Failed to load module: "+e+" (HTTP "+o.status+")")}return o.responseText}var validModes=["singleton","transient"];function getContainingFolder(e){if(!e){console.warn("getContainingFolder: absolutePath is invalid")}var o=e.lastIndexOf("/");if(o<0){return useRelativePath?"":"/"}var r=e.substr(0,o)+"/";if(useRelativePath&&r.length&&r[0]=="/"){r=r.substr(1)}return r}function resolveRelativePath(e,o){if(!e)return normalizePath(o);if(e[0]==="/"||e.indexOf("http")===0){return normalizePath(e)}return normalizePath(o+e)}var supportedExtensions=[".js",".json",".cjs"];function ensureRequiredJsPath(e){var o=e.lastIndexOf("/");var r=o<0?e:e.substr(o+1);var n=r.lastIndexOf(".");var t=r.substr(n);if(n<0){return e+".js"}if(supportedExtensions.some(e=>e==t.toLowerCase())){return e}return e+".js"}var module={require(script,workingDirectory,mode){mode=mode||"singleton";workingDirectory=workingDirectory||"/";if(validModes.indexOf(mode)==-1){throw"Invalid require mode"}var url=resolveRelativePath(script,workingDirectory);url=ensureRequiredJsPath(url);if(_alias[url]){url=_alias[url]}if(!_cache[url]){_cache[url]=_httpGetSync(url)}var js=_cache[url];if(url.length>=".json".length&&url.substring(url.length-".json".length)===".json"){return JSON.parse(js)}if(mode=="singleton"&&_singleton[url]){return _singleton[url]}var module={exports:{}};if(mode=="singleton"){_singleton[url]=module.exports}var __filename=url;var __dirname=getContainingFolder(url);var self=this;with(module){var require=function(e,o,r){o=o||getContainingFolder(url);return self.require(e,o,r)};js=js.replace(/\bexport\s+default\b/g,"exports.default =");eval(js+"\r\n//# sourceURL="+url);if(mode=="singleton"){_singleton[url]=exports}return exports}},alias(e,o){_alias[o]=e}};exports.require=module.require;exports.alias=module.alias;exports.getContainingFolder=getContainingFolder;return exports}(window);

package/pome-localization.js

@@ -28,10 +28,10 @@ function create() {
             this.localesGroups.push(locales);
 
             if (typeof locales == 'string') {
-                this.locales[locales] = path;
+                this.locales[locales.toLowerCase()] = path;
             } else if (locales instanceof Array) {
                 for (var i = 0; i < locales.length; ++i) {
-                    this.locales[locales[i]] = path;
+                    this.locales[locales[i].toLowerCase()] = path;
                 }
             }
 
@@ -46,6 +46,8 @@ function create() {
                     : window.localStorage.locale;
             }
 
+            locale = locale.toLowerCase();
+
             if (!this.locales[locale]) {
                 locale = 'fallback';
             }
@@ -96,6 +98,7 @@ function create() {
         setLocalizedString(locales, key, val) {
             var self = this;
             locales.forEach(function (locale) {
+                locale = locale.toLowerCase();
                 if (!self.overrides[locale]) {
                     self.overrides[locale] = {};
                 }

package/pome-localization.min.js

@@ -1 +1 @@
-function create(){var s=null;return{localesGroups:[],locales:{},texts:{},overrides:{},getCurrentLocale(){return s},getLocalesGroups(){return this.localesGroups},addLocale(e,t,l){if(!t){var r=e.lastIndexOf("/");if(r<0){t=e}else{t=e.substr(e,r+1)}t=t.split(".")[0]}this.localesGroups.push(t);if(typeof t=="string"){this.locales[t]=e}else if(t instanceof Array){for(var s=0;s<t.length;++s){this.locales[t[s]]=e}}if(l){this.locales["fallback"]=e}},setLocale(e){if(!e){e=!window.localStorage.locale?window.navigator.language:window.localStorage.locale}if(!this.locales[e]){e="fallback"}if(!this.locales[e]){throw"No available translations for the locale"}s=e;this.texts=require(this.locales[e]).texts;if(this.locales["fallback"]){if(this.locales[e]!=this.locales["fallback"]){var t=require(this.locales["fallback"]).texts;var l=Object.getOwnPropertyNames(t);var r=this;l.forEach(function(e){if(!r.texts[e]){r.texts[e]=t[e]}})}}},sr(){if(arguments.length==0){return null}var e=arguments[0];var t=e;var l=false;if(this.overrides[this.getCurrentLocale()]&&this.overrides[this.getCurrentLocale()][e]){t=this.overrides[this.getCurrentLocale()][e];l=true}if(!l&&this.texts[e]){t=this.texts[e]}for(var r=1;r<arguments.length;++r){t=t.replaceAll(`{${r-1}}`,arguments[r])}return t},setLocalizedString(e,t,l){var r=this;e.forEach(function(e){if(!r.overrides[e]){r.overrides[e]={}}r.overrides[e][t]=l})}}}exports.create=create;
+function create(){var a=null;return{localesGroups:[],locales:{},texts:{},overrides:{},getCurrentLocale(){return a},getLocalesGroups(){return this.localesGroups},addLocale(e,t,r){if(!t){var s=e.lastIndexOf("/");if(s<0){t=e}else{t=e.substr(e,s+1)}t=t.split(".")[0]}this.localesGroups.push(t);if(typeof t=="string"){this.locales[t.toLowerCase()]=e}else if(t instanceof Array){for(var a=0;a<t.length;++a){this.locales[t[a].toLowerCase()]=e}}if(r){this.locales["fallback"]=e}},setLocale(e){if(!e){e=!window.localStorage.locale?window.navigator.language:window.localStorage.locale}e=e.toLowerCase();if(!this.locales[e]){e="fallback"}if(!this.locales[e]){throw"No available translations for the locale"}a=e;this.texts=require(this.locales[e]).texts;if(this.locales["fallback"]){if(this.locales[e]!=this.locales["fallback"]){var t=require(this.locales["fallback"]).texts;var r=Object.getOwnPropertyNames(t);var s=this;r.forEach(function(e){if(!s.texts[e]){s.texts[e]=t[e]}})}}},sr(){if(arguments.length==0){return null}var e=arguments[0];var t=e;var r=false;if(this.overrides[this.getCurrentLocale()]&&this.overrides[this.getCurrentLocale()][e]){t=this.overrides[this.getCurrentLocale()][e];r=true}if(!r&&this.texts[e]){t=this.texts[e]}for(var s=1;s<arguments.length;++s){t=t.replaceAll(`{${s-1}}`,arguments[s])}return t},setLocalizedString(e,t,r){var s=this;e.forEach(function(e){e=e.toLowerCase();if(!s.overrides[e]){s.overrides[e]={}}s.overrides[e][t]=r})}}}exports.create=create;

package/pome-ui.dev.js

@@ -18514,15 +18514,26 @@ function build(options, exports) {
     // routes that return the app entry page (status 200) for any URL:
     // if the response body starts with "<!DOCTYPE" or "<html" it is treated
     // as a missing file and null is returned.
+    // Caches "not found" results so that repeated requests for the same
+    // missing skeleton file do not produce additional network round-trips.
+    var _skeletonNotFoundCache = {};
     function _httpGetSkeletonFile(url) {
+        if (_skeletonNotFoundCache[url]) {
+            return Promise.resolve(null);
+        }
         return _httpGet(url).then(function (text) {
-            if (!text) return null;
+            if (!text) {
+                _skeletonNotFoundCache[url] = true;
+                return null;
+            }
             var trimmed = text.replace(/^[\s\uFEFF]+/, ''); // strip BOM / whitespace
             if (/^<!DOCTYPE/i.test(trimmed) || /^<html/i.test(trimmed)) {
+                _skeletonNotFoundCache[url] = true;
                 return null; // SPA fallback page, not a real skeleton file
             }
             return text;
         }).catch(function () {
+            _skeletonNotFoundCache[url] = true;
             return null;
         });
     };
@@ -18876,6 +18887,16 @@ function build(options, exports) {
                             ret.component(com.name, com.options);
                         }
 
+                        // Inherit parent's registered components
+                        if (parent && parent.$ && parent.$.appContext && parent.$.appContext.components) {
+                            var parentComps = parent.$.appContext.components;
+                            for (var pName in parentComps) {
+                                if (!ret._context.components[pName]) {
+                                    ret.component(pName, parentComps[pName]);
+                                }
+                            }
+                        }
+
                         var originalMountFunc = ret.mount || function () { };
                         ret.mount = function (el) {
                             ret.proxy = originalMountFunc(el);