@acemir/cssom 0.9.26 → 0.9.27

package/build/CSSOM.js

@@ -1,17 +1,56 @@
-var __globalObject = null;
-
 var CSSOM = {
-    setup: function(opts) {
-        if (opts.globalObject) {
-            __globalObject = opts.globalObject;
-        }
-    },
-    getGlobalObject: function() {
-        return __globalObject;
+  /**
+   * Creates and configures a new CSSOM instance with the specified options.
+   * 
+   * @param {Object} opts - Configuration options for the CSSOM instance
+   * @param {Object} [opts.globalObject] - Optional global object to be assigned to CSSOM objects prototype
+   * @returns {Object} A new CSSOM instance with the applied configuration
+   * @description
+   * This method creates a new instance of CSSOM and optionally
+   * configures CSSStyleSheet with a global object reference. When a globalObject is provided
+   * and CSSStyleSheet exists on the instance, it creates a new CSSStyleSheet constructor
+   * using a factory function and assigns the globalObject to its prototype's __globalObject property.
+   */
+  setup: function (opts) {
+    var instance = Object.create(this);
+    if (opts.globalObject) {
+      if (instance.CSSStyleSheet) {
+        const factoryCSSStyleSheet = createFunctionFactory(instance.CSSStyleSheet);
+        const CSSStyleSheet = factoryCSSStyleSheet();
+        CSSStyleSheet.prototype.__globalObject = opts.globalObject;
+
+        instance.CSSStyleSheet = CSSStyleSheet;
+      }
     }
+    return instance;
+  }
 };
 
+function createFunctionFactory(fn) {
+  return function() {
+    // Create a new function that delegates to the original
+    var newFn = function() {
+      return fn.apply(this, arguments);
+    };
 
+    // Copy prototype chain
+    Object.setPrototypeOf(newFn, Object.getPrototypeOf(fn));
+
+    // Copy own properties
+    for (var key in fn) {
+      if (Object.prototype.hasOwnProperty.call(fn, key)) {
+        newFn[key] = fn[key];
+      }
+    }
+
+    // Clone the .prototype object for constructor-like behavior
+    if (fn.prototype) {
+      newFn.prototype = Object.create(fn.prototype);
+    }
+
+    return newFn;
+  };
+}
 
 
 
@@ -27,8 +66,19 @@ var CSSOM = {
  * @return {Function} The error constructor
  */
 function getErrorConstructor(context, errorType) {
-	if (CSSOM.getGlobalObject() && CSSOM.getGlobalObject()[errorType]) {
-		return CSSOM.getGlobalObject()[errorType];
+	// Try parentStyleSheet.__globalObject first
+	if (context.parentStyleSheet && context.parentStyleSheet.__globalObject && context.parentStyleSheet.__globalObject[errorType]) {
+		return context.parentStyleSheet.__globalObject[errorType];
+	}
+	
+	// Try __parentStyleSheet (alternative naming)
+	if (context.__parentStyleSheet && context.__parentStyleSheet.__globalObject && context.__parentStyleSheet.__globalObject[errorType]) {
+		return context.__parentStyleSheet.__globalObject[errorType];
+	}
+	
+	// Try __globalObject on the context itself
+	if (context.__globalObject && context.__globalObject[errorType]) {
+		return context.__globalObject[errorType];
 	}
 	
 	// Fall back to native constructor
@@ -1826,14 +1876,14 @@ CSSOM.CSSStyleSheet.prototype.removeRule = function(index) {
  */
 CSSOM.CSSStyleSheet.prototype.replace = function(text) {
 	var _Promise;
-	if (CSSOM.getGlobalObject() && CSSOM.getGlobalObject()['Promise']) {
-		_Promise = CSSOM.getGlobalObject()['Promise'];
+	if (this.__globalObject && this.__globalObject['Promise']) {
+		_Promise = this.__globalObject['Promise'];
 	} else {
 		_Promise = Promise;
 	}
 	var _setTimeout;
-	if (CSSOM.getGlobalObject() && CSSOM.getGlobalObject()['setTimeout']) {
-		_setTimeout = CSSOM.getGlobalObject()['setTimeout'];
+	if (this.__globalObject && this.__globalObject['setTimeout']) {
+		_setTimeout = this.__globalObject['setTimeout'];
 	} else {
 		_setTimeout = setTimeout;
 	}
@@ -2924,17 +2974,17 @@ Object.defineProperty(CSSOM.CSSPageRule.prototype, "cssText", {
 
 
 /**
- * Parses a CSS string and returns a CSSOM.CSSStyleSheet object representing the parsed stylesheet.
+ * Parses a CSS string and returns a `CSSStyleSheet` object representing the parsed stylesheet.
  *
  * @param {string} token - The CSS string to parse.
  * @param {object} [opts] - Optional parsing options.
- * @param {object} [opts.globalObject] - @deprecated This property will be removed in the next release. Use CSSOM.setup({ globalObject }) instead. - An optional global object to override globals and window. Useful on jsdom webplatform tests.
+ * @param {object} [opts.globalObject] - An optional global object to prioritize over the window object. Useful on jsdom webplatform tests.
  * @param {Element | ProcessingInstruction} [opts.ownerNode] - The owner node of the stylesheet.
  * @param {CSSRule} [opts.ownerRule] - The owner rule of the stylesheet.
  * @param {CSSOM.CSSStyleSheet} [opts.styleSheet] - Reuse a style sheet instead of creating a new one (e.g. as `parentStyleSheet`)
  * @param {CSSOM.CSSRuleList} [opts.cssRules] - Prepare all rules in this list instead of mutating the style sheet continually
  * @param {function|boolean} [errorHandler] - Optional error handler function or `true` to use `console.error`.
- * @returns {CSSOM.CSSStyleSheet} The parsed CSSStyleSheet object.
+ * @returns {CSSOM.CSSStyleSheet} The parsed `CSSStyleSheet` object.
  */
 CSSOM.parse = function parse(token, opts, errorHandler) {
 	errorHandler = errorHandler === true ? (console && console.error) : errorHandler;
@@ -2983,7 +3033,11 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	if (opts && opts.styleSheet) {
 		styleSheet = opts.styleSheet;
 	} else {
-		styleSheet = new CSSOM.CSSStyleSheet()
+		if (opts && opts.globalObject && opts.globalObject.CSSStyleSheet) {
+			styleSheet = new opts.globalObject.CSSStyleSheet();
+		} else {
+			styleSheet = new CSSOM.CSSStyleSheet();
+		}
 		styleSheet.__constructed = false;
 	}
 
@@ -2994,10 +3048,6 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		topScope = styleSheet;
 	}
 
-	if (opts && opts.globalObject) {
-		CSSOM.setup({ globalObject: opts.globalObject });
-	}
-
 	if (opts && opts.ownerNode) {
 		styleSheet.__ownerNode = opts.ownerNode;
 		var ownerNodeMedia = opts.ownerNode.media || (opts.ownerNode.getAttribute && opts.ownerNode.getAttribute("media"));
@@ -5029,6 +5079,9 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 						});
 						if (isValid) {
 							importRule = new CSSOM.CSSImportRule();
+							if (opts && opts.globalObject && opts.globalObject.CSSStyleSheet) {
+								importRule.styleSheet = new opts.globalObject.CSSStyleSheet();
+							}
 							importRule.__parentStyleSheet = importRule.styleSheet.__parentStyleSheet = styleSheet;
 							importRule.parse(buffer + character);
 							topScope.cssRules.push(importRule);

package/lib/CSSOM.js

@@ -1,18 +1,58 @@
-var __globalObject = null;
-
 var CSSOM = {
-    setup: function(opts) {
-        if (opts.globalObject) {
-            __globalObject = opts.globalObject;
-        }
-    },
-    getGlobalObject: function() {
-        return __globalObject;
+  /**
+   * Creates and configures a new CSSOM instance with the specified options.
+   * 
+   * @param {Object} opts - Configuration options for the CSSOM instance
+   * @param {Object} [opts.globalObject] - Optional global object to be assigned to CSSOM objects prototype
+   * @returns {Object} A new CSSOM instance with the applied configuration
+   * @description
+   * This method creates a new instance of CSSOM and optionally
+   * configures CSSStyleSheet with a global object reference. When a globalObject is provided
+   * and CSSStyleSheet exists on the instance, it creates a new CSSStyleSheet constructor
+   * using a factory function and assigns the globalObject to its prototype's __globalObject property.
+   */
+  setup: function (opts) {
+    var instance = Object.create(this);
+    if (opts.globalObject) {
+      if (instance.CSSStyleSheet) {
+        const factoryCSSStyleSheet = createFunctionFactory(instance.CSSStyleSheet);
+        const CSSStyleSheet = factoryCSSStyleSheet();
+        CSSStyleSheet.prototype.__globalObject = opts.globalObject;
+
+        instance.CSSStyleSheet = CSSStyleSheet;
+      }
     }
+    return instance;
+  }
 };
 
+function createFunctionFactory(fn) {
+  return function() {
+    // Create a new function that delegates to the original
+    var newFn = function() {
+      return fn.apply(this, arguments);
+    };
+
+    // Copy prototype chain
+    Object.setPrototypeOf(newFn, Object.getPrototypeOf(fn));
+
+    // Copy own properties
+    for (var key in fn) {
+      if (Object.prototype.hasOwnProperty.call(fn, key)) {
+        newFn[key] = fn[key];
+      }
+    }
+
+    // Clone the .prototype object for constructor-like behavior
+    if (fn.prototype) {
+      newFn.prototype = Object.create(fn.prototype);
+    }
+
+    return newFn;
+  };
+}
+
 //.CommonJS
-exports.setup = CSSOM.setup;
-exports.getGlobalObject = CSSOM.getGlobalObject;
+module.exports = CSSOM;
 ///CommonJS
 

package/lib/CSSStyleSheet.js

@@ -1,6 +1,5 @@
 //.CommonJS
 var CSSOM = {
-	getGlobalObject: require('./CSSOM').getGlobalObject,
 	MediaList: require("./MediaList").MediaList,
 	StyleSheet: require("./StyleSheet").StyleSheet,
 	CSSRuleList: require("./CSSRuleList").CSSRuleList,
@@ -272,14 +271,14 @@ CSSOM.CSSStyleSheet.prototype.removeRule = function(index) {
  */
 CSSOM.CSSStyleSheet.prototype.replace = function(text) {
 	var _Promise;
-	if (CSSOM.getGlobalObject() && CSSOM.getGlobalObject()['Promise']) {
-		_Promise = CSSOM.getGlobalObject()['Promise'];
+	if (this.__globalObject && this.__globalObject['Promise']) {
+		_Promise = this.__globalObject['Promise'];
 	} else {
 		_Promise = Promise;
 	}
 	var _setTimeout;
-	if (CSSOM.getGlobalObject() && CSSOM.getGlobalObject()['setTimeout']) {
-		_setTimeout = CSSOM.getGlobalObject()['setTimeout'];
+	if (this.__globalObject && this.__globalObject['setTimeout']) {
+		_setTimeout = this.__globalObject['setTimeout'];
 	} else {
 		_setTimeout = setTimeout;
 	}

package/lib/errorUtils.js

@@ -1,9 +1,3 @@
-//.CommonJS
-var CSSOM = {
-	getGlobalObject: require('./CSSOM').getGlobalObject
-}
-///CommonJS
-
 // Utility functions for CSSOM error handling
 
 /**
@@ -16,8 +10,19 @@ var CSSOM = {
  * @return {Function} The error constructor
  */
 function getErrorConstructor(context, errorType) {
-	if (CSSOM.getGlobalObject() && CSSOM.getGlobalObject()[errorType]) {
-		return CSSOM.getGlobalObject()[errorType];
+	// Try parentStyleSheet.__globalObject first
+	if (context.parentStyleSheet && context.parentStyleSheet.__globalObject && context.parentStyleSheet.__globalObject[errorType]) {
+		return context.parentStyleSheet.__globalObject[errorType];
+	}
+	
+	// Try __parentStyleSheet (alternative naming)
+	if (context.__parentStyleSheet && context.__parentStyleSheet.__globalObject && context.__parentStyleSheet.__globalObject[errorType]) {
+		return context.__parentStyleSheet.__globalObject[errorType];
+	}
+	
+	// Try __globalObject on the context itself
+	if (context.__globalObject && context.__globalObject[errorType]) {
+		return context.__globalObject[errorType];
 	}
 	
 	// Fall back to native constructor

package/lib/parse.js

@@ -1,21 +1,19 @@
 //.CommonJS
-var CSSOM = {
-	setup: require('./CSSOM').setup
-};
+var CSSOM = {};
 ///CommonJS
 
 /**
- * Parses a CSS string and returns a CSSOM.CSSStyleSheet object representing the parsed stylesheet.
+ * Parses a CSS string and returns a `CSSStyleSheet` object representing the parsed stylesheet.
  *
  * @param {string} token - The CSS string to parse.
  * @param {object} [opts] - Optional parsing options.
- * @param {object} [opts.globalObject] - @deprecated This property will be removed in the next release. Use CSSOM.setup({ globalObject }) instead. - An optional global object to override globals and window. Useful on jsdom webplatform tests.
+ * @param {object} [opts.globalObject] - An optional global object to prioritize over the window object. Useful on jsdom webplatform tests.
  * @param {Element | ProcessingInstruction} [opts.ownerNode] - The owner node of the stylesheet.
  * @param {CSSRule} [opts.ownerRule] - The owner rule of the stylesheet.
  * @param {CSSOM.CSSStyleSheet} [opts.styleSheet] - Reuse a style sheet instead of creating a new one (e.g. as `parentStyleSheet`)
  * @param {CSSOM.CSSRuleList} [opts.cssRules] - Prepare all rules in this list instead of mutating the style sheet continually
  * @param {function|boolean} [errorHandler] - Optional error handler function or `true` to use `console.error`.
- * @returns {CSSOM.CSSStyleSheet} The parsed CSSStyleSheet object.
+ * @returns {CSSOM.CSSStyleSheet} The parsed `CSSStyleSheet` object.
  */
 CSSOM.parse = function parse(token, opts, errorHandler) {
 	errorHandler = errorHandler === true ? (console && console.error) : errorHandler;
@@ -64,7 +62,11 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	if (opts && opts.styleSheet) {
 		styleSheet = opts.styleSheet;
 	} else {
-		styleSheet = new CSSOM.CSSStyleSheet()
+		if (opts && opts.globalObject && opts.globalObject.CSSStyleSheet) {
+			styleSheet = new opts.globalObject.CSSStyleSheet();
+		} else {
+			styleSheet = new CSSOM.CSSStyleSheet();
+		}
 		styleSheet.__constructed = false;
 	}
 
@@ -75,10 +77,6 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		topScope = styleSheet;
 	}
 
-	if (opts && opts.globalObject) {
-		CSSOM.setup({ globalObject: opts.globalObject });
-	}
-
 	if (opts && opts.ownerNode) {
 		styleSheet.__ownerNode = opts.ownerNode;
 		var ownerNodeMedia = opts.ownerNode.media || (opts.ownerNode.getAttribute && opts.ownerNode.getAttribute("media"));
@@ -2110,6 +2108,9 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 						});
 						if (isValid) {
 							importRule = new CSSOM.CSSImportRule();
+							if (opts && opts.globalObject && opts.globalObject.CSSStyleSheet) {
+								importRule.styleSheet = new opts.globalObject.CSSStyleSheet();
+							}
 							importRule.__parentStyleSheet = importRule.styleSheet.__parentStyleSheet = styleSheet;
 							importRule.parse(buffer + character);
 							topScope.cssRules.push(importRule);
@@ -2484,9 +2485,5 @@ CSSOM.CSSLayerBlockRule = require("./CSSLayerBlockRule").CSSLayerBlockRule;
 CSSOM.CSSLayerStatementRule = require("./CSSLayerStatementRule").CSSLayerStatementRule;
 CSSOM.CSSPageRule = require("./CSSPageRule").CSSPageRule;
 // Use cssstyle if available
-try {
-	CSSOM.CSSStyleDeclaration = require("cssstyle").CSSStyleDeclaration;
-} catch (e) {
-	// ignore
-}
+require("./cssstyleTryCatchBlock");
 ///CommonJS

package/package.json

@@ -7,7 +7,7 @@
     "parser",
     "styleSheet"
   ],
-  "version": "0.9.26",
+  "version": "0.9.27",
   "author": "Nikita Vasilyev <me@elv1s.ru>",
   "contributors": [
     "Acemir Sousa Mendes <acemirsm@gmail.com>"