@domql/utils 3.0.7 → 3.1.2

package/dist/cjs/env.js

@@ -18,15 +18,26 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var env_exports = {};
 __export(env_exports, {
+  ENV: () => ENV,
   NODE_ENV: () => NODE_ENV,
   getNev: () => getNev,
   isDevelopment: () => isDevelopment,
+  isLocal: () => isLocal,
+  isNotProduction: () => isNotProduction,
   isProduction: () => isProduction,
-  isTest: () => isTest
+  isStaging: () => isStaging,
+  isTest: () => isTest,
+  isTesting: () => isTesting
 });
 module.exports = __toCommonJS(env_exports);
+// @preserve-env
 const NODE_ENV = "development";
-const isProduction = (env = NODE_ENV) => env === "production" || env === "prod" || env !== "development" && env !== "dev" && env !== "test";
-const isTest = (env = NODE_ENV) => env === "test";
-const isDevelopment = (env = NODE_ENV) => env === "development" || env === "dev";
+const ENV = NODE_ENV;
+const isProduction = (env = NODE_ENV) => env === "production";
+const isTest = (env = NODE_ENV) => env === "testing" || env === "test";
+const isTesting = isTest;
+const isStaging = (env = NODE_ENV) => env === "staging";
+const isLocal = (env = NODE_ENV) => env === "local";
+const isDevelopment = (env = NODE_ENV) => env === "development" || env === "dev" || env === "local";
 const getNev = (key, env = NODE_ENV) => env[key];
+const isNotProduction = (env = NODE_ENV) => !isProduction(env);

package/dist/cjs/events.js

