marko 5.35.7 → 5.35.8

package/src/runtime/components/Component.js

@@ -1,6 +1,6 @@
 "use strict";
-/* jshint newcap:false */
 
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var EventEmitter = require("events-light");
 var SubscriptionTracker = require("listener-tracker");
@@ -513,6 +513,7 @@ Component.prototype = componentProto = {
   },
 
   ___scheduleRerender: function () {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     var self = this;
     var renderer = self.___renderer;
 

package/src/runtime/components/ComponentDef.js

@@ -1,8 +1,9 @@
 "use strict";
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var extend = require("raptor-util/extend");
-var w10Noop = require("warp10/constants").NOOP;
 var componentUtil = require("@internal/components-util");
+var w10NOOP = require("../helpers/serialize-noop").___noop;
 var attachBubblingEvent = componentUtil.___attachBubblingEvent;
 var addDelegatedEventHandler =
   require("./event-delegation").___addDelegatedEventHandler;
@@ -98,7 +99,7 @@ ComponentDef.___deserialize = function (o, types, global, registry) {
   var componentProps = extra.w || EMPTY_OBJECT;
   var flags = extra.f;
   var isLegacy = flags & FLAG_IS_LEGACY;
-  var renderBody = flags & FLAG_HAS_RENDER_BODY ? w10Noop : extra.r;
+  var renderBody = flags & FLAG_HAS_RENDER_BODY ? w10NOOP : extra.r;
 
   var component =
     typeName /* legacy */ &&
@@ -107,6 +108,7 @@ ComponentDef.___deserialize = function (o, types, global, registry) {
   // Prevent newly created component from being queued for update since we area
   // just building it from the server info
   component.___updateQueued = true;
+  component.___global = global;
 
   if (isLegacy) {
     component.widgetConfig = componentProps;
@@ -156,8 +158,6 @@ ComponentDef.___deserialize = function (o, types, global, registry) {
     component.___setCustomEvents(customEvents, scope);
   }
 
-  component.___global = global;
-
   return {
     id: id,
     ___component: component,

package/src/runtime/components/ServerComponent.js

@@ -1,4 +1,5 @@
 "use strict";
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 
 class ServerComponent {

package/src/runtime/components/State.js

@@ -28,23 +28,19 @@ function State(component) {
 
 State.prototype = {
   ___reset: function () {
-    var self = this;
-
-    self.___dirty = false;
-    self.___old = null;
-    self.___changes = null;
-    self.___forced = null;
+    this.___dirty = false;
+    this.___old = null;
+    this.___changes = null;
+    this.___forced = null;
   },
 
   ___replace: function (newState) {
-    var state = this;
     var key;
-
     var rawState = this.___raw;
 
     for (key in rawState) {
       if (!(key in newState)) {
-        state.___set(
+        this.___set(
           key,
           undefined,
           false /* ensure:false */,
@@ -54,7 +50,7 @@ State.prototype = {
     }
 
     for (key in newState) {
-      state.___set(
+      this.___set(
         key,
         newState[key],
         true /* ensure:true */,

package/src/runtime/components/defineComponent.js

@@ -1,5 +1,4 @@
 "use strict";
-/* jshint newcap:false */
 
 var inherit = require("raptor-util/inherit");
 var BaseComponent = require("./Component");

package/src/runtime/components/legacy/defineRenderer-legacy.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var componentLookup = require("@internal/components-util").___componentLookup;
 var req = require("@internal/require");

package/src/runtime/components/legacy/dependencies/index.js

@@ -44,7 +44,6 @@ function attachDepsAndComponentsToTemplate(target, context) {
   var components = (target.___components = {});
 
   if (!template.meta) {
-    // eslint-disable-next-line no-console
     console.warn("Metadata not set for template at ", template.path);
     return;
   }

package/src/runtime/components/legacy/jquery.js

@@ -9,6 +9,7 @@ exports.patchComponent = function (jQuery, proto, delayThrow) {
 
   (proto || require("../Component").prototype).$ = function jqueryProxy(arg) {
     var args = arguments;
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     var self = this;
 
     if (!(jQuery || (jQuery = window.$))) {

package/src/runtime/components/legacy/renderer-legacy.js

@@ -8,6 +8,7 @@ var componentLookup = componentsUtil.___componentLookup;
 var modernRenderer = require("../renderer");
 var resolveComponentKey = modernRenderer.___resolveComponentKey;
 var trackAsyncComponents = modernRenderer.___trackAsyncComponents;
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 
 function createRendererFunc(templateRenderFunc, componentProps) {

package/src/runtime/helpers/dynamic-tag.js

@@ -1,14 +1,14 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
-var w10NOOP = require("warp10/constants").NOOP;
 var ComponentDef = require("../components/ComponentDef");
 var ComponentsContext = require("../components/ComponentsContext");
+var serializeNOOP = require("../helpers/serialize-noop");
+var w10NOOP = serializeNOOP.___noop;
+var w10ToJSON = serializeNOOP.___toJSON;
 var changeCase = require("./_change-case");
 var getComponentsContext = ComponentsContext.___getComponentsContext;
-var RENDER_BODY_TO_JSON = function () {
-  return w10NOOP;
-};
 
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
@@ -80,7 +80,12 @@ module.exports = function dynamicTag(
       }
 
       if (dynamicTag.___runtimeCompat) {
-        renderer = dynamicTag.___runtimeCompat(renderer, render, args);
+        renderer = dynamicTag.___runtimeCompat(
+          renderer,
+          render,
+          args,
+          out.global,
+        );
       }
 
       if (renderer) {
@@ -113,7 +118,7 @@ module.exports = function dynamicTag(
               parentComponentDef.id + "-" + parentComponentDef.___nextKey(key),
               globalContext,
             );
-            render.toJSON = RENDER_BODY_TO_JSON;
+            render.toJSON = w10ToJSON;
 
             if (args) {
               render.apply(null, [out].concat(args, attrs));

package/src/runtime/helpers/serialize-noop.js

@@ -0,0 +1,5 @@
+var w10NOOP = require("warp10/constants").NOOP;
+exports.___noop = w10NOOP;
+exports.___toJSON = function () {
+  return w10NOOP;
+};

package/src/runtime/helpers/tags-compat/dom-debug.mjs

@@ -1,3 +1,4 @@
 import { compat } from "@marko/runtime-tags/debug/dom";
+
 import { p } from "./runtime-dom.js";
 p(compat);

package/src/runtime/helpers/tags-compat/dom.mjs

@@ -1,3 +1,4 @@
 import { compat } from "@marko/runtime-tags/dom";
+
 import { p } from "./runtime-dom.js";
 p(compat);

package/src/runtime/helpers/tags-compat/html-debug.js

@@ -1,3 +1,3 @@
 exports.s = require("./runtime-html.js").p(
-  require("@marko/runtime-tags/debug/html"),
+  require("@marko/runtime-tags/debug/html").compat,
 );

package/src/runtime/helpers/tags-compat/html-debug.mjs

@@ -1,3 +1,4 @@
-import * as api from "@marko/runtime-tags/debug/html";
+import { compat } from "@marko/runtime-tags/debug/html";
+
 import { p } from "./runtime-html.js";
-export const s = p(api);
+export const s = p(compat);

package/src/runtime/helpers/tags-compat/html.js

@@ -1 +1,3 @@
-exports.s = require("./runtime-html.js").p(require("@marko/runtime-tags/html"));
+exports.s = require("./runtime-html.js").p(
+  require("@marko/runtime-tags/html").compat,
+);

package/src/runtime/helpers/tags-compat/html.mjs

@@ -1,3 +1,4 @@
-import * as api from "@marko/runtime-tags/html";
+import { compat } from "@marko/runtime-tags/html";
+
 import { p } from "./runtime-html.js";
-export const s = p(api);
+export const s = p(compat);

package/src/runtime/helpers/tags-compat/runtime-dom.js

@@ -15,12 +15,17 @@ exports.p = function (domCompat) {
     renderer,
     renderBody,
     args,
+    global,
   ) {
-    const tagsRenderer = domCompat.resolveRenderer(renderer || renderBody);
-
-    if (tagsRenderer) {
-      return (input, out) =>
-        TagsCompat({ i: args ? args : input, r: tagsRenderer }, out);
+    const tagsRenderer = domCompat.resolveRegistered(
+      renderer || renderBody,
+      global,
+    );
+
+    if (tagsRenderer && domCompat.isRenderer(tagsRenderer)) {
+      return (input, out) => {
+        return TagsCompat({ i: args ? args : input, r: tagsRenderer }, out);
+      };
     }
 
     return renderer;
@@ -29,17 +34,9 @@ exports.p = function (domCompat) {
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
-      const isHydrate =
-        ___getComponentsContext(out).___globalContext.___isHydrate;
       const input = Array.isArray(_.i) ? _.i : [_.i];
-      const tagsRenderer = domCompat.resolveRenderer(_.r);
-      const newNode = domCompat.render(
-        isHydrate,
-        out,
-        component,
-        tagsRenderer,
-        input,
-      );
+      const tagsRenderer = domCompat.resolveRegistered(_.r, global);
+      const newNode = domCompat.render(out, component, tagsRenderer, input);
 
       out.bf(out.___assignedKey, component, !newNode);
       if (newNode) {
@@ -111,8 +108,12 @@ exports.p = function (domCompat) {
               customEvents,
               scopeId,
             ) {
+              const global = this.___global;
               for (const customEvent of customEvents) {
-                customEvent[1] = domCompat.resolveRenderer(customEvent[1]);
+                customEvent[1] = domCompat.resolveRegistered(
+                  customEvent[1],
+                  global,
+                );
               }
 
               setCustomEvents.call(this, customEvents, scopeId);
@@ -141,19 +142,21 @@ exports.p = function (domCompat) {
     return newRenderer;
   }
 
-  domCompat.register("@marko/tags-compat-5-to-6", create5to6Renderer);
+  domCompat.registerRenderer(create5to6Renderer);
+  domCompat.init();
 
   function renderAndMorph(scope, renderer, renderBody, input) {
     const out = defaultCreateOut();
     let host = domCompat.getStartNode(scope);
     let rootNode = host.fragment;
     if (!rootNode) {
-      const component = (scope.marko5Component = ___componentLookup[scope.m5c]);
+      const component = (scope.___marko5Component =
+        ___componentLookup[scope.m5c]);
       rootNode = component.___rootNode;
       host = rootNode.startNode;
       domCompat.setScopeNodes(host, rootNode.endNode);
     }
-    const existingComponent = scope.marko5Component;
+    const existingComponent = scope.___marko5Component;
     const componentsContext = ___getComponentsContext(out);
     const globalComponentsContext = componentsContext.___globalContext;
     let customEvents;
@@ -191,7 +194,7 @@ exports.p = function (domCompat) {
       component.___rootNode = rootNode;
       component.___input = input[0];
       component.___customEvents = customEvents;
-      scope.marko5Component = component;
+      scope.___marko5Component = component;
     });
   }
 

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -6,37 +6,28 @@ const createRenderer = require("../../components/renderer");
 const defaultCreateOut = require("../../createOut");
 const dynamicTag5 = require("../dynamic-tag");
 
-exports.p = function (tagsAPI) {
-  const {
-    patchDynamicTag,
-    createRenderFn,
-    fork,
-    write,
-    serializerRegister,
-    writeScope,
-    nextScopeId,
-    getRegistryInfo,
-  } = tagsAPI;
-  const FN_TO_JSON = function () {
-    // TODO: this should instead return an object that contains getRegistryInfo
-    // then in the dom-compat, handle that object to lookup the function in the registry
-    // (we also need to do this for events)
-    return getRegistryInfo(this);
-  };
-
+exports.p = function (htmlCompat) {
   const isMarko6 = (fn) => !!fn.___isTagsAPI;
   const isMarko5 = (fn) => !fn.___isTagsAPI;
+  const writeHTML = (result) => {
+    const state = result.out._state;
+    const writer = state.writer;
+    state.events.emit("___toString", writer);
+    htmlCompat.writeScript(writer._scripts);
+    htmlCompat.write(writer._content);
+  };
 
   dynamicTag5.___runtimeCompat = function tagsToVdom(
     tagsRenderer,
     renderBody,
     args,
   ) {
-    if (tagsRenderer ? isMarko5(tagsRenderer) : isMarko5(renderBody))
+    if (tagsRenderer ? isMarko5(tagsRenderer) : isMarko5(renderBody)) {
       return tagsRenderer;
+    }
 
     if (!tagsRenderer && renderBody) {
-      renderBody.toJSON = FN_TO_JSON;
+      renderBody.toJSON = htmlCompat.toJSON;
     }
 
     return (input, out) =>
@@ -53,29 +44,9 @@ exports.p = function (tagsAPI) {
     function (_, out, componentDef, component) {
       const input = _.i;
       const tagsRenderer = _.r;
-      const renderFn = createRenderFn(tagsRenderer);
       const willRerender = componentDef._wrr;
-      const $global = out.global;
-      const streamData = ($global.streamData = $global.streamData || {});
-
-      if (willRerender) {
-        $global.serializedGlobals = $global.serializedGlobals || {};
-        $global.serializedGlobals.componentIdToScopeId = true;
-        $global.componentIdToScopeId = $global.componentIdToScopeId || {};
-        $global.componentIdToScopeId[component.id] = streamData.scopeId || 0;
-      }
-
       out.bf(out.___assignedKey, component, willRerender);
-      renderFn(
-        out.beginAsync(),
-        input,
-        {
-          ...$global,
-          componentIdToScopeId: undefined,
-          streamData: undefined,
-        },
-        streamData,
-      );
+      htmlCompat.render(tagsRenderer, willRerender, out, component, input);
       out.ef();
     },
     // eslint-disable-next-line no-constant-condition
@@ -92,7 +63,7 @@ exports.p = function (tagsAPI) {
     {},
   );
 
-  patchDynamicTag(
+  htmlCompat.patchDynamicTag(
     function getRenderer(tag) {
       const renderer = tag._ || tag.renderBody || tag;
       if (isMarko6(renderer)) return renderer;
@@ -108,8 +79,6 @@ exports.p = function (tagsAPI) {
         const out = defaultCreateOut();
         let customEvents;
 
-        out.global.streamData = tagsAPI.getStreamData();
-
         if (renderer5) {
           const normalizedInput = {};
 
@@ -122,7 +91,7 @@ exports.p = function (tagsAPI) {
                 (c === "-" ? "" : c.toLowerCase()) + key.slice(3),
                 value,
               ]);
-              value.toJSON = FN_TO_JSON;
+              value.toJSON = htmlCompat.toJSON;
             } else {
               normalizedInput[key] = input[key];
             }
@@ -136,9 +105,7 @@ exports.p = function (tagsAPI) {
         const component = componentsContext.___components[0];
         if (component) {
           component.___component.___customEvents = customEvents;
-          writeScope(nextScopeId(), {
-            m5c: component.id,
-          });
+          htmlCompat.writeSetScopeForComponent(component.id);
         }
 
         initComponentsTag({}, out);
@@ -147,7 +114,7 @@ exports.p = function (tagsAPI) {
         out.once("finish", (result) => {
           if (!async) {
             async = false;
-            write(result.toString());
+            writeHTML(result);
           }
         });
 
@@ -155,9 +122,7 @@ exports.p = function (tagsAPI) {
 
         if (async !== false) {
           async = true;
-          fork(out, (result) => {
-            write(result.toString());
-          });
+          htmlCompat.fork(out, writeHTML);
         }
       };
     },
@@ -167,11 +132,5 @@ exports.p = function (tagsAPI) {
     },
   );
 
-  return function serialized5to6(renderer, id) {
-    return serializerRegister(
-      "@marko/tags-compat-5-to-6",
-      renderer,
-      serializerRegister(id, () => {}),
-    );
-  };
+  return htmlCompat.registerRenderer;
 };

package/src/runtime/html/AsyncStream.js

@@ -725,6 +725,7 @@ var proto = (AsyncStream.prototype = {
   },
 
   then: function (fn, fnErr) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     var out = this;
     return new Promise(function (resolve, reject) {
       out.on("error", reject);

package/src/runtime/html/helpers/attr.js

@@ -3,6 +3,7 @@
 var escapeQuoteHelpers = require("./escape-quotes");
 var escapeDoubleQuotes = escapeQuoteHelpers.___escapeDoubleQuotes;
 var escapeSingleQuotes = escapeQuoteHelpers.___escapeSingleQuotes;
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 
 module.exports = maybeEmptyAttr;

package/src/runtime/html/helpers/attrs.js

@@ -1,5 +1,6 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var dynamicAttrHelper = require("./_dynamic-attr");
 

package/src/runtime/html/helpers/data-marko.js

@@ -15,7 +15,6 @@ module.exports = function dataMarko(out, componentDef, props, key) {
 
   if (willNotRerender) {
     if (props) {
-      // eslint-disable-next-line no-unused-vars
       for (var _ in props) {
         result +=
           " data-marko='" + escapeSingleQuotes(JSON.stringify(props)) + "'";

package/src/runtime/html/helpers/merge-attrs.js

@@ -1,5 +1,6 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var dynamicAttrHelper = require("./_dynamic-attr");
 

package/src/runtime/vdom/AsyncVDOMBuilder.js

@@ -418,6 +418,7 @@ var proto = (AsyncVDOMBuilder.prototype = {
   },
 
   then: function (fn, fnErr) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     var out = this;
     var promise = new Promise(function (resolve, reject) {
       out.on("error", reject).on(EVENT_FINISH, function (result) {

package/src/runtime/vdom/VElement.js

@@ -1,5 +1,4 @@
-/* jshint newcap:false */
-
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var inherit = require("raptor-util/inherit");
 var componentsUtil = require("@internal/components-util");

package/src/runtime/vdom/VNode.js

@@ -1,4 +1,3 @@
-/* jshint newcap:false */
 function VNode() {}
 
 VNode.prototype = {

package/src/runtime/vdom/helpers/attrs.js

@@ -1,5 +1,6 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
 var classHelper = require("../../helpers/class-value");
 var styleHelper = require("../../helpers/style-value");

package/src/runtime/vdom/morphdom/index.js

@@ -360,7 +360,6 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   var depth = 0;
                   var nodeValue;
 
-                  // eslint-disable-next-line no-constant-condition
                   while (true) {
                     if (endNode.nodeType === COMMENT_NODE) {
                       nodeValue = endNode.nodeValue;

package/src/taglib/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 let complain = "MARKO_DEBUG" && require("complain");
 const compiler = require("@marko/compiler");
 

package/tags-html.d.ts

@@ -188,7 +188,6 @@ declare global {
           | "prev"
           | "search"
           | "tag"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -316,7 +315,6 @@ declare global {
           | "nofullscreen"
           | "noplaybackrate"
           | "noremoteplayback"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -820,7 +818,6 @@ declare global {
           | "opener"
           | "prev"
           | "search"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
         /**
          * Specifies the browsing context in which the linked resource will be opened.
@@ -854,6 +851,8 @@ declare global {
       interface Head extends HTMLAttributes<HTMLHeadElement> {
         /** @deprecated */
         profile?: AttrString;
+        /** @see https://ogp.me/ */
+        prefix?: AttrString;
       }
       interface Header extends HTMLAttributes<HTMLElement> {}
       interface HGroup extends HTMLAttributes<HTMLElement> {}
@@ -876,6 +875,8 @@ declare global {
         manifest?: AttrString;
         /** @deprecated */
         version?: AttrString;
+        /** @see https://ogp.me/ */
+        prefix?: AttrString;
       }
       interface I extends HTMLAttributes<HTMLElement> {}
       interface IFrame extends HTMLAttributes<HTMLIFrameElement> {
@@ -930,7 +931,6 @@ declare global {
           | "allow-top-navigation-by-user-activation"
           | "allow-top-navigation-to-custom-protocols"
           | "allow-top-navigation"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
         /**
          * The URL of the page to embed in the iframe.
@@ -1435,7 +1435,6 @@ declare global {
           | "prev"
           | "search"
           | "stylesheet"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -1509,6 +1508,9 @@ declare global {
          * @see https://html.spec.whatwg.org/multipage/semantics.html#attr-meta-name
          */
         name?: AttrString;
+
+        /** @see https://ogp.me/ */
+        property?: AttrString;
       }
       interface Meter extends HTMLAttributes<HTMLMeterElement> {
         /**
@@ -1786,7 +1788,6 @@ declare global {
           | "application/javascript"
           | "module"
           | "import-map"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /** @deprecated */
@@ -2244,7 +2245,6 @@ declare global {
           | "nofullscreen"
           | "noplaybackrate"
           | "noremoteplayback"
-          // eslint-disable-next-line @typescript-eslint/ban-types
           | (string & {});
 
         /**
@@ -3780,7 +3780,6 @@ type AttrTarget =
   | "_parent"
   | "_self"
   | "_top"
-  // eslint-disable-next-line @typescript-eslint/ban-types
   | (string & {});
 type AttrReferrerPolicy =
   | AttrMissing
@@ -3853,5 +3852,4 @@ type AttrAutoComplete =
   | "mobile"
   | "fax"
   | "pager"
-  // eslint-disable-next-line @typescript-eslint/ban-types
   | (string & {});