@domql/utils 2.3.153 → 2.4.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 symbo.ls
+Copyright (c) 2023 symbo.ls
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/cookie.js

@@ -0,0 +1,28 @@
+'use strict'
+
+import { isUndefined } from './types'
+
+export const isMobile = (() => typeof navigator === 'undefined'
+  ? false
+  : /Mobi/.test(navigator.userAgent))()
+
+export const setCookie = (cname, cvalue, exdays = 365) => {
+  if (isUndefined(document) || isUndefined(document.cookie)) return
+  const d = new Date()
+  d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000))
+  const expires = `expires=${d.toUTCString()}`
+  document.cookie = `${cname}=${cvalue};${expires};path=/`
+}
+
+export const getCookie = (cname) => {
+  if (isUndefined(document) || isUndefined(document.cookie)) return
+  const name = `${cname}=`
+  const decodedCookie = decodeURIComponent(document.cookie)
+  const ca = decodedCookie.split(';')
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i]
+    while (c.charAt(0) === ' ') c = c.substring(1)
+    if (c.indexOf(name) === 0) return c.substring(name.length, c.length)
+  }
+  return ''
+}

package/dist/cjs/cookie.js

@@ -0,0 +1,50 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cookie_exports = {};
+__export(cookie_exports, {
+  getCookie: () => getCookie,
+  isMobile: () => isMobile,
+  setCookie: () => setCookie
+});
+module.exports = __toCommonJS(cookie_exports);
+var import_types = require("./types");
+const isMobile = (() => typeof navigator === "undefined" ? false : /Mobi/.test(navigator.userAgent))();
+const setCookie = (cname, cvalue, exdays = 365) => {
+  if ((0, import_types.isUndefined)(document) || (0, import_types.isUndefined)(document.cookie))
+    return;
+  const d = /* @__PURE__ */ new Date();
+  d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1e3);
+  const expires = `expires=${d.toUTCString()}`;
+  document.cookie = `${cname}=${cvalue};${expires};path=/`;
+};
+const getCookie = (cname) => {
+  if ((0, import_types.isUndefined)(document) || (0, import_types.isUndefined)(document.cookie))
+    return;
+  const name = `${cname}=`;
+  const decodedCookie = decodeURIComponent(document.cookie);
+  const ca = decodedCookie.split(";");
+  for (let i = 0; i < ca.length; i++) {
+    let c = ca[i];
+    while (c.charAt(0) === " ")
+      c = c.substring(1);
+    if (c.indexOf(name) === 0)
+      return c.substring(name.length, c.length);
+  }
+  return "";
+};

package/dist/cjs/env.js

@@ -0,0 +1,32 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var env_exports = {};
+__export(env_exports, {
+  NODE_ENV: () => NODE_ENV,
+  getNev: () => getNev,
+  isDevelopment: () => isDevelopment,
+  isProduction: () => isProduction,
+  isTest: () => isTest
+});
+module.exports = __toCommonJS(env_exports);
+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 getNev = (key, env = NODE_ENV) => env[key];

package/dist/cjs/globals.js

@@ -0,0 +1,30 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var globals_exports = {};
+__export(globals_exports, {
+  document: () => document,
+  global: () => global,
+  self: () => self,
+  window: () => window
+});
+module.exports = __toCommonJS(globals_exports);
+const global = globalThis;
+const self = globalThis;
+const window = globalThis;
+const document = window.document;

package/dist/cjs/index.js

@@ -15,7 +15,8 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 module.exports = __toCommonJS(utils_exports);
-__reExport(utils_exports, require("@domql/key"), module.exports);
+__reExport(utils_exports, require("./key.js"), module.exports);
+__reExport(utils_exports, require("./env.js"), module.exports);
 __reExport(utils_exports, require("./types.js"), module.exports);
 __reExport(utils_exports, require("./object.js"), module.exports);
 __reExport(utils_exports, require("./function.js"), module.exports);
@@ -23,3 +24,5 @@ __reExport(utils_exports, require("./array.js"), module.exports);
 __reExport(utils_exports, require("./node.js"), module.exports);
 __reExport(utils_exports, require("./log.js"), module.exports);
 __reExport(utils_exports, require("./string.js"), module.exports);
