@strapi/typescript-utils 4.2.0-beta.2 → 4.3.0-beta.1

package/lib/admin/create-tsconfig-file.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs-extra');
+
+module.exports = async dest => {
+  const tsConfig = {
+    compilerOptions: {
+      lib: ['es2019', 'es2020.promise', 'es2020.bigint', 'es2020.string', 'DOM'],
+      noImplicitAny: false,
+      module: 'es2020',
+      target: 'es5',
+      jsx: 'react',
+      allowJs: true,
+      strict: true,
+      moduleResolution: 'node',
+      skipLibCheck: true,
+      esModuleInterop: true,
+      allowSyntheticDefaultImports: true,
+      resolveJsonModule: true,
+      noEmit: false,
+      incremental: true,
+    },
+    include: ['../../../src/admin/*', '../../../src/**/**/admin/src/*'],
+    exclude: ['node_modules', '**/*.test.js', '*.js'],
+  };
+
+  const filePath = path.join(dest, 'admin', 'src', 'tsconfig.json');
+
+  try {
+    await fs.ensureFile(filePath);
+
+    await fs.writeJSON(filePath, tsConfig, { spaces: 2 });
+  } catch (err) {
+    console.log(err);
+  }
+};

package/lib/admin/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const createTSConfigFile = require('./create-tsconfig-file');
+
+module.exports = { createTSConfigFile };

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/index.js

@@ -2,11 +2,13 @@
 
 const compile = require('./compile');
 const compilers = require('./compilers');
+const admin = require('./admin');
 const utils = require('./utils');
 
 module.exports = {
   compile,
   compilers,
+  admin,
 
   ...utils,
 };

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.2",
+  "version": "4.3.0-beta.1",
   "description": "Typescript support for Strapi",
   "keywords": [
     "strapi",
@@ -32,5 +32,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "bff73257e7695d6f361c91dda8cc810a2bb70b6e"
+  "gitHead": "9d6555398960c39159d66bb4eea3bcb0362e37e3"
 }

package/{lib/configs → tsconfigs}/server.json

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