@oriflame/config-typescript 5.1.11 → 5.1.12-alpha.6

package/dts/index.d.ts

@@ -1,19 +1,19 @@
-import type { TypeScriptConfig } from '@beemo/driver-typescript';
-export interface TypeScriptOptions {
-    sourceMaps?: boolean;
-    library?: boolean;
-    future?: boolean;
-    react?: boolean;
-    srcFolder: string;
-    typesFolder: string;
-    workspaces?: boolean;
-    allowJs?: boolean;
-    includeTests?: boolean;
-    declarationDir?: string;
-    emitDeclarationOnly?: boolean;
-    skipLibCheck?: boolean;
-    buildFolder?: string;
-}
-export declare function getCompilerOptions({ library, future, react, srcFolder, allowJs, skipLibCheck, sourceMaps, emitDeclarationOnly, declarationDir, buildFolder, workspaces, }: Partial<TypeScriptOptions>): import("@beemo/driver-typescript").CompilerOptions;
-export declare function getConfig(options: TypeScriptOptions): TypeScriptConfig;
+import type { TypeScriptConfig } from '@beemo/driver-typescript';
+export interface TypeScriptOptions {
+    sourceMaps?: boolean;
+    library?: boolean;
+    future?: boolean;
+    react?: boolean;
+    srcFolder: string;
+    typesFolder: string;
+    workspaces?: boolean;
+    allowJs?: boolean;
+    includeTests?: boolean;
+    testsFolder: string;
+    declarationDir?: string;
+    emitDeclarationOnly?: boolean;
+    skipLibCheck?: boolean;
+}
+export declare function getCompilerOptions({ library, future, react, srcFolder, allowJs, skipLibCheck, sourceMaps, emitDeclarationOnly, declarationDir, includeTests, workspaces, }: Partial<TypeScriptOptions>): import("@beemo/driver-typescript").CompilerOptions;
+export declare function getConfig(options: TypeScriptOptions): TypeScriptConfig;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -1,11 +1,5 @@
 'use strict';
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
@@ -26,7 +20,7 @@ function getCompilerOptions({
   sourceMaps = true,
   emitDeclarationOnly = false,
   declarationDir = 'dts',
-  buildFolder,
+  includeTests,
   workspaces
 }) {
   if (workspaces) {
@@ -34,7 +28,7 @@ function getCompilerOptions({
   } // Do we need isolated modules?
 
 
-  compilerOptions.isolatedModules = future && library;
+  compilerOptions.isolatedModules = future && library && !includeTests;
   compilerOptions.useDefineForClassFields = future && process.env.NODE_ENV === 'development';
   compilerOptions.allowJs = allowJs;
   compilerOptions.skipLibCheck = skipLibCheck;
@@ -54,15 +48,17 @@ function getCompilerOptions({
     };
   }
 
-  if (!workspaces) {
-    compilerOptions.outDir = `./${buildFolder}`;
+  if (!workspaces && library) {
+    compilerOptions.declarationDir = declarationDir;
   }
 
-  if (library && !workspaces) {
-    compilerOptions.composite = true;
-    compilerOptions.declarationDir = `./${declarationDir}`;
+  if (!workspaces) {
+    compilerOptions.outDir = declarationDir;
+    compilerOptions.rootDir = srcFolder;
   }
 
+  compilerOptions.composite = library && !workspaces;
+
   if (sourceMaps) {
     compilerOptions.sourceMap = true;
     compilerOptions.declarationMap = true;
@@ -73,10 +69,10 @@ function getCompilerOptions({
 
 function getConfig(options) {
   const workspaces = options.workspaces,
-        library = options.library,
         srcFolder = options.srcFolder,
         typesFolder = options.typesFolder,
-        buildFolder = options.buildFolder;
+        includeTests = options.includeTests,
+        testsFolder = options.testsFolder;
 
   if (workspaces) {
     return {
@@ -84,13 +80,17 @@ function getConfig(options) {
     };
   }
 
-  return {
-    compilerOptions: _objectSpread(_objectSpread({}, getCompilerOptions(options)), library && {
-      outDir: buildFolder
-    }),
+  const tsconfig = {
+    compilerOptions: getCompilerOptions(options),
     include: [`./${srcFolder}/**/*`, `./${typesFolder}/**/*`],
     exclude: ['**/node_modules/*']
   };
+
+  if (includeTests) {
+    tsconfig.include.push(`./${testsFolder}/**/*`);
+  }
+
+  return tsconfig;
 }
 
 exports.getCompilerOptions = getCompilerOptions;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":null,"names":["config","require","compilerOptions","getCompilerOptions","library","future","react","srcFolder","allowJs","skipLibCheck","sourceMaps","emitDeclarationOnly","declarationDir","buildFolder","workspaces","Object","assign","isolatedModules","useDefineForClassFields","process","env","NODE_ENV","declaration","lib","jsx","baseUrl","paths","ALIAS_PATTERN","outDir","composite","sourceMap","declarationMap","getConfig","options","typesFolder","include","exclude"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/index.ts"],"sourcesContent":null,"names":["config","require","compilerOptions","getCompilerOptions","library","future","react","srcFolder","allowJs","skipLibCheck","sourceMaps","emitDeclarationOnly","declarationDir","includeTests","workspaces","Object","assign","isolatedModules","useDefineForClassFields","process","env","NODE_ENV","declaration","lib","jsx","baseUrl","paths","ALIAS_PATTERN","outDir","rootDir","composite","sourceMap","declarationMap","getConfig","options","typesFolder","testsFolder","tsconfig","include","exclude","push"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oriflame/config-typescript",
-  "version": "5.1.11",
+  "version": "5.1.12-alpha.6+7ad8f2ff",
   "description": "Reusable typescript config.",
   "keywords": [
     "lumos",
@@ -28,8 +28,8 @@
     "src/**/*.{ts,tsx,json}"
   ],
   "dependencies": {
-    "@oriflame/lumos-common": "^5.1.11",
-    "tsconfig-oriflame": "^5.1.11"
+    "@oriflame/lumos-common": "^5.1.12-alpha.6+7ad8f2ff",
+    "tsconfig-oriflame": "^5.1.12-alpha.6+7ad8f2ff"
   },
   "devDependencies": {
     "@beemo/core": "^2.1.3",
@@ -45,5 +45,5 @@
     "format": "lib",
     "platform": "node"
   },
-  "gitHead": "9de0434681490c0e307d6de006e3a06d08c774e7"
+  "gitHead": "7ad8f2ff2ecf20b1227078cc0e992f354a01788c"
 }

package/src/index.ts

@@ -15,10 +15,10 @@ export interface TypeScriptOptions {
   workspaces?: boolean;
   allowJs?: boolean;
   includeTests?: boolean;
+  testsFolder: string;
   declarationDir?: string;
   emitDeclarationOnly?: boolean;
   skipLibCheck?: boolean;
-  buildFolder?: string;
 }
 
 export function getCompilerOptions({
@@ -31,7 +31,7 @@ export function getCompilerOptions({
   sourceMaps = true,
   emitDeclarationOnly = false,
   declarationDir = 'dts',
-  buildFolder,
+  includeTests,
   workspaces,
 }: Partial<TypeScriptOptions>) {
   if (workspaces) {
@@ -41,7 +41,7 @@ export function getCompilerOptions({
     );
   }
   // Do we need isolated modules?
-  compilerOptions.isolatedModules = future && library;
+  compilerOptions.isolatedModules = future && library && !includeTests;
   compilerOptions.useDefineForClassFields = future && process.env.NODE_ENV === 'development';
   compilerOptions.allowJs = allowJs;
   compilerOptions.skipLibCheck = skipLibCheck;
@@ -59,15 +59,17 @@ export function getCompilerOptions({
     };
   }
 
-  if (!workspaces) {
-    compilerOptions.outDir = `./${buildFolder}`;
+  if (!workspaces && library) {
+    compilerOptions.declarationDir = declarationDir;
   }
 
-  if (library && !workspaces) {
-    compilerOptions.composite = true;
-    compilerOptions.declarationDir = `./${declarationDir}`;
+  if (!workspaces) {
+    compilerOptions.outDir = declarationDir;
+    compilerOptions.rootDir = srcFolder;
   }
 
+  compilerOptions.composite = library && !workspaces;
+
   if (sourceMaps) {
     compilerOptions.sourceMap = true;
     compilerOptions.declarationMap = true;
@@ -77,19 +79,22 @@ export function getCompilerOptions({
 }
 
 export function getConfig(options: TypeScriptOptions): TypeScriptConfig {
-  const { workspaces, library, srcFolder, typesFolder, buildFolder } = options;
+  const { workspaces, srcFolder, typesFolder, includeTests, testsFolder } = options;
   if (workspaces) {
     return {
       compilerOptions: getCompilerOptions(options),
     };
   }
 
-  return {
-    compilerOptions: {
-      ...getCompilerOptions(options),
-      ...(library && { outDir: buildFolder }),
-    },
+  const tsconfig = {
+    compilerOptions: getCompilerOptions(options),
     include: [`./${srcFolder}/**/*`, `./${typesFolder}/**/*`],
     exclude: ['**/node_modules/*'],
   };
+
+  if (includeTests) {
+    tsconfig.include.push(`./${testsFolder}/**/*`);
+  }
+
+  return tsconfig;
 }