@next-core/runtime 1.41.0 → 1.41.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -106,8 +106,8 @@ export function getDependencyMapOfContext(contextConfs) {
|
|
|
106
106
|
var keyword = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "CTX";
|
|
107
107
|
var strict = arguments.length > 2 ? arguments[2] : undefined;
|
|
108
108
|
var depsMap = new Map();
|
|
109
|
-
for (var
|
|
110
|
-
var data = [
|
|
109
|
+
for (var contextConf of contextConfs) {
|
|
110
|
+
var data = [contextConf.if, contextConf.value, contextConf.resolve];
|
|
111
111
|
var stats = collectMemberUsage(data, keyword);
|
|
112
112
|
if (!strict && keyword === "STATE") {
|
|
113
113
|
var legacyTplStats = collectMemberUsage(data, "TPL");
|
|
@@ -119,7 +119,7 @@ export function getDependencyMapOfContext(contextConfs) {
|
|
|
119
119
|
stats.hasNonStaticUsage = true;
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
|
-
depsMap.set(
|
|
122
|
+
depsMap.set(contextConf, stats);
|
|
123
123
|
}
|
|
124
124
|
return depsMap;
|
|
125
125
|
}
|
|
@@ -128,10 +128,10 @@ function detectCircularContexts(dependencyMap, keyword) {
|
|
|
128
128
|
var pendingDeps = new Set(Array.from(duplicatedMap.keys()).map(contextConf => contextConf.name));
|
|
129
129
|
var next = () => {
|
|
130
130
|
var processedAtLeastOne = false;
|
|
131
|
-
for (var [
|
|
131
|
+
for (var [contextConf, stats] of duplicatedMap.entries()) {
|
|
132
132
|
if (![...stats.usedProperties].some(dep => pendingDeps.has(dep))) {
|
|
133
|
-
duplicatedMap.delete(
|
|
134
|
-
pendingDeps.delete(
|
|
133
|
+
duplicatedMap.delete(contextConf);
|
|
134
|
+
pendingDeps.delete(contextConf.name);
|
|
135
135
|
processedAtLeastOne = true;
|
|
136
136
|
}
|
|
137
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveDataStore.js","names":["collectMemberUsage","resolveDataStore","contextConfs","resolveContext","keyword","arguments","length","undefined","strict","dependencyMap","getDependencyMapOfContext","pendingDeps","Map","contextName","Array","from","keys","map","contextConf","name","_pendingDeps$get","set","get","hasNonStaticUsage","values","some","stats","processed","WeakSet","deferredContexts","pendingContexts","Set","Promise","resolve","reject","wrapResolve","_ref","_asyncToGenerator","_pendingDeps$get2","add","resolved","delete","left","Error","concat","scheduleNext","_x","apply","scheduleAsSerial","_scheduleNext","readyContexts","entries","filter","predicateNextResolveFactory","entry","has","all","pendingResult","then","size","detectCircularContexts","deferred","catch","error","index","usedProperties","dep","depsMap","data","if","value","legacyTplStats","prop","duplicatedMap","next","processedAtLeastOne","ReferenceError","join"],"sources":["../../../../src/internal/data/resolveDataStore.ts"],"sourcesContent":["import { ContextConf } from \"@next-core/types\";\nimport { collectMemberUsage, MemberUsage } from \"@next-core/utils/storyboard\";\n\nexport interface DeferredContext {\n resolve(): void;\n reject(e: unknown): void;\n}\n\nexport function resolveDataStore(\n contextConfs: ContextConf[],\n resolveContext: (contextConf: ContextConf) => Promise<boolean>,\n keyword = \"CTX\",\n strict?: boolean\n): {\n pendingResult: Promise<void>;\n pendingContexts: Map<string, Promise<void>>;\n} {\n const dependencyMap = getDependencyMapOfContext(\n contextConfs,\n keyword,\n strict\n );\n // There maybe multiple context confs for a specific name, since there are conditional contexts.\n // This is a map of how many pending context confs for each context name.\n const pendingDeps = new Map<string, number>();\n for (const contextName of Array.from(dependencyMap.keys()).map(\n (contextConf) => contextConf.name\n )) {\n pendingDeps.set(contextName, (pendingDeps.get(contextName) ?? 0) + 1);\n }\n const hasNonStaticUsage = Array.from(dependencyMap.values()).some(\n (stats) => stats.hasNonStaticUsage\n );\n const processed = new WeakSet<ContextConf>();\n\n const deferredContexts = new Map<string, DeferredContext>();\n const pendingContexts = new Map(\n [...new Set(contextConfs.map((contextConf) => contextConf.name))].map(\n (contextName) => [\n contextName,\n new Promise<void>((resolve, reject) => {\n deferredContexts.set(contextName, { resolve, reject });\n }),\n ]\n )\n );\n\n const wrapResolve = async (contextConf: ContextConf): Promise<void> => {\n processed.add(contextConf);\n const resolved = await resolveContext(contextConf);\n dependencyMap.delete(contextConf);\n const left = pendingDeps.get(contextConf.name) ?? 0;\n if (resolved) {\n // Assert: contextConf.name exists in deferredContexts\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n deferredContexts.get(contextConf.name)!.resolve();\n pendingDeps.delete(contextConf.name);\n if (left === 0) {\n throw new Error(`Duplicated context defined: ${contextConf.name}`);\n }\n } else {\n // Assert: left >= 1\n if (left === 1) {\n // Assert: contextConf.name exists in deferredContexts\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n deferredContexts.get(contextConf.name)!.resolve();\n pendingDeps.delete(contextConf.name);\n } else {\n pendingDeps.set(contextConf.name, left - 1);\n }\n }\n await scheduleNext();\n };\n\n let scheduleAsSerial = hasNonStaticUsage;\n\n async function scheduleNext(): Promise<void> {\n const readyContexts = Array.from(dependencyMap.entries())\n .filter(predicateNextResolveFactory(pendingDeps, scheduleAsSerial))\n .map((entry) => entry[0])\n .filter((contextConf) => !processed.has(contextConf));\n await Promise.all(readyContexts.map(wrapResolve));\n }\n\n const pendingResult = scheduleNext()\n .then(async () => {\n // If there are still contexts left, it implies one of these situations:\n // - Circular contexts.\n // Such as: a depends on b, while b depends on a.\n // - Related contexts are all ignored.\n // Such as: a depends on b,\n // while both them are ignore by a falsy result of `if`.\n if (dependencyMap.size > 0) {\n // This will throw if circular contexts detected.\n detectCircularContexts(dependencyMap, keyword);\n scheduleAsSerial = true;\n await scheduleNext();\n }\n // There maybe ignored contexts which are still not fulfilled.\n // We treat them as RESOLVED.\n for (const deferred of deferredContexts.values()) {\n deferred.resolve();\n }\n })\n .catch((error) => {\n // There maybe contexts left not fulfilled, when an error occurred.\n // We treat them as REJECTED.\n for (const deferred of deferredContexts.values()) {\n deferred.reject(error);\n }\n throw error;\n });\n return { pendingResult, pendingContexts };\n}\n\nfunction predicateNextResolveFactory(\n pendingDeps: Map<string, number>,\n scheduleAsSerial: boolean\n): (entry: [ContextConf, MemberUsage], index: number) => boolean {\n return (entry, index) =>\n // When contexts contain computed CTX accesses, it implies a dynamic dependency map.\n // So make them process sequentially, keep the same behavior as before.\n scheduleAsSerial\n ? index === 0\n : // A context is ready when it has no pending dependencies.\n ![...entry[1].usedProperties].some((dep) => pendingDeps.has(dep));\n}\n\nexport function getDependencyMapOfContext(\n contextConfs: ContextConf[],\n keyword = \"CTX\",\n strict?: boolean\n): Map<ContextConf, MemberUsage> {\n const depsMap = new Map<ContextConf, MemberUsage>();\n for (const contextConf of contextConfs) {\n const data = [contextConf.if, contextConf.value, contextConf.resolve];\n const stats = collectMemberUsage(data, keyword);\n if (!strict && keyword === \"STATE\") {\n const legacyTplStats = collectMemberUsage(data, \"TPL\");\n // Merge stats with legacyTplStats\n for (const prop of legacyTplStats.usedProperties) {\n stats.usedProperties.add(prop);\n }\n if (legacyTplStats.hasNonStaticUsage) {\n stats.hasNonStaticUsage = true;\n }\n }\n depsMap.set(contextConf, stats);\n }\n return depsMap;\n}\n\nfunction detectCircularContexts(\n dependencyMap: Map<ContextConf, MemberUsage>,\n keyword: string\n): void {\n const duplicatedMap = new Map(dependencyMap);\n const pendingDeps = new Set<string>(\n Array.from(duplicatedMap.keys()).map((contextConf) => contextConf.name)\n );\n const next = (): void => {\n let processedAtLeastOne = false;\n for (const [contextConf, stats] of duplicatedMap.entries()) {\n if (![...stats.usedProperties].some((dep) => pendingDeps.has(dep))) {\n duplicatedMap.delete(contextConf);\n pendingDeps.delete(contextConf.name);\n processedAtLeastOne = true;\n }\n }\n if (processedAtLeastOne) {\n next();\n }\n };\n next();\n\n if (duplicatedMap.size > 0) {\n throw new ReferenceError(\n `Circular ${keyword} detected: ${Array.from(duplicatedMap.keys())\n .map((contextConf) => contextConf.name)\n .join(\", \")}`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"resolveDataStore.js","names":["collectMemberUsage","resolveDataStore","contextConfs","resolveContext","keyword","arguments","length","undefined","strict","dependencyMap","getDependencyMapOfContext","pendingDeps","Map","contextName","Array","from","keys","map","contextConf","name","_pendingDeps$get","set","get","hasNonStaticUsage","values","some","stats","processed","WeakSet","deferredContexts","pendingContexts","Set","Promise","resolve","reject","wrapResolve","_ref","_asyncToGenerator","_pendingDeps$get2","add","resolved","delete","left","Error","concat","scheduleNext","_x","apply","scheduleAsSerial","_scheduleNext","readyContexts","entries","filter","predicateNextResolveFactory","entry","has","all","pendingResult","then","size","detectCircularContexts","deferred","catch","error","index","usedProperties","dep","depsMap","data","if","value","legacyTplStats","prop","duplicatedMap","next","processedAtLeastOne","ReferenceError","join"],"sources":["../../../../src/internal/data/resolveDataStore.ts"],"sourcesContent":["import { ContextConf } from \"@next-core/types\";\nimport { collectMemberUsage, MemberUsage } from \"@next-core/utils/storyboard\";\n\nexport interface DeferredContext {\n resolve(): void;\n reject(e: unknown): void;\n}\n\nexport function resolveDataStore(\n contextConfs: ContextConf[],\n resolveContext: (contextConf: ContextConf) => Promise<boolean>,\n keyword = \"CTX\",\n strict?: boolean\n): {\n pendingResult: Promise<void>;\n pendingContexts: Map<string, Promise<void>>;\n} {\n const dependencyMap = getDependencyMapOfContext(\n contextConfs,\n keyword,\n strict\n );\n // There maybe multiple context confs for a specific name, since there are conditional contexts.\n // This is a map of how many pending context confs for each context name.\n const pendingDeps = new Map<string, number>();\n for (const contextName of Array.from(dependencyMap.keys()).map(\n (contextConf) => contextConf.name\n )) {\n pendingDeps.set(contextName, (pendingDeps.get(contextName) ?? 0) + 1);\n }\n const hasNonStaticUsage = Array.from(dependencyMap.values()).some(\n (stats) => stats.hasNonStaticUsage\n );\n const processed = new WeakSet<ContextConf>();\n\n const deferredContexts = new Map<string, DeferredContext>();\n const pendingContexts = new Map(\n [...new Set(contextConfs.map((contextConf) => contextConf.name))].map(\n (contextName) => [\n contextName,\n new Promise<void>((resolve, reject) => {\n deferredContexts.set(contextName, { resolve, reject });\n }),\n ]\n )\n );\n\n const wrapResolve = async (contextConf: ContextConf): Promise<void> => {\n processed.add(contextConf);\n const resolved = await resolveContext(contextConf);\n dependencyMap.delete(contextConf);\n const left = pendingDeps.get(contextConf.name) ?? 0;\n if (resolved) {\n // Assert: contextConf.name exists in deferredContexts\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n deferredContexts.get(contextConf.name)!.resolve();\n pendingDeps.delete(contextConf.name);\n if (left === 0) {\n throw new Error(`Duplicated context defined: ${contextConf.name}`);\n }\n } else {\n // Assert: left >= 1\n if (left === 1) {\n // Assert: contextConf.name exists in deferredContexts\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n deferredContexts.get(contextConf.name)!.resolve();\n pendingDeps.delete(contextConf.name);\n } else {\n pendingDeps.set(contextConf.name, left - 1);\n }\n }\n await scheduleNext();\n };\n\n let scheduleAsSerial = hasNonStaticUsage;\n\n async function scheduleNext(): Promise<void> {\n const readyContexts = Array.from(dependencyMap.entries())\n .filter(predicateNextResolveFactory(pendingDeps, scheduleAsSerial))\n .map((entry) => entry[0])\n .filter((contextConf) => !processed.has(contextConf));\n await Promise.all(readyContexts.map(wrapResolve));\n }\n\n const pendingResult = scheduleNext()\n .then(async () => {\n // If there are still contexts left, it implies one of these situations:\n // - Circular contexts.\n // Such as: a depends on b, while b depends on a.\n // - Related contexts are all ignored.\n // Such as: a depends on b,\n // while both them are ignore by a falsy result of `if`.\n if (dependencyMap.size > 0) {\n // This will throw if circular contexts detected.\n detectCircularContexts(dependencyMap, keyword);\n scheduleAsSerial = true;\n await scheduleNext();\n }\n // There maybe ignored contexts which are still not fulfilled.\n // We treat them as RESOLVED.\n for (const deferred of deferredContexts.values()) {\n deferred.resolve();\n }\n })\n .catch((error) => {\n // There maybe contexts left not fulfilled, when an error occurred.\n // We treat them as REJECTED.\n for (const deferred of deferredContexts.values()) {\n deferred.reject(error);\n }\n throw error;\n });\n return { pendingResult, pendingContexts };\n}\n\nfunction predicateNextResolveFactory(\n pendingDeps: Map<string, number>,\n scheduleAsSerial: boolean\n): (entry: [ContextConf, MemberUsage], index: number) => boolean {\n return (entry, index) =>\n // When contexts contain computed CTX accesses, it implies a dynamic dependency map.\n // So make them process sequentially, keep the same behavior as before.\n scheduleAsSerial\n ? index === 0\n : // A context is ready when it has no pending dependencies.\n ![...entry[1].usedProperties].some((dep) => pendingDeps.has(dep));\n}\n\nexport function getDependencyMapOfContext(\n contextConfs: ContextConf[],\n keyword = \"CTX\",\n strict?: boolean\n): Map<ContextConf, MemberUsage> {\n const depsMap = new Map<ContextConf, MemberUsage>();\n for (const contextConf of contextConfs) {\n const data = [contextConf.if, contextConf.value, contextConf.resolve];\n const stats = collectMemberUsage(data, keyword);\n if (!strict && keyword === \"STATE\") {\n const legacyTplStats = collectMemberUsage(data, \"TPL\");\n // Merge stats with legacyTplStats\n for (const prop of legacyTplStats.usedProperties) {\n stats.usedProperties.add(prop);\n }\n if (legacyTplStats.hasNonStaticUsage) {\n stats.hasNonStaticUsage = true;\n }\n }\n depsMap.set(contextConf, stats);\n }\n return depsMap;\n}\n\nfunction detectCircularContexts(\n dependencyMap: Map<ContextConf, MemberUsage>,\n keyword: string\n): void {\n const duplicatedMap = new Map(dependencyMap);\n const pendingDeps = new Set<string>(\n Array.from(duplicatedMap.keys()).map((contextConf) => contextConf.name)\n );\n const next = (): void => {\n let processedAtLeastOne = false;\n for (const [contextConf, stats] of duplicatedMap.entries()) {\n if (![...stats.usedProperties].some((dep) => pendingDeps.has(dep))) {\n duplicatedMap.delete(contextConf);\n pendingDeps.delete(contextConf.name);\n processedAtLeastOne = true;\n }\n }\n if (processedAtLeastOne) {\n next();\n }\n };\n next();\n\n if (duplicatedMap.size > 0) {\n throw new ReferenceError(\n `Circular ${keyword} detected: ${Array.from(duplicatedMap.keys())\n .map((contextConf) => contextConf.name)\n .join(\", \")}`\n );\n }\n}\n"],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@next-core/runtime",
|
|
3
|
-
"version": "1.41.
|
|
3
|
+
"version": "1.41.2",
|
|
4
4
|
"homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/runtime",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"repository": {
|
|
@@ -44,14 +44,14 @@
|
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@next-core/color-theme": "^0.4.8",
|
|
47
|
-
"@next-core/cook": "^2.2.
|
|
48
|
-
"@next-core/http": "^1.2.
|
|
49
|
-
"@next-core/i18n": "^1.0.
|
|
50
|
-
"@next-core/inject": "^1.0.
|
|
51
|
-
"@next-core/loader": "^1.5.
|
|
52
|
-
"@next-core/supply": "^2.1.
|
|
47
|
+
"@next-core/cook": "^2.2.16",
|
|
48
|
+
"@next-core/http": "^1.2.2",
|
|
49
|
+
"@next-core/i18n": "^1.0.44",
|
|
50
|
+
"@next-core/inject": "^1.0.34",
|
|
51
|
+
"@next-core/loader": "^1.5.8",
|
|
52
|
+
"@next-core/supply": "^2.1.15",
|
|
53
53
|
"@next-core/types": "^1.10.0",
|
|
54
|
-
"@next-core/utils": "^1.7.
|
|
54
|
+
"@next-core/utils": "^1.7.2",
|
|
55
55
|
"@ungap/event-target": "^0.2.4",
|
|
56
56
|
"compare-versions": "^6.1.0",
|
|
57
57
|
"history": "^4.10.1",
|
|
@@ -60,11 +60,11 @@
|
|
|
60
60
|
"path-to-regexp": "^6.2.2"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@microsoft/api-extractor": "^7.43.
|
|
63
|
+
"@microsoft/api-extractor": "^7.43.3",
|
|
64
64
|
"@next-api-sdk/api-gateway-sdk": "^1.1.0",
|
|
65
65
|
"@next-api-sdk/micro-app-sdk": "^1.2.1",
|
|
66
|
-
"@next-core/build-next-libs": "^1.0.
|
|
67
|
-
"@next-core/test-next": "^1.
|
|
66
|
+
"@next-core/build-next-libs": "^1.0.15",
|
|
67
|
+
"@next-core/test-next": "^1.1.1"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "db50cd31e4f0e9ad071aae54d84e5f2c686749cc"
|
|
70
70
|
}
|