danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2024-11-27 04:34:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1526 from sass/file-importer-result

Browse Source 
Replace FileImporterResult with a plain URL
This commit is contained in:
Natalie Weizenbaum 2021-10-09 01:19:04 +00:00 committed by GitHub
commit 978e5e40c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/ci.yml vendored
View File

@ -36,12 +36,9 @@ jobs:
- uses: dart-lang/setup-dart@v1
with: {sdk: "${{ matrix.dart_channel }}"}
- run: dart pub get
- name: Set up sass-spec
run: tool/github-action/check-out-sass-spec.sh
env:
PR_BRANCH: "${{ github.base_ref }}"
CURRENT_REF: "${{ github.ref }}"
PR_BODY: "${{ github.event.pull_request.body }}"
- name: Check out sass-spec
uses: sass/clone-linked-repo@v1
with: {repo: sass/sass-spec}
- uses: actions/setup-node@v2
with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
- run: npm install
@ -86,11 +83,8 @@ jobs:
- run: npm install
- name: Check out sass-spec
run: tool/github-action/check-out-sass-spec.sh
env:
PR_BRANCH: "${{ github.base_ref }}"
CURRENT_REF: "${{ github.ref }}"
PR_BODY: "${{ github.event.pull_request.body }}"
uses: sass/clone-linked-repo@v1
with: {repo: sass/sass-spec}
- name: Build JS
run: dart pub run grinder pkg-npm-dev
@ -100,7 +94,10 @@ jobs:
working-directory: sass-spec
- name: Check out Sass specification
run: git clone https://github.com/sass/sass.git language --depth 1
uses: sass/clone-linked-repo@v1
with:
repo: sass/sass
path: language
- name: Run tests
run: npm run js-api-spec -- --sassSassRepo ../language

32
lib/src/importer/node_to_dart/async_file.dart
View File

