From 6fa8ee1284d5bd3809b8b002cfa45a4afd848e37 Mon Sep 17 00:00:00 2001
From: Arkadiusz Filipczak <ark.flp@gmail.com>
Date: Wed, 5 Jan 2022 16:57:26 +0100
Subject: [PATCH 1/3] Add support for <script> elements in GHS

---
 .../src/generalhtmlsupport.js                 |   2 +
 .../src/integrations/script.js                |  73 ++++++++
 .../src/schemadefinitions.js                  |   8 +
 .../tests/integrations/script.js              | 177 ++++++++++++++++++
 .../tests/manual/generalhtmlsupport.js        |   4 +
 5 files changed, 264 insertions(+)
 create mode 100644 packages/ckeditor5-html-support/src/integrations/script.js
 create mode 100644 packages/ckeditor5-html-support/tests/integrations/script.js

diff --git a/packages/ckeditor5-html-support/src/generalhtmlsupport.js b/packages/ckeditor5-html-support/src/generalhtmlsupport.js
index 8709762af54..0cf135c1ac1 100644
--- a/packages/ckeditor5-html-support/src/generalhtmlsupport.js
+++ b/packages/ckeditor5-html-support/src/generalhtmlsupport.js
@@ -15,6 +15,7 @@ import DualContentModelElementSupport from './integrations/dualcontent';
 import HeadingElementSupport from './integrations/heading';
 import ImageElementSupport from './integrations/image';
 import MediaEmbedElementSupport from './integrations/mediaembed';
+import ScriptElementSupport from './integrations/script';
 import TableElementSupport from './integrations/table';
 
 /**
@@ -44,6 +45,7 @@ export default class GeneralHtmlSupport extends Plugin {
 			HeadingElementSupport,
 			ImageElementSupport,
 			MediaEmbedElementSupport,
+			ScriptElementSupport,
 			TableElementSupport
 		];
 	}
diff --git a/packages/ckeditor5-html-support/src/integrations/script.js b/packages/ckeditor5-html-support/src/integrations/script.js
new file mode 100644
index 00000000000..994d4dd3010
--- /dev/null
+++ b/packages/ckeditor5-html-support/src/integrations/script.js
@@ -0,0 +1,73 @@
+/**
+ * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+/**
+ * @module html-support/integrations/codeblock
+ */
+
+import { Plugin } from 'ckeditor5/src/core';
+import {
+	createObjectView,
+	modelToViewBlockAttributeConverter,
+	viewToModelBlockAttributeConverter,
+	viewToModelObjectConverter
+} from '../converters.js';
+
+import DataFilter from '../datafilter';
+
+/**
+ * Provides the General HTML Support for `script` elements.
+ *
+ * @extends module:core/plugin~Plugin
+ */
+export default class ScriptElementSupport extends Plugin {
+	/**
+	 * @inheritDoc
+	 */
+	static get requires() {
+		return [ DataFilter ];
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	init() {
+		const dataFilter = this.editor.plugins.get( DataFilter );
+
+		dataFilter.on( 'register:script', ( evt, definition ) => {
+			const editor = this.editor;
+			const schema = editor.model.schema;
+			const conversion = editor.conversion;
+
+			schema.register( 'htmlScript', definition.modelSchema );
+
+			schema.extend( 'htmlScript', {
+				allowAttributes: [ 'htmlAttributes' ]
+			} );
+
+			editor.data.registerRawContentMatcher( {
+				name: 'script'
+			} );
+
+			conversion.for( 'upcast' ).elementToElement( {
+				view: 'script',
+				model: viewToModelObjectConverter( definition )
+			} );
+
+			conversion.for( 'upcast' ).add( viewToModelBlockAttributeConverter( definition, dataFilter ) );
+
+			conversion.for( 'downcast' ).elementToElement( {
+				model: 'htmlScript',
+				view: ( modelElement, { writer } ) => {
+					return createObjectView( 'script', modelElement, writer );
+				}
+			} );
+
+			conversion.for( 'downcast' ).add( modelToViewBlockAttributeConverter( definition ) );
+
+			evt.stop();
+		} );
+	}
+}
diff --git a/packages/ckeditor5-html-support/src/schemadefinitions.js b/packages/ckeditor5-html-support/src/schemadefinitions.js
index 01f605e3f78..c5d1c209664 100644
--- a/packages/ckeditor5-html-support/src/schemadefinitions.js
+++ b/packages/ckeditor5-html-support/src/schemadefinitions.js
@@ -832,6 +832,14 @@ export default {
 			modelSchema: {
 				inheritAllFrom: '$htmlObjectInline'
 			}
+		},
+		{
+			model: 'htmlScript',
+			view: 'script',
+			modelSchema: {
+				allowWhere: [ '$text', '$block' ],
+				isInline: true
+			}
 		}
 	]
 };
