espolar 0.1.3 → 0.1.5

package/README.md

@@ -92,18 +92,18 @@ Main entry point. Returns `PrintResult<Data>`.
 
 The context object passed to each printer function.
 
-| Method/Property                                         | Description                                     |
-| ------------------------------------------------------- | ----------------------------------------------- |
-| `readonly source: string`                               | The original source string                      |
-| `readonly generatedOffset: number`                      | Current output position                         |
-| `write(text: string)`                                   | Emit text to the output                         |
-| `writeNode(node)`                                       | Dispatch to a printer (preserving if untouched) |
-| `writeNodeList(nodes, separator)`                       | Print a list with explicit separator            |
-| `writeNodeListWithSourceGaps(nodes, fallbackSeparator)` | Print a list, copying source gaps between nodes |
-| `writePreservedNode(node)`                              | Force-preserve a node from source               |
-| `writeSource(start, end, data)`                         | Copy source range and add mapping               |
-| `getLeadingComments(node)`                              | Query leading comments                          |
-| `getTrailingComments(node)`                             | Query trailing comments                         |
+| Method/Property                                      | Description                                     |
+| ---------------------------------------------------- | ----------------------------------------------- |
+| `readonly source: string`                            | The original source string                      |
+| `readonly generatedOffset: number`                   | Current output position                         |
+| `write(text: string)`                                | Emit text to the output                         |
+| `writeMapped(text: string, srcStart, srcEnd, data?)` | Emit text to the output with mappings           |
+| `writeNode(node)`                                    | Dispatch to a printer (preserving if untouched) |
+| `writeNodeList(nodes, sep)`                          | Print a list with explicit separator            |
+| `writeNodeListWithSourceGaps(nodes, fallbackSep)`    | Print a list, copying source gaps between nodes |
+| `writeSource(start, end, data?)`                     | Copy source range and add mapping               |
+| `writePreservedNode(node)`                           | Force-preserve a node from source               |
+| `appendMapping(srcRange, genStart, genEnd, data)`    | Append a mapping manually                       |
 
 ### Exported helpers
 

package/dist/index.d.ts

@@ -90,7 +90,7 @@ interface PrinterContext<Data = any> {
   writeNode(node: AST.Node | null | undefined): void;
   writeNodeList(nodes: readonly (AST.Node | null | undefined)[], separator: string): void;
   writeNodeListWithSourceGaps(nodes: readonly (AST.Node | null | undefined)[], fallbackSeparator: string): void;
-  writeSource(start: number, end: number, data: Data): void;
+  writeSource(start: number, end: number, data?: Data): void;
   writePreservedNode(node: AST.Node): void;
   appendMapping(sourceRange: SourceRange, generatedStart: number, generatedEnd: number, data?: Data): void;
 }
@@ -175,6 +175,7 @@ declare const defaultPrinters: {
   ImportDeclaration: typeof printImportDeclaration;
   ImportExpression: typeof printImportExpression;
   ImportSpecifier: typeof printImportSpecifier;
+  ImportDefaultSpecifier: typeof printImportDefaultSpecifier;
   ExportNamedDeclaration: typeof printExportNamedDeclaration;
   ExportDefaultDeclaration: typeof printExportDefaultDeclaration;
   ExportAllDeclaration: typeof printExportAllDeclaration;
@@ -314,6 +315,7 @@ declare function printPropertyDefinition(node: AST.PropertyDefinition | AST.Acce
 declare function printMethodDefinition(node: AST.MethodDefinition | AST.TSAbstractMethodDefinition, context: PrinterContext): void;
 declare function printImportDeclaration(node: AST.ImportDeclaration, context: PrinterContext): void;
 declare function printImportExpression(node: AST.ImportExpression, context: PrinterContext): void;
+declare function printImportDefaultSpecifier(node: AST.ImportDefaultSpecifier, context: PrinterContext): void;
 declare function printImportSpecifier(node: AST.ImportSpecifier, context: PrinterContext): void;
 declare function printExportNamedDeclaration(node: AST.ExportNamedDeclaration, context: PrinterContext): void;
 declare function printExportDefaultDeclaration(node: AST.ExportDefaultDeclaration, context: PrinterContext): void;

package/dist/index.js

@@ -161,6 +161,7 @@ const defaultPrinters = {
 	ImportDeclaration: printImportDeclaration,
 	ImportExpression: printImportExpression,
 	ImportSpecifier: printImportSpecifier,
+	ImportDefaultSpecifier: printImportDefaultSpecifier,
 	ExportNamedDeclaration: printExportNamedDeclaration,
 	ExportDefaultDeclaration: printExportDefaultDeclaration,
 	ExportAllDeclaration: printExportAllDeclaration,
@@ -829,7 +830,7 @@ function printImportDeclaration(node, context) {
 	}
 	let wroteDefault = false;
 	for (const s of specifiers) if (s.type === "ImportDefaultSpecifier") {
-		context.writeNode(s.local);
+		context.writeNode(s);
 		wroteDefault = true;
 	}
 	let namespaceSpec;
@@ -865,6 +866,9 @@ function printImportExpression(node, context) {
 	}
 	context.write(")");
 }
+function printImportDefaultSpecifier(node, context) {
+	context.writeNode(node.local);
+}
 function printImportSpecifier(node, context) {
 	if (node.importKind === "type") context.write("type ");
 	if (node.local.type === "Identifier" && node.imported.type === "Identifier" && node.local.name !== node.imported.name) {
@@ -1411,7 +1415,7 @@ function createPrinterContext(options) {
 			generatedOffset += text.length;
 		},
 		writeMapped(text, sourceStart, sourceEnd, data) {
-			if (text.length === 0 || sourceEnd <= sourceStart) return;
+			if (text.length === 0 || sourceEnd < sourceStart) return;
 			const generatedStart = generatedOffset;
 			context.write(text);
 			appendMapping({
@@ -1468,13 +1472,13 @@ function createPrinterContext(options) {
 			}
 		},
 		writeSource(start, end, data) {
-			if (end <= start) return;
+			if (end < start) return;
 			const generatedStart = generatedOffset;
 			context.write(options.source.slice(start, end));
 			appendMapping({
 				start,
 				end
-			}, generatedStart, generatedOffset, data);
+			}, generatedStart, generatedOffset, data ?? getMappingData(null));
 		},
 		writePreservedNode(node) {
 			const range = getNodeRange(node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "espolar",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {