@oinone/kunlun-environment 6.4.1 → 7.1.0

package/dist/oinone-kunlun-environment.esm.js

@@ -1 +1 @@
-import{Manager as e,ObjectUtils as t}from"@oinone/kunlun-shared";import{SPIOperator as n}from"@oinone/kunlun-spi";const r="oio-click-activated",o="__null__";function i(e,t){return new Proxy({handle:e,el:t},{get(e,t,n){var r,o,i,c,l,a;switch(t){case"w":return(null===(r=e.el)||void 0===r?void 0:r.getBoundingClientRect().width)||0;case"h":return(null===(o=e.el)||void 0===o?void 0:o.getBoundingClientRect().height)||0;case"x":return(null===(i=e.el)||void 0===i?void 0:i.getBoundingClientRect().x)||0;case"y":return(null===(c=e.el)||void 0===c?void 0:c.getBoundingClientRect().y)||0;case"ex":{const t=null===(l=e.el)||void 0===l?void 0:l.getBoundingClientRect();return t?t.x+t.width:0}case"ey":{const t=null===(a=e.el)||void 0===a?void 0:a.getBoundingClientRect();return t?t.y+t.height:0}case"el":{const r=Reflect.get(e,t,n);return"function"==typeof r?r():r}}return Reflect.get(e,t,n)}})}const c={getContentHTMLElement:function(){const{contentSelector:e}=this,t=document.querySelector(e);if(t)return t}};class l{static getGlobalEnvironment(){return l.manager.get(l.ROOT_HANDLE)}static getCurrentEnvironment(){const e=l.currentHandle,t=l.manager.get(e);if(!t)throw new Error(`Invalid current environment. handle: ${e}`);return t}static get(e){return l.manager.get(e)}static createOrReplace(e,t){return l.manager.createOrReplace(e,t)}static delete(e,t=!0){l.manager.delete(e,t)}static select(e){if(!l.manager.get(e))throw new Error(`Invalid environment. ${e}`);this.currentHandle=e}}function a(){return l.getGlobalEnvironment()}function u(){return l.getCurrentEnvironment()}l.manager=new class extends e{constructor(){super()}generator(e){const n={contentSelector:o,mcx:0,mcy:0,st:0,sl:0,visibleArea:new Map,clickVisibleArea:[]},r=["contentVisibleArea","visibleArea"];for(const[e,t]of Object.entries(c))r.push(e),n[e]=t.bind(n);return n.contentVisibleArea=i(e,()=>n.getContentHTMLElement()),t.readonly(n,r)}},l.ROOT_HANDLE="__ROOT_HANDLE__",l.currentHandle=l.ROOT_HANDLE,l.manager.createOrReplace(l.ROOT_HANDLE);const s=Symbol("__current_instance_getter");function g(e,t){return n.register(s,e,t)}function d(e){return n.selector(s,e)}function m(){return d({framework:"vue"})()}n.createStorage({key:s,matchKeys:["framework","isMobile"]});export{r as CLICK_ACTIVATED_CLASS,o as CONTENT_NULL_SELECTOR,l as RuntimeEnvironmentManager,i as createVisibleArea,g as registerCurrentInstanceGetter,d as selectorCurrentInstanceGetter,m as useCurrentInstance,u as useEnv,a as useGlobalEnv};
+import{Manager as n,ObjectUtils as e}from"@oinone/kunlun-shared";import{SPIOperator as t}from"@oinone/kunlun-spi";const r="oio-click-activated",i="__null__";function a(n,e){return new Proxy({handle:n,el:e},{get(n,t,r){let i;switch(i="function"==typeof e?e():e,t){case"w":return(null==i?void 0:i.getBoundingClientRect().width)||0;case"h":return(null==i?void 0:i.getBoundingClientRect().height)||0;case"x":return(null==i?void 0:i.getBoundingClientRect().x)||0;case"y":return(null==i?void 0:i.getBoundingClientRect().y)||0;case"ex":{const n=null==i?void 0:i.getBoundingClientRect();return n?n.x+n.width:0}case"ey":{const n=null==i?void 0:i.getBoundingClientRect();return n?n.y+n.height:0}case"el":return i}return Reflect.get(n,t,r)}})}const o={getContentHTMLElement:function(){const{contentSelector:n}=this,e=document.querySelector(n);if(e)return e}};class RuntimeEnvironmentManager{static getGlobalEnvironment(){return RuntimeEnvironmentManager.manager.get(RuntimeEnvironmentManager.ROOT_HANDLE)}static getCurrentEnvironment(){const n=RuntimeEnvironmentManager.currentHandle,e=RuntimeEnvironmentManager.manager.get(n);if(!e)throw new Error(`Invalid current environment. handle: ${n}`);return e}static get(n){return RuntimeEnvironmentManager.manager.get(n)}static createOrReplace(n,e){return RuntimeEnvironmentManager.manager.createOrReplace(n,e)}static delete(n,e=!0){RuntimeEnvironmentManager.manager.delete(n,e)}static select(n){if(!RuntimeEnvironmentManager.manager.get(n))throw new Error(`Invalid environment. ${n}`);this.currentHandle=n}}function u(){return RuntimeEnvironmentManager.getGlobalEnvironment()}function c(){return RuntimeEnvironmentManager.getCurrentEnvironment()}RuntimeEnvironmentManager.manager=new class InternalRuntimeEnvironmentManager extends n{constructor(){super()}generator(n){const t={contentSelector:i,mcx:0,mcy:0,st:0,sl:0,visibleArea:new Map,clickVisibleArea:[]},r=["contentVisibleArea","visibleArea"];for(const[n,e]of Object.entries(o))r.push(n),t[n]=e.bind(t);return t.contentVisibleArea=a(n,()=>t.getContentHTMLElement()),e.readonly(t,r)}},RuntimeEnvironmentManager.ROOT_HANDLE="__ROOT_HANDLE__",RuntimeEnvironmentManager.currentHandle=RuntimeEnvironmentManager.ROOT_HANDLE,RuntimeEnvironmentManager.manager.createOrReplace(RuntimeEnvironmentManager.ROOT_HANDLE);const m=Symbol("__current_instance_getter");function l(n,e){return t.register(m,n,e)}function g(n){return t.selector(m,n)}function s(){return g({framework:"vue"})()}t.createStorage({key:m,matchKeys:["framework","isMobile"]});export{r as CLICK_ACTIVATED_CLASS,i as CONTENT_NULL_SELECTOR,RuntimeEnvironmentManager,a as createVisibleArea,l as registerCurrentInstanceGetter,g as selectorCurrentInstanceGetter,s as useCurrentInstance,c as useEnv,u as useGlobalEnv};

