Modulify tests

dy · dy · commit 74d191d4b70f · 2023-01-30T10:36:12.000-05:00
diff --git a/index.js b/index.js
@@ -1,18 +1,17 @@
-'use strict'
 /**
  * Transform glsl to js.
  *
  * @module  glsl-js
  */
 
-var GLSL = require('./lib');
+import GLSL from './lib/index.cjs';
+
 
 //static bindings
-GLSL.compile =
-GLSL.string = function (str, opt) {
+export function compile (str, opt) {
 	return GLSL(opt).compile(str);
 };
 
-GLSL.stream = require('./stream');
+export * from './stream.cjs';
 
-module.exports = GLSL;
+export default GLSL
diff --git a/lib/builtins.cjs b/lib/builtins.cjs
diff --git a/lib/descriptor.cjs b/lib/descriptor.cjs
@@ -4,7 +4,7 @@
  *
  * @module  glsl-js/lib/descriptor
  */
-var types = require('./types');
+var types = require('./types.cjs');
 var pick = require('pick-by-alias');
 
 /**
diff --git a/lib/index.cjs b/lib/index.cjs
@@ -12,13 +12,13 @@
 var Emitter = require('events')
 var inherits = require('inherits')
 var assert = require('assert')
-var parse = require('./parse')
-var builtins = require('./builtins')
-var types = require('./types')
-var operators = require('./operators')
-var stdlib = require('./stdlib')
+var parse = require('./parse.cjs')
+var builtins = require('./builtins.cjs')
+var types = require('./types.cjs')
+var operators = require('./operators.cjs')
+var stdlib = require('./stdlib.cjs')
 var flatten = require('array-flatten')
-var Descriptor = require('./descriptor')
+var Descriptor = require('./descriptor.cjs')
 var prepr = require('prepr')
 
 var floatRE = /^-?[0-9]*(?:.[0-9]+)?(?:e-?[0-9]+)?$/i
diff --git a/lib/operators.cjs b/lib/operators.cjs
@@ -5,7 +5,7 @@
  * @module  glsl-js/lib/operators
  */
 
-var Descriptor = require('./descriptor');
+var Descriptor = require('./descriptor.cjs');
 
 var floatRE = RegExp('^' + require('float-regex').source + '$')
 
diff --git a/lib/parse.cjs b/lib/parse.cjs
diff --git a/lib/stdlib.cjs b/lib/stdlib.cjs
@@ -5,7 +5,7 @@
  * @module  glsl-js/lib/stdlib
  */
 
-var operators = require('./operators').operators;
+var operators = require('./operators.cjs').operators;
 
 // Returns the type of argument at index
 // If argIndex is not specified, assume the first argument
diff --git a/lib/types.cjs b/lib/types.cjs
@@ -17,7 +17,7 @@
  */
 
 
-var Descriptor = require('./descriptor');
+var Descriptor = require('./descriptor.cjs');
 
 // null type means any type
 // we keep single argument for float operations complacency
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "1.8.6",
   "description": "Transpile GLSL to JS",
   "main": "index.js",
+  "type": "module",
   "dependencies": {
     "array-flatten": "^2.0.0",
     "float-regex": "^1.0.0",
diff --git a/stream.cjs b/stream.cjs
@@ -6,8 +6,8 @@
  */
 
 var tokenize = require('glsl-tokenizer/string');
-var parse = require('./lib/parse');
-var GLSL = require('./lib');
+var parse = require('./lib/parse.cjs');
+var GLSL = require('./lib/index.cjs');
 var Transform = require('stream').Transform;
 var inherits = require('inherits');
 
diff --git a/test/api.js b/test/api.js
@@ -1,17 +1,15 @@
 
-var GLSL = require('../')
-var compile = GLSL.compile
-var TokenStream = require('glsl-tokenizer/stream')
-var ParseStream = require('glsl-parser/stream')
-var CompileStream = require('../stream')
-var test = require('tape')
-var StringStream = require('stream-array')
-var Sink = require('stream').Writable
-var clean = require('cln')
+import GLSL from '../index.js'
+import TokenStream from 'glsl-tokenizer/stream.js'
+import ParseStream from 'glsl-parser/stream.js'
+import CompileStream from '../stream.cjs'
+import test from 'tape'
+import StringStream from 'stream-array'
+import { Writable } from 'stream'
+import clean from 'cln'
 
 var compile = GLSL({})
 
-
 //examplary source, containing all possible tokens
 var source = `
 	precision mediump float;
@@ -158,7 +156,7 @@ test('Stream', function (t) {
 	})
 
 	//to release data
-	.pipe(Sink({
+	.pipe(Writable({
 		objectMode: true,
 		write: function (data, enc, cb) {
 			res += data + '\n';
diff --git a/test/benchmark.cjs b/test/benchmark.cjs
@@ -1,6 +1,6 @@
 var test = require('tst');
 var inherits = require('inherits');
-var lib = require('../lib/stdlib');
+var lib = require('../lib/stdlib.cjs');
 var glMat = require('gl-matrix');
 var ndarray = require('ndarray');
 
diff --git a/test/functions.js b/test/functions.js
@@ -1,9 +1,7 @@
-var test = require('tape')
-var GLSL = require('../')
-var compile = GLSL.compile
-var test = require('tape')
-var evaluate= require('./util/eval')
-var clean = require('cln')
+import test from 'tape'
+import GLSL, {compile} from '../index.js'
+import evaluate from './util/eval.js'
+import clean from 'cln'
 
 
 test.skip('Arguments', function (t) {
diff --git a/test/index.js b/test/index.js
@@ -1,10 +1,18 @@
-var GLSL = require('../')
-var compile = GLSL.compile
-var test = require('tape')
-var evaluate= require('./util/eval')
-var clean = require('cln')
-var glsl = require('glslify')
-
+import GLSL from '../index.js'
+import test from 'tape'
+import evaluate from './util/eval.js'
+import clean from 'cln'
+import glsl from 'glslify'
+
+import './functions.js'
+import './math.js'
+import './primitives.js'
+import './vectors.js'
+import './matrices.js'
+import './builtins.js'
+import './preprocessor.js'
+import './api.js'
+import './structs.js'
 
 var compile = GLSL({})
 
@@ -605,12 +613,3 @@ test('vec3 f() { return vec3(3.); } vec3 x = -f();', function (t) {
 // indexing (arrays only) [ ]
 
 
-require('./functions')
-require('./math')
-require('./primitives')
-require('./vectors')
-require('./matrices')
-require('./builtins')
-require('./preprocessor')
-require('./api')
-require('./structs')
diff --git a/test/math.js b/test/math.js
@@ -1,9 +1,9 @@
-var test = require('tape')
-var evaluate= require('./util/eval')
-var almost = require('./util/almost')
+import test from 'tape'
+import evaluate from './util/eval.js'
+import almost from './util/almost.js'
 
 // math
-var stdlib = require('../lib/stdlib')
+import stdlib from '../lib/stdlib.cjs'
 var mat4 = stdlib.mat4;
 var vec4 = stdlib.vec4;
 var pi2 = Math.PI * 2;
diff --git a/test/matrices.js b/test/matrices.js
@@ -1,5 +1,5 @@
-var test = require('tape')
-var evaluate= require('./util/eval');
+import test  from  'tape'
+import evaluate from  './util/eval.js'
 
 // constructors
 
diff --git a/test/preprocessor.js b/test/preprocessor.js
@@ -1,7 +1,6 @@
-var test = require('tape')
-var GLSL = require('../');
-var compile = GLSL.compile;
-var clean = require('cln')
+import test from 'tape'
+import {compile} from '../index.js'
+import clean from 'cln'
 
 test('Transform macro to commented', function (t) {
 	t.equal(clean(compile(`
diff --git a/test/primitives.js b/test/primitives.js
@@ -1,8 +1,7 @@
-var GLSL = require('../')
-var compile = GLSL.compile
-var test = require('tape')
-var evaluate= require('./util/eval')
-var clean = require('cln')
+import GLSL from '../index.js'
+import test from 'tape'
+import evaluate from './util/eval.js'
+import clean from 'cln'
 
 
 var compile = GLSL({})
@@ -92,7 +91,6 @@ test('bool(double)', function (t) {
 	t.equal(!!evaluate('+bool(123.4e100);'), true);
 	t.end()
 });
-var test= require('tape')
 
 // converts a signed integer value to a float
 test('float(int)', function (t) {
diff --git a/test/structs.js b/test/structs.js
@@ -1,8 +1,7 @@
-var GLSL = require('../')
-var compile = GLSL.compile
-var test = require('tape')
-var evaluate= require('./util/eval')
-var clean = require('cln')
+import GLSL from '../index.js'
+import test from 'tape'
+import evaluate from './util/eval.js'
+import clean from 'cln'
 
 var compile = GLSL({})
 
diff --git a/test/util/almost.js b/test/util/almost.js
@@ -1,6 +1,6 @@
-var al = require('almost-equal')
+import al from 'almost-equal'
 
-module.exports = function almost (a,b) {
+export default function almost (a,b) {
 	if (a.length) {
 		for (let i = 0; i < a.length; i++) {
 			if (!almost(a[i], b[i])) {
diff --git a/test/util/eval.js b/test/util/eval.js
@@ -2,9 +2,9 @@
  * Eval piece of glsl code
  */
 
-var GLSL = require('../../');
+import GLSL from '../../index.js';
 
-module.exports = function evaluate (str, opt, data) {
+export default function evaluate (str, opt, data) {
 	var strLines;
 
 	opt = opt || {};
diff --git a/test/vectors.js b/test/vectors.js
@@ -1,9 +1,9 @@
 //ref https://www.opengl.org/registry/doc/GLSLangSpec.4.40.pdf
-var test = require('tape')
-var GLSL = require('../');
-var almost = require('./util/almost');
-var evaluate= require('./util/eval');
-var clean = require('cln')
+import test from 'tape'
+import GLSL from '../index.js'
+import almost from './util/almost.js'
+import evaluate from './util/eval.js'
+import clean from 'cln'
 
 // constructors
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* @module glsl-js/lib/descriptor`
`6`	`6`	`*/`
`7`		`-var types = require('./types');`
	`7`	`+var types = require('./types.cjs');`
`8`	`8`	`var pick = require('pick-by-alias');`
`9`	`9`
`10`	`10`	`/**`