Add ts support

gulp/tsconfig.json

@@ -1,8 +1,8 @@
 {
     "compilerOptions": {
         /* Basic Options */
-        "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
+        "target": "ESNext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
-        "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+        "module": "ESNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
         // "lib": [],                             /* Specify library files to be included in the compilation. */
         "allowJs": true /* Allow javascript files to be compiled. */,
         "checkJs": true /* Report errors in .js files. */,

gulp/webpack.config.js

@@ -45,7 +45,25 @@ const moduleRules = [
         ],
     },
     {
-        test: /\.worker\.js$/,
+        test: /\.[jt]s$/,
+        use: [
+            {
+                loader: "ts-loader",
+
+                options: {
+                    configFile: resolve("../src/js/tsconfig.json"),
+                    onlyCompileBundledFiles: true,
+                    transpileOnly: true,
+                    experimentalWatchApi: true,
+                },
+            },
+        ],
+        resolve: {
+            fullySpecified: false,
+        },
+    },
+    {
+        test: /\.worker\.[jt]s$/,
         use: [
             {
                 loader: "worker-loader",
@@ -56,12 +74,6 @@ const moduleRules = [
             },
         ],
     },
-    {
-        test: /\.js$/,
-        resolve: {
-            fullySpecified: false,
-        },
-    },
 ];
 
 /** @type {import("webpack").Configuration} */
@@ -78,6 +90,8 @@ export default {
         alias: {
             "global-compression": resolve("../src/js/core/lzstring.js"),
         },
+        fullySpecified: false,
+        extensions: [".ts", ".js"],
     },
     devtool: "cheap-source-map",
     watch: true,

gulp/webpack.production.config.js

@@ -56,7 +56,25 @@ const moduleRules = [
         ],
     },
     {
-        test: /\.worker\.js$/,
+        test: /\.[jt]s$/,
+        use: [
+            {
+                loader: "ts-loader",
+
+                options: {
+                    configFile: resolve("../src/js/tsconfig.json"),
+                    onlyCompileBundledFiles: true,
+                    transpileOnly: true,
+                    experimentalWatchApi: true,
+                },
+            },
+        ],
+        resolve: {
+            fullySpecified: false,
+        },
+    },
+    {
+        test: /\.worker\.[jt]s$/,
         use: [
             {
                 loader: "worker-loader",
@@ -67,12 +85,6 @@ const moduleRules = [
             },
         ],
     },
-    {
-        test: /\.js$/,
-        resolve: {
-            fullySpecified: false,
-        },
-    },
 ];
 
 /** @type {import("webpack").Configuration} */
@@ -89,6 +101,8 @@ export default {
         alias: {
             "global-compression": resolve("../src/js/core/lzstring.js"),
         },
+        fullySpecified: false,
+        extensions: [".ts", ".js"],
     },
     stats: { optimizationBailout: true },
     devtool: false,

package.json

@@ -75,6 +75,7 @@
         "prettier": "^2.0.4",
         "strip-json-comments": "^3.0.1",
         "terser-webpack-plugin": "^5.3.6",
+        "ts-loader": "^9.4.2",
         "typescript": "3.9.3",
         "webpack": "^5.75.0",
         "webpack-deadcode-plugin": "^0.1.17",

src/js/tsconfig.json

@@ -1,59 +1,42 @@
 {
     "compilerOptions": {
         /* Basic Options */
-        "target": "es6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
+        "target": "es2017" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
-        "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
+        "module": "ESNext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
-        "lib": ["DOM", "ES2018"] /* Specify library files to be included in the compilation. */,
+        "lib": [
+            "DOM",
+            "DOM.Iterable",
+            "ESNext"
+        ] /* Specify library files to be included in the compilation. */,
         "allowJs": true /* Allow javascript files to be compiled. */,
         "checkJs": true /* Report errors in .js files. */,
-        // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+
-        // "declaration": true, /* Generates corresponding '.d.ts' file. */
+        /*
-        // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+            Without this, tsc complains that all the js inputs would overwrite themselves after being compiled
-        // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+            However, we are using webpack to compile things, so the default tsc output is never written to disk,
-        // "outFile": "./typedefs_gen",                       /* Concatenate and emit output to single file. */
+            instead it is emitted into the webpack bundle. Nothing is actually going to be written to ../../build,
-        // "outDir": "./typedefs_gen",                        /* Redirect output structure to the directory. */
+            but TSC thinks it is, which avoids these overwrite errors.
-        // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+        */
-        // "composite": true,                     /* Enable project compilation */
+        "outDir": "../../build_output" /* Redirect output structure to the directory. */,
-        // "incremental": true,                   /* Enable incremental compilation */
+
-        // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-        // "removeComments": true,                /* Do not emit comments to output. */
-        "noEmit": true /* Do not emit outputs. */,
-        // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-        // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-        // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
         /* Strict Type-Checking Options */
-        // "strict": true,                           /* Enable all strict type-checking options. */
-        // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-        // "strictNullChecks": true,              /* Enable strict null checks. */
         "strictFunctionTypes": true /* Enable strict checking of function types. */,
         "strictBindCallApply": true /* Enable strict 'bind', 'call', and 'apply' methods on functions. */,
-        // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
         "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */,
         "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
+
         /* Additional Checks */
-        // "noUnusedLocals": true,                /* Report errors on unused locals. */
-        // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-        // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
         "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */,
+
         /* Module Resolution Options */
         "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
-        // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-        // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-        // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-        // "typeRoots": [],                       /* List of folders to include type definitions from. */
-        // "types": [],                           /* Type declaration files to be included in compilation. */
-        // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
         "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
-        // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
-        /* Source Map Options */
-        // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-        // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-        // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-        // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
         /* Experimental Options */
-        // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+        "resolveJsonModule": true,
-        // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+        "skipLibCheck": true,
-        "resolveJsonModule": true
+        "skipDefaultLibCheck": true
     },
-    "exclude": ["webworkers"]
+    "include": ["./**/*.js", "./**/*.ts"],
+    "exclude": ["webworkers", "node_modules"]
 }

yarn.lock

@@ -1703,7 +1703,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2919,7 +2919,7 @@ engine.io@~6.2.1:
     engine.io-parser "~5.0.3"
     ws "~8.2.3"
 
-enhanced-resolve@^5.10.0:
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
   version "5.12.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
   integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
@@ -6476,7 +6476,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -8841,7 +8841,7 @@ semver@^6.0.0, semver@^6.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.3, semver@^7.3.2, semver@^7.3.5, semver@^7.3.7:
+semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
@@ -9848,6 +9848,16 @@ trim-repeated@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
+ts-loader@^9.4.2:
+  version "9.4.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.2.tgz#80a45eee92dd5170b900b3d00abcfa14949aeb78"
+  integrity sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==
+  dependencies:
+    chalk "^4.1.0"
+    enhanced-resolve "^5.0.0"
+    micromatch "^4.0.0"
+    semver "^7.3.4"
+
 tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"