marko 2.11.1 → 2.11.3

package/compiler/TemplateBuilder.js

@@ -16,7 +16,7 @@
 'use strict';
 var createError = require('raptor-util').createError;
 var nodePath = require('path');
-var stringify = require('raptor-json/stringify');
+var stringify = require('./util/stringify');
 var StringBuilder = require('raptor-strings/StringBuilder');
 var Expression = require('./Expression');
 var arrayFromArguments = require('raptor-util').arrayFromArguments;

package/compiler/TypeConverter.js

@@ -16,7 +16,7 @@
 'use strict';
 var createError = require('raptor-util').createError;
 var expressionParser = require('./expression-parser');
-var stringify = require('raptor-json/stringify');
+var stringify = require('./util/stringify');
 var Expression = require('./Expression');
 function TypeConverter() {
 }

package/compiler/expression-parser.js

@@ -17,7 +17,7 @@
 var createError = require('raptor-util').createError;
 var Expression = require('./Expression');
 var strings = require('raptor-strings');
-var stringify = require('raptor-json/stringify');
+var stringify = require('./util/stringify');
 var regexp = require('raptor-regexp');
 var ok = require('assert').ok;
 

package/compiler/util/stringify.js

@@ -0,0 +1,169 @@
+/*
+ * Copyright 2011 eBay Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Defines a "stringify" function that can be pulled in using require.
+ *
+ * Example:
+ * <js>
+ * var stringify = require('raptor/json/stringify');
+ * var json = stringify({hello: "world"});
+ * //Output: {"hello":"world"}
+ * </js>
+ *
+ * The Raptor stringify function supports additional options not provided
+ * by the builtin JSON object:
+ * <b>special</b>: A regular expression to indicate "special" characters that must be escaped
+ * <b>useSingleQuote</b>: If true, then single quotes will be used for strings instead of double quotes (helpful if the the string values contain a lot of double quotes)
+ *
+ */
+
+var raptorStrings = require("raptor-strings");
+var unicodeEncode = raptorStrings.unicodeEncode; //Pick up the unicodeEncode method from the strings module
+var COMMA = ",";
+var NULL = "null";
+var ARRAY = Array;
+var SPECIAL = /([^ -~]|(["'\\]))/g;
+var REPLACE_CHARS = {
+  "\b": "\\b",
+  "\t": "\\t",
+  "\n": "\\n",
+  "\f": "\\f",
+  "\r": "\\r",
+  "\\": "\\\\",
+};
+
+function stringify(o, options) {
+  if (!options) {
+    options = {};
+  }
+
+  var specialRegExp = options.special || SPECIAL;
+  var replace = options.replace || REPLACE_CHARS;
+
+  var buffer = raptorStrings.createStringBuilder();
+
+  function append(str) {
+    buffer.append(str);
+  }
+
+  var useSingleQuote = options.useSingleQuote === true;
+  var strChar = useSingleQuote === true ? "'" : '"';
+  function encodeString(s) {
+    return (
+      strChar +
+      s.replace(specialRegExp, function (c) {
+        var replacement = replace[c];
+
+        if (replacement) {
+          return replacement;
+        }
+
+        if (c === '"') {
+          return useSingleQuote ? '"' : '\\"';
+        } else if (c === "'") {
+          return useSingleQuote ? "\\'" : "'";
+        } else {
+          return unicodeEncode(c);
+        }
+      }) +
+      strChar
+    );
+  }
+
+  function serialize(o) {
+    if (o == null) {
+      append(NULL);
+      return;
+    }
+
+    var constr = o.constructor,
+      i,
+      len;
+
+    if (typeof o.toJSON === "function") {
+      if (constr !== Date) {
+        // Dates are handled later
+        o = o.toJSON();
+        if (o == null) {
+          append(NULL);
+          return;
+        }
+
+        constr = o.constructor;
+      }
+    }
+
+    if (o === true || o === false || constr === Boolean) {
+      append(o.toString());
+    } else if (constr === ARRAY) {
+      append("[");
+
+      len = o.length;
+      for (i = 0; i < len; i++) {
+        if (i !== 0) {
+          append(COMMA);
+        }
+
+        serialize(o[i]);
+      }
+
+      append("]");
+    } else if (constr === Date) {
+      append(o.getTime());
+    } else {
+      var type = typeof o;
+      switch (type) {
+        case "string":
+          append(encodeString(o));
+          break;
+        case "number":
+          append(isFinite(o) ? o + "" : NULL);
+          break;
+        case "object":
+          append("{");
+          var first = true,
+            v;
+          for (var k in o) {
+            if (o.hasOwnProperty(k)) {
+              v = o[k];
+              if (v == null || typeof v === "function") continue;
+
+              if (first === false) {
+                append(COMMA);
+              } else {
+                first = false;
+              }
+
+              append(encodeString(k));
+              append(":");
+              serialize(v);
+            }
+          }
+          append("}");
+          break;
+        default:
+          append(NULL);
+      }
+    }
+  }
+
+  serialize(o);
+
+  return buffer.toString();
+}
+
+module.exports = stringify;

package/package.json

@@ -32,10 +32,9 @@
     "jsonminify": "^0.2.3",
     "marko-async": "^2.0.0",
     "marko-layout": "^2.0.0",
-    "minimatch": "^0.2.14",
+    "minimatch": "^9.0.0",
     "property-handlers": "^1.0.0",
     "raptor-args": "^1.0.0",
-    "raptor-json": "^1.0.1",
     "raptor-logging": "^1.0.1",
     "raptor-modules": "^1.0.5",
     "raptor-polyfill": "^1.0.0",
@@ -69,5 +68,5 @@
   "logo": {
     "url": "https://raw.githubusercontent.com/marko-js/branding/master/marko-logo-small.png"
   },
-  "version": "2.11.1"
+  "version": "2.11.3"
 }

package/taglibs/core/ForNode.js

@@ -35,7 +35,7 @@ function convertNumber(str) {
     }
 }
 
-var stringify = require('raptor-json/stringify').stringify;
+var stringify = require('../../compiler/util/stringify');
 function parseForEach(value) {
     var match = value.match(forEachRegEx);
     if (match) {

package/taglibs/core/IncludeNode.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 'use strict';
-var stringify = require('raptor-json/stringify');
+var stringify = require('../../compiler/util/stringify');
 var nodePath = require('path');
 var req = require;
 var fs;

package/taglibs/core/TagHandlerNode.js

@@ -16,7 +16,7 @@
 'use strict';
 var extend = require('raptor-util').extend;
 var forEachEntry = require('raptor-util').forEachEntry;
-var stringify = require('raptor-json/stringify');
+var stringify = require('../../compiler/util/stringify');
 var isObjectEmpty = require('raptor-util/isObjectEmpty');
 var requireVarName = require('./requireVarName');
 

package/.npmignore

@@ -1 +0,0 @@
-/test