feat: extract @unminify/ast-utils

packages/ast-utils/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "@unminify/ast-utils",
+  "type": "module",
+  "version": "0.0.1",
+  "packageManager": "[email protected]",
+  "description": "🔪📦 Unminify and beautify bundled code",
+  "author": "Pionxzh",
+  "license": "MIT",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "package.json"
+  ],
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format cjs,esm --dts --sourcemap --clean",
+    "test": "vitest run --globals",
+    "test:update": "vitest run --update --globals",
+    "test:watch": "vitest watch --globals",
+    "test:type": "tsc --noEmit",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
+  },
+  "dependencies": {
+    "@babel/types": "^7.20.7",
+    "eslint": "^8.32.0",
+    "jscodeshift": "^0.14.0"
+  },
+  "devDependencies": {
+    "@types/jscodeshift": "^0.11.6",
+    "@types/yargs": "^17.0.20",
+    "tsup": "^6.5.0",
+    "typescript": "^4.9.4",
+    "vitest": "^0.28.3"
+  }
+}

packages/ast-utils/src/index.ts

@@ -0,0 +1,5 @@
+export { isIIFE } from './isIIFE'
+export { isTopLevel } from './isTopLevel'
+export { renameFunctionParameters } from './renameFunctionParameters'
+export { splitVariableDeclarators } from './splitVariableDeclarators'
+export { pruneComments } from './pruneComments'

packages/ast-utils/src/isIIFE.ts

@@ -0,0 +1,10 @@
+import type { ExpressionStatement, Statement } from 'jscodeshift'
+
+export function isIIFE(node: Statement): node is ExpressionStatement {
+    if (node.type !== 'ExpressionStatement') return false
+    const expression = (node as ExpressionStatement).expression
+    if (expression.type !== 'CallExpression') return false
+    const callee = expression.callee
+    return callee.type === 'FunctionExpression'
+        || callee.type === 'ArrowFunctionExpression'
+}

packages/ast-utils/src/pruneComments.ts

@@ -0,0 +1,6 @@
+import type { Collection, JSCodeshift } from 'jscodeshift'
+
+export function pruneComments(j: JSCodeshift, collection: Collection): void {
+    // @ts-expect-error - Comment type is wrong
+    collection.find(j.Comment).forEach(path => path.prune())
+}

packages/ast-utils/src/renameFunctionParameters.ts

@@ -0,0 +1,26 @@
+import type { ArrowFunctionExpression, FunctionExpression, JSCodeshift } from 'jscodeshift'
+
+export function renameFunctionParameters(j: JSCodeshift, node: FunctionExpression | ArrowFunctionExpression, parameters: string[]): void {
+    node.params.forEach((param, index) => {
+        if (param.type === 'Identifier') {
+            const oldName = param.name
+            const newName = parameters[index]
+
+            // Only get the immediate function scope
+            const functionScope = j(node).closestScope().get()
+
+            // Check if the name is in the current scope and rename it
+            if (functionScope.scope.getBindings()[oldName]) {
+                j(functionScope)
+                    .find(j.Identifier, { name: oldName })
+                    .forEach((path) => {
+                        // Exclude MemberExpression properties
+                        if (!(path.parent.node.type === 'MemberExpression' && path.parent.node.property === path.node)
+                            && path.scope.node === functionScope.node) {
+                            path.node.name = newName
+                        }
+                    })
+            }
+        }
+    })
+}

packages/ast-utils/src/splitVariableDeclarators.ts

@@ -0,0 +1,30 @@
+import type { Collection, JSCodeshift } from 'jscodeshift'
+
+/**
+ * ```js
+ * var a = 1, b = true, c = func(d)
+ * ->
+ * var a = 1
+ * var b = true
+ * var c = func(d)
+ * ```
+ */
+export function splitVariableDeclarators(j: JSCodeshift, collection: Collection) {
+    collection
+        .find(j.VariableDeclaration, {
+            declarations: [
+                {
+                    type: 'VariableDeclarator',
+                    id: { type: 'Identifier' },
+                },
+            ],
+        })
+        .filter((path) => {
+            if (path.parent?.node.type === 'ForStatement') return false
+            return path.node.declarations.length > 1
+        })
+        .forEach((p) => {
+            const { kind, declarations } = p.node
+            j(p).replaceWith(declarations.map(d => j.variableDeclaration(kind, [d])))
+        })
+}

packages/ast-utils/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "lib": ["ESNext"],
+    "moduleResolution": "Node",
+    "strict": true,
+    "outDir": "dist",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "noEmit": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "skipLibCheck": true,
+    "useDefineForClassFields": true
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}

packages/unminify/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "unminify",
+  "name": "@unminify/kit",
   "type": "module",
   "version": "0.0.1",
   "packageManager": "[email protected]",
@@ -38,6 +38,7 @@
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
     "@babel/types": "^7.20.7",
+    "@unminify/ast-utils": "workspace:*",
     "eslint": "^8.32.0",
     "fs-extra": "^11.1.0",
     "globby": "^11.1.0",

packages/unminify/tsconfig.json

