Merge pull request #738 from antvis/fix_vite_meta

Fix vite meta

packages/component/package.json

@@ -30,6 +30,7 @@
     "@babel/runtime": "^7.7.7",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
+    "reflect-metadata": "^0.1.13",
     "load-styles": "^2.0.0"
   },
   "gitHead": "7eb8382ede52d803fae13a85fe6af074400260ee",

packages/core/package.json

@@ -35,7 +35,6 @@
     "inversify": "^5.0.1",
     "inversify-inject-decorators": "^3.1.0",
     "lodash": "^4.17.15",
-    "merge-json-schemas": "^1.0.0",
     "probe.gl": "^3.1.1",
     "reflect-metadata": "^0.1.13",
     "viewport-mercator-project": "^6.2.1"

packages/core/src/services/asset/FontService.ts

@@ -2,6 +2,7 @@ import { LRUCache } from '@antv/l7-utils';
 // @ts-ignore
 import TinySDF from '@mapbox/tiny-sdf';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { buildMapping } from '../../utils/font_util';
 import {
   IFontAtlas,

packages/core/src/services/asset/IconService.ts

@@ -2,6 +2,7 @@
 import TinySDF from '@mapbox/tiny-sdf';
 import { EventEmitter } from 'eventemitter3';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { buildIconMaping } from '../../utils/font_util';
 import { ITexture2D } from '../renderer/ITexture2D';

packages/core/src/services/camera/CameraService.ts

@@ -1,5 +1,6 @@
 import { mat4 } from 'gl-matrix';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { ICameraService, IViewport } from './ICameraService';
 
 @injectable()

packages/core/src/services/component/ControlService.ts

@@ -1,5 +1,6 @@
 import { DOM } from '@antv/l7-utils';
 import { Container, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { IMapService } from '../map/IMapService';
 import {

packages/core/src/services/component/MarkerService.ts

@@ -1,4 +1,5 @@
 import { Container, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { IMapService } from '../map/IMapService';
 import {

packages/core/src/services/component/PopupService.ts

@@ -1,4 +1,5 @@
 import { Container, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { IMapService } from '../map/IMapService';
 import { IPopup, IPopupService } from './IPopupService';

packages/core/src/services/config/ConfigService.ts

@@ -1,6 +1,7 @@
 // import Ajv from 'ajv';
 import { injectable, postConstruct } from 'inversify';
 import { merge } from 'lodash';
+import 'reflect-metadata';
 import { ILayerConfig } from '../layer/ILayerService';
 import { IRenderConfig } from '../renderer/IRendererService';
 import { IGlobalConfigService, ISceneConfig } from './IConfigService';

packages/core/src/services/coordinate/CoordinateSystemService.ts

@@ -1,5 +1,6 @@
 import { mat4, vec4 } from 'gl-matrix';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { getDistanceScales } from '../../utils/project';
 import { ICameraService } from '../camera/ICameraService';

packages/core/src/services/interaction/InteractionService.ts

@@ -1,6 +1,7 @@
 import EventEmitter from 'eventemitter3';
 import Hammer from 'hammerjs';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 // @ts-ignore
 import { TYPES } from '../../types';
 import { ILogService } from '../log/ILogService';

packages/core/src/services/interaction/PickingService.ts

@@ -1,5 +1,6 @@
 import { decodePickingColor, DOM, encodePickingColor } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { IGlobalConfigService, ISceneConfig } from '../config/IConfigService';
 import {

packages/core/src/services/layer/ILayerService.ts

@@ -197,10 +197,7 @@ export interface ILayer {
   off(type: string, handler: (...args: any[]) => void): void;
   emit(type: string, handler: unknown): void;
   once(type: string, handler: (...args: any[]) => void): void;
-  /**
-   * JSON Schema 用于校验配置项
-   */
-  getConfigSchemaForValidation(): object;
+
   isDirty(): boolean;
   /**
    * 直接调用拾取方法，在非鼠标交互场景中使用

packages/core/src/services/layer/LayerService.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { ILayer } from '../..';
 import { TYPES } from '../../types';
 import Clock from '../../utils/clock';

packages/core/src/services/layer/StyleAttributeService.ts

@@ -1,4 +1,5 @@
 import { inject, injectable, optional } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { gl } from '../renderer/gl';
 import { IAttribute } from '../renderer/IAttribute';

packages/core/src/services/renderer/passes/BaseNormalPass.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../../types';
 import { ICameraService } from '../../camera/ICameraService';
 import { IInteractionService } from '../../interaction/IInteractionService';

packages/core/src/services/renderer/passes/BasePostProcessingPass.ts

@@ -1,5 +1,6 @@
 import { inject, injectable } from 'inversify';
 import { camelCase, isNil, upperFirst } from 'lodash';
+import 'reflect-metadata';
 import { IShaderModuleService } from '../../shader/IShaderModuleService';
 import { gl } from '../gl';
 import { IModel } from '../IModel';

packages/core/src/services/renderer/passes/ClearPass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import { ILayer } from '../../layer/ILayerService';
 import BaseNormalPass from './BaseNormalPass';
 

packages/core/src/services/renderer/passes/MultiPassRenderer.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../../types';
 import { ILayer } from '../../layer/ILayerService';
 import {

packages/core/src/services/renderer/passes/PixelPickingPass.ts

@@ -1,5 +1,6 @@
 import { decodePickingColor, DOM, encodePickingColor } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../../types';
 import {
   IInteractionTarget,

packages/core/src/services/renderer/passes/PostProcessor.ts

@@ -1,4 +1,5 @@
 import { inject, injectable, postConstruct } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../../types';
 import { ILayer } from '../../layer/ILayerService';
 import { gl } from '../gl';

packages/core/src/services/renderer/passes/RenderPass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import { ILayer } from '../../layer/ILayerService';
 import { PassType } from '../IMultiPassRenderer';
 import BaseNormalPass from './BaseNormalPass';

packages/core/src/services/renderer/passes/TAAPass.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import blendFS from '../../../shaders/post-processing/blend.glsl';
 import copyFS from '../../../shaders/post-processing/copy.glsl';
 import quadVS from '../../../shaders/post-processing/quad.glsl';

packages/core/src/services/renderer/passes/post-processing/BlurHPass.ts

@@ -1,5 +1,6 @@
 import { injectable } from 'inversify';
 import { isNil } from 'lodash';
+import 'reflect-metadata';
 import blur from '../../../../shaders/post-processing/blur.glsl';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import { IUniform } from '../../IUniform';

packages/core/src/services/renderer/passes/post-processing/ColorHalfTonePass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import colorHalftone from '../../../../shaders/post-processing/colorhalftone.glsl';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import BasePostProcessingPass from '../BasePostProcessingPass';

packages/core/src/services/renderer/passes/post-processing/CopyPass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import copy from '../../../../shaders/post-processing/copy.glsl';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import BasePostProcessingPass from '../BasePostProcessingPass';

packages/core/src/services/renderer/passes/post-processing/HexagonalPixelatePass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import hexagonalPixelate from '../../../../shaders/post-processing/hexagonalpixelate.glsl';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import BasePostProcessingPass from '../BasePostProcessingPass';

packages/core/src/services/renderer/passes/post-processing/InkPass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import ink from '../../../../shaders/post-processing/ink.glsl';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import BasePostProcessingPass from '../BasePostProcessingPass';

packages/core/src/services/renderer/passes/post-processing/NoisePass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import noise from '../../../../shaders/post-processing/noise.glsl';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import BasePostProcessingPass from '../BasePostProcessingPass';

packages/core/src/services/renderer/passes/post-processing/SepiaPass.ts

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import quad from '../../../../shaders/post-processing/quad.glsl';
 import sepia from '../../../../shaders/post-processing/sepia.glsl';
 import BasePostProcessingPass from '../BasePostProcessingPass';

packages/core/src/services/scene/SceneService.ts

@@ -4,6 +4,7 @@ import { DOM } from '@antv/l7-utils';
 import elementResizeEvent, { unbind } from 'element-resize-event';
 import { EventEmitter } from 'eventemitter3';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { TYPES } from '../../types';
 import { createRendererContainer } from '../../utils/dom';
 import { IFontService } from '../asset/IFontService';

packages/core/src/services/shader/ShaderModuleService.ts

@@ -1,5 +1,6 @@
 import { inject, injectable } from 'inversify';
 import { uniq } from 'lodash';
+import 'reflect-metadata';
 import { extractUniforms } from '../../utils/shader-module';
 import { IModuleParams, IShaderModuleService } from './IShaderModuleService';
 

packages/layers/src/core/BaseLayer.ts

@@ -48,8 +48,6 @@ import { encodePickingColor } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
 import { isFunction, isObject } from 'lodash';
-// @ts-ignore
-import mergeJsonSchemas from 'merge-json-schemas';
 import { normalizePasses } from '../plugins/MultiPassRendererPlugin';
 import { BlendTypes } from '../utils/blend';
 import { handleStyleDataMapping } from '../utils/dataMappingStyle';
@@ -807,18 +805,6 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
   public getEncodedData() {
     return this.encodedData;
   }
-
-  public getConfigSchemaForValidation() {
-    if (!this.configSchema) {
-      // 相比 allOf, merge 有一些优势
-      // @see https://github.com/goodeggs/merge-json-schemas
-      this.configSchema = mergeJsonSchemas([
-        baseLayerSchema,
-        this.getConfigSchema(),
-      ]);
-    }
-    return this.configSchema;
-  }
   public getLegendItems(name: string): any {
     const scale = this.styleAttributeService.getLayerAttributeScale(name);
     if (scale) {

packages/layers/src/heatmap/models/heatmap.ts

@@ -10,6 +10,7 @@ import {
 import { generateColorRamp, IColorRamp } from '@antv/l7-utils';
 import { mat4 } from 'gl-matrix';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import BaseModel from '../../core/BaseModel';
 import { HeatmapTriangulation } from '../../core/triangulation';
 import heatmap3DFrag from '../shaders/heatmap_3d_frag.glsl';

packages/layers/src/plugins/ConfigSchemaValidationPlugin.ts

@@ -1,43 +0,0 @@
-// import {
-//   IGlobalConfigService,
-//   ILayer,
-//   ILayerPlugin,
-//   ILogService,
-//   TYPES,
-// } from '@antv/l7-core';
-// import { inject, injectable } from 'inversify';
-
-// /**
-//  * Layer 初始化阶段以及重绘阶段首先校验传入参数，如果校验失败则中断后续插件处理。
-//  */
-// @injectable()
-// export default class ConfigSchemaValidationPlugin implements ILayerPlugin {
-//   @inject(TYPES.IGlobalConfigService)
-//   private readonly configService: IGlobalConfigService;
-
-//   @inject(TYPES.ILogService)
-//   private readonly logger: ILogService;
-
-//   public apply(layer: ILayer) {
-//     layer.hooks.init.tap('ConfigSchemaValidationPlugin', () => {
-//       this.configService.registerLayerConfigSchemaValidator(
-//         layer.name as string,
-//         layer.getConfigSchemaForValidation(),
-//       );
-
-//       const { valid, errorText } = this.configService.validateLayerConfig(
-//         layer.name as string,
-//         layer.getLayerConfig(),
-//       );
-
-//       if (!valid) {
-//         this.logger.error(errorText || '');
-//         // 中断 init 过程
-//         return false;
-//       }
-//     });
-//     layer.hooks.beforeRender.tap('ConfigSchemaValidationPlugin', () => {
-//       // TODO: 配置项发生变化，需要重新校验
-//     });
-//   }
-// }

packages/layers/src/plugins/DataMappingPlugin.ts

@@ -15,6 +15,7 @@ import {
 import { rgb2arr, unProjectFlat } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
 import { cloneDeep } from 'lodash';
+import 'reflect-metadata';
 
 @injectable()
 export default class DataMappingPlugin implements ILayerPlugin {

packages/layers/src/plugins/DataSourcePlugin.ts

@@ -8,6 +8,7 @@ import {
 import Source from '@antv/l7-source';
 import { injectable } from 'inversify';
 import { cloneDeep } from 'lodash';
+import 'reflect-metadata';
 
 @injectable()
 export default class DataSourcePlugin implements ILayerPlugin {

packages/layers/src/plugins/FeatureScalePlugin.ts

@@ -18,6 +18,7 @@ import { extent, ticks } from 'd3-array';
 import * as d3 from 'd3-scale';
 import { inject, injectable } from 'inversify';
 import { isNil, isString, uniq } from 'lodash';
+import 'reflect-metadata';
 
 const dateRegex = /^(?:(?!0000)[0-9]{4}([-/.]+)(?:(?:0?[1-9]|1[0-2])\1(?:0?[1-9]|1[0-9]|2[0-8])|(?:0?[13-9]|1[0-2])\1(?:29|30)|(?:0?[13578]|1[02])\1(?:31))|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)([-/.]?)0?2\2(?:29))(\s+([01]|([01][0-9]|2[0-3])):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9]))?$/;
 

packages/layers/src/plugins/LayerAnimateStylePlugin.ts

@@ -10,6 +10,7 @@ import {
   TYPES,
 } from '@antv/l7-core';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 
 @injectable()
 export default class LayerAnimateStylePlugin implements ILayerPlugin {

packages/layers/src/plugins/LayerModelPlugin.ts

@@ -1,5 +1,6 @@
 import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 /**
  * Layer Model 初始化，更新，销毁
  */

packages/layers/src/plugins/LayerStylePlugin.ts

@@ -2,6 +2,7 @@ import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { encodePickingColor, rgb2arr } from '@antv/l7-utils';
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置
  */

packages/layers/src/plugins/LightingPlugin.ts

@@ -9,6 +9,7 @@ import {
   TYPES,
 } from '@antv/l7-core';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 
 const lightTypeUniformMap = {
   directional: {

packages/layers/src/plugins/MultiPassRendererPlugin.ts

@@ -8,6 +8,7 @@ import {
   TYPES,
 } from '@antv/l7-core';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 
 /**
  * 'blurH' -> ['blurH', {}]

packages/layers/src/plugins/PixelPickingPlugin.ts

@@ -13,6 +13,7 @@ import {
   rgb2arr,
 } from '@antv/l7-utils';
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 
 const PickingStage = {
   NONE: 0.0,

packages/layers/src/plugins/RegisterStyleAttributePlugin.ts

@@ -9,7 +9,7 @@ import {
   TYPES,
 } from '@antv/l7-core';
 import { inject, injectable } from 'inversify';
-import { isNumber } from 'lodash';
+import 'reflect-metadata';
 
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建

packages/layers/src/plugins/ShaderUniformPlugin.ts

@@ -11,6 +11,7 @@ import {
 } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：

packages/layers/src/plugins/UpdateModelPlugin.ts

@@ -1,5 +1,6 @@
 import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 /**
  * Model 更新
  */

packages/layers/src/plugins/UpdateStyleAttributePlugin.ts

@@ -6,6 +6,7 @@ import {
   TYPES,
 } from '@antv/l7-core';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建

packages/maps/package.json

@@ -35,6 +35,7 @@
     "@types/mapbox-gl": "^1.11.2",
     "gl-matrix": "^3.1.0",
     "inversify": "^5.0.1",
+    "reflect-metadata": "^0.1.13",
     "load-styles": "^2.0.0",
     "mapbox-gl": "^1.2.1",
     "viewport-mercator-project": "^6.2.1"

packages/maps/src/amap/map.ts

@@ -23,6 +23,7 @@ import {
 import { DOM } from '@antv/l7-utils';
 import { mat4, vec2, vec3 } from 'gl-matrix';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { IAMapEvent, IAMapInstance } from '../../typings/index';
 import { toPaddingOptions } from '../utils';
 import { Version } from '../version';

packages/maps/src/amap2/map.ts

@@ -24,6 +24,7 @@ import {
 import { DOM } from '@antv/l7-utils';
 import { mat4, vec2, vec3 } from 'gl-matrix';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { IAMapEvent, IAMapInstance } from '../../typings/index';
 import { toPaddingOptions } from '../utils';
 import { Version } from '../version';

packages/maps/src/map/map.ts

@@ -22,6 +22,7 @@ import { Map } from '@antv/l7-map';
 import { DOM } from '@antv/l7-utils';
 import { mat4, vec2, vec3 } from 'gl-matrix';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 import { Version } from '../version';
 import Viewport from './Viewport';
 const EventMap: {

packages/maps/src/mapbox/map.ts

@@ -24,6 +24,7 @@ import { inject, injectable } from 'inversify';
 import mapboxgl, { IControl, Map } from 'mapbox-gl';
 // tslint:disable-next-line:no-submodule-imports
 import 'mapbox-gl/dist/mapbox-gl.css';
+import 'reflect-metadata';
 import { IMapboxInstance } from '../../typings/index';
 import { Version } from '../version';
 import Viewport from './Viewport';

packages/renderer/src/regl/index.ts

@@ -22,6 +22,7 @@ import {
   ITexture2DInitializationOptions,
 } from '@antv/l7-core';
 import { injectable } from 'inversify';
+import 'reflect-metadata';
 import regl from 'regl';
 import ReglAttribute from './ReglAttribute';
 import ReglBuffer from './ReglBuffer';

packages/source/package.json

@@ -37,6 +37,7 @@
     "d3-hexbin": "^0.2.2",
     "eventemitter3": "^4.0.0",
     "inversify": "^5.0.1",
+    "reflect-metadata": "^0.1.13",
     "lodash": "^4.17.15",
     "supercluster": "^7.0.0"
   },

packages/three/package.json

@@ -48,6 +48,7 @@
     "@babel/runtime": "^7.7.7",
     "inversify": "^5.0.1",
     "rollup": "^2.3.3",
+    "reflect-metadata": "^0.1.13",
     "rollup-plugin-less": "^1.1.2"
   },
   "devDependencies": {

packages/three/src/core/threeRenderService.ts

@@ -1,5 +1,6 @@
 import { IMapService, IMercator, IRendererService, TYPES } from '@antv/l7';
 import { inject, injectable } from 'inversify';
+import 'reflect-metadata';
 
 import {
   AnimationMixer,