@rspack/core 0.3.12 → 0.3.13
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.
- package/dist/Compiler.d.ts.map +1 -1
- package/dist/Compiler.js +3 -0
- package/dist/Compiler.js.map +1 -1
- package/dist/ErrorHelpers.d.ts.map +1 -1
- package/dist/ErrorHelpers.js +10 -0
- package/dist/ErrorHelpers.js.map +1 -1
- package/dist/MultiStats.js +26 -6
- package/dist/MultiStats.js.map +1 -1
- package/dist/ResolverFactory.d.ts.map +1 -1
- package/dist/ResolverFactory.js +8 -3
- package/dist/ResolverFactory.js.map +1 -1
- package/dist/Template.d.ts +12 -12
- package/dist/Template.d.ts.map +1 -1
- package/dist/Template.js +31 -15
- package/dist/Template.js.map +1 -1
- package/dist/config/browserslistTargetHandler.d.ts +2 -2
- package/dist/config/browserslistTargetHandler.d.ts.map +1 -1
- package/dist/config/browserslistTargetHandler.js +1 -1
- package/dist/config/normalization.js.map +1 -1
- package/dist/config/target.d.ts.map +1 -1
- package/dist/config/target.js +10 -1
- package/dist/config/target.js.map +1 -1
- package/dist/lib/AbstractMethodError.d.ts.map +1 -1
- package/dist/lib/AbstractMethodError.js +2 -0
- package/dist/lib/AbstractMethodError.js.map +1 -1
- package/dist/lib/Cache.d.ts.map +1 -1
- package/dist/lib/Cache.js +18 -4
- package/dist/lib/Cache.js.map +1 -1
- package/dist/lib/CacheFacade.d.ts +2 -2
- package/dist/lib/CacheFacade.d.ts.map +1 -1
- package/dist/lib/CacheFacade.js +4 -1
- package/dist/lib/CacheFacade.js.map +1 -1
- package/dist/lib/EnvironmentPlugin.d.ts +3 -3
- package/dist/lib/EnvironmentPlugin.d.ts.map +1 -1
- package/dist/lib/EnvironmentPlugin.js +6 -2
- package/dist/lib/EnvironmentPlugin.js.map +1 -1
- package/dist/lib/HookWebpackError.d.ts +1 -1
- package/dist/lib/HookWebpackError.d.ts.map +1 -1
- package/dist/lib/HookWebpackError.js +3 -1
- package/dist/lib/HookWebpackError.js.map +1 -1
- package/dist/lib/LoaderOptionsPlugin.d.ts +4 -4
- package/dist/lib/LoaderOptionsPlugin.d.ts.map +1 -1
- package/dist/lib/LoaderOptionsPlugin.js +8 -3
- package/dist/lib/LoaderOptionsPlugin.js.map +1 -1
- package/dist/lib/LoaderTargetPlugin.d.ts +2 -2
- package/dist/lib/LoaderTargetPlugin.d.ts.map +1 -1
- package/dist/lib/LoaderTargetPlugin.js +7 -2
- package/dist/lib/LoaderTargetPlugin.js.map +1 -1
- package/dist/lib/ModuleFilenameHelpers.d.ts +1 -1
- package/dist/lib/ModuleFilenameHelpers.d.ts.map +1 -1
- package/dist/lib/ModuleFilenameHelpers.js +11 -4
- package/dist/lib/ModuleFilenameHelpers.js.map +1 -1
- package/dist/lib/WebpackError.d.ts +8 -8
- package/dist/lib/WebpackError.d.ts.map +1 -1
- package/dist/lib/WebpackError.js +9 -3
- package/dist/lib/WebpackError.js.map +1 -1
- package/dist/lib/cache/getLazyHashedEtag.d.ts +3 -3
- package/dist/lib/cache/getLazyHashedEtag.d.ts.map +1 -1
- package/dist/lib/cache/getLazyHashedEtag.js +5 -2
- package/dist/lib/cache/getLazyHashedEtag.js.map +1 -1
- package/dist/lib/formatLocation.d.ts +1 -1
- package/dist/lib/formatLocation.d.ts.map +1 -1
- package/dist/lib/formatLocation.js +4 -2
- package/dist/lib/formatLocation.js.map +1 -1
- package/dist/loader-runner/LoaderLoadingError.d.ts +0 -1
- package/dist/loader-runner/LoaderLoadingError.d.ts.map +1 -1
- package/dist/loader-runner/LoaderLoadingError.js +3 -0
- package/dist/loader-runner/LoaderLoadingError.js.map +1 -1
- package/dist/loader-runner/loadLoader.d.ts.map +1 -1
- package/dist/loader-runner/loadLoader.js +21 -2
- package/dist/loader-runner/loadLoader.js.map +1 -1
- package/dist/logging/Logger.d.ts +1 -1
- package/dist/logging/Logger.d.ts.map +1 -1
- package/dist/util/cleverMerge.d.ts +2 -2
- package/dist/util/cleverMerge.d.ts.map +1 -1
- package/dist/util/cleverMerge.js +24 -1
- package/dist/util/cleverMerge.js.map +1 -1
- package/dist/util/hash/BatchedHash.d.ts.map +1 -1
- package/dist/util/hash/BatchedHash.js +1 -0
- package/dist/util/hash/BatchedHash.js.map +1 -1
- package/dist/util/hash/wasm-hash.d.ts.map +1 -1
- package/dist/util/hash/wasm-hash.js +2 -0
- package/dist/util/hash/wasm-hash.js.map +1 -1
- package/dist/util/identifier.d.ts.map +1 -1
- package/dist/util/identifier.js +17 -0
- package/dist/util/identifier.js.map +1 -1
- package/package.json +6 -6
|
@@ -3,17 +3,23 @@
|
|
|
3
3
|
Author Tobias Koppers @sokra
|
|
4
4
|
*/
|
|
5
5
|
"use strict";
|
|
6
|
-
/** @typedef {import("./ChunkGraph")} ChunkGraph */
|
|
7
|
-
/** @typedef {import("./Module")} Module */
|
|
8
|
-
/** @typedef {import("./RequestShortener")} RequestShortener */
|
|
9
|
-
/** @typedef {typeof import("./util/Hash")} Hash */
|
|
6
|
+
// /** @typedef {import("./ChunkGraph")} ChunkGraph */
|
|
7
|
+
// /** @typedef {import("./Module")} Module */
|
|
8
|
+
// /** @typedef {import("./RequestShortener")} RequestShortener */
|
|
9
|
+
// /** @typedef {typeof import("./util/Hash")} Hash */
|
|
10
|
+
/** @typedef {any} ChunkGraph */
|
|
11
|
+
/** @typedef {any} Module */
|
|
12
|
+
/** @typedef {any} RequestShortener */
|
|
13
|
+
/** @typedef {any} Hash */
|
|
10
14
|
const ModuleFilenameHelpers = exports;
|
|
15
|
+
// @ts-expect-error
|
|
11
16
|
const asRegExp = test => {
|
|
12
17
|
if (typeof test === "string") {
|
|
13
18
|
test = new RegExp("^" + test.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"));
|
|
14
19
|
}
|
|
15
20
|
return test;
|
|
16
21
|
};
|
|
22
|
+
// @ts-expect-error
|
|
17
23
|
ModuleFilenameHelpers.matchPart = (str, test) => {
|
|
18
24
|
if (!test)
|
|
19
25
|
return true;
|
|
@@ -25,6 +31,7 @@ ModuleFilenameHelpers.matchPart = (str, test) => {
|
|
|
25
31
|
return test.test(str);
|
|
26
32
|
}
|
|
27
33
|
};
|
|
34
|
+
// @ts-expect-error
|
|
28
35
|
ModuleFilenameHelpers.matchObject = (obj, str) => {
|
|
29
36
|
if (obj.test) {
|
|
30
37
|
if (!ModuleFilenameHelpers.matchPart(str, obj.test)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleFilenameHelpers.js","sourceRoot":"","sources":["../../src/lib/ModuleFilenameHelpers.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,
|
|
1
|
+
{"version":3,"file":"ModuleFilenameHelpers.js","sourceRoot":"","sources":["../../src/lib/ModuleFilenameHelpers.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,sDAAsD;AACtD,8CAA8C;AAC9C,kEAAkE;AAClE,sDAAsD;AACtD,gCAAgC;AAChC,4BAA4B;AAC5B,sCAAsC;AACtC,0BAA0B;AAE1B,MAAM,qBAAqB,GAAG,OAAO,CAAC;AAEtC,mBAAmB;AACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE;IACvB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC7B,IAAI,GAAG,IAAI,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC,CAAC;KAC1E;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,mBAAmB;AACnB,qBAAqB,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACxB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;KAC3D;SAAM;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACtB;AACF,CAAC,CAAC;AAEF,mBAAmB;AACnB,qBAAqB,CAAC,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAChD,IAAI,GAAG,CAAC,IAAI,EAAE;QACb,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACpD,OAAO,KAAK,CAAC;SACb;KACD;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QAChB,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE;YACvD,OAAO,KAAK,CAAC;SACb;KACD;IACD,IAAI,GAAG,CAAC,OAAO,EAAE;QAChB,IAAI,qBAAqB,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE;YACtD,OAAO,KAAK,CAAC;SACb;KACD;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAC"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
export = WebpackError;
|
|
2
|
-
/** @typedef {
|
|
3
|
-
/** @typedef {
|
|
4
|
-
/** @typedef {
|
|
2
|
+
/** @typedef {any} Chunk */
|
|
3
|
+
/** @typedef {any} DependencyLocation */
|
|
4
|
+
/** @typedef {any} Module */
|
|
5
5
|
declare class WebpackError extends Error {
|
|
6
6
|
details: any;
|
|
7
7
|
/** @type {Module} */
|
|
8
|
-
module:
|
|
8
|
+
module: Module;
|
|
9
9
|
/** @type {DependencyLocation} */
|
|
10
|
-
loc:
|
|
10
|
+
loc: DependencyLocation;
|
|
11
11
|
/** @type {boolean} */
|
|
12
12
|
hideStack: boolean;
|
|
13
13
|
/** @type {Chunk} */
|
|
14
|
-
chunk:
|
|
14
|
+
chunk: Chunk;
|
|
15
15
|
/** @type {string} */
|
|
16
16
|
file: string;
|
|
17
17
|
}
|
|
18
18
|
declare namespace WebpackError {
|
|
19
19
|
export { Chunk, DependencyLocation, Module };
|
|
20
20
|
}
|
|
21
|
-
type Chunk = any;
|
|
22
|
-
type DependencyLocation = any;
|
|
23
21
|
type Module = any;
|
|
22
|
+
type DependencyLocation = any;
|
|
23
|
+
type Chunk = any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackError.d.ts","sourceRoot":"","sources":["../../src/lib/WebpackError.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"WebpackError.d.ts","sourceRoot":"","sources":["../../src/lib/WebpackError.js"],"names":[],"mappings":";AAYA,2BAA2B;AAC3B,wCAAwC;AACxC,4BAA4B;AAE5B;IAQE,aAAwB;IACxB,qBAAqB;IACrB,QADW,MAAM,CACM;IACvB,iCAAiC;IACjC,KADW,kBAAkB,CACT;IACpB,sBAAsB;IAEtB,WAFW,OAAO,CAEQ;IAC1B,oBAAoB;IACpB,OADW,KAAK,CACM;IACtB,qBAAqB;IAErB,MAFW,MAAM,CAEI;CAwBtB;;;;cA9Ca,GAAG;0BADH,GAAG;aADH,GAAG"}
|
package/dist/lib/WebpackError.js
CHANGED
|
@@ -4,9 +4,12 @@
|
|
|
4
4
|
*/
|
|
5
5
|
"use strict";
|
|
6
6
|
const inspect = require("util").inspect.custom;
|
|
7
|
-
/** @typedef {import("./Chunk")} Chunk */
|
|
8
|
-
/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
|
|
9
|
-
/** @typedef {import("./Module")} Module */
|
|
7
|
+
// /** @typedef {import("./Chunk")} Chunk */
|
|
8
|
+
// /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
|
|
9
|
+
// /** @typedef {import("./Module")} Module */
|
|
10
|
+
/** @typedef {any} Chunk */
|
|
11
|
+
/** @typedef {any} DependencyLocation */
|
|
12
|
+
/** @typedef {any} Module */
|
|
10
13
|
class WebpackError extends Error {
|
|
11
14
|
/**
|
|
12
15
|
* Creates an instance of WebpackError.
|
|
@@ -14,16 +17,19 @@ class WebpackError extends Error {
|
|
|
14
17
|
*/
|
|
15
18
|
constructor(message) {
|
|
16
19
|
super(message);
|
|
20
|
+
// @ts-expect-error
|
|
17
21
|
this.details = undefined;
|
|
18
22
|
/** @type {Module} */
|
|
19
23
|
this.module = undefined;
|
|
20
24
|
/** @type {DependencyLocation} */
|
|
21
25
|
this.loc = undefined;
|
|
22
26
|
/** @type {boolean} */
|
|
27
|
+
// @ts-expect-error
|
|
23
28
|
this.hideStack = undefined;
|
|
24
29
|
/** @type {Chunk} */
|
|
25
30
|
this.chunk = undefined;
|
|
26
31
|
/** @type {string} */
|
|
32
|
+
// @ts-expect-error
|
|
27
33
|
this.file = undefined;
|
|
28
34
|
}
|
|
29
35
|
[inspect]() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebpackError.js","sourceRoot":"","sources":["../../src/lib/WebpackError.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;AAE/C,
|
|
1
|
+
{"version":3,"file":"WebpackError.js","sourceRoot":"","sources":["../../src/lib/WebpackError.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;AAE/C,4CAA4C;AAC5C,iFAAiF;AACjF,8CAA8C;AAC9C,2BAA2B;AAC3B,wCAAwC;AACxC,4BAA4B;AAE5B,MAAM,YAAa,SAAQ,KAAK;IAC/B;;;OAGG;IACH,YAAY,OAAO;QAClB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,mBAAmB;QACnB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,qBAAqB;QACrB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,iCAAiC;QACjC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;QACrB,sBAAsB;QACtB,mBAAmB;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,oBAAoB;QACpB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,qBAAqB;QACrB,mBAAmB;QACnB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IACvB,CAAC;IAED,CAAC,OAAO,CAAC;QACR,OAAO,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;CAmBD;AAED,8DAA8D;AAE9D,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC"}
|
|
@@ -11,9 +11,9 @@ declare namespace getter {
|
|
|
11
11
|
type HashableObject = {
|
|
12
12
|
updateHash: (arg0: Hash) => void;
|
|
13
13
|
};
|
|
14
|
-
type HashConstructor =
|
|
15
|
-
/** @typedef {
|
|
16
|
-
/** @typedef {
|
|
14
|
+
type HashConstructor = any;
|
|
15
|
+
/** @typedef {any} Hash */
|
|
16
|
+
/** @typedef {any} HashConstructor */
|
|
17
17
|
/**
|
|
18
18
|
* @typedef {Object} HashableObject
|
|
19
19
|
* @property {function(Hash): void} updateHash
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLazyHashedEtag.d.ts","sourceRoot":"","sources":["../../../src/lib/cache/getLazyHashedEtag.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"getLazyHashedEtag.d.ts","sourceRoot":"","sources":["../../../src/lib/cache/getLazyHashedEtag.js"],"names":[],"mappings":";AAkDA;;;;GAIG;AACH,6BAJW,cAAc,iBACd,MAAM,GAAG,eAAe,GACtB,cAAc,CA4B1B;;;;;uBAjEsB,IAAI,KAAG,IAAI;;uBAJpB,GAAG;AADjB,0BAA0B;AAC1B,qCAAqC;AAErC;;;GAGG;AAEH;IACC;;;OAGG;IACH,iBAHW,cAAc,iBACd,MAAM,GAAG,eAAe,EAMlC;IAHA,qBAAe;IACf,0BAAsB;IACtB,mBAAiC;IAGlC;;OAEG;IACH,YAFa,MAAM,CAUlB;CACD;YA/Ba,GAAG"}
|
|
@@ -4,8 +4,10 @@
|
|
|
4
4
|
*/
|
|
5
5
|
"use strict";
|
|
6
6
|
const createHash = require("../../util/createHash");
|
|
7
|
-
/** @typedef {import("../util/Hash")} Hash */
|
|
8
|
-
/** @typedef {typeof import("../util/Hash")} HashConstructor */
|
|
7
|
+
// /** @typedef {import("../util/Hash")} Hash */
|
|
8
|
+
// /** @typedef {typeof import("../util/Hash")} HashConstructor */
|
|
9
|
+
/** @typedef {any} Hash */
|
|
10
|
+
/** @typedef {any} HashConstructor */
|
|
9
11
|
/**
|
|
10
12
|
* @typedef {Object} HashableObject
|
|
11
13
|
* @property {function(Hash): void} updateHash
|
|
@@ -25,6 +27,7 @@ class LazyHashedEtag {
|
|
|
25
27
|
*/
|
|
26
28
|
toString() {
|
|
27
29
|
if (this._hash === undefined) {
|
|
30
|
+
// @ts-expect-error
|
|
28
31
|
const hash = createHash(this._hashFunction);
|
|
29
32
|
this._obj.updateHash(hash);
|
|
30
33
|
this._hash = /** @type {string} */ (hash.digest("base64"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLazyHashedEtag.js","sourceRoot":"","sources":["../../../src/lib/cache/getLazyHashedEtag.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEpD,
|
|
1
|
+
{"version":3,"file":"getLazyHashedEtag.js","sourceRoot":"","sources":["../../../src/lib/cache/getLazyHashedEtag.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAEpD,gDAAgD;AAChD,kEAAkE;AAClE,0BAA0B;AAC1B,qCAAqC;AAErC;;;GAGG;AAEH,MAAM,cAAc;IACnB;;;OAGG;IACH,YAAY,GAAG,EAAE,YAAY,GAAG,KAAK;QACpC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,QAAQ;QACP,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,mBAAmB;YACnB,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,GAAG,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC3D;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CACD;AAED,qFAAqF;AACrF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;AAE7B,gFAAgF;AAChF,MAAM,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;AAEjC;;;;GAIG;AACH,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,YAAY,GAAG,KAAK,EAAE,EAAE;IAC5C,IAAI,QAAQ,CAAC;IACb,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;QACrC,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YACtD,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;YACzB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YACvC,OAAO,OAAO,CAAC;SACf;KACD;SAAM;QACN,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxC,IAAI,QAAQ,KAAK,SAAS,EAAE;YAC3B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YACtD,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;YACzB,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC3B,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YACvC,OAAO,OAAO,CAAC;SACf;KACD;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACtD,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3B,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"}
|
|
@@ -3,7 +3,7 @@ export = formatLocation;
|
|
|
3
3
|
* @param {DependencyLocation} loc location
|
|
4
4
|
* @returns {string} formatted location
|
|
5
5
|
*/
|
|
6
|
-
declare function formatLocation(loc:
|
|
6
|
+
declare function formatLocation(loc: DependencyLocation): string;
|
|
7
7
|
declare namespace formatLocation {
|
|
8
8
|
export { DependencyLocation, SourcePosition };
|
|
9
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatLocation.d.ts","sourceRoot":"","sources":["../../src/lib/formatLocation.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"formatLocation.d.ts","sourceRoot":"","sources":["../../src/lib/formatLocation.js"],"names":[],"mappings":";AA2BA;;;GAGG;AACH,qCAHW,kBAAkB,GAChB,MAAM,CAsClB;;;;0BA1Da,GAAG;sBACH,GAAG"}
|
|
@@ -3,8 +3,10 @@
|
|
|
3
3
|
Author Tobias Koppers @sokra
|
|
4
4
|
*/
|
|
5
5
|
"use strict";
|
|
6
|
-
/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
|
|
7
|
-
/** @typedef {import("./Dependency").SourcePosition} SourcePosition */
|
|
6
|
+
// /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
|
|
7
|
+
// /** @typedef {import("./Dependency").SourcePosition} SourcePosition */
|
|
8
|
+
/** @typedef {any} DependencyLocation */
|
|
9
|
+
/** @typedef {any} SourcePosition */
|
|
8
10
|
/**
|
|
9
11
|
* @param {SourcePosition} pos position
|
|
10
12
|
* @returns {string} formatted position
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatLocation.js","sourceRoot":"","sources":["../../src/lib/formatLocation.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,
|
|
1
|
+
{"version":3,"file":"formatLocation.js","sourceRoot":"","sources":["../../src/lib/formatLocation.js"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;AAEb,iFAAiF;AACjF,yEAAyE;AACzE,wCAAwC;AACxC,oCAAoC;AAEpC;;;GAGG;AACH,MAAM,cAAc,GAAG,GAAG,CAAC,EAAE;IAC5B,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QACnC,IAAI,MAAM,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,EAAE;YACrC,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;SACnC;aAAM,IAAI,MAAM,IAAI,GAAG,EAAE;YACzB,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC;SACvB;KACD;IACD,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,cAAc,GAAG,GAAG,CAAC,EAAE;IAC5B,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QACnC,IAAI,OAAO,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE;YAC3D,IACC,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;gBAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAClC,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ;gBAC3B,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAChC,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,QAAQ;gBAClC,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG,CAAC,IAAI,EAC9B;gBACD,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;aACxD;iBAAM,IACN,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;gBAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAClC,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ;gBACpC,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ;gBAC3B,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAChC,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,QAAQ,EACjC;gBACD,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;aAC3C;iBAAM;gBACN,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;aACjE;SACD;QACD,IAAI,OAAO,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,EAAE;YAChC,OAAO,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,IAAI,MAAM,IAAI,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE;YACpC,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,KAAK,GAAG,CAAC;SACnC;QACD,IAAI,MAAM,IAAI,GAAG,EAAE;YAClB,OAAO,GAAG,CAAC,IAAI,CAAC;SAChB;KACD;IACD,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoaderLoadingError.d.ts","sourceRoot":"","sources":["../../src/loader-runner/LoaderLoadingError.js"],"names":[],"mappings":";AAYA;
|
|
1
|
+
{"version":3,"file":"LoaderLoadingError.d.ts","sourceRoot":"","sources":["../../src/loader-runner/LoaderLoadingError.js"],"names":[],"mappings":";AAYA;CASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoaderLoadingError.js","sourceRoot":"","sources":["../../src/loader-runner/LoaderLoadingError.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,YAAY,CAAC;AAEb,MAAM,kBAAmB,SAAQ,KAAK;IACrC,YAAY,OAAO;QAClB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;CACD;AAED,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"LoaderLoadingError.js","sourceRoot":"","sources":["../../src/loader-runner/LoaderLoadingError.js"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,YAAY,CAAC;AAEb,MAAM,kBAAmB,SAAQ,KAAK;IACrC;;OAEG;IACH,YAAY,OAAO;QAClB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;QAChC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;CACD;AAED,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadLoader.d.ts","sourceRoot":"","sources":["../../src/loader-runner/loadLoader.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loadLoader.d.ts","sourceRoot":"","sources":["../../src/loader-runner/loadLoader.js"],"names":[],"mappings":"AAuBiB,2DAoGhB"}
|
|
@@ -10,15 +10,17 @@
|
|
|
10
10
|
*/
|
|
11
11
|
var assert = require("assert");
|
|
12
12
|
var LoaderLoadingError = require("./LoaderLoadingError");
|
|
13
|
-
var { stringifyLoaderObject } = require(".");
|
|
14
13
|
var { toBuffer, serializeObject, isNil, toObject, stringifyLoaderObject } = require("../util");
|
|
14
|
+
/** @type {undefined | import('node:url')} */
|
|
15
15
|
var url;
|
|
16
|
+
// @ts-expect-error
|
|
16
17
|
module.exports = function loadLoader(loader, callback) {
|
|
17
18
|
if (loader.type === "module") {
|
|
18
19
|
try {
|
|
19
20
|
if (url === undefined)
|
|
20
21
|
url = require("url");
|
|
21
22
|
var loaderUrl = url.pathToFileURL(loader.path);
|
|
23
|
+
/** @type {Promise<any>} */
|
|
22
24
|
var modulePromise = eval("import(" + JSON.stringify(loaderUrl.toString()) + ")");
|
|
23
25
|
modulePromise.then(function (module) {
|
|
24
26
|
handleResult(loader, module, callback);
|
|
@@ -33,37 +35,51 @@ module.exports = function loadLoader(loader, callback) {
|
|
|
33
35
|
try {
|
|
34
36
|
var module;
|
|
35
37
|
if (loader.path.startsWith("builtin:")) {
|
|
38
|
+
// @ts-expect-error
|
|
36
39
|
module = async function (content, sourceMap, additionalData) {
|
|
37
40
|
var _a;
|
|
41
|
+
// @ts-expect-error
|
|
38
42
|
assert(!this.__internal__context.isPitching);
|
|
43
|
+
// @ts-expect-error
|
|
39
44
|
const callback = this.async();
|
|
40
45
|
const { runBuiltinLoader } = require("@rspack/binding");
|
|
46
|
+
// @ts-expect-error
|
|
41
47
|
let options = (_a = this.getOptions()) !== null && _a !== void 0 ? _a : {};
|
|
42
48
|
// This is used an hack to tell `builtin:swc-loader` whether to return AST or source.
|
|
49
|
+
// @ts-expect-error
|
|
43
50
|
this.__internal__context.loaderIndexFromJs = this.loaderIndex;
|
|
44
51
|
try {
|
|
45
|
-
const context = await runBuiltinLoader(stringifyLoaderObject(loader), JSON.stringify(options),
|
|
52
|
+
const context = await runBuiltinLoader(stringifyLoaderObject(loader), JSON.stringify(options),
|
|
53
|
+
// @ts-expect-error
|
|
54
|
+
Object.assign({}, this.__internal__context, {
|
|
46
55
|
content: isNil(content) ? undefined : toBuffer(content),
|
|
47
56
|
sourceMap: serializeObject(sourceMap),
|
|
48
57
|
additionalData: serializeObject(additionalData)
|
|
49
58
|
}));
|
|
59
|
+
// @ts-expect-error
|
|
50
60
|
this.__internal__context.additionalDataExternal =
|
|
51
61
|
context.additionalDataExternal;
|
|
62
|
+
// @ts-expect-error
|
|
52
63
|
context.fileDependencies.forEach(this.addDependency);
|
|
64
|
+
// @ts-expect-error
|
|
53
65
|
context.contextDependencies.forEach(this.addContextDependency);
|
|
66
|
+
// @ts-expect-error
|
|
54
67
|
context.missingDependencies.forEach(this.addMissingDependency);
|
|
68
|
+
// @ts-expect-error
|
|
55
69
|
context.buildDependencies.forEach(this.addBuildDependency);
|
|
56
70
|
callback(null, context.content, isNil(context.sourceMap)
|
|
57
71
|
? undefined
|
|
58
72
|
: toObject(context.sourceMap), isNil(context.additionalData)
|
|
59
73
|
? undefined
|
|
60
74
|
: toObject(context.additionalData));
|
|
75
|
+
// @ts-expect-error
|
|
61
76
|
this._compilation.__internal__pushNativeDiagnostics(context.diagnosticsExternal);
|
|
62
77
|
}
|
|
63
78
|
catch (e) {
|
|
64
79
|
return callback(e);
|
|
65
80
|
}
|
|
66
81
|
};
|
|
82
|
+
// @ts-expect-error
|
|
67
83
|
module.pitch = function () {
|
|
68
84
|
// Pitching for builtin loader is not supported
|
|
69
85
|
};
|
|
@@ -75,7 +91,9 @@ module.exports = function loadLoader(loader, callback) {
|
|
|
75
91
|
catch (e) {
|
|
76
92
|
// it is possible for node to choke on a require if the FD descriptor
|
|
77
93
|
// limit has been reached. give it a chance to recover.
|
|
94
|
+
// @ts-expect-error
|
|
78
95
|
if (e instanceof Error && e.code === "EMFILE") {
|
|
96
|
+
// @ts-expect-error
|
|
79
97
|
var retry = loadLoader.bind(null, loader, callback);
|
|
80
98
|
if (typeof setImmediate === "function") {
|
|
81
99
|
// node >= 0.9.0
|
|
@@ -91,6 +109,7 @@ module.exports = function loadLoader(loader, callback) {
|
|
|
91
109
|
return handleResult(loader, module, callback);
|
|
92
110
|
}
|
|
93
111
|
};
|
|
112
|
+
// @ts-expect-error
|
|
94
113
|
function handleResult(loader, module, callback) {
|
|
95
114
|
if (typeof module !== "function" && typeof module !== "object") {
|
|
96
115
|
return callback(new LoaderLoadingError("Module '" +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadLoader.js","sourceRoot":"","sources":["../../src/loader-runner/loadLoader.js"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AAEH,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAI,kBAAkB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AACzD,IAAI,
|
|
1
|
+
{"version":3,"file":"loadLoader.js","sourceRoot":"","sources":["../../src/loader-runner/loadLoader.js"],"names":[],"mappings":"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"}
|
package/dist/logging/Logger.d.ts
CHANGED
|
@@ -26,7 +26,7 @@ export declare const LogType: Readonly<{
|
|
|
26
26
|
}>;
|
|
27
27
|
export declare function getLogTypeBitFlag(type: LogTypeEnum): number;
|
|
28
28
|
export declare function getLogTypesBitFlag(types: LogTypeEnum[]): number;
|
|
29
|
-
export type LogTypeEnum = typeof LogType[keyof typeof LogType];
|
|
29
|
+
export type LogTypeEnum = (typeof LogType)[keyof typeof LogType];
|
|
30
30
|
declare const LOG_SYMBOL: unique symbol;
|
|
31
31
|
declare const TIMERS_SYMBOL: unique symbol;
|
|
32
32
|
declare const TIMERS_AGGREGATES_SYMBOL: unique symbol;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/logging/Logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;EAqBlB,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,UAElD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,UAEtD;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,OAAO,CAAC,MAAM,OAAO,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../src/logging/Logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;EAqBlB,CAAC;AAEH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,UAElD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,UAEtD;AAED,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,OAAO,OAAO,CAAC,CAAC;AAEjE,QAAA,MAAM,UAAU,eAA0C,CAAC;AAC3D,QAAA,MAAM,aAAa,eAAiC,CAAC;AACrD,QAAA,MAAM,wBAAwB,eAA4C,CAAC;AAE3E,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,KAAK,MAAM,CAAC;AAEvE,qBAAa,MAAM;IAClB,cAAc,EAAE,cAAc,CAAC;IAC/B,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC;IAClB,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC;IACrB,CAAC,wBAAwB,CAAC,EAAE,GAAG,CAAC;gBACpB,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc;IAK5D,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIlB,KAAK,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE;IAIvB,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAMrC,KAAK;IAIL,KAAK;IAIL,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIrB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIpB,cAAc,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAI7B,QAAQ,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIvB,OAAO,CAAC,KAAK,EAAE,GAAG;IAIlB,UAAU,CAAC,KAAK,EAAE,GAAG;IAIrB,IAAI,CAAC,KAAK,EAAE,GAAG;IAKf,OAAO,CAAC,KAAK,EAAE,GAAG;IASlB,OAAO,CAAC,KAAK,EAAE,GAAG;IAUlB,aAAa,CAAC,KAAK,EAAE,GAAG;IAwBxB,gBAAgB,CAAC,KAAK,EAAE,GAAG;CAO3B"}
|
|
@@ -66,9 +66,9 @@ export function cleverMerge<T, O>(first: T, second: O): T | O | (T & O);
|
|
|
66
66
|
* @param {T} obj the object
|
|
67
67
|
* @param {P} byProperty the by description
|
|
68
68
|
* @param {...any} values values
|
|
69
|
-
* @returns {Omit<T, P
|
|
69
|
+
* @returns {Omit<T, P>|undefined} object with merged byProperty
|
|
70
70
|
*/
|
|
71
|
-
export function resolveByProperty<T, P extends string>(obj: T, byProperty: P, ...values: any[]): Omit<T, P
|
|
71
|
+
export function resolveByProperty<T, P extends string>(obj: T, byProperty: P, ...values: any[]): Omit<T, P> | undefined;
|
|
72
72
|
/**
|
|
73
73
|
* @template T
|
|
74
74
|
* @param {T} obj the object
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cleverMerge.d.ts","sourceRoot":"","sources":["../../src/util/cleverMerge.js"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"cleverMerge.d.ts","sourceRoot":"","sources":["../../src/util/cleverMerge.js"],"names":[],"mappings":";;;;UA6Fc,GAAG,GAAG,SAAS;;;;gBACf,MAAM,GAAG,SAAS;;;;cAClB,IAAI,MAAM,EAAE,GAAG,CAAC;;;;;;YAKhB,IAAI,MAAM,EAAE,yBAAyB,CAAC;;;;aACtC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,EAAE,WAAU;KAAE,GAAG,SAAS;;AA/C9D;;;;;;GAMG;AACH,gEAJW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,OAAO,KA+B/B;AAtED;;;;;;;;;;;;;;GAcG;AACH,8EAkBC;AAgND;;;;;;;;;GASG;AACH,wEAQC;AAqRD;;;;;;;GAOG;AACH,yFAHe,GAAG,4BA4BjB;AAlED;;;;GAIG;AACH,+CA0BC;AAzhBD,mCAAgC"}
|
package/dist/util/cleverMerge.js
CHANGED
|
@@ -44,10 +44,12 @@ const cachedCleverMerge = (first, second) => {
|
|
|
44
44
|
mergeCache.set(first, innerCache);
|
|
45
45
|
}
|
|
46
46
|
const prevMerge = innerCache.get(second);
|
|
47
|
+
// @ts-expect-error
|
|
47
48
|
if (prevMerge !== undefined)
|
|
48
49
|
return prevMerge;
|
|
49
50
|
const newMerge = _cleverMerge(first, second, true);
|
|
50
51
|
innerCache.set(second, newMerge);
|
|
52
|
+
// @ts-expect-error
|
|
51
53
|
return newMerge;
|
|
52
54
|
};
|
|
53
55
|
/**
|
|
@@ -69,6 +71,7 @@ const cachedSetProperty = (obj, property, value) => {
|
|
|
69
71
|
mapByProperty.set(property, mapByValue);
|
|
70
72
|
}
|
|
71
73
|
let result = mapByValue.get(value);
|
|
74
|
+
// @ts-expect-error
|
|
72
75
|
if (result)
|
|
73
76
|
return result;
|
|
74
77
|
result = {
|
|
@@ -76,6 +79,7 @@ const cachedSetProperty = (obj, property, value) => {
|
|
|
76
79
|
[property]: value
|
|
77
80
|
};
|
|
78
81
|
mapByValue.set(value, result);
|
|
82
|
+
// @ts-expect-error
|
|
79
83
|
return result;
|
|
80
84
|
};
|
|
81
85
|
/**
|
|
@@ -110,6 +114,7 @@ const cachedParseObject = obj => {
|
|
|
110
114
|
const parseObject = obj => {
|
|
111
115
|
const info = new Map();
|
|
112
116
|
let dynamicInfo;
|
|
117
|
+
// @ts-expect-error
|
|
113
118
|
const getInfo = p => {
|
|
114
119
|
const entry = info.get(p);
|
|
115
120
|
if (entry !== undefined)
|
|
@@ -125,6 +130,7 @@ const parseObject = obj => {
|
|
|
125
130
|
for (const key of Object.keys(obj)) {
|
|
126
131
|
if (key.startsWith("by")) {
|
|
127
132
|
const byProperty = key;
|
|
133
|
+
// @ts-expect-error
|
|
128
134
|
const byObj = obj[byProperty];
|
|
129
135
|
if (typeof byObj === "object") {
|
|
130
136
|
for (const byValue of Object.keys(byObj)) {
|
|
@@ -161,11 +167,13 @@ const parseObject = obj => {
|
|
|
161
167
|
}
|
|
162
168
|
else {
|
|
163
169
|
const entry = getInfo(key);
|
|
170
|
+
// @ts-expect-error
|
|
164
171
|
entry.base = obj[key];
|
|
165
172
|
}
|
|
166
173
|
}
|
|
167
174
|
else {
|
|
168
175
|
const entry = getInfo(key);
|
|
176
|
+
// @ts-expect-error
|
|
169
177
|
entry.base = obj[key];
|
|
170
178
|
}
|
|
171
179
|
}
|
|
@@ -184,6 +192,7 @@ const serializeObject = (info, dynamicInfo) => {
|
|
|
184
192
|
// Setup byProperty structure
|
|
185
193
|
for (const entry of info.values()) {
|
|
186
194
|
if (entry.byProperty !== undefined) {
|
|
195
|
+
// @ts-expect-error
|
|
187
196
|
const byObj = (obj[entry.byProperty] = obj[entry.byProperty] || {});
|
|
188
197
|
for (const byValue of entry.byValues.keys()) {
|
|
189
198
|
byObj[byValue] = byObj[byValue] || {};
|
|
@@ -192,10 +201,12 @@ const serializeObject = (info, dynamicInfo) => {
|
|
|
192
201
|
}
|
|
193
202
|
for (const [key, entry] of info) {
|
|
194
203
|
if (entry.base !== undefined) {
|
|
204
|
+
// @ts-expect-error
|
|
195
205
|
obj[key] = entry.base;
|
|
196
206
|
}
|
|
197
207
|
// Fill byProperty structure
|
|
198
208
|
if (entry.byProperty !== undefined) {
|
|
209
|
+
// @ts-expect-error
|
|
199
210
|
const byObj = (obj[entry.byProperty] = obj[entry.byProperty] || {});
|
|
200
211
|
for (const byValue of Object.keys(byObj)) {
|
|
201
212
|
const value = getFromByValues(entry.byValues, byValue);
|
|
@@ -205,6 +216,7 @@ const serializeObject = (info, dynamicInfo) => {
|
|
|
205
216
|
}
|
|
206
217
|
}
|
|
207
218
|
if (dynamicInfo !== undefined) {
|
|
219
|
+
// @ts-expect-error
|
|
208
220
|
obj[dynamicInfo.byProperty] = dynamicInfo.fn;
|
|
209
221
|
}
|
|
210
222
|
return obj;
|
|
@@ -256,6 +268,7 @@ const cleverMerge = (first, second) => {
|
|
|
256
268
|
return second;
|
|
257
269
|
if (typeof first !== "object" || first === null)
|
|
258
270
|
return first;
|
|
271
|
+
// @ts-expect-error
|
|
259
272
|
return _cleverMerge(first, second, false);
|
|
260
273
|
};
|
|
261
274
|
/**
|
|
@@ -273,6 +286,7 @@ const _cleverMerge = (first, second, internalCaching = false) => {
|
|
|
273
286
|
// If the first argument has a dynamic part we modify the dynamic part to merge the second argument
|
|
274
287
|
if (firstDynamicInfo !== undefined) {
|
|
275
288
|
let { byProperty, fn } = firstDynamicInfo;
|
|
289
|
+
// @ts-expect-error
|
|
276
290
|
const fnInfo = fn[DYNAMIC_INFO];
|
|
277
291
|
if (fnInfo) {
|
|
278
292
|
second = internalCaching
|
|
@@ -280,12 +294,14 @@ const _cleverMerge = (first, second, internalCaching = false) => {
|
|
|
280
294
|
: cleverMerge(fnInfo[1], second);
|
|
281
295
|
fn = fnInfo[0];
|
|
282
296
|
}
|
|
297
|
+
// @ts-expect-error
|
|
283
298
|
const newFn = (...args) => {
|
|
284
299
|
const fnResult = fn(...args);
|
|
285
300
|
return internalCaching
|
|
286
301
|
? cachedCleverMerge(fnResult, second)
|
|
287
302
|
: cleverMerge(fnResult, second);
|
|
288
303
|
};
|
|
304
|
+
// @ts-expect-error
|
|
289
305
|
newFn[DYNAMIC_INFO] = [fn, second];
|
|
290
306
|
return serializeObject(firstObject.static, { byProperty, fn: newFn });
|
|
291
307
|
}
|
|
@@ -444,6 +460,7 @@ const mergeSingleValue = (a, b, internalCaching) => {
|
|
|
444
460
|
case VALUE_TYPE_UNDEFINED:
|
|
445
461
|
return b;
|
|
446
462
|
case VALUE_TYPE_DELETE:
|
|
463
|
+
// @ts-expect-error
|
|
447
464
|
return b.filter(item => item !== "...");
|
|
448
465
|
case VALUE_TYPE_ARRAY_EXTEND: {
|
|
449
466
|
const newArray = [];
|
|
@@ -460,6 +477,7 @@ const mergeSingleValue = (a, b, internalCaching) => {
|
|
|
460
477
|
return newArray;
|
|
461
478
|
}
|
|
462
479
|
case VALUE_TYPE_OBJECT:
|
|
480
|
+
// @ts-expect-error
|
|
463
481
|
return b.map(item => (item === "..." ? a : item));
|
|
464
482
|
default:
|
|
465
483
|
throw new Error("Not implemented");
|
|
@@ -475,7 +493,9 @@ const mergeSingleValue = (a, b, internalCaching) => {
|
|
|
475
493
|
*/
|
|
476
494
|
const removeOperations = obj => {
|
|
477
495
|
const newObj = /** @type {T} */ ({});
|
|
496
|
+
// @ts-expect-error
|
|
478
497
|
for (const key of Object.keys(obj)) {
|
|
498
|
+
// @ts-expect-error
|
|
479
499
|
const value = obj[key];
|
|
480
500
|
const type = getValueType(value);
|
|
481
501
|
switch (type) {
|
|
@@ -483,12 +503,15 @@ const removeOperations = obj => {
|
|
|
483
503
|
case VALUE_TYPE_DELETE:
|
|
484
504
|
break;
|
|
485
505
|
case VALUE_TYPE_OBJECT:
|
|
506
|
+
// @ts-expect-error
|
|
486
507
|
newObj[key] = removeOperations(value);
|
|
487
508
|
break;
|
|
488
509
|
case VALUE_TYPE_ARRAY_EXTEND:
|
|
510
|
+
// @ts-expect-error
|
|
489
511
|
newObj[key] = value.filter(i => i !== "...");
|
|
490
512
|
break;
|
|
491
513
|
default:
|
|
514
|
+
// @ts-expect-error
|
|
492
515
|
newObj[key] = value;
|
|
493
516
|
break;
|
|
494
517
|
}
|
|
@@ -501,7 +524,7 @@ const removeOperations = obj => {
|
|
|
501
524
|
* @param {T} obj the object
|
|
502
525
|
* @param {P} byProperty the by description
|
|
503
526
|
* @param {...any} values values
|
|
504
|
-
* @returns {Omit<T, P
|
|
527
|
+
* @returns {Omit<T, P>|undefined} object with merged byProperty
|
|
505
528
|
*/
|
|
506
529
|
const resolveByProperty = (obj, byProperty, ...values) => {
|
|
507
530
|
if (typeof obj !== "object" || obj === null || !(byProperty in obj)) {
|