@tarojs/components-advanced 4.0.0-alpha.0 → 4.0.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (71) hide show
  1. package/LICENSE +11 -4
  2. package/README.md +6 -0
  3. package/dist/components/index.d.ts +2 -2
  4. package/dist/components/virtual-list/constants.d.ts +1 -2
  5. package/dist/components/virtual-list/dom-helpers.d.ts +1 -2
  6. package/dist/components/virtual-list/dom-helpers.js.map +1 -1
  7. package/dist/components/virtual-list/index.d.ts +9 -17
  8. package/dist/components/virtual-list/index.js.map +1 -1
  9. package/dist/components/virtual-list/list-set.d.ts +3 -3
  10. package/dist/components/virtual-list/list-set.js.map +1 -1
  11. package/dist/components/virtual-list/preset.d.ts +10 -10
  12. package/dist/components/virtual-list/preset.js +1 -3
  13. package/dist/components/virtual-list/preset.js.map +1 -1
  14. package/dist/components/virtual-list/react/index.d.ts +2 -2
  15. package/dist/components/virtual-list/react/index.js +3 -2
  16. package/dist/components/virtual-list/react/index.js.map +1 -1
  17. package/dist/components/virtual-list/react/list.d.ts +5 -10
  18. package/dist/components/virtual-list/react/list.js +3 -3
  19. package/dist/components/virtual-list/react/list.js.map +1 -1
  20. package/dist/components/virtual-list/react/validate.d.ts +3 -4
  21. package/dist/components/virtual-list/react/validate.js.map +1 -1
  22. package/dist/components/virtual-list/react/wrapper.d.ts +1 -1
  23. package/dist/components/virtual-list/react/wrapper.js +1 -1
  24. package/dist/components/virtual-list/react/wrapper.js.map +1 -1
  25. package/dist/components/virtual-list/utils.d.ts +3 -3
  26. package/dist/components/virtual-list/vue/index.d.ts +6 -6
  27. package/dist/components/virtual-list/vue/list.d.ts +24 -3
  28. package/dist/components/virtual-list/vue/list.js +12 -9
  29. package/dist/components/virtual-list/vue/list.js.map +1 -1
  30. package/dist/components/virtual-waterfall/constants.d.ts +1 -2
  31. package/dist/components/virtual-waterfall/index.d.ts +9 -17
  32. package/dist/components/virtual-waterfall/index.js +1 -1
  33. package/dist/components/virtual-waterfall/index.js.map +1 -1
  34. package/dist/components/virtual-waterfall/list-map.d.ts +3 -4
  35. package/dist/components/virtual-waterfall/list-map.js.map +1 -1
  36. package/dist/components/virtual-waterfall/preset.d.ts +10 -10
  37. package/dist/components/virtual-waterfall/preset.js +1 -3
  38. package/dist/components/virtual-waterfall/preset.js.map +1 -1
  39. package/dist/components/virtual-waterfall/react/index.d.ts +2 -2
  40. package/dist/components/virtual-waterfall/react/index.js +4 -3
  41. package/dist/components/virtual-waterfall/react/index.js.map +1 -1
  42. package/dist/components/virtual-waterfall/react/waterfall.d.ts +4 -9
  43. package/dist/components/virtual-waterfall/react/waterfall.js +3 -3
  44. package/dist/components/virtual-waterfall/react/waterfall.js.map +1 -1
  45. package/dist/components/virtual-waterfall/react/wrapper.d.ts +1 -1
  46. package/dist/components/virtual-waterfall/react/wrapper.js +1 -1
  47. package/dist/components/virtual-waterfall/react/wrapper.js.map +1 -1
  48. package/dist/components/virtual-waterfall/vue/index.d.ts +6 -6
  49. package/dist/components/virtual-waterfall/vue/waterfall.d.ts +24 -3
  50. package/dist/components/virtual-waterfall/vue/waterfall.js +12 -9
  51. package/dist/components/virtual-waterfall/vue/waterfall.js.map +1 -1
  52. package/dist/index.d.ts +2 -2
  53. package/dist/utils/convert.d.ts +2 -3
  54. package/dist/utils/convert.js.map +1 -1
  55. package/dist/utils/dom.d.ts +3 -4
  56. package/dist/utils/dom.js.map +1 -1
  57. package/dist/utils/helper.d.ts +2 -3
  58. package/dist/utils/helper.js.map +1 -1
  59. package/dist/utils/index.d.ts +6 -6
  60. package/dist/utils/lodash.d.ts +3 -4
  61. package/dist/utils/lodash.js.map +1 -1
  62. package/dist/utils/math.d.ts +2 -3
  63. package/dist/utils/math.js.map +1 -1
  64. package/dist/utils/timer.d.ts +3 -3
  65. package/dist/utils/timer.js.map +1 -1
  66. package/dist/utils/vue-render.d.ts +1 -2
  67. package/dist/utils/vue-render.js +10 -11
  68. package/dist/utils/vue-render.js.map +1 -1
  69. package/package.json +14 -22
  70. package/dist/node_modules/.pnpm/registry.npmjs.org_tslib@2.5.0/node_modules/tslib/tslib.es6.js +0 -296
  71. package/dist/node_modules/.pnpm/registry.npmjs.org_tslib@2.5.0/node_modules/tslib/tslib.es6.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"lodash.js","sources":["../../src/utils/lodash.ts"],"sourcesContent":["export function omit<\n T extends Record<string, unknown> = Record<string, any>,\n P extends string = ''\n> (obj: T = ({} as T), fields: P[] = []): Omit<T, P> {\n const shallow = { ...obj }\n fields.forEach((key) => {\n delete shallow[key]\n })\n return shallow\n}\n\nexport function throttle (fn, threshold = 250, scope?) {\n let lastTime = 0\n let deferTimer: ReturnType<typeof setTimeout>\n return function (...args) {\n const context = scope || this\n const now = Date.now()\n if (now - lastTime > threshold) {\n fn.apply(this, args)\n lastTime = now\n } else {\n clearTimeout(deferTimer)\n deferTimer = setTimeout(() => {\n lastTime = now\n fn.apply(context, args)\n }, threshold)\n }\n }\n}\n\nexport function debounce (fn, ms = 250, scope?) {\n let timer: ReturnType<typeof setTimeout>\n\n return function (...args) {\n const context = scope || this\n clearTimeout(timer)\n timer = setTimeout(function () {\n fn.apply(context, args)\n }, ms)\n }\n}\n"],"names":[],"mappings":"SAAgB,IAAI,CAGjB,MAAU,EAAQ,EAAE,SAAc,EAAE,EAAA;AACrC,IAAA,MAAM,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAQ,GAAG,CAAE,CAAA;AAC1B,IAAA,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,KAAI;AACrB,QAAA,OAAO,OAAO,CAAC,GAAG,CAAC,CAAA;AACrB,KAAC,CAAC,CAAA;AACF,IAAA,OAAO,OAAO,CAAA;AAChB,CAAC;AAEK,SAAU,QAAQ,CAAE,EAAE,EAAE,SAAS,GAAG,GAAG,EAAE,KAAM,EAAA;IACnD,IAAI,QAAQ,GAAG,CAAC,CAAA;AAChB,IAAA,IAAI,UAAyC,CAAA;IAC7C,OAAO,UAAU,GAAG,IAAI,EAAA;AACtB,QAAA,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAA;AAC7B,QAAA,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;AACtB,QAAA,IAAI,GAAG,GAAG,QAAQ,GAAG,SAAS,EAAE;AAC9B,YAAA,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACpB,QAAQ,GAAG,GAAG,CAAA;AACf,SAAA;AAAM,aAAA;YACL,YAAY,CAAC,UAAU,CAAC,CAAA;AACxB,YAAA,UAAU,GAAG,UAAU,CAAC,MAAK;gBAC3B,QAAQ,GAAG,GAAG,CAAA;AACd,gBAAA,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;aACxB,EAAE,SAAS,CAAC,CAAA;AACd,SAAA;AACH,KAAC,CAAA;AACH,CAAC;AAEK,SAAU,QAAQ,CAAE,EAAE,EAAE,EAAE,GAAG,GAAG,EAAE,KAAM,EAAA;AAC5C,IAAA,IAAI,KAAoC,CAAA;IAExC,OAAO,UAAU,GAAG,IAAI,EAAA;AACtB,QAAA,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAA;QAC7B,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,KAAK,GAAG,UAAU,CAAC,YAAA;AACjB,YAAA,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;SACxB,EAAE,EAAE,CAAC,CAAA;AACR,KAAC,CAAA;AACH;;;;"}
