Merge pull request #6 from jckirton/move-autocomplete-to-postprocessing

Move script autocompletes from minification to postprocessing.

Author: edg-l

src/processScript/index.ts

@@ -326,7 +326,8 @@ export async function processScript(code: string, {
 	code = generate(file).code
 
 	if (shouldMinify)
-		code = await minify(file, { uniqueId, mangleNames, forceQuineCheats, autocomplete })
+		// code = await minify(file, { uniqueId, mangleNames, forceQuineCheats, autocomplete })
+		code = await minify(file, { uniqueId, mangleNames, forceQuineCheats })
 	else {
 		traverse(file, {
 			MemberExpression({ node: memberExpression }) {
@@ -420,7 +421,7 @@ export async function processScript(code: string, {
 		)
 	}
 
-	code = postprocess(code, uniqueId)
+	code = postprocess(code, uniqueId, autocomplete)
 
 	if (includesIllegalString(code)) {
 		throw Error(

src/processScript/minify.ts

@@ -25,7 +25,7 @@ type MinifyOptions = LaxPartial<{
 	 */
 	forceQuineCheats: boolean
 
-	/** the comment inserted after the function signature */ autocomplete: string
+	// /** the comment inserted after the function signature */ autocomplete: string
 }>
 
 const minifyNumber = async (number: number) => /\$\((?<number>.+)\)/
@@ -40,7 +40,8 @@ const minifyNumber = async (number: number) => /\$\((?<number>.+)\)/
  */
 export async function minify(
 	file: File,
-	{ uniqueId = `00000000000`, mangleNames = false, forceQuineCheats, autocomplete }: MinifyOptions = {}
+	// { uniqueId = `00000000000`, mangleNames = false, forceQuineCheats, autocomplete }: MinifyOptions = {}
+	{ uniqueId = `00000000000`, mangleNames = false, forceQuineCheats }: MinifyOptions = {}
 ): Promise<string> {
 	assert(/^\w{11}$/.exec(uniqueId), HERE)
 
@@ -175,13 +176,13 @@ export async function minify(
 			.replace(new RegExp(`_${uniqueId}_PROTOTYPE_PROPERTY_`, `g`), `"prototype"`)
 			.replace(new RegExp(`_${uniqueId}_PROTO_PROPERTY_`, `g`), `"__proto__"`)
 
-		if (autocomplete) {
-			scriptBeforeJSONValueReplacement = spliceString(
-				scriptBeforeJSONValueReplacement,
-				`//${autocomplete}\n`,
-				getFunctionBodyStart(scriptBeforeJSONValueReplacement) + 1
-			)
-		}
+		// if (autocomplete) {
+		// 	scriptBeforeJSONValueReplacement = spliceString(
+		// 		scriptBeforeJSONValueReplacement,
+		// 		`//${autocomplete}\n`,
+		// 		getFunctionBodyStart(scriptBeforeJSONValueReplacement) + 1
+		// 	)
+		// }
 
 		if (forceQuineCheats == false)
 			return scriptBeforeJSONValueReplacement
@@ -465,7 +466,8 @@ export async function minify(
 	if (comment != undefined) {
 		code = spliceString(
 			code,
-			`${autocomplete ? `//${autocomplete}\n` : ``}\n//\t${comment}\t\n`,
+			// `${autocomplete ? `//${autocomplete}\n` : ``}\n//\t${comment}\t\n`,
+			`\n//\t${comment}\t\n`,
 			getFunctionBodyStart(code) + 1
 		)
 

src/processScript/postprocess.ts

@@ -1,5 +1,6 @@
-export const postprocess = (code: string, uniqueId: string): string => code
+export const postprocess = (code: string, uniqueId: string, autocomplete: string | undefined): string => code
 	.replace(/^function\s*[\w$]+\(/, `function(`)
+	.replace(/(^.+\{)/, `$1${autocomplete ? `//${autocomplete}` : ``}`)
 	.replace(new RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$SC_DOLLAR\\$`, `g`), `S\\C$`)
 	.replace(new RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$DB_DOLLAR\\$`, `g`), `D\\B$`)
 	.replace(new RegExp(`\\$${uniqueId}\\$\\\\(?:\\\\)?\\$D\\$`, `g`), `_\\_D_S`)