dlsjs 0.1.10 → 0.1.16

package/package.json

@@ -3,7 +3,7 @@
   "author": "林川",
   "license": "MIT",
   "private": false,
-  "version": "0.1.10",
+  "version": "0.1.16",
   "description": "domain-language for js",
   "main": "dist/dlsjs.esm.js",
   "module": "dist/dlsjs.esm.js",

package/src/core/ES/Const.js

@@ -7,3 +7,18 @@ export class DLS {
         this.treeFind = treeFind
     }
 }
+
+export function generateRandomId() {
+    const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+
+    // 使用Web Crypto API获取安全的随机值
+    const randomValues = new Uint8Array(8);
+    crypto.getRandomValues(randomValues);
+
+    for (let i = 0; i < 8; i++) {
+        result += chars[randomValues[i] % chars.length];
+    }
+
+    return result;
+}

package/src/core/ES/Trans.js

@@ -32,7 +32,7 @@ export function deepConvert(data, scope, convertFunc, isTerminator) {
                 container[key] = deepConvert(data[key], scope, convertFunc, isTerminator)
             }else {
                 let tempResult = deepConvert(data[key], scope, convertFunc, isTerminator)
-                if(tempResult !== undefined) container.push(deepConvert(data[key], scope, convertFunc, isTerminator))
+                if(tempResult !== undefined) container.push(tempResult)
             }
         }
         return container

package/src/core/Instance/transCore.js

@@ -40,9 +40,13 @@ function transValue(data, params, {reservedDeepProperty, reservedKey, reservedPr
  * 终止符判断。防止翻译器无法停止，这里设置终止条件，返回值为ture时视作当前分支终结。
  * @param data
  * @param params
+ * @param reservedDeepProperty
+ * @param reservedKey
+ * @param reservedProperty
+ * @param reservedWord
  * @returns {boolean}
  */
-function isTerminator(data, params) {
+function isTerminator(data, params, {reservedDeepProperty, reservedKey, reservedProperty, reservedWord}) {
     // 键名匹配成功时，翻译键值后不再继续遍历
     if(reservedKey.hasOwnProperty(params.key)) {
         return true
@@ -92,7 +96,13 @@ export function createMyTrans(rules = {}) {
         reservedProperty: Object.assign({}, reservedProperty, rules.reservedProperty),
         reservedWord: Object.assign({}, reservedWord, rules.reservedWord),
     })
-    return (jsonObj, scope) => deepConvert(jsonObj, scope, myTransFunc , isTerminator)
+    const myIsTerminator = (data, params) => isTerminator(data, params, {
+        reservedDeepProperty: Object.assign({}, reservedDeepProperty, rules.reservedDeepProperty),
+        reservedKey: Object.assign({}, reservedKey, rules.reservedKey),
+        reservedProperty: Object.assign({}, reservedProperty, rules.reservedProperty),
+        reservedWord: Object.assign({}, reservedWord, rules.reservedWord),
+    })
+    return (jsonObj, scope) => deepConvert(jsonObj, scope, myTransFunc , myIsTerminator)
 }