@next-core/cook 1.9.21 → 1.9.23

package/dist/esm/precookFunction.js

@@ -1,20 +1,31 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["typescript"];
+var _excluded = ["typescript", "cacheKey"];
 import { parseAsEstree } from "./parse";
 import { precook } from "./precook";
+var ASTCache = new WeakMap();
 export function precookFunction(source) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
     {
-      typescript
+      typescript,
+      cacheKey
     } = _ref,
     restOptions = _objectWithoutProperties(_ref, _excluded);
-  var func = parseAsEstree(source, {
-    typescript
-  });
+  var func = cacheKey ? ASTCache.get(cacheKey) : undefined;
+  if (!func) {
+    func = parseAsEstree(source, {
+      typescript
+    });
+    if (cacheKey) {
+      ASTCache.set(cacheKey, func);
+    }
+  }
   var attemptToVisitGlobals = precook(func, restOptions);
   return {
     function: func,
     attemptToVisitGlobals
   };
 }
+export function clearFunctionASTCache() {
+  ASTCache = new WeakMap();
+}
 //# sourceMappingURL=precookFunction.js.map

package/dist/esm/precookFunction.js.map

@@ -1 +1 @@
-{"version":3,"file":"precookFunction.js","names":["parseAsEstree","precook","precookFunction","source","typescript","restOptions","func","attemptToVisitGlobals","function"],"sources":["../../src/precookFunction.ts"],"sourcesContent":["import { FunctionDeclaration } from \"@babel/types\";\nimport { parseAsEstree } from \"./parse\";\nimport { precook, PrecookOptions } from \"./precook\";\n\nexport interface PrecookFunctionOptions extends PrecookOptions {\n  typescript?: boolean;\n}\n\nexport interface PrecookFunctionResult {\n  function: FunctionDeclaration;\n  attemptToVisitGlobals: Set<string>;\n}\n\nexport function precookFunction(\n  source: string,\n  { typescript, ...restOptions }: PrecookFunctionOptions = {}\n): PrecookFunctionResult {\n  const func = parseAsEstree(source, { typescript });\n  const attemptToVisitGlobals = precook(func, restOptions);\n  return {\n    function: func,\n    attemptToVisitGlobals,\n  };\n}\n"],"mappings":";;AACA,SAASA,aAAa,QAAQ,SAAS;AACvC,SAASC,OAAO,QAAwB,WAAW;AAWnD,OAAO,SAASC,eAAe,CAC7BC,MAAc,EAES;EAAA,+EADkC,CAAC,CAAC;IAA3D;MAAEC;IAAmD,CAAC;IAArCC,WAAW;EAE5B,IAAMC,IAAI,GAAGN,aAAa,CAACG,MAAM,EAAE;IAAEC;EAAW,CAAC,CAAC;EAClD,IAAMG,qBAAqB,GAAGN,OAAO,CAACK,IAAI,EAAED,WAAW,CAAC;EACxD,OAAO;IACLG,QAAQ,EAAEF,IAAI;IACdC;EACF,CAAC;AACH"}
+{"version":3,"file":"precookFunction.js","names":["parseAsEstree","precook","ASTCache","WeakMap","precookFunction","source","typescript","cacheKey","restOptions","func","get","undefined","set","attemptToVisitGlobals","function","clearFunctionASTCache"],"sources":["../../src/precookFunction.ts"],"sourcesContent":["import type { FunctionDeclaration } from \"@babel/types\";\nimport { parseAsEstree } from \"./parse\";\nimport { precook, PrecookOptions } from \"./precook\";\n\nlet ASTCache = new WeakMap<object, FunctionDeclaration>();\n\nexport interface PrecookFunctionOptions extends PrecookOptions {\n  cacheKey?: object;\n  typescript?: boolean;\n}\n\nexport interface PrecookFunctionResult {\n  function: FunctionDeclaration;\n  attemptToVisitGlobals: Set<string>;\n}\n\nexport function precookFunction(\n  source: string,\n  { typescript, cacheKey, ...restOptions }: PrecookFunctionOptions = {}\n): PrecookFunctionResult {\n  let func = cacheKey ? ASTCache.get(cacheKey) : undefined;\n  if (!func) {\n    func = parseAsEstree(source, { typescript });\n    if (cacheKey) {\n      ASTCache.set(cacheKey, func);\n    }\n  }\n  const attemptToVisitGlobals = precook(func, restOptions);\n  return {\n    function: func,\n    attemptToVisitGlobals,\n  };\n}\n\nexport function clearFunctionASTCache(): void {\n  ASTCache = new WeakMap();\n}\n"],"mappings":";;AACA,SAASA,aAAa,QAAQ,SAAS;AACvC,SAASC,OAAO,QAAwB,WAAW;AAEnD,IAAIC,QAAQ,GAAG,IAAIC,OAAO,EAA+B;AAYzD,OAAO,SAASC,eAAe,CAC7BC,MAAc,EAES;EAAA,+EAD4C,CAAC,CAAC;IAArE;MAAEC,UAAU;MAAEC;IAAiD,CAAC;IAArCC,WAAW;EAEtC,IAAIC,IAAI,GAAGF,QAAQ,GAAGL,QAAQ,CAACQ,GAAG,CAACH,QAAQ,CAAC,GAAGI,SAAS;EACxD,IAAI,CAACF,IAAI,EAAE;IACTA,IAAI,GAAGT,aAAa,CAACK,MAAM,EAAE;MAAEC;IAAW,CAAC,CAAC;IAC5C,IAAIC,QAAQ,EAAE;MACZL,QAAQ,CAACU,GAAG,CAACL,QAAQ,EAAEE,IAAI,CAAC;IAC9B;EACF;EACA,IAAMI,qBAAqB,GAAGZ,OAAO,CAACQ,IAAI,EAAED,WAAW,CAAC;EACxD,OAAO;IACLM,QAAQ,EAAEL,IAAI;IACdI;EACF,CAAC;AACH;AAEA,OAAO,SAASE,qBAAqB,GAAS;EAC5Cb,QAAQ,GAAG,IAAIC,OAAO,EAAE;AAC1B"}

