vite-node 3.0.9 → 3.1.0-beta.2

package/dist/source-map.cjs

@@ -590,385 +590,302 @@ const reSourceMap = /^data:application\/json[^,]+base64,/;
 let retrieveFileHandlers = [];
 let retrieveMapHandlers = [];
 function globalProcessVersion() {
-  if (typeof process === "object" && process !== null) {
-    return process.version;
-  } else {
-    return "";
-  }
+	if (typeof process === "object" && process !== null) return process.version;
+	else return "";
 }
 function handlerExec(list) {
-  return function(arg) {
-    for (let i = 0; i < list.length; i++) {
-      const ret = list[i](arg);
-      if (ret) {
-        return ret;
-      }
-    }
-    return null;
-  };
+	return function(arg) {
+		for (let i = 0; i < list.length; i++) {
+			const ret = list[i](arg);
+			if (ret) return ret;
+		}
+		return null;
+	};
 }
 let retrieveFile = handlerExec(retrieveFileHandlers);
-retrieveFileHandlers.push((path2) => {
-  path2 = path2.trim();
-  if (path2.startsWith("file:")) {
-    path2 = path2.replace(/file:\/\/\/(\w:)?/, (protocol, drive) => {
-      return drive ? "" : "/";
-    });
-  }
-  if (path2 in fileContentsCache) {
-    return fileContentsCache[path2];
-  }
-  let contents = "";
-  try {
-    if (fs.existsSync(path2)) {
-      contents = fs.readFileSync(path2, "utf8");
-    }
-  } catch {
-  }
-  return fileContentsCache[path2] = contents;
+retrieveFileHandlers.push((path) => {
+	path = path.trim();
+	if (path.startsWith("file:")) path = path.replace(/file:\/\/\/(\w:)?/, (protocol, drive) => {
+		return drive ? "" : "/";
+	});
+	if (path in fileContentsCache) return fileContentsCache[path];
+	let contents = "";
+	try {
+		if (fs.existsSync(path)) contents = fs.readFileSync(path, "utf8");
+	} catch {}
+	return fileContentsCache[path] = contents;
 });
 function supportRelativeURL(file, url) {
-  if (!file) {
-    return url;
-  }
-  const dir = path.dirname(file);
-  const match = /^\w+:\/\/[^/]*/.exec(dir);
-  let protocol = match ? match[0] : "";
-  const startPath = dir.slice(protocol.length);
-  if (protocol && /^\/\w:/.test(startPath)) {
-    protocol += "/";
-    return protocol + path.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
-  }
-  return protocol + path.resolve(dir.slice(protocol.length), url);
+	if (!file) return url;
+	const dir = path.dirname(file);
+	const match = /^\w+:\/\/[^/]*/.exec(dir);
+	let protocol = match ? match[0] : "";
+	const startPath = dir.slice(protocol.length);
+	if (protocol && /^\/\w:/.test(startPath)) {
+		protocol += "/";
+		return protocol + path.resolve(dir.slice(protocol.length), url).replace(/\\/g, "/");
+	}
+	return protocol + path.resolve(dir.slice(protocol.length), url);
 }
 function retrieveSourceMapURL(source) {
-  const fileData = retrieveFile(source);
-  if (!fileData) {
-    return null;
-  }
-  const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
-  let lastMatch, match;
-  while (match = re.exec(fileData)) {
-    lastMatch = match;
-  }
-  if (!lastMatch) {
-    return null;
-  }
-  return lastMatch[1];
+	const fileData = retrieveFile(source);
+	if (!fileData) return null;
+	const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
+	let lastMatch, match;
+	while (match = re.exec(fileData)) lastMatch = match;
+	if (!lastMatch) return null;
+	return lastMatch[1];
 }
 let retrieveSourceMap = handlerExec(retrieveMapHandlers);
 retrieveMapHandlers.push((source) => {
-  let sourceMappingURL = retrieveSourceMapURL(source);
-  if (!sourceMappingURL) {
-    return null;
-  }
-  let sourceMapData;
-  if (reSourceMap.test(sourceMappingURL)) {
-    const rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(",") + 1);
-    sourceMapData = Buffer.from(rawData, "base64").toString();
-    sourceMappingURL = source;
-  } else {
-    sourceMappingURL = supportRelativeURL(source, sourceMappingURL);
-    sourceMapData = retrieveFile(sourceMappingURL);
-  }
-  if (!sourceMapData) {
-    return null;
-  }
-  return {
-    url: sourceMappingURL,
-    map: sourceMapData
-  };
+	let sourceMappingURL = retrieveSourceMapURL(source);
+	if (!sourceMappingURL) return null;
+	let sourceMapData;
+	if (reSourceMap.test(sourceMappingURL)) {
+		const rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(",") + 1);
+		sourceMapData = Buffer.from(rawData, "base64").toString();
+		sourceMappingURL = source;
+	} else {
+		sourceMappingURL = supportRelativeURL(source, sourceMappingURL);
+		sourceMapData = retrieveFile(sourceMappingURL);
+	}
+	if (!sourceMapData) return null;
+	return {
+		url: sourceMappingURL,
+		map: sourceMapData
+	};
 });
 function mapSourcePosition(position) {
-  var _a;
-  if (!position.source) {
-    return position;
-  }
-  let sourceMap = sourceMapCache[position.source];
-  if (!sourceMap) {
-    const urlAndMap = retrieveSourceMap(position.source);
-    if (urlAndMap && urlAndMap.map) {
-      sourceMap = sourceMapCache[position.source] = {
-        url: urlAndMap.url,
-        map: new TraceMap(urlAndMap.map)
-      };
-      if ((_a = sourceMap.map) == null ? void 0 : _a.sourcesContent) {
-        sourceMap.map.sources.forEach((source, i) => {
-          var _a2, _b;
-          const contents = (_b = (_a2 = sourceMap.map) == null ? void 0 : _a2.sourcesContent) == null ? void 0 : _b[i];
-          if (contents && source && sourceMap.url) {
-            const url = supportRelativeURL(sourceMap.url, source);
-            fileContentsCache[url] = contents;
-          }
-        });
-      }
-    } else {
-      sourceMap = sourceMapCache[position.source] = {
-        url: null,
-        map: null
-      };
-    }
-  }
-  if (sourceMap && sourceMap.map && sourceMap.url) {
-    const originalPosition = originalPositionFor(sourceMap.map, position);
-    if (originalPosition.source !== null) {
-      originalPosition.source = supportRelativeURL(
-        sourceMap.url,
-        originalPosition.source
-      );
-      return originalPosition;
-    }
-  }
-  return position;
+	if (!position.source) return position;
+	let sourceMap = sourceMapCache[position.source];
+	if (!sourceMap) {
+		const urlAndMap = retrieveSourceMap(position.source);
+		if (urlAndMap && urlAndMap.map) {
+			var _sourceMap$map;
+			sourceMap = sourceMapCache[position.source] = {
+				url: urlAndMap.url,
+				map: new TraceMap(urlAndMap.map)
+			};
+			if ((_sourceMap$map = sourceMap.map) === null || _sourceMap$map === void 0 ? void 0 : _sourceMap$map.sourcesContent) sourceMap.map.sources.forEach((source, i) => {
+				var _sourceMap$map2;
+				const contents = (_sourceMap$map2 = sourceMap.map) === null || _sourceMap$map2 === void 0 || (_sourceMap$map2 = _sourceMap$map2.sourcesContent) === null || _sourceMap$map2 === void 0 ? void 0 : _sourceMap$map2[i];
+				if (contents && source && sourceMap.url) {
+					const url = supportRelativeURL(sourceMap.url, source);
+					fileContentsCache[url] = contents;
+				}
+			});
+		} else sourceMap = sourceMapCache[position.source] = {
+			url: null,
+			map: null
+		};
+	}
+	if (sourceMap && sourceMap.map && sourceMap.url) {
+		const originalPosition = originalPositionFor(sourceMap.map, position);
+		if (originalPosition.source !== null) {
+			originalPosition.source = supportRelativeURL(sourceMap.url, originalPosition.source);
+			return originalPosition;
+		}
+	}
+	return position;
 }
 function mapEvalOrigin(origin) {
-  let match = /^eval at ([^(]+) \((.+):(\d+):(\d+)\)$/.exec(origin);
-  if (match) {
-    const position = mapSourcePosition({
-      name: null,
-      source: match[2],
-      line: +match[3],
-      column: +match[4] - 1
-    });
-    return `eval at ${match[1]} (${position.source}:${position.line}:${position.column + 1})`;
-  }
-  match = /^eval at ([^(]+) \((.+)\)$/.exec(origin);
-  if (match) {
-    return `eval at ${match[1]} (${mapEvalOrigin(match[2])})`;
-  }
-  return origin;
+	let match = /^eval at ([^(]+) \((.+):(\d+):(\d+)\)$/.exec(origin);
+	if (match) {
+		const position = mapSourcePosition({
+			name: null,
+			source: match[2],
+			line: +match[3],
+			column: +match[4] - 1
+		});
+		return `eval at ${match[1]} (${position.source}:${position.line}:${position.column + 1})`;
+	}
+	match = /^eval at ([^(]+) \((.+)\)$/.exec(origin);
+	if (match) return `eval at ${match[1]} (${mapEvalOrigin(match[2])})`;
+	return origin;
 }
 function CallSiteToString() {
-  let fileName;
-  let fileLocation = "";
-  if (this.isNative()) {
-    fileLocation = "native";
-  } else {
-    fileName = this.getScriptNameOrSourceURL();
-    if (!fileName && this.isEval()) {
-      fileLocation = this.getEvalOrigin();
-      fileLocation += ", ";
-    }
-    if (fileName) {
-      fileLocation += fileName;
-    } else {
-      fileLocation += "<anonymous>";
-    }
-    const lineNumber = this.getLineNumber();
-    if (lineNumber != null) {
-      fileLocation += `:${lineNumber}`;
-      const columnNumber = this.getColumnNumber();
-      if (columnNumber) {
-        fileLocation += `:${columnNumber}`;
-      }
-    }
-  }
-  let line = "";
-  const functionName = this.getFunctionName();
-  let addSuffix = true;
-  const isConstructor = this.isConstructor();
-  const isMethodCall = !(this.isToplevel() || isConstructor);
-  if (isMethodCall) {
-    let typeName = this.getTypeName();
-    if (typeName === "[object Object]") {
-      typeName = "null";
-    }
-    const methodName = this.getMethodName();
-    if (functionName) {
-      if (typeName && functionName.indexOf(typeName) !== 0) {
-        line += `${typeName}.`;
-      }
-      line += functionName;
-      if (methodName && functionName.indexOf(`.${methodName}`) !== functionName.length - methodName.length - 1) {
-        line += ` [as ${methodName}]`;
-      }
-    } else {
-      line += `${typeName}.${methodName || "<anonymous>"}`;
-    }
-  } else if (isConstructor) {
-    line += `new ${functionName || "<anonymous>"}`;
-  } else if (functionName) {
-    line += functionName;
-  } else {
-    line += fileLocation;
-    addSuffix = false;
-  }
-  if (addSuffix) {
-    line += ` (${fileLocation})`;
-  }
-  return line;
+	let fileName;
+	let fileLocation = "";
+	if (this.isNative()) fileLocation = "native";
+	else {
+		fileName = this.getScriptNameOrSourceURL();
+		if (!fileName && this.isEval()) {
+			fileLocation = this.getEvalOrigin();
+			fileLocation += ", ";
+		}
+		if (fileName) fileLocation += fileName;
+		else fileLocation += "<anonymous>";
+		const lineNumber = this.getLineNumber();
+		if (lineNumber != null) {
+			fileLocation += `:${lineNumber}`;
+			const columnNumber = this.getColumnNumber();
+			if (columnNumber) fileLocation += `:${columnNumber}`;
+		}
+	}
+	let line = "";
+	const functionName = this.getFunctionName();
+	let addSuffix = true;
+	const isConstructor = this.isConstructor();
+	const isMethodCall = !(this.isToplevel() || isConstructor);
+	if (isMethodCall) {
+		let typeName = this.getTypeName();
+		if (typeName === "[object Object]") typeName = "null";
+		const methodName = this.getMethodName();
+		if (functionName) {
+			if (typeName && functionName.indexOf(typeName) !== 0) line += `${typeName}.`;
+			line += functionName;
+			if (methodName && functionName.indexOf(`.${methodName}`) !== functionName.length - methodName.length - 1) line += ` [as ${methodName}]`;
+		} else line += `${typeName}.${methodName || "<anonymous>"}`;
+	} else if (isConstructor) line += `new ${functionName || "<anonymous>"}`;
+	else if (functionName) line += functionName;
+	else {
+		line += fileLocation;
+		addSuffix = false;
+	}
+	if (addSuffix) line += ` (${fileLocation})`;
+	return line;
 }
 function cloneCallSite(frame) {
-  const object = {};
-  Object.getOwnPropertyNames(Object.getPrototypeOf(frame)).forEach((name) => {
-    const key = name;
-    object[key] = /^(?:is|get)/.test(name) ? function() {
-      return frame[key].call(frame);
-    } : frame[key];
-  });
-  object.toString = CallSiteToString;
-  return object;
+	const object = {};
+	Object.getOwnPropertyNames(Object.getPrototypeOf(frame)).forEach((name) => {
+		const key = name;
+		object[key] = /^(?:is|get)/.test(name) ? function() {
+			return frame[key].call(frame);
+		} : frame[key];
+	});
+	object.toString = CallSiteToString;
+	return object;
 }
 function wrapCallSite(frame, state) {
-  if (state === void 0) {
-    state = { nextPosition: null, curPosition: null };
-  }
-  if (frame.isNative()) {
-    state.curPosition = null;
-    return frame;
-  }
-  const source = frame.getFileName() || frame.getScriptNameOrSourceURL();
-  if (source) {
-    const line = frame.getLineNumber();
-    let column = frame.getColumnNumber() - 1;
-    const noHeader = /^v(?:10\.1[6-9]|10\.[2-9]\d|10\.\d{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
-    const headerLength = noHeader.test(globalProcessVersion()) ? 0 : 62;
-    if (line === 1 && column > headerLength && !frame.isEval()) {
-      column -= headerLength;
-    }
-    const position = mapSourcePosition({
-      name: null,
-      source,
-      line,
-      column
-    });
-    state.curPosition = position;
-    frame = cloneCallSite(frame);
-    const originalFunctionName = frame.getFunctionName;
-    frame.getFunctionName = function() {
-      if (state.nextPosition == null) {
-        return originalFunctionName();
-      }
-      return state.nextPosition.name || originalFunctionName();
-    };
-    frame.getFileName = function() {
-      return position.source ?? void 0;
-    };
-    frame.getLineNumber = function() {
-      return position.line;
-    };
-    frame.getColumnNumber = function() {
-      return position.column + 1;
-    };
-    frame.getScriptNameOrSourceURL = function() {
-      return position.source;
-    };
-    return frame;
-  }
-  let origin = frame.isEval() && frame.getEvalOrigin();
-  if (origin) {
-    origin = mapEvalOrigin(origin);
-    frame = cloneCallSite(frame);
-    frame.getEvalOrigin = function() {
-      return origin || void 0;
-    };
-    return frame;
-  }
-  return frame;
+	if (state === void 0) state = {
+		nextPosition: null,
+		curPosition: null
+	};
+	if (frame.isNative()) {
+		state.curPosition = null;
+		return frame;
+	}
+	const source = frame.getFileName() || frame.getScriptNameOrSourceURL();
+	if (source) {
+		const line = frame.getLineNumber();
+		let column = frame.getColumnNumber() - 1;
+		const noHeader = /^v(?:10\.1[6-9]|10\.[2-9]\d|10\.\d{3,}|1[2-9]\d*|[2-9]\d|\d{3,}|11\.11)/;
+		const headerLength = noHeader.test(globalProcessVersion()) ? 0 : 62;
+		if (line === 1 && column > headerLength && !frame.isEval()) column -= headerLength;
+		const position = mapSourcePosition({
+			name: null,
+			source,
+			line,
+			column
+		});
+		state.curPosition = position;
+		frame = cloneCallSite(frame);
+		const originalFunctionName = frame.getFunctionName;
+		frame.getFunctionName = function() {
+			if (state.nextPosition == null) return originalFunctionName();
+			return state.nextPosition.name || originalFunctionName();
+		};
+		frame.getFileName = function() {
+			return position.source ?? void 0;
+		};
+		frame.getLineNumber = function() {
+			return position.line;
+		};
+		frame.getColumnNumber = function() {
+			return position.column + 1;
+		};
+		frame.getScriptNameOrSourceURL = function() {
+			return position.source;
+		};
+		return frame;
+	}
+	let origin = frame.isEval() && frame.getEvalOrigin();
+	if (origin) {
+		origin = mapEvalOrigin(origin);
+		frame = cloneCallSite(frame);
+		frame.getEvalOrigin = function() {
+			return origin || void 0;
+		};
+		return frame;
+	}
+	return frame;
 }
 function prepareStackTrace(error, stack) {
-  const name = error.name || "Error";
-  const message = error.message || "";
-  const errorString = `${name}: ${message}`;
-  const state = { nextPosition: null, curPosition: null };
-  const processedStack = [];
-  for (let i = stack.length - 1; i >= 0; i--) {
-    processedStack.push(`
-    at ${wrapCallSite(stack[i], state)}`);
-    state.nextPosition = state.curPosition;
-  }
-  state.curPosition = state.nextPosition = null;
-  return errorString + processedStack.reverse().join("");
+	const name = error.name || "Error";
+	const message = error.message || "";
+	const errorString = `${name}: ${message}`;
+	const state = {
+		nextPosition: null,
+		curPosition: null
+	};
+	const processedStack = [];
+	for (let i = stack.length - 1; i >= 0; i--) {
+		processedStack.push(`\n    at ${wrapCallSite(stack[i], state)}`);
+		state.nextPosition = state.curPosition;
+	}
+	state.curPosition = state.nextPosition = null;
+	return errorString + processedStack.reverse().join("");
 }
 retrieveFileHandlers.slice(0);
 retrieveMapHandlers.slice(0);
 function install(options) {
-  options = options || {};
-  if (options.retrieveFile) {
-    if (options.overrideRetrieveFile) {
-      retrieveFileHandlers.length = 0;
-    }
-    retrieveFileHandlers.unshift(options.retrieveFile);
-  }
-  if (options.retrieveSourceMap) {
-    if (options.overrideRetrieveSourceMap) {
-      retrieveMapHandlers.length = 0;
-    }
-    retrieveMapHandlers.unshift(options.retrieveSourceMap);
-  }
-  if (!errorFormatterInstalled) {
-    errorFormatterInstalled = true;
-    Error.prepareStackTrace = prepareStackTrace;
-  }
+	options = options || {};
+	if (options.retrieveFile) {
+		if (options.overrideRetrieveFile) retrieveFileHandlers.length = 0;
+		retrieveFileHandlers.unshift(options.retrieveFile);
+	}
+	if (options.retrieveSourceMap) {
+		if (options.overrideRetrieveSourceMap) retrieveMapHandlers.length = 0;
+		retrieveMapHandlers.unshift(options.retrieveSourceMap);
+	}
+	if (!errorFormatterInstalled) {
+		errorFormatterInstalled = true;
+		Error.prepareStackTrace = prepareStackTrace;
+	}
 }
 
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 const VITE_NODE_SOURCEMAPPING_SOURCE = "//# sourceMappingSource=vite-node";
 const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`;
-const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(
-  `//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`
-);
+const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
 function withInlineSourcemap(result, options) {
-  var _a;
-  const map = result.map;
-  let code = result.code;
-  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_SOURCE)) {
-    return result;
-  }
-  if ("sources" in map) {
-    map.sources = (_a = map.sources) == null ? void 0 : _a.map((source) => {
-      if (!source) {
-        return source;
-      }
-      if (pathe.isAbsolute(source)) {
-        const actualPath = !source.startsWith(utils.withTrailingSlash(options.root)) && source.startsWith("/") ? pathe.resolve(options.root, source.slice(1)) : source;
-        return pathe.relative(pathe.dirname(options.filepath), actualPath);
-      }
-      return source;
-    });
-  }
-  const OTHER_SOURCE_MAP_REGEXP = new RegExp(
-    `//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`,
-    "gm"
-  );
-  while (OTHER_SOURCE_MAP_REGEXP.test(code)) {
-    code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
-  }
-  if (!options.noFirstLineMapping && map.mappings.startsWith(";")) {
-    map.mappings = `AAAA,CAAA${map.mappings}`;
-  }
-  const sourceMap = Buffer.from(JSON.stringify(map), "utf-8").toString(
-    "base64"
-  );
-  result.code = `${code.trimEnd()}
-
-${VITE_NODE_SOURCEMAPPING_SOURCE}
-//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${sourceMap}
-`;
-  return result;
+	const map = result.map;
+	let code = result.code;
+	if (!map || code.includes(VITE_NODE_SOURCEMAPPING_SOURCE)) return result;
+	if ("sources" in map) {
+		var _map$sources;
+		map.sources = (_map$sources = map.sources) === null || _map$sources === void 0 ? void 0 : _map$sources.map((source) => {
+			if (!source) return source;
+			if (pathe.isAbsolute(source)) {
+				const actualPath = !source.startsWith(utils.withTrailingSlash(options.root)) && source.startsWith("/") ? pathe.resolve(options.root, source.slice(1)) : source;
+				return pathe.relative(pathe.dirname(options.filepath), actualPath);
+			}
+			return source;
+		});
+	}
+	const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`, "gm");
+	while (OTHER_SOURCE_MAP_REGEXP.test(code)) code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
+	if (!options.noFirstLineMapping && map.mappings.startsWith(";")) map.mappings = `AAAA,CAAA${map.mappings}`;
+	const sourceMap = Buffer.from(JSON.stringify(map), "utf-8").toString("base64");
+	result.code = `${code.trimEnd()}\n\n${VITE_NODE_SOURCEMAPPING_SOURCE}\n//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${sourceMap}\n`;
+	return result;
 }
 function extractSourceMap(code) {
-  var _a;
-  const mapString = (_a = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) == null ? void 0 : _a[1];
-  if (mapString) {
-    return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
-  }
-  return null;
+	var _code$match;
+	const mapString = (_code$match = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) === null || _code$match === void 0 ? void 0 : _code$match[1];
+	if (mapString) return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+	return null;
 }
 function installSourcemapsSupport(options) {
-  install({
-    retrieveSourceMap(source) {
-      const map = options.getSourceMap(source);
-      if (map) {
-        return {
-          url: source,
-          map
-        };
-      }
-      return null;
-    }
-  });
+	install({ retrieveSourceMap(source) {
+		const map = options.getSourceMap(source);
+		if (map) return {
+			url: source,
+			map
+		};
+		return null;
+	} });
 }
 
 exports.extractSourceMap = extractSourceMap;