package/dist/types/index.d.ts

@@ -1 +1 @@
-export * from './src';
+export * from './src';

package/dist/types/src/env/constant.d.ts

@@ -1,2 +1,2 @@
-export declare const CLICK_ACTIVATED_CLASS = "oio-click-activated";
-export declare const CONTENT_NULL_SELECTOR = "__null__";
+export declare const CLICK_ACTIVATED_CLASS = "oio-click-activated";
+export declare const CONTENT_NULL_SELECTOR = "__null__";

package/dist/types/src/env/index.d.ts

@@ -1,4 +1,4 @@
-export * from './constant';
-export * from './typing';
-export * from './manager';
-export * from './utils';
+export * from './constant';
+export * from './typing';
+export * from './manager';
+export * from './utils';

package/dist/types/src/env/manager.d.ts

@@ -1,14 +1,14 @@
-import { RuntimeEnvironment } from './typing';
-export declare class RuntimeEnvironmentManager {
-    private static manager;
-    private static ROOT_HANDLE;
-    private static currentHandle;
-    static getGlobalEnvironment(): RuntimeEnvironment;
-    static getCurrentEnvironment(): RuntimeEnvironment;
-    static get(handle: string): RuntimeEnvironment | undefined;
-    static createOrReplace(handle: string, parent?: RuntimeEnvironment): RuntimeEnvironment;
-    static delete(handle: string, deep?: boolean): void;
-    static select(handle: string): void;
-}
-export declare function useGlobalEnv(): RuntimeEnvironment;
-export declare function useEnv(): RuntimeEnvironment;
+import type { RuntimeEnvironment } from './typing';
+export declare class RuntimeEnvironmentManager {
+    private static manager;
+    private static ROOT_HANDLE;
+    private static currentHandle;
+    static getGlobalEnvironment(): RuntimeEnvironment;
+    static getCurrentEnvironment(): RuntimeEnvironment;
+    static get(handle: string): RuntimeEnvironment | undefined;
+    static createOrReplace(handle: string, parent?: RuntimeEnvironment): RuntimeEnvironment;
+    static delete(handle: string, deep?: boolean): void;
+    static select(handle: string): void;
+}
+export declare function useGlobalEnv(): RuntimeEnvironment;
+export declare function useEnv(): RuntimeEnvironment;