package/dist/esm/preevaluate.js

@@ -1,15 +1,29 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["cache"];
 import { parseAsEstreeExpression } from "./parse";
 import { precook } from "./precook";
+var ASTCache = new Map();
 // `raw` should always be asserted by `isEvaluable`.
-export function preevaluate(raw, options) {
+export function preevaluate(raw) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    {
+      cache
+    } = _ref,
+    restOptions = _objectWithoutProperties(_ref, _excluded);
   var fixes = [];
   var source = raw.replace(/^\s*<%[~=!]?\s|\s%>\s*$/g, m => {
     fixes.push(m);
     return "";
   });
-  var expression = parseAsEstreeExpression(source);
-  var attemptToVisitGlobals = precook(expression, _objectSpread(_objectSpread({}, options), {}, {
+  var expression = cache ? ASTCache.get(source) : undefined;
+  if (!expression) {
+    expression = parseAsEstreeExpression(source);
+    if (cache) {
+      ASTCache.set(source, expression);
+    }
+  }
+  var attemptToVisitGlobals = precook(expression, _objectSpread(_objectSpread({}, restOptions), {}, {
     expressionOnly: true
   }));
   return {
@@ -32,4 +46,7 @@ export function isSnippetEvaluation(raw) {
 export function isTrackAll(raw) {
   return /^\s*<%=\s/.test(raw) && /\s%>\s*$/.test(raw);
 }
+export function clearExpressionASTCache() {
+  ASTCache.clear();
+}
 //# sourceMappingURL=preevaluate.js.map

package/dist/esm/preevaluate.js.map

@@ -1 +1 @@
-{"version":3,"file":"preevaluate.js","names":["parseAsEstreeExpression","precook","preevaluate","raw","options","fixes","source","replace","m","push","expression","attemptToVisitGlobals","expressionOnly","prefix","suffix","isEvaluable","test","shouldAllowRecursiveEvaluations","isSnippetEvaluation","isTrackAll"],"sources":["../../src/preevaluate.ts"],"sourcesContent":["import { Expression } from \"@babel/types\";\nimport { parseAsEstreeExpression } from \"./parse\";\nimport { precook, PrecookOptions } from \"./precook\";\n\nexport type PreevaluateOptions = Omit<PrecookOptions, \"expressionOnly\">;\n\nexport interface PreevaluateResult {\n  expression: Expression;\n  attemptToVisitGlobals: Set<string>;\n  source: string;\n  prefix: string;\n  suffix: string;\n}\n\n// `raw` should always be asserted by `isEvaluable`.\nexport function preevaluate(\n  raw: string,\n  options?: PreevaluateOptions\n): PreevaluateResult {\n  const fixes: string[] = [];\n  const source = raw.replace(/^\\s*<%[~=!]?\\s|\\s%>\\s*$/g, (m) => {\n    fixes.push(m);\n    return \"\";\n  });\n  const expression = parseAsEstreeExpression(source);\n  const attemptToVisitGlobals = precook(expression, {\n    ...options,\n    expressionOnly: true,\n  });\n  return {\n    expression,\n    attemptToVisitGlobals,\n    source,\n    prefix: fixes[0],\n    suffix: fixes[1],\n  };\n}\n\nexport function isEvaluable(raw: string): boolean {\n  return /^\\s*<%[~=]?\\s/.test(raw) && /\\s%>\\s*$/.test(raw);\n}\n\nexport function shouldAllowRecursiveEvaluations(raw: string): boolean {\n  return /^\\s*<%~\\s/.test(raw);\n}\n\nexport function isSnippetEvaluation(raw: string): boolean {\n  return /^\\s*<%[!@]=?\\s/.test(raw) && /\\s%>\\s*$/.test(raw);\n}\n\nexport function isTrackAll(raw: string): boolean {\n  return /^\\s*<%=\\s/.test(raw) && /\\s%>\\s*$/.test(raw);\n}\n"],"mappings":";AACA,SAASA,uBAAuB,QAAQ,SAAS;AACjD,SAASC,OAAO,QAAwB,WAAW;AAYnD;AACA,OAAO,SAASC,WAAW,CACzBC,GAAW,EACXC,OAA4B,EACT;EACnB,IAAMC,KAAe,GAAG,EAAE;EAC1B,IAAMC,MAAM,GAAGH,GAAG,CAACI,OAAO,CAAC,0BAA0B,EAAGC,CAAC,IAAK;IAC5DH,KAAK,CAACI,IAAI,CAACD,CAAC,CAAC;IACb,OAAO,EAAE;EACX,CAAC,CAAC;EACF,IAAME,UAAU,GAAGV,uBAAuB,CAACM,MAAM,CAAC;EAClD,IAAMK,qBAAqB,GAAGV,OAAO,CAACS,UAAU,kCAC3CN,OAAO;IACVQ,cAAc,EAAE;EAAI,GACpB;EACF,OAAO;IACLF,UAAU;IACVC,qBAAqB;IACrBL,MAAM;IACNO,MAAM,EAAER,KAAK,CAAC,CAAC,CAAC;IAChBS,MAAM,EAAET,KAAK,CAAC,CAAC;EACjB,CAAC;AACH;AAEA,OAAO,SAASU,WAAW,CAACZ,GAAW,EAAW;EAChD,OAAO,eAAe,CAACa,IAAI,CAACb,GAAG,CAAC,IAAI,UAAU,CAACa,IAAI,CAACb,GAAG,CAAC;AAC1D;AAEA,OAAO,SAASc,+BAA+B,CAACd,GAAW,EAAW;EACpE,OAAO,WAAW,CAACa,IAAI,CAACb,GAAG,CAAC;AAC9B;AAEA,OAAO,SAASe,mBAAmB,CAACf,GAAW,EAAW;EACxD,OAAO,gBAAgB,CAACa,IAAI,CAACb,GAAG,CAAC,IAAI,UAAU,CAACa,IAAI,CAACb,GAAG,CAAC;AAC3D;AAEA,OAAO,SAASgB,UAAU,CAAChB,GAAW,EAAW;EAC/C,OAAO,WAAW,CAACa,IAAI,CAACb,GAAG,CAAC,IAAI,UAAU,CAACa,IAAI,CAACb,GAAG,CAAC;AACtD"}
+{"version":3,"file":"preevaluate.js","names":["parseAsEstreeExpression","precook","ASTCache","Map","preevaluate","raw","cache","restOptions","fixes","source","replace","m","push","expression","get","undefined","set","attemptToVisitGlobals","expressionOnly","prefix","suffix","isEvaluable","test","shouldAllowRecursiveEvaluations","isSnippetEvaluation","isTrackAll","clearExpressionASTCache","clear"],"sources":["../../src/preevaluate.ts"],"sourcesContent":["import type { Expression } from \"@babel/types\";\nimport { parseAsEstreeExpression } from \"./parse\";\nimport { precook, PrecookOptions } from \"./precook\";\n\nconst ASTCache = new Map<string, Expression>();\n\nexport type PreevaluateOptions = Omit<PrecookOptions, \"expressionOnly\"> & {\n  cache?: boolean;\n};\n\nexport interface PreevaluateResult {\n  expression: Expression;\n  attemptToVisitGlobals: Set<string>;\n  source: string;\n  prefix: string;\n  suffix: string;\n}\n\n// `raw` should always be asserted by `isEvaluable`.\nexport function preevaluate(\n  raw: string,\n  { cache, ...restOptions }: PreevaluateOptions = {}\n): PreevaluateResult {\n  const fixes: string[] = [];\n  const source = raw.replace(/^\\s*<%[~=!]?\\s|\\s%>\\s*$/g, (m) => {\n    fixes.push(m);\n    return \"\";\n  });\n  let expression = cache ? ASTCache.get(source) : undefined;\n  if (!expression) {\n    expression = parseAsEstreeExpression(source);\n    if (cache) {\n      ASTCache.set(source, expression);\n    }\n  }\n  const attemptToVisitGlobals = precook(expression, {\n    ...restOptions,\n    expressionOnly: true,\n  });\n  return {\n    expression,\n    attemptToVisitGlobals,\n    source,\n    prefix: fixes[0],\n    suffix: fixes[1],\n  };\n}\n\nexport function isEvaluable(raw: string): boolean {\n  return /^\\s*<%[~=]?\\s/.test(raw) && /\\s%>\\s*$/.test(raw);\n}\n\nexport function shouldAllowRecursiveEvaluations(raw: string): boolean {\n  return /^\\s*<%~\\s/.test(raw);\n}\n\nexport function isSnippetEvaluation(raw: string): boolean {\n  return /^\\s*<%[!@]=?\\s/.test(raw) && /\\s%>\\s*$/.test(raw);\n}\n\nexport function isTrackAll(raw: string): boolean {\n  return /^\\s*<%=\\s/.test(raw) && /\\s%>\\s*$/.test(raw);\n}\n\nexport function clearExpressionASTCache(): void {\n  ASTCache.clear();\n}\n"],"mappings":";;;AACA,SAASA,uBAAuB,QAAQ,SAAS;AACjD,SAASC,OAAO,QAAwB,WAAW;AAEnD,IAAMC,QAAQ,GAAG,IAAIC,GAAG,EAAsB;AAc9C;AACA,OAAO,SAASC,WAAW,CACzBC,GAAW,EAEQ;EAAA,+EAD6B,CAAC,CAAC;IAAlD;MAAEC;IAA0C,CAAC;IAAjCC,WAAW;EAEvB,IAAMC,KAAe,GAAG,EAAE;EAC1B,IAAMC,MAAM,GAAGJ,GAAG,CAACK,OAAO,CAAC,0BAA0B,EAAGC,CAAC,IAAK;IAC5DH,KAAK,CAACI,IAAI,CAACD,CAAC,CAAC;IACb,OAAO,EAAE;EACX,CAAC,CAAC;EACF,IAAIE,UAAU,GAAGP,KAAK,GAAGJ,QAAQ,CAACY,GAAG,CAACL,MAAM,CAAC,GAAGM,SAAS;EACzD,IAAI,CAACF,UAAU,EAAE;IACfA,UAAU,GAAGb,uBAAuB,CAACS,MAAM,CAAC;IAC5C,IAAIH,KAAK,EAAE;MACTJ,QAAQ,CAACc,GAAG,CAACP,MAAM,EAAEI,UAAU,CAAC;IAClC;EACF;EACA,IAAMI,qBAAqB,GAAGhB,OAAO,CAACY,UAAU,kCAC3CN,WAAW;IACdW,cAAc,EAAE;EAAI,GACpB;EACF,OAAO;IACLL,UAAU;IACVI,qBAAqB;IACrBR,MAAM;IACNU,MAAM,EAAEX,KAAK,CAAC,CAAC,CAAC;IAChBY,MAAM,EAAEZ,KAAK,CAAC,CAAC;EACjB,CAAC;AACH;AAEA,OAAO,SAASa,WAAW,CAAChB,GAAW,EAAW;EAChD,OAAO,eAAe,CAACiB,IAAI,CAACjB,GAAG,CAAC,IAAI,UAAU,CAACiB,IAAI,CAACjB,GAAG,CAAC;AAC1D;AAEA,OAAO,SAASkB,+BAA+B,CAAClB,GAAW,EAAW;EACpE,OAAO,WAAW,CAACiB,IAAI,CAACjB,GAAG,CAAC;AAC9B;AAEA,OAAO,SAASmB,mBAAmB,CAACnB,GAAW,EAAW;EACxD,OAAO,gBAAgB,CAACiB,IAAI,CAACjB,GAAG,CAAC,IAAI,UAAU,CAACiB,IAAI,CAACjB,GAAG,CAAC;AAC3D;AAEA,OAAO,SAASoB,UAAU,CAACpB,GAAW,EAAW;EAC/C,OAAO,WAAW,CAACiB,IAAI,CAACjB,GAAG,CAAC,IAAI,UAAU,CAACiB,IAAI,CAACjB,GAAG,CAAC;AACtD;AAEA,OAAO,SAASqB,uBAAuB,GAAS;EAC9CxB,QAAQ,CAACyB,KAAK,EAAE;AAClB"}

package/dist/types/interfaces.d.ts

@@ -22,6 +22,7 @@ export interface EstreeLiteral {
     value: unknown;
     raw: string;
     regex?: {
+        pattern: string;
         flags: string;
     };
     loc: SourceLocation;

package/dist/types/precookFunction.d.ts

@@ -1,10 +1,12 @@
-import { FunctionDeclaration } from "@babel/types";
+import type { FunctionDeclaration } from "@babel/types";
 import { PrecookOptions } from "./precook";
 export interface PrecookFunctionOptions extends PrecookOptions {
+    cacheKey?: object;
     typescript?: boolean;
 }
 export interface PrecookFunctionResult {
     function: FunctionDeclaration;
     attemptToVisitGlobals: Set<string>;
 }
-export declare function precookFunction(source: string, { typescript, ...restOptions }?: PrecookFunctionOptions): PrecookFunctionResult;
+export declare function precookFunction(source: string, { typescript, cacheKey, ...restOptions }?: PrecookFunctionOptions): PrecookFunctionResult;
+export declare function clearFunctionASTCache(): void;

package/dist/types/preevaluate.d.ts

@@ -1,6 +1,8 @@
-import { Expression } from "@babel/types";
+import type { Expression } from "@babel/types";
 import { PrecookOptions } from "./precook";
-export declare type PreevaluateOptions = Omit<PrecookOptions, "expressionOnly">;
+export declare type PreevaluateOptions = Omit<PrecookOptions, "expressionOnly"> & {
+    cache?: boolean;
+};
 export interface PreevaluateResult {
     expression: Expression;
     attemptToVisitGlobals: Set<string>;
@@ -8,8 +10,9 @@ export interface PreevaluateResult {
     prefix: string;
     suffix: string;
 }
-export declare function preevaluate(raw: string, options?: PreevaluateOptions): PreevaluateResult;
+export declare function preevaluate(raw: string, { cache, ...restOptions }?: PreevaluateOptions): PreevaluateResult;
 export declare function isEvaluable(raw: string): boolean;
 export declare function shouldAllowRecursiveEvaluations(raw: string): boolean;
 export declare function isSnippetEvaluation(raw: string): boolean;
 export declare function isTrackAll(raw: string): boolean;
+export declare function clearExpressionASTCache(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/cook",
-  "version": "1.9.21",
+  "version": "1.9.23",
   "description": "Cook expressions and storyboard functions",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/cook",
   "license": "GPL-3.0",
@@ -30,12 +30,12 @@
   "sideEffects": false,
   "dependencies": {
     "@babel/parser": "^7.20.5",
-    "@next-core/brick-types": "^2.98.0"
+    "@next-core/brick-types": "^2.98.1"
   },
   "devDependencies": {
     "@next-core/build-next-libs": "^0.2.16",
-    "@next-core/supply": "^1.1.21",
+    "@next-core/supply": "^1.1.22",
     "lodash": "^4.17.21"
   },
-  "gitHead": "f473f042645d24462e595d961f14b22e15bd67fd"
+  "gitHead": "2f3e51e97c53f902790e63e9cfc887afb91d4fc1"
 }