getPySrc should return source code (pyscript#1041)

madhur-tandon · web-flow · commit 08e83feaf539 · 2022-12-13T02:41:21.000+05:30
* getPySrc should return source code

* fix lint

* add test

* fix dynamic tag test

* address feedback
diff --git a/pyscriptjs/src/components/pyscript.ts b/pyscriptjs/src/components/pyscript.ts
@@ -9,6 +9,8 @@ const logger = getLogger('py-script');
 
 export function make_PyScript(runtime: Runtime) {
     class PyScript extends HTMLElement {
+        srcCode: string
+
         async connectedCallback() {
             if (this.hasAttribute('output')) {
                 const deprecationMessage = (
@@ -19,6 +21,10 @@ export function make_PyScript(runtime: Runtime) {
                 showWarning(deprecationMessage)
             }
             ensureUniqueId(this);
+            // Save innerHTML information in srcCode so we can access it later
+            // once we clean innerHTML (which is required since we don't want
+            // source code to be rendered on the screen)
+            this.srcCode = this.innerHTML;
             const pySrc = await this.getPySrc();
             this.innerHTML = '';
             pyExec(runtime, pySrc, this);
@@ -36,7 +42,7 @@ export function make_PyScript(runtime: Runtime) {
                     throw e
                 }
             } else {
-                return htmlDecode(this.innerHTML);
+                return htmlDecode(this.srcCode);
             }
         }
     }
diff --git a/pyscriptjs/tests/integration/test_01_basic.py b/pyscriptjs/tests/integration/test_01_basic.py
@@ -276,3 +276,19 @@ def test_deprecated_globals(self):
             "Direct usage of sys is deprecated. Please use import sys instead.",
             "Direct usage of create is deprecated. Please use pyscript.create instead.",
         ]
+
+    def test_getPySrc_returns_source_code(self):
+        self.pyscript_run(
+            """
+            <py-script>
+                print("hello world!")
+            </py-script>
+            """
+        )
+
+        pyscript_tag = self.page.locator("py-script")
+        assert pyscript_tag.inner_html() == ""
+        assert (
+            pyscript_tag.evaluate("node => node.getPySrc()")
+            == 'print("hello world!")\n'
+        )

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ const logger = getLogger('py-script');`
`9`	`9`
`10`	`10`	`export function make_PyScript(runtime: Runtime) {`
`11`	`11`	`class PyScript extends HTMLElement {`
	`12`	`+ srcCode: string`
	`13`	`+`
`12`	`14`	`async connectedCallback() {`
`13`	`15`	`if (this.hasAttribute('output')) {`
`14`	`16`	`const deprecationMessage = (`
`@@ -19,6 +21,10 @@ export function make_PyScript(runtime: Runtime) {`
`19`	`21`	`showWarning(deprecationMessage)`
`20`	`22`	`}`
`21`	`23`	`ensureUniqueId(this);`
	`24`	`+ // Save innerHTML information in srcCode so we can access it later`
	`25`	`+ // once we clean innerHTML (which is required since we don't want`
	`26`	`+ // source code to be rendered on the screen)`
	`27`	`+ this.srcCode = this.innerHTML;`
`22`	`28`	`const pySrc = await this.getPySrc();`
`23`	`29`	`this.innerHTML = '';`
`24`	`30`	`pyExec(runtime, pySrc, this);`
`@@ -36,7 +42,7 @@ export function make_PyScript(runtime: Runtime) {`
`36`	`42`	`throw e`
`37`	`43`	`}`
`38`	`44`	`} else {`
`39`		`- return htmlDecode(this.innerHTML);`
	`45`	`+ return htmlDecode(this.srcCode);`
`40`	`46`	`}`
`41`	`47`	`}`
`42`	`48`	`}`