domql 1.5.94 → 1.5.96

package/package.json

@@ -2,7 +2,7 @@
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
   "author": "symbo.ls",
-  "version": "1.5.94",
+  "version": "1.5.96",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -15,11 +15,12 @@
     "packages"
   ],
   "scripts": {
-    "prepublish": "rm -rf dist && npx esbuild src/index.js --target=es2020 --format=cjs --bundle --sourcemap=external --outfile=dist/index.cjs.js",
+    "compile": "npx esbuild src/index.js --target=es2020 --format=cjs --bundle --sourcemap=external --outfile=dist/index.cjs.js",
+    "prepublish": "rm -rf dist && yarn compile && yarn test:lint",
     "start": "parcel examples/index.html --no-cache",
     "build": "parcel build examples/index.html",
-    "standard": "npx standard \"src/**/*.js\"",
-    "test": "yarn standard; jest --coverage --coverageReporters=text-lcov | coveralls",
+    "test:lint": "npx standard \"src/**/*.js\"",
+    "test": "yarn test:lint; jest --coverage --coverageReporters=text-lcov | coveralls",
     "test-watch": "jest --watch"
   },
   "dependencies": {

package/src/element/state.js

@@ -5,9 +5,15 @@ import { deepClone, exec, overwriteShallow, overwriteDeep } from '../utils'
 import { is, isObject, isFunction, isUndefined } from '@domql/utils'
 
 export const IGNORE_STATE_PARAMS = [
+<<<<<<< HEAD
+  'update', 'parse', 'clean', 'create', 'parent', '__element', '__depends',
+  '__ref', '__root', '__components', '__extend', '__cached', '__projectSystem',
+  '__projectState', '__projectComponents', '__projectPages', '__projectFiddles',
+=======
   'update', 'parse', 'clean', 'create', 'parent', '__element', '__depends', '__ref', '__root',
-  '__components',
-  '__projectSystem', '__projectState', '__projectComponents', '__projectPages', '__projectFiddles',
+  '__components', '__extend', '__cached',
+  '__projectSystem', '__projectState', '__projectComponents', '__projectPages', '__projectSnippets',
+>>>>>>> 5e4dd98 (fiddle > snippets)
   'projectStateUpdate', 'projectSystemUpdate'
 ]
 
@@ -188,7 +194,7 @@ export const createState = function (element, parent, opts) {
   state.__projectState = state.__root.PROJECT_STATE
   state.__projectComponents = state.__root.PROJECT_COMPONENTS
   state.__projectPages = state.__root.PROJECT_PAGES
-  state.__projectFiddles = state.__root.PROJECT_FIDDLES
+  state.__projectSnippets = state.__root.PROJECT_SNIPPETS
 
   // run `on.stateCreated`
   if (element.on && isFunction(element.on.stateCreated)) {

package/src/utils/object.js

@@ -95,7 +95,6 @@ export const merge = (element, obj) => {
 }
 
 export const deepMerge = (element, extend) => {
-  // console.groupCollapsed('deepMerge:')
   for (const e in extend) {
     const elementProp = element[e]
     const extendProp = extend[e]
@@ -107,7 +106,6 @@ export const deepMerge = (element, extend) => {
       deepMerge(elementProp, extendProp)
     }
   }
-  // console.groupEnd('deepMerge:')
   return element
 }
 
@@ -123,16 +121,16 @@ export const clone = obj => {
 /**
  * Deep cloning of object
  */
-export const deepClone = (obj, excluding = ['parent', 'node', '__element', 'state', '__root', 'context']) => {
+export const deepClone = (obj, excluding = ['parent', 'node', '__element', 'state', '__root', '__cached', 'context']) => {
   const o = isArray(obj) ? [] : {}
   for (const prop in obj) {
     if (excluding.indexOf(prop) > -1) continue
     let objProp = obj[prop]
     if (prop === 'extend' && isArray(objProp)) {
-      objProp = mergeArray(objProp)
+      objProp = mergeArray(objProp, excluding)
     }
     if (isObjectLike(objProp)) {
-      o[prop] = deepClone(objProp)
+      o[prop] = deepClone(objProp, excluding)
     } else o[prop] = objProp
   }
   return o
@@ -217,8 +215,8 @@ export const mergeIfExisted = (a, b) => {
 /**
  * Merges array extends
  */
-export const mergeArray = (arr) => {
-  return arr.reduce((a, c) => deepMerge(a, deepClone(c)), {})
+export const mergeArray = (arr, excluding = ['parent', 'node', '__element', 'state', '__root', '__cached', 'context']) => {
+  return arr.reduce((a, c) => deepMerge(a, deepClone(c, excluding)), {})
 }
 
 /**