diff --git a/packages/ckeditor5-html-support/tests/integrations/script.js b/packages/ckeditor5-html-support/tests/integrations/script.js
new file mode 100644
index 00000000000..2eca7458a3f
--- /dev/null
+++ b/packages/ckeditor5-html-support/tests/integrations/script.js
@@ -0,0 +1,177 @@
+/**
+ * @license Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import GeneralHtmlSupport from '../../src/generalhtmlsupport';
+import { getModelDataWithAttributes } from '../_utils/utils';
+import { getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
+
+/* global document */
+
+describe( 'ScriptElementSupport', () => {
+	const CODE = 'console.log( "Hello World" )';
+	const CODE_CPP = 'cout << "Hello World" << endl;';
+
+	let editor, model, editorElement, dataFilter;
+
+	beforeEach( async () => {
+		editorElement = document.createElement( 'div' );
+		document.body.appendChild( editorElement );
+
+		const newEditor = await ClassicTestEditor.create( editorElement, {
+			plugins: [ Paragraph, GeneralHtmlSupport ]
+		} );
+		editor = newEditor;
+		model = editor.model;
+		dataFilter = editor.plugins.get( 'DataFilter' );
+
+		dataFilter.allowElement( 'script' );
+	} );
+
+	afterEach( () => {
+		editorElement.remove();
+
+		return editor.destroy();
+	} );
+
+	it( 'should allow element', () => {
+		editor.setData( `<p>Foo</p><script>${ CODE }</script>` );
+
+		expect( getModelData( model, { withoutSelection: true } ) ).to.equal(
+			`<paragraph>Foo</paragraph><htmlScript htmlContent="${ CODE }"></htmlScript>`
+		);
+
+		expect( editor.getData() ).to.equal( `<p>Foo</p><script>${ CODE }</script>` );
+	} );
+
+	it( 'should allow attributes', () => {
+		dataFilter.allowAttributes( { name: 'script', attributes: [ 'type', 'nonce' ] } );
+
+		editor.setData( `<p>Foo</p><script type="c++" nonce="qwerty">${ CODE_CPP }</script>` );
+
+		expect( getModelDataWithAttributes( model, { withoutSelection: true } ) ).to.deep.equal( {
+			data: `<paragraph>Foo</paragraph><htmlScript htmlAttributes="(1)" htmlContent="${ CODE_CPP }"></htmlScript>`,
+			attributes: {
+				1: {
+					attributes: {
+						nonce: 'qwerty',
+						type: 'c++'
+					}
+				},
+				2: CODE_CPP
+			}
+		} );
+
+		expect( editor.getData() ).to.equal( `<p>Foo</p><script type="c++" nonce="qwerty">${ CODE_CPP }</script>` );
+	} );
+
+	it( 'should disallow attributes', () => {
+		dataFilter.allowAttributes( { name: 'script', attributes: true } );
+		dataFilter.disallowAttributes( { name: 'script', attributes: 'nonce' } );
+
+		editor.setData( `<p>Foo</p><script type="c++" nonce="qwerty">${ CODE_CPP }</script>` );
+
+		expect( getModelDataWithAttributes( model, { withoutSelection: true } ) ).to.deep.equal( {
+			data: `<paragraph>Foo</paragraph><htmlScript htmlAttributes="(1)" htmlContent="${ CODE_CPP }"></htmlScript>`,
+			attributes: {
+				1: {
+					attributes: {
+						type: 'c++'
+					}
+				},
+				2: CODE_CPP
+			}
+		} );
+
+		expect( editor.getData() ).to.equal( `<p>Foo</p><script type="c++">${ CODE_CPP }</script>` );
+	} );
+
+	describe( 'element position', () => {
+		const testCases = [ {
+			name: 'paragraph',
+			data: `<article><section><p>Foo<script>${ CODE }</script>Bar</p></section></article>`,
+			model:
+				'<htmlArticle>' +
+					`<htmlSection><paragraph>Foo<htmlScript htmlContent="${ CODE }"></htmlScript>Bar</paragraph></htmlSection>` +
+				'</htmlArticle>'
+		}, {
+			name: 'section',
+			data: `<article><section><p>Foo</p><script>${ CODE }</script></section></article>`,
+			model:
+				'<htmlArticle>' +
+					`<htmlSection><paragraph>Foo</paragraph><htmlScript htmlContent="${ CODE }"></htmlScript></htmlSection>` +
+				'</htmlArticle>'
+		}, {
+			name: 'article',
+			data: `<article><section><p>Foo</p></section><script>${ CODE }</script></article>`,
+			model:
+				'<htmlArticle>' +
+					`<htmlSection><paragraph>Foo</paragraph></htmlSection><htmlScript htmlContent="${ CODE }"></htmlScript>` +
+				'</htmlArticle>'
+		}, {
+			name: 'root',
+			data: `<article><section><p>Foo</p></section></article><script>${ CODE }</script>`,
+			model:
+				'<htmlArticle><htmlSection><paragraph>Foo</paragraph></htmlSection></htmlArticle>' +
+				`<htmlScript htmlContent="${ CODE }"></htmlScript>`
+		} ];
+
+		for ( const { name, data, model: modelData } of testCases ) {
+			it( `should allow element inside ${ name }`, () => {
+				dataFilter.allowElement( 'article' );
+				dataFilter.allowElement( 'section' );
+
+				editor.setData( data );
+
+				expect( getModelData( model, { withoutSelection: true } ) ).to.equal( modelData );
+
+				expect( editor.getData() ).to.equal( data );
+			} );
+		}
+	} );
+
+	it( 'should not consume attributes already consumed (downcast)', () => {
+		dataFilter.allowAttributes( { name: 'script', attributes: true } );
+
+		editor.conversion.for( 'downcast' ).add( dispatcher => {
+			dispatcher.on( 'attribute:htmlAttributes:htmlScript', ( evt, data, conversionApi ) => {
+				conversionApi.consumable.consume( data.item, evt.name );
+			}, { priority: 'high' } );
+		} );
+
+		editor.setData( `<p>Foo</p><script nonce="qwerty">${ CODE }</script>` );
+
+		expect( getModelDataWithAttributes( model, { withoutSelection: true } ) ).to.deep.equal( {
+			data: `<paragraph>Foo</paragraph><htmlScript htmlAttributes="(1)" htmlContent="${ CODE }"></htmlScript>`,
+			attributes: {
+				1: { attributes: { nonce: 'qwerty' } },
+				2: CODE
+			}
+		} );
+
+		expect( editor.getData() ).to.equal( `<p>Foo</p><script>${ CODE }</script>` );
+	} );
+
+	it( 'should not consume attributes already consumed (upcast)', () => {
+		dataFilter.allowAttributes( { name: 'script', attributes: true } );
+
+		editor.conversion.for( 'upcast' ).add( dispatcher => {
+			dispatcher.on( 'element:script', ( evt, data, conversionApi ) => {
+				conversionApi.consumable.consume( data.viewItem, { attributes: 'nonce' } );
+			}, { priority: 'high' } );
+		} );
+
+		editor.setData( `<p>Foo</p><script type="c++" nonce="qwerty">${ CODE_CPP }</script>` );
+
+		expect( getModelDataWithAttributes( model, { withoutSelection: true } ) ).to.deep.equal( {
+			data: `<paragraph>Foo</paragraph><htmlScript htmlAttributes="(1)" htmlContent="${ CODE_CPP }"></htmlScript>`,
+			attributes: {
+				1: { attributes: { type: 'c++' } },
+				2: CODE_CPP
+			}
+		} );
+	} );
+} );
diff --git a/packages/ckeditor5-html-support/tests/manual/generalhtmlsupport.js b/packages/ckeditor5-html-support/tests/manual/generalhtmlsupport.js
index cd3103cc1c8..d085bd41a83 100644
--- a/packages/ckeditor5-html-support/tests/manual/generalhtmlsupport.js
+++ b/packages/ckeditor5-html-support/tests/manual/generalhtmlsupport.js
@@ -110,6 +110,10 @@ ClassicEditor
 						}
 					],
 					styles: { 'background-color': true }