package/dist/types/src/env/method/getContentHTMLElement.d.ts

@@ -1,2 +1,2 @@
-import { RuntimeEnvironment } from '../typing';
-export declare function getContentHTMLElement(this: RuntimeEnvironment): HTMLElement | undefined;
+import type { RuntimeEnvironment } from '../typing';
+export declare function getContentHTMLElement(this: RuntimeEnvironment): HTMLElement | undefined;

package/dist/types/src/env/method/index.d.ts

@@ -1 +1 @@
-export * from './getContentHTMLElement';
+export * from './getContentHTMLElement';

package/dist/types/src/env/typing.d.ts

@@ -1,22 +1,22 @@
-import { ContextNode } from '@oinone/kunlun-shared';
-export interface RuntimeEnvironment extends ContextNode<RuntimeEnvironment> {
-    contentSelector: string;
-    mcx: number;
-    mcy: number;
-    st: number;
-    sl: number;
-    contentVisibleArea: VisibleArea;
-    visibleArea: Map<string, VisibleArea>;
-    clickVisibleArea: VisibleArea[];
-    getContentHTMLElement(): HTMLElement | undefined;
-}
-export interface VisibleArea {
-    handle: string;
-    el?: HTMLElement;
-    h: number;
-    w: number;
-    x: number;
-    y: number;
-    ex: number;
-    ey: number;
-}
+import type { ContextNode } from '@oinone/kunlun-shared';
+export interface RuntimeEnvironment extends ContextNode<RuntimeEnvironment> {
+    contentSelector: string;
+    mcx: number;
+    mcy: number;
+    st: number;
+    sl: number;
+    contentVisibleArea: VisibleArea;
+    visibleArea: Map<string, VisibleArea>;
+    clickVisibleArea: VisibleArea[];
+    getContentHTMLElement(): HTMLElement | undefined;
+}
+export interface VisibleArea {
+    handle: string;
+    el?: HTMLElement;
+    h: number;
+    w: number;
+    x: number;
+    y: number;
+    ex: number;
+    ey: number;
+}

package/dist/types/src/env/utils.d.ts

@@ -1,2 +1,2 @@
-import { VisibleArea } from './typing';
-export declare function createVisibleArea(handle: string, el?: HTMLElement | (() => HTMLElement | undefined)): VisibleArea;
+import type { VisibleArea } from './typing';
+export declare function createVisibleArea(handle: string, el?: HTMLElement | (() => HTMLElement | undefined)): VisibleArea;

package/dist/types/src/framework/index.d.ts

@@ -1 +1 @@
-export * from './typing';
+export * from './typing';

package/dist/types/src/framework/typing.d.ts

@@ -1,5 +1,5 @@
-import { SPIOptions } from '@oinone/kunlun-spi';
-export interface FrameworkInitializeOptions extends SPIOptions {
-    framework: string;
-    isMobile?: boolean;
-}
+import type { SPIOptions } from '@oinone/kunlun-spi';
+export interface FrameworkInitializeOptions extends SPIOptions {
+    framework: string;
+    isMobile?: boolean;
+}

package/dist/types/src/index.d.ts

@@ -1,4 +1,4 @@
-export * from './env';
-export * from './framework';
-export * from './instance';
-export * from './spi';
+export * from './env';
+export * from './framework';
+export * from './instance';
+export * from './spi';

