Make code work again without ESM

Author: WebCoder49

code-input.js

@@ -224,29 +224,13 @@ var codeInput = {
      */
     templates: {
         // (Source code for class templates after var codeInput = ... so they can extend the codeInput.Template class)
-        // ESM-SUPPORT-START-TEMPLATE-prism Do not (re)move this - it's needed for ESM generation!
-        /**
-         * @deprecated Please use `new codeInput.templates.Prism(...)`
-         */
-        prism(prism, plugins = []) { // Dependency: Prism.js (https://prismjs.com/)
-            return new codeInput.templates.Prism(prism, plugins);
-        },
-        // ESM-SUPPORT-END-TEMPLATE-prism Do not (re)move this - it's needed for ESM generation!
         /**
          * @deprecated Please use `new codeInput.templates.Prism(...)`
          */
         prism(prism, plugins = []) { // Dependency: Prism.js (https://prismjs.com/)
             return new codeInput.templates.Prism(prism, plugins);
         },
 
-        // ESM-SUPPORT-START-TEMPLATE-hljs Do not (re)move this - it's needed for ESM generation!
-        /**
-         * @deprecated Please use `new codeInput.templates.Hljs(...)`
-         */
-        hljs(hljs, plugins = []) { // Dependency: Highlight.js (https://highlightjs.org/)
-            return new codeInput.templates.Hljs(hljs, plugins)
-        },
-        // ESM-SUPPORT-END-TEMPLATE-hljs Do not (re)move this - it's needed for ESM generation!
         /**
          * @deprecated Please use `new codeInput.templates.Hljs(...)`
          */
@@ -1060,6 +1044,7 @@ var codeInput = {
 {
     // Templates are defined here after the codeInput variable is set, because they reference it by extending codeInput.Template.
 
+    // ESM-SUPPORT-START-TEMPLATE-prism Do not (re)move this - it's needed for ESM generation!
     /**
     * A template that uses Prism.js syntax highlighting (https://prismjs.com/).
     */
@@ -1080,8 +1065,10 @@ var codeInput = {
             );
         }
     };
+    // ESM-SUPPORT-END-TEMPLATE-prism Do not (re)move this - it's needed for ESM generation!
     codeInput.templates.Prism = Prism;
 
+    // ESM-SUPPORT-START-TEMPLATE-hljs Do not (re)move this - it's needed for ESM generation!
     /**
      * A template that uses highlight.js syntax highlighting (https://highlightjs.org/).
      */
@@ -1105,6 +1092,7 @@ var codeInput = {
             );
         }
     };
+    // ESM-SUPPORT-END-TEMPLATE-hljs Do not (re)move this - it's needed for ESM generation!
     codeInput.templates.Hljs = Hljs;
 }
 

esm/generate.mjs

@@ -92,9 +92,7 @@ const AUTOGENERATED_NOTICE = "// NOTICE: This code is @generated from code outsi
         const templateMjs = await open("templates/"+templateName+".mjs", "w")
         await templateMjs.writeFile(AUTOGENERATED_NOTICE);
         // Imports
-        await templateMjs.writeFile("import { Template } from \"../code-input.mjs\";\n")
-        // Template syntax is to be stored in an object; do so temporarily.
-        await templateMjs.writeFile("const templates = {\n");
+        await templateMjs.writeFile("import { Template } from \"../code-input.mjs\";\n");
         // Code after start and before end of this template, making use of the imported Template, not codeInput.Template
         let copyingCode = false;
         let templateClassName = null;
@@ -104,7 +102,7 @@ const AUTOGENERATED_NOTICE = "// NOTICE: This code is @generated from code outsi
             }
             if(copyingCode) {
                 if(templateClassName === null) {
-                    const templateClassNameThisLine = line.match(/[A-Za-z]+(?=: class extends codeInput.Template)/);
+                    const templateClassNameThisLine = line.match(/(?<=class )[A-Za-z]+(?= extends codeInput.Template)/);
                     if(templateClassNameThisLine !== null && templateClassNameThisLine.length > 0) {
                         templateClassName = templateClassNameThisLine;
                     }
@@ -115,9 +113,8 @@ const AUTOGENERATED_NOTICE = "// NOTICE: This code is @generated from code outsi
                 copyingCode = true; // After is code to copy - this line missed out
             }
         }
-        await templateMjs.writeFile("};\n");
         // Export, assuming the name of the function is the same as the name of the file.
-        await templateMjs.writeFile("export default templates."+templateClassName+";\n");
+        await templateMjs.writeFile("export default "+templateClassName+";\n");
         await codeInputJs.close();
         await templateMjs.close();
     });

esm/generate.sh

@@ -40,15 +40,13 @@ mkdir -p templates
     echo "" >> templates/$0.mjs;
     # Imports
     echo "import { Template } from \"../code-input.mjs\";" >> templates/$0.mjs
-    # Template syntax is to be stored in an object; do so temporarily.
-    echo "const templates = {" >> templates/$0.mjs
+
     # Code after start and before end of this template, making use of the imported Template, not codeInput.Template
     head -$(($(sed -n "/ESM-SUPPORT-END-TEMPLATE-$0/=" ../code-input.js | head -1) - 1)) ../code-input.js | tail --line=+$(($(sed -n "/ESM-SUPPORT-START-TEMPLATE-$0/=" ../code-input.js | head -1) + 1)) | sed "s/codeInput\.Template/Template/g" >> templates/$0.mjs
-    echo "};" >> templates/$0.mjs
 
-    TEMPLATE_CLASS_NAME="$(grep -Eo "[a-zA-Z]+: class extends Template" templates/$0.mjs | head -1 | sed "s/: class extends Template//")";
+    TEMPLATE_CLASS_NAME="$(grep -Eo "class [a-zA-Z]+ extends Template" templates/$0.mjs | head -1 | sed "s/class //" | sed "s/ extends Template//")";
     # Export.
-    echo "export default templates.$TEMPLATE_CLASS_NAME;" >> templates/$0.mjs
+    echo "export default $TEMPLATE_CLASS_NAME;" >> templates/$0.mjs
 
     # $0 is the template name, $1 is the autogenerated notice
     ' "%" "$AUTOGENERATED_NOTICE"