@module-federation/runtime 0.1.4 → 0.1.6

package/dist/share.esm.js

@@ -69,6 +69,11 @@ const objectToString = Object.prototype.toString;
 function isPlainObject(val) {
     return objectToString.call(val) === '[object Object]';
 }
+function arrayOptions(options) {
+    return Array.isArray(options) ? options : [
+        options
+    ];
+}
 
 function _extends$1() {
     _extends$1 = Object.assign || function(target) {
@@ -183,7 +188,7 @@ function getGlobalFederationConstructor() {
 function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
     if (isDebug) {
         globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
-        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.4";
+        globalThis.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.1.6";
     }
 }
 // eslint-disable-next-line @typescript-eslint/ban-types
@@ -638,15 +643,19 @@ function _extends() {
     };
     return _extends.apply(this, arguments);
 }
-function formatShare(shareArgs, from) {
+function formatShare(shareArgs, from, name) {
     let get;
     if ('get' in shareArgs) {
         // eslint-disable-next-line prefer-destructuring
         get = shareArgs.get;
-    } else {
-        // @ts-ignore ignore
+    } else if ('lib' in shareArgs) {
         get = ()=>Promise.resolve(shareArgs.lib);
+    } else {
+        get = ()=>Promise.resolve(()=>{
+                throw new Error(`Can not get shared '${name}'!`);
+            });
     }
+    var _shareArgs_version;
     return _extends({
         deps: [],
         useIn: [],
@@ -661,6 +670,7 @@ function formatShare(shareArgs, from) {
         }, shareArgs.shareConfig),
         get,
         loaded: 'lib' in shareArgs ? true : undefined,
+        version: (_shareArgs_version = shareArgs.version) != null ? _shareArgs_version : '0',
         scope: Array.isArray(shareArgs.scope) ? shareArgs.scope : [
             'default'
         ],
@@ -672,7 +682,11 @@ function formatShareConfigs(shareArgs, from) {
         return {};
     }
     return Object.keys(shareArgs).reduce((res, pkgName)=>{
-        res[pkgName] = formatShare(shareArgs[pkgName], from);
+        const arrayShareArgs = arrayOptions(shareArgs[pkgName]);
+        res[pkgName] = res[pkgName] || [];
+        arrayShareArgs.forEach((shareConfig)=>{
+            res[pkgName].push(formatShare(shareConfig, from, pkgName));
+        });
         return res;
     }, {});
 }
@@ -695,12 +709,11 @@ function versionLt(a, b) {
         return false;
     }
 }
-const findVersion = (shareScopeMap, scope, pkgName, cb)=>{
-    const versions = shareScopeMap[scope][pkgName];
+const findVersion = (shareVersionMap, cb)=>{
     const callback = cb || function(prev, cur) {
         return versionLt(prev, cur);
     };
-    return Object.keys(versions).reduce((prev, cur)=>{
+    return Object.keys(shareVersionMap).reduce((prev, cur)=>{
         if (!prev) {
             return cur;
         }
@@ -722,7 +735,7 @@ function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName) {
     const callback = function(prev, cur) {
         return !isLoaded(versions[prev]) && versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap, scope, pkgName, callback);
+    return findVersion(shareScopeMap[scope][pkgName], callback);
 }
 function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
     const versions = shareScopeMap[scope][pkgName];
@@ -739,7 +752,7 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
         }
         return versionLt(prev, cur);
     };
-    return findVersion(shareScopeMap, scope, pkgName, callback);
+    return findVersion(shareScopeMap[scope][pkgName], callback);
 }
 function getFindShareFunction(strategy) {
     if (strategy === 'loaded-first') {
@@ -802,5 +815,25 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
 function getGlobalShareScope() {
     return Global.__FEDERATION__.__SHARE__;
 }
+function getTargetSharedOptions(options) {
+    const { pkgName, extraOptions, shareInfos } = options;
+    const defaultResolver = (sharedOptions)=>{
+        if (!sharedOptions) {
+            return undefined;
+        }
+        const shareVersionMap = {};
+        sharedOptions.forEach((shared)=>{
+            shareVersionMap[shared.version] = shared;
+        });
+        const callback = function(prev, cur) {
+            return !isLoaded(shareVersionMap[prev]) && versionLt(prev, cur);
+        };
+        const maxVersion = findVersion(shareVersionMap, callback);
+        return shareVersionMap[maxVersion];
+    };
+    var _extraOptions_resolver;
+    const resolver = (_extraOptions_resolver = extraOptions == null ? void 0 : extraOptions.resolver) != null ? _extraOptions_resolver : defaultResolver;
+    return Object.assign({}, resolver(shareInfos[pkgName]), extraOptions == null ? void 0 : extraOptions.customShareInfo);
+}
 
-export { setGlobalFederationConstructor as A, getGlobalFederationInstance as B, getGlobalFederationConstructor as C, DEFAULT_REMOTE_TYPE as D, setGlobalFederationInstance as E, registerGlobalPlugins as F, Global as G, nativeGlobal as H, resetFederationGlobalInfo as I, getTargetSnapshotInfoByModuleInfo as J, globalLoading as a, DEFAULT_SCOPE as b, getRemoteEntryExports as c, assert as d, getFMId as e, error as f, getGlobalHostPlugins as g, isPlainObject as h, isObject as i, isRemoteInfoWithEntry as j, isPureRemoteEntry as k, getRegisteredShare as l, getInfoWithoutType as m, getPreloaded as n, setPreloaded as o, getGlobalSnapshotInfoByModuleInfo as p, addGlobalSnapshot as q, setGlobalSnapshotInfoByModuleInfo as r, safeToString as s, getGlobalSnapshot as t, getGlobalShareScope as u, formatShareConfigs as v, warn as w, getBuilderId as x, isBrowserEnv as y, addUniqueItem as z };
+export { isBrowserEnv as A, addUniqueItem as B, setGlobalFederationConstructor as C, DEFAULT_REMOTE_TYPE as D, getGlobalFederationInstance as E, getGlobalFederationConstructor as F, Global as G, setGlobalFederationInstance as H, registerGlobalPlugins as I, nativeGlobal as J, resetFederationGlobalInfo as K, getTargetSnapshotInfoByModuleInfo as L, globalLoading as a, DEFAULT_SCOPE as b, getRemoteEntryExports as c, assert as d, getFMId as e, error as f, getGlobalHostPlugins as g, isPlainObject as h, isObject as i, isRemoteInfoWithEntry as j, isPureRemoteEntry as k, getInfoWithoutType as l, getPreloaded as m, setPreloaded as n, getRegisteredShare as o, arrayOptions as p, getGlobalSnapshotInfoByModuleInfo as q, addGlobalSnapshot as r, safeToString as s, setGlobalSnapshotInfoByModuleInfo as t, getGlobalSnapshot as u, getGlobalShareScope as v, warn as w, getTargetSharedOptions as x, formatShareConfigs as y, getBuilderId as z };

package/dist/src/core.d.ts

@@ -136,8 +136,14 @@ export declare class FederationHost {
     constructor(userOptions: UserOptions);
     private _setGlobalShareScopeMap;
     initOptions(userOptions: UserOptions): Options;
-    loadShare<T>(pkgName: string, customShareInfo?: Partial<Shared>): Promise<false | (() => T | undefined)>;
-    loadShareSync<T>(pkgName: string, customShareInfo?: Partial<Shared>): () => T | never;
+    loadShare<T>(pkgName: string, extraOptions?: {
+        customShareInfo?: Partial<Shared>;
+        resolver?: (sharedOptions: ShareInfos[string]) => Shared;
+    }): Promise<false | (() => T | undefined)>;
+    loadShareSync<T>(pkgName: string, extraOptions?: {
+        customShareInfo?: Partial<Shared>;
+        resolver?: (sharedOptions: ShareInfos[string]) => Shared;
+    }): () => T | never;
     initRawContainer(name: string, url: string, container: RemoteEntryExports): Module;
     private _getRemoteModuleAndOptions;
     loadRemote<T>(id: string, options?: {

package/dist/src/type/config.d.ts

@@ -15,6 +15,10 @@ export type RemoteInfoOptionalVersion = {
     version?: string;
 } & RemoteInfoCommon;
 export type Remote = (RemoteWithEntry | RemoteWithVersion) & RemoteInfoCommon;
+export type LoadShareExtraOptions = {
+    customShareInfo?: Partial<Shared>;
+    resolver?: (sharedOptions: ShareInfos[string]) => Shared;
+};
 export interface RemoteInfo {
     name: string;
     version?: string;
@@ -32,7 +36,7 @@ export interface SharedConfig {
     strictVersion?: boolean;
 }
 type SharedBaseArgs = {
-    version: string;
+    version?: string;
     shareConfig?: SharedConfig;
     scope?: string | Array<string>;
     deps?: Array<string>;
@@ -43,7 +47,7 @@ export type ShareArgs = (SharedBaseArgs & {
     get: SharedGetter;
 }) | (SharedBaseArgs & {
     lib: () => Module;
-});
+}) | SharedBaseArgs;
 export type Shared = {
     version: string;
     get: SharedGetter;
@@ -69,7 +73,7 @@ export type GlobalShareScopeMap = {
     [instanceName: string]: ShareScopeMap;
 };
 export type ShareInfos = {
-    [pkgName: string]: Shared;
+    [pkgName: string]: Shared[];
 };
 export interface Options {
     id?: string;
@@ -82,7 +86,7 @@ export interface Options {
 }
 export type UserOptions = Omit<Optional<Options, 'plugins'>, 'shared' | 'inBrowser'> & {
     shared?: {
-        [pkgName: string]: ShareArgs;
+        [pkgName: string]: ShareArgs | ShareArgs[];
     };
 };
 export type LoadModuleOptions = {

package/dist/src/utils/plugin.d.ts

@@ -1,4 +1,4 @@
 import { FederationHost } from '../core';
 import { UserOptions } from '../type';
 import { Module } from '../module';
-export declare function registerPlugins(plugins: UserOptions['plugins'], hookInstances: Array<FederationHost['hooks'] | FederationHost['snapshotHandler']['hooks'] | Module['host']['loaderHook']>): void;
+export declare function registerPlugins(plugins: UserOptions['plugins'], hookInstances: Array<FederationHost['hooks'] | FederationHost['snapshotHandler']['hooks'] | Module['host']['loaderHook']>): import("../type").FederationRuntimePlugin[] | undefined;

package/dist/src/utils/share.d.ts

@@ -1,11 +1,12 @@
 import { Federation } from '../global';
-import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap } from '../type';
+import { GlobalShareScopeMap, Shared, ShareArgs, ShareInfos, ShareScopeMap, LoadShareExtraOptions, UserOptions } from '../type';
 import { SyncWaterfallHook } from './hooks';
-export declare function formatShare(shareArgs: ShareArgs, from: string): Shared;
-export declare function formatShareConfigs(shareArgs: {
-    [pkgName: string]: ShareArgs;
-}, from: string): ShareInfos;
-export declare function getRegisteredShare(localShareScopeMap: ShareScopeMap, pkgName: string, shareInfo: ShareInfos[keyof ShareInfos], resolveShare: SyncWaterfallHook<{
+export declare function formatShare(shareArgs: ShareArgs, from: string, name: string): Shared;
+export declare function formatShareConfigs(shareArgs: UserOptions['shared'], from: string): ShareInfos;
+export declare function versionLt(a: string, b: string): boolean;
+export declare const findVersion: (shareVersionMap: ShareScopeMap[string][string], cb?: ((prev: string, cur: string) => boolean) | undefined) => string;
+export declare const isLoaded: (shared: Shared) => boolean;
+export declare function getRegisteredShare(localShareScopeMap: ShareScopeMap, pkgName: string, shareInfo: Shared, resolveShare: SyncWaterfallHook<{
     shareScopeMap: ShareScopeMap;
     scope: string;
     pkgName: string;
@@ -14,3 +15,8 @@ export declare function getRegisteredShare(localShareScopeMap: ShareScopeMap, pk
     resolver: () => Shared | undefined;
 }>): Shared | void;
 export declare function getGlobalShareScope(): GlobalShareScopeMap;
+export declare function getTargetSharedOptions(options: {
+    pkgName: string;
+    extraOptions?: LoadShareExtraOptions;
+    shareInfos: ShareInfos;
+}): Shared & Partial<Shared>;

package/dist/src/utils/tool.d.ts

@@ -10,3 +10,4 @@ export declare function isObject(val: any): boolean;
 export declare const objectToString: () => string;
 export declare function isPlainObject(val: any): val is object;
 export declare function isStaticResourcesEqual(url1: string, url2: string): boolean;
+export declare function arrayOptions<T>(options: T | Array<T>): Array<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/runtime",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "author": "zhouxiao <codingzx@gmail.com>",
   "main": "./dist/index.cjs",
   "module": "./dist/index.esm.js",
@@ -45,6 +45,6 @@
     }
   },
   "dependencies": {
-    "@module-federation/sdk": "0.1.4"
+    "@module-federation/sdk": "0.1.6"
   }
 }