sass-embedded 1.80.6 → 1.81.0
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/lib/src/canonicalize-context.js +3 -1
- package/dist/lib/src/canonicalize-context.js.map +1 -1
- package/dist/lib/src/compiler/async.js +32 -30
- package/dist/lib/src/compiler/async.js.map +1 -1
- package/dist/lib/src/compiler/sync.js +31 -27
- package/dist/lib/src/compiler/sync.js.map +1 -1
- package/dist/lib/src/compiler/utils.js +22 -25
- package/dist/lib/src/compiler/utils.js.map +1 -1
- package/dist/lib/src/deprecations.js +3 -6
- package/dist/lib/src/deprecations.js.map +1 -1
- package/dist/lib/src/dispatcher.js +28 -24
- package/dist/lib/src/dispatcher.js.map +1 -1
- package/dist/lib/src/exception.js +3 -0
- package/dist/lib/src/exception.js.map +1 -1
- package/dist/lib/src/function-registry.js +6 -6
- package/dist/lib/src/function-registry.js.map +1 -1
- package/dist/lib/src/importer-registry.js +14 -15
- package/dist/lib/src/importer-registry.js.map +1 -1
- package/dist/lib/src/legacy/importer.js +12 -6
- package/dist/lib/src/legacy/importer.js.map +1 -1
- package/dist/lib/src/legacy/index.js +12 -18
- package/dist/lib/src/legacy/index.js.map +1 -1
- package/dist/lib/src/legacy/resolve-path.js +7 -7
- package/dist/lib/src/legacy/resolve-path.js.map +1 -1
- package/dist/lib/src/legacy/value/base.js +1 -0
- package/dist/lib/src/legacy/value/base.js.map +1 -1
- package/dist/lib/src/legacy/value/color.js +2 -1
- package/dist/lib/src/legacy/value/color.js.map +1 -1
- package/dist/lib/src/legacy/value/wrap.js.map +1 -1
- package/dist/lib/src/message-transformer.js +10 -8
- package/dist/lib/src/message-transformer.js.map +1 -1
- package/dist/lib/src/packet-transformer.js +28 -23
- package/dist/lib/src/packet-transformer.js.map +1 -1
- package/dist/lib/src/protofier.js +7 -7
- package/dist/lib/src/protofier.js.map +1 -1
- package/dist/lib/src/request-tracker.js +3 -5
- package/dist/lib/src/request-tracker.js.map +1 -1
- package/dist/lib/src/value/argument-list.js +23 -2
- package/dist/lib/src/value/argument-list.js.map +1 -1
- package/dist/lib/src/value/boolean.js +8 -4
- package/dist/lib/src/value/boolean.js.map +1 -1
- package/dist/lib/src/value/calculations.js +6 -0
- package/dist/lib/src/value/calculations.js.map +1 -1
- package/dist/lib/src/value/color.js +55 -54
- package/dist/lib/src/value/color.js.map +1 -1
- package/dist/lib/src/value/function.js +27 -0
- package/dist/lib/src/value/function.js.map +1 -1
- package/dist/lib/src/value/list.js +6 -4
- package/dist/lib/src/value/list.js.map +1 -1
- package/dist/lib/src/value/map.js +2 -1
- package/dist/lib/src/value/map.js.map +1 -1
- package/dist/lib/src/value/mixin.js +9 -0
- package/dist/lib/src/value/mixin.js.map +1 -1
- package/dist/lib/src/value/null.js +6 -4
- package/dist/lib/src/value/null.js.map +1 -1
- package/dist/lib/src/value/number.js +7 -6
- package/dist/lib/src/value/number.js.map +1 -1
- package/dist/lib/src/value/string.js +5 -4
- package/dist/lib/src/value/string.js.map +1 -1
- package/dist/lib/src/version.js +3 -0
- package/dist/lib/src/version.js.map +1 -1
- package/dist/package.json +25 -24
- package/dist/test/sandbox.js +2 -2
- package/dist/test/sandbox.js.map +1 -1
- package/dist/tool/get-embedded-compiler.js +1 -2
- package/dist/tool/get-embedded-compiler.js.map +1 -1
- package/dist/tool/get-language-repo.js +1 -2
- package/dist/tool/get-language-repo.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -0
- package/package.json +25 -24
- package/dist/lib/src/sync-process/event.js +0 -6
- package/dist/lib/src/sync-process/event.js.map +0 -1
- package/dist/lib/src/sync-process/index.js +0 -122
- package/dist/lib/src/sync-process/index.js.map +0 -1
- package/dist/lib/src/sync-process/sync-message-port.js +0 -132
- package/dist/lib/src/sync-process/sync-message-port.js.map +0 -1
- package/dist/lib/src/sync-process/worker.js +0 -51
- package/dist/lib/src/sync-process/worker.js.map +0 -1
|
@@ -5,10 +5,13 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CanonicalizeContext = void 0;
|
|
7
7
|
class CanonicalizeContext {
|
|
8
|
+
fromImport;
|
|
9
|
+
_containingUrl;
|
|
8
10
|
get containingUrl() {
|
|
9
11
|
this._containingUrlAccessed = true;
|
|
10
12
|
return this._containingUrl;
|
|
11
13
|
}
|
|
14
|
+
_containingUrlAccessed = false;
|
|
12
15
|
/**
|
|
13
16
|
* Whether the `containingUrl` getter has been accessed.
|
|
14
17
|
*
|
|
@@ -20,7 +23,6 @@ class CanonicalizeContext {
|
|
|
20
23
|
return this._containingUrlAccessed;
|
|
21
24
|
}
|
|
22
25
|
constructor(containingUrl, fromImport) {
|
|
23
|
-
this._containingUrlAccessed = false;
|
|
24
26
|
this._containingUrl = containingUrl;
|
|
25
27
|
this.fromImport = fromImport;
|
|
26
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canonicalize-context.js","sourceRoot":"","sources":["../../../lib/src/canonicalize-context.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"canonicalize-context.js","sourceRoot":"","sources":["../../../lib/src/canonicalize-context.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,MAAa,mBAAmB;IACrB,UAAU,CAAU;IAEZ,cAAc,CAAa;IAE5C,IAAI,aAAa;QACf,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACnC,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEO,sBAAsB,GAAG,KAAK,CAAC;IAEvC;;;;;;OAMG;IACH,IAAI,qBAAqB;QACvB,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAED,YAAY,aAAyB,EAAE,UAAmB;QACxD,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AA3BD,kDA2BC"}
|
|
@@ -25,6 +25,36 @@ const utils = require("../utils");
|
|
|
25
25
|
const initFlag = Symbol();
|
|
26
26
|
/** An asynchronous wrapper for the embedded Sass compiler */
|
|
27
27
|
class AsyncCompiler {
|
|
28
|
+
/** The underlying process that's being wrapped. */
|
|
29
|
+
process = (0, child_process_1.spawn)(compiler_path_1.compilerCommand[0], [...compiler_path_1.compilerCommand.slice(1), '--embedded'], {
|
|
30
|
+
// Use the command's cwd so the compiler survives the removal of the
|
|
31
|
+
// current working directory.
|
|
32
|
+
// https://github.com/sass/embedded-host-node/pull/261#discussion_r1438712923
|
|
33
|
+
cwd: path.dirname(compiler_path_1.compilerCommand[0]),
|
|
34
|
+
// Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980
|
|
35
|
+
shell: ['.bat', '.cmd'].includes(path.extname(compiler_path_1.compilerCommand[0]).toLowerCase()),
|
|
36
|
+
windowsHide: true,
|
|
37
|
+
});
|
|
38
|
+
/** The next compilation ID. */
|
|
39
|
+
compilationId = 1;
|
|
40
|
+
/** A list of active compilations. */
|
|
41
|
+
compilations = new Set();
|
|
42
|
+
/** Whether the underlying compiler has already exited. */
|
|
43
|
+
disposed = false;
|
|
44
|
+
/** Reusable message transformer for all compilations. */
|
|
45
|
+
messageTransformer;
|
|
46
|
+
/** The child process's exit event. */
|
|
47
|
+
exit$ = new Promise(resolve => {
|
|
48
|
+
this.process.on('exit', code => resolve(code));
|
|
49
|
+
});
|
|
50
|
+
/** The buffers emitted by the child process's stdout. */
|
|
51
|
+
stdout$ = new rxjs_1.Observable(observer => {
|
|
52
|
+
this.process.stdout.on('data', buffer => observer.next(buffer));
|
|
53
|
+
}).pipe((0, operators_1.takeUntil)(this.exit$));
|
|
54
|
+
/** The buffers emitted by the child process's stderr. */
|
|
55
|
+
stderr$ = new rxjs_1.Observable(observer => {
|
|
56
|
+
this.process.stderr.on('data', buffer => observer.next(buffer));
|
|
57
|
+
}).pipe((0, operators_1.takeUntil)(this.exit$));
|
|
28
58
|
/** Writes `buffer` to the child process's stdin. */
|
|
29
59
|
writeStdin(buffer) {
|
|
30
60
|
this.process.stdin.write(buffer);
|
|
@@ -42,9 +72,9 @@ class AsyncCompiler {
|
|
|
42
72
|
*/
|
|
43
73
|
async compileRequestAsync(request, importers, options) {
|
|
44
74
|
const optionsKey = Symbol();
|
|
45
|
-
deprecations_1.activeDeprecationOptions.set(optionsKey, options
|
|
75
|
+
deprecations_1.activeDeprecationOptions.set(optionsKey, options ?? {});
|
|
46
76
|
try {
|
|
47
|
-
const functions = new function_registry_1.FunctionRegistry(options
|
|
77
|
+
const functions = new function_registry_1.FunctionRegistry(options?.functions);
|
|
48
78
|
const dispatcher = (0, utils_1.createDispatcher)(this.compilationId++, this.messageTransformer, {
|
|
49
79
|
handleImportRequest: request => importers.import(request),
|
|
50
80
|
handleFileImportRequest: request => importers.fileImport(request),
|
|
@@ -75,34 +105,6 @@ class AsyncCompiler {
|
|
|
75
105
|
}
|
|
76
106
|
/** Initialize resources shared across compilations. */
|
|
77
107
|
constructor(flag) {
|
|
78
|
-
/** The underlying process that's being wrapped. */
|
|
79
|
-
this.process = (0, child_process_1.spawn)(compiler_path_1.compilerCommand[0], [...compiler_path_1.compilerCommand.slice(1), '--embedded'], {
|
|
80
|
-
// Use the command's cwd so the compiler survives the removal of the
|
|
81
|
-
// current working directory.
|
|
82
|
-
// https://github.com/sass/embedded-host-node/pull/261#discussion_r1438712923
|
|
83
|
-
cwd: path.dirname(compiler_path_1.compilerCommand[0]),
|
|
84
|
-
// Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980
|
|
85
|
-
shell: ['.bat', '.cmd'].includes(path.extname(compiler_path_1.compilerCommand[0]).toLowerCase()),
|
|
86
|
-
windowsHide: true,
|
|
87
|
-
});
|
|
88
|
-
/** The next compilation ID. */
|
|
89
|
-
this.compilationId = 1;
|
|
90
|
-
/** A list of active compilations. */
|
|
91
|
-
this.compilations = new Set();
|
|
92
|
-
/** Whether the underlying compiler has already exited. */
|
|
93
|
-
this.disposed = false;
|
|
94
|
-
/** The child process's exit event. */
|
|
95
|
-
this.exit$ = new Promise(resolve => {
|
|
96
|
-
this.process.on('exit', code => resolve(code));
|
|
97
|
-
});
|
|
98
|
-
/** The buffers emitted by the child process's stdout. */
|
|
99
|
-
this.stdout$ = new rxjs_1.Observable(observer => {
|
|
100
|
-
this.process.stdout.on('data', buffer => observer.next(buffer));
|
|
101
|
-
}).pipe((0, operators_1.takeUntil)(this.exit$));
|
|
102
|
-
/** The buffers emitted by the child process's stderr. */
|
|
103
|
-
this.stderr$ = new rxjs_1.Observable(observer => {
|
|
104
|
-
this.process.stderr.on('data', buffer => observer.next(buffer));
|
|
105
|
-
}).pipe((0, operators_1.takeUntil)(this.exit$));
|
|
106
108
|
if (flag !== initFlag) {
|
|
107
109
|
throw utils.compilerError('AsyncCompiler can not be directly constructed. ' +
|
|
108
110
|
'Please use `sass.initAsyncCompiler()` instead.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../../../lib/src/compiler/async.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAmMvC,8CAEC;AAnMD,iDAAoC;AACpC,+BAAgC;AAChC,8CAAyC;AAEzC,6BAA6B;AAC7B,mCAQiB;AACjB,oDAAiD;AACjD,kDAAyD;AACzD,4DAAsD;AACtD,4DAAsD;AACtD,gEAA0D;AAC1D,8DAAwD;AACxD,kCAAkC;AAIlC;;;;GAIG;AACH,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC;AAE1B,6DAA6D;AAC7D,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../../../lib/src/compiler/async.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.Compiler = void 0;
|
|
7
7
|
exports.initCompiler = initCompiler;
|
|
8
8
|
const rxjs_1 = require("rxjs");
|
|
9
|
+
const sync_child_process_1 = require("sync-child-process");
|
|
9
10
|
const path = require("path");
|
|
10
11
|
const utils_1 = require("./utils");
|
|
11
12
|
const compiler_path_1 = require("../compiler-path");
|
|
@@ -14,7 +15,6 @@ const function_registry_1 = require("../function-registry");
|
|
|
14
15
|
const importer_registry_1 = require("../importer-registry");
|
|
15
16
|
const message_transformer_1 = require("../message-transformer");
|
|
16
17
|
const packet_transformer_1 = require("../packet-transformer");
|
|
17
|
-
const sync_process_1 = require("../sync-process");
|
|
18
18
|
const utils = require("../utils");
|
|
19
19
|
/**
|
|
20
20
|
* Flag allowing the constructor passed by `initCompiler` so we can
|
|
@@ -24,13 +24,40 @@ const utils = require("../utils");
|
|
|
24
24
|
const initFlag = Symbol();
|
|
25
25
|
/** A synchronous wrapper for the embedded Sass compiler */
|
|
26
26
|
class Compiler {
|
|
27
|
+
/** The underlying process that's being wrapped. */
|
|
28
|
+
process = new sync_child_process_1.SyncChildProcess(compiler_path_1.compilerCommand[0], [...compiler_path_1.compilerCommand.slice(1), '--embedded'], {
|
|
29
|
+
// Use the command's cwd so the compiler survives the removal of the
|
|
30
|
+
// current working directory.
|
|
31
|
+
// https://github.com/sass/embedded-host-node/pull/261#discussion_r1438712923
|
|
32
|
+
cwd: path.dirname(compiler_path_1.compilerCommand[0]),
|
|
33
|
+
// Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980
|
|
34
|
+
shell: ['.bat', '.cmd'].includes(path.extname(compiler_path_1.compilerCommand[0]).toLowerCase()),
|
|
35
|
+
windowsHide: true,
|
|
36
|
+
});
|
|
37
|
+
/** The next compilation ID. */
|
|
38
|
+
compilationId = 1;
|
|
39
|
+
/** A list of active dispatchers. */
|
|
40
|
+
dispatchers = new Set();
|
|
41
|
+
/** The buffers emitted by the child process's stdout. */
|
|
42
|
+
stdout$ = new rxjs_1.Subject();
|
|
43
|
+
/** The buffers emitted by the child process's stderr. */
|
|
44
|
+
stderr$ = new rxjs_1.Subject();
|
|
45
|
+
/** Whether the underlying compiler has already exited. */
|
|
46
|
+
disposed = false;
|
|
47
|
+
/** Reusable message transformer for all compilations. */
|
|
48
|
+
messageTransformer;
|
|
27
49
|
/** Writes `buffer` to the child process's stdin. */
|
|
28
50
|
writeStdin(buffer) {
|
|
29
51
|
this.process.stdin.write(buffer);
|
|
30
52
|
}
|
|
31
53
|
/** Yields the next event from the underlying process. */
|
|
32
54
|
yield() {
|
|
33
|
-
const
|
|
55
|
+
const result = this.process.next();
|
|
56
|
+
if (result.done) {
|
|
57
|
+
this.disposed = true;
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
const event = result.value;
|
|
34
61
|
switch (event.type) {
|
|
35
62
|
case 'stdout':
|
|
36
63
|
this.stdout$.next(event.data);
|
|
@@ -38,9 +65,6 @@ class Compiler {
|
|
|
38
65
|
case 'stderr':
|
|
39
66
|
this.stderr$.next(event.data);
|
|
40
67
|
return true;
|
|
41
|
-
case 'exit':
|
|
42
|
-
this.disposed = true;
|
|
43
|
-
return false;
|
|
44
68
|
}
|
|
45
69
|
}
|
|
46
70
|
/** Blocks until the underlying process exits. */
|
|
@@ -55,9 +79,9 @@ class Compiler {
|
|
|
55
79
|
*/
|
|
56
80
|
compileRequestSync(request, importers, options) {
|
|
57
81
|
const optionsKey = Symbol();
|
|
58
|
-
deprecations_1.activeDeprecationOptions.set(optionsKey, options
|
|
82
|
+
deprecations_1.activeDeprecationOptions.set(optionsKey, options ?? {});
|
|
59
83
|
try {
|
|
60
|
-
const functions = new function_registry_1.FunctionRegistry(options
|
|
84
|
+
const functions = new function_registry_1.FunctionRegistry(options?.functions);
|
|
61
85
|
const dispatcher = (0, utils_1.createDispatcher)(this.compilationId++, this.messageTransformer, {
|
|
62
86
|
handleImportRequest: request => importers.import(request),
|
|
63
87
|
handleFileImportRequest: request => importers.fileImport(request),
|
|
@@ -104,26 +128,6 @@ class Compiler {
|
|
|
104
128
|
}
|
|
105
129
|
/** Initialize resources shared across compilations. */
|
|
106
130
|
constructor(flag) {
|
|
107
|
-
/** The underlying process that's being wrapped. */
|
|
108
|
-
this.process = new sync_process_1.SyncProcess(compiler_path_1.compilerCommand[0], [...compiler_path_1.compilerCommand.slice(1), '--embedded'], {
|
|
109
|
-
// Use the command's cwd so the compiler survives the removal of the
|
|
110
|
-
// current working directory.
|
|
111
|
-
// https://github.com/sass/embedded-host-node/pull/261#discussion_r1438712923
|
|
112
|
-
cwd: path.dirname(compiler_path_1.compilerCommand[0]),
|
|
113
|
-
// Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980
|
|
114
|
-
shell: ['.bat', '.cmd'].includes(path.extname(compiler_path_1.compilerCommand[0]).toLowerCase()),
|
|
115
|
-
windowsHide: true,
|
|
116
|
-
});
|
|
117
|
-
/** The next compilation ID. */
|
|
118
|
-
this.compilationId = 1;
|
|
119
|
-
/** A list of active dispatchers. */
|
|
120
|
-
this.dispatchers = new Set();
|
|
121
|
-
/** The buffers emitted by the child process's stdout. */
|
|
122
|
-
this.stdout$ = new rxjs_1.Subject();
|
|
123
|
-
/** The buffers emitted by the child process's stderr. */
|
|
124
|
-
this.stderr$ = new rxjs_1.Subject();
|
|
125
|
-
/** Whether the underlying compiler has already exited. */
|
|
126
|
-
this.disposed = false;
|
|
127
131
|
if (flag !== initFlag) {
|
|
128
132
|
throw utils.compilerError('Compiler can not be directly constructed. ' +
|
|
129
133
|
'Please use `sass.initAsyncCompiler()` instead.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../../lib/src/compiler/sync.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../../lib/src/compiler/sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,23 +28,22 @@ function createDispatcher(compilationId, messageTransformer, handlers) {
|
|
|
28
28
|
// Creates a compilation request for the given `options` without adding any
|
|
29
29
|
// input-specific options.
|
|
30
30
|
function newCompileRequest(importers, options) {
|
|
31
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
32
31
|
const request = (0, protobuf_1.create)(proto.InboundMessage_CompileRequestSchema, {
|
|
33
32
|
importers: importers.importers,
|
|
34
|
-
globalFunctions: Object.keys(
|
|
35
|
-
sourceMap: !!
|
|
36
|
-
sourceMapIncludeSources: !!
|
|
37
|
-
alertColor:
|
|
38
|
-
alertAscii: !!
|
|
39
|
-
quietDeps: !!
|
|
40
|
-
verbose: !!
|
|
41
|
-
charset: !!(
|
|
42
|
-
silent:
|
|
43
|
-
fatalDeprecation: (0, deprecations_1.getDeprecationIds)(
|
|
44
|
-
silenceDeprecation: (0, deprecations_1.getDeprecationIds)(
|
|
45
|
-
futureDeprecation: (0, deprecations_1.getDeprecationIds)(
|
|
33
|
+
globalFunctions: Object.keys(options?.functions ?? {}),
|
|
34
|
+
sourceMap: !!options?.sourceMap,
|
|
35
|
+
sourceMapIncludeSources: !!options?.sourceMapIncludeSources,
|
|
36
|
+
alertColor: options?.alertColor ?? !!supportsColor.stdout,
|
|
37
|
+
alertAscii: !!options?.alertAscii,
|
|
38
|
+
quietDeps: !!options?.quietDeps,
|
|
39
|
+
verbose: !!options?.verbose,
|
|
40
|
+
charset: !!(options?.charset ?? true),
|
|
41
|
+
silent: options?.logger === logger_1.Logger.silent,
|
|
42
|
+
fatalDeprecation: (0, deprecations_1.getDeprecationIds)(options?.fatalDeprecations ?? []),
|
|
43
|
+
silenceDeprecation: (0, deprecations_1.getDeprecationIds)(options?.silenceDeprecations ?? []),
|
|
44
|
+
futureDeprecation: (0, deprecations_1.getDeprecationIds)(options?.futureDeprecations ?? []),
|
|
46
45
|
});
|
|
47
|
-
switch (
|
|
46
|
+
switch (options?.style ?? 'expanded') {
|
|
48
47
|
case 'expanded':
|
|
49
48
|
request.style = proto.OutputStyle.EXPANDED;
|
|
50
49
|
break;
|
|
@@ -52,7 +51,7 @@ function newCompileRequest(importers, options) {
|
|
|
52
51
|
request.style = proto.OutputStyle.COMPRESSED;
|
|
53
52
|
break;
|
|
54
53
|
default:
|
|
55
|
-
throw new Error(`Unknown options.style: "${options
|
|
54
|
+
throw new Error(`Unknown options.style: "${options?.style}"`);
|
|
56
55
|
}
|
|
57
56
|
return request;
|
|
58
57
|
}
|
|
@@ -65,12 +64,11 @@ function newCompilePathRequest(path, importers, options) {
|
|
|
65
64
|
}
|
|
66
65
|
// Creates a request for compiling a string.
|
|
67
66
|
function newCompileStringRequest(source, importers, options) {
|
|
68
|
-
var _a, _b;
|
|
69
67
|
const input = (0, protobuf_1.create)(proto.InboundMessage_CompileRequest_StringInputSchema, {
|
|
70
68
|
source,
|
|
71
|
-
syntax: utils.protofySyntax(
|
|
69
|
+
syntax: utils.protofySyntax(options?.syntax ?? 'scss'),
|
|
72
70
|
});
|
|
73
|
-
const url =
|
|
71
|
+
const url = options?.url?.toString();
|
|
74
72
|
if (url && url !== utils_1.legacyImporterProtocol) {
|
|
75
73
|
input.url = url;
|
|
76
74
|
}
|
|
@@ -96,21 +94,20 @@ function validDeprecationId(id) {
|
|
|
96
94
|
}
|
|
97
95
|
/** Handles a log event according to `options`. */
|
|
98
96
|
function handleLogEvent(options, event) {
|
|
99
|
-
var _a, _b;
|
|
100
97
|
let span = event.span ? (0, deprotofy_span_1.deprotofySourceSpan)(event.span) : null;
|
|
101
|
-
if (span &&
|
|
98
|
+
if (span && options?.legacy)
|
|
102
99
|
span = (0, utils_1.removeLegacyImporterFromSpan)(span);
|
|
103
100
|
let message = event.message;
|
|
104
|
-
if (options
|
|
101
|
+
if (options?.legacy)
|
|
105
102
|
message = (0, utils_1.removeLegacyImporter)(message);
|
|
106
103
|
let formatted = event.formatted;
|
|
107
|
-
if (options
|
|
104
|
+
if (options?.legacy)
|
|
108
105
|
formatted = (0, utils_1.removeLegacyImporter)(formatted);
|
|
109
106
|
const deprecationType = validDeprecationId(event.deprecationType)
|
|
110
107
|
? deprecations_1.deprecations[event.deprecationType]
|
|
111
108
|
: null;
|
|
112
109
|
if (event.type === proto.LogEventType.DEBUG) {
|
|
113
|
-
if (
|
|
110
|
+
if (options?.logger?.debug) {
|
|
114
111
|
options.logger.debug(message, {
|
|
115
112
|
span: span,
|
|
116
113
|
});
|
|
@@ -120,7 +117,7 @@ function handleLogEvent(options, event) {
|
|
|
120
117
|
}
|
|
121
118
|
}
|
|
122
119
|
else {
|
|
123
|
-
if (
|
|
120
|
+
if (options?.logger?.warn) {
|
|
124
121
|
const params = deprecationType
|
|
125
122
|
? { deprecation: true, deprecationType: deprecationType }
|
|
126
123
|
: { deprecation: false };
|
|
@@ -128,7 +125,7 @@ function handleLogEvent(options, event) {
|
|
|
128
125
|
params.span = span;
|
|
129
126
|
const stack = event.stackTrace;
|
|
130
127
|
if (stack) {
|
|
131
|
-
params.stack =
|
|
128
|
+
params.stack = options?.legacy ? (0, utils_1.removeLegacyImporter)(stack) : stack;
|
|
132
129
|
}
|
|
133
130
|
options.logger.warn(message, params);
|
|
134
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/src/compiler/utils.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;AAgDvC,4CAWC;AAyCD,sDASC;AAGD,0DAgCC;AAUD,wCAgDC;AAOD,sDAkBC;AAjOD,0BAA0B;AAC1B,gDAAgD;AAChD,iDAA0C;AAE1C,kDAA6E;AAC7E,sDAAsD;AACtD,8CAA6D;AAC7D,4CAAuC;AAEvC,2CAIyB;AACzB,sCAAiC;AAEjC,kCAAkC;AAClC,oDAAoD;AA0BpD;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,aAAqB,EACrB,kBAAsC,EACtC,QAAkC;IAElC,OAAO,IAAI,uBAAU,CACnB,aAAa,EACb,kBAAkB,CAAC,iBAAiB,EACpC,OAAO,CAAC,EAAE,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAC1D,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,2EAA2E;AAC3E,0BAA0B;AAC1B,SAAS,iBAAiB,CACxB,SAA6C,EAC7C,OAAmC
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/src/compiler/utils.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;AAgDvC,4CAWC;AAyCD,sDASC;AAGD,0DAgCC;AAUD,wCAgDC;AAOD,sDAkBC;AAjOD,0BAA0B;AAC1B,gDAAgD;AAChD,iDAA0C;AAE1C,kDAA6E;AAC7E,sDAAsD;AACtD,8CAA6D;AAC7D,4CAAuC;AAEvC,2CAIyB;AACzB,sCAAiC;AAEjC,kCAAkC;AAClC,oDAAoD;AA0BpD;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,aAAqB,EACrB,kBAAsC,EACtC,QAAkC;IAElC,OAAO,IAAI,uBAAU,CACnB,aAAa,EACb,kBAAkB,CAAC,iBAAiB,EACpC,OAAO,CAAC,EAAE,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAC1D,QAAQ,CACT,CAAC;AACJ,CAAC;AAED,2EAA2E;AAC3E,0BAA0B;AAC1B,SAAS,iBAAiB,CACxB,SAA6C,EAC7C,OAAmC;IAEnC,MAAM,OAAO,GAAG,IAAA,iBAAM,EAAC,KAAK,CAAC,mCAAmC,EAAE;QAChE,SAAS,EAAE,SAAS,CAAC,SAAS;QAC9B,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,IAAI,EAAE,CAAC;QACtD,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS;QAC/B,uBAAuB,EAAE,CAAC,CAAC,OAAO,EAAE,uBAAuB;QAC3D,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,CAAC,CAAC,aAAa,CAAC,MAAM;QACzD,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU;QACjC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS;QAC/B,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,OAAO;QAC3B,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,IAAI,IAAI,CAAC;QACrC,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,eAAM,CAAC,MAAM;QACzC,gBAAgB,EAAE,IAAA,gCAAiB,EAAC,OAAO,EAAE,iBAAiB,IAAI,EAAE,CAAC;QACrE,kBAAkB,EAAE,IAAA,gCAAiB,EAAC,OAAO,EAAE,mBAAmB,IAAI,EAAE,CAAC;QACzE,iBAAiB,EAAE,IAAA,gCAAiB,EAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE,CAAC;KACxE,CAAC,CAAC;IAEH,QAAQ,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,CAAC;QACrC,KAAK,UAAU;YACb,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC;YAC3C,MAAM;QAER,KAAK,YAAY;YACf,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC;YAC7C,MAAM;QAER;YACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,0CAA0C;AAC1C,SAAgB,qBAAqB,CACnC,IAAY,EACZ,SAA6C,EAC7C,OAAmC;IAEnC,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACtD,OAAO,CAAC,KAAK,GAAG,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;IAC/C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,4CAA4C;AAC5C,SAAgB,uBAAuB,CACrC,MAAc,EACd,SAA6C,EAC7C,OAAyC;IAEzC,MAAM,KAAK,GAAG,IAAA,iBAAM,EAAC,KAAK,CAAC,+CAA+C,EAAE;QAC1E,MAAM;QACN,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,IAAI,MAAM,CAAC;KACvD,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;IACrC,IAAI,GAAG,IAAI,GAAG,KAAK,8BAAsB,EAAE,CAAC;QAC1C,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,OAAO,IAAI,UAAU,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzD,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;SAAM,IAAI,GAAG,KAAK,8BAAsB,EAAE,CAAC;QAC1C,KAAK,CAAC,QAAQ,GAAG,IAAA,iBAAM,EACrB,KAAK,CAAC,4CAA4C,EAClD;YACE,QAAQ,EAAE,EAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC;SAChD,CACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,gEAAgE;QAChE,uEAAuE;IACzE,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACtD,OAAO,CAAC,KAAK,GAAG,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC;IAC/C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,+DAA+D;AAC/D,SAAS,kBAAkB,CACzB,EAAwC;IAExC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,2BAAY,CAAC;AACpC,CAAC;AAED,kDAAkD;AAClD,SAAgB,cAAc,CAC5B,OAAwD,EACxD,KAAqC;IAErC,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,oCAAmB,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,IAAI,IAAI,IAAI,OAAO,EAAE,MAAM;QAAE,IAAI,GAAG,IAAA,oCAA4B,EAAC,IAAI,CAAC,CAAC;IACvE,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC5B,IAAI,OAAO,EAAE,MAAM;QAAE,OAAO,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;IAC7D,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IAChC,IAAI,OAAO,EAAE,MAAM;QAAE,SAAS,GAAG,IAAA,4BAAoB,EAAC,SAAS,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,eAAe,CAAC;QAC/D,CAAC,CAAC,2BAAY,CAAC,KAAK,CAAC,eAAe,CAAC;QACrC,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC5C,IAAI,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;gBAC5B,IAAI,EAAE,IAAK;aACZ,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YAC1B,MAAM,MAAM,GASR,eAAe;gBACjB,CAAC,CAAC,EAAC,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,eAAe,EAAC;gBACvD,CAAC,CAAC,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC;YACzB,IAAI,IAAI;gBAAE,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YAE7B,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC;YAC/B,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,IAAA,4BAAoB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACvE,CAAC;YAED,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,QAA+C;IAE/C,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;QACtC,MAAM,MAAM,GAAkB;YAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;SACzD,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACpC,IAAI,SAAS;YAAE,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9C,MAAM,IAAI,qBAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,CAAC,aAAa,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}
|
|
@@ -56,7 +56,6 @@ function warnForHostSideDeprecation(message, deprecation, options) {
|
|
|
56
56
|
* deprecations or is silenced by at least one active compilation.
|
|
57
57
|
*/
|
|
58
58
|
function isSilent(deprecation, options) {
|
|
59
|
-
var _a;
|
|
60
59
|
if (!options) {
|
|
61
60
|
for (const potentialOptions of exports.activeDeprecationOptions.values()) {
|
|
62
61
|
if (isSilent(deprecation, potentialOptions))
|
|
@@ -64,14 +63,13 @@ function isSilent(deprecation, options) {
|
|
|
64
63
|
}
|
|
65
64
|
return false;
|
|
66
65
|
}
|
|
67
|
-
return getDeprecationIds(
|
|
66
|
+
return getDeprecationIds(options.silenceDeprecations ?? []).includes(deprecation.id);
|
|
68
67
|
}
|
|
69
68
|
/**
|
|
70
69
|
* Checks whether the given deprecation is included in the given list of future
|
|
71
70
|
* deprecations that should be enabled or is enabled in all active compilations.
|
|
72
71
|
*/
|
|
73
72
|
function isEnabledFuture(deprecation, options) {
|
|
74
|
-
var _a;
|
|
75
73
|
if (!options) {
|
|
76
74
|
for (const potentialOptions of exports.activeDeprecationOptions.values()) {
|
|
77
75
|
if (!isEnabledFuture(deprecation, potentialOptions))
|
|
@@ -79,14 +77,13 @@ function isEnabledFuture(deprecation, options) {
|
|
|
79
77
|
}
|
|
80
78
|
return exports.activeDeprecationOptions.size > 0;
|
|
81
79
|
}
|
|
82
|
-
return getDeprecationIds(
|
|
80
|
+
return getDeprecationIds(options.futureDeprecations ?? []).includes(deprecation.id);
|
|
83
81
|
}
|
|
84
82
|
/**
|
|
85
83
|
* Checks whether the given deprecation is included in the given list of
|
|
86
84
|
* fatal deprecations or is marked as fatal in all active compilations.
|
|
87
85
|
*/
|
|
88
86
|
function isFatal(deprecation, options) {
|
|
89
|
-
var _a;
|
|
90
87
|
if (!options) {
|
|
91
88
|
for (const potentialOptions of exports.activeDeprecationOptions.values()) {
|
|
92
89
|
if (!isFatal(deprecation, potentialOptions))
|
|
@@ -99,7 +96,7 @@ function isFatal(deprecation, options) {
|
|
|
99
96
|
: deprecation.deprecatedIn.major * 1000000 +
|
|
100
97
|
deprecation.deprecatedIn.minor * 1000 +
|
|
101
98
|
deprecation.deprecatedIn.patch;
|
|
102
|
-
for (const fatal of
|
|
99
|
+
for (const fatal of options.fatalDeprecations ?? []) {
|
|
103
100
|
if (fatal instanceof version_1.Version) {
|
|
104
101
|
if (versionNumber === null)
|
|
105
102
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deprecations.js","sourceRoot":"","sources":["../../../lib/src/deprecations.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAYvC,8CAWC;AA0BD,gEAkBC;AAhED,uCAAkC;AAElC,sDAAmD;AAA3C,4GAAA,YAAY,OAAA;AAGpB;;;GAGG;AACH,SAAgB,iBAAiB,CAC/B,GAAkC;IAElC,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACpB,IAAI,IAAI,YAAY,iBAAO,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;aAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACU,QAAA,wBAAwB,GACnC,IAAI,GAAG,EAAE,CAAC;AAUZ;;;;;;GAMG;AACH,SAAgB,0BAA0B,CACxC,OAAe,EACf,WAAwB,EACxB,OAA4B;IAE5B,IACE,WAAW,CAAC,MAAM,KAAK,QAAQ;QAC/B,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,EACtC,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,gBAAgB,WAAW,CAAC,EAAE,MAAM,OAAO,EAAE,CAAC;IAClE,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CACf,WAAwB,EACxB,OAA4B
|
|
1
|
+
{"version":3,"file":"deprecations.js","sourceRoot":"","sources":["../../../lib/src/deprecations.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAYvC,8CAWC;AA0BD,gEAkBC;AAhED,uCAAkC;AAElC,sDAAmD;AAA3C,4GAAA,YAAY,OAAA;AAGpB;;;GAGG;AACH,SAAgB,iBAAiB,CAC/B,GAAkC;IAElC,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACpB,IAAI,IAAI,YAAY,iBAAO,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;aAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACU,QAAA,wBAAwB,GACnC,IAAI,GAAG,EAAE,CAAC;AAUZ;;;;;;GAMG;AACH,SAAgB,0BAA0B,CACxC,OAAe,EACf,WAAwB,EACxB,OAA4B;IAE5B,IACE,WAAW,CAAC,MAAM,KAAK,QAAQ;QAC/B,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,EACtC,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,gBAAgB,WAAW,CAAC,EAAE,MAAM,OAAO,EAAE,CAAC;IAClE,IAAI,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CACf,WAAwB,EACxB,OAA4B;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,KAAK,MAAM,gBAAgB,IAAI,gCAAwB,CAAC,MAAM,EAAE,EAAE,CAAC;YACjE,IAAI,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAAE,OAAO,IAAI,CAAC;QAC3D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,iBAAiB,CAAC,OAAO,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAClE,WAAW,CAAC,EAAE,CACf,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CACtB,WAAwB,EACxB,OAA4B;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,KAAK,MAAM,gBAAgB,IAAI,gCAAwB,CAAC,MAAM,EAAE,EAAE,CAAC;YACjE,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAAE,OAAO,KAAK,CAAC;QACpE,CAAC;QACD,OAAO,gCAAwB,CAAC,IAAI,GAAG,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,QAAQ,CACjE,WAAW,CAAC,EAAE,CACf,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,OAAO,CACd,WAAwB,EACxB,OAA4B;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,KAAK,MAAM,gBAAgB,IAAI,gCAAwB,CAAC,MAAM,EAAE,EAAE,CAAC;YACjE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC;gBAAE,OAAO,KAAK,CAAC;QAC5D,CAAC;QACD,OAAO,gCAAwB,CAAC,IAAI,GAAG,CAAC,CAAC;IAC3C,CAAC;IACD,MAAM,aAAa,GACjB,WAAW,CAAC,YAAY,KAAK,IAAI;QAC/B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,GAAG,OAAO;YACxC,WAAW,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI;YACrC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC;IACrC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,iBAAiB,IAAI,EAAE,EAAE,CAAC;QACpD,IAAI,KAAK,YAAY,iBAAO,EAAE,CAAC;YAC7B,IAAI,aAAa,KAAK,IAAI;gBAAE,SAAS;YACrC,IACE,aAAa;gBACb,KAAK,CAAC,KAAK,GAAG,OAAO,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC,KAAK,EACxD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrC,IAAI,KAAK,KAAK,WAAW,CAAC,EAAE;gBAAE,OAAO,IAAI,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,IAAK,KAAqB,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE;gBAAE,OAAO,IAAI,CAAC;QAChE,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -31,35 +31,39 @@ const utils_1 = require("./utils");
|
|
|
31
31
|
* perform proper error handling.
|
|
32
32
|
*/
|
|
33
33
|
class Dispatcher {
|
|
34
|
+
compilationId;
|
|
35
|
+
outboundMessages$;
|
|
36
|
+
writeInboundMessage;
|
|
37
|
+
outboundRequestHandlers;
|
|
38
|
+
// Tracks the IDs of all outbound requests. An inbound response with matching
|
|
39
|
+
// ID and type will remove the ID.
|
|
40
|
+
pendingOutboundRequests = new request_tracker_1.RequestTracker();
|
|
41
|
+
// All outbound messages for this compilation. If we detect any errors while
|
|
42
|
+
// dispatching messages, this completes.
|
|
43
|
+
messages$ = new rxjs_1.Subject();
|
|
44
|
+
// Subject to unsubscribe from all outbound messages to prevent past
|
|
45
|
+
// dispatchers with compilation IDs reused by future dispatchers from
|
|
46
|
+
// receiving messages intended for future dispatchers.
|
|
47
|
+
unsubscribe$ = new rxjs_1.Subject();
|
|
48
|
+
// If the dispatcher encounters an error, this errors out. It is publicly
|
|
49
|
+
// exposed as a readonly Observable.
|
|
50
|
+
errorInternal$ = new rxjs_1.Subject();
|
|
51
|
+
/**
|
|
52
|
+
* If the dispatcher encounters an error, this errors out. Upon error, the
|
|
53
|
+
* dispatcher rejects all promises awaiting an outbound response, and silently
|
|
54
|
+
* closes all subscriptions to outbound events.
|
|
55
|
+
*/
|
|
56
|
+
error$ = this.errorInternal$.pipe();
|
|
57
|
+
/**
|
|
58
|
+
* Outbound log events. If an error occurs, the dispatcher closes this
|
|
59
|
+
* silently.
|
|
60
|
+
*/
|
|
61
|
+
logEvents$ = this.messages$.pipe((0, operators_1.filter)(message => message.message.case === 'logEvent'), (0, operators_1.map)(message => message.message.value));
|
|
34
62
|
constructor(compilationId, outboundMessages$, writeInboundMessage, outboundRequestHandlers) {
|
|
35
63
|
this.compilationId = compilationId;
|
|
36
64
|
this.outboundMessages$ = outboundMessages$;
|
|
37
65
|
this.writeInboundMessage = writeInboundMessage;
|
|
38
66
|
this.outboundRequestHandlers = outboundRequestHandlers;
|
|
39
|
-
// Tracks the IDs of all outbound requests. An inbound response with matching
|
|
40
|
-
// ID and type will remove the ID.
|
|
41
|
-
this.pendingOutboundRequests = new request_tracker_1.RequestTracker();
|
|
42
|
-
// All outbound messages for this compilation. If we detect any errors while
|
|
43
|
-
// dispatching messages, this completes.
|
|
44
|
-
this.messages$ = new rxjs_1.Subject();
|
|
45
|
-
// Subject to unsubscribe from all outbound messages to prevent past
|
|
46
|
-
// dispatchers with compilation IDs reused by future dispatchers from
|
|
47
|
-
// receiving messages intended for future dispatchers.
|
|
48
|
-
this.unsubscribe$ = new rxjs_1.Subject();
|
|
49
|
-
// If the dispatcher encounters an error, this errors out. It is publicly
|
|
50
|
-
// exposed as a readonly Observable.
|
|
51
|
-
this.errorInternal$ = new rxjs_1.Subject();
|
|
52
|
-
/**
|
|
53
|
-
* If the dispatcher encounters an error, this errors out. Upon error, the
|
|
54
|
-
* dispatcher rejects all promises awaiting an outbound response, and silently
|
|
55
|
-
* closes all subscriptions to outbound events.
|
|
56
|
-
*/
|
|
57
|
-
this.error$ = this.errorInternal$.pipe();
|
|
58
|
-
/**
|
|
59
|
-
* Outbound log events. If an error occurs, the dispatcher closes this
|
|
60
|
-
* silently.
|
|
61
|
-
*/
|
|
62
|
-
this.logEvents$ = this.messages$.pipe((0, operators_1.filter)(message => message.message.case === 'logEvent'), (0, operators_1.map)(message => message.message.value));
|
|
63
67
|
if (compilationId < 1) {
|
|
64
68
|
throw Error(`Invalid compilation ID ${compilationId}.`);
|
|
65
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../lib/src/dispatcher.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,+BAAyC;AACzC,8CAAgE;AAChE,iDAA0C;AAG1C,mDAAmD;AACnD,uDAAiD;AACjD,mCAAoE;AAQpE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../lib/src/dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.Exception = void 0;
|
|
7
7
|
const deprotofy_span_1 = require("./deprotofy-span");
|
|
8
8
|
class Exception extends Error {
|
|
9
|
+
sassMessage;
|
|
10
|
+
sassStack;
|
|
11
|
+
span;
|
|
9
12
|
constructor(failure) {
|
|
10
13
|
super(failure.formatted);
|
|
11
14
|
this.sassMessage = failure.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exception.js","sourceRoot":"","sources":["../../../lib/src/exception.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAIvC,qDAAqD;AAErD,MAAa,SAAU,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"exception.js","sourceRoot":"","sources":["../../../lib/src/exception.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAIvC,qDAAqD;AAErD,MAAa,SAAU,SAAQ,KAAK;IACzB,WAAW,CAAS;IACpB,SAAS,CAAS;IAClB,IAAI,CAAa;IAE1B,YAAY,OAA6D;QACvE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEzB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,IAAA,oCAAmB,EAAC,OAAO,CAAC,IAAK,CAAC,CAAC;IACjD,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF;AAhBD,8BAgBC"}
|
|
@@ -16,13 +16,13 @@ const value_1 = require("./value");
|
|
|
16
16
|
* execute them.
|
|
17
17
|
*/
|
|
18
18
|
class FunctionRegistry {
|
|
19
|
+
functionsByName = new Map();
|
|
20
|
+
functionsById = new Map();
|
|
21
|
+
idsByFunction = new Map();
|
|
22
|
+
/** The next ID to use for a function. */
|
|
23
|
+
id = 0;
|
|
19
24
|
constructor(functionsBySignature) {
|
|
20
|
-
|
|
21
|
-
this.functionsById = new Map();
|
|
22
|
-
this.idsByFunction = new Map();
|
|
23
|
-
/** The next ID to use for a function. */
|
|
24
|
-
this.id = 0;
|
|
25
|
-
for (const [signature, fn] of Object.entries(functionsBySignature !== null && functionsBySignature !== void 0 ? functionsBySignature : {})) {
|
|
25
|
+
for (const [signature, fn] of Object.entries(functionsBySignature ?? {})) {
|
|
26
26
|
const openParen = signature.indexOf('(');
|
|
27
27
|
if (openParen === -1) {
|
|
28
28
|
throw new Error(`options.functions: "${signature}" is missing "("`);
|