Moved registerExtension() into 'transform' module and renamed it 'cin…

…ch'.
pguillory · Feb 24, 2011 · e18d46c · e18d46c
1 parent f476a99
commit e18d46c
Show file tree

Hide file tree

Showing 73 changed files with 40 additions and 52 deletions.
diff --git a/index.js b/index.js
@@ -1,3 +1 @@
-exports.registerExtension = require('./lib/register').registerExtension;
+module.exports = require('./lib/cinch.js')
-exports.transformSource = require("./lib/transform").transformSource;
-exports.transformFile = require("./lib/transform").transformFile;
diff --git a/lib/transform.js → lib/cinch.js b/lib/transform.js → lib/cinch.js
@@ -13,57 +13,61 @@ var idents = require('./idents')
 
 var banner = "/*** Generated by Cinch ***/\n";
 
-exports.transformSource = function(source) {
+exports.registerExtension = function(options) {
-    idents.reset()
+    options = options || {}
-    var script = Narcissus.parser.parse(source)
-    transform_script(script)
-    var transformed = pp(script) + '\n'
-    return transformed
-}
 
-exports.transformFile = function(filename_, options) {
+    // force require() to check for .js_ before .js
-    var dirname = path.dirname(filename_)
+    var js_extension = require.extensions['.js']
-    var ext = path.extname(filename_)
+    delete require.extensions['.js']
-    var basename = path.basename(filename_, ext)
-    var filename = path.join(dirname, basename + '.js')
 
-    idents.reset()
+    require.extensions[options.extension || '.js_'] = function(module, filename_) {
+        var dirname = path.dirname(filename_)
+        var ext = path.extname(filename_)
+        var basename = path.basename(filename_, ext)
+        var filename = path.join(dirname, basename + '.js')
 
-    var source = fs.readFileSync(filename_, 'utf8');
+        var source = fs.readFileSync(filename_, 'utf8');
 
-    if (options.saveParseTree) {
         try {
-            var script = Narcissus.parser.parse(source)
+            Narcissus.parser.parse(source)
         } catch (err) {
             module._compile(source, filename_)
             throw err
         }
-        strip(script)
-        fs.writeFileSync(filename + '.before.json', JSON.stringify(script), 'utf8')
-    }
 
-    try {
+        if (options.saveParseTree) {
+            var script = Narcissus.parser.parse(source)
+            strip(script)
+            fs.writeFileSync(filename_ + '.parsed.json', JSON.stringify(script), 'utf8')
+
+            var script = Narcissus.parser.parse(source)
+            transform_script(script)
+            strip(script)
+            fs.writeFileSync(filename + '.parsed.json', JSON.stringify(script), 'utf8')
+        }
+
         var script = Narcissus.parser.parse(source)
-    } catch (err) {
+        transform_script(script)
-        module._compile(source, filename_)
+        var transformed = pp(script) + '\n'
-        throw err
+
-    }
+    	if (options.saveSource) {
-    transform_script(script)
+    		fs.writeFileSync(filename, transformed, 'utf8');
-    var transformed = pp(script) + '\n'
+    	}
 
-    if (options.saveParseTree) {
+        module._compile(transformed, filename)
-        strip(script)
-        fs.writeFileSync(filename + '.after.json', JSON.stringify(script), 'utf8')
     }
 
-	if (options.saveSource) {
+    require.extensions['.js'] = js_extension
-		fs.writeFileSync(filename, transformed, 'utf8');
+}
-	}
 
-    return transformed
+exports.transformSource = function(source) {
+    var script = Narcissus.parser.parse(source)
+    transform_script(script)
+    return pp(script) + '\n'
 }
 
 function transform_script(script) {
+    idents.reset()
     scan_for_functions_to_transform(script).forEach(transform_function)
     replace_passthrough_callbacks(script)
     replace_passthrough_functions(script)
@@ -153,10 +157,12 @@ function is_passthrough_function(n) {
 }
 function foo() {
     bar()
+    baz()
 }
 // ...to...
 {
     bar()
+    baz()
 }
 */
 function inline_functions_only_called_once(script) {

diff --git a/lib/register.js b/lib/register.js
diff --git a/.../1. Returning a value/index.js.after.json → ...1. Returning a value/index.js.parsed.json b/.../1. Returning a value/index.js.after.json → ...1. Returning a value/index.js.parsed.json
diff --git a/...1. Returning a value/index.js.before.json → .... Returning a value/index.js_.parsed.json b/...1. Returning a value/index.js.before.json → .... Returning a value/index.js_.parsed.json
diff --git a/...itly return undefined/index.js.after.json → ...tly return undefined/index.js.parsed.json b/...itly return undefined/index.js.after.json → ...tly return undefined/index.js.parsed.json
diff --git a/...tly return undefined/index.js.before.json → ...ly return undefined/index.js_.parsed.json b/...tly return undefined/index.js.before.json → ...ly return undefined/index.js_.parsed.json
diff --git a/...s/3. Throws propagate/index.js.after.json → .../3. Throws propagate/index.js.parsed.json b/...s/3. Throws propagate/index.js.after.json → .../3. Throws propagate/index.js.parsed.json
diff --git a/.../3. Throws propagate/index.js.before.json → ...3. Throws propagate/index.js_.parsed.json b/.../3. Throws propagate/index.js.before.json → ...3. Throws propagate/index.js_.parsed.json
diff --git a/...ll a regular function/index.js.after.json → ...l a regular function/index.js.parsed.json b/...ll a regular function/index.js.after.json → ...l a regular function/index.js.parsed.json
diff --git a/...l a regular function/index.js.before.json → ... a regular function/index.js_.parsed.json b/...l a regular function/index.js.before.json → ... a regular function/index.js_.parsed.json
diff --git a/... transformed function/index.js.after.json → ...transformed function/index.js.parsed.json b/... transformed function/index.js.after.json → ...transformed function/index.js.parsed.json
diff --git a/...transformed function/index.js.before.json → ...ransformed function/index.js_.parsed.json b/...transformed function/index.js.before.json → ...ransformed function/index.js_.parsed.json
diff --git a/... through async result/index.js.after.json → ...through async result/index.js.parsed.json b/... through async result/index.js.after.json → ...through async result/index.js.parsed.json
diff --git a/...through async result/index.js.before.json → ...hrough async result/index.js_.parsed.json b/...through async result/index.js.before.json → ...hrough async result/index.js_.parsed.json
diff --git a/...sformed function call/index.js.after.json → ...formed function call/index.js.parsed.json b/...sformed function call/index.js.after.json → ...formed function call/index.js.parsed.json
diff --git a/...formed function call/index.js.before.json → ...ormed function call/index.js_.parsed.json b/...formed function call/index.js.before.json → ...ormed function call/index.js_.parsed.json
diff --git a/...nction defined in var/index.js.after.json → ...ction defined in var/index.js.parsed.json b/...nction defined in var/index.js.after.json → ...ction defined in var/index.js.parsed.json
diff --git a/...ction defined in var/index.js.before.json → ...tion defined in var/index.js_.parsed.json b/...ction defined in var/index.js.before.json → ...tion defined in var/index.js_.parsed.json
diff --git a/... semicolon expression/index.js.after.json → ...semicolon expression/index.js.parsed.json b/... semicolon expression/index.js.after.json → ...semicolon expression/index.js.parsed.json
diff --git a/...semicolon expression/index.js.before.json → ...emicolon expression/index.js_.parsed.json b/...semicolon expression/index.js.before.json → ...emicolon expression/index.js_.parsed.json
diff --git a/...2. In var initializer/index.js.after.json → .... In var initializer/index.js.parsed.json b/...2. In var initializer/index.js.after.json → .... In var initializer/index.js.parsed.json
diff --git a/.... In var initializer/index.js.before.json → ... In var initializer/index.js_.parsed.json b/.... In var initializer/index.js.before.json → ... In var initializer/index.js_.parsed.json
diff --git a/...ll/3. In return value/index.js.after.json → ...l/3. In return value/index.js.parsed.json b/...ll/3. In return value/index.js.after.json → ...l/3. In return value/index.js.parsed.json
diff --git a/...l/3. In return value/index.js.before.json → .../3. In return value/index.js_.parsed.json b/...l/3. In return value/index.js.before.json → .../3. In return value/index.js_.parsed.json
diff --git a/...l/4. In if expression/index.js.after.json → .../4. In if expression/index.js.parsed.json b/...l/4. In if expression/index.js.after.json → .../4. In if expression/index.js.parsed.json
diff --git a/.../4. In if expression/index.js.before.json → ...4. In if expression/index.js_.parsed.json b/.../4. In if expression/index.js.before.json → ...4. In if expression/index.js_.parsed.json
diff --git a/...5. In throw exception/index.js.after.json → .... In throw exception/index.js.parsed.json b/...5. In throw exception/index.js.after.json → .... In throw exception/index.js.parsed.json
diff --git a/.... In throw exception/index.js.before.json → ... In throw exception/index.js_.parsed.json b/.... In throw exception/index.js.before.json → ... In throw exception/index.js_.parsed.json
diff --git a/...nction call/6. In dot/index.js.after.json → ...ction call/6. In dot/index.js.parsed.json b/...nction call/6. In dot/index.js.after.json → ...ction call/6. In dot/index.js.parsed.json
diff --git a/...ction call/6. In dot/index.js.before.json → ...tion call/6. In dot/index.js_.parsed.json b/...ction call/6. In dot/index.js.before.json → ...tion call/6. In dot/index.js_.parsed.json
diff --git a/...sts/3. While/1. Works/index.js.after.json → ...ts/3. While/1. Works/index.js.parsed.json b/...sts/3. While/1. Works/index.js.after.json → ...ts/3. While/1. Works/index.js.parsed.json
diff --git a/...ts/3. While/1. Works/index.js.before.json → ...s/3. While/1. Works/index.js_.parsed.json b/...ts/3. While/1. Works/index.js.before.json → ...s/3. While/1. Works/index.js_.parsed.json
diff --git a/...ests/3. While/2. Body/index.js.after.json → ...sts/3. While/2. Body/index.js.parsed.json b/...ests/3. While/2. Body/index.js.after.json → ...sts/3. While/2. Body/index.js.parsed.json
diff --git a/...sts/3. While/2. Body/index.js.before.json → ...ts/3. While/2. Body/index.js_.parsed.json b/...sts/3. While/2. Body/index.js.before.json → ...ts/3. While/2. Body/index.js_.parsed.json
diff --git a/...sts/3. While/3. Break/index.js.after.json → ...ts/3. While/3. Break/index.js.parsed.json b/...sts/3. While/3. Break/index.js.after.json → ...ts/3. While/3. Break/index.js.parsed.json
diff --git a/...ts/3. While/3. Break/index.js.before.json → ...s/3. While/3. Break/index.js_.parsed.json b/...ts/3. While/3. Break/index.js.before.json → ...s/3. While/3. Break/index.js_.parsed.json
diff --git a/...hile/4. Break in else/index.js.after.json → ...ile/4. Break in else/index.js.parsed.json b/...hile/4. Break in else/index.js.after.json → ...ile/4. Break in else/index.js.parsed.json
diff --git a/...ile/4. Break in else/index.js.before.json → ...le/4. Break in else/index.js_.parsed.json b/...ile/4. Break in else/index.js.before.json → ...le/4. Break in else/index.js_.parsed.json
diff --git a/.../3. While/5. Continue/index.js.after.json → ...3. While/5. Continue/index.js.parsed.json b/.../3. While/5. Continue/index.js.after.json → ...3. While/5. Continue/index.js.parsed.json
diff --git a/...3. While/5. Continue/index.js.before.json → .... While/5. Continue/index.js_.parsed.json b/...3. While/5. Continue/index.js.before.json → .... While/5. Continue/index.js_.parsed.json
diff --git a/...tests/4. For/1. Works/index.js.after.json → ...ests/4. For/1. Works/index.js.parsed.json b/...tests/4. For/1. Works/index.js.after.json → ...ests/4. For/1. Works/index.js.parsed.json
diff --git a/...ests/4. For/1. Works/index.js.before.json → ...sts/4. For/1. Works/index.js_.parsed.json b/...ests/4. For/1. Works/index.js.before.json → ...sts/4. For/1. Works/index.js_.parsed.json
diff --git a/.../2. Iterates properly/index.js.after.json → ...2. Iterates properly/index.js.parsed.json b/.../2. Iterates properly/index.js.after.json → ...2. Iterates properly/index.js.parsed.json
diff --git a/...2. Iterates properly/index.js.before.json → .... Iterates properly/index.js_.parsed.json b/...2. Iterates properly/index.js.before.json → .... Iterates properly/index.js_.parsed.json
diff --git a/...ts/4. For/3. Continue/index.js.after.json → ...s/4. For/3. Continue/index.js.parsed.json b/...ts/4. For/3. Continue/index.js.after.json → ...s/4. For/3. Continue/index.js.parsed.json
diff --git a/...s/4. For/3. Continue/index.js.before.json → .../4. For/3. Continue/index.js_.parsed.json b/...s/4. For/3. Continue/index.js.before.json → .../4. For/3. Continue/index.js_.parsed.json
diff --git a/.... SFC in discriminant/index.js.after.json → ... SFC in discriminant/index.js.parsed.json b/.... SFC in discriminant/index.js.after.json → ... SFC in discriminant/index.js.parsed.json
diff --git a/... SFC in discriminant/index.js.before.json → ...SFC in discriminant/index.js_.parsed.json b/... SFC in discriminant/index.js.before.json → ...SFC in discriminant/index.js_.parsed.json
diff --git a/...Switch/2. SFC in case/index.js.after.json → ...witch/2. SFC in case/index.js.parsed.json b/...Switch/2. SFC in case/index.js.after.json → ...witch/2. SFC in case/index.js.parsed.json
diff --git a/...witch/2. SFC in case/index.js.before.json → ...itch/2. SFC in case/index.js_.parsed.json b/...witch/2. SFC in case/index.js.before.json → ...itch/2. SFC in case/index.js_.parsed.json
diff --git a/...tch/8. In a try block/index.js.after.json → ...ch/8. In a try block/index.js.parsed.json b/...tch/8. In a try block/index.js.after.json → ...ch/8. In a try block/index.js.parsed.json
diff --git a/...ch/8. In a try block/index.js.before.json → ...h/8. In a try block/index.js_.parsed.json b/...ch/8. In a try block/index.js.before.json → ...h/8. In a try block/index.js_.parsed.json
diff --git a/.../8b. In a catch block/index.js.after.json → ...8b. In a catch block/index.js.parsed.json b/.../8b. In a catch block/index.js.after.json → ...8b. In a catch block/index.js.parsed.json
diff --git a/...8b. In a catch block/index.js.before.json → ...b. In a catch block/index.js_.parsed.json b/...8b. In a catch block/index.js.before.json → ...b. In a catch block/index.js_.parsed.json
diff --git a/...c. In a finally block/index.js.after.json → .... In a finally block/index.js.parsed.json b/...c. In a finally block/index.js.after.json → .... In a finally block/index.js.parsed.json
diff --git a/.... In a finally block/index.js.before.json → ... In a finally block/index.js_.parsed.json b/.... In a finally block/index.js.before.json → ... In a finally block/index.js_.parsed.json
diff --git a/.... For-in/1. Basic use/index.js.after.json → ... For-in/1. Basic use/index.js.parsed.json b/.... For-in/1. Basic use/index.js.after.json → ... For-in/1. Basic use/index.js.parsed.json
diff --git a/... For-in/1. Basic use/index.js.before.json → ...For-in/1. Basic use/index.js_.parsed.json b/... For-in/1. Basic use/index.js.before.json → ...For-in/1. Basic use/index.js_.parsed.json
diff --git a/... SFC in object clause/index.js.after.json → ...SFC in object clause/index.js.parsed.json b/... SFC in object clause/index.js.after.json → ...SFC in object clause/index.js.parsed.json
diff --git a/...SFC in object clause/index.js.before.json → ...FC in object clause/index.js_.parsed.json b/...SFC in object clause/index.js.before.json → ...FC in object clause/index.js_.parsed.json
diff --git a/...Part is single return/index.js.after.json → ...art is single return/index.js.parsed.json b/...Part is single return/index.js.after.json → ...art is single return/index.js.parsed.json
diff --git a/...art is single return/index.js.before.json → ...rt is single return/index.js_.parsed.json b/...art is single return/index.js.before.json → ...rt is single return/index.js_.parsed.json
diff --git a/...Part is single return/index.js.after.json → ...art is single return/index.js.parsed.json b/...Part is single return/index.js.after.json → ...art is single return/index.js.parsed.json
diff --git a/...art is single return/index.js.before.json → ...rt is single return/index.js_.parsed.json b/...art is single return/index.js.before.json → ...rt is single return/index.js_.parsed.json
diff --git a/...sions/1. Return value/index.js.after.json → ...ions/1. Return value/index.js.parsed.json b/...sions/1. Return value/index.js.after.json → ...ions/1. Return value/index.js.parsed.json
diff --git a/...ions/1. Return value/index.js.before.json → ...ons/1. Return value/index.js_.parsed.json b/...ions/1. Return value/index.js.before.json → ...ons/1. Return value/index.js_.parsed.json
diff --git a/... Semicolon expression/index.js.after.json → ...Semicolon expression/index.js.parsed.json b/... Semicolon expression/index.js.after.json → ...Semicolon expression/index.js.parsed.json
diff --git a/...Semicolon expression/index.js.before.json → ...emicolon expression/index.js_.parsed.json b/...Semicolon expression/index.js.before.json → ...emicolon expression/index.js_.parsed.json
diff --git a/...ns/3. Var initializer/index.js.after.json → ...s/3. Var initializer/index.js.parsed.json b/...ns/3. Var initializer/index.js.after.json → ...s/3. Var initializer/index.js.parsed.json
diff --git a/...s/3. Var initializer/index.js.before.json → .../3. Var initializer/index.js_.parsed.json b/...s/3. Var initializer/index.js.before.json → .../3. Var initializer/index.js_.parsed.json
diff --git a/...sions/4. If condition/index.js.after.json → ...ions/4. If condition/index.js.parsed.json b/...sions/4. If condition/index.js.after.json → ...ions/4. If condition/index.js.parsed.json
diff --git a/...ions/4. If condition/index.js.before.json → ...ons/4. If condition/index.js_.parsed.json b/...ions/4. If condition/index.js.before.json → ...ons/4. If condition/index.js_.parsed.json