1
+ {"version":3,"file":"lodash.js","sources":["../../src/utils/lodash.ts"],"sourcesContent":["export function omit<\n T extends Record<string, unknown> = Record<string, any>,\n P extends string = ''\n> (obj: T = ({} as T), fields: P[] = []): Omit<T, P> {\n const shallow = { ...obj }\n fields.forEach((key) => {\n delete shallow[key]\n })\n return shallow\n}\n\nexport function throttle (fn, threshold = 250, scope?) {\n let lastTime = 0\n let deferTimer: ReturnType<typeof setTimeout>\n return function (...args) {\n const context = scope || this\n const now = Date.now()\n if (now - lastTime > threshold) {\n fn.apply(this, args)\n lastTime = now\n } else {\n clearTimeout(deferTimer)\n deferTimer = setTimeout(() => {\n lastTime = now\n fn.apply(context, args)\n }, threshold)\n }\n }\n}\n\nexport function debounce (fn, ms = 250, scope?) {\n let timer: ReturnType<typeof setTimeout>\n\n return function (...args) {\n const context = scope || this\n clearTimeout(timer)\n timer = setTimeout(function () {\n fn.apply(context, args)\n }, ms)\n }\n}\n"],"names":[],"mappings":"SAAgB,IAAI,CAGjB,MAAU,EAAQ,EAAE,SAAc,EAAE,EAAA;AACrC,IAAA,MAAM,OAAO,GAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAQ,GAAG,CAAE,CAAA;AAC1B,IAAA,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,KAAI;AACrB,QAAA,OAAO,OAAO,CAAC,GAAG,CAAC,CAAA;AACrB,KAAC,CAAC,CAAA;AACF,IAAA,OAAO,OAAO,CAAA;AAChB,CAAC;AAEK,SAAU,QAAQ,CAAE,EAAE,EAAE,SAAS,GAAG,GAAG,EAAE,KAAM,EAAA;IACnD,IAAI,QAAQ,GAAG,CAAC,CAAA;AAChB,IAAA,IAAI,UAAyC,CAAA;IAC7C,OAAO,UAAU,GAAG,IAAI,EAAA;AACtB,QAAA,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAA;AAC7B,QAAA,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;AACtB,QAAA,IAAI,GAAG,GAAG,QAAQ,GAAG,SAAS,EAAE;AAC9B,YAAA,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACpB,QAAQ,GAAG,GAAG,CAAA;SACf;aAAM;YACL,YAAY,CAAC,UAAU,CAAC,CAAA;AACxB,YAAA,UAAU,GAAG,UAAU,CAAC,MAAK;gBAC3B,QAAQ,GAAG,GAAG,CAAA;AACd,gBAAA,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;aACxB,EAAE,SAAS,CAAC,CAAA;SACd;AACH,KAAC,CAAA;AACH,CAAC;AAEK,SAAU,QAAQ,CAAE,EAAE,EAAE,EAAE,GAAG,GAAG,EAAE,KAAM,EAAA;AAC5C,IAAA,IAAI,KAAoC,CAAA;IAExC,OAAO,UAAU,GAAG,IAAI,EAAA;AACtB,QAAA,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAA;QAC7B,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,KAAK,GAAG,UAAU,CAAC,YAAA;AACjB,YAAA,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;SACxB,EAAE,EAAE,CAAC,CAAA;AACR,KAAC,CAAA;AACH;;;;"}
@@ -1,3 +1,2 @@
1
- declare function getMiddleNumber(...list: number[]): number;
2
- declare function isCosDistributing(list: number[], datum?: number): boolean;
3
- export { getMiddleNumber, isCosDistributing };
1
+ export declare function getMiddleNumber(...list: number[]): number;
2
+ export declare function isCosDistributing(list: number[], datum?: number): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"math.js","sources":["../../src/utils/math.ts"],"sourcesContent":["export function getMiddleNumber (...list: number[]) {\n return list.sort((a, b) => a - b)[Math.floor(list.length / 2)]\n}\n\nexport function isCosDistributing (list: number[], datum = 0) {\n let flags = 0\n for (let i = 0; i < list.length - 1; i++) {\n if (getMiddleNumber(list[i], datum, list[i + 1]) === datum) {\n flags++\n }\n }\n\n return flags === list.length - 1\n}\n"],"names":[],"mappings":"AAAgB,SAAA,eAAe,CAAE,GAAG,IAAc,EAAA;IAChD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;AAChE,CAAC;SAEe,iBAAiB,CAAE,IAAc,EAAE,KAAK,GAAG,CAAC,EAAA;IAC1D,IAAI,KAAK,GAAG,CAAC,CAAA;AACb,IAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;AACxC,QAAA,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;AAC1D,YAAA,KAAK,EAAE,CAAA;AACR,SAAA;AACF,KAAA;AAED,IAAA,OAAO,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;AAClC;;;;"}
1
+ {"version":3,"file":"math.js","sources":["../../src/utils/math.ts"],"sourcesContent":["export function getMiddleNumber (...list: number[]) {\n return list.sort((a, b) => a - b)[Math.floor(list.length / 2)]\n}\n\nexport function isCosDistributing (list: number[], datum = 0) {\n let flags = 0\n for (let i = 0; i < list.length - 1; i++) {\n if (getMiddleNumber(list[i], datum, list[i + 1]) === datum) {\n flags++\n }\n }\n\n return flags === list.length - 1\n}\n"],"names":[],"mappings":"AAAgB,SAAA,eAAe,CAAE,GAAG,IAAc,EAAA;IAChD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;AAChE,CAAC;SAEe,iBAAiB,CAAE,IAAc,EAAE,KAAK,GAAG,CAAC,EAAA;IAC1D,IAAI,KAAK,GAAG,CAAC,CAAA;AACb,IAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;AACxC,QAAA,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;AAC1D,YAAA,KAAK,EAAE,CAAA;SACR;KACF;AAED,IAAA,OAAO,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;AAClC;;;;"}
@@ -1,6 +1,6 @@
1
1
  interface ITimeoutID {
2
2
  id: number;
3
3
  }
