@yuneta/gobj-js 7.7.2 → 7.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3625,7 +3625,7 @@
3625
3625
  if (is_object(kw)) new_dict = kw;
3626
3626
  else if (is_array(kw)) for (let i = 0; i < kw.length; i++) {
3627
3627
  let kv = kw[i];
3628
- let id = kw_get_str(kv, "id", null, false);
3628
+ let id = kw_get_str(gobj, kv, "id", "", 0);
3629
3629
  if (!empty_string(id)) new_dict[id] = kv;
3630
3630
  }
3631
3631
  else log_error(`${gobj_short_name(gobj)} kwid_new_dict: data type unknown`);
@@ -4916,6 +4916,7 @@
4916
4916
  * is_writable // field writable (no readonly)
4917
4917
  * default_value
4918
4918
  * placeholder
4919
+ * fkey // fkey mapping {topic_name: hook_name}, null if none
4919
4920
  * ]
4920
4921
  *
4921
4922
  * The template is recursive, in values you can set dictionaries, or arrays,
@@ -4985,7 +4986,8 @@
4985
4986
  is_hidden: false,
4986
4987
  default_value: col.default,
4987
4988
  placeholder: col.placeholder,
4988
- fillspace: col.fillspace || 4
4989
+ fillspace: col.fillspace || 4,
4990
+ fkey: col.fkey || null
4989
4991
  };
4990
4992
  if (!col.flag) return field_desc;
4991
4993
  for (let i = 0; i < col.flag.length; i++) {
@@ -5031,7 +5033,8 @@
5031
5033
  is_writable: false,
5032
5034
  is_hidden: false,
5033
5035
  default_value: void 0,
5034
- placeholder: void 0
5036
+ placeholder: void 0,
5037
+ fkey: null
5035
5038
  };
5036
5039
  if (is_string(value)) {
5037
5040
  let values = value.split(".");
@@ -5075,7 +5078,9 @@
5075
5078
  let new_record = {};
5076
5079
  if (!kw) kw = {};
5077
5080
  Object.entries(template).forEach(([field, col]) => {
5078
- new_record[field] = kw_get_dict_value(null, kw, field, kw_get_dict_value(col, "default"));
5081
+ let default_value;
5082
+ if (is_object(col)) default_value = col.default;
5083
+ new_record[field] = kw_get_dict_value(null, kw, field, default_value);
5079
5084
  });
5080
5085
  return new_record;
5081
5086
  }