@ -6,12 +6,10 @@ import 'dart:async';
import 'package:node_interop/js.dart';
import 'package:node_interop/util.dart';
import 'package:path/path.dart' as p;
import '../../io.dart' as io;
import '../../node/importer.dart';
import '../../node/url.dart';
import '../../node/utils.dart';
import '../../syntax.dart';
import '../async.dart';
import '../filesystem.dart';
import '../result.dart';
@ -29,9 +27,6 @@ class NodeToDartAsyncFileImporter extends AsyncImporter {
/// The wrapped `findFileUrl` function.
final Object? Function(String, CanonicalizeOptions) _findFileUrl;
/// A map from canonical URLs to the `sourceMapUrl`s associated with them.
final _sourceMapUrls = <Uri, Uri>{};
NodeToDartAsyncFileImporter(this._findFileUrl);
FutureOr<Uri?> canonicalize(Uri url) async {
@ -41,36 +36,21 @@ class NodeToDartAsyncFileImporter extends AsyncImporter {
url.toString(), CanonicalizeOptions(fromImport: fromImport));
if (isPromise(result)) result = await promiseToFuture(result as Promise);
if (result == null) return null;
result as NodeFileImporterResult;
var dartUrl = result.url;
var sourceMapUrl = result.sourceMapUrl;
if (dartUrl == null) {
jsThrow(JsError(
"The findFileUrl() method must return an object a url field."));
if (!isJSUrl(result)) {
jsThrow(JsError("The findFileUrl() method must return a URL."));
}
var resultUrl = jsToDartUrl(dartUrl);
var resultUrl = jsToDartUrl(result as JSUrl);
if (resultUrl.scheme != 'file') {
jsThrow(JsError(
'The findFileUrl() must return a URL with scheme file://, was '
'"$url".'));
}
var canonical = _filesystemImporter.canonicalize(resultUrl);
if (canonical == null) return null;
if (sourceMapUrl != null) {
_sourceMapUrls[canonical] = jsToDartUrl(sourceMapUrl);
}
return canonical;
return _filesystemImporter.canonicalize(resultUrl);
}
ImporterResult? load(Uri url) {
var path = p.fromUri(url);
return ImporterResult(io.readFile(path),
sourceMapUrl: _sourceMapUrls[url] ?? url, syntax: Syntax.forPath(path));
}
ImporterResult? load(Uri url) => _filesystemImporter.load(url);
DateTime modificationTime(Uri url) =>
_filesystemImporter.modificationTime(url);

35
lib/src/importer/node_to_dart/file.dart
View File

@ -3,13 +3,11 @@
// https://opensource.org/licenses/MIT.
import 'package:node_interop/js.dart';
import 'package:path/path.dart' as p;
import '../../io.dart' as io;
import '../../importer.dart';
import '../../node/importer.dart';
import '../../node/url.dart';
import '../../node/utils.dart';
import '../../syntax.dart';
import '../filesystem.dart';
import '../result.dart';
import '../utils.dart';
@ -26,9 +24,6 @@ class NodeToDartFileImporter extends Importer {
/// The wrapped `findFileUrl` function.
final Object? Function(String, CanonicalizeOptions) _findFileUrl;
/// A map from canonical URLs to the `sourceMapUrl`s associated with them.
final _sourceMapUrls = <Uri, Uri>{};
NodeToDartFileImporter(this._findFileUrl);
Uri? canonicalize(Uri url) {
@ -40,39 +35,23 @@ class NodeToDartFileImporter extends Importer {
if (isPromise(result)) {
jsThrow(JsError(
"The canonicalize() function can't return a Promise for synchronous "
"The findFileUrl() function can't return a Promise for synchron "
"compile functions."));
} else if (!isJSUrl(result)) {
jsThrow(JsError("The findFileUrl() method must return a URL."));
}
result as NodeFileImporterResult;
var dartUrl = result.url;
var sourceMapUrl = result.sourceMapUrl;
if (dartUrl == null) {
jsThrow(JsError(
"The findFileUrl() method must return an object a url field."));
}
var resultUrl = jsToDartUrl(dartUrl);
var resultUrl = jsToDartUrl(result as JSUrl);
if (resultUrl.scheme != 'file') {
jsThrow(JsError(
'The findFileUrl() must return a URL with scheme file://, was '
'"$url".'));
}
var canonical = _filesystemImporter.canonicalize(resultUrl);
if (canonical == null) return null;
if (sourceMapUrl != null) {
_sourceMapUrls[canonical] = jsToDartUrl(sourceMapUrl);
}
return canonical;
return _filesystemImporter.canonicalize(resultUrl);
}
ImporterResult? load(Uri url) {
var path = p.fromUri(url);
return ImporterResult(io.readFile(path),
sourceMapUrl: _sourceMapUrls[url] ?? url, syntax: Syntax.forPath(path));
}
ImporterResult? load(Uri url) => _filesystemImporter.load(url);
DateTime modificationTime(Uri url) =>
_filesystemImporter.modificationTime(url);

10
lib/src/node/importer.dart
View File

@ -11,8 +11,7 @@ import 'url.dart';
class NodeImporter {
external Object? Function(String, CanonicalizeOptions)? get canonicalize;
external Object? Function(JSUrl)? get load;
external NodeFileImporterResult? Function(String, CanonicalizeOptions)?
get findFileUrl;
external Object? Function(String, CanonicalizeOptions)? get findFileUrl;
}
@JS()
@ -30,10 +29,3 @@ class NodeImporterResult {
external String? get syntax;
external JSUrl? get sourceMapUrl;
}
@JS()
@anonymous
class NodeFileImporterResult {
external JSUrl? get url;
external JSUrl? get sourceMapUrl;
}

47
tool/github-action/check-out-sass-spec.sh
View File

@ -1,47 +0,0 @@
#!/bin/bash -e
# Copyright 2016 Google Inc. Use of this source code is governed by an MIT-style
# license that can be found in the LICENSE file or at
# https://opensource.org/licenses/MIT.
# Echoes the sass-spec Git ref that should be checked out for the current GitHub
# Actions run. If we're running specs for a pull request which refers to a
# sass-spec pull request, we'll run against the latter rather than sass-spec
# main.
function choose-ref() {
if [ -z "$PR_BRANCH" ]; then
# Remove the "refs/heads/" prefix
current_branch="${CURRENT_REF:11}"
else
current_branch="$PR_BRANCH"
fi
if [[ "$current_branch" == feature.* ]]; then
default="$current_branch"
else
default=main
fi
# We don't have a PR_BRANCH so we are not in a pull request
if [ -z "$PR_BRANCH" ]; then
>&2 echo "Ref: $default."
echo "$default"
exit 0
fi
>&2 echo "$PR_BODY"
RE_SPEC_PR="sass/sass-spec(#|/pull/)([0-9]+)"
if [[ "$PR_BODY" =~ $RE_SPEC_PR ]]; then
ref="pull/${BASH_REMATCH[2]}/head"
>&2 echo "Ref: $ref."
echo "$ref"
else
>&2 echo "Ref: $default."
echo "$default"
fi
}
git init sass-spec
git -C sass-spec fetch git://github.com/sass/sass-spec "$(choose-ref)" --depth 1
git -C sass-spec checkout FETCH_HEAD