Tests, bump version

Author: docd27

.gitignore

@@ -18,3 +18,4 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
+*.cpuprofile

CHANGES.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## 1.0.2 2021-05-07
+* Performance improvement (parser)
+
 ## 1.0.0 2021-05-05
 * Stable Release
 * Bug fixes

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-glsl-optimize",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Import GLSL source files as strings. Pre-processed, validated and optimized with Khronos Group SPIRV-Tools. Supports glslify.",
   "homepage": "https://github.com/docd27/rollup-plugin-glsl-optimize#readme",
   "keywords": [

package.json

@@ -1,8 +1,24 @@
 import {npmCommand} from '../../src/lib/tools.js';
+import {glslifyInit, glslifyProcessSource} from '../../src/lib/glslify.js';
 import {rollup} from 'rollup';
 import {assert} from 'chai';
 import * as fsSync from 'fs';
 
+const consoleOrig = global.console;
+let outBuf;
+function mockConsoleError() {
+  outBuf = '';
+  global.console = {...consoleOrig};
+  global.console.error = (...args) => {
+    outBuf += `${args.map(String).join(' ')}\n`;
+  };
+  global.console.warn = global.console.error;
+}
+function unMockConsoleError() {
+  global.console = consoleOrig;
+  return outBuf;
+}
+
 async function glslifyUninstall() {
   await npmCommand(['uninstall', 'glslify', 'glsl-noise']);
   assert.isFalse(fsSync.existsSync('node_modules/glslify'), 'glslify failed to uninstall');
@@ -13,7 +29,6 @@ async function glslifyInstall() {
   assert.isTrue(fsSync.existsSync('node_modules/glslify'), 'glslify failed to install');
 }
 
-
 /**
  * @param {typeof import('../../src/index.js').default} glslOptimize
  */
@@ -33,6 +48,14 @@ export function glslifyTests(glslOptimize) {
     this.timeout(30000);
     before('install glslify', glslifyInstall);
     after('uninstall glslify', glslifyUninstall);
+    it('should warn about glslify failing to find includes', async function() {
+      await glslifyInit();
+      mockConsoleError();
+      await glslifyProcessSource('does/not/exist/', '', {basedir: '/does/not/exist'}, (message) => {
+        throw new Error(message);
+      });
+      assert.include(unMockConsoleError(), 'glslify may fail to find includes');
+    });
     it('should pass with glslify enabled but unused', async function() {
       const bundle = await rollup({
         input: 'test/fixtures/basic.js',

test/tests/glslify.js

@@ -7,6 +7,7 @@ import {installTests} from './install.js';
 import {utilTests} from './util.js';
 import {parserTests} from './parser.js';
 import {preambleTests} from './preamble.js';
+import {minifyTests} from './minify.js';
 import {glslifyTests} from './glslify.js';
 import {shaderTests} from './shader.js';
 
@@ -29,6 +30,7 @@ export function runTests(glslOptimize) {
   utilTests();
   parserTests();
   preambleTests();
+  minifyTests();
   shaderTests(glslOptimize);
   glslifyTests(glslOptimize);
 }

test/tests/index.js

@@ -0,0 +1,23 @@
+import {assert} from 'chai';
+import {compressShader} from '../../src/lib/minify.js';
+
+export function minifyTests() {
+  describe('Minify', function() {
+    describe('#compressShader()', function() {
+      it('should minify basic', function() {
+        const input = `AAA;\n` +
+                      `\n` +
+                      `BBB;\n`;
+        const expected = `AAA;BBB;`;
+        assert.strictEqual(compressShader(input), expected);
+      });
+      it('should minify preprocessor directives', function() {
+        const input = `AAA;\n\n` +
+                      `#C\n` +
+                      `BBB;\n\n`;
+        const expected = `AAA;\n#C\nBBB;`;
+        assert.strictEqual(compressShader(input), expected);
+      });
+    });
+  });
+}

test/tests/minify.js

@@ -1,9 +1,54 @@
 import {rollup} from 'rollup';
 import {assert} from 'chai';
+import {glslProcessSource} from '../../src/lib/glslProcess.js';
 
+const consoleOrig = global.console;
+let outBuf;
+function mockConsoleError() {
+  outBuf = '';
+  global.console = {...consoleOrig};
+  global.console.error = (...args) => {
+    outBuf += `${args.map(String).join(' ')}\n`;
+  };
+  global.console.warn = global.console.error;
+}
+function unMockConsoleError() {
+  global.console = consoleOrig;
+  return outBuf;
+}
 
 /** @param {typeof import('../../src/index.js').default} glslOptimize */
 export function shaderTests(glslOptimize) {
+  describe('glslProcessSource', function() {
+    it('should warn about failing to find includes', async function() {
+      const input = `#version 300 es
+      precision mediump float;
+
+      in vec3 vpos;
+      out vec4 outColor;
+
+      void main() {
+        outColor = vec4(vpos, 1.0);
+      }`;
+
+      mockConsoleError();
+      await glslProcessSource('does/not/exist', input, 'frag');
+      assert.include(unMockConsoleError(), 'may fail to find includes');
+    });
+    it('should throw an error for GLSL < 300 es', async function() {
+      const input = `#version 100
+      precision mediump float;
+
+      in vec3 vpos;
+      out vec4 outColor;
+
+      void main() {
+        outColor = vec4(vpos, 1.0);
+      }`;
+
+      await assert.isRejected(glslProcessSource('.', input, 'frag'), /shaders version/);
+    });
+  });
   describe('Shader', function() {
     it('should throw an error with a .glsl lacking a shader stage file extension', async function() {
       assert.isRejected(rollup({