@nocobase/plugin-flow-engine 2.0.0-alpha.23 → 2.0.0-alpha.24

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.23",
+  "@nocobase/client": "2.0.0-alpha.24",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.0.0-alpha.23",
-  "@nocobase/data-source-manager": "2.0.0-alpha.23",
-  "@nocobase/resourcer": "2.0.0-alpha.23",
-  "@nocobase/server": "2.0.0-alpha.23",
-  "@nocobase/cache": "2.0.0-alpha.23",
-  "@nocobase/utils": "2.0.0-alpha.23",
-  "@nocobase/plugin-localization": "2.0.0-alpha.23",
-  "@nocobase/actions": "2.0.0-alpha.23"
+  "@nocobase/database": "2.0.0-alpha.24",
+  "@nocobase/data-source-manager": "2.0.0-alpha.24",
+  "@nocobase/resourcer": "2.0.0-alpha.24",
+  "@nocobase/server": "2.0.0-alpha.24",
+  "@nocobase/utils": "2.0.0-alpha.24",
+  "@nocobase/cache": "2.0.0-alpha.24",
+  "@nocobase/plugin-localization": "2.0.0-alpha.24",
+  "@nocobase/actions": "2.0.0-alpha.24"
 };

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2025-10-25T15:29:57.807Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2025-10-26T10:30:14.651Z"}

package/dist/server/plugin.d.ts

@@ -12,10 +12,6 @@ export declare class PluginFlowEngineServer extends PluginUISchemaStorageServer
     afterAdd(): Promise<void>;
     beforeLoad(): Promise<void>;
     getDatabaseByDataSourceKey(dataSourceKey?: string): import("@nocobase/database").default;
-    transformSQL(template: string): {
-        sql: string;
-        bind: {};
-    };
     load(): Promise<void>;
     install(): Promise<void>;
     afterEnable(): Promise<void>;

package/dist/server/plugin.js

@@ -45,6 +45,7 @@ var import_contexts = require("./template/contexts");
 var import_resolver = require("./template/resolver");
 var import_registry = require("./variables/registry");
 var import_utils = require("./variables/utils");
+var import_utils2 = require("@nocobase/utils");
 class PluginFlowEngineServer extends import_server2.default {
   globalContext;
   async afterAdd() {
@@ -60,17 +61,6 @@ class PluginFlowEngineServer extends import_server2.default {
     }
     return cm.db;
   }
-  transformSQL(template) {
-    let index = 1;
-    const bind = {};
-    const sql = template.replace(/{{\s*([^}]+)\s*}}/g, (_, expr) => {
-      const key = `__var${index}`;
-      bind[key] = `{{${expr.trim()}}}`;
-      index++;
-      return `$${key}`;
-    });
-    return { sql, bind };
-  }
   async load() {
     var _a, _b;
     await super.load();
@@ -133,14 +123,15 @@ class PluginFlowEngineServer extends import_server2.default {
     });
     this.app.resourceManager.registerActionHandlers({
       "flowSql:runById": async (ctx, next) => {
-        const { uid, type, filter, bind, dataSourceKey = "main" } = ctx.action.params.values;
+        const { uid, type, filter, bind, liquidContext, dataSourceKey = "main" } = ctx.action.params.values;
         const r = this.db.getRepository("flowSql");
         const record = await r.findOne({
           filter: { uid }
         });
         const db = this.getDatabaseByDataSourceKey(record.dataSourceKey || dataSourceKey);
-        const result = this.transformSQL(record.sql);
-        ctx.body = await db.runSQL(result.sql, {
+        const result = await (0, import_utils2.transformSQL)(record.sql);
+        const sql = await (0, import_utils2.parseLiquidContext)(result.sql, liquidContext);
+        ctx.body = await db.runSQL(sql, {
           type,
           filter,
           bind
@@ -153,8 +144,11 @@ class PluginFlowEngineServer extends import_server2.default {
         const record = await r.findOne({
           filter: { uid }
         });
-        const { bind } = this.transformSQL(record.sql);
-        ctx.body = bind;
+        const { bind, liquidContext } = await (0, import_utils2.transformSQL)(record.sql);
+        ctx.body = {
+          bind,
+          liquidContext
+        };
         await next();
       },
       "flowSql:save": async (ctx, next) => {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.0.0-alpha.23",
+  "version": "2.0.0-alpha.24",
   "main": "./dist/server/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "ea67a7ad1c12fce26e0fff992f33de10901eff6a"
+  "gitHead": "4e6d1ae61143f01aba213355b4c416aab4d64077"
 }