annil 1.6.5 → 1.7.2

package/CHANGELOG.md

@@ -4,6 +4,27 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.7.2](https://github.com/missannil/annil/compare/v1.7.1...v1.7.2) (2024-04-30)
+
+
+### Bug Fixes
+
+* 1. 计算属性依赖优化和返回值为代理的问题 ([6f28738](https://github.com/missannil/annil/commit/6f28738256c1884334b440271741ee1efb9e5519))
+
+## [1.7.1](https://github.com/missannil/annil/compare/v1.7.0...v1.7.1) (2024-04-12)
+
+
+### Bug Fixes
+
+* 1.7.0action发布时npm密钥过期问题 ([0ad71b9](https://github.com/missannil/annil/commit/0ad71b96aaa02668a4052cd57ea2ff8c46598107))
+
+## [1.7.0](https://github.com/missannil/annil/compare/v1.6.5...v1.7.0) (2024-04-11)
+
+
+### Features
+
+* subComponent的inherit字段加入数组类型,表示联合类型 ([a7930ff](https://github.com/missannil/annil/commit/a7930ff1abe18579bff6f1746911c2f30274325b))
+
 ## [1.6.5](https://github.com/missannil/annil/compare/v1.6.4...v1.6.5) (2024-02-13)
 
 

package/README.md

@@ -23,7 +23,7 @@
 
 ### 简介
 
-annil(安奈儿)是微信小程序原生开发插件,她会带给您惊喜。
+annil(安奈儿)是微信小程序原生开发插件。
 
 ### 特点
 

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.d.ts

@@ -1,5 +1,3 @@
 import type { ComputedDependence } from "./computedUpdater";
 export declare function deepProxy(data: object, dependences: ComputedDependence[], basePath?: string[]): object;
-export declare function getProxyOriginalValue<T extends {
-    __original__?: string;
-}>(value: T): unknown;
+export declare function getProxyOriginalValue(value: any): any;

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.js

@@ -1,4 +1,3 @@
-import { deepClone } from "../../../../utils/deepClone";
 import { uniqueDependences } from "./uniqueDependences";
 export function deepProxy(data, dependences, basePath = []) {
     const handler = {
@@ -7,8 +6,8 @@ export function deepProxy(data, dependences, basePath = []) {
                 return target;
             }
             const val = target[prop];
-            if (typeof val === "function" && (!Object.prototype.hasOwnProperty.call(target, prop))) {
-                return val.bind(target);
+            if (prop in target && !target.hasOwnProperty(prop)) {
+                return typeof val === "function" ? val.bind(target) : val;
             }
             dependences = uniqueDependences(dependences, basePath, prop);
             const curPath = basePath.concat(prop);
@@ -24,11 +23,15 @@ export function deepProxy(data, dependences, basePath = []) {
     return new Proxy(data, handler);
 }
 export function getProxyOriginalValue(value) {
-    if (typeof value !== "object" || value === null || !value.__original__) {
+    if (typeof value !== "object" || value === null) {
         return value;
     }
-    else {
-        return deepClone(value.__original__);
+    if (value.__original__)
+        return value.__original__;
+    const ret = Array.isArray(value) ? [] : {};
+    for (const key in value) {
+        ret[key] = getProxyOriginalValue(value[key]);
     }
+    return ret;
 }
 //# sourceMappingURL=data-tracer.js.map

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAmB,MAAS,EAAE,IAAsB;YACrD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAGzB,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gBAEvF,OAAQ,GAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAG1C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YAExD,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,GAAG,CAAC,OAAe,EAAE,IAAY;YAC/B,MAAM,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAsC,KAAQ;IACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
+{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAmB,MAAS,EAAE,IAAsB;YACrD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAGzB,IAAI,IAAI,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5D,CAAC;YACD,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAG1C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YAExD,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,GAAG,CAAC,OAAe,EAAE,IAAY;YAC/B,MAAM,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAU;IAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,YAAY;QAAE,OAAO,KAAK,CAAC,YAAY,CAAC;IAElD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QAExB,GAAG,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/api/SubComponent/SubInherit/SubInheritConstraint.d.ts

@@ -2,7 +2,8 @@ import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { RemoveInnerData } from "../../../types/RemoveInnerData";
 import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
 type WXMLSign = "wxml";
+type unionAddList<Keys extends string> = Keys | Keys[];
 export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
-    [k in keyof TComponentDoc["properties"]]?: RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string> | WXMLSign;
+    [k in keyof TComponentDoc["properties"]]?: unionAddList<RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>> | WXMLSign;
 };
 export {};

package/dist/thirdLib/wm/scrollView.d.ts

@@ -2,8 +2,6 @@ import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 export type ScrollView = CreateComponentDoc<"scrollView", {
     properties: {
-        class?: string;
-        style?: string;
         scroll_x?: boolean;
         scroll_y?: boolean;
         upper_threshold?: number | string;

package/dist/thirdLib/wm/swiper.d.ts

@@ -12,7 +12,7 @@ export type Swiper = CreateComponentDoc<"swiper", {
         list: unknown[];
         class?: string;
         style?: string;
-        indicator_dots?: boolean;
+        indicatorDots?: boolean;
         indicatorColor?: Color;
         indicatorActiveColor?: Color;
         autoplay?: boolean;

package/dist/thirdLib/wm/view.d.ts

@@ -1,11 +1,9 @@
 import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 export type View = CreateComponentDoc<"view", {
     properties: {
-        class?: string;
-        style?: string;
-        hover_class?: string;
-        hover_stop_propagation?: boolean;
-        hover_start_time?: number;
-        hover_stay_time?: number;
+        hoverClass?: string;
+        hoverStopPropagation?: boolean;
+        hoverStartTime?: number;
+        hoverStayTime?: number;
     };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.6.5",
+  "version": "1.7.2",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts

@@ -1,5 +1,4 @@
 /* eslint-disable complexity */
-import { deepClone } from "../../../../utils/deepClone";
 import type { ComputedDependence } from "./computedUpdater";
 import { uniqueDependences } from "./uniqueDependences";
 
@@ -15,12 +14,10 @@ export function deepProxy(
       }
       const val = target[prop];
 
-      // 如 this.data.arr.slice(),`slice`不属于自身属性不代理,不加入依赖。但不包含小程序data子字段为函数的情况)
-      if (typeof val === "function" && (!Object.prototype.hasOwnProperty.call(target, prop))) {
-        // val有不是函数的情况么？
-        return (val as Function).bind(target);
+      // 自身没有但原型链上有的属性不收集依赖
+      if (prop in target && !target.hasOwnProperty(prop)) {
+        return typeof val === "function" ? val.bind(target) : val;
       }
-
       dependences = uniqueDependences(dependences, basePath, prop);
 
       const curPath = basePath.concat(prop);
@@ -40,10 +37,17 @@ export function deepProxy(
   return new Proxy(data, handler);
 }
 
-export function getProxyOriginalValue<T extends { __original__?: string }>(value: T): unknown {
-  if (typeof value !== "object" || value === null || !value.__original__) {
+export function getProxyOriginalValue(value: any): any {
+  if (typeof value !== "object" || value === null) {
     return value;
-  } else {
-    return deepClone(value.__original__);
   }
+  if (value.__original__) return value.__original__;
+
+  const ret = Array.isArray(value) ? [] : {};
+  for (const key in value) {
+    // @ts-ignore 隐式索引
+    ret[key] = getProxyOriginalValue(value[key]);
+  }
+
+  return ret;
 }

package/src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts

@@ -15,7 +15,7 @@ type ComputedId = string;
 export type ComputedCache = Record<ComputedId, ItemCache>;
 
 /**
- * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段 返回false(即被依赖的计算字段写在了依赖他的计算字段后面), 否则返回true表示依赖有效。
+ * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段(即被依赖的计算字段写在了依赖他的计算字段后面) 返回false, 否则返回true表示依赖有效。
  */
 function isValidDependences(dependences: ComputedDependence[], computedKeys: string[]): boolean {
   for (const { paths: path, val } of dependences) {

package/src/api/SubComponent/SubInherit/SubInheritConstraint.ts

@@ -4,12 +4,14 @@ import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc
 
 type WXMLSign = "wxml";
 
+type unionAddList<Keys extends string> = Keys | Keys[];
+
 /**
- * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
+ * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或key[]或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
  * @returns object
  */
 export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
   [k in keyof TComponentDoc["properties"]]?:
-    | RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>
+    | unionAddList<RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>>
     | WXMLSign;
 };

package/src/api/SubComponent/SubInherit/test/error.test.ts

@@ -74,3 +74,11 @@ SubComponent<Mock_RootDoc, Mock_CompDoc>()({
     aaa_xxx: "",
   },
 });
+// 4 数组时类型错误
+
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
+  inherit: {
+    // @ts-expect-error
+    aaa_num: ["optional_lit1eral_num", "require1d_num"],
+  },
+});

package/src/api/SubComponent/SubInherit/test/normal.test.ts

@@ -54,3 +54,14 @@ SubComponent<Mock_RootDoc, Mock_CompDoc>()({
     aaa_obj1: "" as "required_obj" | "optional_obj" | "wxml",
   },
 });
+
+// 3 value为数组时,表示多个字段的联合类型
+
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
+  inherit: {
+    aaa_num: ["optional_literal_num", "required_num"],
+    aaa_str: ["literal_str", "str"],
+    aaa_obj: "" as "required_obj" | "optional_obj" | ["required_obj" | "optional_obj"] | "wxml",
+    aaa_obj1: "" as "required_obj" | "optional_obj" | ["required_obj" | "optional_obj"] | "wxml",
+  },
+});

package/src/api/SubComponent/SubWatch/test/error.test.ts

@@ -14,16 +14,16 @@ SubComponent<{ events: { a: string } }, Wm.View>()({
  */
 SubComponent<{ events: { a: string } }, Wm.View>()({
   data: {
-    view_style: "",
+    view_hoverClass: " h-100",
   },
   watch: {
-    view_style(newValue, oldValue) { // ok
+    view_hoverClass(newValue, oldValue) { // ok
       newValue;
 
       oldValue;
     },
     // @ts-expect-error 超出约束字段错误
-    view_XXstyle() {
+    view_xxxhoverClass() {
     },
   },
 });

package/src/thirdLib/wm/scrollView.ts

@@ -3,8 +3,6 @@ import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 
 export type ScrollView = CreateComponentDoc<"scrollView", {
   properties: {
-    class?: string;
-    style?: string;
     // 允许横向滚动
     scroll_x?: boolean;
     // 允许纵向滚动

package/src/thirdLib/wm/swiper.ts

@@ -21,7 +21,7 @@ export type Swiper = CreateComponentDoc<"swiper", {
      * 是否显示面板指示点
      * @defaultValue false
      */
-    indicator_dots?: boolean;
+    indicatorDots?: boolean;
 
     /**
      * 指示点颜色

package/src/thirdLib/wm/view.ts

@@ -2,27 +2,25 @@ import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 
 export type View = CreateComponentDoc<"view", {
   properties: {
-    class?: string;
-    style?: string;
     /**
      * 指定按下去的样式类。当 hover-class="none" 时，没有点击态效果
      * @defaultValue 'none'
      */
-    hover_class?: string;
+    hoverClass?: string;
     /**
      * 指定是否阻止本节点的祖先节点出现点击态
      * @defaultValue false
      */
-    hover_stop_propagation?: boolean;
+    hoverStopPropagation?: boolean;
     /**
      * 按住后多久出现点击态，单位毫秒
      * @defaultValue 50
      */
-    hover_start_time?: number;
+    hoverStartTime?: number;
     /**
      * 手指松开后点击态保留时间，单位毫秒
      * @defaultValue 400
      */
-    hover_stay_time?: number;
+    hoverStayTime?: number;
   };
 }>;