marko 4.28.5 → 4.28.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -58,33 +58,35 @@ function isXML(path) {
58
58
  }
59
59
 
60
60
  function _compile(src, filename, userOptions, callback) {
61
- registerCoreTaglibs();
62
-
63
- ok(filename, '"filename" argument is required');
64
- ok(typeof filename === "string", '"filename" argument should be a string');
65
-
66
- var options = {};
61
+ try {
62
+ registerCoreTaglibs();
67
63
 
68
- extend(options, globalConfig);
64
+ ok(filename, '"filename" argument is required');
65
+ ok(typeof filename === "string", '"filename" argument should be a string');
69
66
 
70
- if (userOptions) {
71
- extend(options, userOptions);
72
- }
67
+ var options = {};
73
68
 
74
- var compiler = defaultCompiler;
69
+ extend(options, globalConfig);
75
70
 
76
- if (isXML(filename)) {
77
- require("complain")("Using Marko to build XML is deprecated");
78
- options.ignoreUnrecognizedTags = true;
79
- }
71
+ if (userOptions) {
72
+ extend(options, userOptions);
73
+ }
80
74
 
81
- const context = new CompileContext(src, filename, compiler.builder, options);
75
+ var compiler = defaultCompiler;
82
76
 
83
- let result;
77
+ if (isXML(filename)) {
78
+ require("complain")("Using Marko to build XML is deprecated");
79
+ options.ignoreUnrecognizedTags = true;
80
+ }
84
81
 
85
- try {
82
+ const context = new CompileContext(src, filename, compiler.builder, options);
86
83
  const compiled = compiler.compile(src, context);
87
- result = userOptions.sourceOnly ? compiled.code : compiled;
84
+ const result = userOptions.sourceOnly ? compiled.code : compiled;
85
+ if (callback) {
86
+ callback(null, result);
87
+ } else {
88
+ return result;
89
+ }
88
90
  } catch (e) {
89
91
  if (callback) {
90
92
  return callback(e);
@@ -92,12 +94,6 @@ function _compile(src, filename, userOptions, callback) {
92
94
  throw e;
93
95
  }
94
96
  }
95
-
96
- if (callback) {
97
- callback(null, result);
98
- } else {
99
- return result;
100
- }
101
97
  }
102
98
 
103
99
  function compile(src, filename, options, callback) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "marko",
3
- "version": "4.28.5",
3
+ "version": "4.28.6",
4
4
  "license": "MIT",
5
5
  "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
6
6
  "dependencies": {
@@ -58,33 +58,40 @@ function isXML(path) {
58
58
  }
59
59
 
60
60
  function _compile(src, filename, userOptions, callback) {
61
- registerCoreTaglibs();
62
-
63
- ok(filename, '"filename" argument is required');
64
- ok(typeof filename === "string", '"filename" argument should be a string');
65
-
66
- var options = {};
61
+ try {
62
+ registerCoreTaglibs();
67
63
 
68
- extend(options, globalConfig);
64
+ ok(filename, '"filename" argument is required');
65
+ ok(typeof filename === "string", '"filename" argument should be a string');
69
66
 
70
- if (userOptions) {
71
- extend(options, userOptions);
72
- }
67
+ var options = {};
73
68
 
74
- var compiler = defaultCompiler;
69
+ extend(options, globalConfig);
75
70
 
76
- if (isXML(filename)) {
77
- require("complain")("Using Marko to build XML is deprecated");
78
- options.ignoreUnrecognizedTags = true;
79
- }
71
+ if (userOptions) {
72
+ extend(options, userOptions);
73
+ }
80
74
 
81
- const context = new CompileContext(src, filename, compiler.builder, options);
75
+ var compiler = defaultCompiler;
82
76
 
83
- let result;
77
+ if (isXML(filename)) {
78
+ require("complain")("Using Marko to build XML is deprecated");
79
+ options.ignoreUnrecognizedTags = true;
80
+ }
84
81
 
85
- try {
82
+ const context = new CompileContext(
83
+ src,
84
+ filename,
85
+ compiler.builder,
86
+ options
87
+ );
86
88
  const compiled = compiler.compile(src, context);
87
- result = userOptions.sourceOnly ? compiled.code : compiled;
89
+ const result = userOptions.sourceOnly ? compiled.code : compiled;
90
+ if (callback) {
91
+ callback(null, result);
92
+ } else {
93
+ return result;
94
+ }
88
95
  } catch (e) {
89
96
  if (callback) {
90
97
  return callback(e);
@@ -92,12 +99,6 @@ function _compile(src, filename, userOptions, callback) {
92
99
  throw e;
93
100
  }
94
101
  }
95
-
96
- if (callback) {
97
- callback(null, result);
98
- } else {
99
- return result;
100
- }
101
102
  }
102
103
 
103
104
  function compile(src, filename, options, callback) {