terraform 1.12.0 → 1.20.2

package/lib/helpers/raw.js

@@ -15,7 +15,7 @@ var TerraformError = exports.TerraformError = require("../error").TerraformError
 var processors = exports.processors = {
   "html": ["jade", "ejs", "md"],
   "css" : ["styl", "less", "scss", "sass"],
-  "js"  : ["coffee"]
+  "js"  : ["jsx", "cjs", "coffee"]
 }
 
 
@@ -92,6 +92,36 @@ var buildPriorityList = exports.buildPriorityList = function(filePath){
 }
 
 
+var buildPartialPriorityList = exports.buildPartialPriorityList = function(filePath){
+
+  var list      = []
+  var ext       = path.extname(filePath).replace(/^\./, '')
+  var processor = processors[ext]
+
+  var addPartialPaths = function(proList){
+    // foo.html => foo.jade
+    proList.forEach(function(p){
+      var regexp = new RegExp(ext + '$')
+      list.push(filePath.replace(regexp, p))
+    })
+
+    // foo.html => foo.html.jade
+    proList.forEach(function(p){
+      list.push(filePath + '.' + p)
+    })
+  }
+
+  addPartialPaths(processors["html"])
+  addPartialPaths(processors["js"])
+  addPartialPaths(processors["css"])
+
+  // remove leading and trailing slashes
+  var list = list.map(function(item){ return item.replace(/^\/|^\\|\/$/g, '') })
+
+  return list
+}
+
+
 /**
  * Find First File
  *
@@ -446,7 +476,7 @@ exports.shouldIgnore = function(filePath){
 
   // test for starting underscore, .git, .gitignore
   var map = arr.map(function(item){
-    return item[0] === "_" || item.indexOf(".git") === 0
+    return item[0] === "_" || item.indexOf("%5f") === 0 || item.indexOf(".git") === 0
   })
 
   // return if any item starts with underscore

package/lib/javascript/index.js

@@ -8,6 +8,7 @@ var helpers    = require('../helpers')
  * same as doing...
  *
  *    var processors = {
+ *      "cjs"    : require("./processors/cjs")  
  *      "coffee" : require("./processors/coffee")
  *    }
  *
@@ -18,88 +19,46 @@ helpers.processors["js"].forEach(function(sourceType){
   processors[sourceType] = require("./processors/" + sourceType)
 })
 
-module.exports = function(root, filePath, callback){
-
-  var srcPath = path.resolve(root, filePath)
-  var ext     = path.extname(srcPath).replace(/^\./, '')
-  var minifyOpts = {
-    compress: false,
-    mangle: false
+module.exports = function(rootPath, filePath, options, callback){
+  
+  if(!callback) {
+    callback  = options
+    options   = {}
   }
 
-  fs.readFile(srcPath, function(err, data){
-
-    /**
-     * File not Found
-     */
-
-    if(err && err.code === 'ENOENT') return callback(null, null)
-
-    /**
-     * Read File Error
-     */
-
-    if(err) return callback(err)
+  var ext = path.extname(filePath).replace(/^\./, '')
+  return processors[ext].compile(rootPath, filePath, options, callback)
 
-    /**
-     * Lookup Directories
-     */
+  // fs.readFile(srcPath, function(err, data){
 
-    var render = function(ext, data, cb) {
-      processors[ext].compile(srcPath, data, function(err, js) {
-        if (err) return cb(err)
+  //   /**
+  //    * File not Found
+  //    */
 
-        /**
-         * Consistently minify
-         */
-        cb(null, js, minifyOpts)
-      })
-    }
+  //   if(err && err.code === 'ENOENT') return callback(null, null)
 
-    render(ext, data, callback)
+  //   /**
+  //    * Read File Error
+  //    */
 
-    // if(helpers.needsBrowserify(data.toString())) {
-    //   var post = '', success = true
+  //   if(err) return callback(err)
 
-    //   var exceptionHandler = function(err) {
-    //     success = false
-    //     console.log(err.message)
-    //     render(ext, data, callback)
-    //   }
+  //   /**
+  //    * Lookup Directories
+  //    */
 
-    //   process.once('uncaughtException', exceptionHandler)
-    //   browserify(srcPath, {extensions: extensions}).transform(function(file) {
-    //     var result = ''
-    //     return through(write, end)
+  //   var render = function(ext, data, cb) {
+  //     processors[ext].compile(srcPath, data, function(err, js) {
+  //       if (err) return cb(err)
+  //       /**
+  //        * Consistently minify
+  //        */
+  //       cb(null, js)
+  //     })
+  //   }
 
