fix: remove as Type

JackLian · liujuping · commit 5d042dd53371 · 2022-12-13T17:22:01.000+08:00
diff --git a/packages/editor-core/src/utils/assets-transform.ts b/packages/editor-core/src/utils/assets-transform.ts
@@ -1,25 +1,27 @@
-import { AssetsJson, ComponentDescription } from '@alilc/lowcode-types';
-
+/* eslint-disable no-param-reassign */
+import { AssetsJson, ComponentDescription, Package, RemoteComponentDescription } from '@alilc/lowcode-types';
 
+// TODO: &#35813;&#36716;&#25442;&#36923;&#36753;&#26410;&#26469;&#38656;&#35201;&#28040;&#21270;&#25481;
 export function assetsTransform(assets: AssetsJson) {
   const { components, packages } = assets;
-  const packageMaps = (packages || []).reduce((acc, cur) => {
-    const key = (cur.id || cur.package) as string;
+  const packageMaps = (packages || []).reduce((acc: Record<string, Package>, cur: Package) => {
+    const key = cur.id || cur.package || '';
     acc[key] = cur;
     return acc;
   }, {} as any);
-  components.forEach((componentDesc) => {
-    let { devMode, schema, reference } = componentDesc as ComponentDescription;
+  components.forEach((componentDesc: ComponentDescription | RemoteComponentDescription) => {
+    let { devMode, schema, reference } = componentDesc;
     if ((devMode as string) === 'lowcode') {
       devMode = 'lowCode';
     } else if (devMode === 'proCode') {
       devMode = 'proCode';
     }
     if (devMode) {
-      (componentDesc as ComponentDescription).devMode = devMode;
+      componentDesc.devMode = devMode;
     }
     if (devMode === 'lowCode' && !schema && reference) {
-      (componentDesc as ComponentDescription).schema = packageMaps[reference.id as string].schema;
+      const referenceId = reference.id || '';
+      componentDesc.schema = packageMaps[referenceId].schema;
     }
   });
   return assets;
diff --git a/packages/types/src/assets.ts b/packages/types/src/assets.ts
@@ -2,6 +2,7 @@ import { Snippet, ComponentMetadata } from './metadata';
 import { I18nData } from './i18n';
 import { Reference } from './npm';
 import { EitherOr } from './utils';
+import { ComponentSchema } from './schema';
 
 export interface AssetItem {
   type: AssetType;
@@ -148,6 +149,10 @@ export type Package = EitherOr<{
    * &#32452;&#20214;&#25551;&#36848;&#23548;&#20986;&#21517;&#23383;&#65292;&#21487;&#20197;&#36890;&#36807; window[exportName] &#33719;&#21462;&#21040;&#32452;&#20214;&#25551;&#36848;&#30340; Object &#20869;&#23481;&#65307;
    */
   exportName?: string;
+  /**
+   * &#20302;&#20195;&#30721;&#32452;&#20214; schema &#20869;&#23481;
+   */
+  schema?: ComponentSchema;
 }, 'package', 'id'>;
 
 /**
@@ -223,7 +228,7 @@ export interface ComponentDescription extends ComponentMetadata {
 /**
  * &#36828;&#31243;&#29289;&#26009;&#25551;&#36848;
  */
-export interface RemoteComponentDescription {
+export interface RemoteComponentDescription extends ComponentMetadata {
   /**
    * &#32452;&#20214;&#25551;&#36848;&#23548;&#20986;&#21517;&#23383;&#65292;&#21487;&#20197;&#36890;&#36807; window[exportName] &#33719;&#21462;&#21040;&#32452;&#20214;&#25551;&#36848;&#30340; Object &#20869;&#23481;&#65307;
    */
@@ -233,9 +238,14 @@ export interface RemoteComponentDescription {
    */
   url?: string;
   /**
-   * &#32452;&#20214;(&#24211;)&#30340; npm &#20449;&#24687;&#65307;
+   * &#32452;&#20214; (&#24211;) &#30340; npm &#20449;&#24687;&#65307;
    */
   package?: {
     npm?: string;
   };
+
+  /**
+   * &#26367;&#20195; npm &#23383;&#27573;&#30340;&#21319;&#32423;&#29256;&#26412;
+   */
+  reference?: Reference;
 }
