refactor: allow object syntax for exposes

Author: cap-Bernardito

package-lock.json

@@ -54,6 +54,7 @@
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^26.0.1",
+    "babel-loader": "^8.1.0",
     "commitlint-azure-pipelines-cli": "^1.0.3",
     "cross-env": "^7.0.2",
     "del": "^5.1.0",

package.json

@@ -4,6 +4,7 @@
 */
 
 import path from 'path';
+import url from 'url';
 
 import {
   getOptions,
@@ -31,10 +32,18 @@ export default function loader(content, sourceMap) {
   // 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.
-  const newRequestPath = `./${path.relative(
-    this.context,
-    getRemainingRequest(this)
-  )}`;
+  const remainingRequest = getRemainingRequest(this).split('!');
+  const remainingRequests =
+    typeof remainingRequest === 'string'
+      ? [remainingRequest]
+      : remainingRequest;
+
+  const newRequestPath = remainingRequests
+    .map(
+      (currentUrl) =>
+        `./${path.relative(this.context, url.parse(currentUrl).pathname)}`
+    )
+    .join('!');
 
   /*
    * Workaround until module.libIdent() in webpack/webpack handles this correctly.
@@ -52,8 +61,7 @@ export default function loader(content, sourceMap) {
   try {
     exposes = getExposes(options.exposes);
   } catch (error) {
-    this.emitError(error);
-    callback(null, content, sourceMap);
+    callback(error);
 
     return;
   }
@@ -68,9 +76,8 @@ export default function loader(content, sourceMap) {
   code += `var ___EXPOSE_LOADER_GLOBAL_THIS___ = ___EXPOSE_LOADER_GET_GLOBAL_THIS___();\n`;
 
   for (const expose of exposes) {
-    const childProperties = expose.globalName.split('.');
-    const { length } = childProperties;
-    const { packageName } = expose;
+    const { globalName, packageName } = expose;
+    const { length } = globalName;
 
     if (typeof packageName !== 'undefined') {
       code += `var ___EXPOSE_LOADER_IMPORT_NAMED___ = ___EXPOSE_LOADER_IMPORT___.${packageName}\n`;
@@ -83,7 +90,7 @@ export default function loader(content, sourceMap) {
         code += `if (!${propertyString}) ${propertyString} = {};\n`;
       }
 
-      propertyString += `[${JSON.stringify(childProperties[i])}]`;
+      propertyString += `[${JSON.stringify(globalName[i])}]`;
     }
 
     code +=

src/index.js

@@ -1,4 +1,33 @@
 {
+  "definitions": {
+    "ObjectPattern": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "globalName": {
+          "anyOf": [
+            {
+              "type": "string",
+              "minLength": 1
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "minLength": 1
+              },
+              "minItems": 1
+            }
+          ]
+        },
+        "packageName": {
+          "type": "string",
+          "minLength": 1
+        }
+      },
+      "anyOf": [{ "required": ["globalName"] }]
+    }
+  },
   "type": "object",
   "properties": {
     "exposes": {
@@ -7,16 +36,27 @@
           "type": "string",
           "minLength": 1
         },
+        {
+          "$ref": "#/definitions/ObjectPattern"
+        },
         {
           "type": "array",
           "items": {
-            "type": "string",
-            "minLength": 1
+            "anyOf": [
+              {
+                "type": "string",
+                "minLength": 1
+              },
+              {
+                "$ref": "#/definitions/ObjectPattern"
+              }
+            ]
           },
           "minItems": 1
         }
       ]
     }
   },
+  "anyOf": [{ "required": ["exposes"] }],
   "additionalProperties": false
 }

src/options.json

@@ -12,15 +12,22 @@ function resolveExposes(item) {
       globalName: splittedItem[0],
       packageName: splittedItem[1],
     };
+  } else {
+    result = item;
   }
 
-  return result;
+  const nestedGlobalName =
+    typeof result.globalName === 'string'
+      ? result.globalName.split('.')
+      : result.globalName;
+
+  return { ...result, globalName: nestedGlobalName };
 }
 
 function getExposes(items) {
   let result = [];
 
-  if (typeof imports === 'string') {
+  if (typeof items === 'string') {
     result.push(resolveExposes(items));
   } else {
     result = [].concat(items).map((item) => resolveExposes(item));