Make prism/hljs templates classes; keep but deprecate their functions

Author: WebCoder49

code-input.d.ts

@@ -374,11 +374,11 @@ export namespace templates {
     */
     constructor(prism: Object, plugins?: Plugin[])
   }
+  // ESM-SUPPORT-END-TEMPLATE-prism Do not (re)move this - it's needed for ESM generation
   /**
    * @deprecated Please use `new codeInput.templates.Prism(...)`
    */
   function prism(prism: Object, plugins?: Plugin[]): Template
-  // ESM-SUPPORT-END-TEMPLATE-prism Do not (re)move this - it's needed for ESM generation
   // 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/).
@@ -392,11 +392,11 @@ export namespace templates {
     */
     constructor(hljs: Object, plugins?: Plugin[])
   }
+  // ESM-SUPPORT-END-TEMPLATE-hljs Do not (re)move this - it's needed for ESM generation
   /**
    * @deprecated Please use `new codeInput.templates.Hljs(...)`
    */
   function hljs(hljs: Object, plugins?: Plugin[]): Template
-  // ESM-SUPPORT-END-TEMPLATE-hljs Do not (re)move this - it's needed for ESM generation
   /**
    * Constructor to create a proof-of-concept template that gives a message if too many characters are typed.
    * @param {codeInput.Plugin[]} plugins - An array of plugin objects to add extra features - see `codeInput.plugins`

code-input.js

@@ -232,15 +232,27 @@ var codeInput = {
             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);
+            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(...)`
+         */
+        hljs(hljs, plugins = []) { // Dependency: Highlight.js (https://highlightjs.org/)
+            return new codeInput.templates.Hljs(hljs, plugins);
+        },
 
         /**
          * @deprecated Make your own version of this template if you need it - we think it isn't widely used so will remove it from the next version of code-input.

esm/generate.mjs

@@ -97,11 +97,18 @@ const AUTOGENERATED_NOTICE = "// NOTICE: This code is @generated from code outsi
         await templateMjs.writeFile("const templates = {\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;
         for await (const line of codeInputJs.readLines()) {
             if(line.includes("ESM-SUPPORT-END-TEMPLATE-"+templateName)) {
                 break;
             }
             if(copyingCode) {
+                if(templateClassName === null) {
+                    const templateClassNameThisLine = line.match(/[A-Za-z]+(?=: class extends codeInput.Template)/);
+                    if(templateClassNameThisLine !== null && templateClassNameThisLine.length > 0) {
+                        templateClassName = templateClassNameThisLine;
+                    }
+                }
                 await templateMjs.writeFile(line.replaceAll("codeInput.Template", "Template")+"\n");
             }
             if(line.includes("ESM-SUPPORT-START-TEMPLATE-"+templateName)) {
@@ -110,7 +117,7 @@ const AUTOGENERATED_NOTICE = "// NOTICE: This code is @generated from code outsi
         }
         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."+templateName+";\n");
+        await templateMjs.writeFile("export default templates."+templateClassName+";\n");
         await codeInputJs.close();
         await templateMjs.close();
     });
@@ -124,16 +131,16 @@ const AUTOGENERATED_NOTICE = "// NOTICE: This code is @generated from code outsi
         await templateDMts.writeFile("import { Template, Plugin } from \"../code-input.d.mts\";\n");
         // Code after start and before end of this template, making use of the imported Template, not codeInput.Template
         let copyingCode = false;
-        let functionSeen = false;
+        let classSeen = false;
         for await (let line of codeInputDTs.readLines()) {
             if(line.includes("ESM-SUPPORT-END-TEMPLATE-"+templateName)) {
                 break;
             }
             if(copyingCode) {
-                if(/( |\t)*function.*/.test(line) && !functionSeen) {
+                if(/( |\t)*class.*/.test(line) && !classSeen) {
                     // Replace only first occurrence
-                    line = line.replace("function", "export default function");
-                    functionSeen = true;
+                    line = line.replace("class", "export default class");
+                    classSeen = true;
                 }
                 await templateDMts.writeFile(line.replaceAll("codeInput.Template", "Template").replaceAll("codeInput.Plugin", "Plugin")+"\n");
             }

esm/generate.sh

@@ -45,8 +45,10 @@ mkdir -p templates
     # 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
-    # Export, assuming the name of the function is the same as the name of the file.
-    echo "export default templates.$0;" >> templates/$0.mjs
+
+    TEMPLATE_CLASS_NAME="$(grep -Eo "[a-zA-Z]+: class extends Template" templates/$0.mjs | head -1 | sed "s/: class extends Template//")";
+    # Export.
+    echo "export default templates.$TEMPLATE_CLASS_NAME;" >> templates/$0.mjs
 
     # $0 is the template name, $1 is the autogenerated notice
     ' "%" "$AUTOGENERATED_NOTICE"
@@ -57,9 +59,9 @@ mkdir -p templates
     echo "" >> templates/$0.d.mts;
     # Imports
     echo "import { Template, Plugin } from \"../code-input.d.mts\";" >> templates/$0.d.mts
-    # Code after start and before end of this template, making use of the imported Template, not codeInput.Template, and the imported Plugin, not codeInput.Plugin, exporting the function as default
-    # export default function replacement should work but won"t leave indentation as JS version does.
-    head -$(($(sed -n "/ESM-SUPPORT-END-TEMPLATE-$0/=" ../code-input.d.ts | head -1) - 1)) ../code-input.d.ts | tail --line=+$(($(sed -n "/ESM-SUPPORT-START-TEMPLATE-$0/=" ../code-input.d.ts | head -1) + 1)) | sed "s/codeInput\.Template/Template/g" | sed "s/codeInput\.Plugin/Plugin/g" | sed -E "s/^[[:space:]]*function /export default function /" >> templates/$0.d.mts
+    # Code after start and before end of this template, making use of the imported Template, not codeInput.Template, and the imported Plugin, not codeInput.Plugin, exporting the class as default
+    # export default class replacement should work but won"t leave indentation as JS version does.
+    head -$(($(sed -n "/ESM-SUPPORT-END-TEMPLATE-$0/=" ../code-input.d.ts | head -1) - 1)) ../code-input.d.ts | tail --line=+$(($(sed -n "/ESM-SUPPORT-START-TEMPLATE-$0/=" ../code-input.d.ts | head -1) + 1)) | sed "s/codeInput\.Template/Template/g" | sed "s/codeInput\.Plugin/Plugin/g" | sed -E "s/^[[:space:]]*class /export default class /" >> templates/$0.d.mts
 
     # $0 is the template name, $1 is the autogenerated notice
     ' "%" "$AUTOGENERATED_NOTICE"