nv-basic-bw 1.0.28 → 1.0.29

package/cls-accessor.js

@@ -1,5 +1,5 @@
 const _nvison = require("nvison-bw");
-const { dash_to_snake,css_str_to_num} = require("./attr");
+const { dash_to_snake,css_str_to_num,attr_value_to_bool} = require("./util");
 
 const add_attr_accessors_to_cls = (Cls,ATTRS) => {
     /*

package/ele-getter.js

@@ -1,4 +1,4 @@
-const {dash_to_camel}  = require("./attr");
+const {dash_to_camel}  = require("./util");
 
 const add_one_fixed_element_getter = (self, cls, initial_upper = false) => {
     let getter_name = dash_to_camel(cls, initial_upper) + "Element";

package/index.js

@@ -2,7 +2,6 @@ const _ison          = require("nvison-bw");
 const _util            = require("./util");
 const _nd              = require("./nd");
 const _ele             = require("./ele");
-const _attr          = require("./attr");
 const _wait          = require("./wait");
 const _ele_getter    = require("./ele-getter");
 const _cls_accessor  = require("./cls-accessor");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nv-basic-bw",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,7 +9,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "nv-basic-util-bw": "^1.0.2",
+    "nv-basic-util-bw": "^1.0.3",
     "nvison-bw": "^1.0.0"
   }
 }

package/util.js

@@ -82,6 +82,8 @@ const {
    get_all_tag_id_pairs_from_tac_json,
 } = require("nv-basic-util-bw");
 
+const _nvison = require("nvison-bw");
+const parse_json_input = (input)=> _nvison.parse_from_str(input+" ");
 
 module.exports = {
    is_async,
@@ -102,4 +104,10 @@ module.exports = {
    get_all_id_and_clses_from_tac_json,
    get_all_ids_from_tac_json,
    get_all_tag_id_pairs_from_tac_json,
+   ////
+   parse_json_input,
+   dash_to_camel,
+   dash_to_snake,
+   attr_value_to_bool,
+   css_str_to_num,
 }

package/attr.js

@@ -1,78 +0,0 @@
-const _nvison = require("nvison-bw");
-
-const dash_to_camel = (str, initial_upper = false) => {
-    let parts = str.split('-');
-    for (let i = 1; i < parts.length; ++i) {
-        parts[i] = parts[i].charAt(0).toUpperCase() + parts[i].slice(1);
-    }
-    if (initial_upper) {
-        parts[0] = parts[0].charAt(0).toUpperCase() + parts[0].slice(1);
-    }
-    return parts.join('');
-}
-
-const dash_to_snake = (str) => {
-    //把-换成_
-    return str.replace(/-/g, '_');
-}
-
-const attr_value_to_bool = (value, dflt) => {
-    if (typeof value === 'string') {
-        value = value.trim().toLowerCase();
-        if (
-            value === 'false' ||
-            value === '0'     ||
-            value === 'no'   ||
-            value === 'off'  ||
-            value === 'fls'  ||
-            value === 'f'    ||
-            value === 'null' ||
-            value === 'nul'  ||
-            value === 'none' ||
-            value === 'nu'   ||
-            value === 'n' 
-        ) {
-            return false;
-        } else if (
-            value === 'true' ||
-            value === '1'    ||
-            value === 'yes'  ||
-            value === 'on'   ||
-            value === 'tru'  ||
-            value === 't'    ||
-            value === 'y'
-        ) {
-            return true;
-        } else if(
-            value === ''          ||
-            value === 'undefined' ||
-            value === 'un'        ||
-            value === 'default'   || 
-            value === 'dflt' 
-        ) {
-            return Boolean(dflt);
-        } else {
-            return Boolean(value);
-        }
-    } else if(value === undefined) {
-        return Boolean(dflt);
-    } else {
-        return Boolean(value);
-    }
-}
-
-const css_str_to_num = (css_str) => {
-    // 移除非数字字符（如 "px", "em", "%" 等）
-    let num_str = css_str.replace(/[^0-9.-]/g, '');
-    return parseFloat(num_str);
-}
-
-const parse_json_input = (input)=> _nvison.parse_from_str(input+" ");
-
-module.exports = {
-    dash_to_camel,
-    dash_to_snake,
-    attr_value_to_bool,
-    css_str_to_num,
-    parse_json_input,
-}