@mybricks/to-code-taro 1.0.5 → 1.0.7

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

@@ -19,14 +19,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/core/utils/ComContext.tsx
 var ComContext_exports = {};
 __export(ComContext_exports, {
+  SlotProvider: () => SlotProvider,
   default: () => ComContext_default,
   pageRouter: () => import_pageRouter.pageRouter,
-  useAppContext: () => useAppContext
+  useAppContext: () => useAppContext,
+  useParentSlot: () => useParentSlot
 });
 module.exports = __toCommonJS(ComContext_exports);
 var import_react = require("react");
 var import_pageRouter = require("./pageRouter");
 var ComContext = (0, import_react.createContext)(void 0);
+var SlotContext = (0, import_react.createContext)(null);
 function useAppContext() {
   const context = (0, import_react.useContext)(ComContext);
   if (!context) {
@@ -34,9 +37,15 @@ function useAppContext() {
   }
   return context;
 }
+function useParentSlot() {
+  return (0, import_react.useContext)(SlotContext);
+}
+var SlotProvider = SlotContext.Provider;
 var ComContext_default = ComContext;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  SlotProvider,
   pageRouter,
-  useAppContext
+  useAppContext,
+  useParentSlot
 });

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

@@ -87,17 +87,26 @@ function useBindInputs(scope, id, initialHandlers) {
         };
       }
     });
-    scope[id] = proxy;
+    if (scope && scope.current) {
+      scope.current[id] = proxy;
+    }
     return proxy;
   }, [scope, id]);
 }
