fix: handle defualt exports properly in secondary exports (#16)

ForbesLindesay · May 10, 2019 · 680ed3a · 680ed3a
1 parent 8c3c330
commit 680ed3a
Show file tree

Hide file tree

Showing 13 changed files with 941 additions and 15 deletions.
diff --git a/packages/mysql-test/jest/globalSetup.d.ts b/packages/mysql-test/jest/globalSetup.d.ts
@@ -1,3 +1,6 @@
 // @autogenerated
 
-export * from '../lib/jest/globalSetup';
+import def from '../lib/jest/globalSetup';
+
+export default def;
+export * from '../lib/jest/globalSetup';
diff --git a/packages/mysql-test/jest/globalTeardown.d.ts b/packages/mysql-test/jest/globalTeardown.d.ts
@@ -1,3 +1,5 @@
 // @autogenerated
 
-export * from '../lib/jest/globalTeardown';
+import def from '../lib/jest/globalTeardown';
+
+export default def;
diff --git a/packages/mysql-test/package.json b/packages/mysql-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@databases/mysql-test",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/packages/mysql-test/src/jest/globalSetup.ts b/packages/mysql-test/src/jest/globalSetup.ts
@@ -9,12 +9,12 @@ const DEFAULT_ENV_VAR =
 
 export const killers: Array<() => Promise<void>> = [];
 
-module.exports = async (
+export default async function setup(
   opts: Partial<Options> & {
     environmentVariable?: string;
     migrationsScript?: string[];
   } = {},
-) => {
+) {
   const envVar: string = opts.environmentVariable || DEFAULT_ENV_VAR;
   const migrationsScript =
     opts.migrationsScript ||
@@ -40,6 +40,8 @@ module.exports = async (
     delete process.env[envVar];
     await kill();
   });
-};
+}
 
+module.exports = setup;
+module.exports.default = setup;
 module.exports.killers = killers;
diff --git a/packages/mysql-test/src/jest/globalTeardown.ts b/packages/mysql-test/src/jest/globalTeardown.ts
@@ -2,6 +2,9 @@
 
 import {killers} from './globalSetup';
 
-module.exports = async () => {
+export default async function teardown() {
   await Promise.all(killers.map(async kill => await kill()));
-};
+}
+
+module.exports = teardown;
+module.exports.default = teardown;
diff --git a/packages/pg-migrations/build-package.d.ts b/packages/pg-migrations/build-package.d.ts
@@ -1,3 +1,6 @@
 // @autogenerated
 
-export * from './lib/build-package';
+import def from './lib/build-package';
+
+export default def;
+export * from './lib/build-package';
diff --git a/packages/pg-migrations/getID.d.ts b/packages/pg-migrations/getID.d.ts
@@ -1,3 +1,5 @@
 // @autogenerated
 
-export * from './lib/getID';
+import def from './lib/getID';
+
+export default def;
diff --git a/packages/pg-migrations/package.json b/packages/pg-migrations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@databases/pg-migrations",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/packages/pg-test/jest/globalSetup.d.ts b/packages/pg-test/jest/globalSetup.d.ts
@@ -1,3 +1,6 @@
 // @autogenerated
 
-export * from '../lib/jest/globalSetup';
+import def from '../lib/jest/globalSetup';
+
+export default def;
+export * from '../lib/jest/globalSetup';
diff --git a/packages/pg-test/jest/globalTeardown.d.ts b/packages/pg-test/jest/globalTeardown.d.ts
@@ -1,3 +1,5 @@
 // @autogenerated
 
-export * from '../lib/jest/globalTeardown';
+import def from '../lib/jest/globalTeardown';
+
+export default def;
diff --git a/packages/pg-test/package.json b/packages/pg-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@databases/pg-test",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/scripts/build.js b/scripts/build.js
@@ -104,6 +104,10 @@ lsrSync(cwd + '/lib').forEach(entry => {
       unlinkSync(entry.fullPath);
     }
     if (isPublic) {
+      const definition = readFileSync(
+        entry.fullPath.replace(/\.jsx?$/, '.d.ts'),
+        'utf8',
+      );
       const publicFilename = resolve(
         cwd + '/' + entry.path.substr(2).replace(/\.jsx$/, '.js'),
       );
@@ -119,9 +123,18 @@ lsrSync(cwd + '/lib').forEach(entry => {
         publicFilename,
         "// @autogenerated\n\nmodule.exports = require('" + requirePath + "');",
       );
+      const hasDefaultExport = /export default/.test(definition);
+      const hasNamedExport = /export (?:[^d]|d[^e]|de[^f]|def[^a]|defa[^u]|defau[^l]|defaul[^t]|default[^ ])/.test(
+        definition,
+      );
+
       writeFileSync(
         publicFilename.replace(/\.jsx?$/, '.d.ts'),
-        "// @autogenerated\n\nexport * from '" + requirePath + "';",
+        `// @autogenerated\n\n${
+          hasDefaultExport ? `import def from '${requirePath}';\n\n` : ''
+        }${hasDefaultExport ? `export default def;\n` : ''}${
+          hasNamedExport ? `export * from '${requirePath}';\n` : ''
+        }`,
       );
     }
   }