-    //     function write(buf) {
-    //       result += buf
-    //     }
-    //     function end() {
-    //       if(success) {
-    //         var that = this
-    //         render(path.extname(file).replace(/^\./, '').toLowerCase(), result, function(err, data) {
-    //           that.queue(data)
-    //           that.queue(null)
-    //         })
-    //       }
-    //     }
-    //   }).on('error', exceptionHandler).bundle()
-    //   .on('data', function(buf) {
-    //     if (success) {
-    //       post += buf
-    //     }
-    //   }).on('end', function() {
-    //     if (success) {
-    //       process.removeListener('uncaughtException', exceptionHandler)
-    //       callback(null, minify.js(post, minifyOpts))
-    //     }
-    //   })
-    // }
-    // else {
-    //   render(ext, data, callback)
-    // }
+  //   render(ext, data, callback)
 
-  })
+  // })
 
 }

package/lib/javascript/processors/cjs.js

@@ -0,0 +1,34 @@
+
+var esbuild = require("esbuild")
+var TerraformError = require("../../error").TerraformError
+var path = require("path")
+
+exports.compile = function(rootPath, filePath, options, callback){
+  var srcFullPath = path.resolve(rootPath, filePath)
+  // var publicPath = filePath.replace(/\.js\.cjs$/, ".js").replace(/\.cjs$/, ".js")
+  try{
+    var errors = null
+    var results = esbuild.buildSync({
+      entryPoints: [srcFullPath],
+      absWorkingDir: rootPath,
+      //outfile: publicPath,
+      bundle: true,
+      write: false,
+      minify: options.hasOwnProperty("minify") ? options.minify : false,
+      plugins: [],
+    })
+    var script = results.outputFiles[0]["text"]
+  }catch(e){
+    var errorObject = e.errors[0]
+    var errors = errorObject
+    errors.source = "JSX"
+    errors.dest = "JavaScript"
+    errors.filename = filePath
+    errors.stack = errorObject["text"]
+    errors.lineno = parseInt(errorObject["location"]["line"])
+    var script = null
+    var error = new TerraformError(errors)
+  }finally{
+    return callback(error, script)
+  }
+}

package/lib/javascript/processors/coffee.js

@@ -1,6 +1,10 @@
 var TerraformError = require("../../error").TerraformError
+var fs             = require("fs")
+var path           = require("path")
 