@@ -15,7 +15,10 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "skipLibCheck": true,
-    "useDefineForClassFields": true
+    "useDefineForClassFields": true,
+    "paths": {
+      "@unminify/ast-utils": ["../ast-utils/src/index.ts"]
+    }
   },
   "include": [
     "src",

packages/unpacker/package.json

@@ -34,6 +34,7 @@
     "lint:fix": "eslint src --fix"
   },
   "dependencies": {
+    "@unminify/ast-utils": "workspace:*",
     "ast-types": "^0.14.2",
     "jscodeshift": "^0.14.0",
     "picocolors": "^1.0.0",

packages/unpacker/src/utils.ts

@@ -1,40 +1,6 @@
-import type { ASTPath, ArrowFunctionExpression, ClassDeclaration, Collection, ExpressionStatement, FunctionDeclaration, FunctionExpression, JSCodeshift, Node, Statement, VariableDeclaration } from 'jscodeshift'
-import prettier from 'prettier/standalone'
 import babelParser from 'prettier/parser-babel'
-
-export function isTopLevel(j: JSCodeshift, node: ASTPath<Node>): boolean {
-    return j.Program.check(node.parentPath.node)
-}
-
-export function pruneComments(j: JSCodeshift, collection: Collection<any>): void {
-    // @ts-expect-error - Comment type is wrong
-    collection.find(j.Comment).forEach(path => path.prune())
-}
-
-export function renameFunctionParameters(j: JSCodeshift, node: FunctionExpression | ArrowFunctionExpression, parameters: string[]): void {
-    node.params.forEach((param, index) => {
-        if (param.type === 'Identifier') {
-            const oldName = param.name
-            const newName = parameters[index]
-
-            // Only get the immediate function scope
-            const functionScope = j(node).closestScope().get()
-
-            // Check if the name is in the current scope and rename it
-            if (functionScope.scope.getBindings()[oldName]) {
-                j(functionScope)
-                    .find(j.Identifier, { name: oldName })
-                    .forEach((path) => {
-                        // Exclude MemberExpression properties
-                        if (!(path.parent.node.type === 'MemberExpression' && path.parent.node.property === path.node)
-                            && path.scope.node === functionScope.node) {
-                            path.node.name = newName
-                        }
-                    })
-            }
-        }
-    })
-}
+import prettier from 'prettier/standalone'
+import type { Collection, JSCodeshift } from 'jscodeshift'
 
 export function wrapDeclarationWithExport(
     j: JSCodeshift,
@@ -55,7 +21,7 @@ export function wrapDeclarationWithExport(
         return
     }
     const declarationPath = declarations[0].parent?.parent
-    const declarationNode = declarationPath.value
+    const declarationNode = declarationPath?.value
     if (!declarationNode) {
         console.warn('Failed to locate declaration node:', declarationName)
         return
@@ -68,23 +34,38 @@ export function wrapDeclarationWithExport(
     && !j.FunctionDeclaration.check(declarationNode)
     && !j.ClassDeclaration.check(declarationNode)) {
         console.warn(`Declaration is not a variable, function or class: ${declarationName}, the type is ${declarationNode.type}`)
+        console.warn(j(declarationPath).toSource())
         return
     }
 
-    const exportDeclaration = exportName === 'default'
-        ? j.exportDefaultDeclaration(declarationNode)
-        : j.exportNamedDeclaration(declarationNode)
-
-    j(declarationPath).replaceWith(exportDeclaration)
-}
+    if (j.VariableDeclaration.check(declarationNode) && declarationNode.declarations.length > 1) {
+        // special case for multiple variable declarators
+        // e.g. `var a = 1, b = 2`
+        const declarators = declarationNode.declarations
+        const exportDeclarator = declarators.find((declarator) => {
+            return j.VariableDeclarator.check(declarator) && j.Identifier.check(declarator.id) && declarator.id.name === declarationName
+        })
+        if (!exportDeclarator) {
+            console.warn(`Failed to locate export variable declarator: ${declarationName}`)
+            return
+        }
+        const newVariableDeclaration = j.variableDeclaration(declarationNode.kind, [exportDeclarator])
+        const newDeclaration = exportName === 'default'
+            ? j.exportDefaultDeclaration(newVariableDeclaration)
+            : j.exportNamedDeclaration(newVariableDeclaration)
+        const filteredDeclaration = j.variableDeclaration(
+            declarationNode.kind,
+            declarators.filter(declarator => declarator !== exportDeclarator),
+        )
+        j(declarationPath).replaceWith(filteredDeclaration).insertBefore(newDeclaration)
+    }
+    else {
+        const exportDeclaration = exportName === 'default'
+            ? j.exportDefaultDeclaration(declarationNode)
+            : j.exportNamedDeclaration(declarationNode)
 
-export function isIIFE(node: Statement): node is ExpressionStatement {
-    if (node.type !== 'ExpressionStatement') return false
-    const expression = (node as ExpressionStatement).expression
-    if (expression.type !== 'CallExpression') return false
-    const callee = expression.callee
-    return callee.type === 'FunctionExpression'
-        || callee.type === 'ArrowFunctionExpression'
+        j(declarationPath).replaceWith(exportDeclaration)
+    }
 }
 
 export function prettierFormat(code: string) {

packages/unpacker/tsconfig.json

@@ -15,11 +15,13 @@
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "skipLibCheck": true,
-    "useDefineForClassFields": true
+    "useDefineForClassFields": true,
+    "paths": {
+      "@unminify/ast-utils": ["../ast-utils/src/index.ts"]
+    }
   },
   "include": [
-    "src",
-    "lebab.d.ts"
+    "src"
   ],
   "exclude": [
     "node_modules",