@vope/utils 1.4.21 → 1.4.23

package/cjs/index.js

@@ -34,11 +34,13 @@ __export(src_exports, {
   compareVersion: () => compareVersion,
   connectURLParams: () => connectURLParams,
   css: () => css,
+  cubeURLParams: () => cubeURLParams,
   deconPowersSum: () => deconPowersSum,
   deepWeakEqual: () => deepWeakEqual,
   desensDecrypt: () => desensDecrypt,
   desensEncrypt: () => desensEncrypt,
   desensReplace: () => desensReplace,
+  flatURLParams: () => flatURLParams,
   getEncoding: () => getEncoding,
   hash8json: () => hash8json,
   hash8object: () => hash8object,
@@ -716,7 +718,9 @@ var Neo4jAhchors = class {
    * 查找边连接点的位置
    */
   findAnchor(id) {
-    const anchor = this.#anchors[id] || {};
+    const anchor = this.#anchors[id];
+    if (!anchor)
+      return null;
     return {
       source: anchor.source || 0,
       target: anchor.target || 0
@@ -971,8 +975,109 @@ var parseNum = (num) => {
 // src/rotate/angle.ts
 var rotateAngle = (from, angle, visit) => rotateRad(from, angle / 180 * Math.PI, visit);
 
-// src/style/css.ts
+// src/serialize/url-params.ts
 var import_lodash_es4 = require("lodash-es");
+var cubeURLParams = (text, serializes) => {
+  const params = new URLSearchParams(text);
+  const result = {};
+  for (const [key, value] of params) {
+    const serialize = serializes[key];
+    switch (serialize) {
+      case Boolean:
+        result[key] = value === "true";
+        break;
+      case Number:
+        result[key] = Number(value);
+        break;
+      case Date:
+        result[key] = new Date(value);
+        break;
+      case BigInt:
+        result[key] = BigInt(value);
+        break;
+      case RegExp:
+        result[key] = new RegExp(value);
+        break;
+      default:
+        if ((0, import_lodash_es4.isFunction)(serialize)) {
+          result[key] = serialize(value);
+        } else if ((0, import_lodash_es4.isObject)(serialize) && (0, import_lodash_es4.isFunction)(serialize.cube)) {
+          result[key] = serialize.cube(value);
+        } else {
+          result[key] = value;
+        }
+    }
+  }
+  return result;
+};
+var re_flat = /\+/g;
+var flatEncode = (text) => text.replace(re_flat, () => "%2B");
+var flatValue = (value) => {
+  switch (typeof value) {
+    case "boolean":
+    case "bigint":
+    case "number":
+    case "symbol":
+    case "function":
+      return value.toString();
+    case "string":
+      return flatEncode(value);
+    case "undefined":
+      return "";
+    default:
+      if (value === null) {
+        return "";
+      }
+      if (value instanceof Date) {
+        return value.toJSON();
+      } else if (value instanceof RegExp) {
+        return flatEncode(value.source);
+      } else {
+        return flatEncode(value.toString());
+      }
+  }
+};
+var flatURLParams = (data, serializes) => {
+  const params = new URLSearchParams();
+  for (const key in data) {
+    const value = data[key];
+    const serialize = serializes[key];
+    let result;
+    switch (serialize) {
+      case Boolean:
+        result = typeof value === "boolean" ? `${value}` : "";
+        break;
+      case Number:
+        result = typeof value === "number" ? `${value}` : "";
+        break;
+      case Date:
+        result = value instanceof Date ? value.toJSON() : "";
+        break;
+      case BigInt:
+        result = typeof value === "bigint" ? `${value}` : "";
+        break;
+      case RegExp:
+        result = value instanceof RegExp ? flatEncode(value.source) : "";
+        break;
+      case String:
+        result = typeof value === "string" ? flatEncode(value) : "";
+        break;
+      default:
+        if ((0, import_lodash_es4.isFunction)(serialize)) {
+          result = flatValue(value);
+        } else if ((0, import_lodash_es4.isObject)(serialize) && (0, import_lodash_es4.isFunction)(serialize.flat)) {
+          result = serialize.flat(value);
+        } else {
+          result = flatValue(value);
+        }
+    }
+    params.append(key, result);
+  }
+  return params.toString();
+};
+
+// src/style/css.ts
+var import_lodash_es5 = require("lodash-es");
 var hump = /[A-Z]/g;
 var css = (...args) => {
   const list = [];
@@ -980,7 +1085,7 @@ var css = (...args) => {
     const data = args[i];
     if (!data)
       continue;
-    if ((0, import_lodash_es4.isString)(data)) {
+    if ((0, import_lodash_es5.isString)(data)) {
       list.push(data);
     } else if (Array.isArray(data)) {
       const result = css(...data);

package/lib/index.js

@@ -24,6 +24,7 @@ import { parseNum } from "./parse/num";
 import { deconPowersSum } from "./power/decon";
 import { rotateAngle } from "./rotate/angle";
 import { rotateRad } from "./rotate/rad";
+import { cubeURLParams, flatURLParams } from "./serialize/url-params";
 import { css } from "./style/css";
 import { default as default4 } from "./subscriber";
 import { FlexTable } from "./table/flex";
@@ -46,11 +47,13 @@ export {
   compareVersion,
   connectURLParams,
   css,
+  cubeURLParams,
   deconPowersSum,
   deepWeakEqual,
   desensDecrypt,
   desensEncrypt,
   desensReplace,
+  flatURLParams,
   getEncoding,
   hash8json,
   hash8object,

package/lib/neo4j-anchors.js

@@ -112,7 +112,9 @@ class Neo4jAhchors {
    * 查找边连接点的位置
    */
   findAnchor(id) {
-    const anchor = this.#anchors[id] || {};
+    const anchor = this.#anchors[id];
+    if (!anchor)
+      return null;
     return {
       source: anchor.source || 0,
       target: anchor.target || 0

package/lib/serialize/url-params.js

@@ -0,0 +1,103 @@
+import { isFunction, isObject } from "lodash-es";
+const cubeURLParams = (text, serializes) => {
+  const params = new URLSearchParams(text);
+  const result = {};
+  for (const [key, value] of params) {
+    const serialize = serializes[key];
+    switch (serialize) {
+      case Boolean:
+        result[key] = value === "true";
+        break;
+      case Number:
+        result[key] = Number(value);
+        break;
+      case Date:
+        result[key] = new Date(value);
+        break;
+      case BigInt:
+        result[key] = BigInt(value);
+        break;
+      case RegExp:
+        result[key] = new RegExp(value);
+        break;
+      default:
+        if (isFunction(serialize)) {
+          result[key] = serialize(value);
+        } else if (isObject(serialize) && isFunction(serialize.cube)) {
+          result[key] = serialize.cube(value);
+        } else {
+          result[key] = value;
+        }
+    }
+  }
+  return result;
+};
+const re_flat = /\+/g;
+const flatEncode = (text) => text.replace(re_flat, () => "%2B");
+const flatValue = (value) => {
+  switch (typeof value) {
+    case "boolean":
+    case "bigint":
+    case "number":
+    case "symbol":
+    case "function":
+      return value.toString();
+    case "string":
+      return flatEncode(value);
+    case "undefined":
+      return "";
+    default:
+      if (value === null) {
+        return "";
+      }
+      if (value instanceof Date) {
+        return value.toJSON();
+      } else if (value instanceof RegExp) {
+        return flatEncode(value.source);
+      } else {
+        return flatEncode(value.toString());
+      }
+  }
+};
+const flatURLParams = (data, serializes) => {
+  const params = new URLSearchParams();
+  for (const key in data) {
+    const value = data[key];
+    const serialize = serializes[key];
+    let result;
+    switch (serialize) {
+      case Boolean:
+        result = typeof value === "boolean" ? `${value}` : "";
+        break;
+      case Number:
+        result = typeof value === "number" ? `${value}` : "";
+        break;
+      case Date:
+        result = value instanceof Date ? value.toJSON() : "";
+        break;
+      case BigInt:
+        result = typeof value === "bigint" ? `${value}` : "";
+        break;
+      case RegExp:
+        result = value instanceof RegExp ? flatEncode(value.source) : "";
+        break;
+      case String:
+        result = typeof value === "string" ? flatEncode(value) : "";
+        break;
+      default:
+        if (isFunction(serialize)) {
+          result = flatValue(value);
+        } else if (isObject(serialize) && isFunction(serialize.flat)) {
+          result = serialize.flat(value);
+        } else {
+          result = flatValue(value);
+        }
+    }
+    params.append(key, result);
+  }
+  return params.toString();
+};
+export {
+  cubeURLParams,
+  flatURLParams
+};

package/package.json

@@ -1,58 +1,58 @@
-{
-  "name": "@vope/utils",
-  "version": "1.4.21",
-  "description": "",
-  "type": "module",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "types": "./types/index.d.ts",
-  "typings": "./types/index.d.ts",
-  "module": "./lib/index.js",
-  "main": "./cjs/index.js",
-  "scripts": {
-    "start": "esbuild ./pre.ts --outfile=pre.cjs --format=cjs & node ./pre.cjs",
-    "prebuild": "npm run start & esbuild ./build.ts --outfile=build.cjs --format=cjs",
-    "build": "node ./build.cjs",
-    "premocha": "node ./build.cjs --type=test",
-    "mocha": "mocha __tests/**/*.js",
-    "test": "npm run mocha",
-    "prepublishOnly": "npm run build & npm run test"
-  },
-  "exports": {
-    ".": {
-      "import": "./lib/index.js",
-      "require": "./cjs/index.js"
-    }
-  },
-  "author": "vope",
-  "license": "ISC",
-  "files": [
-    "cjs",
-    "lib",
-    "types"
-  ],
-  "devDependencies": {
-    "@babel/parser": "^7.23.4",
-    "@babel/traverse": "^7.23.4",
-    "@babel/types": "^7.23.4",
-    "@types/babel__traverse": "^7.20.4",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.4.5",
-    "esbuild": "^0.19.4",
-    "glob": "^10.3.10",
-    "iconv-lite": "^0.6.3",
-    "mocha": "^10.2.0",
-    "rimraf": "^5.0.5",
-    "tslib": "^2.6.1",
-    "typescript": "^5.3.3"
-  },
-  "dependencies": {
-    "@type-challenges/utils": "^0.1.1",
-    "@types/lodash-es": "^4.17.9",
-    "@vope/types": "^1.0.12",
-    "csstype": "^3.1.3",
-    "lodash-es": "^4.17.21"
-  }
-}
+{
+  "name": "@vope/utils",
+  "version": "1.4.23",
+  "description": "",
+  "type": "module",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "types": "./types/index.d.ts",
+  "typings": "./types/index.d.ts",
+  "module": "./lib/index.js",
+  "main": "./cjs/index.js",
+  "scripts": {
+    "start": "esbuild ./pre.ts --outfile=pre.cjs --format=cjs & node ./pre.cjs",
+    "prebuild": "npm run start & esbuild ./build.ts --outfile=build.cjs --format=cjs",
+    "build": "node ./build.cjs",
+    "premocha": "node ./build.cjs --type=test",
+    "mocha": "mocha __tests/**/*.js",
+    "test": "npm run mocha",
+    "prepublishOnly": "npm run build & npm run test"
+  },
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "require": "./cjs/index.js"
+    }
+  },
+  "author": "vope",
+  "license": "ISC",
+  "files": [
+    "cjs",
+    "lib",
+    "types"
+  ],
+  "devDependencies": {
+    "@babel/parser": "^7.23.4",
+    "@babel/traverse": "^7.23.4",
+    "@babel/types": "^7.23.4",
+    "@types/babel__traverse": "^7.20.4",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.4.5",
+    "esbuild": "^0.19.4",
+    "glob": "^10.3.10",
+    "iconv-lite": "^0.6.3",
+    "mocha": "^10.2.0",
+    "rimraf": "^5.0.5",
+    "tslib": "^2.6.1",
+    "typescript": "^5.3.3"
+  },
+  "dependencies": {
+    "@type-challenges/utils": "^0.1.1",
+    "@types/lodash-es": "^4.17.9",
+    "@vope/types": "^1.0.13",
+    "csstype": "^3.1.3",
+    "lodash-es": "^4.17.21"
+  }
+}

package/types/index.d.ts

@@ -24,6 +24,7 @@ export { parseNum } from './parse/num';
 export { deconPowersSum } from './power/decon';
 export { rotateAngle } from './rotate/angle';
 export { rotateRad } from './rotate/rad';
+export { type URLParamsValues, cubeURLParams, type URLParamsFlats, flatURLParams } from './serialize/url-params';
 export { type CSSProperties, type StyleValue, css } from './style/css';
 export { type SModel, default as Subscriber } from './subscriber';
 export { FlexTable } from './table/flex';

package/types/neo4j-anchors.d.ts

@@ -31,7 +31,7 @@ export default class Neo4jAhchors<INode extends object, IEdge extends object> {
     findAnchor(id: string): {
         source: number;
         target: number;
-    };
+    } | null;
     /**
      * 获取指定边控制点距离两端点连线的距离(可理解为控制边的弯曲程度)
      * @description 返回值是一个相对值，需要乘以一个基数值(基数值应为负值，如-30)

package/types/serialize/url-params.d.ts

@@ -0,0 +1,36 @@
+import { Assign } from '@vope/types';
+type NativeValue = BooleanConstructor | NumberConstructor | DateConstructor | BigIntConstructor | RegExpConstructor | StringConstructor;
+interface AccessorValue<T = any> {
+    cube(text: string): T;
+    flat?(value: T): string;
+}
+type SimplifyValue = ((text: string) => any);
+type Value = NativeValue | SimplifyValue | AccessorValue;
+/**
+ * 转换套件类型
+ */
+type Values = Record<string, Value>;
+export { Values as URLParamsValues };
+type SimplifyBranch<T, Branch extends boolean> = Branch extends true ? T extends object ? Assign<T, {
+    toString?(this: T): string;
+}> : T : T;
+type Cube<T, Branch extends boolean> = [T] extends [DateConstructor] ? Date : [T] extends [NativeValue] ? T extends ((value: string) => infer A) ? A : string : [T] extends [(text: string) => infer S] ? SimplifyBranch<S, Branch> : [T] extends [AccessorValue<infer B>] ? B : string;
+type Cubes<T extends Values, Branch extends boolean = false> = {
+    [P in keyof T]: Cube<T[P], Branch>;
+};
+/**
+ * 将URL查询参数转换成(复杂)对象
+ * @param text URL查询参数字符串
+ * @param serializes 转换套件
+ */
+export declare const cubeURLParams: <T extends Values>(text: string, serializes: T) => Cubes<T, false>;
+/**
+ * 符合套件的(复杂)数据类型
+ */
+export type URLParamsFlats<T extends Values> = Cubes<T, true>;
+/**
+ * 将(复杂)对象转换成URL查询参数
+ * @param data 符合套件格式的(复杂)对象
+ * @param serializes 转换套件
+ */
+export declare const flatURLParams: <T extends Values>(data: Cubes<T, true>, serializes: T) => string;