@domql/utils 3.1.2 → 3.2.7

package/dist/esm/element.js

@@ -1,33 +1,14 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { createExtends } from "./extends.js";
 import { createKey } from "./key.js";
 import { isNode } from "./node.js";
 import { createProps } from "./props.js";
 import { HTML_TAGS } from "./tags.js";
 import { is, isFunction } from "./types.js";
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const returnValueAsText = (element, parent, key) => {
   const childExtendsTag = parent.childExtends && parent.childExtends.tag;
   const childPropsTag = parent.props.childProps && parent.props.childProps.tag;
-  const isKeyValidHTMLTag = HTML_TAGS.body.indexOf(key) > -1 && key;
+  const isKeyValidHTMLTag = HTML_TAGS.body.has(key) && key;
   return {
     text: element,
     tag: childExtendsTag || childPropsTag || isKeyValidHTMLTag || "string"
@@ -39,7 +20,7 @@ const createBasedOnType = (element, parent, key) => {
       console.warn(
         key,
         "element is undefined in",
-        parent && parent.__ref && parent.__ref.path
+        parent?.__ref?.path
       );
     }
     return {};
@@ -73,8 +54,8 @@ const createRoot = (element, parent) => {
   const { __ref: ref } = element;
   const { __ref: parentRef } = parent;
   const hasRoot = parent && parent.key === ":root";
-  if (!(ref == null ? void 0 : ref.root)) {
-    ref.root = hasRoot ? element : parentRef == null ? void 0 : parentRef.root;
+  if (!ref?.root) {
+    ref.root = hasRoot ? element : parentRef?.root;
   }
 };
 const createPath = (element, parent, key) => {
@@ -104,7 +85,7 @@ const addCaching = (element, parent, key) => {
   return ref;
 };
 const createElement = (passedProps, parentEl, passedKey, opts, root) => {
-  const hashed = passedProps == null ? void 0 : passedProps.__hash;
+  const hashed = passedProps?.__hash;
   const element = hashed ? { extends: [passedProps] } : createBasedOnType(passedProps, parentEl, passedKey);
   if (!element) return;
   const parent = createParent(element, parentEl, passedKey, opts, root);
@@ -113,13 +94,14 @@ const createElement = (passedProps, parentEl, passedKey, opts, root) => {
   const props = createProps(element, parent, key);
   const context = addContext(element, parent, key, opts, root);
   const on = element.on || {};
-  return __spreadProps(__spreadValues({}, element), {
+  return {
+    ...element,
     key,
     props,
     parent,
     context,
     on
-  });
+  };
 };
 export {
   addCaching,

package/dist/esm/env.js

@@ -1,5 +1,5 @@
 // @preserve-env
-const NODE_ENV = "development";
+const NODE_ENV = process.env.NODE_ENV;
 const ENV = NODE_ENV;
 const isProduction = (env = NODE_ENV) => env === "production";
 const isTest = (env = NODE_ENV) => env === "testing" || env === "test";

package/dist/esm/events.js

@@ -6,9 +6,9 @@ function addEventFromProps(key, obj) {
   const origEvent = on[eventName];
   const funcFromProps = props[key];
   if (isFunction(origEvent)) {
-    on[eventName] = async (...args) => {
-      const originalEventRetunrs = await origEvent(...args);
-      if (originalEventRetunrs !== false) await funcFromProps(...args);
+    on[eventName] = (...args) => {
+      const originalEventRetunrs = origEvent(...args);
+      if (originalEventRetunrs !== false) funcFromProps(...args);
     };
   } else on[eventName] = funcFromProps;
 }

package/dist/esm/extends.js

@@ -1,27 +1,8 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { joinArrays, removeDuplicatesInArray } from "./array.js";
 import { matchesComponentNaming } from "./component.js";
 import { deepClone, exec } from "./object.js";
 import { isArray, isObject, isString } from "./types.js";
-const ENV = "development";
+const ENV = process.env.NODE_ENV;
 const createExtendsFromKeys = (key) => {
   if (key.includes("+")) {
     return key.split("+").filter(matchesComponentNaming);
@@ -47,13 +28,12 @@ const createExtends = (element, parent, key) => {
   return __extends;
 };
 const addExtends = (newExtends, element) => {
-  var _a;
   const { __ref: ref } = element;
   let { __extends } = ref;
   if (!newExtends) return __extends;
-  const variant = (_a = element.props) == null ? void 0 : _a.variant;
+  const variant = element.props?.variant;
   const context = element.context;
-  if (variant && (context == null ? void 0 : context.components) && !Array.isArray(newExtends) && typeof newExtends === "string") {
+  if (variant && context?.components && !Array.isArray(newExtends) && typeof newExtends === "string") {
     const variantKey = `${newExtends}.${variant}`;
     if (context.components[variantKey]) {
       newExtends = variantKey;
@@ -70,9 +50,10 @@ const concatAddExtends = (newExtend, element) => {
   const { extends: elementExtend } = element;
   const originalArray = isArray(elementExtend) ? elementExtend : [elementExtend];
   const receivedArray = isArray(newExtend) ? newExtend : [newExtend];
-  return __spreadProps(__spreadValues({}, element), {
+  return {
+    ...element,
     extends: joinArrays(receivedArray, originalArray)
-  });
+  };
 };
 const generateHash = () => Math.random().toString(36).substring(2);
 const extendStackRegistry = {};
@@ -85,7 +66,7 @@ const setHashedExtend = (extend, stack) => {
   if (!isString(extend)) {
     extend.__hash = hash;
   }
-  if (!["__proto__", "constructor", "prototype"].includes(hash)) {
+  if (hash !== "__proto__" && hash !== "constructor" && hash !== "prototype") {
     extendStackRegistry[hash] = stack;
   }
   return stack;
@@ -107,10 +88,16 @@ const extractArrayExtend = (extend, stack, context, processed = /* @__PURE__ */
   return stack;
 };
 const deepExtend = (extend, stack, context, processed = /* @__PURE__ */ new Set()) => {
-  const extendOflattenExtend = extend.extends;
-  const cleanExtend = __spreadValues({}, extend);
+  const extendOflattenExtend = extend.extends || extend.extend;
+  const cleanExtend = { ...extend };
   delete cleanExtend.extends;
-  if (Object.keys(cleanExtend).length > 0) {
+  delete cleanExtend.extend;
+  let hasKeys = false;
+  for (const _k in cleanExtend) {
+    hasKeys = true;
+    break;
+  }
+  if (hasKeys) {
     stack.push(cleanExtend);
   }
   if (extendOflattenExtend) {
@@ -128,21 +115,30 @@ const flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new S
     extend = mapStringsWithContextComponents(extend, context);
   }
   processed.add(extend);
-  if (extend == null ? void 0 : extend.extends) {
+  if (extend?.extends || extend?.extend) {
     deepExtend(extend, stack, context, processed);
   } else if (extend) {
     stack.push(extend);
   }
   return stack;
 };
+const MERGE_EXTENDS_SKIP = /* @__PURE__ */ new Set([
+  "parent",
+  "node",
+  "__ref",
+  "__proto__",
+  "extend",
+  "childExtend",
+  "childExtendRecursive"
+]);
 const deepMergeExtends = (element, extend) => {
   extend = deepClone(extend);
   for (const e in extend) {
-    if (["parent", "node", "__ref", "__proto__"].indexOf(e) > -1) continue;
+    if (MERGE_EXTENDS_SKIP.has(e)) continue;
     const elementProp = element[e];
     const extendProp = extend[e];
     if (extendProp === void 0) continue;
-    if (Object.prototype.hasOwnProperty.call(extend, e) && !["__proto__", "constructor", "prototype"].includes(e)) {
+    if (Object.prototype.hasOwnProperty.call(extend, e) && e !== "__proto__" && e !== "constructor" && e !== "prototype") {
       if (elementProp === void 0) {
         element[e] = extendProp;
       } else if (isObject(elementProp) && isObject(extendProp)) {
@@ -171,11 +167,11 @@ const cloneAndMergeArrayExtend = (stack) => {
   }, {});
 };
 const mapStringsWithContextComponents = (extend, context, options = {}, variant) => {
-  const COMPONENTS = context && context.components || options.components;
-  const PAGES = context && context.pages || options.pages;
+  const COMPONENTS = context?.components || options.components;
+  const PAGES = context?.pages || options.pages;
   if (isString(extend)) {
     const componentExists = COMPONENTS && (COMPONENTS[extend + "." + variant] || COMPONENTS[extend] || COMPONENTS["smbls." + extend]);
-    const pageExists = PAGES && extend.startsWith("/") && PAGES[extend];
+    const pageExists = PAGES && extend.charCodeAt(0) === 47 && PAGES[extend];
     if (componentExists) return componentExists;
     else if (pageExists) return pageExists;
     else {
@@ -206,7 +202,7 @@ const getExtendsInElement = (obj) => {
   let result = [];
   function traverse(o) {
     for (const key in o) {
-      if (Object.hasOwnProperty.call(o, key)) {
+      if (Object.prototype.hasOwnProperty.call(o, key)) {
         if (matchesComponentNaming(key)) {
           result.push(key);
         }
@@ -227,14 +223,16 @@ const getExtendsInElement = (obj) => {
   return result;
 };
 const createElementExtends = (element, parent, options = {}) => {
-  var _a;
   const { __ref: ref } = element;
   const context = element.context || parent.context;
-  const variant = (_a = element.props) == null ? void 0 : _a.variant;
+  const variant = element.props?.variant;
+  if (element.extend && !element.extends) element.extends = element.extend;
+  delete element.extend;
+  if (!element.extends && element.props?.extends) element.extends = element.props.extends;
   if (element.extends) {
     if (Array.isArray(element.extends) && element.extends.length > 0) {
       const [firstExtend, ...restExtends] = element.extends;
-      if (typeof firstExtend === "string" && variant && (context == null ? void 0 : context.components)) {
+      if (typeof firstExtend === "string" && variant && context?.components) {
         const variantKey = `${firstExtend}.${variant}`;
         if (context.components[variantKey]) {
           addExtends([variantKey, ...restExtends], element);
@@ -244,7 +242,7 @@ const createElementExtends = (element, parent, options = {}) => {
       } else {
         addExtends(element.extends, element);
       }
-    } else if (typeof element.extends === "string" && variant && (context == null ? void 0 : context.components)) {
+    } else if (typeof element.extends === "string" && variant && context?.components) {
       const variantKey = `${element.extends}.${variant}`;
       if (context.components[variantKey]) {
         addExtends(variantKey, element);
@@ -267,28 +265,28 @@ const createElementExtends = (element, parent, options = {}) => {
   return removeDuplicatesInArray(ref.__extends);
 };
 const inheritChildPropsExtends = (element, parent, options = {}) => {
-  var _a, _b, _c;
   const { props, __ref: ref } = element;
-  const ignoreChildExtends = options.ignoreChildExtends || (props == null ? void 0 : props.ignoreChildExtends);
+  const ignoreChildExtends = options.ignoreChildExtends || props?.ignoreChildExtends;
   if (!ignoreChildExtends) {
-    if ((_b = (_a = parent.props) == null ? void 0 : _a.childProps) == null ? void 0 : _b.extends) {
-      addExtends((_c = parent.props) == null ? void 0 : _c.childProps.extends, element);
+    if (parent.props?.childProps?.extends) {
+      addExtends(parent.props?.childProps.extends, element);
     }
   }
   return ref.__extends;
 };
 const inheritChildExtends = (element, parent, options = {}) => {
   const { props, __ref: ref } = element;
-  const ignoreChildExtends = options.ignoreChildExtends || (props == null ? void 0 : props.ignoreChildExtends);
-  if (!ignoreChildExtends && parent.childExtends) {
-    addExtends(parent.childExtends, element);
+  const ignoreChildExtends = options.ignoreChildExtends || props?.ignoreChildExtends;
+  const childExtends = parent.childExtends || parent.childExtend;
+  if (!ignoreChildExtends && childExtends) {
+    addExtends(childExtends, element);
   }
   return ref.__extends;
 };
 const inheritRecursiveChildExtends = (element, parent, options = {}) => {
   const { props, __ref: ref } = element;
-  const childExtendsRecursive = parent.childExtendsRecursive;
-  const ignoreChildExtendsRecursive = options.ignoreChildExtendsRecursive || (props == null ? void 0 : props.ignoreChildExtendsRecursive);
+  const childExtendsRecursive = parent.childExtendsRecursive || parent.childExtendRecursive;
+  const ignoreChildExtendsRecursive = options.ignoreChildExtendsRecursive || props?.ignoreChildExtendsRecursive;
   const isText = element.key === "__text";
   if (childExtendsRecursive && !isText && !ignoreChildExtendsRecursive) {
     addExtends(childExtendsRecursive, element);
@@ -298,7 +296,7 @@ const inheritRecursiveChildExtends = (element, parent, options = {}) => {
 const createExtendsStack = (element, parent, options = {}) => {
   const { props, __ref: ref } = element;
   const context = element.context || parent.context;
-  const variant = element.variant || (props == null ? void 0 : props.variant);
+  const variant = element.variant || props?.variant;
   const __extends = removeDuplicatesInArray(
     ref.__extends.map((val, i) => {
       return mapStringsWithContextComponents(

package/dist/esm/function.js

@@ -35,16 +35,16 @@ const memoize = (fn) => {
     }
   };
 };
+const RE_STRING_FUNCTION = /^((function\s*\([^)]*\)\s*\{[^}]*\})|(\([^)]*\)\s*=>))/;
 const isStringFunction = (inputString) => {
-  const functionRegex = /^((function\s*\([^)]*\)\s*\{[^}]*\})|(\([^)]*\)\s*=>))/;
-  return functionRegex.test(inputString);
+  return RE_STRING_FUNCTION.test(inputString);
 };
 function cloneFunction(fn, win = window) {
   const temp = function() {
     return fn.apply(win, arguments);
   };
   for (const key in fn) {
-    if (Object.hasOwnProperty.call(fn, key)) {
+    if (Object.prototype.hasOwnProperty.call(fn, key)) {
       temp[key] = fn[key];
     }
   }

package/dist/esm/index.js

@@ -21,3 +21,4 @@ export * from "./scope.js";
 export * from "./methods.js";
 export * from "./cache.js";
 export * from "./update.js";
+export * from "./triggerEvent.js";

package/dist/esm/key.js

@@ -1,12 +1,12 @@
 import { exec } from "./object.js";
-const generateKey = /* @__PURE__ */ function() {
+const generateKey = /* @__PURE__ */ (function() {
   let index = 0;
   function newId() {
     index++;
     return index;
   }
   return newId;
-}();
+})();
 const createSnapshotId = generateKey;
 const createKey = (element, parent, key) => {
   return (exec(key, element) || key || element.key || generateKey()).toString();

package/dist/esm/keys.js

@@ -1,4 +1,4 @@
-const DOMQ_PROPERTIES = [
+const DOMQ_PROPERTIES = /* @__PURE__ */ new Set([
   "attr",
   "style",
   "text",
@@ -8,12 +8,16 @@ const DOMQ_PROPERTIES = [
   "classlist",
   "state",
   "scope",
+  "root",
   "deps",
+  "extend",
   "extends",
   "$router",
   "routes",
   "children",
+  "childExtend",
   "childExtends",
+  "childExtendRecursive",
   "childExtendsRecursive",
   "props",
   "if",
@@ -31,8 +35,8 @@ const DOMQ_PROPERTIES = [
   "on",
   "component",
   "context"
-];
-const PARSED_DOMQ_PROPERTIES = [
+]);
+const PARSED_DOMQ_PROPERTIES = /* @__PURE__ */ new Set([
   "attr",
   "style",
   "text",
@@ -50,7 +54,7 @@ const PARSED_DOMQ_PROPERTIES = [
   "query",
   "on",
   "context"
-];
+]);
 const STATE_PROPERTIES = [
   "ref",
   "parent",
@@ -60,7 +64,7 @@ const STATE_PROPERTIES = [
   "__children",
   "root"
 ];
-const STATE_METHODS = [
+const STATE_METHODS = /* @__PURE__ */ new Set([
   "update",
   "parse",
   "clean",
@@ -93,9 +97,9 @@ const STATE_METHODS = [
   "removeByPath",
   "removePathCollection",
   "getByPath"
-];
-const PROPS_METHODS = ["update", "__element"];
-const METHODS = [
+]);
+const PROPS_METHODS = /* @__PURE__ */ new Set(["update", "__element"]);
+const METHODS = /* @__PURE__ */ new Set([
   "set",
   "reset",
   "update",
@@ -121,15 +125,25 @@ const METHODS = [
   "error",
   "call",
   "nextElement",
-  "previousElement"
-];
-const METHODS_EXL = [
-  ...["node", "context", "extends", "__element", "__ref"],
+  "previousElement",
+  "getRootState",
+  "getRoot",
+  "getRootData",
+  "getRootContext",
+  "getContext",
+  "getChildren"
+]);
+const METHODS_EXL = /* @__PURE__ */ new Set([
+  "node",
+  "context",
+  "extends",
+  "__element",
+  "__ref",
   ...METHODS,
   ...STATE_METHODS,
   ...PROPS_METHODS
-];
-const DOMQL_EVENTS = [
+]);
+const DOMQL_EVENTS = /* @__PURE__ */ new Set([
   "init",
   "beforeClassAssign",
   "render",
@@ -145,7 +159,7 @@ const DOMQL_EVENTS = [
   "complete",
   "frame",
   "update"
-];
+]);
 export {
   DOMQL_EVENTS,
   DOMQ_PROPERTIES,