less 3.0.0-pre.2 → 3.0.1

package/lib/less/plugin-manager.js

@@ -14,11 +14,11 @@ var PluginManager = function(less) {
 };
 
 var pm, PluginManagerFactory = function(less, newFactory) {
-    if (newFactory || !pm) {
-        pm = new PluginManager(less);
-    }
-    return pm;
-};
+        if (newFactory || !pm) {
+            pm = new PluginManager(less);
+        }
+        return pm;
+    };
 
 /**
  * Adds all the plugins in the array
@@ -36,13 +36,13 @@ PluginManager.prototype.addPlugins = function(plugins) {
  * @param plugin
  * @param {String} filename
  */
-PluginManager.prototype.addPlugin = function(plugin, filename) {
+PluginManager.prototype.addPlugin = function(plugin, filename, functionRegistry) {
     this.installedPlugins.push(plugin);
     if (filename) {
         this.pluginCache[filename] = plugin;
     }
     if (plugin.install) {
-        plugin.install(this.less, this);
+        plugin.install(this.less, this, functionRegistry || this.less.functions.functionRegistry);
     }
 };
 /**
@@ -53,37 +53,12 @@ PluginManager.prototype.get = function(filename) {
     return this.pluginCache[filename];
 };
 
-// Object.getPrototypeOf shim for visitor upgrade
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.constructor ? object.constructor.prototype : void 0;
-    };
-}
-
-function upgradeVisitors(visitor, oldType, newType) {
-
-    if (visitor['visit' + oldType] && !visitor['visit' + newType]) {
-        visitor['visit' + newType] = visitor['visit' + oldType];
-    }
-    if (visitor['visit' + oldType + 'Out'] && !visitor['visit' + newType + 'Out']) {
-        visitor['visit' + newType + 'Out'] = visitor['visit' + oldType + 'Out'];
-    }
-}
 /**
  * Adds a visitor. The visitor object has options on itself to determine
  * when it should run.
  * @param visitor
  */
 PluginManager.prototype.addVisitor = function(visitor) {
-    var proto;
-    // 2.x to 3.x visitor compatibility
-    try {
-        proto = Object.getPrototypeOf(visitor);
-        upgradeVisitors(proto, 'Directive', 'AtRule');
-        upgradeVisitors(proto, 'Rule', 'Declaration');
-    }
-    catch(e) {}
-
     this.visitors.push(visitor);
 };
 /**
@@ -176,5 +151,5 @@ PluginManager.prototype.getFileManagers = function() {
     return this.fileManagers;
 };
 
-// 
+//
 module.exports = PluginManagerFactory;

package/lib/less/render.js

@@ -1,10 +1,14 @@
-var PromiseConstructor;
+var PromiseConstructor,
+    utils = require('./utils');
 
 module.exports = function(environment, ParseTree, ImportManager) {
     var render = function (input, options, callback) {
         if (typeof options === 'function') {
             callback = options;
-            options = {};
+            options = utils.defaults(this.options, {});
+        }
+        else {
+            options = utils.defaults(this.options, options || {});
         }
 
         if (!callback) {

package/lib/less/source-map-builder.js

@@ -26,6 +26,9 @@ module.exports = function (SourceMapOutput, environment) {
         if (this.options.sourceMapInputFilename) {
             this.sourceMapInputFilename = sourceMapOutput.normalizeFilename(this.options.sourceMapInputFilename);
         }
+        if (this.options.sourceMapBasepath !== undefined && this.sourceMapURL !== undefined) {
+            this.sourceMapURL = sourceMapOutput.removeBasepath(this.sourceMapURL);
+        }
         return css + this.getCSSAppendage();
     };
 

package/lib/less/source-map-output.js

@@ -28,21 +28,26 @@ module.exports = function (environment) {
         this._column = 0;
     };
 
-    SourceMapOutput.prototype.normalizeFilename = function(filename) {
-        filename = filename.replace(/\\/g, '/');
-
-        if (this._sourceMapBasepath && filename.indexOf(this._sourceMapBasepath) === 0) {
-            filename = filename.substring(this._sourceMapBasepath.length);
-            if (filename.charAt(0) === '\\' || filename.charAt(0) === '/') {
-                filename = filename.substring(1);
+    SourceMapOutput.prototype.removeBasepath = function(path) {
+        if (this._sourceMapBasepath && path.indexOf(this._sourceMapBasepath) === 0) {
+            path = path.substring(this._sourceMapBasepath.length);
+            if (path.charAt(0) === '\\' || path.charAt(0) === '/') {
+                path = path.substring(1);
             }
         }
+
+        return path;
+    };
+
+    SourceMapOutput.prototype.normalizeFilename = function(filename) {
+        filename = filename.replace(/\\/g, '/');
+        filename = this.removeBasepath(filename);
         return (this._sourceMapRootpath || "") + filename;
     };
 
     SourceMapOutput.prototype.add = function(chunk, fileInfo, index, mapLines) {
 
-        //ignore adding empty strings
+        // ignore adding empty strings
         if (!chunk) {
             return;
         }

package/lib/less/transform-tree.js

@@ -25,8 +25,8 @@ module.exports = function(root, options) {
         variables = Object.keys(variables).map(function (k) {
             var value = variables[k];
 
-            if (! (value instanceof tree.Value)) {
-                if (! (value instanceof tree.Expression)) {
+            if (!(value instanceof tree.Value)) {
+                if (!(value instanceof tree.Expression)) {
                     value = new tree.Expression([value]);
                 }
                 value = new tree.Value([value]);

package/lib/less/tree/anonymous.js

@@ -21,6 +21,9 @@ Anonymous.prototype.isRulesetLike = function() {
     return this.rulesetLike;
 };
 Anonymous.prototype.genCSS = function (context, output) {
-    output.add(this.value, this._fileInfo, this._index, this.mapLines);
+    this.nodeVisible = Boolean(this.value);
+    if (this.nodeVisible) {
+        output.add(this.value, this._fileInfo, this._index, this.mapLines);
+    }
 };
 module.exports = Anonymous;

package/lib/less/tree/atrule.js

@@ -1,12 +1,13 @@
 var Node = require("./node"),
     Selector = require("./selector"),
-    Ruleset = require("./ruleset");
+    Ruleset = require("./ruleset"),
+    Anonymous = require('./anonymous');
 
 var AtRule = function (name, value, rules, index, currentFileInfo, debugInfo, isRooted, visibilityInfo) {
     var i;
 
     this.name  = name;
-    this.value = value;
+    this.value = (value instanceof Node) ? value : (value ? new Anonymous(value) : value);
     if (rules) {
         if (Array.isArray(rules)) {
             this.rules = rules;
@@ -60,11 +61,11 @@ AtRule.prototype.genCSS = function (context, output) {
 AtRule.prototype.eval = function (context) {
     var mediaPathBackup, mediaBlocksBackup, value = this.value, rules = this.rules;
 
-    //media stored inside other atrule should not bubble over it
-    //backpup media bubbling information
+    // media stored inside other atrule should not bubble over it
+    // backpup media bubbling information
     mediaPathBackup = context.mediaPath;
     mediaBlocksBackup = context.mediaBlocks;
-    //deleted media bubbling information
+    // deleted media bubbling information
     context.mediaPath = [];
     context.mediaBlocks = [];
 
@@ -76,7 +77,7 @@ AtRule.prototype.eval = function (context) {
         rules = [rules[0].eval(context)];
         rules[0].root = true;
     }
-    //restore media bubbling information
+    // restore media bubbling information
     context.mediaPath = mediaPathBackup;
     context.mediaBlocks = mediaBlocksBackup;
 

package/lib/less/tree/call.js

@@ -1,4 +1,5 @@
 var Node = require("./node"),
+    Anonymous = require("./anonymous"),
     FunctionCaller = require("../functions/function-caller");
 //
 // A function call node.
@@ -6,6 +7,7 @@ var Node = require("./node"),
 var Call = function (name, args, index, currentFileInfo) {
     this.name = name;
     this.args = args;
+    this.mathOn = name === 'calc' ? false : true;
     this._index = index;
     this._fileInfo = currentFileInfo;
 };
@@ -28,8 +30,16 @@ Call.prototype.accept = function (visitor) {
 // The function should receive the value, not the variable.
 //
 Call.prototype.eval = function (context) {
-    var args = this.args.map(function (a) { return a.eval(context); }),
-        result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
+
+    /**
+     * Turn off math for calc(), and switch back on for evaluating nested functions
+     */
+    var currentMathContext = context.mathOn;
+    context.mathOn = this.mathOn;
+    var args = this.args.map(function (a) { return a.eval(context); });
+    context.mathOn = currentMathContext;
+
+    var result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
     
     if (funcCaller.isValid()) {
         try {
@@ -46,11 +56,23 @@ Call.prototype.eval = function (context) {
             };
         }
 
-        if (result != null) {
+        if (result !== null && result !== undefined) {
+            // Results that that are not nodes are cast as Anonymous nodes
+            // Falsy values or booleans are returned as empty nodes
+            if (!(result instanceof Node)) {
+                if (!result || result === true) {
+                    result = new Anonymous(null); 
+                }
+                else {
+                    result = new Anonymous(result.toString()); 
+                }
+                
+            }
             result._index = this._index;
             result._fileInfo = this._fileInfo;
             return result;
         }
+
     }
 
     return new Call(this.name, args, this.getIndex(), this.fileInfo());

package/lib/less/tree/color.js

@@ -132,7 +132,7 @@ Color.prototype.toHSL = function () {
     }
     return { h: h * 360, s: s, l: l, a: a };
 };
-//Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
+// Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
 Color.prototype.toHSV = function () {
     var r = this.rgb[0] / 255,
         g = this.rgb[1] / 255,
@@ -152,7 +152,7 @@ Color.prototype.toHSV = function () {
     if (max === min) {
         h = 0;
     } else {
-        switch(max) {
+        switch (max) {
             case r: h = (g - b) / d + (g < b ? 6 : 0); break;
             case g: h = (b - r) / d + 2; break;
             case b: h = (r - g) / d + 4; break;

package/lib/less/tree/debug-info.js

@@ -1,7 +1,7 @@
 var debugInfo = function(context, ctx, lineSeparator) {
     var result = "";
     if (context.dumpLineNumbers && !context.compress) {
-        switch(context.dumpLineNumbers) {
+        switch (context.dumpLineNumbers) {
             case 'comments':
                 result = debugInfo.asComment(ctx);
                 break;

package/lib/less/tree/declaration.js

@@ -1,10 +1,11 @@
 var Node = require("./node"),
     Value = require("./value"),
-    Keyword = require("./keyword");
+    Keyword = require("./keyword"),
+    Anonymous = require("./anonymous");
 
 var Declaration = function (name, value, important, merge, index, currentFileInfo, inline, variable) {
     this.name = name;
-    this.value = (value instanceof Node) ? value : new Value([value]); //value instanceof tree.Value || value instanceof tree.Ruleset ??
+    this.value = (value instanceof Node) ? value : new Value([value ? new Anonymous(value) : null]);
     this.important = important ? ' ' + important.trim() : '';
     this.merge = merge;
     this._index = index;
@@ -32,7 +33,7 @@ Declaration.prototype.genCSS = function (context, output) {
     try {
         this.value.genCSS(context, output);
     }
-    catch(e) {
+    catch (e) {
         e.index = this._index;
         e.filename = this._fileInfo.filename;
         throw e;
@@ -58,7 +59,7 @@ Declaration.prototype.eval = function (context) {
 
         if (!this.variable && evaldValue.type === "DetachedRuleset") {
             throw { message: "Rulesets cannot be evaluated on a property.",
-                    index: this.getIndex(), filename: this.fileInfo().filename };
+                index: this.getIndex(), filename: this.fileInfo().filename };
         }
         var important = this.important,
             importantResult = context.importantScope.pop();
@@ -73,7 +74,7 @@ Declaration.prototype.eval = function (context) {
                           this.getIndex(), this.fileInfo(), this.inline,
                               variable);
     }
-    catch(e) {
+    catch (e) {
         if (typeof e.index !== 'number') {
             e.index = this.getIndex();
             e.filename = this.fileInfo().filename;

package/lib/less/tree/dimension.js

@@ -8,6 +8,9 @@ var Node = require("./node"),
 //
 var Dimension = function (value, unit) {
     this.value = parseFloat(value);
+    if (isNaN(this.value)) {
+        throw new Error("Dimension is not a number.");
+    }
     this.unit = (unit && unit instanceof Unit) ? unit :
       new Unit(unit ? [unit] : undefined);
     this.setParent(this.unit, this);
@@ -58,7 +61,7 @@ Dimension.prototype.genCSS = function (context, output) {
 // we default to the first Dimension's unit,
 // so `1px + 2` will yield `3px`.
 Dimension.prototype.operate = function (context, op, other) {
-    /*jshint noempty:false */
+    /* jshint noempty:false */
     var value = this._operate(context, op, this.value, other.value),
         unit = this.unit.clone();
 

package/lib/less/tree/extend.js

@@ -11,7 +11,7 @@ var Extend = function Extend(selector, option, index, currentFileInfo, visibilit
     this.copyVisibilityInfo(visibilityInfo);
     this.allowRoot = true;
 
-    switch(option) {
+    switch (option) {
         case "all":
             this.allowBefore = true;
             this.allowAfter = true;
@@ -36,7 +36,7 @@ Extend.prototype.eval = function (context) {
 Extend.prototype.clone = function (context) {
     return new Extend(this.selector, this.option, this.getIndex(), this.fileInfo(), this.visibilityInfo());
 };
-//it concatenates (joins) all selectors in selector array
+// it concatenates (joins) all selectors in selector array
 Extend.prototype.findSelfSelectors = function (selectors) {
     var selfElements = [],
         i,

package/lib/less/tree/import.js

@@ -4,7 +4,8 @@ var Node = require("./node"),
     Quoted = require("./quoted"),
     Ruleset = require("./ruleset"),
     Anonymous = require("./anonymous"),
-    utils = require("../utils");
+    utils = require("../utils"),
+    LessError = require("../less-error");
 
 //
 // CSS @import node
@@ -30,7 +31,7 @@ var Import = function (path, features, options, index, currentFileInfo, visibili
         this.css = !this.options.less || this.options.inline;
     } else {
         var pathValue = this.getPath();
-        if (pathValue && /[#\.\&\?\/]css([\?;].*)?$/.test(pathValue)) {
+        if (pathValue && /[#\.\&\?]css([\?;].*)?$/.test(pathValue)) {
             this.css = true;
         }
     }
@@ -116,8 +117,8 @@ Import.prototype.eval = function (context) {
     if (this.options.reference || this.blocksVisibility()) {
         if (result.length || result.length === 0) {
             result.forEach(function (node) {
-                    node.addVisibilityBlock();
-                }
+                node.addVisibilityBlock();
+            }
             );
         } else {
             result.addVisibilityBlock();
@@ -131,12 +132,19 @@ Import.prototype.doEval = function (context) {
 
     if (this.options.isPlugin) {
         if (this.root && this.root.eval) {
-            this.root.eval(context);
+            try {
+                this.root.eval(context);
+            }
+            catch (e) {
+                e.message = "Plugin error during evaluation";
+                throw new LessError(e, this.root.imports, this.root.filename);
+            }
         }
         registry = context.frames[0] && context.frames[0].functionRegistry;
         if ( registry && this.root && this.root.functions ) {
             registry.addMultiple( this.root.functions );
         }
+
         return [];
     }
 
@@ -150,10 +158,10 @@ Import.prototype.doEval = function (context) {
     }
     if (this.options.inline) {
         var contents = new Anonymous(this.root, 0,
-          {
-              filename: this.importedFilename,
-              reference: this.path._fileInfo && this.path._fileInfo.reference
-          }, true, true);
+            {
+                filename: this.importedFilename,
+                reference: this.path._fileInfo && this.path._fileInfo.reference
+            }, true, true);
 
         return this.features ? new Media([contents], this.features.value) : [contents];
     } else if (this.css) {

package/lib/less/tree/index.js

@@ -1,17 +1,15 @@
-var tree = {};
+var tree = Object.create(null);
 
 tree.Node = require('./node');
-tree.Alpha = require('./alpha');
 tree.Color = require('./color');
 tree.AtRule = require('./atrule');
-// Backwards compatibility
-tree.Directive = require('./directive');
 tree.DetachedRuleset = require('./detached-ruleset');
 tree.Operation = require('./operation');
 tree.Dimension = require('./dimension');
 tree.Unit = require('./unit');
 tree.Keyword = require('./keyword');
 tree.Variable = require('./variable');
+tree.Property = require('./property');
 tree.Ruleset = require('./ruleset');
 tree.Element = require('./element');
 tree.Attribute = require('./attribute');
@@ -20,8 +18,6 @@ tree.Selector = require('./selector');
 tree.Quoted = require('./quoted');
 tree.Expression = require('./expression');
 tree.Declaration = require('./declaration');
-// Backwards compatibility
-tree.Rule = require('./rule');
 tree.Call = require('./call');
 tree.URL = require('./url');
 tree.Import = require('./import');
@@ -40,6 +36,6 @@ tree.Media = require('./media');
 tree.UnicodeDescriptor = require('./unicode-descriptor');
 tree.Negative = require('./negative');
 tree.Extend = require('./extend');
-tree.RulesetCall = require('./ruleset-call');
+tree.VariableCall = require('./variable-call');
 
 module.exports = tree;

package/lib/less/tree/js-eval-node.js

@@ -31,7 +31,7 @@ JsEvalNode.prototype.evaluateJavaScript = function (expression, context) {
     var variables = context.frames[0].variables();
     for (var k in variables) {
         if (variables.hasOwnProperty(k)) {
-            /*jshint loopfunc:true */
+            /* jshint loopfunc:true */
             evalContext[k.slice(1)] = {
                 value: variables[k].value,
                 toJS: function () {

package/lib/less/tree/media.js

@@ -23,7 +23,7 @@ var Media = function (value, features, index, currentFileInfo, visibilityInfo) {
 };
 Media.prototype = new AtRule();
 Media.prototype.type = "Media";
-Media.prototype.isRulesetLike = true;
+Media.prototype.isRulesetLike = function() { return true; };
 Media.prototype.accept = function (visitor) {
     if (this.features) {
         this.features = visitor.visit(this.features);
@@ -48,19 +48,8 @@ Media.prototype.eval = function (context) {
         this.rules[0].debugInfo = this.debugInfo;
         media.debugInfo = this.debugInfo;
     }
-    var strictMathBypass = false;
-    if (!context.strictMath) {
-        strictMathBypass = true;
-        context.strictMath = true;
-    }
-    try {
-        media.features = this.features.eval(context);
-    }
-    finally {
-        if (strictMathBypass) {
-            context.strictMath = false;
-        }
-    }
+    
+    media.features = this.features.eval(context);
 
     context.mediaPath.push(media);
     context.mediaBlocks.push(media);

package/lib/less/tree/mixin-definition.js

@@ -43,7 +43,7 @@ Definition.prototype.accept = function (visitor) {
     }
 };
 Definition.prototype.evalParams = function (context, mixinEnv, args, evaldArguments) {
-    /*jshint boss:true */
+    /* jshint boss:true */
     var frame = new Ruleset(null, null),
         varargs, arg,
         params = utils.copyArray(this.params),
@@ -156,7 +156,7 @@ Definition.prototype.evalCall = function (context, args, important) {
 Definition.prototype.matchCondition = function (args, context) {
     if (this.condition && !this.condition.eval(
         new contexts.Eval(context,
-            [this.evalParams(context, /* the parameter variables*/
+            [this.evalParams(context, /* the parameter variables */
                 new contexts.Eval(context, this.frames ? this.frames.concat(context.frames) : context.frames), args, [])]
             .concat(this.frames || []) // the parent namespace/mixin frames
             .concat(context.frames)))) { // the current environment frames
@@ -174,7 +174,7 @@ Definition.prototype.matchArgs = function (args, context) {
         }
     }, 0);
 
-    if (! this.variadic) {
+    if (!this.variadic) {
         if (requiredArgsCnt < this.required) {
             return false;
         }

package/lib/less/tree/node.js

@@ -2,6 +2,8 @@ var Node = function() {
     this.parent = null;
     this.visibilityBlocks = undefined;
     this.nodeVisible = undefined;
+    this.rootNode = null;
+    this.parsed = null;
 
     var self = this;
     Object.defineProperty(this, "currentFileInfo", {
@@ -31,6 +33,7 @@ Node.prototype.getIndex = function() {
 Node.prototype.fileInfo = function() {
     return this._fileInfo || (this.parent && this.parent.fileInfo()) || {};
 };
+Node.prototype.isRulesetLike = function() { return false; };
 Node.prototype.toCSS = function (context) {
     var strs = [];
     this.genCSS(context, {
@@ -60,8 +63,8 @@ Node.prototype._operate = function (context, op, a, b) {
 };
 Node.prototype.fround = function(context, value) {
     var precision = context && context.numPrecision;
-    //add "epsilon" to ensure numbers like 1.000000005 (represented as 1.000000004999....) are properly rounded...
-    return (precision == null) ? value : Number((value + 2e-16).toFixed(precision));
+    // add "epsilon" to ensure numbers like 1.000000005 (represented as 1.000000004999...) are properly rounded:
+    return (precision) ? Number((value + 2e-16).toFixed(precision)) : value;
 };
 Node.compare = function (a, b) {
     /* returns:
@@ -121,13 +124,13 @@ Node.prototype.removeVisibilityBlock = function () {
     }
     this.visibilityBlocks = this.visibilityBlocks - 1;
 };
-//Turns on node visibility - if called node will be shown in output regardless
-//of whether it comes from import by reference or not
+// Turns on node visibility - if called node will be shown in output regardless
+// of whether it comes from import by reference or not
 Node.prototype.ensureVisibility = function () {
     this.nodeVisible = true;
 };
-//Turns off node visibility - if called node will NOT be shown in output regardless
-//of whether it comes from import by reference or not
+// Turns off node visibility - if called node will NOT be shown in output regardless
+// of whether it comes from import by reference or not
 Node.prototype.ensureInvisibility = function () {
     this.nodeVisible = false;
 };

package/lib/less/tree/operation.js

@@ -25,7 +25,7 @@ Operation.prototype.eval = function (context) {
         }
         if (!a.operate) {
             throw { type: "Operation",
-                    message: "Operation on an invalid type" };
+                message: "Operation on an invalid type" };
         }
 
         return a.operate(context, this.op, b);

package/lib/less/tree/property.js

@@ -0,0 +1,70 @@
+var Node = require("./node"),
+    Declaration = require("./declaration");
+
+var Property = function (name, index, currentFileInfo) {
+    this.name = name;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
+};
+Property.prototype = new Node();
+Property.prototype.type = "Property";
+Property.prototype.eval = function (context) {
+    var property, name = this.name;
+    // TODO: shorten this reference
+    var mergeRules = context.pluginManager.less.visitors.ToCSSVisitor.prototype._mergeRules;
+
+    if (this.evaluating) {
+        throw { type: 'Name',
+            message: "Recursive property reference for " + name,
+            filename: this.fileInfo().filename,
+            index: this.getIndex() };
+    }
+
+    this.evaluating = true;
+
+    property = this.find(context.frames, function (frame) {
+
+        var v, vArr = frame.property(name);
+        if (vArr) {
+            for (var i = 0; i < vArr.length; i++) {
+                v = vArr[i];
+
+                vArr[i] = new Declaration(v.name,
+                    v.value,
+                    v.important,
+                    v.merge,
+                    v.index,
+                    v.currentFileInfo,
+                    v.inline,
+                    v.variable
+                );
+            }
+            mergeRules(vArr);
+
+            v = vArr[vArr.length - 1];
+            if (v.important) {
+                var importantScope = context.importantScope[context.importantScope.length - 1];
+                importantScope.important = v.important;
+            }
+            v = v.value.eval(context);
+            return v;
+        }
+    });
+    if (property) {
+        this.evaluating = false;
+        return property;
+    } else {
+        throw { type: 'Name',
+            message: "Property '" + name + "' is undefined",
+            filename: this.currentFileInfo.filename,
+            index: this.index };
+    }
+};
+Property.prototype.find = function (obj, fun) {
+    for (var i = 0, r; i < obj.length; i++) {
+        r = fun.call(obj, obj[i]);
+        if (r) { return r; }
+    }
+    return null;
+};
+module.exports = Property;