@rindo/core 4.19.1 → 4.20.0

package/internal/client/shadow-css.js

@@ -274,14 +274,14 @@ var scopeSelector = (selector, scopeSelectorText, hostSelector, slotSelector) =>
     }
   }).join(", ");
 };
-var scopeSelectors = (cssText, scopeSelectorText, hostSelector, slotSelector, commentOriginalSelector) => {
+var scopeSelectors = (cssText, scopeSelectorText, hostSelector, slotSelector) => {
   return processRules(cssText, (rule) => {
     let selector = rule.selector;
     let content = rule.content;
     if (rule.selector[0] !== "@") {
       selector = scopeSelector(rule.selector, scopeSelectorText, hostSelector, slotSelector);
     } else if (rule.selector.startsWith("@media") || rule.selector.startsWith("@supports") || rule.selector.startsWith("@page") || rule.selector.startsWith("@document")) {
-      content = scopeSelectors(rule.content, scopeSelectorText, hostSelector, slotSelector, commentOriginalSelector);
+      content = scopeSelectors(rule.content, scopeSelectorText, hostSelector, slotSelector);
     }
     const cssRule = {
       selector: selector.replace(/\s{2,}/g, " ").trim(),
@@ -290,7 +290,7 @@ var scopeSelectors = (cssText, scopeSelectorText, hostSelector, slotSelector, co
     return cssRule;
   });
 };
-var scopeCssText = (cssText, scopeId, hostScopeId, slotScopeId, commentOriginalSelector) => {
+var scopeCssText = (cssText, scopeId, hostScopeId, slotScopeId) => {
   cssText = insertPolyfillHostInCssText(cssText);
   cssText = convertColonHost(cssText);
   cssText = convertColonHostContext(cssText);
@@ -298,7 +298,7 @@ var scopeCssText = (cssText, scopeId, hostScopeId, slotScopeId, commentOriginalS
   cssText = slotted.cssText;
   cssText = convertShadowDOMSelectors(cssText);
   if (scopeId) {
-    cssText = scopeSelectors(cssText, scopeId, hostScopeId, slotScopeId, commentOriginalSelector);
+    cssText = scopeSelectors(cssText, scopeId, hostScopeId, slotScopeId);
   }
   cssText = replaceShadowCssHost(cssText, hostScopeId);
   cssText = cssText.replace(/>\s*\*\s+([^{, ]+)/gm, " $1 ");
@@ -315,37 +315,13 @@ var scopeCssText = (cssText, scopeId, hostScopeId, slotScopeId, commentOriginalS
 var replaceShadowCssHost = (cssText, hostScopeId) => {
   return cssText.replace(/-shadowcsshost-no-combinator/g, `.${hostScopeId}`);
 };
-var scopeCss = (cssText, scopeId, commentOriginalSelector) => {
+var scopeCss = (cssText, scopeId) => {
   const hostScopeId = scopeId + "-h";
   const slotScopeId = scopeId + "-s";
   const commentsWithHash = extractCommentsWithHash(cssText);
   cssText = stripComments(cssText);
-  const orgSelectors = [];
-  if (commentOriginalSelector) {
-    const processCommentedSelector = (rule) => {
-      const placeholder = `/*!@___${orgSelectors.length}___*/`;
-      const comment = `/*!@${rule.selector}*/`;
-      orgSelectors.push({ placeholder, comment });
-      rule.selector = placeholder + rule.selector;
-      return rule;
-    };
-    cssText = processRules(cssText, (rule) => {
-      if (rule.selector[0] !== "@") {
-        return processCommentedSelector(rule);
-      } else if (rule.selector.startsWith("@media") || rule.selector.startsWith("@supports") || rule.selector.startsWith("@page") || rule.selector.startsWith("@document")) {
-        rule.content = processRules(rule.content, processCommentedSelector);
-        return rule;
-      }
-      return rule;
-    });
-  }
-  const scoped = scopeCssText(cssText, scopeId, hostScopeId, slotScopeId, commentOriginalSelector);
+  const scoped = scopeCssText(cssText, scopeId, hostScopeId, slotScopeId);
   cssText = [scoped.cssText, ...commentsWithHash].join("\n");
-  if (commentOriginalSelector) {
-    orgSelectors.forEach(({ placeholder, comment }) => {
-      cssText = cssText.replace(placeholder, comment);
-    });
-  }
   scoped.slottedSelectors.forEach((slottedSelector) => {
     const regex = new RegExp(escapeRegExpSpecialCharacters(slottedSelector.orgSelector), "g");
     cssText = cssText.replace(regex, slottedSelector.updatedSelector);

package/internal/hydrate/index.js

@@ -1,5 +1,5 @@
 /*
- Rindo Hydrate Platform v4.19.1 | MIT Licensed | https://rindojs.web.app
+ Rindo Hydrate Platform v4.20.0 | MIT Licensed | https://rindojs.web.app
  */
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -412,17 +412,6 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
         }
       }
     }
-    for (i2 = node.childNodes.length - 1; i2 >= 0; i2--) {
-      clientHydrate(
-        parentVNode,
-        childRenderNodes,
-        slotNodes,
-        shadowRootNodes,
-        hostElm,
-        node.childNodes[i2],
-        hostId
-      );
-    }
     if (node.shadowRoot) {
       for (i2 = node.shadowRoot.childNodes.length - 1; i2 >= 0; i2--) {
         clientHydrate(
@@ -436,6 +425,17 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
         );
       }
     }
+    for (i2 = node.childNodes.length - 1; i2 >= 0; i2--) {
+      clientHydrate(
+        parentVNode,
+        childRenderNodes,
+        slotNodes,
+        shadowRootNodes,
+        hostElm,
+        node.childNodes[i2],
+        hostId
+      );
+    }
   } else if (node.nodeType === 8 /* CommentNode */) {
     childIdSplt = node.nodeValue.split(".");
     if (childIdSplt[1] === hostId || childIdSplt[1] === "0") {
@@ -513,14 +513,14 @@ var clientHydrate = (parentVNode, childRenderNodes, slotNodes, shadowRootNodes,
 var initializeDocumentHydrate = (node, orgLocNodes) => {
   if (node.nodeType === 1 /* ElementNode */) {
     let i2 = 0;
-    for (; i2 < node.childNodes.length; i2++) {
-      initializeDocumentHydrate(node.childNodes[i2], orgLocNodes);
-    }
     if (node.shadowRoot) {
-      for (i2 = 0; i2 < node.shadowRoot.childNodes.length; i2++) {
+      for (; i2 < node.shadowRoot.childNodes.length; i2++) {
         initializeDocumentHydrate(node.shadowRoot.childNodes[i2], orgLocNodes);
       }
     }
+    for (i2 = 0; i2 < node.childNodes.length; i2++) {
+      initializeDocumentHydrate(node.childNodes[i2], orgLocNodes);
+    }
   } else if (node.nodeType === 8 /* CommentNode */) {
     const childIdSplt = node.nodeValue.split(".");
     if (childIdSplt[0] === ORG_LOCATION_ID) {
@@ -615,8 +615,6 @@ var registerStyle = (scopeId2, cssText, allowCS) => {
 };
 var addStyle = (styleContainerNode, cmpMeta, mode) => {
   var _a;
-  const styleContainerDocument = styleContainerNode;
-  const styleContainerShadowRoot = styleContainerNode;
   const scopeId2 = getScopeId(cmpMeta, mode);
   const style = styles.get(scopeId2);
   if (!BUILD7.attachStyles) {
@@ -625,14 +623,14 @@ var addStyle = (styleContainerNode, cmpMeta, mode) => {
   styleContainerNode = styleContainerNode.nodeType === 11 /* DocumentFragment */ ? styleContainerNode : doc;
   if (style) {
     if (typeof style === "string") {
-      styleContainerNode = styleContainerDocument.head || styleContainerNode;
+      styleContainerNode = styleContainerNode.head || styleContainerNode;
       let appliedStyles = rootAppliedStyles.get(styleContainerNode);
       let styleElm;
       if (!appliedStyles) {
         rootAppliedStyles.set(styleContainerNode, appliedStyles = /* @__PURE__ */ new Set());
       }
       if (!appliedStyles.has(scopeId2)) {
-        if (BUILD7.hydrateClientSide && styleContainerShadowRoot.host && (styleElm = styleContainerNode.querySelector(`[${HYDRATED_STYLE_ID}="${scopeId2}"]`))) {
+        if (BUILD7.hydrateClientSide && styleContainerNode.host && (styleElm = styleContainerNode.querySelector(`[${HYDRATED_STYLE_ID}="${scopeId2}"]`))) {
           styleElm.innerHTML = style;
         } else {
           styleElm = doc.createElement("style");
@@ -641,10 +639,21 @@ var addStyle = (styleContainerNode, cmpMeta, mode) => {
           if (nonce != null) {
             styleElm.setAttribute("nonce", nonce);
           }
-          if (BUILD7.hydrateServerSide || BUILD7.hotModuleReplacement) {
+          if ((BUILD7.hydrateServerSide || BUILD7.hotModuleReplacement) && cmpMeta.$flags$ & 2 /* scopedCssEncapsulation */) {
             styleElm.setAttribute(HYDRATED_STYLE_ID, scopeId2);
           }
-          styleContainerNode.insertBefore(styleElm, styleContainerNode.querySelector("link"));
+          const injectStyle = (
+            /**
+             * we render a scoped component
+             */
+            !(cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */) || /**
+             * we are using shadow dom and render the style tag within the shadowRoot
+             */
+            cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */ && styleContainerNode.nodeName !== "HEAD"
+          );
+          if (injectStyle) {
+            styleContainerNode.insertBefore(styleElm, styleContainerNode.querySelector("link"));
+          }
         }
         if (cmpMeta.$flags$ & 4 /* hasSlotRelocation */) {
           styleElm.innerHTML += SLOT_FB_CSS;
@@ -653,8 +662,8 @@ var addStyle = (styleContainerNode, cmpMeta, mode) => {
           appliedStyles.add(scopeId2);
         }
       }
-    } else if (BUILD7.constructableCSS && !styleContainerDocument.adoptedStyleSheets.includes(style)) {
-      styleContainerDocument.adoptedStyleSheets = [...styleContainerDocument.adoptedStyleSheets, style];
+    } else if (BUILD7.constructableCSS && !styleContainerNode.adoptedStyleSheets.includes(style)) {
+      styleContainerNode.adoptedStyleSheets = [...styleContainerNode.adoptedStyleSheets, style];
     }
   }
   return scopeId2;
@@ -669,7 +678,7 @@ var attachStyles = (hostRef) => {
     cmpMeta,
     hostRef.$modeName$
   );
-  if ((BUILD7.shadowDom || BUILD7.scoped) && BUILD7.cssAnnotations && flags & 10 /* needsScopedEncapsulation */) {
+  if ((BUILD7.shadowDom || BUILD7.scoped) && BUILD7.cssAnnotations && flags & 10 /* needsScopedEncapsulation */ && flags & 2 /* scopedCssEncapsulation */) {
     elm["s-sc"] = scopeId2;
     elm.classList.add(scopeId2 + "-h");
     if (BUILD7.scoped && flags & 2 /* scopedCssEncapsulation */) {
@@ -679,7 +688,6 @@ var attachStyles = (hostRef) => {
   endAttachStyles();
 };
 var getScopeId = (cmp, mode) => "sc-" + (BUILD7.mode && mode && cmp.$flags$ & 32 /* hasMode */ ? cmp.$tagName$ + "-" + mode : cmp.$tagName$);
-var convertScopedToShadow = (css) => css.replace(/\/\*!@([^\/]+)\*\/[^\{]+\{/g, "$1{");
 
 // src/runtime/vdom/vdom-render.ts
 import { BUILD as BUILD10 } from "@rindo/core/internal/app-data";
@@ -875,7 +883,9 @@ var createElm = (oldParentVNode, newParentVNode, childIndex, parentElm) => {
     if (BUILD10.vdomAttribute) {
       updateElement(null, newVNode2, isSvgMode);
     }
-    if ((BUILD10.shadowDom || BUILD10.scoped) && isDef(scopeId) && elm["s-si"] !== scopeId) {
+    const rootNode = elm.getRootNode();
+    const isElementWithinShadowRoot = !rootNode.querySelector("body");
+    if (!isElementWithinShadowRoot && BUILD10.scoped && isDef(scopeId) && elm["s-si"] !== scopeId) {
       elm.classList.add(elm["s-si"] = scopeId);
     }
     if (BUILD10.scoped) {
@@ -1089,6 +1099,15 @@ var updateChildren = (parentElm, oldCh, newVNode2, newCh, isInitialRender = fals
 var isSameVnode = (leftVNode, rightVNode, isInitialRender = false) => {
   if (leftVNode.$tag$ === rightVNode.$tag$) {
     if (BUILD10.slotRelocation && leftVNode.$tag$ === "slot") {
+      if (
+        // The component gets hydrated and no VDOM has been initialized.
+        // Here the comparison can't happen as $name$ property is not set for `leftNode`.
+        "$nodeId$" in leftVNode && isInitialRender && // `leftNode` is not from type HTMLComment which would cause many
+        // hydration comments to be removed
+        leftVNode.$elm$.nodeType !== 8
+      ) {
+        return false;
+      }
       return leftVNode.$name$ === rightVNode.$name$;
     }
     if (BUILD10.vdomKey && !isInitialRender) {
@@ -1130,7 +1149,10 @@ var patch = (oldVNode, newVNode2, isInitialRender = false) => {
         elm.textContent = "";
       }
       addVnodes(elm, null, newVNode2, newChildren, 0, newChildren.length - 1);
-    } else if (BUILD10.updatable && oldChildren !== null) {
+    } else if (
+      // don't do this on initial render as it can cause non-hydrated content to be removed
+      !isInitialRender && BUILD10.updatable && oldChildren !== null
+    ) {
       removeVnodes(oldChildren, 0, oldChildren.length - 1);
     }
     if (BUILD10.svg && isSvgMode && tag === "svg") {
@@ -1822,7 +1844,8 @@ More information: https://rindojs.web.app/docs/properties#prop-mutability`
           if (this.hasOwnProperty(propName)) {
             newValue = this[propName];
             delete this[propName];
-          } else if (prototype.hasOwnProperty(propName) && typeof this[propName] === "number" && this[propName] == newValue) {
+          } else if (prototype.hasOwnProperty(propName) && typeof this[propName] === "number" && // cast type to number to avoid TS compiler issues
+          this[propName] == newValue) {
             return;
           } else if (propName == null) {
             const hostRef = getHostRef(this);
@@ -1929,7 +1952,7 @@ var initializeComponent = async (elm, hostRef, cmpMeta, hmrVersionId) => {
         const endRegisterStyles = createTime("registerStyles", cmpMeta.$tagName$);
         if (!BUILD14.hydrateServerSide && BUILD14.shadowDom && // TODO(RINDO-854): Remove code related to legacy shadowDomShim field
         BUILD14.shadowDomShim && cmpMeta.$flags$ & 8 /* needsShadowDomShim */) {
-          style = await import("../client/shadow-css.js").then((m) => m.scopeCss(style, scopeId2, false));
+          style = await import("../client/shadow-css.js").then((m) => m.scopeCss(style, scopeId2));
         }
         registerStyle(scopeId2, style, !!(cmpMeta.$flags$ & 1 /* shadowDomEncapsulation */));
         endRegisterStyles();
@@ -2498,10 +2521,8 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
   const metaCharset = /* @__PURE__ */ head.querySelector("meta[charset]");
   const dataStyles = /* @__PURE__ */ doc.createElement("style");
   const deferredConnectedCallbacks = [];
-  const styles2 = /* @__PURE__ */ doc.querySelectorAll(`[${HYDRATED_STYLE_ID}]`);
   let appLoadFallback;
   let isBootstrapping = true;
-  let i2 = 0;
   Object.assign(plt, options);
   plt.$resourcesUrl$ = new URL(options.resourcesUrl || "./", doc.baseURI).href;
   if (BUILD19.asyncQueue) {
@@ -2512,11 +2533,6 @@ var bootstrapLazy = (lazyBundles, options = {}) => {
   if (BUILD19.hydrateClientSide) {
     plt.$flags$ |= 2 /* appLoaded */;
   }
-  if (BUILD19.hydrateClientSide && BUILD19.shadowDom) {
-    for (; i2 < styles2.length; i2++) {
-      registerStyle(styles2[i2].getAttribute(HYDRATED_STYLE_ID), convertScopedToShadow(styles2[i2].innerHTML), true);
-    }
-  }
   let hasSlotRelocation = false;
   lazyBundles.map((lazyBundle) => {
     lazyBundle[1].map((compactMeta) => {
@@ -2883,7 +2899,7 @@ var globalScripts = (
 
 // src/hydrate/platform/proxy-host-element.ts
 import { BUILD as BUILD21 } from "@rindo/core/internal/app-data";
-function proxyHostElement(elm, cmpMeta, opts) {
+function proxyHostElement(elm, cmpMeta) {
   if (typeof elm.componentOnReady !== "function") {
     elm.componentOnReady = componentOnReady;
   }
@@ -2896,10 +2912,8 @@ function proxyHostElement(elm, cmpMeta, opts) {
         mode: "open",
         delegatesFocus: !!(cmpMeta.$flags$ & 16 /* shadowDelegatesFocus */)
       });
-    } else if (opts.serializeShadowRoot) {
-      elm.attachShadow({ mode: "open" });
     } else {
-      elm.shadowRoot = elm;
+      elm.attachShadow({ mode: "open" });
     }
   }
   if (cmpMeta.$members$ != null) {
@@ -3012,7 +3026,7 @@ function hydrateApp(win2, opts, results, afterHydrate, resolve) {
             createdElements.add(elm);
             elm.connectedCallback = patchedConnectedCallback2;
             registerHost(elm, Cstr.cmpMeta);
-            proxyHostElement(elm, Cstr.cmpMeta, opts);
+            proxyHostElement(elm, Cstr.cmpMeta);
           }
         }
       }
@@ -3029,7 +3043,7 @@ function hydrateApp(win2, opts, results, afterHydrate, resolve) {
       if (isValidComponent(elm, opts) && results.hydratedCount < opts.maxHydrateCount) {
         if (!connectedElements.has(elm) && shouldHydrate(elm)) {
           connectedElements.add(elm);
-          return hydrateComponent(win2, results, elm.nodeName, elm, waitingElements);
+          return hydrateComponent.call(elm, win2, results, elm.nodeName, elm, waitingElements);
         }
       }
       return resolved2;

package/internal/hydrate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/internal/hydrate",
-  "version": "4.19.1",
+  "version": "4.20.0",
   "description": "Rindo internal hydrate platform to be imported by the Rindo Compiler. Breaking changes can and will happen at any time.",
   "main": "./index.js",
   "private": true

package/internal/hydrate/runner.js

@@ -1,5 +1,5 @@
 /*
- Rindo Hydrate Runner v4.19.1 | MIT Licensed | https://rindojs.web.app
+ Rindo Hydrate Runner v4.20.0 | MIT Licensed | https://rindojs.web.app
  */
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -10414,7 +10414,7 @@ function normalizeSerializationOptions(opts = {}) {
     removeAttributeQuotes: typeof opts.removeAttributeQuotes !== "boolean" ? false : opts.removeAttributeQuotes,
     removeBooleanAttributeQuotes: typeof opts.removeBooleanAttributeQuotes !== "boolean" ? false : opts.removeBooleanAttributeQuotes,
     removeHtmlComments: typeof opts.removeHtmlComments !== "boolean" ? false : opts.removeHtmlComments,
-    serializeShadowRoot: typeof opts.serializeShadowRoot !== "boolean" ? false : opts.serializeShadowRoot,
+    serializeShadowRoot: typeof opts.serializeShadowRoot !== "boolean" ? true : opts.serializeShadowRoot,
     fullDocument: typeof opts.fullDocument !== "boolean" ? true : opts.fullDocument
   };
 }
@@ -10540,7 +10540,7 @@ style="${cssText}">`;
     }
     if (EMPTY_ELEMENTS.has(tagName) === false) {
       const shadowRoot = node.shadowRoot;
-      if (opts.serializeShadowRoot && shadowRoot != null) {
+      if (shadowRoot != null && opts.serializeShadowRoot) {
         output.indent = output.indent + ((_c = opts.indentSpaces) != null ? _c : 0);
         yield* streamToHtml(shadowRoot, opts, output);
         output.indent = output.indent - ((_d = opts.indentSpaces) != null ? _d : 0);
@@ -14884,7 +14884,7 @@ var removeUnusedStyleText = (usedSelectors, diagnostics, styleElm) => {
 
 // src/hydrate/runner/inspect-element.ts
 function inspectElement(results, elm, depth) {
-  const children = elm.children;
+  const children = [...Array.from(elm.children), ...Array.from(elm.shadowRoot ? elm.shadowRoot.children : [])];
   for (let i = 0, ii = children.length; i < ii; i++) {
     const childElm = children[i];
     const tagName = childElm.nodeName.toLowerCase();
@@ -15279,7 +15279,7 @@ function renderToString(html, options, asStream) {
   const opts = normalizeHydrateOptions(options);
   opts.serializeToHtml = true;
   opts.fullDocument = typeof opts.fullDocument === "boolean" ? opts.fullDocument : true;
-  opts.serializeShadowRoot = Boolean(opts.serializeShadowRoot);
+  opts.serializeShadowRoot = typeof opts.serializeShadowRoot === "boolean" ? opts.serializeShadowRoot : true;
   opts.constrainTimeouts = false;
   return hydrateDocument(html, opts, asStream);
 }
@@ -15336,7 +15336,7 @@ async function render(win, opts, results) {
     });
   }
   initializeWindow(win, win.document, opts, results);
-  const beforeHydrateFn = typeof opts.beforeHydrate === "function" ? opts.beforeHydrate(win.document) : NOOP;
+  const beforeHydrateFn = typeof opts.beforeHydrate === "function" ? opts.beforeHydrate : NOOP;
   try {
     await Promise.resolve(beforeHydrateFn(win.document));
     return new Promise((resolve) => hydrateFactory(win, opts, results, afterHydrate, resolve));
@@ -15353,7 +15353,7 @@ function renderStream(win, opts, results) {
   return Readable.from(processRender());
 }
 async function afterHydrate(win, opts, results, resolve) {
-  const afterHydrateFn = typeof opts.afterHydrate === "function" ? opts.afterHydrate(win.document) : NOOP;
+  const afterHydrateFn = typeof opts.afterHydrate === "function" ? opts.afterHydrate : NOOP;
   try {
     await Promise.resolve(afterHydrateFn(win.document));
     return resolve(finalizeHydrate(win, win.document, opts, results));

package/internal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/internal",
-  "version": "4.19.1",
+  "version": "4.20.0",
   "description": "Rindo internals only to be imported by the Rindo Compiler. Breaking changes can and will happen at any time.",
   "main": "./index.js",
   "types": "./index.d.ts",

package/internal/rindo-private.d.ts

@@ -1690,7 +1690,6 @@ export interface TransformCssToEsmInput {
      * is not shared by multiple fields, nor is it a composite of multiple modes).
      */
     mode?: string;
-    commentOriginalSelector?: boolean;
     sourceMap?: boolean;
     minify?: boolean;
     docs?: boolean;

package/internal/rindo-public-compiler.d.ts

@@ -382,6 +382,7 @@ export interface Config extends RindoConfig {
     suppressLogs?: boolean;
     profile?: boolean;
     tsCompilerOptions?: any;
+    tsWatchOptions?: any;
     _isValidated?: boolean;
     _isTesting?: boolean;
 }
@@ -1612,6 +1613,8 @@ export interface Testing {
     run(opts: TestingRunOptions): Promise<boolean>;
     destroy(): Promise<void>;
 }
+export declare type Path = string;
+export declare type TransformerConfig = [string, Record<string, unknown>];
 /**
  * Options for initiating a run of Rindo tests (spec and/or end-to-end)
  */
@@ -1643,7 +1646,7 @@ export interface JestConfig {
      * By default, Jest runs all tests and produces all errors into the console upon completion.
      * The bail config option can be used here to have Jest stop running tests after the first failure. Default: false
      */
-    bail?: boolean;
+    bail?: boolean | number;
     /**
      * The directory where Jest should store its cached dependency information. Jest attempts to scan your dependency tree once (up-front)
      * and cache it in order to ease some of the filesystem raking that needs to happen while running tests. This config option lets you
@@ -1717,8 +1720,8 @@ export interface JestConfig {
     reporters?: any;
     resetMocks?: boolean;
     resetModules?: boolean;
-    resolver?: string;
-    restoreMocks?: string;
+    resolver?: Path | null;
+    restoreMocks?: boolean;
     rootDir?: string;
     roots?: any[];
     runner?: string;
@@ -1735,13 +1738,13 @@ export interface JestConfig {
     testMatch?: string[];
     testPathIgnorePatterns?: string[];
     testPreset?: string;
-    testRegex?: string;
+    testRegex?: string[];
     testResultsProcessor?: string;
     testRunner?: string;
     testURL?: string;
     timers?: string;
     transform?: {
-        [key: string]: string;
+        [regex: string]: Path | TransformerConfig;
     };
     transformIgnorePatterns?: any[];
     unmockedModulePathPatterns?: any[];