yuku-codegen 0.5.41 → 0.5.43

package/README.md

@@ -52,7 +52,7 @@ const out = print(program, {
   indent: 2,
   quotes: "preserve",
   comments: "some",
-  sourceMaps: { lineStarts },
+  sourceMaps: { source },
 });
 ```
 
@@ -62,22 +62,22 @@ const out = print(program, {
 | `indent`     | `number`                                 | `2`        | Spaces per indentation level. Applies in pretty mode only.                   |
 | `quotes`     | `"preserve" \| "double" \| "single"`     | `"preserve"` | Quote style for string literals. `"preserve"` keeps each literal's source quote style (re-escaping the content); `"double"` / `"single"` force one. |
 | `comments`   | `boolean \| "some" \| "line" \| "block"` | `"some"`   | Comment passthrough filter. See [Comments](#comments).                       |
-| `sourceMaps` | `SourceMapOptions`                       | `undefined` | Pass an object to emit a Source Map V3. Its `lineStarts` is required, the rest of the metadata is optional. See [Source maps](#source-maps). |
+| `sourceMaps` | `SourceMapOptions`                       | `undefined` | Pass an object to emit a Source Map V3. Its `source` is required, the rest of the metadata is optional. See [Source maps](#source-maps). |
 
 ## Source maps
 
-Pass a `SourceMapOptions` object to emit a Source Map V3. Its `lineStarts` field is required: feed it the `lineStarts` array from the parser's `ParseResult` (this is what maps generated positions back to the source). The remaining fields (`file`, `sources`, `sourcesContent`, `sourceRoot`) are optional metadata.
+Pass a `SourceMapOptions` object to emit a Source Map V3. Its `source` field is required: feed it the original source text (this is what maps generated positions back to the source). Without it, no map is produced and `map` is `null`. The remaining fields (`file`, `sources`, `sourcesContent`, `sourceRoot`) are optional metadata.
 
 ```js
 import { parse } from "yuku-parser";
 import { print } from "yuku-codegen";
 
 const source = `const greet = (name) => "Hello, " + name;`;