4
- declare function cancelTimeout(timeoutID: ITimeoutID): void;
5
- declare function requestTimeout(callback: () => void, delay?: number): ITimeoutID;
6
- export { cancelTimeout, requestTimeout };
4
+ export declare function cancelTimeout(timeoutID: ITimeoutID): void;
5
+ export declare function requestTimeout(callback: () => void, delay?: number): ITimeoutID;
6
+ export {};
@@ -1 +1 @@
1
- {"version":3,"file":"timer.js","sources":["../../src/utils/timer.ts"],"sourcesContent":["import { cancelAnimationFrame, now, requestAnimationFrame } from '@tarojs/runtime'\n\ninterface ITimeoutID {\n id: number\n}\n\nexport function cancelTimeout (timeoutID: ITimeoutID) {\n cancelAnimationFrame(timeoutID.id)\n}\n\nexport function requestTimeout (callback: () => void, delay = 0) {\n const start = now()\n\n const timeoutID: ITimeoutID = {\n id: requestAnimationFrame(tick) as number\n }\n\n function tick () {\n if (now() - start >= delay) {\n // eslint-disable-next-line no-useless-call\n callback.call(null)\n } else {\n timeoutID.id = requestAnimationFrame(tick) as number\n }\n }\n\n return timeoutID\n}\n"],"names":[],"mappings":";;AAMM,SAAU,aAAa,CAAE,SAAqB,EAAA;AAClD,IAAA,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;AACpC,CAAC;SAEe,cAAc,CAAE,QAAoB,EAAE,KAAK,GAAG,CAAC,EAAA;AAC7D,IAAA,MAAM,KAAK,GAAG,GAAG,EAAE,CAAA;AAEnB,IAAA,MAAM,SAAS,GAAe;AAC5B,QAAA,EAAE,EAAE,qBAAqB,CAAC,IAAI,CAAW;KAC1C,CAAA;AAED,IAAA,SAAS,IAAI,GAAA;AACX,QAAA,IAAI,GAAG,EAAE,GAAG,KAAK,IAAI,KAAK,EAAE;;AAE1B,YAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpB,SAAA;AAAM,aAAA;AACL,YAAA,SAAS,CAAC,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAW,CAAA;AACrD,SAAA;KACF;AAED,IAAA,OAAO,SAAS,CAAA;AAClB;;;;"}
1
+ {"version":3,"file":"timer.js","sources":["../../src/utils/timer.ts"],"sourcesContent":["import { cancelAnimationFrame, now, requestAnimationFrame } from '@tarojs/runtime'\n\ninterface ITimeoutID {\n id: number\n}\n\nexport function cancelTimeout (timeoutID: ITimeoutID) {\n cancelAnimationFrame(timeoutID.id)\n}\n\nexport function requestTimeout (callback: () => void, delay = 0) {\n const start = now()\n\n const timeoutID: ITimeoutID = {\n id: requestAnimationFrame(tick) as number\n }\n\n function tick () {\n if (now() - start >= delay) {\n // eslint-disable-next-line no-useless-call\n callback.call(null)\n } else {\n timeoutID.id = requestAnimationFrame(tick) as number\n }\n }\n\n return timeoutID\n}\n"],"names":[],"mappings":";;AAMM,SAAU,aAAa,CAAE,SAAqB,EAAA;AAClD,IAAA,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;AACpC,CAAC;SAEe,cAAc,CAAE,QAAoB,EAAE,KAAK,GAAG,CAAC,EAAA;AAC7D,IAAA,MAAM,KAAK,GAAG,GAAG,EAAE,CAAA;AAEnB,IAAA,MAAM,SAAS,GAAe;AAC5B,QAAA,EAAE,EAAE,qBAAqB,CAAC,IAAI,CAAW;KAC1C,CAAA;AAED,IAAA,SAAS,IAAI,GAAA;AACX,QAAA,IAAI,GAAG,EAAE,GAAG,KAAK,IAAI,KAAK,EAAE;;AAE1B,YAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACpB;aAAM;AACL,YAAA,SAAS,CAAC,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAW,CAAA;SACrD;KACF;AAED,IAAA,OAAO,SAAS,CAAA;AAClB;;;;"}
@@ -1,4 +1,3 @@
1
- declare function vueRenderFunc(componentName: string, options?: Record<string, any>, children?: any): import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
1
+ export default function (componentName: string, options?: Record<string, any>, children?: any): import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
2
2
  [key: string]: any;