-exports.compile = function(filePath, fileContents, callback){
+exports.compile = function(rootPath, filePath, options, callback){
+
+  var srcFullPath = path.resolve(rootPath, filePath)
 
   try{
     var cs = require("coffeescript")
@@ -21,6 +25,7 @@ exports.compile = function(filePath, fileContents, callback){
   }
 
   try{
+    var fileContents = fs.readFileSync(srcFullPath)
     var errors = null
     var script = cs.compile(fileContents.toString(), { bare: true })
   }catch(e){

package/lib/javascript/processors/jsx.js

@@ -0,0 +1,35 @@
+
+var TerraformError = require("../../error").TerraformError
+var path           = require("path")
+var esbuild        = require("esbuild")
+
+exports.compile = function(rootPath, filePath, options, callback){
+  var srcFullPath = path.resolve(rootPath, filePath)
+  // var publicPath = filePath.replace(/\.js\.cjs$/, ".js").replace(/\.cjs$/, ".js")
+  try{
+    var errors = null
+    var results = esbuild.buildSync({
+      entryPoints: [srcFullPath],
+      absWorkingDir: rootPath,
+      //outfile: publicPath,
+      bundle: true,
+      write: false,
+      minify: options.hasOwnProperty("minify") ? options.minify : false,
+      plugins: [],
+      //inject: [__dirname + "/react-shim.js"],
+    })
+    var script = results.outputFiles[0]["text"]
+  }catch(e){
+    var errorObject = e.errors[0]
+    var errors = errorObject
+    errors.source = "JSX"
+    errors.dest = "JavaScript"
+    errors.filename = filePath
+    errors.stack = errorObject["text"]
+    errors.lineno = parseInt(errorObject["location"]["line"])
+    var script = null
+    var error = new TerraformError(errors)
+  }finally{
+    return callback(error, script)
+  }
+}

package/lib/javascript/processors/react-shim.js

@@ -0,0 +1,2 @@
+import * as React from 'react'
+export { React }

package/lib/stylesheet/index.js

@@ -19,44 +19,52 @@ helpers.processors["css"].forEach(function(sourceType){
   processors[sourceType] = require("./processors/" + sourceType)
 })
 
-module.exports = function(root, filePath, callback){
+module.exports = function(rootPath, filePath, options, callback){
 
-  var srcPath = path.resolve(root, filePath)
-  var ext     = path.extname(srcPath).replace(/^\./, '')
+  if(!callback) {
+    callback  = options
+    options   = {}
+  }
 
+  var ext = path.extname(filePath).replace(/^\./, '')
+  return processors[ext].compile(rootPath, filePath, options, callback)
 
-  fs.readFile(srcPath, function(err, data){
+  // var srcPath = path.resolve(root, filePath)
+  // var ext     = path.extname(srcPath).replace(/^\./, '')
 
-    /**
-     * File not Found
-     */
 
-    if(err && err.code === 'ENOENT') return callback(null, null)
+  // fs.readFile(srcPath, function(err, data){
 
-    /**
-     * Read File Error
-     */
+  //   /**
+  //    * File not Found
+  //    */
 
-    if(err) return callback(err)
+  //   if(err && err.code === 'ENOENT') return callback(null, null)
 
+  //   /**
+  //    * Read File Error
+  //    */
 
-    /**
-     * Lookup Directories
-     */
+  //   if(err) return callback(err)
 
-    var dirs = [
-      path.dirname(srcPath),
-      path.dirname(path.resolve(root))
-    ]
 
-    /**
-     * Lookup Directories
-     */
-    var render = processors[ext].compile(srcPath, dirs, data, function(err, css, sourcemap) {
-      if (err) return callback(err);
-      return callback(null, css.toString(), sourcemap)
-    })
+  //   *
+  //    * Lookup Directories
+     
 
-  })
+  //   var dirs = [
+  //     path.dirname(srcPath),
+  //     path.dirname(path.resolve(root))
+  //   ]
+
+  //   /**
+  //    * Lookup Directories
+  //    */
+  //   var render = processors[ext].compile(srcPath, dirs, data, function(err, css, sourcemap) {
+  //     if (err) return callback(err);
+  //     return callback(null, css.toString(), sourcemap)
+  //   })
+
+  // })
 
 }

package/lib/stylesheet/processors/less.js

@@ -1,6 +1,8 @@
 var TerraformError = require("../../error").TerraformError
+var path  = require("path")
+var fs    = require("fs")
 
-exports.compile = function(filePath, dirs, fileContents, callback){
+exports.compile = function(rootPath, filePath, options, callback){
 
   // there must be a better way to do this...
   try{
@@ -21,6 +23,19 @@ exports.compile = function(filePath, dirs, fileContents, callback){
     }
   }
 
+  var srcFullPath = path.resolve(rootPath, filePath)
+
+  try{
+    var fileContents = fs.readFileSync(srcFullPath)
+  }catch(e){
+    return callback(null, null)
+  }
+
+  var dirs = [
+    path.dirname(srcFullPath),
+    path.dirname(path.resolve(rootPath))
+  ]
+
   var formatError = function(e){
     return new TerraformError({
       source: "Less",
@@ -33,6 +48,7 @@ exports.compile = function(filePath, dirs, fileContents, callback){
     })
   }
 
+
   less.render(fileContents.toString(), {
       paths: dirs,            // Specify search paths for @import directives
       filename: filePath,     // Specify a filename, for better error messages
@@ -41,7 +57,7 @@ exports.compile = function(filePath, dirs, fileContents, callback){
     }, function(e, css){
       if (e) return callback(formatError(e))
       var map = css.map || ""
-      return callback(null, css.css, map.toString())
+      return callback(null, css.css.toString(), map.toString())
   })
 }
 

package/lib/stylesheet/processors/sass.js

@@ -1,9 +1,25 @@
 var sass = require("sass")
 var TerraformError = require("../../error").TerraformError
+var path  = require("path")
+var fs    = require("fs")
+
+exports.compile = function(rootPath, filePath, options, callback){
+
+  var srcFullPath = path.resolve(rootPath, filePath)
+  
+  try{
+    var fileContents = fs.readFileSync(srcFullPath)
+  }catch(e){
+    return callback(null, null)
+  }
+
+  var dirs = [
+    path.dirname(srcFullPath),
+    path.dirname(path.resolve(rootPath))
+  ]
 
-exports.compile = function(filePath, dirs, fileContents, callback){
   sass.render({
-    file: filePath,
+    file: srcFullPath,
     includePaths: dirs,
     outputStyle: 'compressed',
     sourceMap: true,
@@ -23,8 +39,7 @@ exports.compile = function(filePath, dirs, fileContents, callback){
         stack: fileContents.toString()
       })
       return callback(error)
-    }
-    
-    callback(null, css.css, css.map.toString())
+    }  
+    callback(null, css.css.toString(), css.map.toString())
   });
 }

package/lib/stylesheet/processors/scss.js

@@ -1,9 +1,25 @@
 var scss = require("sass")
 var TerraformError = require("../../error").TerraformError
+var path  = require("path")
+var fs    = require("fs")
+
+exports.compile = function(rootPath, filePath, options, callback){
+
+  var srcFullPath = path.resolve(rootPath, filePath)
+  
+  try{
+    var fileContents = fs.readFileSync(srcFullPath)
+  }catch(e){
+    return callback(null, null)
+  }
+
+  var dirs = [
+    path.dirname(srcFullPath),
+    path.dirname(path.resolve(rootPath))
+  ]
 
-exports.compile = function(filePath, dirs, fileContents, callback){
   scss.render({
-    file: filePath,
+    file: srcFullPath,
     includePaths: dirs,
     outputStyle: 'compressed',
     sourceMap: true,
@@ -24,6 +40,6 @@ exports.compile = function(filePath, dirs, fileContents, callback){
       })
       return callback(error)
     }
-    callback(null, css.css, css.map.toString())
+    callback(null, css.css.toString(), css.map.toString())
   });
 }

package/lib/stylesheet/processors/styl.js

@@ -1,7 +1,21 @@
 var TerraformError = require("../../error").TerraformError
+var path  = require("path")
+var fs    = require("fs")
 
-exports.compile = function(filePath, dirs, fileContents, callback){
+exports.compile = function(rootPath, filePath, options, callback){
 
+  var srcFullPath = path.resolve(rootPath, filePath)
+  
+  try{
+    var fileContents = fs.readFileSync(srcFullPath)
+  }catch(e){
+    return callback(null, null)
+  }
+
+  var dirs = [
+    path.dirname(srcFullPath),
+    path.dirname(path.resolve(rootPath))
+  ]
 
   // there must be a better way to do this...
   try{
@@ -23,7 +37,7 @@ exports.compile = function(filePath, dirs, fileContents, callback){
   }
 
   var style = stylus(fileContents.toString())
-    style.set('filename', filePath)
+    style.set('filename', srcFullPath)
     style.set('paths', dirs)
     style.set('compress', true)
     style.set('include css', true)

package/lib/template/index.js

@@ -143,6 +143,7 @@ var scope = module.exports = function(projectPath, parentLocals){
        *  note - layouts get the same scope as the partial
        *
        */
+
       var tmpl = processors[ext](fileContents, { filename: filePath, basedir: projectPath })
 
       try{

package/lib/template/processors/jsx.js

@@ -0,0 +1,27 @@
+var ReactDOMServer = require('react-dom/server')
+var TerraformError = require("../../error").TerraformError
+
+module.exports = function(fileContents, options){
+
+  return {
+    compile: function(){
+      return ejs.compile(fileContents.toString(), Object.assign(options, { rmWhitespace: true }))
+    },
+
+    parseError: function(error){
+      var arr = error.message.split("\n")
+      var path_arr = arr[0].split(":")
+
+      error.lineno   = parseInt(error.lineno || path_arr[path_arr.length -1] || -1)
+      error.message  = arr[arr.length - 1]
+      error.name     = error.name
+      error.source   = "EJS"
+      error.dest     = "HTML"
+      error.filename = error.path || options.filename
+      error.stack    = fileContents.toString()
+
+      return new TerraformError(error)
+    }
+  }
+
+}

package/lib/terraform.js

@@ -1,4 +1,4 @@
-var fs          = require('fs')
+
 var path        = require('path')
 var stylesheet  = require('./stylesheet')
 var template    = require('./template')
@@ -54,7 +54,6 @@ exports.root = function(root, globals){
      */
 
     render: function(filePath, locals, callback){
-
       // get rid of leading slash (windows)
       filePath = filePath.replace(/^\\/g, '')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terraform",
-  "version": "1.12.0",
+  "version": "1.20.2",
   "description": "pre-processor engine that powers the harp web server",
   "repository": {
     "type": "git",
@@ -8,7 +8,8 @@
   },
   "main": "./lib/terraform",
   "scripts": {
-    "test": "mocha --reporter spec"
+    "test": "mocha --reporter spec",
+    "test:css": "mocha test/stylesheets --reporter spec"
   },
   "author": "Brock Whitten <brock@chloi.io>",
   "contributors": [
@@ -41,9 +42,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "ejs": "2.5.7",
+    "ejs": "^3.1.6",
+    "esbuild": "^0.12.1",
     "lru-cache": "4.1.1",
-    "marked": "^0.7.0",
+    "marked": "^4.0.10",
+    "react": "^17.0.2",
     "sass": "^1.29.0",
     "through": "2.3.8"
   },
@@ -52,6 +55,6 @@
     "less": "^4.1.1",
     "mocha": "^8.4.0",
     "should": "3.3.2",
-    "stylus": "0.54.8"
+    "stylus": "^0.56.0"
   }
 }