Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/define accessor #14

Merged
merged 6 commits into from
Aug 28, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
baseUrl: '../src'
});

require(['oo'], function (Class) {
require(['main'], function (Class) {
var Super = Class({
superProp1: 'superProp1',
superProp2: 'superProp2',
Expand Down Expand Up @@ -240,6 +240,17 @@

var e2 = new EooClass2('prop1', 'prop2');
e2.test();

Class.defineAccessor(Sub.prototype, 'testProp');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里我感觉不应该给prototype,直接给个类就行了?毕竟我们的语义是“给类添加一个访问器”

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

在业务中应该是:defineAccessor(exports, name),主要考虑到defineAccessor不局限于 function

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

懂了~

window.accessorSub = new Sub();
console.log(accessorSub.setTestProp);
console.log(accessorSub.getTestProp);

accessorSub.setTestProp('test');
printLine(accessorSub.getTestProp());
accessorSub.setTestProp('test1');
printLine(accessorSub.getTestProp());

});
</script>
</body>
Expand Down
48 changes: 48 additions & 0 deletions src/defineAccessor.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* Created by exodia on 14-8-28.
*/
void function (define, undefined) {

define(
function (require) {
var MEMBERS = '__eooPrivateMembers__';

function simpleGetter(name) {
var body = 'return typeof this.' + MEMBERS + ' === \'object\' ? this.'
+ MEMBERS + '[\'' + name + '\'] : undefined;';
return new Function(body);
}

function simpleSetter(name) {
var body = 'this.' + MEMBERS + ' = this.' + MEMBERS + ' || {};\n'
+ 'this.' + MEMBERS + '[\'' + name + '\'] = value;' ;
return new Function('value', body);
}

/**
* 根据指定的属性名生成对应的accessor
*
* @param {Object | Function} obj 需要生成 accessor 的对象
* @param {string} name 需要生成 accessor 的属性名称
* @param {Object | Function} [accessor] 自定义的 getter 和 setter 配置
* @param {Function} [accessor.get] 自定义的 getter 函数, 配置了accessor,但未设置 get,则不会生成 getter
* @param {Function} [accessor.set] 自定义的 setter 函数, 配置了accessor,但未设置 set,则不会生成 setter
*/
return function (obj, name, accessor) {
var upperName = name.charAt(0).toUpperCase() + name.slice(1);
var getter = 'get' + upperName;
var setter = 'set' + upperName;

if (!accessor) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感觉用用函数预编译能加快些速度呢……

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

obj[getter] = !accessor || typeof accessor.get !== 'function' ? simpleGetter(name) : accessor.get;
obj[setter] = !accessor || typeof accessor.set !== 'function' ? simpleSetter(name) : accessor.set;
}
else {
typeof accessor.get === 'function' && (obj[getter] = accessor.get);
typeof accessor.set === 'function' && (obj[setter] = accessor.set);
}
};
}
);

}(typeof define === 'function' && define.amd ? define : function (factory) { module.exports = factory(require); });
13 changes: 13 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Created by exodia on 14-8-28.
*/
void function (define) {
define(
function (require) {
var oo = require('./oo');
oo.defineAccessor = require('./defineAccessor');

return oo;
}
);
}(typeof define === 'function' && define.amd ? define : function (factory) { module.exports = factory(require); });
21 changes: 4 additions & 17 deletions src/oo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// - demo
void function (define) {
define(function () {
var Empty = function () {};
var NAME_PROPERTY_NAME = '__name__';
var OWNER_PROPERTY_NAME = '__owner__';
var Empty = function () { };
var NAME_PROPERTY_NAME = '__eooName__';
var OWNER_PROPERTY_NAME = '__eooOwner__';

/**
* 简单的 js oo 库
Expand Down Expand Up @@ -173,21 +173,8 @@ void function (define) {
*/
function inherit(BaseClass) {
var kclass = function () {
/**
* 若未进行 constructor 的重写,则klass.prototype.constructor指向BaseClass.prototype.constructor
*/
// 若未进行 constructor 的重写,则klass.prototype.constructor指向BaseClass.prototype.constructor
return kclass.prototype.constructor.apply(this, arguments);

// 下面是之前的代码,我也不知道为什么写的这么多,还有 bug- -!!5555~~

// 兼容非 oo 创建的类继承 oo 类时的构造函数调用
/*if (kclass.caller === this.constructor) {
return kclass.prototype.constructor.apply(this, arguments);
}

return this.constructor !== kclass &&
typeof this.constructor == 'function' &&
this.constructor.apply(this, arguments);*/
};

Empty.prototype = BaseClass.prototype;
Expand Down