support for glslify@2 :)

Author: hughsk

.gitignore

@@ -0,0 +1,4 @@
+node_modules
+*.log
+.DS_Store
+bundle.js

.npmignore

@@ -0,0 +1,9 @@
+node_modules
+*.log
+.DS_Store
+bundle.js
+test
+test.js
+demo
+example
+.npmignore

LICENSE.md

@@ -0,0 +1,10 @@
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2014 Hugh Kennedy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,6 +1,6 @@
 # glslify-import #
 
-A transform stream for [glslify](http://github.com/chrisdickinson/glslify)
+A transform stream for [glslify](http://github.com/stackgl/glslify)
 that adds an `import` directive to your shaders.
 
 ## Usage ##
@@ -9,7 +9,7 @@ Given a basic shader:
 
 ``` glsl
 // main.frag
-#pragma import: ./common.glsl
+#pragma glslify: import('./common.glsl')
 
 void main() {
   gl_FragColor = vec4(color, 1.0);

index.js

@@ -1,47 +1,46 @@
-var combine = require('stream-combiner')
-var glslify = require('glslify-stream')
-var concat = require('concat-stream')
-var map = require('map-stream')
-var fs = require('graceful-fs')
-var split = require('split')
-var eol = require('os').EOL
+const string   = require('glsl-token-string')
+const tokenize = require('glsl-tokenizer')
+const resolve  = require('glsl-resolve')
+const path     = require('path')
+const fs       = require('fs')
 
-module.exports = include
+module.exports = glslifyImport
 
-function include(file) {
-  var stream = combine(split(), map(write))
+function glslifyImport(file, src, opts, done) {
+  const tokens = tokenize(src)
 
-  return stream
+  var total = 0
 
-  function write(line, next) {
-    var cache = {}
-    var match
+  for (var i = 0; i < tokens.length; i++) (function(i) {
+    var token = tokens[i]
+    if (token.type !== 'preprocessor') return
 
-    line = String(line)
-    line = line.replace(/^\s*?#pragma\s+import\:(.+)$/g, function(full, name) {
-      match = name.trim()
-      return ''
-    })
+    var imported = /#pragma glslify:\s*import\(([^\)]+)\)/.exec(token.data)
+    if (!imported) return
+    if (!imported[1]) return
+
+    var target = imported[1]
+      .trim()
+      .replace(/^'|'$/g, '')
+      .replace(/^"|"$/g, '')
+
+    total++
+
+    resolve(target, {
+      basedir: path.dirname(file)
+    }, function(err, resolved) {
+      if (err) return done(err)
 
-    if (!match) return next(null, line + eol)
-
-    glslify.resolve(file, match, function(err, dest) {
-      if (err) return stream.emit('error', err)
-      if (cache[dest]) return next(null, cache[dest])
-
-      // Handle imports recursively too!
-      fs.createReadStream(dest)
-        .on('error', error)
-        .pipe(include(dest))
-        .on('error', error)
-        .pipe(concat(function(data) {
-          next(null, cache[dest] = data + eol)
-        }))
-        .on('error', error)
-
-      function error(err) {
-        return stream.emit('error', err)
-      }
+      fs.readFile(resolved, 'utf8', function(err, contents) {
+        if (err) return done(err)
+
+        token.data = contents
+        if (--total) return
+
+        done(null, string(tokens))
+      })
     })
-  }
+  })(i)
+
+  if (!total) return done(null, src)
 }

package.json

@@ -4,17 +4,17 @@
   "description": "A transform stream for glslify that adds an `import` directive to your shaders.",
   "main": "index.js",
   "dependencies": {
-    "map-stream": "0.0.3",
-    "split": "~0.2.10",
-    "stream-combiner": "0.0.2",
-    "concat-stream": "~1.0.1",
-    "glsl-deparser": "0.0.2",
-    "graceful-fs": "~2.0.1",
-    "glslify-stream": "0.0.1"
+    "glsl-resolve": "0.0.1",
+    "glsl-token-string": "^1.0.1",
+    "glsl-tokenizer": "^2.0.2"
+  },
+  "devDependencies": {
+    "glslify": "^2.1.2",
+    "tap-spec": "^3.0.0",
+    "tape": "^4.0.0"
   },
-  "devDependencies": {},
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node test | tap-spec"
   },
   "author": "Hugh Kennedy <hughskennedy@gmail.com> (http://hughskennedy.com/)",
   "license": "MIT",

test/fixtures/basic-import-1.glsl

@@ -0,0 +1 @@
+const float unaltered = 1.0;

test/fixtures/basic-import-2.glsl

@@ -0,0 +1 @@
+#pragma glslify: imported = require('./basic-require')

test/fixtures/basic-origin.glsl

@@ -0,0 +1,6 @@
+#pragma glslify: import('./basic-import-1.glsl')
+#pragma glslify: import('./basic-import-2.glsl')
+
+void main() {
+  gl_FragCoord = imported();
+}

test/fixtures/basic-require.glsl

@@ -0,0 +1,5 @@
+vec4 basicRequire() {
+  return vec4(1, 0, 0, 1);
+}
+
+#pragma glslify: export(basicRequire)

test/index.js

@@ -0,0 +1,16 @@
+const glslify = require('glslify')
+const path    = require('path')
+const test    = require('tape')
+const origin  = path.join(__dirname, 'fixtures', 'basic-origin.glsl')
+
+test('glslify-import', function(t) {
+  glslify.bundle(origin, {
+    transform: [ require.resolve('../index.js') ]
+  }, function(err, src) {
+    if (err) throw err
+
+    t.ok(/\sunaltered\s/.exec(src), 'unaltered variable is unaltered')
+    t.ok(/basicRequire/.exec(src), 'basic-require.glsl imported dependency is still included')
+    t.end()
+  })
+})