Bug fix

index.js

@@ -7,8 +7,9 @@ const indentation = ({ file, filename }) => {
   require('php-bundler/rules/indentation.js')({ lines, filename })
   require('./rules/comments.js')({ lines, filename })
   require('./rules/end_of_file.js')({ lines, filename })
-  require('./rules/expressions.js')({ lines, filename })
   require('./rules/closures.js')({ lines, filename })
+  require('./rules/expressions.js')({ lines, filename })
+  require('./rules/arrays.js')({ lines, filename })
 
   return lines.join('\n')
 }
@@ -25,7 +26,13 @@ const resoveModule = ({ file, moduleFilename }) => {
   if (!moduleFilename) return file
   moduleFilename = moduleFilename[0]
 
-  let moduleFile = readFileSync(moduleFilename, 'utf-8')
+  let moduleFile
+
+  try {
+    moduleFile = readFileSync(`node_modules/${moduleFilename}/index.php`, 'utf-8')
+  } catch (error) {
+    moduleFile = readFileSync(moduleFilename, 'utf-8')
+  }
 
   if (moduleFile.startsWith('<?php')) {
     moduleFile = moduleFile.replace('<?php\n', '')
@@ -35,6 +42,11 @@ const resoveModule = ({ file, moduleFilename }) => {
 
   moduleFile = closure(moduleFile)
 
+  moduleFile = moduleFile.split('\n').map(line => {
+    if (line === '') return line
+    return `    ${line}`
+  }).join('\n')
+
   const bundle = file.replace(aModuleExpression, moduleFile)
 
   const anotherModuleFilename = bundle.match(aModuleFilename)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "php-bundler",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "main": "index.js",
   "repository": {
     "type": "git",

rules/arrays.js

@@ -0,0 +1,40 @@
+module.exports = ({ lines, filename }) => {
+  const indentation = [
+    '                ',
+    '            ',
+    '        ',
+    '    ',
+    ''
+  ]
+
+  indentation.every(indentationLevel => {
+    lines.reduce((arrayDeclaration, line, index) => {
+      const currentIndentationLevel = line.startsWith(indentationLevel) && !line.startsWith(`${indentationLevel} `)
+
+      if (!arrayDeclaration.line && currentIndentationLevel && (line.endsWith('[') || line.endsWith('('))) {
+        return { line, index }
+      }
+
+      if (currentIndentationLevel && arrayDeclaration.line) {
+        return {}
+      }
+
+      const arrayItemsScope = line.startsWith(`${indentationLevel}    `) && !line.startsWith(`${indentationLevel}     `)
+
+      if (arrayItemsScope && arrayDeclaration.line) {
+        if (['{', '(', '['].every(lineEnd => !line.endsWith(lineEnd))) {
+          if ([']', ')'].every(nextLineStart => !lines[index + 1].trimStart().startsWith(nextLineStart))) {
+            if (line.endsWith(';')) {
+              lines[index] = line.slice(0, -1)
+            }
+            lines[index] = `${lines[index]},`
+          }
+        }
+      }
+
+      return arrayDeclaration
+    }, {})
+
+    return true
+  })
+}

rules/closures.js

@@ -6,13 +6,6 @@ const matchClosures = ({ indentationLevel, line, index, filename }) => {
   }
 }
 
-const missingClosingParentheses = (line) => {
-  const openingParenthesis = [...line.matchAll(/\(/g)].length
-  const closingParenthesis = [...line.matchAll(/\)/g)].length
-
-  return openingParenthesis - closingParenthesis
-}
-
 module.exports = ({ lines, filename }) => {
   const indentation = [
     '                ',
@@ -38,7 +31,7 @@ module.exports = ({ lines, filename }) => {
           if (topLevelClosure) {
             if (lastLine) {
               lines[closureDeclaration.index] = `${closureDeclaration.line} {`
-              lines[index] = '};\n'
+              lines[index] = '}\n'
             }
           } else {
             const remainingExpressionsInTheScope = !lastLine && lines[index + 1].startsWith(`${indentationLevel} `)
@@ -47,11 +40,7 @@ module.exports = ({ lines, filename }) => {
             }
 
             lines[closureDeclaration.index] = `${closureDeclaration.line} {`
-            if (missingClosingParentheses(lines[closureDeclaration.index])) {
-              lines[index - 1] = `${lines[index - 1]}});`
-            } else {
-              lines[index - 1] = `${lines[index - 1]}};`
-            }
+            lines[index] = `${indentationLevel}}`
             closureDeclaration = {}
           }
         } else {
@@ -70,7 +59,7 @@ module.exports = ({ lines, filename }) => {
               return {}
             }
             lines[closureDeclaration.index] = `${closureDeclaration.line} {`
-            lines[index - 2] = '};'
+            lines[index - 2] = '}'
             closureDeclaration = {}
 
             const matchedClosureDeclaration = matchClosures({ indentationLevel, line, index, filename })

rules/expressions.js

@@ -7,7 +7,7 @@ module.exports = ({ lines, filename }) => {
 
     if (line.trimStart() !== '' && !line.trimStart().startsWith('#')) {
       if (!line.includes('function (') && !line.includes('if (')) {
-        if (['{', '(', '[', ','].every(lineEnd => !line.endsWith(lineEnd))) {
+        if (['{', '(', '['].every(lineEnd => !line.endsWith(lineEnd))) {
           if ([']', ')'].every(nextLineStart => !lines[index + 1].trimStart().startsWith(nextLineStart))) {
             lines[index] = `${line};`
           }