+__reExport(utils_exports, require("./globals.js"), module.exports);
+__reExport(utils_exports, require("./cookie.js"), module.exports);

package/dist/cjs/key.js

@@ -0,0 +1,33 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var key_exports = {};
+__export(key_exports, {
+  createKey: () => createKey,
+  createSnapshotId: () => createSnapshotId
+});
+module.exports = __toCommonJS(key_exports);
+const createKey = function() {
+  let index = 0;
+  function newId() {
+    index++;
+    return index;
+  }
+  return newId;
+}();
+const createSnapshotId = createKey;

package/dist/cjs/object.js

@@ -64,9 +64,8 @@ const map = (obj, extention, element) => {
 };
 const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
-    if (e === "__proto__")
-      continue;
-    if (excludeFrom.includes(e) || e.startsWith("__"))
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, e);
+    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const objProp = obj[e];
@@ -78,9 +77,8 @@ const merge = (element, obj, excludeFrom = []) => {
 };
 const deepMerge = (element, extend, excludeFrom = []) => {
   for (const e in extend) {
-    if (e === "__proto__")
-      continue;
-    if (excludeFrom.includes(e) || e.startsWith("__"))
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(extend, e);
+    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const extendProp = extend[e];
@@ -95,7 +93,8 @@ const deepMerge = (element, extend, excludeFrom = []) => {
 const clone = (obj, excludeFrom = []) => {
   const o = {};
   for (const prop in obj) {
-    if (excludeFrom.includes(prop) || prop.startsWith("__"))
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop);
+    if (!hasOwnProperty || excludeFrom.includes(prop) || prop.startsWith("__"))
       continue;
     o[prop] = obj[prop];
   }
@@ -107,7 +106,8 @@ const deepCloneExclude = (obj, excludeFrom = []) => {
   }
   const o = {};
   for (const k in obj) {
-    if (excludeFrom.includes(k) || k.startsWith("__"))
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, k);
+    if (!hasOwnProperty || excludeFrom.includes(k) || k.startsWith("__"))
       continue;
     let v = obj[k];
     if (k === "extend" && (0, import_types.isArray)(v)) {
@@ -231,7 +231,8 @@ const detachFunctionsFromObject = (obj, detached = {}) => {
 };
 const deepDestringify = (obj, stringified = {}) => {
   for (const prop in obj) {
-    if (prop === "__proto__")
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop);
+    if (!hasOwnProperty)
       continue;
     const objProp = obj[prop];
     if ((0, import_types.isString)(objProp)) {

package/dist/cjs/string.js

@@ -30,10 +30,11 @@ const stringIncludesAny = (str, characters) => {
   }
   return false;
 };
+const brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g;
 const replaceLiteralsWithObjectFields = (str, state) => {
   if (!str.includes("{{"))
     return str;
-  return str.replace(/\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g, (_, parentPath, variable) => {
+  return str.replace(brackRegex, (_, parentPath, variable) => {
     if (parentPath) {
       const parentLevels = parentPath.match(/\.\.\//g).length;
       let parentState = state;

package/env.js

@@ -0,0 +1,10 @@
+'use strict'
+
+export const NODE_ENV = process.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 isDevelopment = (env = NODE_ENV) => env === 'development' || env === 'dev'
+
+export const getNev = (key, env = NODE_ENV) => env[key]

package/globals.js

@@ -0,0 +1,8 @@
+'use strict'
+
+const global = globalThis
+const self = globalThis
+const window = globalThis
+const document = window.document // eslint-disable-line
+
+export { global, self, window, document }

package/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
-export * from '@domql/key'
+export * from './key.js'
+export * from './env.js'
 export * from './types.js'
 export * from './object.js'
 export * from './function.js'
@@ -8,3 +9,5 @@ export * from './array.js'
 export * from './node.js'
 export * from './log.js'
 export * from './string.js'
+export * from './globals.js'
+export * from './cookie.js'

package/key.js

@@ -0,0 +1,14 @@
+'use strict'
+
+export const createKey = (function () {
+  let index = 0
+
+  function newId () {
+    index++
+    return index
+  }
+
+  return newId
+})()
+
+export const createSnapshotId = createKey

package/object.js

@@ -24,8 +24,8 @@ export const map = (obj, extention, element) => {
 
 export const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
-    if (e === '__proto__') continue
-    if (excludeFrom.includes(e) || e.startsWith('__')) continue
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, e)
+    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith('__')) continue
     const elementProp = element[e]
     const objProp = obj[e]
     if (elementProp === undefined) {
@@ -37,8 +37,8 @@ export const merge = (element, obj, excludeFrom = []) => {
 
 export const deepMerge = (element, extend, excludeFrom = []) => {
   for (const e in extend) {
-    if (e === '__proto__') continue
-    if (excludeFrom.includes(e) || e.startsWith('__')) continue
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(extend, e)
+    if (!hasOwnProperty || excludeFrom.includes(e) || e.startsWith('__')) continue
     const elementProp = element[e]
     const extendProp = extend[e]
     if (isObjectLike(elementProp) && isObjectLike(extendProp)) {
@@ -53,7 +53,8 @@ export const deepMerge = (element, extend, excludeFrom = []) => {
 export const clone = (obj, excludeFrom = []) => {
   const o = {}
   for (const prop in obj) {
-    if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop)
+    if (!hasOwnProperty || excludeFrom.includes(prop) || prop.startsWith('__')) continue
     o[prop] = obj[prop]
   }
   return o
@@ -67,7 +68,8 @@ export const deepCloneExclude = (obj, excludeFrom = []) => {
 
   const o = {}
   for (const k in obj) {
-    if (excludeFrom.includes(k) || k.startsWith('__')) continue
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, k)
+    if (!hasOwnProperty || excludeFrom.includes(k) || k.startsWith('__')) continue
 
     let v = obj[k]
 
@@ -208,7 +210,8 @@ export const detachFunctionsFromObject = (obj, detached = {}) => {
  */
 export const deepDestringify = (obj, stringified = {}) => {
   for (const prop in obj) {
-    if (prop === '__proto__') continue
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop)
+    if (!hasOwnProperty) continue
     const objProp = obj[prop]
     if (isString(objProp)) {
       if (objProp.includes('=>') || objProp.includes('function') || objProp.startsWith('(')) {

package/package.json

@@ -1,18 +1,23 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.153",
+  "version": "2.4.0",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
   "main": "index.js",
-  "exports": "./dist/cjs/index.js",
+  "exports": {
+    ".": {
+      "kalduna": "./index.js",
+      "default": "./dist/cjs/index.js"
+    }
+  },
   "source": "index.js",
   "files": [
     "*.js",
     "dist"
   ],
   "scripts": {
-    "copy:package:cjs": "cp ../../.build/package-cjs.json dist/cjs/package.json",
+    "copy:package:cjs": "cp ../../build/package-cjs.json dist/cjs/package.json",
     "build:esm": "npx esbuild *.js --target=es2019 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild *.js --target=node16 --format=cjs --outdir=dist/cjs",
     "build": "yarn build:cjs",
@@ -21,9 +26,9 @@
   "dependencies": {
     "@domql/globals": "latest",
     "@domql/key": "latest",
-    "@domql/tags": "latest"
+    "@domql/tags": "^2.3.117"
   },
-  "gitHead": "91cb404c3b97ab43b164ecb85a572d37e0976d97",
+  "gitHead": "d01a7237a0065a5a439a03062064076c5fdc91b7",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/string.js

@@ -8,10 +8,17 @@ export const stringIncludesAny = (str, characters) => {
   }
   return false
 }
-
+/**
+ * Replaces placeholders in a string with corresponding {{ }} values from an object.
+ *
+ * @param {string} str - The string containing placeholders to replace.
+ * @param {object} state - The object containing the values to substitute.
+ * @returns {string} The modified string with placeholders replaced by values from the object.
+ */
+const brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g
 export const replaceLiteralsWithObjectFields = (str, state) => {
   if (!str.includes('{{')) return str
-  return str.replace(/\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g, (_, parentPath, variable) => {
+  return str.replace(brackRegex, (_, parentPath, variable) => {
     if (parentPath) {
       const parentLevels = parentPath.match(/\.\.\//g).length
       let parentState = state