3
3
  }>;
4
- export { vueRenderFunc as default };
@@ -1,17 +1,16 @@
1
- import { __rest } from '../node_modules/.pnpm/registry.npmjs.org_tslib@2.5.0/node_modules/tslib/tslib.es6.js';
1
+ import { __rest } from 'tslib';
2
2
  import { h } from 'vue';
3
3
 
4
4
  function render (componentName, options, children) {
5
- const { attrs = {}, on = {}, props = {}, slots = {} } = options, el = __rest(options, ["attrs", "on", "props", "slots"]);
6
- if (process.env.FRAMEWORK === 'vue3') {
7
- // Events
8
- Object.keys(on).forEach(key => {
9
- const name = `on${key.charAt(0).toUpperCase()}${key.slice(1)}`;
10
- el[name] = on[key];
11
- });
12
- return h(componentName, Object.assign(Object.assign(Object.assign(Object.assign({}, attrs), props), slots), el), children);
13
- }
14
- return h(componentName, options, children);
5
+ const { attrs = {}, on = {}, props = {}, slots = {} } = options, el = __rest(options
6
+ // Events
7
+ , ["attrs", "on", "props", "slots"]);
8
+ // Events
9
+ Object.keys(on).forEach(key => {
10
+ const name = `on${key.charAt(0).toUpperCase()}${key.slice(1)}`;
11
+ el[name] = on[key];
12
+ });
13
+ return h(componentName, Object.assign(Object.assign(Object.assign(Object.assign({}, attrs), props), slots), el), children);
15
14
  }