package/dist/types/src/instance/index.d.ts

@@ -1,3 +1,3 @@
-import { FrameworkInstance } from './typing';
-export declare function useCurrentInstance(): FrameworkInstance;
-export * from './typing';
+import type { FrameworkInstance } from './typing';
+export declare function useCurrentInstance(): FrameworkInstance;
+export * from './typing';

package/dist/types/src/instance/typing.d.ts

@@ -1,14 +1,14 @@
-export interface FrameworkInstance {
-    app: FrameworkApplication;
-    currentInstance?: FrameworkComponentInstance | null;
-}
-export interface FrameworkApplication {
-    id: string;
-}
-export interface FrameworkComponentInstance {
-    vNode: FrameworkVNode;
-}
-export interface FrameworkVNode {
-    el: HTMLElement;
-}
-export declare type FrameworkInstanceGetter = () => FrameworkInstance;
+export interface FrameworkInstance {
+    app: FrameworkApplication;
+    currentInstance?: FrameworkComponentInstance | null;
+}
+export interface FrameworkApplication {
+    id: string;
+}
+export interface FrameworkComponentInstance {
+    vNode: FrameworkVNode;
+}
+export interface FrameworkVNode {
+    el: HTMLElement;
+}
+export type FrameworkInstanceGetter = () => FrameworkInstance;

package/dist/types/src/spi/framework.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/dist/types/src/spi/index.d.ts

@@ -1 +1 @@
-export * from './instance';
+export * from './instance';

package/dist/types/src/spi/instance.d.ts

@@ -1,4 +1,4 @@
-import { FrameworkInitializeOptions } from '../framework';
-import { FrameworkInstanceGetter } from '../instance/typing';
-export declare function registerCurrentInstanceGetter(options: FrameworkInitializeOptions, getter: FrameworkInstanceGetter): boolean;
-export declare function selectorCurrentInstanceGetter(options: FrameworkInitializeOptions): FrameworkInstanceGetter | undefined;
+import type { FrameworkInitializeOptions } from '../framework';
+import type { FrameworkInstanceGetter } from '../instance/typing';
+export declare function registerCurrentInstanceGetter(options: FrameworkInitializeOptions, getter: FrameworkInstanceGetter): boolean;
+export declare function selectorCurrentInstanceGetter(options: FrameworkInitializeOptions): FrameworkInstanceGetter | undefined;

package/package.json

@@ -1,18 +1,29 @@
 {
   "name": "@oinone/kunlun-environment",
-  "version": "6.4.1",
-  "main": "index.ts",
+  "version": "7.1.0",
+  "type": "module",
+  "main": "dist/oinone-kunlun-environment.esm.js",
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "rollup -c",
     "dist": "npm run prepublishOnly",
     "index": "npm run postpublish",
-    "x-prepublishOnly": "node ../../scripts/prepublish-only.js",
-    "x-postpublish": "node ../../scripts/postpublish.js"
+    "format": "prettier --write --experimental-cli src/",
+    "test": "jest",
+    "prepublishOnly": "node ../../../../scripts/prepublish-only.cjs",
+    "deploy": "npm publish --exact",
+    "postpublish": "node ../../../../scripts/postpublish.cjs"
   },
   "devDependencies": {
-    "@oinone/kunlun-shared": "6.4.1",
-    "@oinone/kunlun-spi": "6.4.1"
+    "@oinone/kunlun-shared": "7.1.0",
+    "@oinone/kunlun-spi": "7.1.0"
   },
-  "gitHead": "2b4c0c7911626c105ca71c2d41e54af470e2e079"
-}
+  "gitHead": "2b4c0c7911626c105ca71c2d41e54af470e2e079",
+  "module": "dist/oinone-kunlun-environment.esm.js",
+  "typings": "dist/types/index.d.ts",
+  "files": [
+    "dist",
+    "index.ts",
+    "src"
+  ]
+}

package/src/env/manager.ts

@@ -1,7 +1,7 @@
 import { Manager, ObjectUtils } from '@oinone/kunlun-shared';
 import { CONTENT_NULL_SELECTOR } from './constant';
 import { getContentHTMLElement } from './method';
