refactor: add support __esModule expose && named expose

Author: cap-Bernardito

src/index.js

@@ -11,6 +11,8 @@ import validateOptions from 'schema-utils';
 
 import schema from './options.json';
 
+import getExposes from './utils';
+
 export default function loader(content, sourceMap) {
   const options = getOptions(this);
 
@@ -21,6 +23,17 @@ export default function loader(content, sourceMap) {
 
   const callback = this.async();
 
+  let exposes;
+
+  try {
+    exposes = getExposes(options.exposes);
+  } catch (error) {
+    this.emitError(error);
+    callback(null, content, sourceMap);
+
+    return;
+  }
+
   // Change the request from an /abolute/path.js to a relative ./path.js
   // This prevents [chunkhash] values from changing when running webpack
   // builds in different directories.
@@ -35,10 +48,6 @@ export default function loader(content, sourceMap) {
    */
   this._module.userRequest = `${this._module.userRequest}-exposed`;
 
-  const exposes = Array.isArray(options.exposes)
-    ? options.exposes
-    : [options.exposes];
-
   let code = `var ___EXPOSE_LOADER_IMPORT___ = require(${JSON.stringify(
     `-!${newRequestPath}`
   )});\n`;
@@ -47,13 +56,15 @@ export default function loader(content, sourceMap) {
     require.resolve('./runtime/getGlobalThis.js')
   )});\n`;
   code += `var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();\n`;
-  code += `var ___EXPOSE_LOADER_IMPORT_DEFAULT___ = ___EXPOSE_LOADER_IMPORT___.__esModule
-  ? ___EXPOSE_LOADER_IMPORT___.default\n || ___EXPOSE_LOADER_IMPORT___\n
-  : ___EXPOSE_LOADER_IMPORT___\n`;
 
   for (const expose of exposes) {
-    const childProperties = expose.split('.');
+    const childProperties = expose.globalName.split('.');
     const { length } = childProperties;
+    const { packageName } = expose;
+
+    if (typeof packageName !== 'undefined') {
+      code += `var ___EXPOSE_LOADER_IMPORT_NAMED___ = ___EXPOSE_LOADER_IMPORT___.${packageName}\n`;
+    }
 
     let propertyString = '___EXPOSE_LOADER_GLOBAL_THIS___';
 
@@ -65,10 +76,11 @@ export default function loader(content, sourceMap) {
       propertyString += `[${JSON.stringify(childProperties[i])}]`;
     }
 
-    code += `${propertyString} = ___EXPOSE_LOADER_IMPORT_DEFAULT___;\n`;
+    code +=
+      typeof packageName !== 'undefined'
+        ? `${propertyString} = ___EXPOSE_LOADER_IMPORT_NAMED___;\n`
+        : `${propertyString} = ___EXPOSE_LOADER_IMPORT___;\n`;
   }
 
-  code += `module.exports = ___EXPOSE_LOADER_IMPORT___;`;
-
-  callback(null, `${code}`, sourceMap);
+  callback(null, `${content}\n${code}`, sourceMap);
 }

src/utils.js

@@ -0,0 +1,32 @@
+function resolveExposes(item) {
+  let result;
+
+  if (typeof item === 'string') {
+    const splittedItem = item.split(' ');
+
+    if (splittedItem.length > 2) {
+      throw new Error(`Invalid "${item}" for expose`);
+    }
+
+    result = {
+      globalName: splittedItem[0],
+      packageName: splittedItem[1],
+    };
+  }
+
+  return result;
+}
+
+function getExposes(items) {
+  let result = [];
+
+  if (typeof imports === 'string') {
+    result.push(resolveExposes(items));
+  } else {
+    result = [].concat(items).map((item) => resolveExposes(item));
+  }
+
+  return result;
+}
+
+export default getExposes;

test/__snapshots__/loader.test.js.snap

@@ -3,17 +3,16 @@
 exports[`loader should work for a nested property for a global object: errors 1`] = `Array []`;
 
 exports[`loader should work for a nested property for a global object: module 1`] = `
-"var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
+"const globalObject4 = { foo: 'bar' };
+
+module.exports = globalObject4;
+
+var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
 var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(\\"../../src/runtime/getGlobalThis.js\\");
 var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();
-var ___EXPOSE_LOADER_IMPORT_DEFAULT___ = ___EXPOSE_LOADER_IMPORT___.__esModule
-  ? ___EXPOSE_LOADER_IMPORT___.default
- || ___EXPOSE_LOADER_IMPORT___
-
-  : ___EXPOSE_LOADER_IMPORT___
 if (!___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"]) ___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = {};
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"][\\"nested\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
-module.exports = ___EXPOSE_LOADER_IMPORT___;"
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"][\\"nested\\"] = ___EXPOSE_LOADER_IMPORT___;
+"
 `;
 
 exports[`loader should work for a nested property for a global object: result 1`] = `
@@ -31,25 +30,25 @@ Object {
 
 exports[`loader should work for a nested property for a global object: warnings 1`] = `Array []`;
 
-exports[`loader should work for nested preporties for a global object: errors 1`] = `Array []`;
+exports[`loader should work for nested properties for a global object: errors 1`] = `Array []`;
 
-exports[`loader should work for nested preporties for a global object: module 1`] = `
-"var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
+exports[`loader should work for nested properties for a global object: module 1`] = `
+"const globalObject4 = { foo: 'bar' };
+
+module.exports = globalObject4;
+
+var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
 var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(\\"../../src/runtime/getGlobalThis.js\\");
 var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();
-var ___EXPOSE_LOADER_IMPORT_DEFAULT___ = ___EXPOSE_LOADER_IMPORT___.__esModule
-  ? ___EXPOSE_LOADER_IMPORT___.default
- || ___EXPOSE_LOADER_IMPORT___
-
-  : ___EXPOSE_LOADER_IMPORT___
 if (!___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"]) ___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = {};
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"][\\"nested\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"][\\"nested\\"] = ___EXPOSE_LOADER_IMPORT___;
+var ___EXPOSE_LOADER_IMPORT_NAMED___ = ___EXPOSE_LOADER_IMPORT___.foo
 if (!___EXPOSE_LOADER_GLOBAL_THIS___[\\"myOtherGlobal\\"]) ___EXPOSE_LOADER_GLOBAL_THIS___[\\"myOtherGlobal\\"] = {};
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myOtherGlobal\\"][\\"nested\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
-module.exports = ___EXPOSE_LOADER_IMPORT___;"
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myOtherGlobal\\"][\\"nested\\"] = ___EXPOSE_LOADER_IMPORT_NAMED___;
+"
 `;
 
-exports[`loader should work for nested preporties for a global object: result 1`] = `
+exports[`loader should work for nested properties for a global object: result 1`] = `
 Object {
   "ExposeLoader": Object {
     "foo": "bar",
@@ -60,28 +59,25 @@ Object {
     },
   },
   "myOtherGlobal": Object {
-    "nested": Object {
-      "foo": "bar",
-    },
+    "nested": "bar",
   },
 }
 `;
 
-exports[`loader should work for nested preporties for a global object: warnings 1`] = `Array []`;
+exports[`loader should work for nested properties for a global object: warnings 1`] = `Array []`;
 
 exports[`loader should work from esModule export: errors 1`] = `Array []`;
 
 exports[`loader should work from esModule export: module 1`] = `
-"var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-module-default-export.js\\");
+"const globalObject5 = { foo: 'bar' };
+
+export default globalObject5;
+
+var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-module-default-export.js\\");
 var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(\\"../../src/runtime/getGlobalThis.js\\");
 var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();
-var ___EXPOSE_LOADER_IMPORT_DEFAULT___ = ___EXPOSE_LOADER_IMPORT___.__esModule
-  ? ___EXPOSE_LOADER_IMPORT___.default
- || ___EXPOSE_LOADER_IMPORT___
-
-  : ___EXPOSE_LOADER_IMPORT___
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
-module.exports = ___EXPOSE_LOADER_IMPORT___;"
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = ___EXPOSE_LOADER_IMPORT___;
+"
 `;
 
 exports[`loader should work from esModule export: result 1`] = `
@@ -92,27 +88,82 @@ Object {
     },
   },
   "myGlobal": Object {
-    "foo": "bar",
+    "default": Object {
+      "foo": "bar",
+    },
   },
 }
 `;
 
 exports[`loader should work from esModule export: warnings 1`] = `Array []`;
 
+exports[`loader should work string config: errors 1`] = `Array []`;
+
+exports[`loader should work string config: module 1`] = `
+"const globalObject6 = { foo: 'bar' };
+const globalObject7 = { bar: 'foo' };
+
+export default function globalDef(){
+  return { bar: 'foo' };
+};
+
+export { globalObject6, globalObject7 };
+
+var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-module-named-exports.js\\");
+var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(\\"../../src/runtime/getGlobalThis.js\\");
+var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();
+var ___EXPOSE_LOADER_IMPORT_NAMED___ = ___EXPOSE_LOADER_IMPORT___.globalObject6
+if (!___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"]) ___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"] = {};
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"][\\"globalObject6\\"] = ___EXPOSE_LOADER_IMPORT_NAMED___;
+var ___EXPOSE_LOADER_IMPORT_NAMED___ = ___EXPOSE_LOADER_IMPORT___.globalObject7
+if (!___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"]) ___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"] = {};
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"][\\"globalObject7\\"] = ___EXPOSE_LOADER_IMPORT_NAMED___;
+var ___EXPOSE_LOADER_IMPORT_NAMED___ = ___EXPOSE_LOADER_IMPORT___.default
+if (!___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"]) ___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"] = {};
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal_alias\\"][\\"default\\"] = ___EXPOSE_LOADER_IMPORT_NAMED___;
+"
+`;
+
+exports[`loader should work string config: result 1`] = `
+Object {
+  "ExposeLoader": Object {
+    "default": Object {
+      "default": [Function],
+      "globalObject6": Object {
+        "foo": "bar",
+      },
+      "globalObject7": Object {
+        "bar": "foo",
+      },
+    },
+  },
+  "myGlobal_alias": Object {
+    "default": [Function],
+    "globalObject6": Object {
+      "foo": "bar",
+    },
+    "globalObject7": Object {
+      "bar": "foo",
+    },
+  },
+}
+`;
+
+exports[`loader should work string config: warnings 1`] = `Array []`;
+
 exports[`loader should work with multiple exposes: errors 1`] = `Array []`;
 
 exports[`loader should work with multiple exposes: module 1`] = `
-"var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
+"const globalObject4 = { foo: 'bar' };
+
+module.exports = globalObject4;
+
+var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
 var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(\\"../../src/runtime/getGlobalThis.js\\");
 var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();
-var ___EXPOSE_LOADER_IMPORT_DEFAULT___ = ___EXPOSE_LOADER_IMPORT___.__esModule
-  ? ___EXPOSE_LOADER_IMPORT___.default
- || ___EXPOSE_LOADER_IMPORT___
-
-  : ___EXPOSE_LOADER_IMPORT___
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myOtherGlobal\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
-module.exports = ___EXPOSE_LOADER_IMPORT___;"
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = ___EXPOSE_LOADER_IMPORT___;
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myOtherGlobal\\"] = ___EXPOSE_LOADER_IMPORT___;
+"
 `;
 
 exports[`loader should work with multiple exposes: result 1`] = `
@@ -134,16 +185,15 @@ exports[`loader should work with multiple exposes: warnings 1`] = `Array []`;
 exports[`loader should work: errors 1`] = `Array []`;
 
 exports[`loader should work: module 1`] = `
-"var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
+"const globalObject4 = { foo: 'bar' };
+
+module.exports = globalObject4;
+
+var ___EXPOSE_LOADER_IMPORT___ = require(\\"-!./global-commonjs2-single-export.js\\");
 var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(\\"../../src/runtime/getGlobalThis.js\\");
 var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();
-var ___EXPOSE_LOADER_IMPORT_DEFAULT___ = ___EXPOSE_LOADER_IMPORT___.__esModule
-  ? ___EXPOSE_LOADER_IMPORT___.default
- || ___EXPOSE_LOADER_IMPORT___
-
-  : ___EXPOSE_LOADER_IMPORT___
-___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = ___EXPOSE_LOADER_IMPORT_DEFAULT___;
-module.exports = ___EXPOSE_LOADER_IMPORT___;"
+___EXPOSE_LOADER_GLOBAL_THIS___[\\"myGlobal\\"] = ___EXPOSE_LOADER_IMPORT___;
+"
 `;
 
 exports[`loader should work: result 1`] = `

test/fixtures/global-module-named-exports.js

@@ -1,4 +1,8 @@
 const globalObject6 = { foo: 'bar' };
 const globalObject7 = { bar: 'foo' };
 
+export default function globalDef(){
+  return { bar: 'foo' };
+};
+
 export { globalObject6, globalObject7 };

test/fixtures/simple-module-named-export.js

@@ -0,0 +1,3 @@
+import * as myExports from './global-module-named-exports';
+
+export default myExports;

test/helpers/execute.js

@@ -16,7 +16,7 @@ export default (code) => {
   module._compile(
     `
 const result = {};
-    
+
 if (typeof myGlobal !== "undefined") {
   delete myGlobal;
 }
@@ -37,6 +37,10 @@ if (typeof myOtherGlobal !== "undefined") {
   result['myOtherGlobal'] = myOtherGlobal;
 }
 
+if (typeof myGlobal_alias !== "undefined") {
+  result['myGlobal_alias'] = myGlobal_alias;
+}
+
 module.exports = result;`,
     resource
   );

test/loader.test.js

@@ -57,9 +57,9 @@ describe('loader', () => {
     expect(getWarnings(stats)).toMatchSnapshot('warnings');
   });
 
-  it('should work for nested preporties for a global object', async () => {
+  it('should work for nested properties for a global object', async () => {
     const compiler = getCompiler('simple-commonjs2-single-export.js', {
-      exposes: ['myGlobal.nested', 'myOtherGlobal.nested'],
+      exposes: ['myGlobal.nested', 'myOtherGlobal.nested foo'],
     });
     const stats = await compile(compiler);
 
@@ -88,4 +88,24 @@ describe('loader', () => {
     expect(getErrors(stats)).toMatchSnapshot('errors');
     expect(getWarnings(stats)).toMatchSnapshot('warnings');
   });
+
+  it('should work string config', async () => {
+    const compiler = getCompiler('simple-module-named-export.js', {
+      exposes: [
+        'myGlobal_alias.globalObject6 globalObject6',
+        'myGlobal_alias.globalObject7 globalObject7',
+        'myGlobal_alias.default default',
+      ],
+    });
+    const stats = await compile(compiler);
+
+    expect(
+      getModuleSource('./global-module-named-exports.js-exposed', stats)
+    ).toMatchSnapshot('module');
+    expect(
+      execute(readAsset('main.bundle.js', compiler, stats))
+    ).toMatchSnapshot('result');
+    expect(getErrors(stats)).toMatchSnapshot('errors');
+    expect(getWarnings(stats)).toMatchSnapshot('warnings');
+  });
 });