msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

implemented preprocess-sync

Browse Source
pull/5770/head
Andreas Ehrencrona 5 years ago
parent 0011123174
commit d17807a13a
3 changed files with 178 additions and 82 deletions
Show Stats Download Patch File Download Diff File

208
src/compiler/preprocess/index.ts
Unescape View File

@ -3,8 +3,8 @@ import { getLocator } from 'locate-character';
import { StringWithSourcemap, SourceLocation, sourcemap_add_offset, combine_sourcemaps } from '../utils/string_with_sourcemap';
import { decode_map } from './decode_sourcemap';
import parse_tag_attributes from './parse_tag_attributes';
import { replace_in_code, Source } from './replace_in_code';
import { Preprocessor, PreprocessorGroup, Processed } from './types';
import { perform_replacements, Source, Replacement } from './replace_in_code';
import { Preprocessor, SyncPreprocessor, PreprocessorGroup, Processed } from './types';
interface SourceUpdate {
string: string;
@ -100,65 +100,190 @@ function processed_tag_to_sws(
return tag_open_sws.concat(content_sws).concat(tag_close_sws);
}
/**
* Calculate the updates required to process all instances of the specified tag.
*/
async function process_tag(
tag_name: 'style' | 'script',
preprocessor: Preprocessor,
source: Source
): Promise<SourceUpdate> {
const { filename, get_location } = source;
interface TagInstance {
tag_with_content: string,
attributes: string,
content: string,
tag_offset: number;
}
export function get_tag_instances(tag: 'style'|'script', source: string): TagInstance[] {
const tag_regex =
tag_name === 'style'
tag === 'style'
? /<!--[^]*?-->|<style(\s[^]*?)?(?:>([^]*?)<\/style>|\/>)/gi
: /<!--[^]*?-->|<script(\s[^]*?)?(?:>([^]*?)<\/script>|\/>)/gi;
const dependencies: string[] = [];
async function process_single_tag(
tag_with_content: string,
attributes = '',
content = '',
tag_offset: number
): Promise<StringWithSourcemap> {
const no_change = () =>
StringWithSourcemap.from_source(filename, tag_with_content, get_location(tag_offset));
const instances: TagInstance[] = [];
if (!attributes && !content) return no_change();
source.replace(tag_regex, (...match) => {
const [tag_with_content, attributes, content, tag_offset] = match;
const processed = await preprocessor({
instances.push({
tag_with_content,
attributes: attributes || '',
content: content || '',
attributes: parse_tag_attributes(attributes || ''),
filename
tag_offset
});
if (!processed) return no_change();
if (processed.dependencies) dependencies.push(...processed.dependencies);
return '';
});
return processed_tag_to_sws(processed, tag_name, attributes,
{source: content, get_location: offset => source.get_location(offset + tag_offset), filename});
}
return instances;
}
return {...await replace_in_code(tag_regex, process_single_tag, source), dependencies};
function to_source_update(tags: TagInstance[], processed: Processed[], tag_name: 'style' | 'script', source: Source) {
const { filename, get_location } = source;
const dependencies: string[] = [];
const replacements: Replacement[] = processed.map((processed, idx) => {
const match = tags[idx];
const {tag_with_content, attributes, content, tag_offset} = match;
let sws: StringWithSourcemap;
if (!processed) {
sws = StringWithSourcemap.from_source(filename, tag_with_content, get_location(tag_offset));
} else {
if (processed.dependencies) dependencies.push(...processed.dependencies);
sws = processed_tag_to_sws(processed, tag_name, attributes, {
source: content,
get_location: offset => source.get_location(offset + tag_offset),
filename
});
}
return { offset: tag_offset, length: tag_with_content.length, replacement: sws };
});
return {...perform_replacements(replacements, source), dependencies};
}
export default async function preprocess(
source: string,
/**
* Calculate the updates required to process all instances of the specified tag.
*/
async function process_tag(
tag_name: 'style' | 'script',
preprocessor: Preprocessor | SyncPreprocessor,
source: Source
): Promise<SourceUpdate> {
const { filename } = source;
const tags = get_tag_instances(tag_name, source.source);
const processed = await Promise.all<Processed>(tags.map(({attributes, content}) => {
if (attributes || content) {
return preprocessor({
content,
attributes: parse_tag_attributes(attributes || ''),
filename
});
}
}));
return to_source_update(tags, processed, tag_name, source);
}
function process_tag_sync(
tag_name: 'style' | 'script',
preprocessor: SyncPreprocessor,
source: Source
): SourceUpdate {
const { filename } = source;
const tags = get_tag_instances(tag_name, source.source);
const processed: Processed[] = tags.map(({attributes, content}) => {
if (attributes || content) {
return preprocessor({
content,
attributes: parse_tag_attributes(attributes || ''),
filename
});
}
});
return to_source_update(tags, processed, tag_name, source);
}
function decode_preprocessor_params(
preprocessor: PreprocessorGroup | PreprocessorGroup[],
options?: { filename?: string }
): Promise<Processed> {
) {
// @ts-ignore todo: doublecheck
const filename = (options && options.filename) || preprocessor.filename; // legacy
const preprocessors = preprocessor
? Array.isArray(preprocessor) ? preprocessor : [preprocessor]
: [];
const preprocessors = preprocessor ? (Array.isArray(preprocessor) ? preprocessor : [preprocessor]) : [];
const markup = preprocessors.map(p => p.markup).filter(Boolean);
const script = preprocessors.map(p => p.script).filter(Boolean);
const style = preprocessors.map(p => p.style).filter(Boolean);
return { markup, script, style, filename };
}
function is_sync(processor: Preprocessor | SyncPreprocessor): processor is SyncPreprocessor {
return processor['is_sync'];
}
export function preprocess_sync(
source: string,
preprocessor: PreprocessorGroup | PreprocessorGroup[],
options?: { filename?: string }
): Processed {
const { markup, script, style, filename } = decode_preprocessor_params(preprocessor, options);
const result = new PreprocessResult(source, filename);
// TODO keep track: what preprocessor generated what sourcemap?
// to make debugging easier = detect low-resolution sourcemaps in fn combine_mappings
for (const process of markup) {
if (is_sync(process)) {
const processed = process({
content: result.source,
filename,
attributes: null
});
if (!processed) continue;
result.update_source({
string: processed.code,
map: processed.map
? // TODO: can we use decode_sourcemap?
typeof processed.map === 'string'
? JSON.parse(processed.map)
: processed.map
: undefined,
dependencies: processed.dependencies
});
}
}
for (const process of script) {
if (is_sync(process)) {
result.update_source(process_tag_sync('script', process, result));
}
}
for (const process of style) {
if (is_sync(process)) {
result.update_source(process_tag_sync('style', process, result));
}
}
return result.to_processed();
}
export default async function preprocess(
source: string,
preprocessor: PreprocessorGroup | PreprocessorGroup[],
options?: { filename?: string }
): Promise<Processed> {
const { markup, script, style, filename } = decode_preprocessor_params(preprocessor, options);
const result = new PreprocessResult(source, filename);
// TODO keep track: what preprocessor generated what sourcemap?
@ -167,7 +292,8 @@ export default async function preprocess(
for (const process of markup) {
const processed = await process({
content: result.source,
filename
filename,
attributes: null
});
if (!processed) continue;
@ -188,8 +314,8 @@ export default async function preprocess(
result.update_source(await process_tag('script', process, result));
}
for (const preprocess of style) {
result.update_source(await process_tag('style', preprocess, result));
for (const process of style) {
result.update_source(await process_tag('style', process, result));
}
return result.to_processed();

38
src/compiler/preprocess/replace_in_code.ts
Unescape View File

@ -7,37 +7,13 @@ export interface Source {
filename: string;
}
interface Replacement {
export interface Replacement {
offset: number;
length: number;
replacement: StringWithSourcemap;
}
function calculate_replacements(
re: RegExp,
get_replacement: (...match: any[]) => Promise<StringWithSourcemap>,
source: string
) {
const replacements: Array<Promise<Replacement>> = [];
source.replace(re, (...match) => {
replacements.push(
get_replacement(...match).then(
replacement => {
const matched_string = match[0];
const offset = match[match.length-2];
return ({ offset, length: matched_string.length, replacement });
}
)
);
return '';
});
return Promise.all(replacements);
}
function perform_replacements(
export function perform_replacements(
replacements: Replacement[],
{ filename, source, get_location }: Source
): StringWithSourcemap {
@ -56,13 +32,3 @@ function perform_replacements(
return out.concat(unchanged_suffix);
}
export async function replace_in_code(
regex: RegExp,
get_replacement: (...match: any[]) => Promise<StringWithSourcemap>,
location: Source
): Promise<StringWithSourcemap> {
const replacements = await calculate_replacements(regex, get_replacement, location.source);
return perform_replacements(replacements, location);
}

14
src/compiler/preprocess/types.ts
Unescape View File

@ -6,13 +6,17 @@ export interface Processed {
}
export interface PreprocessorGroup {
markup?: (options: { content: string; filename: string }) => Processed | Promise<Processed>;
style?: Preprocessor;
script?: Preprocessor;
markup?: Preprocessor | SyncPreprocessor;
style?: Preprocessor | SyncPreprocessor;
script?: Preprocessor | SyncPreprocessor;
}
export type Preprocessor = (options: {
interface PreprocessorOptions {
content: string;
attributes: Record<string, string | boolean>;
filename?: string;
}) => Processed | Promise<Processed>;
}
export declare type Preprocessor = (options: PreprocessorOptions) => Promise<Processed>;
export declare type SyncPreprocessor = ((options: PreprocessorOptions) => Processed) & { is_sync: true };

Write Preview
Loading…
Cancel
Save