-import { RuntimeEnvironment, VisibleArea } from './typing';
+import type { RuntimeEnvironment, VisibleArea } from './typing';
 import { createVisibleArea } from './utils';
 
 const runtimeEnvironmentMethods: Record<string, Function> = {

package/src/env/method/getContentHTMLElement.ts

@@ -1,4 +1,4 @@
-import { RuntimeEnvironment } from '../typing';
+import type { RuntimeEnvironment } from '../typing';
 
 export function getContentHTMLElement(this: RuntimeEnvironment): HTMLElement | undefined {
   const { contentSelector } = this;

package/src/env/typing.ts

@@ -1,4 +1,4 @@
-import { ContextNode } from '@oinone/kunlun-shared';
+import type { ContextNode } from '@oinone/kunlun-shared';
 
 export interface RuntimeEnvironment extends ContextNode<RuntimeEnvironment> {
   contentSelector: string;

package/src/env/utils.ts

@@ -1,38 +1,40 @@
-import { VisibleArea } from './typing';
+import type { VisibleArea } from './typing';
 
 export function createVisibleArea(handle: string, el?: HTMLElement | (() => HTMLElement | undefined)): VisibleArea {
   const origin = { handle, el } as VisibleArea;
   return new Proxy(origin, {
     get(target, key, receiver) {
+      let tel: HTMLElement | undefined;
+      if (typeof el === 'function') {
+        tel = el();
+      } else {
+        tel = el;
+      }
       switch (key) {
         case 'w':
-          return target.el?.getBoundingClientRect().width || 0;
+          return tel?.getBoundingClientRect().width || 0;
         case 'h':
-          return target.el?.getBoundingClientRect().height || 0;
+          return tel?.getBoundingClientRect().height || 0;
         case 'x':
-          return target.el?.getBoundingClientRect().x || 0;
+          return tel?.getBoundingClientRect().x || 0;
         case 'y':
-          return target.el?.getBoundingClientRect().y || 0;
+          return tel?.getBoundingClientRect().y || 0;
         case 'ex': {
-          const rect = target.el?.getBoundingClientRect();
+          const rect = tel?.getBoundingClientRect();
           if (!rect) {
             return 0;
           }
           return rect.x + rect.width;
         }
         case 'ey': {
-          const rect = target.el?.getBoundingClientRect();
+          const rect = tel?.getBoundingClientRect();
           if (!rect) {
             return 0;
           }
           return rect.y + rect.height;
         }
         case 'el': {
-          const el = Reflect.get(target, key, receiver);
-          if (typeof el === 'function') {
-            return el();
-          }
-          return el;
+          return tel;
         }
       }
       return Reflect.get(target, key, receiver);

package/src/framework/typing.ts

@@ -1,4 +1,4 @@
-import { SPIOptions } from '@oinone/kunlun-spi';
+import type { SPIOptions } from '@oinone/kunlun-spi';
 
 export interface FrameworkInitializeOptions extends SPIOptions {
   framework: string;

package/src/instance/index.ts

@@ -1,5 +1,5 @@
 import { selectorCurrentInstanceGetter } from '../spi';
-import { FrameworkInstance } from './typing';
+import type { FrameworkInstance } from './typing';
 
 export function useCurrentInstance(): FrameworkInstance {
   return selectorCurrentInstanceGetter({ framework: 'vue' })!();

package/src/spi/instance.ts

@@ -1,6 +1,6 @@
 import { SPIOperator } from '@oinone/kunlun-spi';
-import { FrameworkInitializeOptions } from '../framework';
-import { FrameworkInstanceGetter } from '../instance/typing';
+import type { FrameworkInitializeOptions } from '../framework';
+import type { FrameworkInstanceGetter } from '../instance/typing';
 
 const CURRENT_INSTANCE_GETTER_KEY = Symbol('__current_instance_getter');
 

package/rollup.config.js

@@ -1,4 +0,0 @@
-import pkg from './package.json';
-import rollupConfig from '../../scripts/build.config.js';
-
-export default rollupConfig(pkg.name, ['@oinone/kunlun-shared', '@oinone/kunlun-spi']);