@@ -23,15 +23,15 @@ __export(events_exports, {
 module.exports = __toCommonJS(events_exports);
 var import_string = require("./string.js");
 var import_types = require("./types.js");
-const addEventFromProps = (key, element) => {
-  const { props, on } = element;
+function addEventFromProps(key, obj) {
+  const { props, on } = obj;
   const eventName = (0, import_string.lowercaseFirstLetter)(key.split("on")[1]);
   const origEvent = on[eventName];
   const funcFromProps = props[key];
   if ((0, import_types.isFunction)(origEvent)) {
-    on[eventName] = (...args) => {
-      const originalEventRetunrs = origEvent(...args);
-      if (originalEventRetunrs !== false) funcFromProps(...args);
+    on[eventName] = async (...args) => {
+      const originalEventRetunrs = await origEvent(...args);
+      if (originalEventRetunrs !== false) await funcFromProps(...args);
     };
   } else on[eventName] = funcFromProps;
-};
+}

package/dist/cjs/extends.js

@@ -97,7 +97,7 @@ const addExtends = (newExtends, element) => {
 };
 const concatAddExtends = (newExtend, element) => {
   if (!newExtend) return element;
-  const { extend: elementExtend } = element;
+  const { extends: elementExtend } = element;
   const originalArray = (0, import_types.isArray)(elementExtend) ? elementExtend : [elementExtend];
   const receivedArray = (0, import_types.isArray)(newExtend) ? newExtend : [newExtend];
   return {

package/dist/cjs/props.js

@@ -28,6 +28,7 @@ __export(props_exports, {
   pickupPropsFromElement: () => pickupPropsFromElement,
   propExists: () => propExists,
   propertizeElement: () => propertizeElement,
+  propertizeUpdate: () => propertizeUpdate,
   removeDuplicateProps: () => removeDuplicateProps,
   setPropsPrototype: () => setPropsPrototype,
   syncProps: () => syncProps,
@@ -50,53 +51,57 @@ const createProps = (element, parent, key) => {
   }
   return { ...props };
 };
-function pickupPropsFromElement(element, opts = {}) {
+function pickupPropsFromElement(obj, opts = {}) {
   var _a, _b, _c;
   const cachedKeys = opts.cachedKeys || [];
-  for (const key in element) {
-    const value = element[key];
-    const hasDefine = (0, import_types.isObject)((_a = element.define) == null ? void 0 : _a[key]);
-    const hasGlobalDefine = (0, import_types.isObject)((_c = (_b = element.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
+  for (const key in obj) {
+    const value = obj[key];
+    const hasDefine = (0, import_types.isObject)((_a = this.define) == null ? void 0 : _a[key]);
+    const hasGlobalDefine = (0, import_types.isObject)((_c = (_b = this.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
     const isElement = /^[A-Z]/.test(key) || /^\d+$/.test(key);
     const isBuiltin = import_keys.DOMQ_PROPERTIES.includes(key);
     if (!isElement && !isBuiltin && !hasDefine && !hasGlobalDefine) {
-      element.props[key] = value;
-      delete element[key];
+      obj.props[key] = value;
+      delete obj[key];
       cachedKeys.push(key);
     }
   }
-  return element;
+  return obj;
 }
-function pickupElementFromProps(element, opts) {
+function pickupElementFromProps(obj = this, opts) {
   var _a, _b, _c;
   const cachedKeys = opts.cachedKeys || [];
-  for (const key in element.props) {
-    const value = element.props[key];
+  for (const key in obj.props) {
+    const value = obj.props[key];
     const isEvent = key.startsWith("on") && key.length > 2;
     const isFn = (0, import_types.isFunction)(value);
     if (isEvent && isFn) {
-      (0, import_events.addEventFromProps)(key, element);
-      delete element.props[key];
+      (0, import_events.addEventFromProps)(key, obj);
+      delete obj.props[key];
       continue;
     }
     if (cachedKeys.includes(key)) continue;
-    const hasDefine = (0, import_types.isObject)((_a = element.define) == null ? void 0 : _a[key]);
-    const hasGlobalDefine = (0, import_types.isObject)((_c = (_b = element.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
+    const hasDefine = (0, import_types.isObject)((_a = this.define) == null ? void 0 : _a[key]);
+    const hasGlobalDefine = (0, import_types.isObject)((_c = (_b = this.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
     const isElement = /^[A-Z]/.test(key) || /^\d+$/.test(key);
     const isBuiltin = import_keys.DOMQ_PROPERTIES.includes(key);
     if (isElement || isBuiltin || hasDefine || hasGlobalDefine) {
-      element[key] = value;
-      delete element.props[key];
+      obj[key] = value;
+      if (obj.props) delete obj.props[key];
     }
   }
-  return element;
+  return obj;
 }
-function propertizeElement(element, opts = {}) {
+function propertizeElement(element = this) {
   const cachedKeys = [];
-  pickupPropsFromElement(element, { cachedKeys });
-  pickupElementFromProps(element, { cachedKeys });
+  pickupPropsFromElement.call(this, element, { cachedKeys });
+  pickupElementFromProps.call(this, element, { cachedKeys });
   return element;
 }
+function propertizeUpdate(params = {}) {
+  const obj = (0, import_object.deepMerge)({ on: {}, props: {} }, params);
+  return propertizeElement.call(this, obj);
+}
 const objectizeStringProperty = (propValue) => {
   if ((0, import_types.is)(propValue)("string", "number")) {
     return { inheritedString: propValue };

package/dist/esm/env.js

@@ -1,12 +1,23 @@
+// @preserve-env
 const NODE_ENV = "development";
-const isProduction = (env = NODE_ENV) => env === "production" || env === "prod" || env !== "development" && env !== "dev" && env !== "test";
-const isTest = (env = NODE_ENV) => env === "test";
-const isDevelopment = (env = NODE_ENV) => env === "development" || env === "dev";
+const ENV = NODE_ENV;
+const isProduction = (env = NODE_ENV) => env === "production";
+const isTest = (env = NODE_ENV) => env === "testing" || env === "test";
+const isTesting = isTest;
+const isStaging = (env = NODE_ENV) => env === "staging";
+const isLocal = (env = NODE_ENV) => env === "local";
+const isDevelopment = (env = NODE_ENV) => env === "development" || env === "dev" || env === "local";
 const getNev = (key, env = NODE_ENV) => env[key];
+const isNotProduction = (env = NODE_ENV) => !isProduction(env);
 export {
+  ENV,
   NODE_ENV,
   getNev,
   isDevelopment,
+  isLocal,
+  isNotProduction,
   isProduction,
-  isTest
+  isStaging,
+  isTest,
+  isTesting
 };

package/dist/esm/events.js

@@ -1,17 +1,17 @@
 import { lowercaseFirstLetter } from "./string.js";
 import { isFunction } from "./types.js";
-const addEventFromProps = (key, element) => {
-  const { props, on } = element;
+function addEventFromProps(key, obj) {
+  const { props, on } = obj;
   const eventName = lowercaseFirstLetter(key.split("on")[1]);
   const origEvent = on[eventName];
   const funcFromProps = props[key];
   if (isFunction(origEvent)) {
-    on[eventName] = (...args) => {
-      const originalEventRetunrs = origEvent(...args);
-      if (originalEventRetunrs !== false) funcFromProps(...args);
+    on[eventName] = async (...args) => {
+      const originalEventRetunrs = await origEvent(...args);
+      if (originalEventRetunrs !== false) await funcFromProps(...args);
     };
   } else on[eventName] = funcFromProps;
-};
+}
 export {
   addEventFromProps
 };

package/dist/esm/extends.js

@@ -67,7 +67,7 @@ const addExtends = (newExtends, element) => {
 };
 const concatAddExtends = (newExtend, element) => {
   if (!newExtend) return element;
-  const { extend: elementExtend } = element;
+  const { extends: elementExtend } = element;
   const originalArray = isArray(elementExtend) ? elementExtend : [elementExtend];
   const receivedArray = isArray(newExtend) ? newExtend : [newExtend];
   return __spreadProps(__spreadValues({}, element), {

package/dist/esm/props.js

@@ -29,53 +29,57 @@ const createProps = (element, parent, key) => {
   }
   return __spreadValues({}, props);
 };
-function pickupPropsFromElement(element, opts = {}) {
+function pickupPropsFromElement(obj, opts = {}) {
   var _a, _b, _c;
   const cachedKeys = opts.cachedKeys || [];
-  for (const key in element) {
-    const value = element[key];
-    const hasDefine = isObject((_a = element.define) == null ? void 0 : _a[key]);
-    const hasGlobalDefine = isObject((_c = (_b = element.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
+  for (const key in obj) {
+    const value = obj[key];
+    const hasDefine = isObject((_a = this.define) == null ? void 0 : _a[key]);
+    const hasGlobalDefine = isObject((_c = (_b = this.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
     const isElement = /^[A-Z]/.test(key) || /^\d+$/.test(key);
     const isBuiltin = DOMQ_PROPERTIES.includes(key);
     if (!isElement && !isBuiltin && !hasDefine && !hasGlobalDefine) {
-      element.props[key] = value;
-      delete element[key];
+      obj.props[key] = value;
+      delete obj[key];
       cachedKeys.push(key);
     }
   }
-  return element;
+  return obj;
 }
-function pickupElementFromProps(element, opts) {
+function pickupElementFromProps(obj = this, opts) {
   var _a, _b, _c;
   const cachedKeys = opts.cachedKeys || [];
-  for (const key in element.props) {
-    const value = element.props[key];
+  for (const key in obj.props) {
+    const value = obj.props[key];
     const isEvent = key.startsWith("on") && key.length > 2;
     const isFn = isFunction(value);
     if (isEvent && isFn) {
-      addEventFromProps(key, element);
-      delete element.props[key];
+      addEventFromProps(key, obj);
+      delete obj.props[key];
       continue;
     }
     if (cachedKeys.includes(key)) continue;
-    const hasDefine = isObject((_a = element.define) == null ? void 0 : _a[key]);
-    const hasGlobalDefine = isObject((_c = (_b = element.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
+    const hasDefine = isObject((_a = this.define) == null ? void 0 : _a[key]);
+    const hasGlobalDefine = isObject((_c = (_b = this.context) == null ? void 0 : _b.define) == null ? void 0 : _c[key]);
     const isElement = /^[A-Z]/.test(key) || /^\d+$/.test(key);
     const isBuiltin = DOMQ_PROPERTIES.includes(key);
     if (isElement || isBuiltin || hasDefine || hasGlobalDefine) {
-      element[key] = value;
-      delete element.props[key];
+      obj[key] = value;
+      if (obj.props) delete obj.props[key];
     }
   }
-  return element;
+  return obj;
 }
-function propertizeElement(element, opts = {}) {
+function propertizeElement(element = this) {
   const cachedKeys = [];
-  pickupPropsFromElement(element, { cachedKeys });
-  pickupElementFromProps(element, { cachedKeys });
+  pickupPropsFromElement.call(this, element, { cachedKeys });
+  pickupElementFromProps.call(this, element, { cachedKeys });
   return element;
 }
+function propertizeUpdate(params = {}) {
+  const obj = deepMerge({ on: {}, props: {} }, params);
+  return propertizeElement.call(this, obj);
+}
 const objectizeStringProperty = (propValue) => {
   if (is(propValue)("string", "number")) {
     return { inheritedString: propValue };
@@ -208,6 +212,7 @@ export {
   pickupPropsFromElement,
   propExists,
   propertizeElement,
+  propertizeUpdate,
   removeDuplicateProps,
   setPropsPrototype,
   syncProps,

package/env.js

@@ -1,13 +1,15 @@
 'use strict'
 
+// @preserve-env
 export const NODE_ENV = process.env.NODE_ENV
+export const ENV = NODE_ENV
 
-export const isProduction = (env = NODE_ENV) =>
-  env === 'production' ||
-  env === 'prod' ||
-  (env !== 'development' && env !== 'dev' && env !== 'test')
-export const isTest = (env = NODE_ENV) => env === 'test'
+export const isProduction = (env = NODE_ENV) => env === 'production'
+export const isTest = (env = NODE_ENV) => env === 'testing' || env === 'test'
+export const isTesting = isTest
+export const isStaging = (env = NODE_ENV) => env === 'staging'
+export const isLocal = (env = NODE_ENV) => env === 'local'
 export const isDevelopment = (env = NODE_ENV) =>
-  env === 'development' || env === 'dev'
-
+  env === 'development' || env === 'dev' || env === 'local'
 export const getNev = (key, env = NODE_ENV) => env[key]
+export const isNotProduction = (env = NODE_ENV) => !isProduction(env)

package/events.js

@@ -3,15 +3,15 @@
 import { lowercaseFirstLetter } from './string.js'
 import { isFunction } from './types.js'
 
-export const addEventFromProps = (key, element) => {
-  const { props, on } = element
+export function addEventFromProps (key, obj) {
+  const { props, on } = obj
   const eventName = lowercaseFirstLetter(key.split('on')[1])
   const origEvent = on[eventName]
   const funcFromProps = props[key]
   if (isFunction(origEvent)) {
-    on[eventName] = (...args) => {
-      const originalEventRetunrs = origEvent(...args)
-      if (originalEventRetunrs !== false) funcFromProps(...args)
+    on[eventName] = async (...args) => {
+      const originalEventRetunrs = await origEvent(...args)
+      if (originalEventRetunrs !== false) await funcFromProps(...args)
     }
   } else on[eventName] = funcFromProps
 }

package/extends.js

@@ -70,7 +70,7 @@ export const addExtends = (newExtends, element) => {
 
 export const concatAddExtends = (newExtend, element) => {
   if (!newExtend) return element
-  const { extend: elementExtend } = element
+  const { extends: elementExtend } = element
   const originalArray = isArray(elementExtend) ? elementExtend : [elementExtend]
   const receivedArray = isArray(newExtend) ? newExtend : [newExtend]
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "3.0.7",
+  "version": "3.1.2",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -21,11 +21,11 @@
     "copy:package:cjs": "cp ../../build/package-cjs.json dist/cjs/package.json",
     "build:esm": "npx esbuild *.js --target=es2017 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild *.js --target=node16 --format=cjs --outdir=dist/cjs",
-    "build": "rimraf -I dist; npm run build:cjs; npm run build:esm",
+    "build": "npx rimraf -I dist; npm run build:cjs; npm run build:esm",
     "prepublish": "npm run build; npm run copy:package:cjs"
   },
-  "gitHead": "ad8d42d52cce0024e5df6b2e364f660e0e4dd02d",
+  "gitHead": "429b36616aa04c8587a26ce3c129815115e35897",
   "devDependencies": {
-    "@babel/core": "^7.12.0"
+    "@babel/core": "^7.26.0"
   }
 }

package/props.js

@@ -18,70 +18,76 @@ export const createProps = (element, parent, key) => {
   return { ...props }
 }
 
-export function pickupPropsFromElement (element, opts = {}) {
+export function pickupPropsFromElement (obj, opts = {}) {
   const cachedKeys = opts.cachedKeys || []
 
-  for (const key in element) {
-    const value = element[key]
+  for (const key in obj) {
+    const value = obj[key]
 
-    const hasDefine = isObject(element.define?.[key])
-    const hasGlobalDefine = isObject(element.context?.define?.[key])
+    const hasDefine = isObject(this.define?.[key])
+    const hasGlobalDefine = isObject(this.context?.define?.[key])
     const isElement = /^[A-Z]/.test(key) || /^\d+$/.test(key)
     const isBuiltin = DOMQ_PROPERTIES.includes(key)
 
     // If it's not a special case, move to props
     if (!isElement && !isBuiltin && !hasDefine && !hasGlobalDefine) {
-      element.props[key] = value
-      delete element[key]
+      obj.props[key] = value
+      delete obj[key]
       cachedKeys.push(key)
     }
   }
 
-  return element
+  return obj
 }
 
-export function pickupElementFromProps (element, opts) {
+export function pickupElementFromProps (obj = this, opts) {
   const cachedKeys = opts.cachedKeys || []
 
-  for (const key in element.props) {
-    const value = element.props[key]
+  for (const key in obj.props) {
+    const value = obj.props[key]
 
     // Handle event handlers
     const isEvent = key.startsWith('on') && key.length > 2
     const isFn = isFunction(value)
 
     if (isEvent && isFn) {
-      addEventFromProps(key, element)
-      delete element.props[key]
+      addEventFromProps(key, obj)
+      delete obj.props[key]
       continue
     }
 
-    // Skip if key was originally from element
+    // Skip if key was originally from obj
     if (cachedKeys.includes(key)) continue
 
-    const hasDefine = isObject(element.define?.[key])
-    const hasGlobalDefine = isObject(element.context?.define?.[key])
+    const hasDefine = isObject(this.define?.[key])
+    const hasGlobalDefine = isObject(this.context?.define?.[key])
     const isElement = /^[A-Z]/.test(key) || /^\d+$/.test(key)
     const isBuiltin = DOMQ_PROPERTIES.includes(key)
 
-    // Move qualifying properties back to element root
+    // Move qualifying properties back to obj root
     if (isElement || isBuiltin || hasDefine || hasGlobalDefine) {
-      element[key] = value
-      delete element.props[key]
+      obj[key] = value
+
+      if (obj.props) delete obj.props[key]
     }
   }
 
-  return element
+  return obj
 }
 
 // Helper function to maintain compatibility with original propertizeElement
-export function propertizeElement (element, opts = {}) {
+export function propertizeElement (element = this) {
   const cachedKeys = []
-  pickupPropsFromElement(element, { cachedKeys })
-  pickupElementFromProps(element, { cachedKeys })
+  pickupPropsFromElement.call(this, element, { cachedKeys })
+  pickupElementFromProps.call(this, element, { cachedKeys })
   return element
 }
 
+export function propertizeUpdate (params = {}) {
+  const obj = deepMerge({ on: {}, props: {} }, params)
+  return propertizeElement.call(this, obj)
+}
+
 export const objectizeStringProperty = propValue => {
   if (is(propValue)('string', 'number')) {
     return { inheritedString: propValue }