fix: 优化类型声明以支持 Vite

knight.chen · knight.chen · commit 5d02fdadf04b · 2022-10-03T10:26:42.000+08:00
diff --git a/packages/hooks/src/current-node.ts b/packages/hooks/src/current-node.ts
@@ -1,7 +1,8 @@
-import { Node } from '@alilc/lowcode-designer';
-import { NodeSchema } from '@alilc/lowcode-types';
-import { inject, InjectionKey } from 'vue';
-import { DesignMode } from './renderer-context';
+import type { Node } from '@alilc/lowcode-designer';
+import type { InjectionKey } from 'vue';
+import type { NodeSchema } from '@alilc/lowcode-types';
+import type { DesignMode } from './renderer-context';
+import { inject } from 'vue';
 
 export interface EnvNode {
   mode: DesignMode;
diff --git a/packages/hooks/src/renderer-context.ts b/packages/hooks/src/renderer-context.ts
@@ -1,12 +1,7 @@
-import {
-  Component,
-  ComponentPublicInstance,
-  InjectionKey,
-  inject,
-  getCurrentInstance,
-} from 'vue';
-import { Node } from '@alilc/lowcode-designer';
-import { NodeSchema } from '@alilc/lowcode-types';
+import type { Component, ComponentPublicInstance, InjectionKey } from 'vue';
+import type { Node } from '@alilc/lowcode-designer';
+import type { NodeSchema } from '@alilc/lowcode-types';
+import { inject, getCurrentInstance } from 'vue';
 
 export type DesignMode = 'live' | 'design';
 
diff --git a/packages/utils/src/asset.ts b/packages/utils/src/asset.ts
@@ -1,16 +1,8 @@
 /**
  * copy from https://github.com/alibaba/lowcode-engine/blob/main/packages/utils/src/asset.ts
  */
-
-import {
-  Asset,
-  AssetBundle,
-  AssetItem,
-  AssetLevel,
-  AssetLevels,
-  AssetList,
-  AssetType,
-} from '@alilc/lowcode-types';
+import type { Asset, AssetBundle, AssetItem, AssetList } from '@alilc/lowcode-types';
+import { AssetLevel, AssetLevels, AssetType } from '@alilc/lowcode-types';
 import { isCSSUrl } from './check';
 import { createDefer } from './create-defer';
 import { evaluate, load } from './script';
diff --git a/packages/utils/src/build-components.ts b/packages/utils/src/build-components.ts
@@ -1,6 +1,7 @@
-import { Component, defineComponent, h } from 'vue';
-import { isESModule, isFunction, isObject } from './check';
+import type { Component } from 'vue';
 import type { ComponentSchema, NpmInfo } from '@alilc/lowcode-types';
+import { defineComponent, h } from 'vue';
+import { isESModule, isFunction, isObject } from './check';
 
 export function isVueComponent(val: unknown): val is Component {
   if (isFunction(val)) return true;
diff --git a/packages/utils/src/build-utils.ts b/packages/utils/src/build-utils.ts
@@ -1,4 +1,5 @@
-import { isJSFunction, JSFunction, NpmInfo } from '@alilc/lowcode-types';
+import type { JSFunction, NpmInfo } from '@alilc/lowcode-types';
+import { isJSFunction } from '@alilc/lowcode-types';
 import { accessLibrary } from './build-components';
 
 export interface UtilsNpmMetadata {
diff --git a/packages/vue-renderer/src/config.ts b/packages/vue-renderer/src/config.ts
@@ -1,4 +1,4 @@
-import { RendererComponent } from './core';
+import type { RendererComponent } from './core';
 import { RENDERER_COMPS } from './renderers';
 
 export type RendererModules = Record<string, RendererComponent>;
diff --git a/packages/vue-renderer/src/core/base.ts b/packages/vue-renderer/src/core/base.ts
@@ -1,7 +1,7 @@
-import { NodeSchema, RootSchema } from '@alilc/lowcode-types';
-import { Node } from '@alilc/lowcode-designer';
-import { Component, ComponentPublicInstance, PropType, VNodeProps } from 'vue';
-import { BlockScope, I18nMessages, RuntimeScope } from '../utils';
+import type { NodeSchema, RootSchema } from '@alilc/lowcode-types';
+import type { Node } from '@alilc/lowcode-designer';
+import type { Component, ComponentPublicInstance, PropType, VNodeProps } from 'vue';
+import type { BlockScope, I18nMessages, RuntimeScope } from '../utils';
 
 export const rendererProps = {
   __scope: {
diff --git a/packages/vue-renderer/src/core/hoc.ts b/packages/vue-renderer/src/core/hoc.ts
@@ -1,18 +1,13 @@
+import type { SlotNode } from '@alilc/lowcode-designer';
+import type { ComponentPublicInstance } from 'vue';
+import type { PropSchemaMap, SlotSchemaMap } from './use';
 import { isNil } from 'lodash-es';
 import { isJSSlot, TransformStage } from '@alilc/lowcode-types';
-import { SlotNode } from '@alilc/lowcode-designer';
-import {
-  ComponentPublicInstance,
-  h,
-  Fragment,
-  reactive,
-  onUnmounted,
-  defineComponent,
-} from 'vue';
+import { h, Fragment, reactive, onUnmounted, defineComponent } from 'vue';
 import { leafProps } from './base';
 import { useRendererContext } from '@knxcloud/lowcode-hooks';
 import { ensureArray } from '../utils';
-import { PropSchemaMap, SlotSchemaMap, useLeaf } from './use';
+import { useLeaf } from './use';
 
 export const Hoc = defineComponent({
   name: 'Hoc',
diff --git a/packages/vue-renderer/src/core/use.ts b/packages/vue-renderer/src/core/use.ts
@@ -1,11 +1,16 @@
-import { Prop } from '@alilc/lowcode-designer';
+import type { Prop } from '@alilc/lowcode-designer';
+import type { Component, VNode, Ref, ComputedRef, Slot, Slots, InjectionKey } from 'vue';
+import type {
+  NodeData,
+  SlotSchema,
+  NodeSchema,
+  JSFunction,
+  CompositeValue,
+} from '@alilc/lowcode-types';
+import type { LeafProps, RendererProps } from './base';
+import type { MaybeArray, BlockScope, RuntimeScope } from '../utils';
+
 import {
-  Component,
-  VNode,
-  Ref,
-  ComputedRef,
-  Slot,
-  Slots,
   h,
   createTextVNode,
   computed,
@@ -24,14 +29,8 @@ import {
   toRaw,
   toDisplayString,
   inject,
-  InjectionKey,
 } from 'vue';
 import {
-  NodeData,
-  SlotSchema,
-  NodeSchema,
-  JSFunction,
-  CompositeValue,
   isJSSlot,
   isJSFunction,
   isDOMText,
@@ -45,7 +44,6 @@ import {
   getRendererContextKey,
   useRendererContext,
 } from '@knxcloud/lowcode-hooks';
-import { LeafProps, RendererProps } from './base';
 import { Hoc } from './hoc';
 import { Live } from './live';
 import {
@@ -58,7 +56,6 @@ import {
   parseExpression,
 } from '../utils';
 import { createDataSourceManager } from '../data-source';
-import { MaybeArray, BlockScope, RuntimeScope } from '../utils';
 
 const currentNodeKey = getCurrentNodeKey();
 
diff --git a/packages/vue-renderer/src/data-source/index.ts b/packages/vue-renderer/src/data-source/index.ts
@@ -1,9 +1,14 @@
-import { InterpretDataSource, InterpretDataSourceConfig } from '@alilc/lowcode-types';
+import type {
+  InterpretDataSource,
+  InterpretDataSourceConfig,
+} from '@alilc/lowcode-types';
+import type { RequestParams } from './interface';
+import type { RuntimeScope } from '../utils';
 import { computed, reactive, ref, shallowRef } from 'vue';
 import { isBoolean, isFunction, isUndefined } from 'lodash-es';
 import { request, Response } from './request';
-import { DataSourceStatus, RequestParams } from './interface';
-import { isPlainObject, parseSchema, RuntimeScope } from '../utils';
+import { DataSourceStatus } from './interface';
+import { isPlainObject, parseSchema } from '../utils';
 
 const same = <T>(v: T) => v;
 const noop = () => void 0;
diff --git a/packages/vue-renderer/src/data-source/request.ts b/packages/vue-renderer/src/data-source/request.ts
@@ -1,5 +1,5 @@
+import type { RequestOptions, ResponseType } from './interface';
 import { isPlainObject } from '../utils';
-import { RequestOptions, ResponseType } from './interface';
 
 function serializeParams(obj: Record<string, unknown>) {
   const result: string[] = [];
diff --git a/packages/vue-renderer/src/renderer.ts b/packages/vue-renderer/src/renderer.ts
@@ -1,16 +1,10 @@
-import { NodeSchema, RootSchema } from '@alilc/lowcode-types';
+import type { NodeSchema, RootSchema } from '@alilc/lowcode-types';
+import type { PropType, Component, ComponentPublicInstance } from 'vue';
+import type { I18nMessages, BlockScope } from './utils';
 import { Node } from '@alilc/lowcode-designer';
-import {
-  PropType,
-  Component,
-  ComponentPublicInstance,
-  h,
-  computed,
-  defineComponent,
-} from 'vue';
+import { h, computed, defineComponent } from 'vue';
 import config from './config';
 import { RENDERER_COMPS } from './renderers';
-import { I18nMessages, BlockScope } from './utils';
 
 interface RendererProps {
   scope?: BlockScope;
@@ -119,4 +113,5 @@ const Renderer = defineComponent({
   },
 }) as new (...args: any[]) => { $props: RendererProps };
 
-export { RendererProps, Renderer, I18nMessages, BlockScope };
+export { Renderer };
+export type { RendererProps, I18nMessages, BlockScope };
diff --git a/packages/vue-renderer/src/renderers/index.ts b/packages/vue-renderer/src/renderers/index.ts
@@ -1,4 +1,4 @@
-import { RendererComponent } from '../core';
+import type { RendererComponent } from '../core';
 import { PageRenderer } from './page';
 
 export const RENDERER_COMPS: Record<string, RendererComponent> = {
diff --git a/packages/vue-renderer/src/utils/parse.ts b/packages/vue-renderer/src/utils/parse.ts
@@ -1,15 +1,9 @@
-import {
-  I18nData,
-  JSFunction,
-  JSExpression,
-  isI18nData,
-  isJSExpression,
-  isJSFunction,
-} from '@alilc/lowcode-types';
+import type { I18nData, JSFunction, JSExpression } from '@alilc/lowcode-types';
+import type { BlockScope, RuntimeScope } from './scope';
+import { isI18nData, isJSExpression, isJSFunction } from '@alilc/lowcode-types';
 import { isFunction, isString } from 'lodash-es';
 import { isPlainObject } from './object';
 import { ensureArray } from './array';
-import { BlockScope, RuntimeScope } from './scope';
 
 export const EXPRESSION_TYPE = {
   JSEXPRESSION: 'JSExpression',
diff --git a/packages/vue-renderer/src/utils/scope.ts b/packages/vue-renderer/src/utils/scope.ts
@@ -1,7 +1,8 @@
-import { ComponentPublicInstance, isProxy, reactive } from 'vue';
+import type { ComponentPublicInstance } from 'vue';
+import type { MaybeArray } from './array';
+import type { DataSourceItem } from '../data-source';
 import { isObject } from './object';
-import { MaybeArray } from './array';
-import { DataSourceItem } from '../data-source';
+import { isProxy, reactive } from 'vue';
 
 export interface BlockScope {
   [x: string]: unknown;
diff --git a/packages/vue-simulator-renderer/src/host.ts b/packages/vue-simulator-renderer/src/host.ts
@@ -1,3 +1,3 @@
-import { BuiltinSimulatorHost } from '@alilc/lowcode-designer';
+import type { BuiltinSimulatorHost } from '@alilc/lowcode-designer';
 
 export const host: BuiltinSimulatorHost = (window as any).LCSimulatorHost;
diff --git a/packages/vue-simulator-renderer/src/interface.ts b/packages/vue-simulator-renderer/src/interface.ts
@@ -1,8 +1,12 @@
-import { Router } from 'vue-router';
-import { Config, I18nMessages } from '@knxcloud/lowcode-vue-renderer';
-import { Component, ComponentPublicInstance, App } from 'vue';
-import { ComponentSchema, NpmInfo, RootSchema } from '@alilc/lowcode-types';
-import { BuiltinSimulatorRenderer, DocumentModel, Node } from '@alilc/lowcode-designer';
+import type { Router } from 'vue-router';
+import type { Config, I18nMessages } from '@knxcloud/lowcode-vue-renderer';
+import type { Component, ComponentPublicInstance, App } from 'vue';
+import type { ComponentSchema, NpmInfo, RootSchema } from '@alilc/lowcode-types';
+import type {
+  Node,
+  DocumentModel,
+  BuiltinSimulatorRenderer,
+} from '@alilc/lowcode-designer';
 
 export type MinxedComponent = NpmInfo | Component | ComponentSchema;
 
diff --git a/packages/vue-simulator-renderer/src/simulator-view.ts b/packages/vue-simulator-renderer/src/simulator-view.ts
@@ -1,6 +1,7 @@
-import { defineComponent, h, PropType, renderSlot } from 'vue';
+import type { PropType } from 'vue';
+import type { DocumentInstance, VueSimulatorRenderer } from './interface';
+import { defineComponent, h, renderSlot } from 'vue';
 import LowCodeRenderer from '@knxcloud/lowcode-vue-renderer';
-import { DocumentInstance, VueSimulatorRenderer } from './interface';
 import { RouterView } from 'vue-router';
 
 export const Layout = defineComponent({
diff --git a/packages/vue-simulator-renderer/src/simulator.ts b/packages/vue-simulator-renderer/src/simulator.ts
@@ -1,8 +1,14 @@
-import { DocumentModel } from '@alilc/lowcode-designer';
+import type { DocumentModel } from '@alilc/lowcode-designer';
+import type { Ref, Component } from 'vue';
+import type {
+  ComponentInstance,
+  DocumentInstance,
+  MinxedComponent,
+  SimulatorViewLayout,
+  VueSimulatorRenderer,
+} from './interface';
 import { TransformStage } from '@alilc/lowcode-types';
 import {
-  Ref,
-  Component,
   createApp,
   ref,
   shallowRef,
@@ -18,13 +24,6 @@ import {
   buildComponents,
   getSubComponent,
 } from '@knxcloud/lowcode-utils';
-import {
-  ComponentInstance,
-  DocumentInstance,
-  MinxedComponent,
-  SimulatorViewLayout,
-  VueSimulatorRenderer,
-} from './interface';
 import { Renderer, SimulatorRendererView } from './simulator-view';
 import { Slot, Leaf, Page } from './buildin-components';
 import { host } from './host';
diff --git a/packages/vue-simulator-renderer/src/utils/closest-node.ts b/packages/vue-simulator-renderer/src/utils/closest-node.ts
@@ -1,5 +1,5 @@
-import { NodeInstance } from '@alilc/lowcode-designer';
-import { ComponentInternalInstance } from 'vue';
+import type { NodeInstance } from '@alilc/lowcode-designer';
+import type { ComponentInternalInstance } from 'vue';
 import { isCommentNode } from './check-node';
 import {
   ComponentRecord,
diff --git a/packages/vue-simulator-renderer/src/utils/comp-node.ts b/packages/vue-simulator-renderer/src/utils/comp-node.ts
@@ -1,6 +1,7 @@
+import type { ComponentInternalInstance, VNode } from 'vue';
+import type { ComponentInstance } from '../interface';
 import { isNil } from '@knxcloud/lowcode-utils';
-import { ComponentInternalInstance, isProxy, VNode } from 'vue';
-import { ComponentInstance } from '../interface';
+import { isProxy } from 'vue';
 import { isObject } from './check';
 
 const SYMBOL_VDID = Symbol('_LCDocId');
diff --git a/packages/vue-simulator-renderer/src/utils/find-dom-nodes.ts b/packages/vue-simulator-renderer/src/utils/find-dom-nodes.ts
@@ -1,5 +1,6 @@
-import { ComponentInternalInstance, VNode, isVNode } from 'vue';
-import { ComponentInstance } from '../interface';
+import type { ComponentInternalInstance, VNode } from 'vue';
+import type { ComponentInstance } from '../interface';
+import { isVNode } from 'vue';
 import { isVNodeHTMLElement } from './comp-node';
 import { isDomNode, isEmptyNode } from './check-node';
 import { getClientRects } from './get-client-rects';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { RendererComponent } from './core';`
	`1`	`+import type { RendererComponent } from './core';`
`2`	`2`	`import { RENDERER_COMPS } from './renderers';`
`3`	`3`
`4`	`4`	`export type RendererModules = Record<string, RendererComponent>;`