Add interoperability hack to npm for functions that were built for browsers. Fixes locutusjs#145

kvz · kvz · commit ff467267210e · 2014-03-04T11:33:43.000+01:00
diff --git a/bin/phpjs.js b/bin/phpjs.js
@@ -21,7 +21,19 @@ cli.parse({
 var PhpjsUtil = phpjsutil({
   injectDependencies: ['ini_set', 'ini_get'],
   equal             : equal,
-  debug             : cli.debug
+  debug             : cli.debug,
+  globals           : {
+    'XMLHttpRequest': '{}',
+    'window': '{' +
+      'document: {' +
+        'lastModified: 1388954399,' +
+        'getElementsByTagName: function(){return [];}' +
+      '},' +
+      'location: {' +
+        'href: ""' +
+      '}' +
+    '}',
+  }
 });
 
 // Environment-specific file opener. function name needs to
@@ -152,6 +164,11 @@ cli.buildnpm = function(args, options) {
   fs.appendFileSync(options.output, '// \n');
   fs.appendFileSync(options.output, '// Make function changes in ./functions and \n');
   fs.appendFileSync(options.output, '// generator changes in ./lib/phpjsutil.js \n');
+
+  for (var global in PhpjsUtil.globals) {
+    fs.appendFileSync(options.output, 'exports.' + global + ' = ' + PhpjsUtil.globals[global] + ';\n');
+  }
+
   self.glob(pattern, function (err, params, file) {
     if (err) {
       return self.error('Could not glob for ' + pattern + '. ' + err);
diff --git a/build/npm.js b/build/npm.js
@@ -3,6 +3,8 @@
 // 
 // Make function changes in ./functions and 
 // generator changes in ./lib/phpjsutil.js 
+exports.XMLHttpRequest = {};
+exports.window = {document: {lastModified: 1388954399,getElementsByTagName: function(){return [];}},location: {href: ""}};
 
 exports.array = function () {
   try {
@@ -1229,23 +1231,6 @@ exports.array_pop = function (inputArr) {
     }
 };
 
-exports.array_product = function (input) {
-  var idx = 0,
-      product = 1,
-      il = 0;
-  
-    if (Object.prototype.toString.call(input) !== '[object Array]') {
-      return null;
-    }
-  
-    il = input.length;
-    while (idx < il) {
-      product *= (!isNaN(input[idx]) ? input[idx] : 0);
-      idx++;
-    }
-    return product;
-};
-
 exports.array_push = function (inputArr) {
   var i = 0,
       pr = '',
@@ -1278,6 +1263,23 @@ exports.array_push = function (inputArr) {
     return len + i - 1;
 };
 
+exports.array_product = function (input) {
+  var idx = 0,
+      product = 1,
+      il = 0;
+  
+    if (Object.prototype.toString.call(input) !== '[object Array]') {
+      return null;
+    }
+  
+    il = input.length;
+    while (idx < il) {
+      product *= (!isNaN(input[idx]) ? input[idx] : 0);
+      idx++;
+    }
+    return product;
+};
+
 exports.array_rand = function (input, num_req) {
   var indexes = [];
     var ticks = num_req || 1;
@@ -8242,11 +8244,6 @@ exports.is_object = function (mixed_var) {
     return mixed_var !== null && typeof mixed_var === 'object';
 };
 
-exports.is_scalar = function (mixed_var) {
-  return (/boolean|number|string/)
-      .test(typeof mixed_var);
-};
-
 exports.is_resource = function (handle) {
   var getFuncName = function(fn) {
       var name = (/\W*function\s+([\w\$]+)\s*\(/)
@@ -8260,6 +8257,11 @@ exports.is_resource = function (handle) {
       'PHPJS_Resource');
 };
 
+exports.is_scalar = function (mixed_var) {
+  return (/boolean|number|string/)
+      .test(typeof mixed_var);
+};
+
 exports.is_string = function (mixed_var) {
   return (typeof mixed_var === 'string');
 };
@@ -10526,7 +10528,11 @@ exports.setlocale = function (category, locale) {
     };
     // END STATIC
     // BEGIN REDUNDANT
-    this.php_js = this.php_js || {};
+    try {
+      this.php_js = this.php_js || {};
+    } catch (e) {
+      this.php_js = {};
+    }
   
     var phpjs = this.php_js;
   
diff --git a/functions/strings/setlocale.js b/functions/strings/setlocale.js
@@ -95,7 +95,11 @@ function setlocale(category, locale) {
   };
   // END STATIC
   // BEGIN REDUNDANT
-  this.php_js = this.php_js || {};
+  try {
+    this.php_js = this.php_js || {};
+  } catch (e) {
+    this.php_js = {};
+  }
 
   var phpjs = this.php_js;
 
@@ -343,4 +347,4 @@ function setlocale(category, locale) {
     this.php_js.localeCategories[category] = locale;
   }
   return locale;
-}
+}
diff --git a/functions/strings/str_word_count.js b/functions/strings/str_word_count.js
@@ -13,6 +13,8 @@ function str_word_count(str, format, charlist) {
   //   returns 2: {0: 'Hello', 6: 'fri', 10: 'nd', 14: "you're", 29: 'looking', 46: 'good', 51: 'today'}
   //   example 3: str_word_count("Hello fri3nd, you're\r\n       looking          good today!", 1, '\u00e0\u00e1\u00e3\u00e73');
   //   returns 3: ['Hello', 'fri3nd', "you're", 'looking', 'good', 'today']
+  //   example 4: str_word_count('hey', 2);
+  //   returns 4: {0: 'hey'}
 
   var len = str.length,
     cl = charlist && charlist.length,
@@ -102,4 +104,4 @@ function str_word_count(str, format, charlist) {
   }
 
   throw 'You have supplied an incorrect format';
-}
+}
diff --git a/lib/phpjsutil.js b/lib/phpjsutil.js
@@ -248,18 +248,9 @@ PhpjsUtil.prototype.test = function(params, cb) {
     var extracted = self.getRecursiveCode(params);
     codez = codez.concat(codez, extracted);
 
-    codez.unshift('' +
-      'XMLHttpRequest = {};' +
-      'window = {' +
-        'document: {' +
-          'lastModified: 1388954399,' +
-          'getElementsByTagName: function(){return [];}' +
-        '},' +
-        'location: {' +
-          'href: ""' +
-        '}' +
-      '};' +
-    '');
+    for (var global in self.globals) {
+      codez.unshift(global + ' = ' + self.globals[global] + ';');
+    }
 
     // Load code
     // self. refers to own function
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phpjs",
-  "version": "1.0.2",
+  "version": "1.1.2",
   "description": "php.js offers community built php functions in javascript",
   "homepage": "http://phpjs.org",
   "author": "Kevin van Zonneveld <kevin@vanzonneveld.net>",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "phpjs",`
`3`		`- "version": "1.0.2",`
	`3`	`+ "version": "1.1.2",`
`4`	`4`	`"description": "php.js offers community built php functions in javascript",`
`5`	`5`	`"homepage": "http://phpjs.org",`
`6`	`6`	`"author": "Kevin van Zonneveld <kevin@vanzonneveld.net>",`