@next-core/runtime 1.22.3 → 1.22.5

package/dist/esm/internal/CustomTemplates/setupTemplateProxy.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import { hasOwnProperty } from "@next-core/utils/general";
 import { clamp } from "lodash";
-import { symbolForAsyncComputedPropsFromHost, symbolForTPlExternalForEachItem, symbolForTplStateStoreId } from "./constants.js";
+import { symbolForAsyncComputedPropsFromHost, symbolForTPlExternalForEachIndex, symbolForTPlExternalForEachItem, symbolForTplStateStoreId } from "./constants.js";
 import { computePropertyValue } from "../compute/computeRealProperties.js";
 export function setupTemplateProxy(hostContext, ref, slots) {
   var {
@@ -56,7 +56,7 @@ export function setupTemplateProxy(hostContext, ref, slots) {
           quasisMap.set(refToSlot, expandableSlot);
         }
         var refPosition = (_to$refPosition = to.refPosition) !== null && _to$refPosition !== void 0 ? _to$refPosition : -1;
-        expandableSlot[clamp(refPosition < 0 ? expandableSlot.length + refPosition : refPosition, 0, expandableSlot.length - 1)].push(...(hasOwnProperty(hostBrick.runtimeContext, "forEachItem") ? setupTemplateExternalBricks(insertBricks, hostBrick.runtimeContext.forEachItem) : insertBricks));
+        expandableSlot[clamp(refPosition < 0 ? expandableSlot.length + refPosition : refPosition, 0, expandableSlot.length - 1)].push(...(hasOwnProperty(hostBrick.runtimeContext, "forEachItem") ? setupTemplateExternalBricks(insertBricks, hostBrick.runtimeContext.forEachItem, hostBrick.runtimeContext.forEachIndex) : insertBricks));
       }
       var _loop = function () {
         if (!hasOwnProperty(slots, slotName)) {
@@ -83,28 +83,29 @@ export function setupTemplateProxy(hostContext, ref, slots) {
 }
 
 // External bricks of a template, have the same forEachItem context as their host.
-function setupTemplateExternalBricks(bricks, forEachItem) {
+function setupTemplateExternalBricks(bricks, forEachItem, forEachIndex) {
   return bricks.map(brick => {
     var _brick$slots;
     return _objectSpread(_objectSpread({}, brick), {}, {
       [symbolForTPlExternalForEachItem]: forEachItem,
+      [symbolForTPlExternalForEachIndex]: forEachIndex,
       slots: Object.fromEntries(Object.entries((_brick$slots = brick.slots) !== null && _brick$slots !== void 0 ? _brick$slots : {}).map(_ref2 => {
         var _slotConf$bricks;
         var [slotName, slotConf] = _ref2;
         return [slotName, slotConf.type === "routes" ? {
           type: "routes",
-          routes: setupTemplateExternalRoutes(slotConf.routes, forEachItem)
+          routes: setupTemplateExternalRoutes(slotConf.routes, forEachItem, forEachIndex)
         } : {
           type: "bricks",
-          bricks: setupTemplateExternalBricks((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : [], forEachItem)
+          bricks: setupTemplateExternalBricks((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : [], forEachItem, forEachIndex)
         }];
       }))
     });
   });
 }
-function setupTemplateExternalRoutes(routes, forEachItem) {
+function setupTemplateExternalRoutes(routes, forEachItem, forEachIndex) {
   return routes.map(route => route.type && route.type !== "bricks" ? route : _objectSpread(_objectSpread({}, route), {}, {
-    bricks: setupTemplateExternalBricks(route.bricks, forEachItem)
+    bricks: setupTemplateExternalBricks(route.bricks, forEachItem, forEachIndex)
   }));
 }
 //# sourceMappingURL=setupTemplateProxy.js.map

package/dist/esm/internal/CustomTemplates/setupTemplateProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupTemplateProxy.js","names":["hasOwnProperty","clamp","symbolForAsyncComputedPropsFromHost","symbolForTPlExternalForEachItem","symbolForTplStateStoreId","computePropertyValue","setupTemplateProxy","hostContext","ref","slots","reversedProxies","asyncHostPropertyEntries","externalSlots","tplStateStoreId","hostBrick","asyncComputedProps","propertyProxies","properties","get","getComputedProps","asyncHostProps","map","_ref","from","to","filtered","filter","entry","length","refProperty","Boolean","slotProxies","quasisMap","Map","_externalSlots$from$b","_externalSlots$from","_to$refSlot","_to$refPosition","insertBricks","bricks","refToSlot","refSlot","expandableSlot","size","i","push","set","refPosition","runtimeContext","setupTemplateExternalBricks","forEachItem","_loop","slotName","type","slotConf","quasis","flatMap","index","concat","entries","brick","_brick$slots","_objectSpread","Object","fromEntries","_ref2","_slotConf$bricks","routes","setupTemplateExternalRoutes","route"],"sources":["../../../../src/internal/CustomTemplates/setupTemplateProxy.ts"],"sourcesContent":["import type { BrickConf, RouteConf, SlotsConfOfBricks } from \"@next-core/types\";\nimport { hasOwnProperty } from \"@next-core/utils/general\";\nimport { clamp } from \"lodash\";\nimport {\n  symbolForAsyncComputedPropsFromHost,\n  symbolForTPlExternalForEachItem,\n  symbolForTplStateStoreId,\n} from \"./constants.js\";\nimport type { AsyncPropertyEntry, TemplateHostContext } from \"../interfaces.js\";\nimport { computePropertyValue } from \"../compute/computeRealProperties.js\";\n\nexport function setupTemplateProxy(\n  hostContext: TemplateHostContext,\n  ref: string | undefined,\n  slots: SlotsConfOfBricks\n) {\n  const {\n    reversedProxies,\n    asyncHostPropertyEntries,\n    externalSlots,\n    tplStateStoreId,\n    hostBrick,\n  } = hostContext;\n\n  let asyncComputedProps: AsyncPropertyEntry[] | undefined;\n\n  if (ref && reversedProxies) {\n    const propertyProxies = reversedProxies.properties.get(ref);\n    if (propertyProxies) {\n      const getComputedProps = (\n        asyncHostProps: AsyncPropertyEntry[]\n      ): AsyncPropertyEntry[] => {\n        return propertyProxies!\n          .map(({ from, to }) => {\n            const filtered = asyncHostProps.filter(\n              (entry) => entry[0] === from\n            );\n            if (filtered.length > 0 && to.refProperty) {\n              return [\n                to.refProperty,\n                computePropertyValue(filtered, from),\n                true,\n              ];\n            }\n          })\n          .filter(Boolean) as [string, Promise<unknown>][];\n      };\n\n      asyncComputedProps = getComputedProps(asyncHostPropertyEntries);\n    }\n\n    const slotProxies = reversedProxies.slots.get(ref);\n    if (slotProxies && externalSlots) {\n      // Use an approach like template-literal's quasis:\n      // `quasi0${0}quais1${1}quasi2...`\n      // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.\n      const quasisMap = new Map<string, BrickConf[][]>();\n\n      for (const { from, to } of slotProxies) {\n        const insertBricks = externalSlots[from]?.bricks ?? [];\n        if (!insertBricks.length) {\n          continue;\n        }\n        const refToSlot = to.refSlot ?? from;\n        let expandableSlot = quasisMap.get(refToSlot);\n        if (!expandableSlot) {\n          expandableSlot = [];\n          // The size of quasis should be the existed slotted bricks' size plus one.\n          const size = hasOwnProperty(slots, refToSlot)\n            ? slots[refToSlot].bricks.length + 1\n            : 1;\n          for (let i = 0; i < size; i += 1) {\n            expandableSlot.push([]);\n          }\n          quasisMap.set(refToSlot, expandableSlot);\n        }\n        const refPosition = to.refPosition ?? -1;\n        expandableSlot[\n          clamp(\n            refPosition < 0 ? expandableSlot.length + refPosition : refPosition,\n            0,\n            expandableSlot.length - 1\n          )\n        ].push(\n          ...(hasOwnProperty(hostBrick.runtimeContext, \"forEachItem\")\n            ? setupTemplateExternalBricks(\n                insertBricks,\n                hostBrick.runtimeContext.forEachItem\n              )\n            : insertBricks)\n        );\n      }\n\n      for (const [slotName, quasis] of quasisMap.entries()) {\n        if (!hasOwnProperty(slots, slotName)) {\n          slots[slotName] = {\n            type: \"bricks\",\n            bricks: [],\n          };\n        }\n        const slotConf = slots[slotName];\n        slotConf.bricks = quasis.flatMap((bricks, index) =>\n          index < slotConf.bricks.length\n            ? bricks.concat(slotConf.bricks[index])\n            : bricks\n        );\n\n        if (slotConf.bricks.length === 0) {\n          delete slots[slotName];\n        }\n      }\n    }\n  }\n\n  return {\n    [symbolForAsyncComputedPropsFromHost]: asyncComputedProps,\n    [symbolForTplStateStoreId]: tplStateStoreId,\n  };\n}\n\n// External bricks of a template, have the same forEachItem context as their host.\nfunction setupTemplateExternalBricks(\n  bricks: BrickConf[],\n  forEachItem: unknown\n): BrickConf[] {\n  return bricks.map((brick) => ({\n    ...brick,\n    [symbolForTPlExternalForEachItem]: forEachItem,\n    slots: Object.fromEntries(\n      Object.entries(brick.slots ?? {}).map(([slotName, slotConf]) => [\n        slotName,\n        slotConf.type === \"routes\"\n          ? {\n              type: \"routes\",\n              routes: setupTemplateExternalRoutes(slotConf.routes, forEachItem),\n            }\n          : {\n              type: \"bricks\",\n              bricks: setupTemplateExternalBricks(\n                slotConf.bricks ?? [],\n                forEachItem\n              ),\n            },\n      ])\n    ),\n  }));\n}\n\nfunction setupTemplateExternalRoutes(\n  routes: RouteConf[],\n  forEachItem: unknown\n): RouteConf[] {\n  return routes.map((route) =>\n    route.type && route.type !== \"bricks\"\n      ? route\n      : {\n          ...route,\n          bricks: setupTemplateExternalBricks(route.bricks, forEachItem),\n        }\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"setupTemplateProxy.js","names":["hasOwnProperty","clamp","symbolForAsyncComputedPropsFromHost","symbolForTPlExternalForEachIndex","symbolForTPlExternalForEachItem","symbolForTplStateStoreId","computePropertyValue","setupTemplateProxy","hostContext","ref","slots","reversedProxies","asyncHostPropertyEntries","externalSlots","tplStateStoreId","hostBrick","asyncComputedProps","propertyProxies","properties","get","getComputedProps","asyncHostProps","map","_ref","from","to","filtered","filter","entry","length","refProperty","Boolean","slotProxies","quasisMap","Map","_externalSlots$from$b","_externalSlots$from","_to$refSlot","_to$refPosition","insertBricks","bricks","refToSlot","refSlot","expandableSlot","size","i","push","set","refPosition","runtimeContext","setupTemplateExternalBricks","forEachItem","forEachIndex","_loop","slotName","type","slotConf","quasis","flatMap","index","concat","entries","brick","_brick$slots","_objectSpread","Object","fromEntries","_ref2","_slotConf$bricks","routes","setupTemplateExternalRoutes","route"],"sources":["../../../../src/internal/CustomTemplates/setupTemplateProxy.ts"],"sourcesContent":["import type { BrickConf, RouteConf, SlotsConfOfBricks } from \"@next-core/types\";\nimport { hasOwnProperty } from \"@next-core/utils/general\";\nimport { clamp } from \"lodash\";\nimport {\n  symbolForAsyncComputedPropsFromHost,\n  symbolForTPlExternalForEachIndex,\n  symbolForTPlExternalForEachItem,\n  symbolForTplStateStoreId,\n} from \"./constants.js\";\nimport type { AsyncPropertyEntry, TemplateHostContext } from \"../interfaces.js\";\nimport { computePropertyValue } from \"../compute/computeRealProperties.js\";\n\nexport function setupTemplateProxy(\n  hostContext: TemplateHostContext,\n  ref: string | undefined,\n  slots: SlotsConfOfBricks\n) {\n  const {\n    reversedProxies,\n    asyncHostPropertyEntries,\n    externalSlots,\n    tplStateStoreId,\n    hostBrick,\n  } = hostContext;\n\n  let asyncComputedProps: AsyncPropertyEntry[] | undefined;\n\n  if (ref && reversedProxies) {\n    const propertyProxies = reversedProxies.properties.get(ref);\n    if (propertyProxies) {\n      const getComputedProps = (\n        asyncHostProps: AsyncPropertyEntry[]\n      ): AsyncPropertyEntry[] => {\n        return propertyProxies!\n          .map(({ from, to }) => {\n            const filtered = asyncHostProps.filter(\n              (entry) => entry[0] === from\n            );\n            if (filtered.length > 0 && to.refProperty) {\n              return [\n                to.refProperty,\n                computePropertyValue(filtered, from),\n                true,\n              ];\n            }\n          })\n          .filter(Boolean) as [string, Promise<unknown>][];\n      };\n\n      asyncComputedProps = getComputedProps(asyncHostPropertyEntries);\n    }\n\n    const slotProxies = reversedProxies.slots.get(ref);\n    if (slotProxies && externalSlots) {\n      // Use an approach like template-literal's quasis:\n      // `quasi0${0}quais1${1}quasi2...`\n      // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.\n      const quasisMap = new Map<string, BrickConf[][]>();\n\n      for (const { from, to } of slotProxies) {\n        const insertBricks = externalSlots[from]?.bricks ?? [];\n        if (!insertBricks.length) {\n          continue;\n        }\n        const refToSlot = to.refSlot ?? from;\n        let expandableSlot = quasisMap.get(refToSlot);\n        if (!expandableSlot) {\n          expandableSlot = [];\n          // The size of quasis should be the existed slotted bricks' size plus one.\n          const size = hasOwnProperty(slots, refToSlot)\n            ? slots[refToSlot].bricks.length + 1\n            : 1;\n          for (let i = 0; i < size; i += 1) {\n            expandableSlot.push([]);\n          }\n          quasisMap.set(refToSlot, expandableSlot);\n        }\n        const refPosition = to.refPosition ?? -1;\n        expandableSlot[\n          clamp(\n            refPosition < 0 ? expandableSlot.length + refPosition : refPosition,\n            0,\n            expandableSlot.length - 1\n          )\n        ].push(\n          ...(hasOwnProperty(hostBrick.runtimeContext, \"forEachItem\")\n            ? setupTemplateExternalBricks(\n                insertBricks,\n                hostBrick.runtimeContext.forEachItem,\n                hostBrick.runtimeContext.forEachIndex!\n              )\n            : insertBricks)\n        );\n      }\n\n      for (const [slotName, quasis] of quasisMap.entries()) {\n        if (!hasOwnProperty(slots, slotName)) {\n          slots[slotName] = {\n            type: \"bricks\",\n            bricks: [],\n          };\n        }\n        const slotConf = slots[slotName];\n        slotConf.bricks = quasis.flatMap((bricks, index) =>\n          index < slotConf.bricks.length\n            ? bricks.concat(slotConf.bricks[index])\n            : bricks\n        );\n\n        if (slotConf.bricks.length === 0) {\n          delete slots[slotName];\n        }\n      }\n    }\n  }\n\n  return {\n    [symbolForAsyncComputedPropsFromHost]: asyncComputedProps,\n    [symbolForTplStateStoreId]: tplStateStoreId,\n  };\n}\n\n// External bricks of a template, have the same forEachItem context as their host.\nfunction setupTemplateExternalBricks(\n  bricks: BrickConf[],\n  forEachItem: unknown,\n  forEachIndex: number\n): BrickConf[] {\n  return bricks.map((brick) => ({\n    ...brick,\n    [symbolForTPlExternalForEachItem]: forEachItem,\n    [symbolForTPlExternalForEachIndex]: forEachIndex,\n    slots: Object.fromEntries(\n      Object.entries(brick.slots ?? {}).map(([slotName, slotConf]) => [\n        slotName,\n        slotConf.type === \"routes\"\n          ? {\n              type: \"routes\",\n              routes: setupTemplateExternalRoutes(\n                slotConf.routes,\n                forEachItem,\n                forEachIndex\n              ),\n            }\n          : {\n              type: \"bricks\",\n              bricks: setupTemplateExternalBricks(\n                slotConf.bricks ?? [],\n                forEachItem,\n                forEachIndex\n              ),\n            },\n      ])\n    ),\n  }));\n}\n\nfunction setupTemplateExternalRoutes(\n  routes: RouteConf[],\n  forEachItem: unknown,\n  forEachIndex: number\n): RouteConf[] {\n  return routes.map((route) =>\n    route.type && route.type !== \"bricks\"\n      ? route\n      : {\n          ...route,\n          bricks: setupTemplateExternalBricks(\n            route.bricks,\n            forEachItem,\n            forEachIndex\n          ),\n        }\n  );\n}\n"],"mappings":"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"}

package/dist/esm/internal/FormRenderer/expandFormRenderer.js

@@ -15,6 +15,7 @@ export function expandFormRenderer(formData, hostBrickConf, hostBrick, asyncHost
 
   // There is a boundary for `forEachItem` and `STATE` between form internals and externals.
   delete runtimeContext.forEachItem;
+  delete runtimeContext.forEachIndex;
   delete runtimeContext.tplStateStoreId;
   var formStateStore = new DataStore("FORM_STATE", undefined, rendererContext);
   runtimeContext.formStateStoreMap.set(formStateStoreId, formStateStore);

package/dist/esm/internal/FormRenderer/expandFormRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"expandFormRenderer.js","names":["hasOwnProperty","uniqueId","DataStore","getDefaultProperties","symbolForFormStateStoreId","formContainers","expandFormRenderer","formData","hostBrickConf","hostBrick","asyncHostPropertyEntries","rendererContext","_normalizedFormData$c","_hostBrickConf$proper","normalizedFormData","JSON","parse","formStateStoreId","runtimeContext","_objectSpread","forEachItem","tplStateStoreId","formStateStore","undefined","formStateStoreMap","set","formStateStoreScope","push","context","some","ctx","name","define","formConf","formSchemaToBrick","formSchema","fields","includes","brick","events","mergeEvents","renderRoot","properties","slots","children","style","padding","schema","id","bricks","mountPoint","instanceId","iid","field","find","item","fieldId","defaults","brickConf","slot","formSchemasToBricks","if","schemas","Array","isArray","map","targetEvents","sourceEvents","eventType","handlers","Object","entries","flat"],"sources":["../../../../src/internal/FormRenderer/expandFormRenderer.ts"],"sourcesContent":["import type { BrickConf, BrickEventsMap } from \"@next-core/types\";\nimport { hasOwnProperty } from \"@next-core/utils/general\";\nimport { uniqueId } from \"lodash\";\nimport { DataStore } from \"../data/DataStore.js\";\nimport type { AsyncPropertyEntry, RuntimeBrick } from \"../interfaces.js\";\nimport type {\n  FieldProperties,\n  FormDataProperties,\n  FormSchemaProperties,\n} from \"./interfaces.js\";\nimport { getDefaultProperties } from \"./getDefaultProperties.js\";\nimport { symbolForFormStateStoreId } from \"./constants.js\";\nimport type { RendererContext } from \"../RendererContext.js\";\n\nconst formContainers = [\"forms.general-form\", \"form.general-form\", \"eo-form\"];\n\nexport function expandFormRenderer(\n  formData: unknown,\n  hostBrickConf: BrickConf,\n  hostBrick: RuntimeBrick,\n  asyncHostPropertyEntries: AsyncPropertyEntry[],\n  rendererContext: RendererContext\n): BrickConf {\n  const normalizedFormData = (\n    typeof formData === \"string\" ? JSON.parse(formData) : formData\n  ) as FormDataProperties;\n\n  const formStateStoreId = uniqueId(\"form-state-\");\n  const runtimeContext = {\n    ...hostBrick.runtimeContext,\n    formStateStoreId,\n  };\n\n  // There is a boundary for `forEachItem` and `STATE` between form internals and externals.\n  delete runtimeContext.forEachItem;\n  delete runtimeContext.tplStateStoreId;\n\n  const formStateStore = new DataStore(\n    \"FORM_STATE\",\n    undefined,\n    rendererContext\n  );\n  runtimeContext.formStateStoreMap.set(formStateStoreId, formStateStore);\n  if (runtimeContext.formStateStoreScope) {\n    runtimeContext.formStateStoreScope.push(formStateStore);\n  }\n\n  // Always add a state of `params`.\n  const context = normalizedFormData.context ?? [];\n  if (!context.some((ctx) => ctx.name === \"params\")) {\n    context.push({ name: \"params\" });\n  }\n\n  formStateStore.define(context, runtimeContext, asyncHostPropertyEntries);\n\n  const formConf = formSchemaToBrick(\n    normalizedFormData.formSchema,\n    normalizedFormData.fields,\n    formStateStoreId\n  );\n\n  if (formContainers.includes(formConf.brick) && hostBrickConf.events) {\n    formConf.events = mergeEvents(formConf.events, hostBrickConf.events);\n  }\n\n  const renderRoot =\n    typeof hostBrickConf.properties?.renderRoot !== \"boolean\" ||\n    hostBrickConf.properties.renderRoot;\n\n  if (renderRoot) {\n    return {\n      ...hostBrickConf,\n      slots: undefined,\n      children: [\n        {\n          brick: \"eo-micro-view\",\n          properties: { style: { padding: \"12px\" } },\n          children: [formConf],\n        },\n      ],\n    };\n  }\n\n  return {\n    ...hostBrickConf,\n    slots: undefined,\n    children: [formConf],\n  };\n}\n\nfunction formSchemaToBrick(\n  schema: FormSchemaProperties,\n  fields: FieldProperties[],\n  formStateStoreId: string\n): BrickConf {\n  const { id, bricks, events, context, mountPoint, instanceId: iid } = schema;\n  let { brick, properties } = schema;\n\n  // 根据字段类型获取默认配置\n  const field = fields.find((item: FieldProperties) => item.fieldId === id);\n  if (field) {\n    const defaults = getDefaultProperties(field);\n    if (!brick) {\n      brick = defaults.brick;\n    }\n    properties = {\n      ...defaults.properties,\n      ...properties,\n    };\n  }\n\n  const brickConf = {\n    brick,\n    properties,\n    iid,\n    slot: mountPoint,\n    events,\n    context,\n    children: formSchemasToBricks(bricks, fields, formStateStoreId),\n    [symbolForFormStateStoreId]: formStateStoreId,\n  } as BrickConf;\n\n  if (hasOwnProperty(schema, \"if\")) {\n    brickConf.if = schema.if;\n  }\n\n  return brickConf;\n}\n\nfunction formSchemasToBricks(\n  schemas: FormSchemaProperties[] | undefined,\n  fields: FieldProperties[],\n  formStateStoreId: string\n): BrickConf[] | undefined {\n  if (Array.isArray(schemas)) {\n    return schemas.map((schema) =>\n      formSchemaToBrick(schema, fields, formStateStoreId)\n    );\n  }\n}\n\nfunction mergeEvents(\n  targetEvents: BrickEventsMap | undefined,\n  sourceEvents: BrickEventsMap\n): BrickEventsMap {\n  const events = targetEvents ?? {};\n\n  for (const [eventType, handlers] of Object.entries(sourceEvents)) {\n    events[eventType] = hasOwnProperty(events, eventType)\n      ? [events[eventType], handlers].flat()\n      : handlers;\n  }\n\n  return events;\n}\n"],"mappings":"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"}
+{"version":3,"file":"expandFormRenderer.js","names":["hasOwnProperty","uniqueId","DataStore","getDefaultProperties","symbolForFormStateStoreId","formContainers","expandFormRenderer","formData","hostBrickConf","hostBrick","asyncHostPropertyEntries","rendererContext","_normalizedFormData$c","_hostBrickConf$proper","normalizedFormData","JSON","parse","formStateStoreId","runtimeContext","_objectSpread","forEachItem","forEachIndex","tplStateStoreId","formStateStore","undefined","formStateStoreMap","set","formStateStoreScope","push","context","some","ctx","name","define","formConf","formSchemaToBrick","formSchema","fields","includes","brick","events","mergeEvents","renderRoot","properties","slots","children","style","padding","schema","id","bricks","mountPoint","instanceId","iid","field","find","item","fieldId","defaults","brickConf","slot","formSchemasToBricks","if","schemas","Array","isArray","map","targetEvents","sourceEvents","eventType","handlers","Object","entries","flat"],"sources":["../../../../src/internal/FormRenderer/expandFormRenderer.ts"],"sourcesContent":["import type { BrickConf, BrickEventsMap } from \"@next-core/types\";\nimport { hasOwnProperty } from \"@next-core/utils/general\";\nimport { uniqueId } from \"lodash\";\nimport { DataStore } from \"../data/DataStore.js\";\nimport type { AsyncPropertyEntry, RuntimeBrick } from \"../interfaces.js\";\nimport type {\n  FieldProperties,\n  FormDataProperties,\n  FormSchemaProperties,\n} from \"./interfaces.js\";\nimport { getDefaultProperties } from \"./getDefaultProperties.js\";\nimport { symbolForFormStateStoreId } from \"./constants.js\";\nimport type { RendererContext } from \"../RendererContext.js\";\n\nconst formContainers = [\"forms.general-form\", \"form.general-form\", \"eo-form\"];\n\nexport function expandFormRenderer(\n  formData: unknown,\n  hostBrickConf: BrickConf,\n  hostBrick: RuntimeBrick,\n  asyncHostPropertyEntries: AsyncPropertyEntry[],\n  rendererContext: RendererContext\n): BrickConf {\n  const normalizedFormData = (\n    typeof formData === \"string\" ? JSON.parse(formData) : formData\n  ) as FormDataProperties;\n\n  const formStateStoreId = uniqueId(\"form-state-\");\n  const runtimeContext = {\n    ...hostBrick.runtimeContext,\n    formStateStoreId,\n  };\n\n  // There is a boundary for `forEachItem` and `STATE` between form internals and externals.\n  delete runtimeContext.forEachItem;\n  delete runtimeContext.forEachIndex;\n  delete runtimeContext.tplStateStoreId;\n\n  const formStateStore = new DataStore(\n    \"FORM_STATE\",\n    undefined,\n    rendererContext\n  );\n  runtimeContext.formStateStoreMap.set(formStateStoreId, formStateStore);\n  if (runtimeContext.formStateStoreScope) {\n    runtimeContext.formStateStoreScope.push(formStateStore);\n  }\n\n  // Always add a state of `params`.\n  const context = normalizedFormData.context ?? [];\n  if (!context.some((ctx) => ctx.name === \"params\")) {\n    context.push({ name: \"params\" });\n  }\n\n  formStateStore.define(context, runtimeContext, asyncHostPropertyEntries);\n\n  const formConf = formSchemaToBrick(\n    normalizedFormData.formSchema,\n    normalizedFormData.fields,\n    formStateStoreId\n  );\n\n  if (formContainers.includes(formConf.brick) && hostBrickConf.events) {\n    formConf.events = mergeEvents(formConf.events, hostBrickConf.events);\n  }\n\n  const renderRoot =\n    typeof hostBrickConf.properties?.renderRoot !== \"boolean\" ||\n    hostBrickConf.properties.renderRoot;\n\n  if (renderRoot) {\n    return {\n      ...hostBrickConf,\n      slots: undefined,\n      children: [\n        {\n          brick: \"eo-micro-view\",\n          properties: { style: { padding: \"12px\" } },\n          children: [formConf],\n        },\n      ],\n    };\n  }\n\n  return {\n    ...hostBrickConf,\n    slots: undefined,\n    children: [formConf],\n  };\n}\n\nfunction formSchemaToBrick(\n  schema: FormSchemaProperties,\n  fields: FieldProperties[],\n  formStateStoreId: string\n): BrickConf {\n  const { id, bricks, events, context, mountPoint, instanceId: iid } = schema;\n  let { brick, properties } = schema;\n\n  // 根据字段类型获取默认配置\n  const field = fields.find((item: FieldProperties) => item.fieldId === id);\n  if (field) {\n    const defaults = getDefaultProperties(field);\n    if (!brick) {\n      brick = defaults.brick;\n    }\n    properties = {\n      ...defaults.properties,\n      ...properties,\n    };\n  }\n\n  const brickConf = {\n    brick,\n    properties,\n    iid,\n    slot: mountPoint,\n    events,\n    context,\n    children: formSchemasToBricks(bricks, fields, formStateStoreId),\n    [symbolForFormStateStoreId]: formStateStoreId,\n  } as BrickConf;\n\n  if (hasOwnProperty(schema, \"if\")) {\n    brickConf.if = schema.if;\n  }\n\n  return brickConf;\n}\n\nfunction formSchemasToBricks(\n  schemas: FormSchemaProperties[] | undefined,\n  fields: FieldProperties[],\n  formStateStoreId: string\n): BrickConf[] | undefined {\n  if (Array.isArray(schemas)) {\n    return schemas.map((schema) =>\n      formSchemaToBrick(schema, fields, formStateStoreId)\n    );\n  }\n}\n\nfunction mergeEvents(\n  targetEvents: BrickEventsMap | undefined,\n  sourceEvents: BrickEventsMap\n): BrickEventsMap {\n  const events = targetEvents ?? {};\n\n  for (const [eventType, handlers] of Object.entries(sourceEvents)) {\n    events[eventType] = hasOwnProperty(events, eventType)\n      ? [events[eventType], handlers].flat()\n      : handlers;\n  }\n\n  return events;\n}\n"],"mappings":"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"}

package/dist/esm/internal/Renderer.js

@@ -17,7 +17,7 @@ import { resolveData } from "./data/resolveData.js";
 import { asyncComputeRealValue } from "./compute/computeRealValue.js";
 import { listenOnTrackingContext } from "./compute/listenOnTrackingContext.js";
 import { matchRoute, matchRoutes } from "./matchRoutes.js";
-import { symbolForAsyncComputedPropsFromHost, symbolForTPlExternalForEachItem, symbolForTplStateStoreId } from "./CustomTemplates/constants.js";
+import { symbolForAsyncComputedPropsFromHost, symbolForTPlExternalForEachIndex, symbolForTPlExternalForEachItem, symbolForTplStateStoreId } from "./CustomTemplates/constants.js";
 import { expandCustomTemplate } from "./CustomTemplates/expandCustomTemplate.js";
 import { getTagNameOfCustomTemplate, getTplStateStore } from "./CustomTemplates/utils.js";
 import { customTemplates } from "../CustomTemplates.js";
@@ -37,10 +37,7 @@ export function renderRoutes(_x, _x2, _x3, _x4, _x5, _x6, _x7) {
 function _renderRoutes() {
   _renderRoutes = _asyncToGenerator(function* (returnNode, routes, _runtimeContext, rendererContext, parentRoutes, slotId, isIncremental) {
     var matched = yield matchRoutes(routes, _runtimeContext);
-    var output = {
-      blockingList: [],
-      menuRequests: []
-    };
+    var output = getEmptyRenderOutput();
     switch (matched) {
       case "missed":
         break;
@@ -114,10 +111,7 @@ export function renderBricks(_x8, _x9, _x10, _x11, _x12, _x13, _x14, _x15) {
 }
 function _renderBricks() {
   _renderBricks = _asyncToGenerator(function* (returnNode, bricks, runtimeContext, rendererContext, parentRoutes, slotId, tplStack, keyPath) {
-    var output = {
-      blockingList: [],
-      menuRequests: []
-    };
+    var output = getEmptyRenderOutput();
     var kPath = keyPath !== null && keyPath !== void 0 ? keyPath : [];
     // 多个构件并行异步转换，但转换的结果按原顺序串行合并。
     var rendered = yield Promise.all(bricks.map((brickConf, index) => renderBrick(returnNode, brickConf, runtimeContext, rendererContext, parentRoutes, slotId, kPath.concat(index), tplStack && new Map(tplStack))));
@@ -140,10 +134,7 @@ function _renderBrick() {
     var _hooks$checkPermissio2, _runtimeContext$app;
     var keyPath = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
     var tplStack = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : new Map();
-    var output = {
-      blockingList: [],
-      menuRequests: []
-    };
+    var output = getEmptyRenderOutput();
     if (!brickConf.brick) {
       if (brickConf.template) {
         // eslint-disable-next-line no-console
@@ -185,9 +176,10 @@ function _renderBrick() {
       formStateStoreId
     });
     if (hasOwnProperty(brickConf, symbolForTPlExternalForEachItem)) {
-      // The external bricks of a template should restore their `forEachItem`
-      // from their host.
+      // The external bricks of a template should restore their `forEachItem` and
+      // `forEachIndex` from their host.
       runtimeContext.forEachItem = brickConf[symbolForTPlExternalForEachItem];
+      runtimeContext.forEachIndex = brickConf[symbolForTPlExternalForEachIndex];
     }
     var {
       context
@@ -211,7 +203,7 @@ function _renderBrick() {
       var {
         dataSource
       } = brickConf;
-      var renderControlNode = /*#__PURE__*/function () {
+      var lowerLevelRenderControlNode = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (runtimeContext) {
           var _slots$slot;
           // First, compute the `dataSource`
@@ -226,13 +218,13 @@ function _renderBrick() {
           // Then, get the bricks in that matched slot.
           var bricks = slots && hasOwnProperty(slots, slot) && ((_slots$slot = slots[slot]) === null || _slots$slot === void 0 ? void 0 : _slots$slot.bricks);
           if (!Array.isArray(bricks)) {
-            return output;
+            return getEmptyRenderOutput();
           }
           switch (brickName) {
             case ":forEach":
               {
                 if (!Array.isArray(computedDataSource)) {
-                  return output;
+                  return getEmptyRenderOutput();
                 }
                 return renderForEach(returnNode, computedDataSource, bricks, runtimeContext, rendererContext, parentRoutes, slotId, tplStack, keyPath);
               }
@@ -243,10 +235,24 @@ function _renderBrick() {
               }
           }
         });
-        return function renderControlNode(_x31) {
+        return function lowerLevelRenderControlNode(_x31) {
           return _ref.apply(this, arguments);
         };
       }();
+      var renderControlNode = /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(function* (runtimeContext) {
+          var _rawOutput$node;
+          var rawOutput = yield lowerLevelRenderControlNode(runtimeContext);
+          (_rawOutput$node = rawOutput.node) !== null && _rawOutput$node !== void 0 ? _rawOutput$node : rawOutput.node = {
+            tag: RenderTag.PLACEHOLDER,
+            return: returnNode
+          };
+          return rawOutput;
+        });
+        return function renderControlNode(_x32) {
+          return _ref2.apply(this, arguments);
+        };
+      }();
       var controlledOutput = yield renderControlNode(runtimeContext);
       var {
         onMount,
@@ -260,12 +266,12 @@ function _renderBrick() {
         controlledOutput.hasTrackingControls = true;
         var renderId = 0;
         var listener = /*#__PURE__*/function () {
-          var _ref2 = _asyncToGenerator(function* () {
+          var _ref3 = _asyncToGenerator(function* () {
             var currentRenderId = ++renderId;
             var [scopedRuntimeContext, tplStateStoreScope, formStateStoreScope] = createScopedRuntimeContext(runtimeContext);
-            var controlOutput = yield renderControlNode(scopedRuntimeContext);
+            var reControlledOutput = yield renderControlNode(scopedRuntimeContext);
             var scopedStores = [...tplStateStoreScope, ...formStateStoreScope];
-            yield postAsyncRender(controlOutput, scopedRuntimeContext, scopedStores);
+            yield postAsyncRender(reControlledOutput, scopedRuntimeContext, scopedStores);
 
             // Ignore stale renders
             if (renderId === currentRenderId) {
@@ -276,7 +282,7 @@ function _renderBrick() {
                   }
                 }));
               }
-              rendererContext.reRender(slotId, keyPath, controlOutput.node, returnNode);
+              rendererContext.reRender(slotId, keyPath, reControlledOutput.node, returnNode);
               if (onMount) {
                 listenerFactory(onMount, scopedRuntimeContext)(new CustomEvent("mount", {
                   detail: {
@@ -290,7 +296,7 @@ function _renderBrick() {
             }
           });
           return function listener() {
-            return _ref2.apply(this, arguments);
+            return _ref3.apply(this, arguments);
           };
         }();
         var debouncedListener = debounce(listener);
@@ -354,12 +360,12 @@ function _renderBrick() {
     var confProps;
     if (brickName === FORM_RENDERER) {
       var _brickConf$properties;
-      var _ref3 = (_brickConf$properties = brickConf.properties) !== null && _brickConf$properties !== void 0 ? _brickConf$properties : {};
+      var _ref4 = (_brickConf$properties = brickConf.properties) !== null && _brickConf$properties !== void 0 ? _brickConf$properties : {};
       ({
         formData
-      } = _ref3);
-      confProps = _objectWithoutProperties(_ref3, _excluded3);
-      _ref3;
+      } = _ref4);
+      confProps = _objectWithoutProperties(_ref4, _excluded3);
+      _ref4;
     } else {
       confProps = brickConf.properties;
     }
@@ -413,12 +419,12 @@ function _renderBrick() {
     // 加载构件属性和加载子构件等任务，可以并行。
     var blockingList = [];
     var loadProperties = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator(function* () {
+      var _ref5 = _asyncToGenerator(function* () {
         brick.properties = yield constructAsyncProperties(asyncPropertyEntries);
         listenOnTrackingContext(brick, trackingContextList);
       });
       return function loadProperties() {
-        return _ref4.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }();
     blockingList.push(loadProperties());
@@ -438,25 +444,26 @@ function _renderBrick() {
       // There is a boundary for `forEachItem` between template internals and externals.
       childRuntimeContext = _objectSpread({}, runtimeContext);
       delete childRuntimeContext.forEachItem;
+      delete childRuntimeContext.forEachIndex;
     } else {
       childRuntimeContext = runtimeContext;
     }
     var loadChildren = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(function* () {
+      var _ref6 = _asyncToGenerator(function* () {
         var slots = childrenToSlots(expandedBrickConf.children, expandedBrickConf.slots);
         if (!slots) {
           return;
         }
         var routeSlotIndexes = new Set();
-        var rendered = yield Promise.all(Object.entries(slots).map((_ref6, index) => {
-          var [childSlotId, slotConf] = _ref6;
+        var rendered = yield Promise.all(Object.entries(slots).map((_ref7, index) => {
+          var [childSlotId, slotConf] = _ref7;
           if (slotConf.type !== "routes") {
             return renderBricks(brick, slotConf.bricks, childRuntimeContext, rendererContext, parentRoutes, childSlotId, tplStack);
           }
           if (runtimeContext.flags["incremental-sub-route-rendering"]) {
             routeSlotIndexes.add(index);
             rendererContext.performIncrementalRender( /*#__PURE__*/function () {
-              var _ref7 = _asyncToGenerator(function* (location) {
+              var _ref8 = _asyncToGenerator(function* (location) {
                 var {
                   homepage
                 } = childRuntimeContext.app;
@@ -513,8 +520,8 @@ function _renderBrick() {
                 }
                 return true;
               });
-              return function (_x32) {
-                return _ref7.apply(this, arguments);
+              return function (_x33) {
+                return _ref8.apply(this, arguments);
               };
             }());
           }
@@ -540,7 +547,7 @@ function _renderBrick() {
         }));
       });
       return function loadChildren() {
-        return _ref5.apply(this, arguments);
+        return _ref6.apply(this, arguments);
       };
     }();
     blockingList.push(loadChildren());
@@ -564,13 +571,11 @@ function renderForEach(_x22, _x23, _x24, _x25, _x26, _x27, _x28, _x29, _x30) {
 }
 function _renderForEach() {
   _renderForEach = _asyncToGenerator(function* (returnNode, dataSource, bricks, runtimeContext, rendererContext, parentRoutes, slotId, tplStack, keyPath) {
-    var output = {
-      blockingList: [],
-      menuRequests: []
-    };
+    var output = getEmptyRenderOutput();
     var rows = dataSource.length;
     var rendered = yield Promise.all(dataSource.map((item, i) => Promise.all(bricks.map((brickConf, j) => renderBrick(returnNode, brickConf, _objectSpread(_objectSpread({}, runtimeContext), {}, {
-      forEachItem: item
+      forEachItem: item,
+      forEachIndex: i
     }), rendererContext, parentRoutes, slotId, keyPath.concat(i * rows + j), tplStack && new Map(tplStack))))));
 
     // 多层构件并行异步转换，但转换的结果按原顺序串行合并。
@@ -645,6 +650,12 @@ function mergeRenderOutput(output, newOutput) {
   }
   Object.assign(output, rest);
 }
+function getEmptyRenderOutput() {
+  return {
+    blockingList: [],
+    menuRequests: []
+  };
+}
 export function childrenToSlots(children, originalSlots) {
   var newSlots = originalSlots;
   // istanbul ignore next