feat(SchemaRegistry): add Node.textContent

fixes #8413

modules/@angular/compiler/src/schema/dom_element_schema_registry.ts

@@ -62,13 +62,13 @@ const OBJECT = 'object';
 //                       DO NOT EDIT THIS DOM SCHEMA WITHOUT A SECURITY REVIEW!
 //
 // Newly added properties must be security reviewed and assigned an appropriate SecurityContext in
-// dom_security_schema.ts. Reach out to mprobst for details.
+// dom_security_schema.ts. Reach out to mprobst & rjamet for details.
 //
 // =================================================================================================
 
 const SCHEMA: string[] =
     /*@ts2dart_const*/ ([
-      '*|%classList,className,id,innerHTML,*beforecopy,*beforecut,*beforepaste,*copy,*cut,*paste,*search,*selectstart,*webkitfullscreenchange,*webkitfullscreenerror,*wheel,outerHTML,#scrollLeft,#scrollTop',
+      '*|textContent,%classList,className,id,innerHTML,*beforecopy,*beforecut,*beforepaste,*copy,*cut,*paste,*search,*selectstart,*webkitfullscreenchange,*webkitfullscreenerror,*wheel,outerHTML,#scrollLeft,#scrollTop',
       '^*|accessKey,contentEditable,dir,!draggable,!hidden,innerText,lang,*abort,*autocomplete,*autocompleteerror,*beforecopy,*beforecut,*beforepaste,*blur,*cancel,*canplay,*canplaythrough,*change,*click,*close,*contextmenu,*copy,*cuechange,*cut,*dblclick,*drag,*dragend,*dragenter,*dragleave,*dragover,*dragstart,*drop,*durationchange,*emptied,*ended,*error,*focus,*input,*invalid,*keydown,*keypress,*keyup,*load,*loadeddata,*loadedmetadata,*loadstart,*message,*mousedown,*mouseenter,*mouseleave,*mousemove,*mouseout,*mouseover,*mouseup,*mousewheel,*mozfullscreenchange,*mozfullscreenerror,*mozpointerlockchange,*mozpointerlockerror,*paste,*pause,*play,*playing,*progress,*ratechange,*reset,*resize,*scroll,*search,*seeked,*seeking,*select,*selectstart,*show,*stalled,*submit,*suspend,*timeupdate,*toggle,*volumechange,*waiting,*webglcontextcreationerror,*webglcontextlost,*webglcontextrestored,*webkitfullscreenchange,*webkitfullscreenerror,*wheel,outerText,!spellcheck,%style,#tabIndex,title,!translate',
       'media|!autoplay,!controls,%crossOrigin,#currentTime,!defaultMuted,#defaultPlaybackRate,!disableRemotePlayback,!loop,!muted,*encrypted,#playbackRate,preload,src,#volume',
       ':svg:^*|*abort,*autocomplete,*autocompleteerror,*blur,*cancel,*canplay,*canplaythrough,*change,*click,*close,*contextmenu,*cuechange,*dblclick,*drag,*dragend,*dragenter,*dragleave,*dragover,*dragstart,*drop,*durationchange,*emptied,*ended,*error,*focus,*input,*invalid,*keydown,*keypress,*keyup,*load,*loadeddata,*loadedmetadata,*loadstart,*mousedown,*mouseenter,*mouseleave,*mousemove,*mouseout,*mouseover,*mouseup,*mousewheel,*pause,*play,*playing,*progress,*ratechange,*reset,*resize,*scroll,*seeked,*seeking,*select,*show,*stalled,*submit,*suspend,*timeupdate,*toggle,*volumechange,*waiting,%style,#tabIndex',
@@ -212,7 +212,7 @@ const SCHEMA: string[] =
       ':svg:textPath^:svg:textContent|',
       ':svg:title^:svg:|',
       ':svg:use^:svg:graphics|',
-      ':svg:view^:svg:|#zoomAndPan'
+      ':svg:view^:svg:|#zoomAndPan',
     ]);
 
 var attrToPropMap: {[name: string]: string} = <any>{

modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts

@@ -85,13 +85,13 @@ export function main() {
 
     if (browserDetection.isChromeDesktop) {
       it('generate a new schema', () => {
-        // console.log(JSON.stringify(registry.properties));
+        let schema = '\n';
-        extractSchema(
+        extractSchema().forEach((props, name) => {
-          (descriptors) => {
+          schema += `'${name}|${props.join(',')}',\n`;
+        });
         // Uncomment this line to see:
         // the generated schema which can then be pasted to the DomElementSchemaRegistry
-            // console.log(descriptors);
+        //console.log(schema);
-          });
       });
     }
 

modules/@angular/compiler/test/schema/schema_extractor.ts

@@ -4,7 +4,7 @@ const SVG_PREFIX = ':svg:';
 
 var document = typeof global['document'] == 'object' ? global['document'] : null;
 
-export function extractSchema(fn: (descriptors: string[]) => void): string[] {
+export function extractSchema(): Map<string, string[]> {
   var SVGGraphicsElement = global['SVGGraphicsElement'];
   var SVGAnimationElement = global['SVGAnimationElement'];
   var SVGGeometryElement = global['SVGGeometryElement'];
@@ -13,7 +13,7 @@ export function extractSchema(fn: (descriptors: string[]) => void): string[] {
   var SVGTextContentElement = global['SVGTextContentElement'];
   var SVGTextPositioningElement = global['SVGTextPositioningElement'];
   if (!document || !SVGGraphicsElement) return null;
-  var descriptors: string[] = [];
+  var descMap: Map<string, string[]> = new Map();
   var visited: {[name: string]: boolean} = {};
   var element = document.createElement('video');
   var svgAnimation = document.createElementNS('http://www.w3.org/2000/svg', 'set');
@@ -22,39 +22,41 @@ export function extractSchema(fn: (descriptors: string[]) => void): string[] {
   var svgGradient = document.createElementNS('http://www.w3.org/2000/svg', 'linearGradient');
   var svgText = document.createElementNS('http://www.w3.org/2000/svg', 'text');
 
-  extractProperties(Element, element, visited, descriptors, '*', '');
+  extractProperties(Node, element, visited, descMap, '*', '');
-  extractProperties(HTMLElement, element, visited, descriptors, '', '*');
+  extractProperties(Element, element, visited, descMap, '*', '');
-  extractProperties(HTMLMediaElement, element, visited, descriptors, 'media', '');
+  extractProperties(HTMLElement, element, visited, descMap, '', '*');
-  extractProperties(SVGElement, svgText, visited, descriptors, SVG_PREFIX, '*');
+  extractProperties(HTMLMediaElement, element, visited, descMap, 'media', '');
-  extractProperties(SVGGraphicsElement, svgText, visited, descriptors, SVG_PREFIX + 'graphics',
+  extractProperties(SVGElement, svgText, visited, descMap, SVG_PREFIX, '*');
+  extractProperties(SVGGraphicsElement, svgText, visited, descMap, SVG_PREFIX + 'graphics',
                     SVG_PREFIX);
-  extractProperties(SVGAnimationElement, svgAnimation, visited, descriptors,
+  extractProperties(SVGAnimationElement, svgAnimation, visited, descMap,
                     SVG_PREFIX + 'animation', SVG_PREFIX);
-  extractProperties(SVGGeometryElement, svgPath, visited, descriptors, SVG_PREFIX + 'geometry',
+  extractProperties(SVGGeometryElement, svgPath, visited, descMap, SVG_PREFIX + 'geometry',
                     SVG_PREFIX);
-  extractProperties(SVGComponentTransferFunctionElement, svgFeFuncA, visited, descriptors,
+  extractProperties(SVGComponentTransferFunctionElement, svgFeFuncA, visited, descMap,
                     SVG_PREFIX + 'componentTransferFunction', SVG_PREFIX);
-  extractProperties(SVGGradientElement, svgGradient, visited, descriptors, SVG_PREFIX + 'gradient',
+  extractProperties(SVGGradientElement, svgGradient, visited, descMap, SVG_PREFIX + 'gradient',
                     SVG_PREFIX);
-  extractProperties(SVGTextContentElement, svgText, visited, descriptors,
+  extractProperties(SVGTextContentElement, svgText, visited, descMap,
                     SVG_PREFIX + 'textContent', SVG_PREFIX + 'graphics');
-  extractProperties(SVGTextPositioningElement, svgText, visited, descriptors,
+  extractProperties(SVGTextPositioningElement, svgText, visited, descMap,
                     SVG_PREFIX + 'textPositioning', SVG_PREFIX + 'textContent');
   var keys = Object.getOwnPropertyNames(window).filter(
       k => k.endsWith('Element') && (k.startsWith('HTML') || k.startsWith('SVG')));
   keys.sort();
-  keys.forEach(name => extractRecursiveProperties(visited, descriptors, window[name]));
+  keys.forEach(name => extractRecursiveProperties(visited, descMap, window[name]));
-  fn(descriptors);
+
+  return descMap;
 }
 
-function extractRecursiveProperties(visited: {[name: string]: boolean}, descriptors: string[],
+function extractRecursiveProperties(visited: {[name: string]: boolean}, descMap: Map<string, string[]>,
                                     type: Function): string {
   var name = extractName(type);
   if (visited[name]) return name;  // already been here
   var superName = '';
   if (name != '*') {
     superName =
-        extractRecursiveProperties(visited, descriptors, type.prototype.__proto__.constructor);
+        extractRecursiveProperties(visited, descMap, type.prototype.__proto__.constructor);
   }
 
   var instance: HTMLElement = null;
@@ -69,15 +71,16 @@ function extractRecursiveProperties(visited: {[name: string]: boolean}, descript
       throw new Error(`Tag <${tagName}> is not an instance of ${htmlType['name']}`);
     }
   });
-  extractProperties(type, instance, visited, descriptors, name, superName);
+  extractProperties(type, instance, visited, descMap, name, superName);
   return name;
 }
 
 function extractProperties(type: Function, instance: any, visited: {[name: string]: boolean},
-                           descriptors: string[], name: string, superName: string) {
+                           descMap: Map<string, string[]>, name: string, superName: string) {
   if (!type) return;
   visited[name] = true;
-  var props = <string[]>[];
+  const fullName = name + (superName ? '^' + superName : '');
+  let props: string[] = descMap.has(fullName) ? descMap.get(fullName) : [];
   var prototype = type.prototype;
   var keys = Object.getOwnPropertyNames(prototype);
   keys.sort();
@@ -93,7 +96,9 @@ function extractProperties(type: Function, instance: any, visited: {[name: strin
       }
     }
   });
-  descriptors.push(name + (superName ? '^' + superName : '') + '|' + props.join(','));
+
+  // There is no point in using `Node.nodeValue`, filter it out
+  descMap.set(fullName, type === Node ? props.filter(p => p != '%nodeValue') : props);
 }
 
 function extractName(type: Function): string {