-const { program, lineStarts } = parse(source);
+const { program } = parse(source);
 
 const { code, map } = print(program, {
   sourceMaps: {
-    lineStarts,
+    source,
     file: "out.js",
     sourceFileName: "in.js",
     sourcesContent: source,
@@ -92,7 +92,7 @@ await Bun.write("out.js.map", JSON.stringify(map));
 
 | Field            | Type       | Description                                                                       |
 | ---------------- | ---------- | --------------------------------------------------------------------------------- |
-| `lineStarts`     | `number[]` | **Required.** The parser's `ParseResult.lineStarts`, used to map positions to the source. |
+| `source`         | `string`   | **Required.** The original source text, used to map positions to the source. |
 | `file`           | `string`   | Output filename, embedded as the map's `file`.                                    |
 | `sourceFileName` | `string` | Source filename, embedded as the single entry of `sources`.                         |
 | `sourceRoot`     | `string` | Prefix embedded as `sourceRoot`.                                                    |

package/encode.js

@@ -1,7 +1,7 @@
 // generated by tools/estree/encoder.zig, do not edit
 const NULL = 0xFFFFFFFF;
 const NODE_SIZE = 48;
-const HEADER_SIZE = 44;
+const HEADER_SIZE = 40;
 const NODE_FLAGS_OFFSET = 2;
 const NODE_FIELD0_OFFSET = 4;
 const NODE_HEADER_U32S = 2;
@@ -32,7 +32,7 @@ const ACCESSIBILITY_INV = (v) =>
   : 3;
 const TS_MAPPED_OPTIONAL_INV = (v) => v === true ? 1 : v === "+" ? 2 : v === "-" ? 3 : 0;
 const TS_MAPPED_READONLY_INV = (v) => v === true ? 1 : v === "+" ? 2 : v === "-" ? 3 : 0;
-function encode(program, lineStarts) {
+function encode(program) {
   const root = program;
   const sizeHint = root.end || 0;
   let nodeCap = Math.max(512, (sizeHint / 7) | 0);
@@ -2333,23 +2333,13 @@ function encode(program, lineStarts) {
       }
     }
   }
-  const lineStartsCount = Array.isArray(lineStarts) ? lineStarts.length : 0;
-  let lineStartsBytes = null;
-  if (lineStartsCount > 0) {
-    lineStartsBytes = new ArrayBuffer(lineStartsCount * 4);
-    const lsDV = new DataView(lineStartsBytes);
-    for (let i = 0; i < lineStartsCount; i++) {
-      lsDV.setUint32(i * 4, lineStarts[i] >>> 0, true);
-    }
-  }
   const totalNodeBytes = nodeCount * NODE_SIZE;
   const totalExtraBytes = extraCount * 4;
   const totalOffsetsBytes = attached ? (nodeCount + 1) * 4 : 0;
   const totalAttachedBytes = attachedCount * ATTACHED_COMMENT_SIZE;
-  const totalLineStartsBytes = lineStartsCount * 4;
   const finalSize =
     HEADER_SIZE + totalNodeBytes + totalExtraBytes + poolLen +
-    totalOffsetsBytes + totalAttachedBytes + totalLineStartsBytes;
+    totalOffsetsBytes + totalAttachedBytes;
   const out = new ArrayBuffer(finalSize);
   const outU8 = new Uint8Array(out);
   const outU32 = new Uint32Array(out, 0, (finalSize >>> 2));
@@ -2359,23 +2349,20 @@ function encode(program, lineStarts) {
   outU32[3] = 0;
   outU32[4] = 0;
   outU32[5] = attachedCount;
-  outU32[6] = lineStartsCount;
-  outU32[7] = 0;
-  outU32[8] = progIdx;
-  outU32[9] = attached ? FLAG_ATTACHED_COMMENTS : 0;
-  outU32[10] = 0;
+  outU32[6] = 0;
+  outU32[7] = progIdx;
+  outU32[8] = attached ? FLAG_ATTACHED_COMMENTS : 0;
+  outU32[9] = 0;
   const nodesOff = HEADER_SIZE;
   const extrasOff = nodesOff + totalNodeBytes;
   const poolOff = extrasOff + totalExtraBytes;
   const offsetsOff = poolOff + poolLen;
   const attachedOff = offsetsOff + totalOffsetsBytes;
-  const lineStartsOff = attachedOff + totalAttachedBytes;
   outU8.set(new Uint8Array(nodeAB, 0, totalNodeBytes), nodesOff);
   outU8.set(new Uint8Array(extras.buffer, 0, totalExtraBytes), extrasOff);
   outU8.set(pool.subarray(0, poolLen), poolOff);
   if (offsetsBytes !== null) outU8.set(new Uint8Array(offsetsBytes), offsetsOff);
   if (attachedBytes !== null) outU8.set(new Uint8Array(attachedBytes), attachedOff);
-  if (lineStartsBytes !== null) outU8.set(new Uint8Array(lineStartsBytes), lineStartsOff);
   return out;
 }
 export { encode };

package/index.d.ts

@@ -28,11 +28,10 @@ export type { Comment };
 /** Source-map configuration. Pass to `CodegenOptions.sourceMaps` to enable. */
 export interface SourceMapOptions {
   /**
-   * UTF-16 line-start offsets, taken straight from the parser's
-   * `ParseResult.lineStarts`. Required: this is what maps generated positions
-   * back to the original source.
+   * The original source text. Required to emit a map; without it, `map` is
+   * `null`.
    */
-  lineStarts: number[];
+  source: string;
   /** Output filename, embedded as the map's `file`. */
   file?: string;
   /** Source filename, embedded as the single entry of `sources`. */
@@ -56,7 +55,7 @@ export interface CodegenOptions {
   quotes?: Quotes;
   /**
    * Enable Source Map V3 output. Pass a {@link SourceMapOptions} object. Its
-   * `lineStarts` (from the parser) is required. The rest of the metadata
+   * `source` (the original source text) is required. The rest of the metadata
    * (`file`, `sources`, `sourcesContent`, `sourceRoot`) is optional. Omit to
    * disable.
    * @default undefined

package/index.js

@@ -7,13 +7,7 @@ function normalizeOptions(options) {
   const c = next.comments;
   if (c === true) next.comments = "all";
   else if (c === false) next.comments = "none";
-  const s = next.sourceMaps;
-  if (s) {
-    const { lineStarts: _, ...meta } = s;
-    next.sourceMaps = meta;
-  } else {
-    next.sourceMaps = undefined;
-  }
+  if (next.sourceMaps == null) next.sourceMaps = undefined;
   return next;
 }
 
@@ -24,15 +18,7 @@ function run(method, program, options) {
         (program === null ? "null" : typeof program),
     );
   }
-  const sourceMaps = options?.sourceMaps;
-  const lineStarts = sourceMaps ? sourceMaps.lineStarts : null;
-  if (sourceMaps && !Array.isArray(lineStarts)) {
-    throw new Error(
-      "`sourceMaps` requires a `lineStarts` array. Pass the parser's " +
-        "`ParseResult.lineStarts`, e.g. `{ sourceMaps: { lineStarts } }`.",
-    );
-  }
-  return binding[method](encode(program, lineStarts), normalizeOptions(options));
+  return binding[method](encode(program), normalizeOptions(options));
 }
 
 export function print(program, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuku-codegen",
-  "version": "0.5.41",
+  "version": "0.5.43",
   "description": "High-performance JavaScript/TypeScript code generator written in Zig",
   "license": "MIT",
   "repository": {
@@ -17,17 +17,17 @@
     "encode.js"
   ],
   "optionalDependencies": {
-    "@yuku-codegen/binding-linux-x64-gnu": "0.5.41",
-    "@yuku-codegen/binding-linux-arm64-gnu": "0.5.41",
-    "@yuku-codegen/binding-linux-arm-gnu": "0.5.41",
-    "@yuku-codegen/binding-linux-x64-musl": "0.5.41",
-    "@yuku-codegen/binding-linux-arm64-musl": "0.5.41",
-    "@yuku-codegen/binding-linux-arm-musl": "0.5.41",
-    "@yuku-codegen/binding-darwin-x64": "0.5.41",
-    "@yuku-codegen/binding-darwin-arm64": "0.5.41",
-    "@yuku-codegen/binding-win32-x64": "0.5.41",
-    "@yuku-codegen/binding-win32-arm64": "0.5.41",
-    "@yuku-codegen/binding-freebsd-x64": "0.5.41"
+    "@yuku-codegen/binding-linux-x64-gnu": "0.5.43",
+    "@yuku-codegen/binding-linux-arm64-gnu": "0.5.43",
+    "@yuku-codegen/binding-linux-arm-gnu": "0.5.43",
+    "@yuku-codegen/binding-linux-x64-musl": "0.5.43",
+    "@yuku-codegen/binding-linux-arm64-musl": "0.5.43",
+    "@yuku-codegen/binding-linux-arm-musl": "0.5.43",
+    "@yuku-codegen/binding-darwin-x64": "0.5.43",
+    "@yuku-codegen/binding-darwin-arm64": "0.5.43",
+    "@yuku-codegen/binding-win32-x64": "0.5.43",
+    "@yuku-codegen/binding-win32-arm64": "0.5.43",
+    "@yuku-codegen/binding-freebsd-x64": "0.5.43"
   },
   "keywords": [
     "ast",
@@ -40,6 +40,6 @@
     "typescript"
   ],
   "dependencies": {
-    "@yuku-toolchain/types": "0.5.37"
+    "@yuku-toolchain/types": "0.5.42"
   }
 }