@mybricks/to-code-taro 1.1.4 → 1.1.5

package/dist/cjs/core/comlib/_Connector.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/core/comlib/_Connector.ts
@@ -32,61 +22,58 @@ __export(Connector_exports, {
   default: () => Connector_default
 });
 module.exports = __toCommonJS(Connector_exports);
-var import_taro = __toESM(require("@tarojs/taro"));
-var Connector_default = (context) => {
-  var _a;
-  const data = context.data;
-  const inputs = context.inputs;
-  const outputs = context.outputs;
-  (_a = inputs.request) == null ? void 0 : _a.call(inputs, (val) => {
+function callCon({ env, data, inputs, outputs, onError }, params = {}) {
+  if (data.connector || data.dynamicConfig) {
     try {
-      const config = {
-        method: (val == null ? void 0 : val.method) || data.method || "GET",
-        url: (val == null ? void 0 : val.url) || data.url,
-        header: (val == null ? void 0 : val.headers) || data.headers || {},
-        data: (val == null ? void 0 : val.data) || data.data,
-        timeout: (val == null ? void 0 : val.timeout) || data.timeout,
-        dataType: (val == null ? void 0 : val.dataType) || data.dataType || "json",
-        responseType: (val == null ? void 0 : val.responseType) || data.responseType || "text"
+      let finnalConnector = {
+        ...data.connector || {},
+        outputSchema: data.outputSchema
       };
-      if (!config.url) {
-        outputs.onFail("请求URL不能为空");
-        return;
+      if (data.dynamicConfig) {
+        finnalConnector = data.dynamicConfig;
       }
-      if (!/^https?:\/\//.test(config.url)) {
-        outputs.onFail("URL格式不正确，请以http://或https://开头");
-        return;
+      if (data.timeout) {
+        finnalConnector.timeout = data.timeout;
       }
-      import_taro.default.request({
-        ...config,
-        success: (res) => {
-          if (res.statusCode >= 200 && res.statusCode < 300) {
-            outputs.onSuccess({
-              data: res.data,
-              statusCode: res.statusCode,
-              header: res.header
-            });
-          } else {
-            outputs.onFail({
-              message: `请求失败: ${res.statusCode}`,
-              statusCode: res.statusCode,
-              data: res.data
-            });
-          }
-        },
-        fail: (err) => {
-          outputs.onFail({
-            message: err.errMsg || "网络请求失败",
-            error: err
-          });
-        }
-      });
-    } catch (error) {
-      console.error("网络请求失败:", error);
-      outputs.onFail({
-        message: (error == null ? void 0 : error.message) || "网络请求失败",
-        error
+      env.request(finnalConnector, params, {
+        ...data.connectorConfig || {},
+        outputSchema: finnalConnector == null ? void 0 : finnalConnector.outputSchema,
+        isMultipleOutputs: true
+      }).then((val) => {
+        outputs[(val == null ? void 0 : val.__OUTPUT_ID__) ?? "then"](
+          (val == null ? void 0 : val.__ORIGIN_RESPONSE__) ?? val
+        );
+      }).catch((err) => {
+        outputs["catch"](err);
       });
+    } catch (ex) {
+      console.error(ex);
+      outputs["catch"](`执行错误 ${ex.message || ex}`);
     }
-  });
-};
+  } else {
+    outputs["catch"](`没有选择接口`);
+  }
+}
+function isPlainObject(value) {
+  if (typeof value !== "object" || value === null)
+    return false;
+  let proto = Object.getPrototypeOf(value);
+  if (proto === null)
+    return true;
+  return proto === Object.prototype;
+}
+function Connector_default({ env, data, inputs, outputs, onError }) {
+  if (!env.runtime) {
+    return;
+  }
+  if (data.immediate) {
+    callCon({ env, data, outputs });
+  } else {
+    inputs["call"]((params) => {
+      if (!isPlainObject(params)) {
+        params = {};
+      }
+      callCon({ env, data, outputs, onError }, params);
+    });
+  }
+}

package/dist/cjs/core/mybricks/createJSHandle.js

@@ -71,7 +71,8 @@ var createJSHandle = (fn, options) => {
     inputs,
     outputs,
     logger: import_log.logger,
-    env: appContext == null ? void 0 : appContext.env
+    env: appContext == null ? void 0 : appContext.env,
+    appContext
   });
   const isJsMultipleInputs = props.inputs[0] ? validateJsMultipleInputs(props.inputs[0]) : false;
   const exeOutputs = new Proxy(

package/dist/cjs/core/utils/hooks.js

@@ -29,6 +29,7 @@ module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
 var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
 var import_ComContext = require("./ComContext");
+var import_pool = require("./pool");
 function deepProxy(target, onSet) {
   if (target === null || typeof target !== "object" || target.__isProxy)
     return target;
@@ -56,27 +57,27 @@ function useModel(rawData) {
   const dataRef = (0, import_react.useRef)(rawData || {});
   return (0, import_react.useMemo)(() => deepProxy(dataRef.current, () => forceUpdate({})), []);
 }
-function proxyRefs(target, parentComRefs, globalTodoPool) {
+function proxyRefs(target, parentComRefs, todoPool) {
   return new Proxy(target, {
     get(obj, prop) {
+      var _a;
       if (prop === "__isProxy")
         return true;
       if (prop === "toJSON")
         return () => obj;
       if (typeof prop === "string" && prop.startsWith("u_") && obj[prop] === void 0) {
+        if (((_a = parentComRefs == null ? void 0 : parentComRefs.current) == null ? void 0 : _a[prop]) && !parentComRefs.current[prop].__isShadow) {
+          return parentComRefs.current[prop];
+        }
+        const currentIndex = obj.$index ?? 0;
         return obj[prop] = new Proxy({ __isShadow: true }, {
           get(_, method) {
             if (method === "__isShadow")
               return true;
             return (...args) => {
-              if (!(globalTodoPool instanceof Map))
+              if (!(todoPool instanceof import_pool.TodoPool))
                 return;
-              const instances = globalTodoPool.get(prop) || [];
-              if (!globalTodoPool.has(prop))
-                globalTodoPool.set(prop, instances);
-              const index = obj.$index ?? 0;
-              const todo = instances[index] || (instances[index] = {});
-              todo[method] = args;
+              todoPool.push(prop, currentIndex, method, args);
             };
           }
         });
@@ -110,7 +111,7 @@ function proxyRefs(target, parentComRefs, globalTodoPool) {
 function useBindInputs(scope, id, initialHandlers) {
   var _a, _b;
   const handlersRef = (0, import_react.useRef)({ ...initialHandlers });
-  const { globalTodoInputs } = (0, import_ComContext.useAppContext)();
+  const { todoPool } = (0, import_ComContext.useAppContext)();
   const parentSlot = (0, import_ComContext.useParentSlot)();
   const index = ((_b = (_a = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _a.inputValues) == null ? void 0 : _b.index) ?? 0;
   (0, import_react.useEffect)(() => {
@@ -130,19 +131,13 @@ function useBindInputs(scope, id, initialHandlers) {
         return (arg, ...args) => {
           if (typeof arg === "function") {
             handlersRef.current[pin] = arg;
-            const instances = globalTodoInputs == null ? void 0 : globalTodoInputs.get(id);
-            const todo = (instances == null ? void 0 : instances[index]) || (instances == null ? void 0 : instances[0]);
-            if (todo == null ? void 0 : todo[pin]) {
-              const pendingArgs = todo[pin];
+            const pendingArgs = todoPool == null ? void 0 : todoPool.pop(id, index, pin);
+            if (pendingArgs) {
               if (pin === "_setData") {
                 arg(...pendingArgs);
               } else {
                 (0, import_createReactiveInputHandler.createReactiveInputHandler)({ input: arg, value: pendingArgs[0], rels: {}, title: id });
               }
-              delete todo[pin];
-              const hasTasks = instances == null ? void 0 : instances.some((inst) => inst && Object.keys(inst).length > 0);
-              if (!hasTasks)
-                globalTodoInputs.delete(id);
             }
           } else {
             const handler = handlersRef.current[pin];
@@ -159,7 +154,7 @@ function useBindInputs(scope, id, initialHandlers) {
       Object.keys(initialHandlers).forEach((pin) => proxy[pin](initialHandlers[pin]));
     }
     return proxy;
-  }, [scope, id, globalTodoInputs, index]);
+  }, [scope, id, todoPool, index]);
 }
 function useBindEvents(props, context) {
   return (0, import_react.useMemo)(() => {

package/dist/cjs/core/utils/index.js

@@ -24,6 +24,7 @@ __export(utils_exports, {
   SUBJECT_SUBSCRIBE: () => import_constant.SUBJECT_SUBSCRIBE,
   SUBJECT_VALUE: () => import_constant.SUBJECT_VALUE,
   SlotProvider: () => import_ComContext.SlotProvider,
+  TodoPool: () => import_pool.TodoPool,
   WithCom: () => import_with.WithCom,
   WithWrapper: () => import_with.WithWrapper,
   closeActivePopupRouter: () => import_popupRouter.closeActivePopupRouter,
@@ -39,6 +40,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./hooks"), module.exports);
+var import_pool = require("./pool");
 var import_with = require("./with");
 var import_PopupRenderer = require("./PopupRenderer");
 var import_pageRouter = require("./pageRouter");
@@ -54,6 +56,7 @@ __reExport(utils_exports, require("./slots"), module.exports);
   SUBJECT_SUBSCRIBE,
   SUBJECT_VALUE,
   SlotProvider,
+  TodoPool,
   WithCom,
   WithWrapper,
   closeActivePopupRouter,

package/dist/cjs/core/utils/pool.js

@@ -0,0 +1,63 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/core/utils/pool.ts
+var pool_exports = {};
+__export(pool_exports, {
+  TodoPool: () => TodoPool
+});
+module.exports = __toCommonJS(pool_exports);
+var TodoPool = class {
+  constructor() {
+    this.pool = /* @__PURE__ */ new Map();
+  }
+  /** 存：记录待执行指令 */
+  push(id, index, method, args) {
+    if (!this.pool.has(id)) {
+      this.pool.set(id, /* @__PURE__ */ new Map());
+    }
+    const instances = this.pool.get(id);
+    if (!instances.has(index)) {
+      instances.set(index, {});
+    }
+    instances.get(index)[method] = args;
+  }
+  /** 取：获取并物理删除指令 */
+  pop(id, index, method) {
+    const instances = this.pool.get(id);
+    if (!instances)
+      return void 0;
+    const todo = instances.get(index);
+    if (todo && todo[method]) {
+      const args = todo[method];
+      delete todo[method];
+      if (Object.keys(todo).length === 0) {
+        instances.delete(index);
+      }
+      if (instances.size === 0) {
+        this.pool.delete(id);
+      }
+      return args;
+    }
+    return void 0;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  TodoPool
+});

package/dist/cjs/core/utils/slots.js

@@ -38,9 +38,9 @@ var import_react = __toESM(require("react"));
 var import_ComContext = __toESM(require("./ComContext"));
 var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
 var import_hooks = require("./hooks");
-function createPenetratingComRefs(parentComRefs, globalTodoPool, index = 0) {
+function createPenetratingComRefs(parentComRefs, todoPool, index = 0) {
   const localTarget = { $inputs: {}, $outputs: {}, $index: index };
-  return { current: (0, import_hooks.proxyRefs)(localTarget, parentComRefs, globalTodoPool) };
+  return { current: (0, import_hooks.proxyRefs)(localTarget, parentComRefs, todoPool) };
 }
 function SlotParamsBridge(props) {
   var _a, _b;
@@ -76,7 +76,7 @@ function createChannelProxy(title) {
   );
 }
 function useEnhancedSlots(rawSlots, id) {
-  const { comRefs: parentComRefs, globalTodoInputs } = (0, import_ComContext.useAppContext)();
+  const { comRefs: parentComRefs, todoPool } = (0, import_ComContext.useAppContext)();
   const slotStoreRef = (0, import_react.useRef)({});
   return (0, import_react.useMemo)(() => {
     if (!rawSlots)
@@ -90,15 +90,15 @@ function useEnhancedSlots(rawSlots, id) {
         _scopedComRefs: {},
         _render: void 0,
         render: (params) => {
-          var _a, _b, _c, _d, _e;
+          var _a, _b, _c;
           const r = state._render;
-          const rawScope = (params == null ? void 0 : params.key) ?? ((_a = params == null ? void 0 : params.inputValues) == null ? void 0 : _a.index) ?? ((_c = (_b = params == null ? void 0 : params.inputValues) == null ? void 0 : _b.itemData) == null ? void 0 : _c.id);
+          const rawScope = ((_a = params == null ? void 0 : params.inputValues) == null ? void 0 : _a.index) ?? (params == null ? void 0 : params.key);
           if (rawScope === void 0 || rawScope === null) {
             return /* @__PURE__ */ import_react.default.createElement(SlotParamsBridge, { state, params, render: r });
           }
           const scopeId = `${id}.${slotKey}::${String(rawScope)}`;
-          const index = ((_d = params == null ? void 0 : params.inputValues) == null ? void 0 : _d.index) ?? 0;
-          const scopedComRefs = (_e = state._scopedComRefs)[scopeId] || (_e[scopeId] = createPenetratingComRefs(parentComRefs, globalTodoInputs, index));
+          const index = ((_b = params == null ? void 0 : params.inputValues) == null ? void 0 : _b.index) ?? 0;
+          const scopedComRefs = (_c = state._scopedComRefs)[scopeId] || (_c[scopeId] = createPenetratingComRefs(parentComRefs, todoPool, index));
           return /* @__PURE__ */ import_react.default.createElement(ScopedComContextProvider, { comRefs: scopedComRefs, scopeId }, /* @__PURE__ */ import_react.default.createElement(SlotParamsBridge, { state, params, render: r }));
         }
       });
@@ -112,7 +112,7 @@ function useEnhancedSlots(rawSlots, id) {
       };
     });
     return nextSlots;
-  }, [rawSlots, id, parentComRefs, globalTodoInputs]);
+  }, [rawSlots, id, parentComRefs, todoPool]);
 }
 function ScopedComContextProvider(props) {
   const parent = (0, import_ComContext.useAppContext)();

package/dist/cjs/core/utils/useContext.js

@@ -24,10 +24,11 @@ __export(useContext_exports, {
 module.exports = __toCommonJS(useContext_exports);
 var import_react = require("react");
 var import_hooks = require("./hooks");
-var GLOBAL_TODO_POOL = /* @__PURE__ */ new Map();
+var import_pool = require("./pool");
+var import_request = require("@/common/request");
 function useAppCreateContext(id) {
-  const globalTodoInputs = (0, import_react.useRef)(GLOBAL_TODO_POOL);
-  const comRefs = (0, import_react.useRef)((0, import_hooks.proxyRefs)({ $inputs: {}, $outputs: {} }, void 0, globalTodoInputs.current));
+  const todoPool = (0, import_react.useMemo)(() => new import_pool.TodoPool(), []);
+  const comRefs = (0, import_react.useRef)((0, import_hooks.proxyRefs)({ $inputs: {}, $outputs: {} }, void 0, todoPool));
   const $vars = (0, import_react.useRef)({});
   const $fxs = (0, import_react.useRef)({});
   const [popupState, setPopupState] = (0, import_react.useState)({
@@ -40,8 +41,9 @@ function useAppCreateContext(id) {
     canvas: {
       id
     },
-    runtime: {
-      debug: false
+    env: {
+      runtime: true,
+      request: (connector, params, config) => (0, import_request.request)(connector, params, config, { $vars })
     },
     edit: false,
     isH5: false,
@@ -58,7 +60,7 @@ function useAppCreateContext(id) {
     comRefs,
     $vars,
     $fxs,
-    globalTodoInputs: globalTodoInputs.current,
+    todoPool,
     appContext,
     popupState,
     setPopupState

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -164,6 +164,14 @@ ${item.content || ""}`;
     }
   }
   (0, import_commonDir.handleCommonDir)(commonDir, files);
+  const apiItem = files.find((item) => item.type === "connector-api");
+  if (apiItem) {
+    commonDir.children = commonDir.children || [];
+    commonDir.children.push({
+      path: "src/common/api.ts",
+      content: apiItem.content
+    });
+  }
   const popupFile = files.find((f) => f.type === "popup" && !f.meta);
   if (popupFile) {
     commonDir.children.push({