amis-core 6.7.0 → 6.8.0

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,7 +14,7 @@ function isPureVariable(path) {
         try {
             var ast = memoryParse.memoryParse(path);
             // 只有一个成员说明是纯表达式模式
-            return ast.body.length === 1 && ast.body[0].type === 'script';
+            return (ast === null || ast === void 0 ? void 0 : ast.body.length) === 1 && ast.body[0].type === 'script';
         }
         catch (err) {
             return false;

package/lib/utils/json-schema-2-amis-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/memoryParse.d.ts

@@ -1,3 +1,4 @@
+import type { ASTNode } from 'amis-formula';
 export declare function memoryParse(input: string, options?: {
     /**
      * 直接是运算表达式？还是从模板开始 ${} 里面才算运算表达式
@@ -14,4 +15,4 @@ export declare function memoryParse(input: string, options?: {
      */
     allowFilter?: boolean;
     variableNamespaces?: Array<string>;
-}): any;
+}): ASTNode | undefined;

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,22 +8,26 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisFormula = require('amis-formula');
+var visitedCache = require('./visitedCache.js');
 
-var cache = {};
+// NOTE 缓存前40条表达式
+var cache = new visitedCache["default"](40);
 function memoryParse(input, options) {
     if (options === void 0) { options = {
         evalMode: false
     }; }
-    // @todo 优化内存缓存释放，比如只缓存最高频的模版
+    // 优化内存缓存释放，比如只缓存最高频的模版
     if (typeof input !== 'string') {
         return;
     }
     var key = input + JSON.stringify(options);
-    if (cache[key]) {
-        return cache[key];
+    // get cache result
+    if (cache.has(key)) {
+        return cache.get(key);
     }
+    // run parse function and cache
     var ast = amisFormula.parse(input, options);
-    cache[key] = ast;
+    cache.set(key, ast);
     return ast;
 }
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/object.d.ts

@@ -1,8 +1,6 @@
-export declare function createObject(superProps?: {
+export declare function createObject<P extends {
     [propName: string]: any;
-}, props?: {
-    [propName: string]: any;
-}, properties?: any): object;
+} | null>(superProps?: P, props?: P, properties?: any): object;
 export declare function extractObjectChain(value: any): object[];
 export declare function createObjectFromChain(chain: Array<object>): object;
 /**

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -167,6 +167,35 @@ function resizeSensor(element, callback, once, type) {
     if (!element) {
         return function () { };
     }
+    // 优先用 ResizeObserver
+    if (typeof ResizeObserver !== 'undefined') {
+        var rect = element.getBoundingClientRect();
+        var originWidth_1 = rect.width;
+        var originHeight_1 = rect.height;
+        var observer_1 = new ResizeObserver(function (entries) {
+            if (once) {
+                observer_1.disconnect();
+            }
+            if (type === 'both') {
+                callback();
+            }
+            else {
+                var entry = entries[0];
+                var cr = entry.contentRect;
+                if ((type === 'width' && cr.width !== originWidth_1) ||
+                    (type === 'height' && cr.height !== originHeight_1)) {
+                    callback();
+                    originWidth_1 = cr.width;
+                    originHeight_1 = cr.height;
+                }
+            }
+        });
+        observer_1.observe(element);
+        return function () {
+            observer_1.disconnect();
+        };
+    }
+    // 不支持 ResizeObserver 的话，用 polyfill
     var disposeEvent = undefined;
     if (once) {
         disposeEvent = attachResizeEvent(element, function () {

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -18,6 +18,7 @@ var moment = require('moment');
 var capitalize = require('lodash/capitalize');
 require('amis-formula');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ require('tslib');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var amisFormula = require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 var tokenize = require('./tokenize.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ var template = require('lodash/template');
 var amisFormula = require('amis-formula');
 var moment = require('moment');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 require('@rc-component/mini-decimal');
 require('./filter.js');
 

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/uncontrollable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ var moment = require('moment');
 var tpl = require('./tpl.js');
 require('amis-formula');
 var isPlainObject = require('lodash/isPlainObject');
+require('./memoryParse.js');
 var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');

package/lib/utils/visitedCache.d.ts

@@ -0,0 +1,46 @@
+/**
+ * @description 缓存值的单元
+ */
+export type CacheEntry<V> = {
+    value: V;
+    visitCount: number;
+};
+/**
+ * 自动清理访问次数最少key的Map，次数相同时优先淘汰旧项
+ * 每次触发清理的计数基于容量的百分比
+ * @class VisitedCache
+ * @template K - 缓存key的类型
+ * @template V - 缓存value的类型
+ */
+export default class VisitedCache<K, V> {
+    private capacity;
+    private cache;
+    private visitCountOrder;
+    private keyOrderMatrixForByCount;
+    private releaseCount;
+    /**
+     *
+     * @param capacity 容量
+     * @param releasePercent 清理数量占容量百分比
+     */
+    constructor(capacity: number, releasePercent?: number);
+    /**
+     * 更新现存项目的缓存顺序
+     * @param key
+     * @param entry
+     */
+    private updateCacheEntryOrder;
+    /**
+     *
+     * @param {K} key
+     * @returns {(V | undefined)}
+     */
+    get(key: K): V | undefined;
+    /**
+     *
+     * @param {K} key
+     * @param {V} value
+     */
+    set(key: K, value: V): void;
+    has(key: K): boolean;
+}

package/lib/utils/visitedCache.js

@@ -0,0 +1,128 @@
+/**
+ * amis-core v6.8.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+
+/**
+ * 自动清理访问次数最少key的Map，次数相同时优先淘汰旧项
+ * 每次触发清理的计数基于容量的百分比
+ * @class VisitedCache
+ * @template K - 缓存key的类型
+ * @template V - 缓存value的类型
+ */
+var VisitedCache = /** @class */ (function () {
+    /**
+     *
+     * @param capacity 容量
+     * @param releasePercent 清理数量占容量百分比
+     */
+    function VisitedCache(capacity, releasePercent) {
+        this.visitCountOrder = [];
+        this.keyOrderMatrixForByCount = {};
+        this.capacity = capacity;
+        this.cache = new Map();
+        this.releaseCount = (this.capacity * (releasePercent || 1 / 8)) >> 0 || 1;
+    }
+    /**
+     * 更新现存项目的缓存顺序
+     * @param key
+     * @param entry
+     */
+    VisitedCache.prototype.updateCacheEntryOrder = function (key, entry, nextVisitCount) {
+        var oldVisitCount = entry.visitCount;
+        var oldKeyOrder = this.keyOrderMatrixForByCount[oldVisitCount];
+        if (Array.isArray(oldKeyOrder)) {
+            // 从key为旧访问次数的顺序数组中删除
+            var oldKeyIndex = oldKeyOrder.indexOf(key);
+            if (oldKeyIndex !== -1) {
+                oldKeyOrder.splice(oldKeyIndex, 1);
+            }
+        }
+        // 相同访问量，更新访问顺序
+        this.keyOrderMatrixForByCount[nextVisitCount] = Array.isArray(this.keyOrderMatrixForByCount[nextVisitCount])
+            ? tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(this.keyOrderMatrixForByCount[nextVisitCount]), false), [key], false) : [key];
+        entry.visitCount = nextVisitCount;
+        // 重新按照访问量排序
+        this.visitCountOrder = tslib.__spreadArray([], tslib.__read(new Set(tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(this.visitCountOrder), false), [nextVisitCount], false))), false).sort(function (a, b) { return a - b; });
+    };
+    /**
+     *
+     * @param {K} key
+     * @returns {(V | undefined)}
+     */
+    VisitedCache.prototype.get = function (key) {
+        if (this.cache.has(key)) {
+            var entry = this.cache.get(key);
+            if (entry !== undefined) {
+                var visitCount = entry.visitCount;
+                // 更新访问顺序
+                this.updateCacheEntryOrder(key, entry, visitCount + 1);
+                return entry.value;
+            }
+        }
+        return undefined;
+    };
+    /**
+     *
+     * @param {K} key
+     * @param {V} value
+     */
+    VisitedCache.prototype.set = function (key, value) {
+        // 更新现存项的值和访问次数及新鲜度
+        if (this.cache.has(key)) {
+            var entry = this.cache.get(key);
+            if (entry !== undefined) {
+                var visitCount = entry.visitCount;
+                this.updateCacheEntryOrder(key, entry, visitCount + 1);
+                entry.value = value;
+            }
+        }
+        else {
+            // 先进行清理
+            if (this.cache.size === this.capacity) {
+                // TODO 依据最大容量的1/10进行释放,试试效果
+                var dynamicReleaseCount = this.releaseCount;
+                // const dynamicReleaseCount =
+                // 	(this.keyOrderMatrixForByCount[this.visitCountOrder[this.visitCountOrder.length - 1]].length / (this.capacity)) >>
+                // 		0 || 1
+                var findIndex = 0;
+                var released = 0;
+                while (released < dynamicReleaseCount &&
+                    findIndex <= this.visitCountOrder.length - 1) {
+                    // 最少访问的次数
+                    var targetCount = this.visitCountOrder[findIndex];
+                    // 查看其中有没有项
+                    var targetKeyOrder = this.keyOrderMatrixForByCount[targetCount];
+                    if (!targetKeyOrder.length) {
+                        findIndex++;
+                    }
+                    else {
+                        while (targetKeyOrder.length > 0 &&
+                            released < dynamicReleaseCount) {
+                            this.cache.delete(targetKeyOrder.shift());
+                            released++;
+                        }
+                    }
+                }
+            }
+            var newEntry = {
+                visitCount: 1,
+                value: value
+            };
+            this.cache.set(key, newEntry);
+            this.updateCacheEntryOrder(key, newEntry, 1);
+        }
+    };
+    VisitedCache.prototype.has = function (key) {
+        return this.cache.has(key);
+    };
+    return VisitedCache;
+}());
+
+exports["default"] = VisitedCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "6.7.0",
+  "version": "6.8.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-formula": "^6.7.0",
+    "amis-formula": "^6.8.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",