@strapi/typescript-utils 4.2.0-beta.1 → 4.2.0-beta.4

package/lib/compile.js

@@ -3,12 +3,12 @@
 const compilers = require('./compilers');
 const getConfigPath = require('./utils/get-config-path');
 
-module.exports = async (srcDir, { watch = false } = {}) => {
+module.exports = async (srcDir, { watch = false, configOptions = {} } = {}) => {
   // TODO: Use the Strapi debug logger instead or don't log at all
   console.log(`Starting the compilation for TypeScript files in ${srcDir}`);
 
   const compiler = watch ? compilers.watch : compilers.basic;
   const configPath = getConfigPath(srcDir);
 
-  compiler.run(configPath);
+  compiler.run(configPath, configOptions);
 };

package/lib/compilers/basic.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const ts = require('typescript');
+const { merge } = require('lodash');
 
 const reportDiagnostics = require('../utils/report-diagnostics');
 const resolveConfigOptions = require('../utils/resolve-config-options');
@@ -9,15 +10,18 @@ module.exports = {
   /**
    * Default TS -> JS Compilation for Strapi
    * @param {string} tsConfigPath
+   * @param {Object} configOptions
+   * @param {Array.<string>} configOptions.fileNames
+   * @param {Object} configOptions.options
    */
-  run(tsConfigPath) {
+  run(tsConfigPath, configOptions = {}) {
     // Parse the tsconfig.json file & resolve the configuration options
     const { fileNames, options, projectReferences } = resolveConfigOptions(tsConfigPath);
 
     const program = ts.createProgram({
-      rootNames: fileNames,
+      rootNames: configOptions.fileNames ? configOptions.fileNames : fileNames,
       projectReferences,
-      options,
+      options: merge(options, configOptions.options),
     });
 
     const emitResults = program.emit();

package/lib/configs/server.json

@@ -11,6 +11,7 @@
         "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true,
 
+        "incremental": true,
         "esModuleInterop": true,
         "resolveJsonModule": true,
         "noEmitOnError": true

package/lib/utils/index.js

@@ -6,6 +6,7 @@ const getConfigPath = require('./get-config-path');
 const reportDiagnostics = require('./report-diagnostics');
 const resolveConfigOptions = require('./resolve-config-options');
 const formatHost = require('./format-host');
+const resolveOutDir = require('./resolve-outdir');
 
 module.exports = {
   isUsingTypeScript,
@@ -14,4 +15,5 @@ module.exports = {
   reportDiagnostics,
   resolveConfigOptions,
   formatHost,
+  resolveOutDir,
 };

package/lib/utils/resolve-outdir.js

@@ -0,0 +1,17 @@
+'use strict';
+const path = require('path');
+const resolveConfigOptions = require('./resolve-config-options');
+const isUsingTypescript = require('./is-using-typescript');
+
+const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json';
+/**
+ * Gets the outDir value from config file (tsconfig)
+ * @param {string} dir
+ * @param {string | undefined} configFilename
+ * @returns {string | undefined}
+ */
+module.exports = async (dir, configFilename = DEFAULT_TS_CONFIG_FILENAME) => {
+  return (await isUsingTypescript(dir))
+    ? resolveConfigOptions(path.join(dir, configFilename)).options.outDir
+    : undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/typescript-utils",
-  "version": "4.2.0-beta.1",
+  "version": "4.2.0-beta.4",
   "description": "Typescript support for Strapi",
   "keywords": [
     "strapi",
@@ -32,5 +32,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "4fa2804f35e15ed72dfd309fb5bb1c4dba18932f"
+  "gitHead": "5caff35a30e33b7a660eb946299f9e3d2d35b2b8"
 }