+				},
+				{
+					name: 'script',
+					attributes: true
 				}
 			],
 			disallow: [

From c7188439edb53a9c8f76b88ff67612041e47e2b3 Mon Sep 17 00:00:00 2001
From: Arkadiusz Filipczak <ark.flp@gmail.com>
Date: Fri, 7 Jan 2022 14:23:05 +0100
Subject: [PATCH 2/3] Suppress console.warn() in tests

---
 .../ckeditor5-html-support/tests/integrations/script.js    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/ckeditor5-html-support/tests/integrations/script.js b/packages/ckeditor5-html-support/tests/integrations/script.js
index 2eca7458a3f..3c9ae74d0ba 100644
--- a/packages/ckeditor5-html-support/tests/integrations/script.js
+++ b/packages/ckeditor5-html-support/tests/integrations/script.js
@@ -9,13 +9,13 @@ import GeneralHtmlSupport from '../../src/generalhtmlsupport';
 import { getModelDataWithAttributes } from '../_utils/utils';
 import { getData as getModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 
-/* global document */
+/* global console, document */
 
 describe( 'ScriptElementSupport', () => {
 	const CODE = 'console.log( "Hello World" )';
 	const CODE_CPP = 'cout << "Hello World" << endl;';
 
-	let editor, model, editorElement, dataFilter;
+	let editor, model, editorElement, dataFilter, warnStub;
 
 	beforeEach( async () => {
 		editorElement = document.createElement( 'div' );
@@ -29,9 +29,12 @@ describe( 'ScriptElementSupport', () => {
 		dataFilter = editor.plugins.get( 'DataFilter' );
 
 		dataFilter.allowElement( 'script' );
+
+		warnStub = sinon.stub( console, 'warn' );
 	} );
 
 	afterEach( () => {
+		warnStub.restore();
 		editorElement.remove();
 
 		return editor.destroy();

From ed38d6ee3f9597da029a44584eeb40582d8b01b6 Mon Sep 17 00:00:00 2001
From: Kuba Niegowski <j.niegowski@cksource.com>
Date: Tue, 11 Jan 2022 18:34:44 +0100
Subject: [PATCH 3/3] Code review fixes.

---
 packages/ckeditor5-html-support/src/integrations/script.js   | 4 ++--
 packages/ckeditor5-html-support/src/schemadefinitions.js     | 1 -
 packages/ckeditor5-html-support/tests/integrations/script.js | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/ckeditor5-html-support/src/integrations/script.js b/packages/ckeditor5-html-support/src/integrations/script.js
index 994d4dd3010..dc4579e36cb 100644
--- a/packages/ckeditor5-html-support/src/integrations/script.js
+++ b/packages/ckeditor5-html-support/src/integrations/script.js
@@ -4,7 +4,7 @@
  */
 
 /**
- * @module html-support/integrations/codeblock
+ * @module html-support/integrations/script
  */
 
 import { Plugin } from 'ckeditor5/src/core';
@@ -44,7 +44,7 @@ export default class ScriptElementSupport extends Plugin {
 			schema.register( 'htmlScript', definition.modelSchema );
 
 			schema.extend( 'htmlScript', {
-				allowAttributes: [ 'htmlAttributes' ]
+				allowAttributes: [ 'htmlAttributes', 'htmlContent' ]
 			} );
 
 			editor.data.registerRawContentMatcher( {
diff --git a/packages/ckeditor5-html-support/src/schemadefinitions.js b/packages/ckeditor5-html-support/src/schemadefinitions.js
index c5d1c209664..dc7fe108d1f 100644
--- a/packages/ckeditor5-html-support/src/schemadefinitions.js
+++ b/packages/ckeditor5-html-support/src/schemadefinitions.js
@@ -46,7 +46,6 @@
 //
 // Skipped hidden elements:
 // noscript
-// script
 
 export default {
 	block: [
diff --git a/packages/ckeditor5-html-support/tests/integrations/script.js b/packages/ckeditor5-html-support/tests/integrations/script.js
index 3c9ae74d0ba..e5d03373110 100644
--- a/packages/ckeditor5-html-support/tests/integrations/script.js
+++ b/packages/ckeditor5-html-support/tests/integrations/script.js
@@ -21,10 +21,9 @@ describe( 'ScriptElementSupport', () => {
 		editorElement = document.createElement( 'div' );
 		document.body.appendChild( editorElement );
 
-		const newEditor = await ClassicTestEditor.create( editorElement, {
+		editor = await ClassicTestEditor.create( editorElement, {
 			plugins: [ Paragraph, GeneralHtmlSupport ]
 		} );
-		editor = newEditor;
 		model = editor.model;
 		dataFilter = editor.plugins.get( 'DataFilter' );