@symbo.ls/create 2.11.450 → 2.11.452

package/dist/cjs/bundle/index.js

@@ -604,7 +604,7 @@ var require_object = __commonJS({
       diff: () => diff,
       diffArrays: () => diffArrays,
       diffObjects: () => diffObjects,
-      exec: () => exec6,
+      exec: () => exec7,
       flattenRecursive: () => flattenRecursive,
       hasOwnProperty: () => hasOwnProperty,
       isCyclic: () => isCyclic,
@@ -631,7 +631,7 @@ var require_object = __commonJS({
     var import_string = require_string();
     var import_node = require_node();
     var ENV3 = "development";
-    var exec6 = (param, element, state, context) => {
+    var exec7 = (param, element, state, context) => {
       if ((0, import_types.isFunction)(param)) {
         return param.call(
           element,
@@ -644,7 +644,7 @@ var require_object = __commonJS({
     };
     var map = (obj, extention, element) => {
       for (const e in extention) {
-        obj[e] = exec6(extention[e], element);
+        obj[e] = exec7(extention[e], element);
       }
     };
     var merge6 = (element, obj, excludeFrom = []) => {
@@ -2477,7 +2477,7 @@ var require_cjs2 = __commonJS({
           diff: () => diff,
           diffArrays: () => diffArrays,
           diffObjects: () => diffObjects,
-          exec: () => exec6,
+          exec: () => exec7,
           flattenRecursive: () => flattenRecursive,
           hasOwnProperty: () => hasOwnProperty,
           isCyclic: () => isCyclic,
@@ -2504,7 +2504,7 @@ var require_cjs2 = __commonJS({
         var import_string = require_string3();
         var import_node = require_node4();
         var ENV22 = "development";
-        var exec6 = (param, element, state, context) => {
+        var exec7 = (param, element, state, context) => {
           if ((0, import_types.isFunction)(param)) {
             return param.call(
               element,
@@ -2517,7 +2517,7 @@ var require_cjs2 = __commonJS({
         };
         var map = (obj, extention, element) => {
           for (const e in extention) {
-            obj[e] = exec6(extention[e], element);
+            obj[e] = exec7(extention[e], element);
           }
         };
         var merge52 = (element, obj, excludeFrom = []) => {
@@ -4302,7 +4302,7 @@ var require_cjs2 = __commonJS({
               diff: () => diff,
               diffArrays: () => diffArrays,
               diffObjects: () => diffObjects,
-              exec: () => exec6,
+              exec: () => exec7,
               flattenRecursive: () => flattenRecursive,
               hasOwnProperty: () => hasOwnProperty,
               isEmpty: () => isEmpty,
@@ -4328,7 +4328,7 @@ var require_cjs2 = __commonJS({
             var import_string = require_string22();
             var import_node = require_node22();
             var ENV22 = "development";
-            var exec6 = (param, element, state, context) => {
+            var exec7 = (param, element, state, context) => {
               if ((0, import_types.isFunction)(param)) {
                 return param.call(
                   element,
@@ -4341,7 +4341,7 @@ var require_cjs2 = __commonJS({
             };
             var map = (obj, extention, element) => {
               for (const e in extention) {
-                obj[e] = exec6(extention[e], element);
+                obj[e] = exec7(extention[e], element);
               }
             };
             var merge52 = (element, obj, excludeFrom = []) => {
@@ -8317,7 +8317,7 @@ var require_cjs3 = __commonJS({
           diff: () => diff,
           diffArrays: () => diffArrays,
           diffObjects: () => diffObjects,
-          exec: () => exec6,
+          exec: () => exec7,
           flattenRecursive: () => flattenRecursive,
           hasOwnProperty: () => hasOwnProperty,
           isEmpty: () => isEmpty,
@@ -8343,7 +8343,7 @@ var require_cjs3 = __commonJS({
         var import_string = require_string3();
         var import_node = require_node4();
         var ENV3 = "development";
-        var exec6 = (param, element, state, context) => {
+        var exec7 = (param, element, state, context) => {
           if ((0, import_types.isFunction)(param)) {
             return param.call(
               element,
@@ -8356,7 +8356,7 @@ var require_cjs3 = __commonJS({
         };
         var map = (obj, extention, element) => {
           for (const e in extention) {
-            obj[e] = exec6(extention[e], element);
+            obj[e] = exec7(extention[e], element);
           }
         };
         var merge6 = (element, obj, excludeFrom = []) => {
@@ -11404,21 +11404,21 @@ var require_create3 = __commonJS({
     var import_ignore = require_ignore2();
     var import_inherit = require_inherit2();
     var createPropsStack = (element, parent) => {
-      const { props: props2, __ref } = element;
-      const propsStack = __ref.__props = (0, import_inherit.inheritParentProps)(element, parent);
+      const { props: props2, __ref: ref } = element;
+      const propsStack = ref.__props = (0, import_inherit.inheritParentProps)(element, parent);
       if ((0, import_utils32.isObject)(props2))
         propsStack.push(props2);
       else if (props2 === "inherit" && parent.props)
         propsStack.push(parent.props);
       else if (props2)
         propsStack.push(props2);
-      if ((0, import_utils32.isArray)(__ref.__extend)) {
-        __ref.__extend.forEach((extend) => {
+      if ((0, import_utils32.isArray)(ref.__extend)) {
+        ref.__extend.forEach((extend) => {
           if (extend.props && extend.props !== props2)
             propsStack.push(extend.props);
         });
       }
-      __ref.__props = propsStack;
+      ref.__props = propsStack;
       return propsStack;
     };
     var syncProps = (props2, element) => {
@@ -12992,8 +12992,8 @@ var require_methods2 = __commonJS({
         if (v === param)
           return childElem;
         else if ((0, import_utils32.isFunction)(param)) {
-          const exec6 = param(childElem, childElem.state, childElem.context);
-          if (childElem.state && exec6) {
+          const exec7 = param(childElem, childElem.state, childElem.context);
+          if (childElem.state && exec7) {
             return childElem;
           }
         }
@@ -13014,8 +13014,8 @@ var require_methods2 = __commonJS({
         if (v === param)
           results.push(childElem);
         else if ((0, import_utils32.isFunction)(param)) {
-          const exec6 = param(childElem, childElem.state, childElem.context);
-          if (childElem.state && exec6)
+          const exec7 = param(childElem, childElem.state, childElem.context);
+          if (childElem.state && exec7)
             results.push(childElem);
         }
         (_a = childElem == null ? void 0 : childElem.lookdownAll) == null ? void 0 : _a.call(childElem, param, results);
@@ -13077,6 +13077,7 @@ var require_methods2 = __commonJS({
       const obj = {};
       const keyList = keys.call(element);
       keyList.forEach((v) => {
+        var _a;
         if (excl.includes(v))
           return;
         const val = element[v];
@@ -13092,7 +13093,7 @@ var require_methods2 = __commonJS({
         } else if (v === "props") {
           const { __element, update, ...props2 } = element[v];
           obj[v] = props2;
-        } else if ((0, import_utils32.isDefined)(val))
+        } else if ((0, import_utils32.isDefined)(val) && !((_a = element.context) == null ? void 0 : _a.methods[v]))
           obj[v] = val;
       });
       return obj;
@@ -14835,7 +14836,7 @@ var require_object3 = __commonJS({
       diff: () => diff,
       diffArrays: () => diffArrays,
       diffObjects: () => diffObjects,
-      exec: () => exec6,
+      exec: () => exec7,
       flattenRecursive: () => flattenRecursive,
       hasOwnProperty: () => hasOwnProperty,
       isEmpty: () => isEmpty,
@@ -14858,7 +14859,7 @@ var require_object3 = __commonJS({
     var import_types = require_types2();
     var import_array = require_array2();
     var import_string = require_string2();
-    var exec6 = (param, element, state, context) => {
+    var exec7 = (param, element, state, context) => {
       if ((0, import_types.isFunction)(param)) {
         return param(
           element,
@@ -14870,7 +14871,7 @@ var require_object3 = __commonJS({
     };
     var map = (obj, extention, element) => {
       for (const e in extention) {
-        obj[e] = exec6(extention[e], element);
+        obj[e] = exec7(extention[e], element);
       }
     };
     var merge6 = (element, obj, excludeFrom = []) => {
@@ -15923,7 +15924,7 @@ var utilImports_exports = {};
 __export(utilImports_exports, {
   applyCSS: () => applyCSS,
   init: () => init,
-  reInit: () => reInit,
+  reinit: () => reinit,
   scratchSystem: () => import_scratch2.scratchSystem,
   scratchUtils: () => import_scratch2.scratchUtils,
   set: () => import_scratch2.set
@@ -17110,8 +17111,8 @@ var dynamic_default = {};
 
 // ../init/index.js
 var CONFIG = (0, import_scratch.getActiveConfig)();
-var mergeWithLocalFile = (config = CONFIG, RC_FILE) => {
-  const rcfile = (0, import_utils2.isObject)(RC_FILE) ? RC_FILE : dynamic_default || {};
+var mergeWithLocalFile = (config = CONFIG, options) => {
+  const rcfile = (0, import_utils2.isObject)(options.localFile) ? options.localFile : dynamic_default || {};
   const clonedFile = (0, import_utils2.deepClone)(rcfile.designSystem || {});
   return (0, import_utils2.deepMerge)(config, clonedFile);
 };
@@ -17126,7 +17127,7 @@ var SET_OPTIONS = {
 };
 var init = (config, options = SET_OPTIONS) => {
   const emotion2 = options.emotion || emotion;
-  const resultConfig = mergeWithLocalFile(config || {});
+  const resultConfig = mergeWithLocalFile(config || {}, options);
   const conf = (0, import_scratch.set)({
     verbose: options.verbose,
     useReset: options.useReset,
@@ -17165,15 +17166,20 @@ var init = (config, options = SET_OPTIONS) => {
 var UPDATE_OPTIONS = {
   emotion
 };
-var reInit = (config, RC_FILE, options = UPDATE_OPTIONS) => {
+var reinit = (config, options = UPDATE_OPTIONS) => {
   const emotion2 = options.emotion || emotion;
-  const resultConfig = mergeWithLocalFile(config || {}, RC_FILE);
+  const resultConfig = mergeWithLocalFile(config || {}, options);
+  const prevStyles = document.querySelector('[data-emotion="smbls"]');
+  console.log(prevStyles);
   const conf = (0, import_scratch.set)({
     verbose: false,
     ...resultConfig
   });
-  emotion2.injectGlobal({ ":root": conf.CSS_VARS });
-  emotion2.injectGlobal(conf.RESET);
+  if (!options.preventInject) {
+    emotion2.injectGlobal({ ":root": conf.CSS_VARS });
+    emotion2.injectGlobal(conf.RESET);
+  }
+  return conf;
 };
 var applyCSS = (styles, options = UPDATE_OPTIONS) => {
   const emotion2 = options.emotion || emotion;
@@ -17719,8 +17725,8 @@ var Img = {
   attr: {
     src: (el) => {
       const { props: props2, context } = el;
-      const { exec: exec6, isString: isString13, replaceLiteralsWithObjectFields: replaceLiteralsWithObjectFields3 } = context.utils;
-      let src = (props2.preSrc || "") + exec6(props2.src, el);
+      const { exec: exec7, isString: isString13, replaceLiteralsWithObjectFields: replaceLiteralsWithObjectFields3 } = context.utils;
+      let src = (props2.preSrc || "") + exec7(props2.src, el);
       if (isString13(src) && src.includes("{{")) {
         src = replaceLiteralsWithObjectFields3(src, el.state);
       }
@@ -17805,8 +17811,8 @@ var getComputedBackgroundColor = ({ props: props2 }) => {
   return (0, import_scratch6.getColor)(props2.shapeDirectionColor) || (0, import_scratch6.getColor)(props2.borderColor) || (0, import_scratch6.getColor)(props2.backgroundColor) || (0, import_scratch6.getColor)(props2.background);
 };
 var inheritTransition = ({ props: props2, deps }) => {
-  const exec6 = Timing.class.transition({ props: props2, deps });
-  return exec6 && exec6.transition;
+  const exec7 = Timing.class.transition({ props: props2, deps });
+  return exec7 && exec7.transition;
 };
 var SHAPES = {
   rectangle: {},
@@ -19004,20 +19010,22 @@ var Circle = {
 
 // ../uikit/Icon/index.js
 var import_utils15 = __toESM(require_cjs());
-var getIconName = ({ key, props: props2, context, deps, state }) => {
-  let iconName = props2.name || props2.icon || key;
+var getIconName = (el, s) => {
+  const { key, props: props2, deps } = el;
+  let iconName = (0, import_utils15.exec)(props2.name || props2.icon || key, el);
   if ((0, import_utils15.isString)(iconName) && iconName.includes("{{")) {
-    iconName = deps.replaceLiteralsWithObjectFields(iconName, state);
+    iconName = deps.replaceLiteralsWithObjectFields(iconName, s);
   }
   return deps.isString(iconName) ? iconName : key;
 };
 var Icon = {
   extend: "Svg",
   deps: { isString: import_utils15.isString, replaceLiteralsWithObjectFields: import_utils15.replaceLiteralsWithObjectFields },
-  props: ({ key, props: props2, parent, context, deps, state }) => {
+  props: (el, s) => {
+    const { props: props2, parent, context, deps, state } = el;
     const { ICONS, SEMANTIC_ICONS, useIconSprite, verbose } = context && context.designSystem;
     const { toCamelCase } = context && context.utils;
-    let iconName = getIconName({ key, props: props2, parent, context, deps, state });
+    let iconName = getIconName(el, s);
     const camelCase = toCamelCase(iconName);
     const isArray5 = camelCase.split(/([a-z])([A-Z])/g);
     const semanticIconRootName = isArray5[1] ? isArray5[0] : iconName.split(".")[0].split(" ")[0];
@@ -19045,11 +19053,14 @@ var Icon = {
       };
     }
     let activeIconName;
-    if (props2.active) {
-      activeIconName = props2[".active"].name || props2[".active"].icon;
+    if (props2.isActive) {
+      activeIconName = props2[".isActive"].name || props2[".isActive"].icon;
     }
-    if (parent && parent.props && parent.props.active && parent.props[".active"] && parent.props[".active"].icon) {
-      activeIconName = parent.props[".active"].icon.name || parent.props[".active"].icon.icon || parent.props[".active"].icon;
+    if (parent && parent.props && parent.props.isActive && parent.props[".isActive"] && parent.props[".isActive"].icon) {
+      activeIconName = (0, import_utils15.exec)(
+        parent.props[".isActive"].icon.name || parent.props[".isActive"].icon.icon || parent.props[".isActive"].icon,
+        el
+      );
     }
     if ((0, import_utils15.isString)(activeIconName) && activeIconName.includes("{{")) {
       activeIconName = deps.replaceLiteralsWithObjectFields(activeIconName, state);
@@ -19087,10 +19098,9 @@ var IconText = {
     lineHeight: 1
   },
   Icon: {
-    props: ({ parent, props: props2 }) => ({ icon: parent.props.icon }),
+    props: ({ parent }) => ({ icon: parent.props.icon }),
     if: ({ parent, props: props2 }) => {
-      const doesExist = parent.props.icon || parent.props.Icon || props2.name || props2.icon || props2.sfSymbols || parent.props.sfSymbols;
-      return doesExist;
+      return parent.props.icon || parent.props.Icon || props2.name || props2.icon || props2.sfSymbols || parent.props.sfSymbols;
     }
   },
   text: ({ props: props2 }) => props2.text,
@@ -19382,8 +19392,8 @@ var Link = {
   },
   attr: {
     href: (el, s, ctx) => {
-      const { isString: isString13, exec: exec6, replaceLiteralsWithObjectFields: replaceLiteralsWithObjectFields3 } = ctx.utils;
-      const href = exec6(el.props.href, el) || exec6(exec6(el.props, el).href, el);
+      const { isString: isString13, exec: exec7, replaceLiteralsWithObjectFields: replaceLiteralsWithObjectFields3 } = ctx.utils;
+      const href = exec7(el.props.href, el) || exec7(exec7(el.props, el).href, el);
       if (isString13(href) && href.includes("{{")) {
         return replaceLiteralsWithObjectFields3(href, s);
       }
@@ -19399,8 +19409,8 @@ var RouterLink = {
     click: (event, el, s) => {
       const { props: props2, context: ctx } = el;
       const { href: h, scrollToTop, stopPropagation } = props2;
-      const { exec: exec6, isString: isString13, replaceLiteralsWithObjectFields: replaceLiteralsWithObjectFields3, isDefined: isDefined2 } = ctx.utils;
-      let href = exec6(h, el, s);
+      const { exec: exec7, isString: isString13, replaceLiteralsWithObjectFields: replaceLiteralsWithObjectFields3, isDefined: isDefined2 } = ctx.utils;
+      let href = exec7(h, el, s);
       if (isString13(href) && href.includes("{{")) {
         href = replaceLiteralsWithObjectFields3(href, s);
       }

package/dist/cjs/utilImports.js

@@ -21,7 +21,7 @@ var utilImports_exports = {};
 __export(utilImports_exports, {
   applyCSS: () => import_init.applyCSS,
   init: () => import_init.init,
-  reInit: () => import_init.reInit,
+  reinit: () => import_init.reinit,
   scratchSystem: () => import_scratch.scratchSystem,
   scratchUtils: () => import_scratch.scratchUtils,
   set: () => import_scratch.set

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.11.450",
+  "version": "2.11.452",
   "license": "MIT",
-  "gitHead": "4153a92a328d62db727ee4c99cd53f389ee6e05b",
+  "gitHead": "65799b9b9cb6d7e6e5e3f0cfc0b1140ccc506b2b",
   "files": [
     "src",
     "dist"
@@ -35,10 +35,10 @@
     "@domql/report": "^2.5.0",
     "@domql/router": "^2.5.0",
     "@symbo.ls/fetch": "^2.11.450",
-    "@symbo.ls/init": "^2.11.450",
+    "@symbo.ls/init": "^2.11.452",
     "@symbo.ls/scratch": "^2.11.450",
-    "@symbo.ls/sync": "^2.11.450",
-    "@symbo.ls/uikit": "^2.11.450",
+    "@symbo.ls/sync": "^2.11.452",
+    "@symbo.ls/uikit": "^2.11.451",
     "@symbo.ls/utils": "^2.11.446",
     "domql": "^2.5.0"
   },

package/src/utilImports.js

@@ -5,6 +5,6 @@ import { scratchUtils, scratchSystem, set } from '@symbo.ls/scratch'
 export { scratchUtils, scratchSystem, set }
 export * from '@domql/utils'
 export * from '@symbo.ls/utils'
-export { init, reInit, applyCSS } from '@symbo.ls/init'
+export { init, reinit, applyCSS } from '@symbo.ls/init'
 export * from '@domql/report'
 export * from '@domql/router'