@strapi/typescript-utils 4.2.0-beta.0 → 4.2.0-beta.3

package/lib/compile.js

@@ -2,16 +2,13 @@
 
 const compilers = require('./compilers');
 const getConfigPath = require('./utils/get-config-path');
-const copyResources = require('./utils/copy-resources');
 
-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);
-
-  await copyResources(srcDir);
+  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/admin.json

@@ -0,0 +1,20 @@
+{
+    "$schema": "https://json.schemastore.org/tsconfig",
+    
+    "compilerOptions": {
+        "module": "ES2020",
+        "moduleResolution": "node",
+        "lib": ["ES2020", "DOM"],
+        "target": "ES5",
+
+        "jsx": "react",
+        "sourceMap": true,
+        "incremental": true,
+
+        "allowJs": true,
+        "allowSyntheticDefaultImports": true,
+        "resolveJsonModule": true,
+        "noEmit": true,
+        "skipLibCheck": true
+    }
+}

package/lib/configs/server.json

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://json.schemastore.org/tsconfig",
+    
+    "compilerOptions": {
+        "module": "CommonJS",
+        "moduleResolution": "Node",
+        "lib": ["ES2020"],
+        "target": "ES2019",
+
+        "strict": false,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+
+        "incremental": true,
+        "esModuleInterop": true,
+        "resolveJsonModule": true,
+        "noEmitOnError": true
+    }
+}

package/lib/utils/get-config-path.js

@@ -2,8 +2,8 @@
 
 const ts = require('typescript');
 
-const DEFAULT_FILE_NAME = 'tsconfig-server.json';
+const DEFAULT_TS_CONFIG_FILENAME = 'tsconfig.json';
 
-module.exports = (dir, filename = DEFAULT_FILE_NAME) => {
+module.exports = (dir, filename = DEFAULT_TS_CONFIG_FILENAME) => {
   return ts.findConfigFile(dir, ts.sys.fileExists, filename);
 };

package/lib/utils/index.js

@@ -1,19 +1,19 @@
 'use strict';
 
-const isTypeScriptProject = require('./is-typescript-project');
-const isTypeScriptProjectSync = require('./is-typescript-project-sync');
+const isUsingTypeScript = require('./is-using-typescript');
+const isUsingTypeScriptSync = require('./is-using-typescript-sync');
 const getConfigPath = require('./get-config-path');
 const reportDiagnostics = require('./report-diagnostics');
 const resolveConfigOptions = require('./resolve-config-options');
-const copyResources = require('./copy-resources');
 const formatHost = require('./format-host');
+const resolveOutDir = require('./resolve-outdir');
 
 module.exports = {
-  isTypeScriptProject,
-  isTypeScriptProjectSync,
+  isUsingTypeScript,
+  isUsingTypeScriptSync,
   getConfigPath,
   reportDiagnostics,
   resolveConfigOptions,
-  copyResources,
   formatHost,
+  resolveOutDir,
 };

package/lib/utils/{is-typescript-project-sync.js → is-using-typescript-sync.js}

@@ -5,7 +5,7 @@ const fse = require('fs-extra');
 const getConfigPath = require('./get-config-path');
 
 /**
- * Checks if `dir` is a TypeScript directory (whether there is a tsconfig file or not)
+ * Checks if `dir` is a using TypeScript (whether there is a tsconfig file or not)
  * @param {string} dir
  * @param {string | undefined} filename
  * @returns {boolean}

package/lib/utils/{is-typescript-project.js → is-using-typescript.js}

@@ -5,7 +5,7 @@ const fse = require('fs-extra');
 const getConfigPath = require('./get-config-path');
 
 /**
- * Checks if `dir` is a TypeScript directory (whether there is a tsconfig file or not)
+ * Checks if `dir` is a using TypeScript (whether there is a tsconfig file or not)
  * @param {string} dir
  * @param {string | undefined} filename
  * @returns {Promise<boolean>}

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.0",
+  "version": "4.2.0-beta.3",
   "description": "Typescript support for Strapi",
   "keywords": [
     "strapi",
@@ -32,5 +32,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "db70f0de7cc73fb469c8a076b89530729cf14142"
+  "gitHead": "c4addbad6ecbc8ef7633bbba3806f3b0a2ae5f49"
 }

package/lib/utils/copy-resources.js

@@ -1,12 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fse = require('fs-extra');
-
-const DEFAULT_RESOURCES_PATHS = ['public', 'favicon.ico', 'package.json'];
-
-module.exports = async (dir, resources = DEFAULT_RESOURCES_PATHS) => {
-  await Promise.all(
-    resources.map(resourceName => fse.copy(resourceName, path.join(dir, 'dist', resourceName)))
-  );
-};