Skip to content

Commit 89ce7db

Browse files
refactor(types): build deserialize placeholders from one typed options object
1 parent c07b446 commit 89ce7db

3 files changed

Lines changed: 20 additions & 50 deletions

File tree

‎lib/css/CssModule.js‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -192,30 +192,14 @@ class CssModule extends NormalModule {
192192
* @returns {CssModule} the deserialized object
193193
*/
194194
static deserialize(context) {
195-
const obj = new CssModule({
196-
// will be deserialized by Module
197-
layer: /** @type {EXPECTED_ANY} */ (null),
198-
type: "",
199-
// will be filled by updateCacheModule
200-
resource: "",
201-
context: "",
202-
request: /** @type {EXPECTED_ANY} */ (null),
203-
userRequest: /** @type {EXPECTED_ANY} */ (null),
204-
rawRequest: /** @type {EXPECTED_ANY} */ (null),
205-
loaders: /** @type {EXPECTED_ANY} */ (null),
206-
matchResource: /** @type {EXPECTED_ANY} */ (null),
207-
parser: /** @type {EXPECTED_ANY} */ (null),
208-
parserOptions: /** @type {EXPECTED_ANY} */ (null),
209-
generator: /** @type {EXPECTED_ANY} */ (null),
210-
generatorOptions: /** @type {EXPECTED_ANY} */ (null),
211-
resolveOptions: undefined,
212-
cssLayer: /** @type {EXPECTED_ANY} */ (null),
213-
supports: /** @type {EXPECTED_ANY} */ (null),
214-
media: /** @type {EXPECTED_ANY} */ (null),
215-
inheritance: /** @type {EXPECTED_ANY} */ (null),
216-
extractSourceMap: /** @type {EXPECTED_ANY} */ (null),
217-
exportType: /** @type {EXPECTED_ANY} */ (null)
218-
});
195+
const obj = new CssModule(
196+
// the rest is restored by `deserialize` and `updateCacheModule`
197+
/** @type {CssModuleCreateData} */ ({
198+
type: "",
199+
resource: "",
200+
context: ""
201+
})
202+
);
219203
obj.deserialize(context);
220204
return obj;
221205
}

‎lib/module/NormalModule.js‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,25 +2307,14 @@ class NormalModule extends Module {
23072307
*/
23082308
static deserialize(context) {
23092309
// `new this` so subclasses without extra constructor options inherit this method
2310-
const obj = new this({
2311-
// will be deserialized by Module
2312-
layer: /** @type {EXPECTED_ANY} */ (null),
2313-
type: "",
2314-
// will be filled by updateCacheModule
2315-
resource: "",
2316-
context: "",
2317-
request: /** @type {EXPECTED_ANY} */ (null),
2318-
userRequest: /** @type {EXPECTED_ANY} */ (null),
2319-
rawRequest: /** @type {EXPECTED_ANY} */ (null),
2320-
loaders: /** @type {EXPECTED_ANY} */ (null),
2321-
matchResource: /** @type {EXPECTED_ANY} */ (null),
2322-
parser: /** @type {EXPECTED_ANY} */ (null),
2323-
parserOptions: /** @type {EXPECTED_ANY} */ (null),
2324-
generator: /** @type {EXPECTED_ANY} */ (null),
2325-
generatorOptions: /** @type {EXPECTED_ANY} */ (null),
2326-
resolveOptions: undefined,
2327-
extractSourceMap: /** @type {EXPECTED_ANY} */ (null)
2328-
});
2310+
const obj = new this(
2311+
// the rest is restored by `deserialize` and `updateCacheModule`
2312+
/** @type {NormalModuleCreateData} */ ({
2313+
type: "",
2314+
resource: "",
2315+
context: ""
2316+
})
2317+
);
23292318
obj.deserialize(context);
23302319
return obj;
23312320
}

‎lib/optimize/ConcatenatedModule.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3324,13 +3324,10 @@ ${defineGetters}`
33243324
* @returns {ConcatenatedModule} ConcatenatedModule
33253325
*/
33263326
static deserialize(context) {
3327-
const obj = new ConcatenatedModule({
3328-
identifier: /** @type {EXPECTED_ANY} */ (undefined),
3329-
rootModule: /** @type {EXPECTED_ANY} */ (undefined),
3330-
modules: /** @type {EXPECTED_ANY} */ (undefined),
3331-
runtime: undefined,
3332-
compilation: /** @type {EXPECTED_ANY} */ (undefined)
3333-
});
3327+
const obj = new ConcatenatedModule(
3328+
// every field is restored by `deserialize` and `updateCacheModule`
3329+
/** @type {ConstructorParameters<typeof ConcatenatedModule>[0]} */ ({})
3330+
);
33343331
obj.deserialize(context);
33353332
return obj;
33363333
}

0 commit comments

Comments
 (0)