unpoly-rails 3.0.0.rc1 → 3.0.0.rc2

data/assets/unpoly/unpoly.js

@@ -5,7 +5,7 @@
 /***/ (() => {
 
 window.up = {
-    version: '3.0.0-rc1'
+    version: '3.0.0-rc2'
 };
 
 
@@ -14,13 +14,18 @@ window.up = {
 /***/ (() => {
 
 up.mockable = function (originalFn) {
-    let spy;
-    const mockableFn = function () {
-        return (spy || originalFn).apply(null, arguments);
-    };
-    mockableFn.mock = () => spy = jasmine.createSpy('mockable', originalFn);
-    document.addEventListener('up:framework:reset', () => spy = null);
-    return mockableFn;
+    if (window.jasmine) {
+        let name = originalFn.name;
+        let obj = { [name]: originalFn };
+        let mockableFn = function () {
+            return obj[name].apply(this, arguments);
+        };
+        mockableFn.mock = () => spyOn(obj, name);
+        return mockableFn;
+    }
+    else {
+        return originalFn;
+    }
 };
 
 
@@ -869,12 +874,6 @@ up.browser = (function () {
             return value;
         }
     }
-    const getJQuery = function () {
-        if (!canJQuery()) {
-            up.fail('jQuery must be published as window.jQuery');
-        }
-        return jQuery;
-    };
     function assertConfirmed(options) {
         const confirmed = !options.confirm || window.confirm(options.confirm);
         if (!confirmed) {
@@ -889,7 +888,6 @@ up.browser = (function () {
         canEval,
         assertConfirmed,
         popCookie,
-        get jQuery() { return getJQuery(); },
     };
 })();
 
@@ -1874,7 +1872,7 @@ up.Change.Addition = class Addition extends up.Change {
     setETag({ newElement, etag }) {
         e.setMissingAttr(newElement, 'up-etag', etag || false);
     }
-    setMeta(options) {
+    setReloadAttrs(options) {
         this.setSource(options);
         this.setTime(options);
         this.setETag(options);
@@ -2082,9 +2080,9 @@ up.Change.OpenLayer = class OpenLayer extends up.Change.Addition {
         this.layer.createElements(this.content);
         this.layer.setupHandlers();
         this.handleHistory();
-        this.setMeta({ newElement: this.content, source: this.options.source });
+        this.setReloadAttrs({ newElement: this.content, source: this.options.source });
         responseDoc.finalizeElement(this.content);
-        up.hello(this.layer.element, { layer: this.layer, origin: this.origin });
+        up.hello(this.layer.element, { ...this.options, layer: this.layer });
         this.handleLayerChangeRequests();
         this.handleScroll();
         let renderResult = new up.RenderResult({
@@ -2244,7 +2242,7 @@ up.Change.UpdateLayer = (_a = class UpdateLayer extends up.Change.Addition {
             this.renderResult.fragments.unshift(...newFragments);
         }
         executeStep(step) {
-            this.setMeta(step);
+            this.setReloadAttrs(step);
             switch (step.placement) {
                 case 'swap': {
                     let keepPlan = this.findKeepPlan(step);
@@ -2749,19 +2747,12 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
         }
         onRequestSettledWithResponse(response) {
             this.response = response;
-            const expiredResponse = this.options.expiredResponse;
-            const eventProps = {
-                response: this.response,
-                renderOptions: this.options,
-                revalidating: !!expiredResponse,
-                expiredResponse,
-            };
-            if (up.fragment.config.skipResponse(eventProps)) {
+            if (up.fragment.config.skipResponse(this.loadedEventProps())) {
                 this.skip();
             }
             else {
                 this.request.assertEmitted('up:fragment:loaded', {
-                    ...eventProps,
+                    ...this.loadedEventProps(),
                     callback: this.options.onLoaded,
                     log: ['Loaded fragment from %s', this.response.description],
                     skip: () => this.skip()
@@ -2773,6 +2764,22 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
             }
             return this.updateContentFromResponse(this.options);
         }
+        compilerPassMeta() {
+            return u.pick(this.loadedEventProps(), [
+                'revalidating',
+                'response'
+            ]);
+        }
+        loadedEventProps() {
+            const { expiredResponse } = this.options;
+            return {
+                request: this.request,
+                response: this.response,
+                renderOptions: this.options,
+                revalidating: !!expiredResponse,
+                expiredResponse,
+            };
+        }
         onRequestSettledWithError(error) {
             if (error instanceof up.Offline) {
                 this.request.emit('up:fragment:offline', {
@@ -2795,6 +2802,7 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
                 up.puts('up.render()', 'Rendering failed response using fail-prefixed options (https://unpoly.com/failed-responses)');
             }
             this.augmentOptionsFromResponse(finalRenderOptions);
+            finalRenderOptions.meta = this.compilerPassMeta();
             let result = new up.Change.FromContent(finalRenderOptions).execute();
             result.finished = this.finish(result, finalRenderOptions);
             return result;
@@ -2870,6 +2878,7 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
     (() => {
         u.memoizeMethod(_a.prototype, [
             'getRequestAttrs',
+            'loadedEventProps',
         ]);
     })(),
     _a);
@@ -2881,12 +2890,14 @@ up.Change.FromURL = (_a = class FromURL extends up.Change {
 
 const u = up.util;
 up.CompilerPass = class CompilerPass {
-    constructor(root, compilers, { layer, data, dataMap } = {}) {
+    constructor(root, compilers, { layer, data, dataMap, meta }) {
+        layer || (layer = up.layer.get(root) || up.layer.current);
         this.root = root;
         this.compilers = compilers;
-        this.layer = layer || up.layer.get(this.root) || up.layer.current;
+        this.layer = layer;
         this.data = data;
         this.dataMap = dataMap;
+        this.meta = { layer, ...meta };
         this.errors = [];
     }
     run() {
@@ -2931,11 +2942,10 @@ up.CompilerPass = class CompilerPass {
         return up.migrate.postCompile?.(matches, compiler);
     }
     compileOneElement(compiler, element) {
-        const elementArg = compiler.jQuery ? up.browser.jQuery(element) : element;
-        const compileArgs = [elementArg];
+        const compileArgs = [element];
         if (compiler.length !== 1) {
             const data = up.syntax.data(element);
-            compileArgs.push(data);
+            compileArgs.push(data, this.meta);
         }
         const result = this.applyCompilerFunction(compiler, element, compileArgs);
         let destructorOrDestructors = this.destructorPresence(result);
@@ -2944,11 +2954,10 @@ up.CompilerPass = class CompilerPass {
         }
     }
     compileBatch(compiler, elements) {
-        const elementsArgs = compiler.jQuery ? up.browser.jQuery(elements) : elements;
-        const compileArgs = [elementsArgs];
+        const compileArgs = [elements];
         if (compiler.length !== 1) {
             const dataList = u.map(elements, up.syntax.data);
-            compileArgs.push(dataList);
+            compileArgs.push(dataList, this.meta);
         }
         const result = this.applyCompilerFunction(compiler, elements, compileArgs);
         if (this.destructorPresence(result)) {
@@ -3250,7 +3259,6 @@ up.EventListener = class EventListener extends up.Record {
             'eventType',
             'selector',
             'callback',
-            'jQuery',
             'guard',
             'baseLayer',
             'passive',
@@ -3297,8 +3305,7 @@ up.EventListener = class EventListener extends up.Record {
             return;
         }
         if (element) {
-            const elementArg = this.jQuery ? up.browser.jQuery(element) : element;
-            const args = [event, elementArg];
+            const args = [event, element];
             const expectedArgCount = this.callback.length;
             if (expectedArgCount !== 1 && expectedArgCount !== 2) {
                 const data = up.syntax.data(element);
@@ -3354,7 +3361,6 @@ up.EventListenerGroup = class EventListenerGroup extends up.Record {
             'eventTypes',
             'selector',
             'callback',
-            'jQuery',
             'guard',
             'baseLayer',
             'passive',
@@ -4276,12 +4282,12 @@ up.Layer = class Layer extends up.Record {
         return this.stack.asCurrent(this, fn);
     }
     updateHistory(options) {
-        if (u.isString(options.title)) {
-            this.title = options.title;
-        }
         if (u.isString(options.location)) {
             this.location = options.location;
         }
+        if (u.isString(options.title)) {
+            this.title = options.title;
+        }
     }
     isHistoryVisible() {
         return this.history && (this.isRoot() || this.parent.isHistoryVisible());
@@ -4314,12 +4320,14 @@ up.Layer = class Layer extends up.Record {
     set location(location) {
         const previousLocation = this.location;
         location = up.history.normalizeURL(location);
-        if (previousLocation !== location) {
+        if (previousLocation !== location || this.opening) {
             this.savedLocation = location;
-            this.emit('up:layer:location:changed', { location, log: false });
             if (this.showsLiveHistory()) {
                 up.history.push(location);
             }
+            if (!this.opening) {
+                this.emit('up:layer:location:changed', { location });
+            }
         }
     }
     selector(part) {
@@ -5750,7 +5758,7 @@ up.RenderOptions = (function () {
         'history',
         'source',
         'saveScroll',
-        'navigate'
+        'navigate',
     ]);
     const CONTENT_KEYS = [
         'url',
@@ -6483,23 +6491,23 @@ up.Response = class Response extends up.Record {
     get ok() {
         return !u.evalOption(this.fail ?? up.network.config.fail, this);
     }
-    getHeader(name) {
+    header(name) {
         return this.headers[name] || this.xhr?.getResponseHeader(name);
     }
     get contentType() {
-        return this.getHeader('Content-Type');
+        return this.header('Content-Type');
     }
     get cspNonces() {
-        return up.protocol.cspNoncesFromHeader(this.getHeader('Content-Security-Policy'));
+        return up.protocol.cspNoncesFromHeader(this.header('Content-Security-Policy'));
     }
     get lastModified() {
-        let header = this.getHeader('Last-Modified');
+        let header = this.header('Last-Modified');
         if (header) {
             return new Date(header);
         }
     }
     get etag() {
-        return this.getHeader('ETag');
+        return this.header('ETag');
     }
     get json() {
         return this.parsedJSON || (this.parsedJSON = JSON.parse(this.text));
@@ -6509,7 +6517,8 @@ up.Response = class Response extends up.Record {
         return now - this.loadedAt;
     }
     get expired() {
-        return this.age > up.network.config.cacheExpireAge || this.request.expired;
+        return this.age > up.network.config.cacheExpireAge ||
+            this.request.expired;
     }
     get description() {
         return `HTTP ${this.status} response to ${this.request.description}`;
@@ -6957,6 +6966,7 @@ up.framework = (function () {
             readyState = 'booting';
             up.emit('up:framework:boot', { log: false });
             readyState = 'booted';
+            up.emit('up:framework:booted', { log: false });
         }
         else {
             console.error("Unpoly cannot boot: %s", issue);
@@ -7038,9 +7048,6 @@ up.event = (function () {
     function on(...args) {
         return buildListenerGroup(args).bind();
     }
-    function $on(...args) {
-        return buildListenerGroup(args, { jQuery: true }).bind();
-    }
     function off(...args) {
         return buildListenerGroup(args).unbind();
     }
@@ -7111,7 +7118,6 @@ up.event = (function () {
     on('up:framework:reset', reset);
     return {
         on,
-        $on,
         off,
         build,
         emit,
@@ -7124,9 +7130,7 @@ up.event = (function () {
     };
 })();
 up.on = up.event.on;
-up.$on = up.event.$on;
 up.off = up.event.off;
-up.$off = up.event.off;
 up.emit = up.event.emit;
 
 
@@ -7377,9 +7381,6 @@ up.syntax = (function () {
         const compiler = buildCompiler(args);
         return insertCompiler(registeredCompilers, compiler);
     }
-    function registerJQueryCompiler(...args) {
-        registerCompiler(...args, { jQuery: true });
-    }
     function registerMacro(...args) {
         const macro = buildCompiler(args);
         if (up.framework.evaling) {
@@ -7388,9 +7389,6 @@ up.syntax = (function () {
         }
         return insertCompiler(registeredMacros, macro);
     }
-    function registerJQueryMacro(...args) {
-        registerMacro(...args, { jQuery: true });
-    }
     function detectSystemMacroPriority(macroSelector) {
         macroSelector = u.evalOption(macroSelector);
         for (let substr in SYSTEM_MACRO_PRIORITIES) {
@@ -7414,7 +7412,6 @@ up.syntax = (function () {
             isDefault: up.framework.evaling,
             priority: 0,
             batch: false,
-            jQuery: false
         });
         return Object.assign(callback, options);
     }
@@ -7456,10 +7453,10 @@ up.syntax = (function () {
             destructors.push(destructor);
         }
     }
-    function hello(element, { layer, data, dataMap } = {}) {
-        element = up.fragment.get(element);
+    function hello(element, options = {}) {
+        element = up.fragment.get(element, options);
         up.puts('up.hello()', "Compiling fragment %o", element);
-        compile(element, { layer, data, dataMap });
+        compile(element, options);
         up.fragment.emitInserted(element);
         return element;
     }
@@ -7496,8 +7493,6 @@ up.syntax = (function () {
     return {
         compiler: registerCompiler,
         macro: registerMacro,
-        $compiler: registerJQueryCompiler,
-        $macro: registerJQueryMacro,
         destructor: registerDestructor,
         hello,
         clean,
@@ -7505,10 +7500,8 @@ up.syntax = (function () {
     };
 })();
 up.compiler = up.syntax.compiler;
-up.$compiler = up.syntax.$compiler;
 up.destructor = up.syntax.destructor;
 up.macro = up.syntax.macro;
-up.$macro = up.syntax.$macro;
 up.data = up.syntax.data;
 up.hello = up.syntax.hello;
 
@@ -9062,6 +9055,7 @@ up.layer = (function () {
         if (handleDeprecatedConfig) {
             configs.forEach(handleDeprecatedConfig);
         }
+        options.openAnimation ?? (options.openAnimation = u.pluckKey(options, 'animation'));
         options = u.mergeDefined(...configs, { mode, stack }, options);
         if (beforeNew) {
             options = beforeNew(options);