[AssemblyScript] porting source from JS to AS

.size-snapshot.json

@@ -5,8 +5,8 @@
     "gzipped": 13273
   },
   "dist\\gl-matrix-min.js": {
-    "bundled": 54440,
-    "minified": 54369,
-    "gzipped": 13854
+    "bundled": 54568,
+    "minified": 54478,
+    "gzipped": 13921
   }
 }

assembly/tsconfig.json

@@ -1,5 +1,8 @@
 {
   "extends": "assemblyscript/std/portable.json",
+  "exclude": [
+    "./**/*.spec.ts"
+  ],
   "include": [
     "./**/*.ts"
   ]

build/loader-debug.js

@@ -2,9 +2,9 @@ import wasm from './untouched.wasm';
 
 let modules;
 
-wasm({ ...imports }).then(({ instance }) => {
-  modules = instance.exports
-})
+wasm({ ...imports }).then(instance => {
+  modules = instance.exports;
+});
 
 export const {
   glMatrix,

build/loader-release.js

@@ -2,9 +2,9 @@ import wasm from './optimized.wasm';
 
 let modules;
 
-wasm({ ...imports }).then(({ instance }) => {
-  modules = instance.exports
-})
+wasm({ ...imports }).then(instance => {
+  modules = instance.exports;
+});
 
 export const {
   glMatrix,

loader/.gitignore

@@ -0,0 +1,2 @@
+*.js
+!index.js

loader/index.js

@@ -0,0 +1,14 @@
+import wasm from '../build/optimized.wasm';
+
+let modules;
+
+wasm({ ...imports }).then(instance => {
+  modules = instance.exports;
+});
+
+export const {
+  glMatrix,
+  mat2, mat2d, mat3, mat4,
+  quat, quat2,
+  vec2, vec3, vec4
+} = modules;

loader/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "module": "umd",
+    "outDir": "../dist/wasm",
+    "allowJs": true,                       
+    "checkJs": false
+  },
+  "exclude": ["index.js"]
+}

package.json

@@ -36,7 +36,8 @@
     "build-esm": "tsc --module es6 assembly/index.ts --outDir dist/esm",
     "build-cjs": "tsc --module commonjs assembly/index.ts -outDir dist/cjs",
     "build-dts": "tsc --declaration --emitDeclarationOnly --module amd --outFile ./dist/index.d.ts ./assembly/index.ts && node ./utils/bundle-dts.js && tsc --noEmit ./dist/index.d.ts",
-    "build": "del dist && npm run update-license-version && npm run asbuild && npm run build-umd && npm run build-esm && npm run build-cjs && npm run build-dts && node ./utils/build.js",
+    "build-loader": "node ./utils/build-loader.js && tsc -p loader/tsconfig.json",
+    "build": "del dist && npm run update-license-version && npm run build-loader && npm run asbuild && npm run build-umd && npm run build-esm && npm run build-cjs && npm run build-dts && node ./utils/build.js",
     "prepare": "npm run build",
     "asbuild:untouched": "asc assembly/index.ts --target debug",
     "asbuild:optimized": "asc assembly/index.ts --target release",

rollup.config.js

@@ -23,9 +23,17 @@ ${license}
 }
 
 export default [
+  {
+    input: './loader/index.js',
+    output: { file: 'dist/wasm/index.js', format: 'umd', name },
+    plugins: [
+      replace({ preventAssignment: true }),
+      wasm({ sourceMap: true }),
+    ]
+  },
   {
     input: './build/loader-debug.js',
-    output: { file: 'dist/wasm/gl-matrix-loader-debug.js', format: 'umd', name },
+    output: { file: 'dist/gl-matrix-loader-debug.js', format: 'umd', name },
     plugins: [
       replace({ preventAssignment: true }),
       wasm({ sourceMap: true }),
@@ -34,7 +42,7 @@ export default [
   },
   {
     input: './build/loader-release.js',
-    output: { file: 'dist/wasm/gl-matrix-loader-release.js', format: 'umd', name },
+    output: { file: 'dist/gl-matrix-loader-release.js', format: 'umd', name },
     plugins: [
       replace({ preventAssignment: true }),
       wasm({ sourceMap: true }),
@@ -46,7 +54,7 @@ export default [
     output: { file: 'dist/gl-matrix.js', format: 'umd', name },
     plugins: [
       replace({ preventAssignment: true }),
-      typescript(),
+      typescript({ tsconfig: 'assembly/tsconfig.json'}),
       bannerPlugin
     ]
   },
@@ -55,7 +63,7 @@ export default [
     output: { file: 'dist/gl-matrix-min.js', format: 'umd', name },
     plugins: [
       replace({ preventAssignment: true }),
-      typescript(),
+      typescript({ tsconfig: 'assembly/tsconfig.json'}),
       terser({
         output: { comments: /^!/ }
       }),

utils/build-loader.js

@@ -0,0 +1,44 @@
+const fs = require('fs');
+const path = require('path');
+
+const inputDir = 'assembly';
+const outputDir = 'loader';
+
+let declarations = new Set();
+
+let content;
+
+fs.readdirSync(inputDir)
+  .filter(file => 
+    file.includes('.ts') &&
+    !file.includes('import') &&
+    !file.includes('index') &&
+    !file.includes('math') &&
+    !file.includes('d.ts') &&
+    !file.includes('_tests_'))
+  .forEach(file => {
+    const fileName = file.split('.')[0];
+    let moduleName = fileName;
+    if (file.includes('common')) {
+      moduleName = 'glMatrix';
+    }
+    content = `import { ${moduleName} } from './index.js'\n\nexport const {\n`;
+    console.log(`Searching for exported functions and objects in file ${path.join(inputDir, file)}...`);
+    fs.readFileSync(path.join(inputDir, file)).toString().split('\n').forEach(line => {
+      if (line.match(/export.+(function|var).[a-z]+.+[;\{]/g) !== null) {
+        declarations.add(line.replace(/export.+(function|var).([a-z]+).+[;\{\r]/g, "$2"));
+      }
+    });
+
+    declarations.forEach((value, value2, set) => {
+      if (value != 'min' && value != 'max') {
+        content += `  ${value},\n`;
+      }
+    });
+    content += `\} = ${moduleName};\n`;
+
+    console.log(`Found ${declarations.size ?? 0} exports.`);
+
+    loader = fs.writeFileSync(path.join(outputDir, fileName + '.js'), content);
+    console.log(`Exports are being written to file ${path.join(outputDir, fileName + '.js')}\n`);
+  });

utils/build.js

@@ -18,9 +18,15 @@ copyFileSync('README.md', 'dist/README.md');
 copyFileSync('LICENSE.md', 'dist/LICENSE.md');
 
 const files = fs.readdirSync('assembly')
-  .filter(file => !file.includes('common') && !file.includes('index'))
+  .filter(file =>
+    !file.includes('_tests_') &&
+    !file.includes('.json') &&
+    !file.includes('import') &&
+    !file.includes('math') &&
+    !file.includes('common') && !file.includes('index'))
   .forEach(file => {
-    const name = file.endsWith('.js') ? file.slice(0, -3) : file;
+    const name = file.endsWith('.ts') ? file.slice(0, -3) : file;
+    file = file.slice(0, -3) + '.js';
     const filePkg = {
       name: `gl-matrix/${name}`,
       main: `../cjs/${file}`,