-function useBindEvents(props) {
+function useBindEvents(props, context) {
   return (0, import_react.useMemo)(() => {
     const _events = {};
     Object.keys(props).forEach((key) => {
       if (key.startsWith("on") && typeof props[key] === "function") {
         const handler = props[key];
-        const wrapped = (...args) => handler(...args);
+        const wrapped = (originalValue) => {
+          const value = context ? {
+            id: context.id,
+            name: context.name,
+            value: originalValue
+          } : originalValue;
+          return handler(value);
+        };
         wrapped.getConnections = () => [{ id: "default" }];
         _events[key] = wrapped;
       }
@@ -116,7 +125,7 @@ function useBindEvents(props) {
         return target[key];
       }
     });
-  }, [props]);
+  }, [props, context]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -23,6 +23,7 @@ __export(utils_exports, {
   PopupRenderer: () => import_PopupRenderer.PopupRenderer,
   SUBJECT_SUBSCRIBE: () => import_constant.SUBJECT_SUBSCRIBE,
   SUBJECT_VALUE: () => import_constant.SUBJECT_VALUE,
+  SlotProvider: () => import_ComContext.SlotProvider,
   WithCom: () => import_with.WithCom,
   WithWrapper: () => import_with.WithWrapper,
   closeActivePopupRouter: () => import_popupRouter.closeActivePopupRouter,
@@ -33,7 +34,8 @@ __export(utils_exports, {
   popupRouter: () => import_popupRouter.popupRouter,
   router: () => import_pageRouter.router,
   subscribePopupRouter: () => import_popupRouter.subscribePopupRouter,
-  useAppContext: () => import_ComContext.useAppContext
+  useAppContext: () => import_ComContext.useAppContext,
+  useAppCreateContext: () => import_useContext.useAppCreateContext
 });
 module.exports = __toCommonJS(utils_exports);
 __reExport(utils_exports, require("./hooks"), module.exports);
@@ -42,13 +44,16 @@ var import_PopupRenderer = require("./PopupRenderer");
 var import_pageRouter = require("./pageRouter");
 var import_popupRouter = require("./popupRouter");
 var import_ComContext = require("./ComContext");
+var import_useContext = require("./useContext");
 var import_mybricks = require("../mybricks");
 var import_constant = require("../mybricks/constant");
+__reExport(utils_exports, require("./slots"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PopupRenderer,
   SUBJECT_SUBSCRIBE,
   SUBJECT_VALUE,
+  SlotProvider,
   WithCom,
   WithWrapper,
   closeActivePopupRouter,
@@ -60,5 +65,7 @@ var import_constant = require("../mybricks/constant");
   router,
   subscribePopupRouter,
   useAppContext,
-  ...require("./hooks")
+  useAppCreateContext,
+  ...require("./hooks"),
+  ...require("./slots")
 });

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

@@ -0,0 +1,124 @@
+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)
+    __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 __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/utils/slots.tsx
+var slots_exports = {};
+__export(slots_exports, {
+  ScopedComContextProvider: () => ScopedComContextProvider,
+  useEnhancedSlots: () => useEnhancedSlots,
+  useResolvedParentSlot: () => useResolvedParentSlot
+});
+module.exports = __toCommonJS(slots_exports);
+var import_react = __toESM(require("react"));
+var import_ComContext = __toESM(require("./ComContext"));
+var import_createReactiveInputHandler = require("../mybricks/createReactiveInputHandler");
+function createChannelProxy(title) {
+  const handlersMap = {};
+  return new Proxy(
+    {},
+    {
+      get: (_t, pin) => {
+        return (arg) => {
+          if (typeof arg === "function") {
+            handlersMap[pin] = arg;
+            return;
+          }
+          const handler = handlersMap[pin];
+          if (typeof handler === "function") {
+            return (0, import_createReactiveInputHandler.createReactiveInputHandler)({
+              input: handler,
+              value: arg,
+              rels: {},
+              title
+            });
+          }
+        };
+      }
+    }
+  );
+}
+function useEnhancedSlots(rawSlots, id) {
+  const slotStoreRef = (0, import_react.useRef)({});
+  return (0, import_react.useMemo)(() => {
+    if (!rawSlots)
+      return {};
+    const nextSlots = {};
+    Object.entries(rawSlots).forEach(([slotKey, slotDef]) => {
+      const state = slotStoreRef.current[slotKey] || (slotStoreRef.current[slotKey] = {
+        inputs: createChannelProxy(`${id}.${slotKey}.inputs`),
+        outputs: createChannelProxy(`${id}.${slotKey}.outputs`),
+        _inputs: createChannelProxy(`${id}.${slotKey}._inputs`),
+        _scopedComRefs: {},
+        _render: void 0,
+        render: (params) => {
+          var _a, _b, _c, _d;
+          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 SlotComp = r;
+          const content = r ? /* @__PURE__ */ import_react.default.createElement(SlotComp, { ...params || {} }) : null;
+          if (rawScope === void 0 || rawScope === null) {
+            return /* @__PURE__ */ import_react.default.createElement(import_ComContext.SlotProvider, { value: { ...state, params } }, content);
+          }
+          const scopeId = `${id}.${slotKey}::${String(rawScope)}`;
+          const scopedComRefs = (_d = state._scopedComRefs)[scopeId] || (_d[scopeId] = { current: { $inputs: {} } });
+          return /* @__PURE__ */ import_react.default.createElement(import_ComContext.SlotProvider, { value: { ...state, params } }, /* @__PURE__ */ import_react.default.createElement(ScopedComContextProvider, { comRefs: scopedComRefs, scopeId }, content));
+        }
+      });
+      state._render = slotDef == null ? void 0 : slotDef.render;
+      nextSlots[slotKey] = {
+        ...slotDef || {},
+        render: state.render,
+        inputs: state.inputs,
+        outputs: state.outputs,
+        _inputs: state._inputs
+      };
+    });
+    return nextSlots;
+  }, [rawSlots, id]);
+}
+function ScopedComContextProvider(props) {
+  const parent = (0, import_ComContext.useAppContext)();
+  const value = (0, import_react.useMemo)(() => {
+    return {
+      ...parent,
+      comRefs: props.comRefs || parent.comRefs,
+      $scopeId: props.scopeId
+    };
+  }, [parent, props.comRefs, props.scopeId]);
+  return /* @__PURE__ */ import_react.default.createElement(import_ComContext.default.Provider, { value }, props.children);
+}
+function useResolvedParentSlot(parentSlotProp) {
+  const parentSlotFromCtx = (0, import_ComContext.useParentSlot)();
+  return parentSlotProp ?? parentSlotFromCtx;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ScopedComContextProvider,
+  useEnhancedSlots,
+  useResolvedParentSlot
+});

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

@@ -25,14 +25,15 @@ module.exports = __toCommonJS(useContext_exports);
 var import_react = require("react");
 var import_hooks = require("./hooks");
 function useAppCreateContext() {
-  const comRefs = (0, import_react.useRef)((0, import_hooks.deepProxy)({}));
+  const comRefs = (0, import_react.useRef)((0, import_hooks.deepProxy)({ $inputs: {} }));
+  const outputs = (0, import_react.useRef)((0, import_hooks.deepProxy)({}));
   const [popupState, setPopupState] = (0, import_react.useState)({
     visible: false,
     name: "",
     value: null,
     controller: null
   });
-  const appContext = {
+  const appContext = (0, import_react.useRef)({
     canvas: {
       id: "u_7VvVn"
       // 使用 data 中的 id
@@ -47,14 +48,17 @@ function useAppCreateContext() {
     isRelease: false,
     isDebug: false,
     isLocal: false,
-    isTest: false
-  };
-  return {
+    isTest: false,
+    tabBar: [],
+    useTabBar: false
+  }).current;
+  return (0, import_react.useMemo)(() => ({
     comRefs,
+    outputs,
     appContext,
     popupState,
     setPopupState
-  };
+  }), [popupState]);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -38,9 +38,11 @@ var import_components = require("@tarojs/components");
 var import_index = require("./index");
 var import_useContext = require("./useContext");
 var import_ComContext = __toESM(require("./ComContext"));
+var import_slots = require("./slots");
 var import_taro = require("@tarojs/taro");
 var WithCom = (props) => {
-  const { component: Component, id = "", data, className, style, ...rest } = props;
+  var _a;
+  const { component: Component, id = "", data, className, style, inputValues, inputValuesMapping, ...rest } = props;
   const { comRefs, appContext } = (0, import_ComContext.useAppContext)();
   const env = appContext;
   const isPopup = Component.isPopup;
@@ -70,20 +72,45 @@ var WithCom = (props) => {
     });
   }
   const inputProxy = (0, import_index.useBindInputs)(comRefs, id, handlers);
-  const eventProxy = (0, import_index.useBindEvents)(rest);
+  const { slots: rawSlots, parentSlot: parentSlotProp, ...restProps } = rest;
+  const { outputs: globalOutputs } = (0, import_ComContext.useAppContext)();
+  const parentSlot = (0, import_slots.useResolvedParentSlot)(parentSlotProp);
+  const eventProxy = (0, import_index.useBindEvents)(restProps, {
+    id,
+    name: props.name || id,
+    parentSlot
+  });
+  if (globalOutputs && globalOutputs.current) {
+    globalOutputs.current[id] = eventProxy;
+  }
   comRefs.current[id] = inputProxy;
-  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, /* @__PURE__ */ import_react.default.createElement(
+  const enhancedSlots = (0, import_slots.useEnhancedSlots)(rawSlots, id);
+  const jsx = /* @__PURE__ */ import_react.default.createElement(
     Component,
     {
-      ...rest,
+      ...restProps,
       inputs: inputProxy,
       outputs: eventProxy,
+      slots: enhancedSlots,
+      parentSlot,
       data: _data,
       env,
       id,
       style
     }
-  )) : null;
+  );
+  if ((_a = parentSlot == null ? void 0 : parentSlot.params) == null ? void 0 : _a.itemWrap) {
+    return parentSlot.params.itemWrap({
+      id,
+      name: props.name || id,
+      jsx,
+      def: Component.def,
+      inputs: inputProxy,
+      outputs: eventProxy,
+      style
+    });
+  }
+  return show || isPopup ? /* @__PURE__ */ import_react.default.createElement(import_components.View, { className, style: { ...style, ...dynamicStyle } }, jsx) : null;
 };
 var WithWrapper = (Component) => {
   return function WrappedComponent(props) {

package/dist/cjs/generate/generateTaroProjectJson.js

@@ -76,7 +76,7 @@ ${fileContent}` : fileContent;
         content: configContent
       },
       {
-        path: `src/pages/${pageName}/index.less`,
+        path: `src/pages/${pageName}/index.global.less`,
         content: item.cssContent || ""
       },
       {
@@ -108,7 +108,7 @@ ${item.content || ""}`;
           content: fullContent
         },
         {
-          path: `src/popupComponents/${popupId}/index.less`,
+          path: `src/popupComponents/${popupId}/index.global.less`,
           content: item.cssContent || ""
         }
       ]

package/dist/cjs/handleCom.d.ts

@@ -1,31 +1,8 @@
-import { ImportManager } from "./utils";
-import { RenderManager } from "./utils/templates/renderManager";
-import type { UI, BaseConfig } from "./toCodeTaro";
-export type Com = Extract<UI["children"][0], {
-    type: "com";
-}>;
-type HandleComResult = {
-    ui: string;
-    js: string;
-    slots: string[];
-    scopeSlots: string[];
-    cssContent: string;
-    renderCode?: string;
-    outputsConfig?: Record<string, any>;
-};
-export interface HandleComConfig extends BaseConfig {
-    addParentDependencyImport: (typeof ImportManager)["prototype"]["addImport"];
-    addConsumer: (provider: ReturnType<BaseConfig["getCurrentProvider"]>) => void;
-    addComId: (comId: string) => void;
-    renderManager?: RenderManager;
-    addJSModule?: (module: {
-        id: string;
-        title: string;
-        transformCode: string;
-        inputs: string[];
-        outputs: string[];
-        data: any;
-    }) => void;
-}
-declare const handleCom: (com: Com, config: HandleComConfig) => HandleComResult;
+export type Com = any;
+export type HandleComConfig = any;
+export type HandleComResult = any;
+/**
+ * 处理组件
+ */
+export declare const handleCom: (com: Com, config: HandleComConfig) => HandleComResult;
 export default handleCom;