annil 1.7.4 → 1.7.5-beta.4

package/src/api/DefineComponent/assignOptions/index.ts

@@ -1,469 +0,0 @@
-import type { Func } from "hry-types/src/Misc/_api";
-import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
-import type { Assign } from "../../../types/Assign";
-import type { WMComponent } from "../../../types/OfficialTypeAlias";
-import { deepClone } from "../../../utils/deepClone";
-import { INNERMARKER } from "../../../utils/InnerMarker";
-import { isEmptyObject } from "../../../utils/isEmptyObject";
-import { instanceConfig } from "../../InstanceInject/instanceConfig";
-import type { RootComponentTrueOptions } from "../../RootComponent";
-import type { ComputedConstraint } from "../../RootComponent/Computed/ComputedConstraint";
-import type {
-  CustomEventConstraint,
-  CustomEvents,
-  FullCustomEvents,
-} from "../../RootComponent/CustomEvents/CustomEventConstraint";
-import type { DataConstraint } from "../../RootComponent/Data/DataConstraint";
-import type { EventsConstraint } from "../../RootComponent/Events/EventsConstraint";
-import type { ComponentInstance, PageInstance } from "../../RootComponent/Instance/RootComponentInstance";
-import type { LifetimesConstraint } from "../../RootComponent/Lifetimes/LifetimesConstraint";
-import type { MethodsConstraint } from "../../RootComponent/Methods/MethodsConstraint";
-import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
-import type { PropertiesConstraint } from "../../RootComponent/Properties/PropertiesConstraint";
-import type { StoreConstraint } from "../../RootComponent/Store/StoreConstraint";
-import type { SubComponentTrueOptions } from "../../SubComponent";
-import type { DefineComponentOption } from "..";
-
-import { BStore } from "../../../behaviors/BStore";
-import { computedWatchHandle } from "./computedWatchHandle";
-
-import type { ComputedCache } from "./computedWatchHandle/initComputedAndGetCache";
-import { initStore } from "./initStore";
-
-type InstanceInnerFields = {
-  data: OptionsInnerFields["data"];
-  disposer: Record<string, Func>;
-  cloneData: OptionsInnerFields["data"];
-} & OptionsInnerFields["methods"];
-
-export type Instance =
-  & (ComponentInstance | PageInstance)
-  & InstanceInnerFields;
-
-/**
- * 临时的函数配置项
- * 把根组件与子组件中配置类型为函数的相同字段配置收集在一起(数组)
- */
-export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch" | "observers", Record<string, Func[]>>;
-
-export type WatchOldValue = Record<string, unknown[]>;
-
-export type OptionsInnerFields = {
-  data: {
-    __computedCache__?: ComputedCache;
-    __storeConfig__?: StoreConstraint;
-    __watchOldValue__?: WatchOldValue;
-  };
-  methods: {
-    disposer?: Record<string, Func>;
-    // computedHandle加入
-    __computedUpdater__?: Func;
-  };
-};
-
-/**
- * 最终传入原生Component的配置项
- */
-export type FinalOptionsOfComponent = {
-  data: DataConstraint & OptionsInnerFields["data"];
-  observers: Record<string, Func>;
-  behaviors: string[];
-  methods: MethodsConstraint & OptionsInnerFields["methods"];
-  externalClasses: string[];
-  pageLifetimes: PageLifetimesOption<false, object>["pageLifetimes"] & {};
-  isPage?: boolean;
-  options?: WMComponent.Options;
-  properties?: PropertiesConstraint;
-  store?: StoreConstraint;
-  computed?: ComputedConstraint;
-  watch?: Record<string, Func>;
-  lifetimes?: LifetimesConstraint;
-};
-
-/**
- * 劫持attached,根据this.route做判断 isPage值是否正确
- */
-export function isPageCheck(isPage: boolean | undefined) {
-  return function(this: Instance) {
-    const route = (this as PageInstance).route as string | undefined;
-    if (route && isPage !== true) {
-      // 页面isPage值错误
-      throw Error(
-        `页面 /${route} 中, RootComponent构建页面时,isPage字段值应为 true`,
-      );
-    }
-    if (!route && isPage !== false && isPage !== undefined) {
-      // 组件写了isPage = true
-      throw Error(
-        `组件 ${this.is} 中  RootComponent构建组件时,可不写isPage字段或值为 false`,
-      );
-    }
-  };
-}
-
-// function addCloneDataToInstance(this: Instance) {
-//   this.cloneData = new Proxy(this.data, {
-//     get: <T extends object>(target: T, key: keyof T) => {
-//       return deepClone(target)[key];
-//     },
-//   });
-// }
-/**
- * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
- * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
- * @param option - 传入onLoad的参数 有以下两种可能
- * 1. 使用wx.navigateTo传值的。这种情况无内置字段 option[INNERMARKER.url] 等于 undefined
- * 2. 使用插件提供的navigateTo传值。这种情况 INNERMARKER.url被load周期劫持函数解码后赋值INNERMARKER.url字段为本身,即option[INNERMARKER.url] 等于 INNERMARKER.url
- */
-/* istanbul ignore next miniprogram-simulate(当前版本 1.6.1) 无法测试页面生命周期 */
-function onLoadReceivedDataHandle(
-  this: PageInstance,
-  option: Record<typeof INNERMARKER.url, string>,
-) {
-  const innerData: string | undefined = option[INNERMARKER.url];
-
-  // 情况1为undefined,2为INNERMARKER.url有值但不是本身,说明是老框架。3所以innerData等于 INNERMARKER.url即有组件配置了load(新框架在pageLifetimes.load中提前解析了)
-  if (innerData === undefined) return;
-  if (innerData !== INNERMARKER.url) {
-    // 需要情况2 需要解析
-    const decodeOption = JSON.parse(decodeURIComponent(innerData));
-    for (const key in decodeOption) {
-      option[key] = decodeOption[key];
-    }
-  }
-
-  delete option[INNERMARKER.url];
-
-  this.setData(option);
-}
-
-/**
- * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
- * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
- */
-/* istanbul ignore next miniprogram-simulate(当前版本 1.6.1) 无法测试load */
-function loadReceivedDataHandle(
-  this: PageInstance,
-  option: Record<typeof INNERMARKER.url, string>,
-) {
-  const innerData: string | undefined = option[INNERMARKER.url];
-  // 未使用自定义的navigateTo
-  if (innerData === undefined) return;
-  // 使用navigateTo API
-  const decodeOption = JSON.parse(decodeURIComponent(innerData));
-
-  for (const key in decodeOption) {
-    option[key] = decodeOption[key];
-  }
-  // 给onLoad劫持函数一个标记,判断在新框架下已经被解析过了
-  option[INNERMARKER.url] = INNERMARKER.url;
-}
-/**
- * 劫持指定配置字段
- */
-function hijack<T extends FinalOptionsOfComponent[keyof FinalOptionsOfComponent]>(
-  config: T,
-  field: keyof T,
-  before: Func[],
-  // after: Func[] = [],
-) {
-  // @ts-ignore 隐式索引
-  const originalFunc: Func | undefined = config[field];
-
-  // @ts-ignore 隐式索引
-  config[field] = function(...args: any[]) {
-    before.forEach(func => func.call(this, ...args));
-
-    originalFunc && originalFunc.apply(this, args);
-
-    // after.forEach(func => func.call(this, ...args));
-  };
-
-  return;
-}
-
-/**
- * 报错的形式避免输入字段和内部字段冲突,保证config下不包含内部预定字段(列表)
- */
-function InternalFieldProtection(config: object, keys: string[]) {
-  const methodsConfigKeys = Object.keys(config);
-  for (const key of keys) {
-    if (methodsConfigKeys.includes(key)) {
-      throw Error(`${key}已被内部字段占用`);
-    }
-  }
-}
-/**
- * 把函数配置放入一个配置中依次运行
- */
-function _funcOptionsHandle(config: object, configList: Record<string, Func[]>) {
-  for (const key in configList) {
-    // @ts-ignore 隐式索引
-    config[key] = function(...args: unknown[]) {
-      configList[key].forEach(ele => ele.call(this, ...args));
-    };
-  }
-}
-/**
- * 把函数列表配置放入一个配置中循环一次运行
- */
-function assignFuncOptions(
-  finalOptionsForComponent: FinalOptionsOfComponent,
-  isPage: boolean | undefined,
-  funcOptions: FuncOptions,
-) {
-  if (isPage) {
-    // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
-    !(isEmptyObject(funcOptions.pageLifetimes))
-      && _funcOptionsHandle(finalOptionsForComponent.methods, funcOptions.pageLifetimes);
-  } else {
-    // 组件时
-    !(isEmptyObject(funcOptions.pageLifetimes))
-      && _funcOptionsHandle(finalOptionsForComponent.pageLifetimes, funcOptions.pageLifetimes);
-  }
-  funcOptions.lifetimes && _funcOptionsHandle(finalOptionsForComponent.lifetimes ||= {}, funcOptions.lifetimes);
-
-  funcOptions.watch && _funcOptionsHandle(finalOptionsForComponent.watch ||= {}, funcOptions.watch);
-}
-/**
- * 把配置为函数的字段方法收集到funcOptions中
- */
-function funcFieldsCollect(
-  options: SubComponentTrueOptions | RootComponentTrueOptions,
-  funcOptions: FuncOptions,
-) {
-  let key: keyof FuncOptions;
-  for (key in funcOptions) {
-    const optionsKeyConfig = options[key];
-    if (optionsKeyConfig) {
-      for (const _key in optionsKeyConfig) {
-        // @ts-ignore
-        (funcOptions[key][_key] ||= []).push(optionsKeyConfig[_key]);
-      }
-    }
-  }
-}
-
-/**
- * 其他字段加入到componentOptions对应字段配置中
- */
-function otherFieldsHandle(
-  finalOptions: FinalOptionsOfComponent,
-  rootComponentOptions: RootComponentTrueOptions,
-) {
-  for (const key in rootComponentOptions) {
-    // @ts-ignore 隐式索引
-    const config = rootComponentOptions[key];
-    if (Array.isArray(config) === true) {
-      //  "behaviors" || "externalClasses"是数组
-      // @ts-ignore 只有 behaviors 和 externalClasses, 且都默认为[]
-      finalOptions[key].push(...config);
-    } else if (typeof config === "object") {
-      // @ts-ignore 隐式索引
-      Object.assign(finalOptions[key] ||= {}, config);
-    } else {
-      // 函数字段有 根组件有 `export` 子组件无此字段
-      // @ts-ignore 隐式索引
-      finalOptions[key] = config;
-    }
-  }
-}
-/**
- * 把events字段放入到componentOptions.methods中
- */
-function eventsHandle(methods: FinalOptionsOfComponent["methods"], eventsConfig: EventsConstraint) {
-  Object.assign(methods, eventsConfig);
-}
-function assignSubComponentsOption(
-  componentOptions: FinalOptionsOfComponent,
-  subComponents: SubComponentTrueOptions[],
-  funcOptions: FuncOptions,
-) {
-  subComponents.forEach((subOption) => {
-    subOption.events && eventsHandle(componentOptions.methods, subOption.events);
-
-    funcFieldsCollect(subOption, funcOptions);
-
-    otherFieldsHandle(componentOptions, subOption);
-  });
-}
-
-// 类型守卫
-function IsFullCustomEvents(
-  customEventOptions: CustomEvents,
-): customEventOptions is FullCustomEvents {
-  return Object.prototype.toString.call(customEventOptions) === "[object Object]";
-}
-
-/**
- * 把customEvents字段配置变成函数放入到componentOptions.methods中
- */
-function customEventsHandle(
-  methods: FinalOptionsOfComponent["methods"],
-  customEventsConfig: CustomEventConstraint,
-) {
-  for (const key in customEventsConfig) {
-    const customEventOptions = customEventsConfig[key];
-
-    if (IsFullCustomEvents(customEventOptions)) {
-      methods[key] = function(this: Instance, detail: unknown) {
-        this.triggerEvent(key, detail, customEventOptions.options);
-      };
-    } else {
-      methods[key] = function(this: Instance, detail: unknown) {
-        this.triggerEvent(key, detail);
-      };
-    }
-  }
-}
-/**
- * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
- * @param finalOptions - 收集配置对象
- * @param funcOptions  - 收集特殊配置对象字段
- * @param rootComponentOptions - 被收集的源配置对象
- */
-function assignRootComponentOption(
-  finalOptions: FinalOptionsOfComponent,
-  funcOptions: FuncOptions,
-  rootComponentOptions: RootComponentTrueOptions,
-) {
-  rootComponentOptions.customEvents && customEventsHandle(finalOptions.methods, rootComponentOptions.customEvents);
-
-  rootComponentOptions.events && eventsHandle(finalOptions.methods, rootComponentOptions.events);
-
-  funcFieldsCollect(rootComponentOptions, funcOptions);
-
-  otherFieldsHandle(finalOptions, rootComponentOptions);
-}
-
-/**
- * 合并 source 对象字段到 target字段
- * @remarks 规则：
- * 1. behaviors字段 源对象在前
- * 2. 对象字段 源覆盖目标
- * @param target - 目标对象
- * @param source - 源对象
- * @returns 按规则合并后的对象
- */
-function merge<Target extends object, Source extends object>(target: Target, source: Source): Assign<Target, Source> {
-  for (const key in source) {
-    const sourceVal = source[key];
-    if (key in target) {
-      // @ts-ignore
-      const targetVal = target[key];
-      switch (key) {
-        case "behaviors":
-          {
-            // @ts-ignore
-            target[key] = [...sourceVal, ...targetVal];
-          }
-          break;
-
-        default:
-          {
-            // @ts-ignore 源覆盖目标
-            target[key] = Object.assign(targetVal, sourceVal);
-          }
-          break;
-      }
-    } else {
-      // @ts-ignore
-      target[key] = sourceVal;
-    }
-  }
-
-  return target as unknown as Assign<Target, Source>;
-}
-/**
- * 返回一个由rootComponentOption和subComponentsList配置整合的对象
- * @param rootComponentOption -
- * @param subComponentsList -
- * @returns FinalOptionsForComponent
- */
-export function assignOptions(
-  defineComponentOption: DefineComponentOption,
-): FinalOptionsOfComponent {
-  const rootComponentOption = defineComponentOption.rootComponent;
-  const subComponentsOption = defineComponentOption.subComponents;
-  // 注入injectInfo和给默认配置(便于后续判断)
-  const finalOptionsForComponent: FinalOptionsOfComponent = merge(
-    { ...deepClone(instanceConfig.injectInfo) },
-    {
-      observers: {},
-      data: {},
-      methods: {},
-      behaviors: [BStore],
-      externalClasses: [],
-      pageLifetimes: {},
-    },
-  );
-
-  /**
-   * 有些字段配置同时存在根组件和子组件当中(如pageLifetimes，lifetimes,watch字段), 且key相同值类型为函数。funcConfig对象用于收集这些配置为数组形式,最终再一起整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
-   */
-  const funcOptions: FuncOptions = {
-    pageLifetimes: {},
-    lifetimes: {},
-    watch: {},
-    observers: {},
-  };
-
-  if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
-    // 把rootComponentOption配置并入finalOptionsForComponent,其中FuncOptions字段配置收集到funcOptions中
-    assignRootComponentOption(finalOptionsForComponent, funcOptions, rootComponentOption);
-  }
-
-  if (subComponentsOption && !isEmptyObject(subComponentsOption)) {
-    // 把subComponentsList配置并入finalOptionsForComponent,其中FuncOptions字段配置收集到funcOptions中
-    assignSubComponentsOption(finalOptionsForComponent, subComponentsOption, funcOptions);
-  }
-  // 把收集好的funcOptions并入finalOptionsForComponent
-  assignFuncOptions(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
-
-  // 配置与内部字段冲突验证
-  InternalFieldProtection(finalOptionsForComponent.methods, ["disposer", "__computedUpdater__"]);
-
-  InternalFieldProtection(finalOptionsForComponent.data, [
-    "__computedCache__",
-    "__storeConfig__",
-    "__watchOldValue__",
-  ]);
-  // 对页面传入参数进行处理 老框架劫持页面methods.onLoad,新框架劫持页面pageLifetimes.load
-
-  finalOptionsForComponent.isPage
-    && hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
-
-  hijack(
-    finalOptionsForComponent.methods,
-    "onLoad",
-    [onLoadReceivedDataHandle],
-  );
-
-  // 验证isPage字段是否配置正确
-  hijack(
-    finalOptionsForComponent.lifetimes!,
-    "attached",
-    [isPageCheck(rootComponentOption?.isPage)],
-  );
-
-  // hijack(
-  //   finalOptionsForComponent.lifetimes!,
-  //   "created",
-  //   [addCloneDataToInstance],
-  // );
-
-  // 页面时删除预设的虚拟组件字段
-  finalOptionsForComponent.isPage
-    && finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
-
-  // 初始化store数据到data并把store配置放入到data的__storeConfig__下
-  initStore(finalOptionsForComponent);
-
-  // 处理computed和watch配置
-  computedWatchHandle(finalOptionsForComponent);
-
-  // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
-  finalOptionsForComponent.behaviors!.push(BBeforeCreate);
-
-  return finalOptionsForComponent;
-}

package/src/types/CreateComponentDoc.ts

@@ -1,17 +0,0 @@
-import type { IfEquals } from "hry-types/src/Any/IfEquals";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-import type { BaseEvents } from "../thirdLib/wm/baseEvents";
-import type { AddPrefix } from "./AddPrefix";
-
-export type CreateComponentDoc<TName extends string, T extends ComponentDoc> = ComputeIntersectionDeep<
-  & IfEquals<
-    T["properties"],
-    unknown,
-    {},
-    {
-      properties: AddPrefix<T["properties"] & {}, TName>;
-    }
-  >
-  & { customEvents: AddPrefix<T["customEvents"] & BaseEvents, TName> }
->;