sass-embedded 1.57.1 → 1.58.3
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/compile.js +41 -39
- package/dist/lib/src/compile.js.map +1 -1
- package/dist/lib/src/deprotofy-span.js +9 -18
- package/dist/lib/src/deprotofy-span.js.map +1 -1
- package/dist/lib/src/dispatcher.js +48 -48
- package/dist/lib/src/dispatcher.js.map +1 -1
- package/dist/lib/src/exception.js +4 -4
- package/dist/lib/src/exception.js.map +1 -1
- package/dist/lib/src/function-registry.js +24 -25
- package/dist/lib/src/function-registry.js.map +1 -1
- package/dist/lib/src/importer-registry.js +57 -64
- package/dist/lib/src/importer-registry.js.map +1 -1
- package/dist/lib/src/message-transformer.js +8 -81
- package/dist/lib/src/message-transformer.js.map +1 -1
- package/dist/lib/src/messages.js +6 -0
- package/dist/lib/src/messages.js.map +1 -0
- package/dist/lib/src/packet-transformer.js.map +1 -1
- package/dist/lib/src/protofier.js +99 -116
- package/dist/lib/src/protofier.js.map +1 -1
- package/dist/lib/src/utils.js +1 -1
- package/dist/lib/src/utils.js.map +1 -1
- package/dist/lib/src/vendor/embedded_sass_pb.js +2410 -0
- package/dist/lib/src/vendor/embedded_sass_pb.js.map +1 -0
- package/dist/package.json +22 -23
- package/dist/tool/get-embedded-compiler.js +2 -2
- package/dist/tool/get-embedded-compiler.js.map +1 -1
- package/dist/tool/get-embedded-protocol.js +11 -30
- package/dist/tool/get-embedded-protocol.js.map +1 -1
- package/dist/tool/prepare-optional-release.js +2 -3
- package/dist/tool/prepare-optional-release.js.map +1 -1
- package/dist/tool/prepare-release.js +0 -4
- package/dist/tool/prepare-release.js.map +1 -1
- package/dist/tool/utils.js +1 -1
- package/dist/tool/utils.js.map +1 -1
- package/package.json +22 -23
- package/CHANGELOG.md +0 -2785
- package/dist/.gitignore +0 -18
- package/dist/lib/src/vendor/embedded-protocol/embedded_sass_pb.js +0 -9031
- package/dist/lib/src/vendor/embedded-protocol/embedded_sass_pb.js.map +0 -1
package/dist/lib/src/compile.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.compileStringAsync = exports.compileAsync = exports.compileString = exports.compile = void 0;
|
|
7
7
|
const p = require("path");
|
|
8
8
|
const supportsColor = require("supports-color");
|
|
9
|
-
const proto = require("./vendor/
|
|
9
|
+
const proto = require("./vendor/embedded_sass_pb");
|
|
10
10
|
const utils = require("./utils");
|
|
11
11
|
const async_compiler_1 = require("./async-compiler");
|
|
12
12
|
const dispatcher_1 = require("./dispatcher");
|
|
@@ -41,55 +41,57 @@ exports.compileStringAsync = compileStringAsync;
|
|
|
41
41
|
// Creates a request for compiling a file.
|
|
42
42
|
function newCompilePathRequest(path, importers, options) {
|
|
43
43
|
const request = newCompileRequest(importers, options);
|
|
44
|
-
request.
|
|
44
|
+
request.input = { case: 'path', value: path };
|
|
45
45
|
return request;
|
|
46
46
|
}
|
|
47
47
|
// Creates a request for compiling a string.
|
|
48
48
|
function newCompileStringRequest(source, importers, options) {
|
|
49
49
|
var _a, _b;
|
|
50
|
-
const input = new proto.
|
|
51
|
-
|
|
52
|
-
|
|
50
|
+
const input = new proto.InboundMessage_CompileRequest_StringInput({
|
|
51
|
+
source,
|
|
52
|
+
syntax: utils.protofySyntax((_a = options === null || options === void 0 ? void 0 : options.syntax) !== null && _a !== void 0 ? _a : 'scss'),
|
|
53
|
+
});
|
|
53
54
|
const url = (_b = options === null || options === void 0 ? void 0 : options.url) === null || _b === void 0 ? void 0 : _b.toString();
|
|
54
55
|
if (url && url !== importer_1.legacyImporterProtocol) {
|
|
55
|
-
input.
|
|
56
|
+
input.url = url;
|
|
56
57
|
}
|
|
57
58
|
if (options && 'importer' in options && options.importer) {
|
|
58
|
-
input.
|
|
59
|
+
input.importer = importers.register(options.importer);
|
|
59
60
|
}
|
|
60
61
|
else if (url === importer_1.legacyImporterProtocol) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
input.importer = new proto.InboundMessage_CompileRequest_Importer({
|
|
63
|
+
importer: { case: 'path', value: p.resolve('.') },
|
|
64
|
+
});
|
|
64
65
|
}
|
|
65
66
|
else {
|
|
66
67
|
// When importer is not set on the host, the compiler will set a
|
|
67
68
|
// FileSystemImporter if `url` is set to a file: url or a NoOpImporter.
|
|
68
69
|
}
|
|
69
70
|
const request = newCompileRequest(importers, options);
|
|
70
|
-
request.
|
|
71
|
+
request.input = { case: 'string', value: input };
|
|
71
72
|
return request;
|
|
72
73
|
}
|
|
73
74
|
// Creates a compilation request for the given `options` without adding any
|
|
74
75
|
// input-specific options.
|
|
75
76
|
function newCompileRequest(importers, options) {
|
|
76
77
|
var _a, _b, _c, _d;
|
|
77
|
-
const request = new proto.
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
78
|
+
const request = new proto.InboundMessage_CompileRequest({
|
|
79
|
+
importers: importers.importers,
|
|
80
|
+
globalFunctions: Object.keys((_a = options === null || options === void 0 ? void 0 : options.functions) !== null && _a !== void 0 ? _a : {}),
|
|
81
|
+
sourceMap: !!(options === null || options === void 0 ? void 0 : options.sourceMap),
|
|
82
|
+
sourceMapIncludeSources: !!(options === null || options === void 0 ? void 0 : options.sourceMapIncludeSources),
|
|
83
|
+
alertColor: (_b = options === null || options === void 0 ? void 0 : options.alertColor) !== null && _b !== void 0 ? _b : !!supportsColor.stdout,
|
|
84
|
+
alertAscii: !!(options === null || options === void 0 ? void 0 : options.alertAscii),
|
|
85
|
+
quietDeps: !!(options === null || options === void 0 ? void 0 : options.quietDeps),
|
|
86
|
+
verbose: !!(options === null || options === void 0 ? void 0 : options.verbose),
|
|
87
|
+
charset: !!((_c = options === null || options === void 0 ? void 0 : options.charset) !== null && _c !== void 0 ? _c : true),
|
|
88
|
+
});
|
|
87
89
|
switch ((_d = options === null || options === void 0 ? void 0 : options.style) !== null && _d !== void 0 ? _d : 'expanded') {
|
|
88
90
|
case 'expanded':
|
|
89
|
-
request.
|
|
91
|
+
request.style = proto.OutputStyle.EXPANDED;
|
|
90
92
|
break;
|
|
91
93
|
case 'compressed':
|
|
92
|
-
request.
|
|
94
|
+
request.style = proto.OutputStyle.COMPRESSED;
|
|
93
95
|
break;
|
|
94
96
|
default:
|
|
95
97
|
throw new Error(`Unknown options.style: "${options === null || options === void 0 ? void 0 : options.style}"`);
|
|
@@ -180,31 +182,31 @@ function createDispatcher(stdout, writeStdin, handlers) {
|
|
|
180
182
|
/** Handles a log event according to `options`. */
|
|
181
183
|
function handleLogEvent(options, event) {
|
|
182
184
|
var _a, _b;
|
|
183
|
-
if (event.
|
|
185
|
+
if (event.type === proto.LogEventType.DEBUG) {
|
|
184
186
|
if ((_a = options === null || options === void 0 ? void 0 : options.logger) === null || _a === void 0 ? void 0 : _a.debug) {
|
|
185
|
-
options.logger.debug(event.
|
|
186
|
-
span: (0, deprotofy_span_1.deprotofySourceSpan)(event.
|
|
187
|
+
options.logger.debug(event.message, {
|
|
188
|
+
span: (0, deprotofy_span_1.deprotofySourceSpan)(event.span),
|
|
187
189
|
});
|
|
188
190
|
}
|
|
189
191
|
else {
|
|
190
|
-
console.error(event.
|
|
192
|
+
console.error(event.formatted);
|
|
191
193
|
}
|
|
192
194
|
}
|
|
193
195
|
else {
|
|
194
196
|
if ((_b = options === null || options === void 0 ? void 0 : options.logger) === null || _b === void 0 ? void 0 : _b.warn) {
|
|
195
197
|
const params = {
|
|
196
|
-
deprecation: event.
|
|
198
|
+
deprecation: event.type === proto.LogEventType.DEPRECATION_WARNING,
|
|
197
199
|
};
|
|
198
|
-
const spanProto = event.
|
|
200
|
+
const spanProto = event.span;
|
|
199
201
|
if (spanProto)
|
|
200
202
|
params.span = (0, deprotofy_span_1.deprotofySourceSpan)(spanProto);
|
|
201
|
-
const stack = event.
|
|
203
|
+
const stack = event.stackTrace;
|
|
202
204
|
if (stack)
|
|
203
205
|
params.stack = stack;
|
|
204
|
-
options.logger.warn(event.
|
|
206
|
+
options.logger.warn(event.message, params);
|
|
205
207
|
}
|
|
206
208
|
else {
|
|
207
|
-
console.error(event.
|
|
209
|
+
console.error(event.formatted);
|
|
208
210
|
}
|
|
209
211
|
}
|
|
210
212
|
}
|
|
@@ -214,19 +216,19 @@ function handleLogEvent(options, event) {
|
|
|
214
216
|
* Throws a `SassException` if the compilation failed.
|
|
215
217
|
*/
|
|
216
218
|
function handleCompileResponse(response) {
|
|
217
|
-
if (response.
|
|
218
|
-
const success = response.
|
|
219
|
+
if (response.result.case === 'success') {
|
|
220
|
+
const success = response.result.value;
|
|
219
221
|
const result = {
|
|
220
|
-
css: success.
|
|
221
|
-
loadedUrls: success.
|
|
222
|
+
css: success.css,
|
|
223
|
+
loadedUrls: success.loadedUrls.map(url => new URL(url)),
|
|
222
224
|
};
|
|
223
|
-
const sourceMap = success.
|
|
225
|
+
const sourceMap = success.sourceMap;
|
|
224
226
|
if (sourceMap)
|
|
225
227
|
result.sourceMap = JSON.parse(sourceMap);
|
|
226
228
|
return result;
|
|
227
229
|
}
|
|
228
|
-
else if (response.
|
|
229
|
-
throw new exception_1.Exception(response.
|
|
230
|
+
else if (response.result.case === 'failure') {
|
|
231
|
+
throw new exception_1.Exception(response.result.value);
|
|
230
232
|
}
|
|
231
233
|
else {
|
|
232
234
|
throw utils.compilerError('Compiler sent empty CompileResponse.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../lib/src/compile.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,0BAA0B;AAE1B,gDAAgD;AAEhD,
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../lib/src/compile.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,43 +9,34 @@ const utils_1 = require("./utils");
|
|
|
9
9
|
// Creates a SourceSpan from the given protocol `buffer`. Throws if the buffer
|
|
10
10
|
// has invalid fields.
|
|
11
11
|
function deprotofySourceSpan(buffer) {
|
|
12
|
-
const text = buffer.
|
|
13
|
-
if (buffer.
|
|
12
|
+
const text = buffer.text;
|
|
13
|
+
if (buffer.start === undefined) {
|
|
14
14
|
throw (0, utils_1.compilerError)('Expected SourceSpan to have start.');
|
|
15
15
|
}
|
|
16
|
-
const start = deprotofySourceLocation(buffer.getStart());
|
|
17
16
|
let end;
|
|
18
|
-
if (buffer.
|
|
17
|
+
if (buffer.end === undefined) {
|
|
19
18
|
if (text !== '') {
|
|
20
19
|
throw (0, utils_1.compilerError)('Expected SourceSpan text to be empty.');
|
|
21
20
|
}
|
|
22
21
|
else {
|
|
23
|
-
end = start;
|
|
22
|
+
end = buffer.start;
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
25
|
else {
|
|
27
|
-
end =
|
|
28
|
-
if (end.offset < start.offset) {
|
|
26
|
+
end = buffer.end;
|
|
27
|
+
if (end.offset < buffer.start.offset) {
|
|
29
28
|
throw (0, utils_1.compilerError)('Expected SourceSpan end to be after start.');
|
|
30
29
|
}
|
|
31
30
|
}
|
|
32
|
-
const url = buffer.
|
|
33
|
-
const context = buffer.
|
|
31
|
+
const url = buffer.url === '' ? undefined : new url_1.URL(buffer.url);
|
|
32
|
+
const context = buffer.context === '' ? undefined : buffer.context;
|
|
34
33
|
return {
|
|
35
34
|
text,
|
|
36
|
-
start,
|
|
35
|
+
start: buffer.start,
|
|
37
36
|
end,
|
|
38
37
|
url,
|
|
39
38
|
context,
|
|
40
39
|
};
|
|
41
40
|
}
|
|
42
41
|
exports.deprotofySourceSpan = deprotofySourceSpan;
|
|
43
|
-
// Creates a SourceLocation from the given protocol `buffer`.
|
|
44
|
-
function deprotofySourceLocation(buffer) {
|
|
45
|
-
return {
|
|
46
|
-
offset: buffer.getOffset(),
|
|
47
|
-
line: buffer.getLine(),
|
|
48
|
-
column: buffer.getColumn(),
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
42
|
//# sourceMappingURL=deprotofy-span.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deprotofy-span.js","sourceRoot":"","sources":["../../../lib/src/deprotofy-span.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,6BAAwB;AAIxB,mCAAsC;AAEtC,8EAA8E;AAC9E,sBAAsB;AACtB,SAAgB,mBAAmB,CAAC,MAAwB;IAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"deprotofy-span.js","sourceRoot":"","sources":["../../../lib/src/deprotofy-span.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,6BAAwB;AAIxB,mCAAsC;AAEtC,8EAA8E;AAC9E,sBAAsB;AACtB,SAAgB,mBAAmB,CAAC,MAAwB;IAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAEzB,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE;QAC9B,MAAM,IAAA,qBAAa,EAAC,oCAAoC,CAAC,CAAC;KAC3D;IAED,IAAI,GAAG,CAAC;IACR,IAAI,MAAM,CAAC,GAAG,KAAK,SAAS,EAAE;QAC5B,IAAI,IAAI,KAAK,EAAE,EAAE;YACf,MAAM,IAAA,qBAAa,EAAC,uCAAuC,CAAC,CAAC;SAC9D;aAAM;YACL,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;SACpB;KACF;SAAM;QACL,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACjB,IAAI,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;YACpC,MAAM,IAAA,qBAAa,EAAC,4CAA4C,CAAC,CAAC;SACnE;KACF;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,SAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEhE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;IAEnE,OAAO;QACL,IAAI;QACJ,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,GAAG;QACH,GAAG;QACH,OAAO;KACR,CAAC;AACJ,CAAC;AAhCD,kDAgCC"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.Dispatcher = void 0;
|
|
7
7
|
const rxjs_1 = require("rxjs");
|
|
8
8
|
const operators_1 = require("rxjs/operators");
|
|
9
|
-
const
|
|
9
|
+
const proto = require("./vendor/embedded_sass_pb");
|
|
10
10
|
const request_tracker_1 = require("./request-tracker");
|
|
11
11
|
const utils_1 = require("./utils");
|
|
12
12
|
/**
|
|
@@ -56,7 +56,7 @@ class Dispatcher {
|
|
|
56
56
|
* Outbound log events. If an error occurs, the dispatcher closes this
|
|
57
57
|
* silently.
|
|
58
58
|
*/
|
|
59
|
-
this.logEvents$ = this.messages$.pipe((0, operators_1.filter)(message => message.
|
|
59
|
+
this.logEvents$ = this.messages$.pipe((0, operators_1.filter)(message => message.message.case === 'logEvent'), (0, operators_1.map)(message => message.message.value));
|
|
60
60
|
this.outboundMessages$
|
|
61
61
|
.pipe((0, operators_1.mergeMap)(message => {
|
|
62
62
|
const result = this.handleOutboundMessage(message);
|
|
@@ -82,7 +82,7 @@ class Dispatcher {
|
|
|
82
82
|
* events synchronously, `callback` will be called synchronously.
|
|
83
83
|
*/
|
|
84
84
|
sendCompileRequest(request, callback) {
|
|
85
|
-
this.handleInboundRequest(request,
|
|
85
|
+
this.handleInboundRequest({ value: request, case: 'compileRequest' }, 'compileResponse', callback);
|
|
86
86
|
}
|
|
87
87
|
// Rejects with `error` all promises awaiting an outbound response, and
|
|
88
88
|
// silently closes all subscriptions awaiting outbound events.
|
|
@@ -95,90 +95,90 @@ class Dispatcher {
|
|
|
95
95
|
// contains a request, runs the appropriate callback to generate an inbound
|
|
96
96
|
// response, and then sends it inbound.
|
|
97
97
|
handleOutboundMessage(message) {
|
|
98
|
-
switch (message.
|
|
99
|
-
case
|
|
98
|
+
switch (message.message.case) {
|
|
99
|
+
case 'logEvent':
|
|
100
|
+
// Handled separately by `logEvents$`.
|
|
100
101
|
return undefined;
|
|
101
|
-
case
|
|
102
|
-
this.pendingInboundRequests.resolve(message.
|
|
102
|
+
case 'compileResponse':
|
|
103
|
+
this.pendingInboundRequests.resolve(message.message.value.id, message.message.case);
|
|
103
104
|
return undefined;
|
|
104
|
-
case
|
|
105
|
-
const request = message.
|
|
106
|
-
const id = request.
|
|
107
|
-
const type =
|
|
105
|
+
case 'importRequest': {
|
|
106
|
+
const request = message.message.value;
|
|
107
|
+
const id = request.id;
|
|
108
|
+
const type = 'importResponse';
|
|
108
109
|
this.pendingOutboundRequests.add(id, type);
|
|
109
110
|
return (0, utils_1.thenOr)(this.outboundRequestHandlers.handleImportRequest(request), response => {
|
|
110
|
-
this.sendInboundMessage(id,
|
|
111
|
+
this.sendInboundMessage(id, { case: type, value: response });
|
|
111
112
|
});
|
|
112
113
|
}
|
|
113
|
-
case
|
|
114
|
-
const request = message.
|
|
115
|
-
const id = request.
|
|
116
|
-
const type =
|
|
114
|
+
case 'fileImportRequest': {
|
|
115
|
+
const request = message.message.value;
|
|
116
|
+
const id = request.id;
|
|
117
|
+
const type = 'fileImportResponse';
|
|
117
118
|
this.pendingOutboundRequests.add(id, type);
|
|
118
119
|
return (0, utils_1.thenOr)(this.outboundRequestHandlers.handleFileImportRequest(request), response => {
|
|
119
|
-
this.sendInboundMessage(id,
|
|
120
|
+
this.sendInboundMessage(id, { case: type, value: response });
|
|
120
121
|
});
|
|
121
122
|
}
|
|
122
|
-
case
|
|
123
|
-
const request = message.
|
|
124
|
-
const id = request.
|
|
125
|
-
const type =
|
|
123
|
+
case 'canonicalizeRequest': {
|
|
124
|
+
const request = message.message.value;
|
|
125
|
+
const id = request.id;
|
|
126
|
+
const type = 'canonicalizeResponse';
|
|
126
127
|
this.pendingOutboundRequests.add(id, type);
|
|
127
128
|
return (0, utils_1.thenOr)(this.outboundRequestHandlers.handleCanonicalizeRequest(request), response => {
|
|
128
|
-
this.sendInboundMessage(id,
|
|
129
|
+
this.sendInboundMessage(id, { case: type, value: response });
|
|
129
130
|
});
|
|
130
131
|
}
|
|
131
|
-
case
|
|
132
|
-
const request = message.
|
|
133
|
-
const id = request.
|
|
134
|
-
const type =
|
|
132
|
+
case 'functionCallRequest': {
|
|
133
|
+
const request = message.message.value;
|
|
134
|
+
const id = request.id;
|
|
135
|
+
const type = 'functionCallResponse';
|
|
135
136
|
this.pendingOutboundRequests.add(id, type);
|
|
136
137
|
return (0, utils_1.thenOr)(this.outboundRequestHandlers.handleFunctionCallRequest(request), response => {
|
|
137
|
-
this.sendInboundMessage(id,
|
|
138
|
+
this.sendInboundMessage(id, { case: type, value: response });
|
|
138
139
|
});
|
|
139
140
|
}
|
|
141
|
+
case 'error':
|
|
142
|
+
throw (0, utils_1.hostError)(message.message.value.message);
|
|
140
143
|
default:
|
|
141
|
-
throw
|
|
144
|
+
throw (0, utils_1.compilerError)(`Unknown message type ${message.message.case}`);
|
|
142
145
|
}
|
|
143
146
|
}
|
|
144
|
-
// Sends
|
|
145
|
-
//
|
|
146
|
-
//
|
|
147
|
-
handleInboundRequest(request,
|
|
147
|
+
// Sends `request` inbound. Once it's done, calls `callback` with either the
|
|
148
|
+
// corresponding outbound response of type `responseType`, or an error if any
|
|
149
|
+
// protocol errors were encountered.
|
|
150
|
+
handleInboundRequest(request, responseType, callback) {
|
|
148
151
|
if (this.messages$.isStopped) {
|
|
149
152
|
callback(new Error('Tried writing to closed dispatcher'), undefined);
|
|
150
153
|
return;
|
|
151
154
|
}
|
|
152
155
|
this.messages$
|
|
153
|
-
.pipe((0, operators_1.filter)(message => message.
|
|
156
|
+
.pipe((0, operators_1.filter)(message => message.message.case === responseType), (0, operators_1.map)(message => message.message.value), (0, operators_1.filter)(response => response.id === request.value.id))
|
|
154
157
|
.subscribe({ next: response => callback(null, response) });
|
|
155
158
|
this.error$.subscribe({ error: error => callback(error, undefined) });
|
|
156
159
|
try {
|
|
157
|
-
this.sendInboundMessage(this.pendingInboundRequests.nextId, request
|
|
160
|
+
this.sendInboundMessage(this.pendingInboundRequests.nextId, request);
|
|
158
161
|
}
|
|
159
162
|
catch (error) {
|
|
160
163
|
this.throwAndClose(error);
|
|
161
164
|
}
|
|
162
165
|
}
|
|
163
166
|
// Sends a message inbound. Keeps track of all pending inbound requests.
|
|
164
|
-
sendInboundMessage(id,
|
|
165
|
-
|
|
166
|
-
if (
|
|
167
|
-
this.pendingInboundRequests.add(id,
|
|
167
|
+
sendInboundMessage(id, message) {
|
|
168
|
+
message.value.id = id;
|
|
169
|
+
if (message.case === 'compileRequest') {
|
|
170
|
+
this.pendingInboundRequests.add(id, 'compileResponse');
|
|
168
171
|
}
|
|
169
|
-
else if (
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
this.pendingOutboundRequests.resolve(id,
|
|
172
|
+
else if (message.case === 'importResponse' ||
|
|
173
|
+
message.case === 'fileImportResponse' ||
|
|
174
|
+
message.case === 'canonicalizeResponse' ||
|
|
175
|
+
message.case === 'functionCallResponse') {
|
|
176
|
+
this.pendingOutboundRequests.resolve(id, message.case);
|
|
174
177
|
}
|
|
175
178
|
else {
|
|
176
|
-
throw Error(`Unknown message type ${
|
|
179
|
+
throw Error(`Unknown message type ${message.case}`);
|
|
177
180
|
}
|
|
178
|
-
this.writeInboundMessage({
|
|
179
|
-
payload,
|
|
180
|
-
type,
|
|
181
|
-
});
|
|
181
|
+
this.writeInboundMessage(new proto.InboundMessage({ message }));
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
exports.Dispatcher = Dispatcher;
|
|
@@ -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,8CAAqD;
|
|
1
|
+
{"version":3,"file":"dispatcher.js","sourceRoot":"","sources":["../../../lib/src/dispatcher.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,+BAAyC;AACzC,8CAAqD;AAOrD,mDAAmD;AACnD,uDAAiD;AACjD,mCAAoE;AAEpE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAa,UAAU;IAiCrB,YACmB,iBAAoD,EACpD,mBAER,EACQ,uBAAiD;QAJjD,sBAAiB,GAAjB,iBAAiB,CAAmC;QACpD,wBAAmB,GAAnB,mBAAmB,CAE3B;QACQ,4BAAuB,GAAvB,uBAAuB,CAA0B;QArCpE,6EAA6E;QAC7E,kCAAkC;QACjB,2BAAsB,GAAG,IAAI,gCAAc,EAAE,CAAC;QAE/D,6EAA6E;QAC7E,kCAAkC;QACjB,4BAAuB,GAAG,IAAI,gCAAc,EAAE,CAAC;QAEhE,6EAA6E;QAC7E,kBAAkB;QACD,cAAS,GAAG,IAAI,cAAO,EAAyB,CAAC;QAElE,yEAAyE;QACzE,oCAAoC;QACnB,mBAAc,GAAG,IAAI,cAAO,EAAQ,CAAC;QAEtD;;;;WAIG;QACM,WAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAE7C;;;WAGG;QACM,eAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACvC,IAAA,kBAAM,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CAAC,EACtD,IAAA,eAAG,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAuC,CAAC,CACxE,CAAC;QASA,IAAI,CAAC,iBAAiB;aACnB,IAAI,CACH,IAAA,oBAAQ,EAAC,OAAO,CAAC,EAAE;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YACnD,OAAO,MAAM,YAAY,OAAO;gBAC9B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;gBAC5B,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAChB,CAAC,CAAC,CACH;aACA,SAAS,CAAC;YACT,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YACzC,QAAQ,EAAE,GAAG,EAAE;gBACb,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC1B,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YACjC,CAAC;SACF,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;OAOG;IACH,kBAAkB,CAChB,OAA4C,EAC5C,QAGS;QAET,IAAI,CAAC,oBAAoB,CACvB,EAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAC,EACxC,iBAAiB,EACjB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,uEAAuE;IACvE,8DAA8D;IACtD,aAAa,CAAC,KAAc;QAClC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,6EAA6E;IAC7E,wEAAwE;IACxE,2EAA2E;IAC3E,uCAAuC;IAC/B,qBAAqB,CAC3B,OAA8B;QAE9B,QAAQ,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE;YAC5B,KAAK,UAAU;gBACb,sCAAsC;gBACtC,OAAO,SAAS,CAAC;YAEnB,KAAK,iBAAiB;gBACpB,IAAI,CAAC,sBAAsB,CAAC,OAAO,CACjC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EACxB,OAAO,CAAC,OAAO,CAAC,IAAI,CACrB,CAAC;gBACF,OAAO,SAAS,CAAC;YAEnB,KAAK,eAAe,CAAC,CAAC;gBACpB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,GAAG,gBAAgB,CAAC;gBAC9B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAE3C,OAAO,IAAA,cAAM,EACX,IAAI,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,OAAO,CAAC,EACzD,QAAQ,CAAC,EAAE;oBACT,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;gBAC7D,CAAC,CACF,CAAC;aACH;YAED,KAAK,mBAAmB,CAAC,CAAC;gBACxB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,GAAG,oBAAoB,CAAC;gBAClC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC3C,OAAO,IAAA,cAAM,EACX,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAC7D,QAAQ,CAAC,EAAE;oBACT,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;gBAC7D,CAAC,CACF,CAAC;aACH;YAED,KAAK,qBAAqB,CAAC,CAAC;gBAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,GAAG,sBAAsB,CAAC;gBACpC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC3C,OAAO,IAAA,cAAM,EACX,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAC/D,QAAQ,CAAC,EAAE;oBACT,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;gBAC7D,CAAC,CACF,CAAC;aACH;YAED,KAAK,qBAAqB,CAAC,CAAC;gBAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBACtC,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,GAAG,sBAAsB,CAAC;gBACpC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAC3C,OAAO,IAAA,cAAM,EACX,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAC/D,QAAQ,CAAC,EAAE;oBACT,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;gBAC7D,CAAC,CACF,CAAC;aACH;YAED,KAAK,OAAO;gBACV,MAAM,IAAA,iBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAEjD;gBACE,MAAM,IAAA,qBAAa,EAAC,wBAAwB,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SACvE;IACH,CAAC;IAED,4EAA4E;IAC5E,6EAA6E;IAC7E,oCAAoC;IAC5B,oBAAoB,CAC1B,OAAqE,EACrE,YAAkC,EAClC,QAAwE;QAExE,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YAC5B,QAAQ,CAAC,IAAI,KAAK,CAAC,oCAAoC,CAAC,EAAE,SAAS,CAAC,CAAC;YACrE,OAAO;SACR;QAED,IAAI,CAAC,SAAS;aACX,IAAI,CACH,IAAA,kBAAM,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,EACxD,IAAA,eAAG,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAyB,CAAC,EACzD,IAAA,kBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CACrD;aACA,SAAS,CAAC,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAC,CAAC,CAAC;QAE3D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,EAAC,CAAC,CAAC;QAEpE,IAAI;YACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACtE;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC3B;IACH,CAAC;IAED,wEAAwE;IAChE,kBAAkB,CACxB,EAAU,EACV,OAAoE;QAEpE,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;QAEtB,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAgB,EAAE;YACrC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;SACxD;aAAM,IACL,OAAO,CAAC,IAAI,KAAK,gBAAgB;YACjC,OAAO,CAAC,IAAI,KAAK,oBAAoB;YACrC,OAAO,CAAC,IAAI,KAAK,sBAAsB;YACvC,OAAO,CAAC,IAAI,KAAK,sBAAsB,EACvC;YACA,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,EAAC,OAAO,EAAC,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AA5ND,gCA4NC"}
|
|
@@ -7,10 +7,10 @@ exports.Exception = void 0;
|
|
|
7
7
|
const deprotofy_span_1 = require("./deprotofy-span");
|
|
8
8
|
class Exception extends Error {
|
|
9
9
|
constructor(failure) {
|
|
10
|
-
super(failure.
|
|
11
|
-
this.sassMessage = failure.
|
|
12
|
-
this.sassStack = failure.
|
|
13
|
-
this.span = (0, deprotofy_span_1.deprotofySourceSpan)(failure.
|
|
10
|
+
super(failure.formatted);
|
|
11
|
+
this.sassMessage = failure.message;
|
|
12
|
+
this.sassStack = failure.stackTrace;
|
|
13
|
+
this.span = (0, deprotofy_span_1.deprotofySourceSpan)(failure.span);
|
|
14
14
|
}
|
|
15
15
|
toString() {
|
|
16
16
|
return this.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;IAKlC,YAAY,OAA6D;QACvE,KAAK,CAAC,OAAO,CAAC,
|
|
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;IAKlC,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"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.FunctionRegistry = void 0;
|
|
7
7
|
const util_1 = require("util");
|
|
8
8
|
const utils = require("./utils");
|
|
9
|
-
const
|
|
9
|
+
const proto = require("./vendor/embedded_sass_pb");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
const protofier_1 = require("./protofier");
|
|
12
12
|
const value_1 = require("./value");
|
|
@@ -48,43 +48,42 @@ class FunctionRegistry {
|
|
|
48
48
|
const protofier = new protofier_1.Protofier(this);
|
|
49
49
|
const fn = this.get(request);
|
|
50
50
|
return (0, utils_1.catchOr)(() => {
|
|
51
|
-
return (0, utils_1.thenOr)(fn(request
|
|
52
|
-
.getArgumentsList()
|
|
53
|
-
.map(value => protofier.deprotofy(value))), result => {
|
|
51
|
+
return (0, utils_1.thenOr)(fn(request.arguments.map(value => protofier.deprotofy(value))), result => {
|
|
54
52
|
if (!(result instanceof value_1.Value)) {
|
|
55
|
-
const name = request.
|
|
56
|
-
?
|
|
57
|
-
:
|
|
53
|
+
const name = request.identifier.case === 'name'
|
|
54
|
+
? `"${request.identifier.value}"`
|
|
55
|
+
: 'anonymous function';
|
|
58
56
|
throw (`options.functions: ${name} returned non-Value: ` +
|
|
59
57
|
(0, util_1.inspect)(result));
|
|
60
58
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
59
|
+
return new proto.InboundMessage_FunctionCallResponse({
|
|
60
|
+
result: { case: 'success', value: protofier.protofy(result) },
|
|
61
|
+
accessedArgumentLists: protofier.accessedArgumentLists,
|
|
62
|
+
});
|
|
65
63
|
});
|
|
66
|
-
}, error => {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
return response;
|
|
70
|
-
});
|
|
64
|
+
}, error => new proto.InboundMessage_FunctionCallResponse({
|
|
65
|
+
result: { case: 'error', value: `${error}` },
|
|
66
|
+
}));
|
|
71
67
|
}
|
|
72
68
|
/** Returns the function to which `request` refers. */
|
|
73
69
|
get(request) {
|
|
74
|
-
if (request.
|
|
75
|
-
|
|
76
|
-
const fn = this.functionsByName.get(request.getName());
|
|
70
|
+
if (request.identifier.case === 'name') {
|
|
71
|
+
const fn = this.functionsByName.get(request.identifier.value);
|
|
77
72
|
if (fn)
|
|
78
73
|
return fn;
|
|
79
|
-
throw
|
|
80
|
-
`named "${request.
|
|
74
|
+
throw (0, utils_1.compilerError)('Invalid OutboundMessage_FunctionCallRequest: there is no function ' +
|
|
75
|
+
`named "${request.identifier.value}"`);
|
|
81
76
|
}
|
|
82
|
-
else {
|
|
83
|
-
const fn = this.functionsById.get(request.
|
|
77
|
+
else if (request.identifier.case === 'functionId') {
|
|
78
|
+
const fn = this.functionsById.get(request.identifier.value);
|
|
84
79
|
if (fn)
|
|
85
80
|
return fn;
|
|
86
|
-
throw
|
|
87
|
-
`with ID "${request.
|
|
81
|
+
throw (0, utils_1.compilerError)('Invalid OutboundMessage_FunctionCallRequest: there is no function ' +
|
|
82
|
+
`with ID "${request.identifier.value}"`);
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
throw (0, utils_1.compilerError)('Invalid OutboundMessage_FunctionCallRequest: function identifier is ' +
|
|
86
|
+
'unset');
|
|
88
87
|
}
|
|
89
88
|
}
|
|
90
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function-registry.js","sourceRoot":"","sources":["../../../lib/src/function-registry.ts"],"names":[],"mappings":";AAAA,uEAAuE;AACvE,gEAAgE;AAChE,uCAAuC;;;AAEvC,+BAA6B;AAG7B,iCAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"function-registry.js","sourceRoot":"","sources":["../../../lib/src/function-registry.ts"],"names":[],"mappings":"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"}
|