16
15
 
17
16
  export { render as default };
@@ -1 +1 @@
1
- {"version":3,"file":"vue-render.js","sources":["../../src/utils/vue-render.ts"],"sourcesContent":["import { h } from 'vue'\n\nexport default function (componentName: string, options?: Record<string, any>, children?: any) {\n const { attrs = {}, on = {}, props = {}, slots = {}, ...el } = options\n if (process.env.FRAMEWORK === 'vue3') {\n // Events\n Object.keys(on).forEach(key => {\n const name = `on${key.charAt(0).toUpperCase()}${key.slice(1)}`\n el[name] = on[key]\n })\n return h(componentName, { ...attrs, ...props, ...slots, ... el }, children)\n }\n return h(componentName, options, children)\n}\n"],"names":[],"mappings":";;;AAEc,eAAA,EAAW,aAAqB,EAAE,OAA6B,EAAE,QAAc,EAAA;IAC3F,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAA,GAAY,OAAO,EAAd,EAAE,GAAA,MAAA,CAAK,OAAO,EAAhE,CAAsD,OAAA,EAAA,IAAA,EAAA,OAAA,EAAA,OAAA,CAAA,CAAU,CAAA;AACtE,IAAA,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM,EAAE;;QAEpC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,IAAG;YAC5B,MAAM,IAAI,GAAG,CAAK,EAAA,EAAA,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA,EAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;YAC9D,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;AACpB,SAAC,CAAC,CAAA;AACF,QAAA,OAAO,CAAC,CAAC,aAAa,EAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAO,KAAK,CAAK,EAAA,KAAK,CAAK,EAAA,KAAK,CAAM,EAAA,EAAE,CAAI,EAAA,QAAQ,CAAC,CAAA;AAC5E,KAAA;IACD,OAAO,CAAC,CAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;AAC5C;;;;"}
1
+ {"version":3,"file":"vue-render.js","sources":["../../src/utils/vue-render.ts"],"sourcesContent":["import { h } from 'vue'\n\nexport default function (componentName: string, options?: Record<string, any>, children?: any) {\n const { attrs = {}, on = {}, props = {}, slots = {}, ...el } = options\n // Events\n Object.keys(on).forEach(key => {\n const name = `on${key.charAt(0).toUpperCase()}${key.slice(1)}`\n el[name] = on[key]\n })\n return h(componentName, { ...attrs, ...props, ...slots, ...el }, children)\n}\n"],"names":[],"mappings":";;;AAEc,eAAA,EAAW,aAAqB,EAAE,OAA6B,EAAE,QAAc,EAAA;IAC3F,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,KAAY,OAAO,EAAd,EAAE,GAAA,MAAA,CAAK,OAAO;;AAAhE,MAAA,CAAA,OAAA,EAAA,IAAA,EAAA,OAAA,EAAA,OAAA,CAAsD,CAAU,CAAA;;IAEtE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,IAAG;QAC5B,MAAM,IAAI,GAAG,CAAK,EAAA,EAAA,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA,EAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;QAC9D,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;AACpB,KAAC,CAAC,CAAA;AACF,IAAA,OAAO,CAAC,CAAC,aAAa,EAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAO,KAAK,CAAK,EAAA,KAAK,CAAK,EAAA,KAAK,CAAK,EAAA,EAAE,CAAI,EAAA,QAAQ,CAAC,CAAA;AAC5E;;;;"}
package/package.json CHANGED
@@ -1,7 +1,9 @@
1
1
  {
2
2
  "name": "@tarojs/components-advanced",
3
- "version": "4.0.0-alpha.0",
3
+ "version": "4.0.0-alpha.10",
4
4
  "description": "",
5
+ "author": "O2Team",
6
+ "license": "MIT",
5
7
  "main": "dist/index.js",
6
8
  "types": "dist/index.d.ts",
7
9
  "files": [
@@ -13,37 +15,26 @@
13
15
  "*.css"
14
16
  ],
15
17
  "keywords": [],
16
- "author": "ZakaryCode",
17
- "license": "MIT",
18
18
  "dependencies": {
19
19
  "classnames": "^2.2.5",
20
20
  "csstype": "^3.1.1",
21
21
  "memoize-one": "^6.0.0",
22
- "postcss": "^8.4.18",
23
- "@tarojs/components": "4.0.0-alpha.0",
24
- "@tarojs/taro": "4.0.0-alpha.0",
25
- "@tarojs/runtime": "4.0.0-alpha.0",
26
- "@tarojs/shared": "4.0.0-alpha.0"
22
+ "tslib": "^2.6.2",
23
+ "@tarojs/components": "4.0.0-alpha.10"
27
24
  },
28
25
  "devDependencies": {
29
- "@babel/cli": "^7.14.5",
30
- "@babel/core": "^7.14.5",
31
- "@babel/plugin-transform-typescript": "^7.20.2",
32
- "@rollup/plugin-commonjs": "^25.0.7",
33
- "@rollup/plugin-node-resolve": "^15.2.3",
34
- "@types/node": "^14.14.31",
35
26
  "react": "^18.2.0",
36
27
  "react-dom": "^18.2.0",
37
- "rollup": "^2.79.0",
38
- "rollup-plugin-node-externals": "^5.0.0",
39
- "rollup-plugin-postcss": "^3.1.8",
40
- "rollup-plugin-ts": "^3.0.2",
41
- "typescript": "^4.7.4",
42
- "vue": "^3.0.0",
43
- "babel-preset-taro": "4.0.0-alpha.0"
28
+ "vue": "3.2.47",
29
+ "@tarojs/runtime": "4.0.0-alpha.10",
30
+ "@tarojs/taro": "4.0.0-alpha.10",
31
+ "@tarojs/shared": "4.0.0-alpha.10"
44
32
  },
45
33
  "peerDependencies": {
46
- "react": ">=17"
34
+ "react": ">=17",
35
+ "@tarojs/shared": "~4.0.0-alpha.10",
36
+ "@tarojs/runtime": "~4.0.0-alpha.10",
37
+ "@tarojs/taro": "~4.0.0-alpha.10"
47
38
  },
48
39
  "peerDependenciesMeta": {
49
40
  "react": {
@@ -54,6 +45,7 @@
54
45
  }
55
46
  },
56
47
  "scripts": {
48
+ "prod": "pnpm run build",
57
49
  "prebuild": "pnpm run clean",
58
50
  "build": "rollup -c",
59
51
  "clean": "rimraf --impl=move-remove ./dist",
@@ -1,296 +0,0 @@
1
- /******************************************************************************
2
- Copyright (c) Microsoft Corporation.
3
-
4
- Permission to use, copy, modify, and/or distribute this software for any
5
- purpose with or without fee is hereby granted.
6
-
7
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
8
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
9
- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
10
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
11
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
12
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
13
- PERFORMANCE OF THIS SOFTWARE.
14
- ***************************************************************************** */
15
- /* global Reflect, Promise */
16
-
17
- var extendStatics = function(d, b) {
18
- extendStatics = Object.setPrototypeOf ||
19
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
20
- function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
21
- return extendStatics(d, b);
22
- };
23
-
24
- function __extends(d, b) {
25
- if (typeof b !== "function" && b !== null)
26
- throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
27
- extendStatics(d, b);
28
- function __() { this.constructor = d; }
29
- d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
30
- }
31
-
32
- var __assign = function() {
33
- __assign = Object.assign || function __assign(t) {
34
- for (var s, i = 1, n = arguments.length; i < n; i++) {
35
- s = arguments[i];
36
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
37
- }
38
- return t;
39
- };
40
- return __assign.apply(this, arguments);
41
- };
42
-
43
- function __rest(s, e) {
44
- var t = {};
45
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
46
- t[p] = s[p];
47
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
48
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
49
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
50
- t[p[i]] = s[p[i]];
51
- }
52
- return t;
53
- }
54
-
55
- function __decorate(decorators, target, key, desc) {
56
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
57
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
58
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
59
- return c > 3 && r && Object.defineProperty(target, key, r), r;
60
- }
61
-
62
- function __param(paramIndex, decorator) {
63
- return function (target, key) { decorator(target, key, paramIndex); }
64
- }
65
-
66
- function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
67
- function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
68
- var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
69
- var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
70
- var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
71
- var _, done = false;
72
- for (var i = decorators.length - 1; i >= 0; i--) {
73
- var context = {};
74
- for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
75
- for (var p in contextIn.access) context.access[p] = contextIn.access[p];
76
- context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
77
- var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
78
- if (kind === "accessor") {
79
- if (result === void 0) continue;
80
- if (result === null || typeof result !== "object") throw new TypeError("Object expected");
81
- if (_ = accept(result.get)) descriptor.get = _;
82
- if (_ = accept(result.set)) descriptor.set = _;
83
- if (_ = accept(result.init)) initializers.push(_);
84
- }
85
- else if (_ = accept(result)) {
86
- if (kind === "field") initializers.push(_);
87
- else descriptor[key] = _;
88
- }
89
- }
90
- if (target) Object.defineProperty(target, contextIn.name, descriptor);
91
- done = true;
92
- };
93
-
94
- function __runInitializers(thisArg, initializers, value) {
95
- var useValue = arguments.length > 2;
96
- for (var i = 0; i < initializers.length; i++) {
97
- value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
98
- }
99
- return useValue ? value : void 0;
100
- };
101
-
102
- function __propKey(x) {
103
- return typeof x === "symbol" ? x : "".concat(x);
104
- };
105
-
106
- function __setFunctionName(f, name, prefix) {
107
- if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
108
- return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
109
- };
110
-
111
- function __metadata(metadataKey, metadataValue) {
112
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
113
- }
114
-
115
- function __awaiter(thisArg, _arguments, P, generator) {
116
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
117
- return new (P || (P = Promise))(function (resolve, reject) {
118
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
119
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
120
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
121
- step((generator = generator.apply(thisArg, _arguments || [])).next());
122
- });
123
- }
124
-
125
- function __generator(thisArg, body) {
126
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
127
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
128
- function verb(n) { return function (v) { return step([n, v]); }; }
129
- function step(op) {
130
- if (f) throw new TypeError("Generator is already executing.");
131
- while (g && (g = 0, op[0] && (_ = 0)), _) try {
132
- if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
133
- if (y = 0, t) op = [op[0] & 2, t.value];
134
- switch (op[0]) {
135
- case 0: case 1: t = op; break;
136
- case 4: _.label++; return { value: op[1], done: false };
137
- case 5: _.label++; y = op[1]; op = [0]; continue;
138
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
139
- default:
140
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
141
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
142
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
143
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
144
- if (t[2]) _.ops.pop();
145
- _.trys.pop(); continue;
146
- }
147
- op = body.call(thisArg, _);
148
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
149
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
150
- }
151
- }
152
-
153
- var __createBinding = Object.create ? (function(o, m, k, k2) {
154
- if (k2 === undefined) k2 = k;
155
- var desc = Object.getOwnPropertyDescriptor(m, k);
156
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
157
- desc = { enumerable: true, get: function() { return m[k]; } };
158
- }
159
- Object.defineProperty(o, k2, desc);
160
- }) : (function(o, m, k, k2) {
161
- if (k2 === undefined) k2 = k;
162
- o[k2] = m[k];
163
- });
164
-
165
- function __exportStar(m, o) {
166
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
167
- }
168
-
169
- function __values(o) {
170
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
171
- if (m) return m.call(o);
172
- if (o && typeof o.length === "number") return {
173
- next: function () {
174
- if (o && i >= o.length) o = void 0;
175
- return { value: o && o[i++], done: !o };
176
- }
177
- };
178
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
179
- }
180
-
181
- function __read(o, n) {
182
- var m = typeof Symbol === "function" && o[Symbol.iterator];
183
- if (!m) return o;
184
- var i = m.call(o), r, ar = [], e;
185
- try {
186
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
187
- }
188
- catch (error) { e = { error: error }; }
189
- finally {
190
- try {
191
- if (r && !r.done && (m = i["return"])) m.call(i);
192
- }
193
- finally { if (e) throw e.error; }
194
- }
195
- return ar;
196
- }
197
-
198
- /** @deprecated */
199
- function __spread() {
200
- for (var ar = [], i = 0; i < arguments.length; i++)
201
- ar = ar.concat(__read(arguments[i]));
202
- return ar;
203
- }
204
-
205
- /** @deprecated */
206
- function __spreadArrays() {
207
- for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
208
- for (var r = Array(s), k = 0, i = 0; i < il; i++)
209
- for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
210
- r[k] = a[j];
211
- return r;
212
- }
213
-
214
- function __spreadArray(to, from, pack) {
215
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
216
- if (ar || !(i in from)) {
217
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
218
- ar[i] = from[i];
219
- }
220
- }
221
- return to.concat(ar || Array.prototype.slice.call(from));
222
- }
223
-
224
- function __await(v) {
225
- return this instanceof __await ? (this.v = v, this) : new __await(v);
226
- }
227
-
228
- function __asyncGenerator(thisArg, _arguments, generator) {
229
- if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
230
- var g = generator.apply(thisArg, _arguments || []), i, q = [];
231
- return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
232
- function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
233
- function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
234
- function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
235
- function fulfill(value) { resume("next", value); }
236
- function reject(value) { resume("throw", value); }
237
- function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
238
- }
239
-
240
- function __asyncDelegator(o) {
241
- var i, p;
242
- return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
243
- function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
244
- }
245
-
246
- function __asyncValues(o) {
247
- if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
248
- var m = o[Symbol.asyncIterator], i;
249
- return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
250
- function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
251
- function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
252
- }
253
-
254
- function __makeTemplateObject(cooked, raw) {
255
- if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
256
- return cooked;
257
- };
258
-
259
- var __setModuleDefault = Object.create ? (function(o, v) {
260
- Object.defineProperty(o, "default", { enumerable: true, value: v });
261
- }) : function(o, v) {
262
- o["default"] = v;
263
- };
264
-
265
- function __importStar(mod) {
266
- if (mod && mod.__esModule) return mod;
267
- var result = {};
268
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
269
- __setModuleDefault(result, mod);
270
- return result;
271
- }
272
-
273
- function __importDefault(mod) {
274
- return (mod && mod.__esModule) ? mod : { default: mod };
275
- }
276
-
277
- function __classPrivateFieldGet(receiver, state, kind, f) {
278
- if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
279
- if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
280
- return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
281
- }
282
-
283
- function __classPrivateFieldSet(receiver, state, value, kind, f) {
284
- if (kind === "m") throw new TypeError("Private method is not writable");
285
- if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
286
- if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
287
- return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
288
- }
289
-
290
- function __classPrivateFieldIn(state, receiver) {
291
- if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function")) throw new TypeError("Cannot use 'in' operator on non-object");
292
- return typeof state === "function" ? receiver === state : state.has(receiver);
293
- }
294
-
295
- export { __assign, __asyncDelegator, __asyncGenerator, __asyncValues, __await, __awaiter, __classPrivateFieldGet, __classPrivateFieldIn, __classPrivateFieldSet, __createBinding, __decorate, __esDecorate, __exportStar, __extends, __generator, __importDefault, __importStar, __makeTemplateObject, __metadata, __param, __propKey, __read, __rest, __runInitializers, __setFunctionName, __spread, __spreadArray, __spreadArrays, __values };
296
- //# sourceMappingURL=tslib.es6.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tslib.es6.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}