Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf422bfd

Browse files
mohd-akramjaylinski
authored andcommitted
Improve rendering performance
Avoid unnecessary copies via Utils.extend in hot paths.
1 parent25c696b commitf422bfd

File tree

4 files changed

+31
-47
lines changed

4 files changed

+31
-47
lines changed

‎lib/handlebars/helpers.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ export function moveHelperToHooks(instance, helperName, keepHelper) {
2020
if(instance.helpers[helperName]){
2121
instance.hooks[helperName]=instance.helpers[helperName];
2222
if(!keepHelper){
23-
deleteinstance.helpers[helperName];
23+
// Using delete is slow
24+
instance.helpers[helperName]=undefined;
2425
}
2526
}
2627
}

‎lib/handlebars/internal/create-new-lookup-object.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎lib/handlebars/internal/proto-access.js

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
import{createNewLookupObject}from'./create-new-lookup-object';
1+
import{extend}from'../utils';
22
importloggerfrom'../logger';
33

44
constloggedProperties=Object.create(null);
55

66
exportfunctioncreateProtoAccessControl(runtimeOptions){
7-
letdefaultMethodWhiteList=Object.create(null);
8-
defaultMethodWhiteList['constructor']=false;
9-
defaultMethodWhiteList['__defineGetter__']=false;
10-
defaultMethodWhiteList['__defineSetter__']=false;
11-
defaultMethodWhiteList['__lookupGetter__']=false;
12-
13-
letdefaultPropertyWhiteList=Object.create(null);
7+
// Create an object with "null"-prototype to avoid truthy results on
8+
// prototype properties.
9+
constpropertyWhiteList=Object.create(null);
1410
// eslint-disable-next-line no-proto
15-
defaultPropertyWhiteList['__proto__']=false;
11+
propertyWhiteList['__proto__']=false;
12+
extend(propertyWhiteList,runtimeOptions.allowedProtoProperties);
13+
14+
constmethodWhiteList=Object.create(null);
15+
methodWhiteList['constructor']=false;
16+
methodWhiteList['__defineGetter__']=false;
17+
methodWhiteList['__defineSetter__']=false;
18+
methodWhiteList['__lookupGetter__']=false;
19+
extend(methodWhiteList,runtimeOptions.allowedProtoMethods);
1620

1721
return{
1822
properties:{
19-
whitelist:createNewLookupObject(
20-
defaultPropertyWhiteList,
21-
runtimeOptions.allowedProtoProperties
22-
),
23+
whitelist:propertyWhiteList,
2324
defaultValue:runtimeOptions.allowProtoPropertiesByDefault,
2425
},
2526
methods:{
26-
whitelist:createNewLookupObject(
27-
defaultMethodWhiteList,
28-
runtimeOptions.allowedProtoMethods
29-
),
27+
whitelist:methodWhiteList,
3028
defaultValue:runtimeOptions.allowProtoMethodsByDefault,
3129
},
3230
};

‎lib/handlebars/runtime.js

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,18 @@ export function template(templateSpec, env) {
7171
}
7272
partial=env.VM.resolvePartial.call(this,partial,context,options);
7373

74-
letextendedOptions=Utils.extend({},options,{
75-
hooks:this.hooks,
76-
protoAccessControl:this.protoAccessControl,
77-
});
78-
79-
letresult=env.VM.invokePartial.call(
80-
this,
81-
partial,
82-
context,
83-
extendedOptions
84-
);
74+
options.hooks=this.hooks;
75+
options.protoAccessControl=this.protoAccessControl;
76+
77+
letresult=env.VM.invokePartial.call(this,partial,context,options);
8578

8679
if(result==null&&env.compile){
8780
options.partials[options.name]=env.compile(
8881
partial,
8982
templateSpec.compilerOptions,
9083
env
9184
);
92-
result=options.partials[options.name](context,extendedOptions);
85+
result=options.partials[options.name](context,options);
9386
}
9487
if(result!=null){
9588
if(options.indent){
@@ -255,8 +248,9 @@ export function template(templateSpec, env) {
255248

256249
function_setup(options){
257250
if(!options.partial){
258-
letmergedHelpers=Utils.extend({},env.helpers,options.helpers);
259-
wrapHelpersToPassLookupProperty(mergedHelpers,container);
251+
letmergedHelpers={};
252+
addHelpers(mergedHelpers,env.helpers,container);
253+
addHelpers(mergedHelpers,options.helpers,container);
260254
container.helpers=mergedHelpers;
261255

262256
if(templateSpec.usePartial){
@@ -417,16 +411,18 @@ function executeDecorators(fn, prog, container, depths, data, blockParams) {
417411
returnprog;
418412
}
419413

420-
functionwrapHelpersToPassLookupProperty(mergedHelpers,container){
421-
Object.keys(mergedHelpers).forEach((helperName)=>{
422-
lethelper=mergedHelpers[helperName];
414+
functionaddHelpers(mergedHelpers,helpers,container){
415+
if(!helpers)return;
416+
Object.keys(helpers).forEach((helperName)=>{
417+
lethelper=helpers[helperName];
423418
mergedHelpers[helperName]=passLookupPropertyOption(helper,container);
424419
});
425420
}
426421

427422
functionpassLookupPropertyOption(helper,container){
428423
constlookupProperty=container.lookupProperty;
429424
returnwrapHelper(helper,(options)=>{
430-
returnUtils.extend({ lookupProperty},options);
425+
options.lookupProperty=lookupProperty;
426+
returnoptions;
431427
});
432428
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp