fix issue with retaining first '.' in property match and test with real files

Author: dhharker

__tests__/index.spec.js

@@ -53,19 +53,19 @@ describe('js-to-styles-vars-loader', () => {
         });
     });
 
-    describe('guardExportType', () => {
+    describe('validateExportType', () => {
       it ("throws on anything except an object, does not throw otherwise", () => {
         const areOk = [{}, {a: "foo"}];
         const areNotOk = [[], ["a"], "", "123", 123, false, true, null, undefined, NaN];
         expect(() => {
             for (const okThing of areOk) {
-                operator.guardExportType(okThing, "");
+                operator.validateExportType(okThing, "");
             }
         }).not.toThrow();
         for (const notOkThing of areNotOk) {
-
             expect(() => {
-                operator.guardExportType(notOkThing, "");
+                operator.validateExportType(notOkThing, "");
+                console.error(`Should have thrown on ${typeof notOkThing} '${notOkThing}'`);
             },).toThrow();
 
         }
@@ -180,7 +180,7 @@ describe('js-to-styles-vars-loader', () => {
             expect(context.addDependency).toHaveBeenCalledWith(path.resolve(dependencyPath));
         });
 
-        it('gives back content as is if there is no requre', () => {
+        it('gives back content as-is if there is no require', () => {
             const content = ".someClass { color: #fff;}";
             expect(operator.mergeVarsToContent(content, context)).toEqual(content);
         });
@@ -191,6 +191,15 @@ describe('js-to-styles-vars-loader', () => {
           const merged = operator.mergeVarsToContent(content, {...context, context: path.resolve('./mocks/')}, 'less');
           expect(merged.trim()).toEqual(expectedContent.trim());
         })
+
+        it("imports nested props", () => {
+          const content = fs.readFileSync(path.resolve('./mocks/case2.less'), 'utf8');
+          const expectedContent = fs.readFileSync(path.resolve('./mocks/case2_expected.less'), 'utf8');
+          const merged = operator.mergeVarsToContent(content, {...context, context: path.resolve('./mocks/')}, 'less');
+          expect(merged.trim()).toEqual(expectedContent.trim());
+        })
+
+
     });
 
     describe('getResource', () => {

index.js

@@ -6,9 +6,9 @@ const requireReg = /require\s*\((["'])([\w.\/]+)(?:\1)\)((?:\.[\w_-]+)*);?/igm;
 
 const operator = {
 
-    guardExportType (data, relativePath) {
-        if (typeof data !== "object" || Array.isArray(data)) {
-            throw new Error(`Value must be an object '${relativePath}'`)
+    validateExportType (data, relativePath) {
+        if (data === null || typeof data !== "object" || Array.isArray(data)) {
+            throw new Error(`Value must be a flat object '${relativePath}'`)
         }
     },
 
@@ -18,10 +18,10 @@ const operator = {
         if (!data) {
             throw new Error(`No data in '${relativePath}'`)
         }
-        this.guardExportType(data, relativePath);
+        this.validateExportType(data, relativePath);
         if (property) {
             const propVal = squba(data, property);
-            this.guardExportType(propVal, relativePath);
+            this.validateExportType(propVal, relativePath);
             return propVal;
         }
         return data;
@@ -55,10 +55,17 @@ const operator = {
         }
     },
 
+    propDeDot (strPropMatch) {
+        if (!strPropMatch || strPropMatch[0] !== ".")
+            return strPropMatch;
+        else
+            return strPropMatch.substr(1);
+    },
+
     mergeVarsToContent (content, webpackContext, preprocessorType) {
         const replacer = function (m,q, relativePath, property) {
             const modulePath = path.join(webpackContext.context, relativePath)
-            const varData = this.getVarData(modulePath, property);
+            const varData = this.getVarData(modulePath, this.propDeDot(property));
             webpackContext.addDependency(modulePath);
             return this.transformToStyleVars({
                 type: preprocessorType,

mocks/case2.js

@@ -0,0 +1,10 @@
+module.exports = {
+    a: {
+        foo: "a"
+    },
+    b: {
+        c: {
+            foo: "c"
+        }
+    }
+};

mocks/case2.less

@@ -0,0 +1,6 @@
+.a {
+  require("./case2.js").a;
+}
+.c {
+  require("./case2.js").b.c;
+}

mocks/case2_expected.less

@@ -0,0 +1,8 @@
+.a {
+  @foo: a;
+
+}
+.c {
+  @foo: c;
+
+}