es-git 0.6.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/index.d.ts +381 -15
  2. package/index.js +57 -52
  3. package/package.json +16 -16
package/index.d.ts CHANGED
@@ -2288,7 +2288,8 @@ export declare class Reference {
2288
2288
  /**
2289
2289
  * Return the peeled OID target of this reference.
2290
2290
  *
2291
- * This peeled OID only applies to direct references that point to a hard.
2291
+ * This peeled OID only applies to direct references that point to a hard
2292
+ * Tag object: it is the result of peeling such Tag.
2292
2293
  *
2293
2294
  * @category Reference/Methods
2294
2295
  * @signature
@@ -4127,20 +4128,6 @@ export declare class Repository {
4127
4128
  * @returns Returns `true` if repository is a shallow clone.
4128
4129
  */
4129
4130
  isShallow(): boolean
4130
- /**
4131
- * Tests whether this repository is a worktree.
4132
- *
4133
- * @category Repository/Methods
4134
- * @signature
4135
- * ```ts
4136
- * class Repository {
4137
- * isWorktree(): boolean;
4138
- * }
4139
- * ```
4140
- *
4141
- * @returns Returns `true` if repository is a worktree.
4142
- */
4143
- isWorktree(): boolean
4144
4131
  /**
4145
4132
  * Tests whether this repository is empty.
4146
4133
  *
@@ -5185,6 +5172,72 @@ export declare class Repository {
5185
5172
  * @returns If it does not exist, returns `null`.
5186
5173
  */
5187
5174
  findTree(oid: string): Tree | null
5175
+ /**
5176
+ * Add a new worktree to the repository.
5177
+ *
5178
+ * @category Repository/Methods
5179
+ *
5180
+ * @signature
5181
+ * ```ts
5182
+ * class Repository {
5183
+ * worktree(name: string, path: string, options?: WorktreeAddOptions | null | undefined): Worktree;
5184
+ * }
5185
+ * ```
5186
+ *
5187
+ * @param {string} name - Name of the worktree to add.
5188
+ * @param {string} path - Path where the worktree should be created.
5189
+ * @param {WorktreeAddOptions} [options] - Options for adding the worktree.
5190
+ * @returns New worktree instance.
5191
+ * @throws Throws error if adding the worktree fails (e.g., path already exists, invalid reference name, or filesystem errors).
5192
+ */
5193
+ worktree(name: string, path: string, options?: WorktreeAddOptions | undefined | null): Worktree
5194
+ /**
5195
+ * List all worktrees in the repository.
5196
+ *
5197
+ * @category Repository/Methods
5198
+ *
5199
+ * @signature
5200
+ * ```ts
5201
+ * class Repository {
5202
+ * worktrees(): string[];
5203
+ * }
5204
+ * ```
5205
+ *
5206
+ * @returns Array of worktree names.
5207
+ * @throws Throws error if listing worktrees fails (e.g., filesystem errors or repository corruption).
5208
+ */
5209
+ worktrees(): Array<string>
5210
+ /**
5211
+ * Tests whether this repository is a worktree.
5212
+ *
5213
+ * @category Repository/Methods
5214
+ * @signature
5215
+ * ```ts
5216
+ * class Repository {
5217
+ * isWorktree(): boolean;
5218
+ * }
5219
+ * ```
5220
+ *
5221
+ * @returns Returns `true` if repository is a worktree.
5222
+ */
5223
+ isWorktree(): boolean
5224
+ /**
5225
+ * Find a worktree by name.
5226
+ *
5227
+ * @category Repository/Methods
5228
+ *
5229
+ * @signature
5230
+ * ```ts
5231
+ * class Repository {
5232
+ * findWorktree(name: string): Worktree;
5233
+ * }
5234
+ * ```
5235
+ *
5236
+ * @param {string} name - Name of the worktree to find.
5237
+ * @returns Worktree instance.
5238
+ * @throws Throws error if the worktree is not found or if opening fails.
5239
+ */
5240
+ findWorktree(name: string): Worktree
5188
5241
  }
5189
5242
 
5190
5243
  /**
@@ -6451,6 +6504,135 @@ export declare class TreeIter extends Iterator<TreeEntry, void, void> {
6451
6504
  next(value?: void): IteratorResult<TreeEntry, void>
6452
6505
  }
6453
6506
 
6507
+ /** A class to represent a git worktree. */
6508
+ export declare class Worktree {
6509
+ /**
6510
+ * Get the name of this worktree.
6511
+ *
6512
+ * @category Worktree/Methods
6513
+ *
6514
+ * @signature
6515
+ * ```ts
6516
+ * class Worktree {
6517
+ * name(): string | null;
6518
+ * }
6519
+ * ```
6520
+ *
6521
+ * @returns Name of this worktree. Returns `null` if the worktree has no name.
6522
+ */
6523
+ name(): string | null
6524
+ /**
6525
+ * Get the path of this worktree.
6526
+ *
6527
+ * @category Worktree/Methods
6528
+ *
6529
+ * @signature
6530
+ * ```ts
6531
+ * class Worktree {
6532
+ * path(): string;
6533
+ * }
6534
+ * ```
6535
+ *
6536
+ * @returns Path of this worktree.
6537
+ */
6538
+ path(): string
6539
+ /**
6540
+ * Validate that the worktree is in a valid state.
6541
+ *
6542
+ * @category Worktree/Methods
6543
+ *
6544
+ * @signature
6545
+ * ```ts
6546
+ * class Worktree {
6547
+ * validate(): void;
6548
+ * }
6549
+ * ```
6550
+ *
6551
+ * @throws Throws error if the worktree is in an invalid state.
6552
+ */
6553
+ validate(): void
6554
+ /**
6555
+ * Lock the worktree.
6556
+ *
6557
+ * @category Worktree/Methods
6558
+ *
6559
+ * @signature
6560
+ * ```ts
6561
+ * class Worktree {
6562
+ * lock(reason?: string | null | undefined): void;
6563
+ * }
6564
+ * ```
6565
+ *
6566
+ * @param {string} [reason] - Optional reason for locking the worktree.
6567
+ * @throws Throws error if locking fails.
6568
+ */
6569
+ lock(reason?: string | undefined | null): void
6570
+ /**
6571
+ * Unlock the worktree.
6572
+ *
6573
+ * @category Worktree/Methods
6574
+ *
6575
+ * @signature
6576
+ * ```ts
6577
+ * class Worktree {
6578
+ * unlock(): void;
6579
+ * }
6580
+ * ```
6581
+ *
6582
+ * @throws Throws error if unlocking fails.
6583
+ */
6584
+ unlock(): void
6585
+ /**
6586
+ * Check if the worktree is locked.
6587
+ *
6588
+ * @category Worktree/Methods
6589
+ *
6590
+ * @signature
6591
+ * ```ts
6592
+ * class Worktree {
6593
+ * isLocked(): WorktreeLockStatus;
6594
+ * }
6595
+ * ```
6596
+ *
6597
+ * @returns Lock status of the worktree.
6598
+ * @throws Throws error if checking the lock status fails.
6599
+ */
6600
+ isLocked(): WorktreeLockStatus
6601
+ /**
6602
+ * Prune the worktree.
6603
+ *
6604
+ * @category Worktree/Methods
6605
+ *
6606
+ * @signature
6607
+ * ```ts
6608
+ * class Worktree {
6609
+ * prune(options?: WorktreePruneOptions | null | undefined): void;
6610
+ * }
6611
+ * ```
6612
+ *
6613
+ * @param {WorktreePruneOptions} [options] - Options for pruning the worktree.
6614
+ * @throws Throws error if pruning fails.
6615
+ */
6616
+ prune(worktreePruneOptions?: WorktreePruneOptions | undefined | null): void
6617
+ /**
6618
+ * Check if the worktree is prunable.
6619
+ *
6620
+ * @category Worktree/Methods
6621
+ *
6622
+ * @signature
6623
+ * ```ts
6624
+ * class Worktree {
6625
+ * isPrunable(options?: WorktreePruneOptions | null | undefined): boolean;
6626
+ * }
6627
+ * ```
6628
+ *
6629
+ * @param {WorktreePruneOptions} [options] - Options for checking if the worktree is prunable.
6630
+ * @returns `true` if the worktree is prunable, `false` otherwise.
6631
+ * @throws Throws error if checking fails.
6632
+ */
6633
+ isPrunable(worktreePruneOptions?: WorktreePruneOptions | undefined | null): boolean
6634
+ }
6635
+
6454
6636
  export interface AddMailmapEntryData {
6455
6637
  realName?: string
6456
6638
  realEmail?: string
@@ -7455,6 +7637,7 @@ export interface ExtractedSignature {
7455
7637
 
7456
7638
  export interface FetchOptions {
7457
7639
  credential?: Credential
7640
+ callbacks?: RemoteCallbacks
7458
7641
  /** Set the proxy options to use for the fetch operation. */
7459
7642
  proxy?: ProxyOptions
7460
7643
  /** Set whether to perform a prune after the fetch. */
@@ -8122,6 +8305,68 @@ export declare function openDefaultConfig(): Config
8122
8305
  */
8123
8306
  export declare function openRepository(path: string, options?: RepositoryOpenOptions | undefined | null, signal?: AbortSignal | undefined | null): Promise<Repository>
8124
8307
 
8308
+ /**
8309
+ * Open a repository from a worktree.
8310
+ *
8311
+ * This will open the repository associated with the given worktree.
8312
+ *
8313
+ * @category Repository
8314
+ *
8315
+ * @signature
8316
+ * ```ts
8317
+ * function openRepositoryFromWorktree(worktree: Worktree): Repository;
8318
+ * ```
8319
+ *
8320
+ * @param {Worktree} worktree - Worktree to open repository from.
8321
+ * @returns {Repository} Repository instance.
8322
+ * @throws Throws error if opening the repository fails.
8323
+ *
8324
+ * @example
8325
+ *
8326
+ * Open a repository from a worktree.
8327
+ *
8328
+ * ```ts
8329
+ * import { openWorktreeFromRepository, openRepositoryFromWorktree } from 'es-git';
8330
+ *
8331
+ * const worktree = await openWorktreeFromRepository(repo);
8332
+ * const repo = openRepositoryFromWorktree(worktree);
8333
+ * ```
8334
+ */
8335
+ export declare function openRepositoryFromWorktree(worktree: Worktree): Repository
8336
+
8337
+ /**
8338
+ * Open a worktree from a repository.
8339
+ *
8340
+ * This will open the worktree associated with the given repository if the
8341
+ * repository is a worktree.
8342
+ *
8343
+ * @category Worktree
8344
+ *
8345
+ * @signature
8346
+ * ```ts
8347
+ * function openWorktreeFromRepository(repo: Repository): Worktree;
8348
+ * ```
8349
+ *
8350
+ * @param {Repository} repo - Repository to open worktree from.
8351
+ * @returns {Worktree} Worktree instance.
8352
+ * @throws Throws error if the repository is not a worktree or if opening fails.
8353
+ *
8354
+ * @example
8355
+ *
8356
+ * Open a worktree from a repository.
8357
+ *
8358
+ * ```ts
8359
+ * import { openRepository, openWorktreeFromRepository } from 'es-git';
8360
+ *
8361
+ * const repo = await openRepository('.');
8362
+ * const worktree = openWorktreeFromRepository(repo);
8363
+ * ```
8364
+ */
8365
+ export declare function openWorktreeFromRepository(repo: Repository): Worktree
8366
+
8367
+ export type PackBuilderStage = 'adding_objects'|
8368
+ 'deltafication';
8369
+
8125
8370
  /**
8126
8371
  * Parse a string as a bool.
8127
8372
  *
@@ -8189,6 +8434,7 @@ export interface PruneOptions {
8189
8434
  /** Options to control the behavior of a git push. */
8190
8435
  export interface PushOptions {
8191
8436
  credential?: Credential
8437
+ callbacks?: RemoteCallbacks
8192
8438
  /** Set the proxy options to use for the push operation. */
8193
8439
  proxy?: ProxyOptions
8194
8440
  /**
@@ -8214,6 +8460,17 @@ export interface PushOptions {
8214
8460
  remoteOptions?: Array<string>
8215
8461
  }
8216
8462
 
8463
+ export interface PushUpdate {
8464
+ /** The source name of the reference, or `null` if it is not valid UTF-8. */
8465
+ srcRefname?: string
8466
+ /** The name of the reference to update on the server, or `null` if it is not valid UTF-8. */
8467
+ dstRefname?: string
8468
+ /** The current target oid of the reference. */
8469
+ src: string
8470
+ /** The new target oid for the reference. */
8471
+ dst: string
8472
+ }
8473
+
8217
8474
  export interface RebaseCommitOptions {
8218
8475
  /**
8219
8476
  * Signature for author.
@@ -8354,6 +8611,47 @@ export interface Refspec {
8354
8611
  force: boolean
8355
8612
  }
8356
8613
 
8614
+ export interface RemoteCallbacks {
8615
+ /** Called with transfer progress during fetch. */
8616
+ transferProgress?: (data: RemoteTransferProgress) => void
8617
+ /**
8618
+ * Textual progress from the remote.
8619
+ *
8620
+ * Text sent over the progress side-band will be passed to this function
8621
+ * (this is the 'counting objects' output).
8622
+ */
8623
+ sidebandProgress?: (data: Uint8Array) => void
8624
+ /**
8625
+ * Each time a reference is updated locally, the callback will be called
8626
+ * with information about it.
8627
+ */
8628
+ updateTips?: (refname: string, oldId: string, newId: string) => void
8629
+ /**
8630
+ * Set a callback to get invoked for each updated reference on a push.
8631
+ *
8632
+ * The first argument to the callback is the name of the reference and the
8633
+ * second is a status message sent by the server. If the status is not `null`
8634
+ * then the push was rejected.
8635
+ */
8636
+ pushUpdateReference?: (refname: string, status: string | null) => void
8637
+ /** The callback through which progress of push transfer is monitored */
8638
+ pushTransferProgress?: (current: number, total: number, bytes: number) => void
8639
+ /**
8640
+ * Function to call with progress information during pack building.
8641
+ *
8642
+ * Be aware that this is called inline with pack building operations,
8643
+ * so performance may be affected.
8644
+ */
8645
+ packProgress?: (stage: PackBuilderStage, current: number, total: number) => void
8646
+ /**
8647
+ * The callback is called once between the negotiation step and the upload.
8648
+ *
8649
+ * The argument to the callback is a slice containing the updates which
8650
+ * will be sent as commands to the destination.
8651
+ */
8652
+ pushNegotiation?: (update: PushUpdate[]) => void
8653
+ }
8654
+
8357
8655
  /**
8358
8656
  * - `None` : Do not follow any off-site redirects at any stage of the fetch or push.
8359
8657
  * - `Initial` : Allow off-site redirects only upon the initial request. This is the default.
@@ -8363,6 +8661,16 @@ export type RemoteRedirect = 'None'|
8363
8661
  'Initial'|
8364
8662
  'All';
8365
8663
 
8664
+ export interface RemoteTransferProgress {
8665
+ totalObjects: number
8666
+ indexedObjects: number
8667
+ receivedObjects: number
8668
+ localObjects: number
8669
+ totalDeltas: number
8670
+ indexedDeltas: number
8671
+ receivedBytes: number
8672
+ }
8673
+
8366
8674
  export interface RenameReferenceOptions {
8367
8675
  /**
8368
8676
  * If the force flag is not enabled, and there's already a reference with
@@ -8997,6 +9305,64 @@ export declare function traceSet(level: TraceLevel, callback: (level: TraceLevel
8997
9305
  export type TreeWalkMode = 'PreOrder'|
8998
9306
  'PostOrder';
8999
9307
 
9308
+ /** Options for adding a worktree. */
9309
+ export interface WorktreeAddOptions {
9310
+ /**
9311
+ * If enabled, this will cause the newly added worktree to be locked.
9312
+ *
9313
+ * Defaults to `false`.
9314
+ */
9315
+ lock?: boolean
9316
+ /**
9317
+ * If enabled, this will checkout the existing branch matching the worktree name.
9318
+ *
9319
+ * Defaults to `false`.
9320
+ */
9321
+ checkoutExisting?: boolean
9322
+ /**
9323
+ * reference name to use for the new worktree HEAD
9324
+ *
9325
+ * Defaults to `null`.
9326
+ */
9327
+ refName?: string
9328
+ }
9329
+
9330
+ /** Lock Status of a worktree */
9331
+ export interface WorktreeLockStatus {
9332
+ /** Worktree is Unlocked */
9333
+ status: WorktreeLockStatusType
9334
+ /** Worktree is locked with the optional message */
9335
+ reason?: string
9336
+ }
9337
+
9338
+ /** Lock Status of a worktree */
9339
+ export type WorktreeLockStatusType = /** Worktree is Unlocked */
9340
+ 'Unlocked'|
9341
+ /** Worktree is locked with the optional message */
9342
+ 'Locked';
9343
+
9344
+ /** Options to configure how worktree pruning is performed. */
9345
+ export interface WorktreePruneOptions {
9346
+ /**
9347
+ * Controls whether valid (still existing on the filesystem) worktrees will be pruned.
9348
+ *
9349
+ * Defaults to `false`.
9350
+ */
9351
+ valid?: boolean
9352
+ /**
9353
+ * Controls whether locked worktrees will be pruned.
9354
+ *
9355
+ * Defaults to `false`.
9356
+ */
9357
+ locked?: boolean
9358
+ /**
9359
+ * Controls whether the actual working tree on the filesystem is recursively removed.
9360
+ *
9361
+ * Defaults to `false`.
9362
+ */
9363
+ workingTree?: boolean
9364
+ }
9365
+
9000
9366
  /**
9001
9367
  * Creates an all zero Oid structure.
9002
9368
  *
package/index.js CHANGED
@@ -77,8 +77,8 @@ function requireNative() {
77
77
  try {
78
78
  const binding = require('es-git-android-arm64')
79
79
  const bindingPackageVersion = require('es-git-android-arm64/package.json').version
80
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
81
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
80
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
81
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
82
82
  }
83
83
  return binding
84
84
  } catch (e) {
@@ -93,8 +93,8 @@ function requireNative() {
93
93
  try {
94
94
  const binding = require('es-git-android-arm-eabi')
95
95
  const bindingPackageVersion = require('es-git-android-arm-eabi/package.json').version
96
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
97
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
96
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
97
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
98
98
  }
99
99
  return binding
100
100
  } catch (e) {
@@ -114,8 +114,8 @@ function requireNative() {
114
114
  try {
115
115
  const binding = require('es-git-win32-x64-gnu')
116
116
  const bindingPackageVersion = require('es-git-win32-x64-gnu/package.json').version
117
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
118
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
117
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
118
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
119
119
  }
120
120
  return binding
121
121
  } catch (e) {
@@ -130,8 +130,8 @@ function requireNative() {
130
130
  try {
131
131
  const binding = require('es-git-win32-x64-msvc')
132
132
  const bindingPackageVersion = require('es-git-win32-x64-msvc/package.json').version
133
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
134
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
133
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
134
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
135
135
  }
136
136
  return binding
137
137
  } catch (e) {
@@ -147,8 +147,8 @@ function requireNative() {
147
147
  try {
148
148
  const binding = require('es-git-win32-ia32-msvc')
149
149
  const bindingPackageVersion = require('es-git-win32-ia32-msvc/package.json').version
150
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
151
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
150
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
151
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
152
152
  }
153
153
  return binding
154
154
  } catch (e) {
@@ -163,8 +163,8 @@ function requireNative() {
163
163
  try {
164
164
  const binding = require('es-git-win32-arm64-msvc')
165
165
  const bindingPackageVersion = require('es-git-win32-arm64-msvc/package.json').version
166
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
167
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
166
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
167
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
168
168
  }
169
169
  return binding
170
170
  } catch (e) {
@@ -182,8 +182,8 @@ function requireNative() {
182
182
  try {
183
183
  const binding = require('es-git-darwin-universal')
184
184
  const bindingPackageVersion = require('es-git-darwin-universal/package.json').version
185
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
186
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
185
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
186
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
187
187
  }
188
188
  return binding
189
189
  } catch (e) {
@@ -198,8 +198,8 @@ function requireNative() {
198
198
  try {
199
199
  const binding = require('es-git-darwin-x64')
200
200
  const bindingPackageVersion = require('es-git-darwin-x64/package.json').version
201
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
202
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
201
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
202
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
203
203
  }
204
204
  return binding
205
205
  } catch (e) {
@@ -214,8 +214,8 @@ function requireNative() {
214
214
  try {
215
215
  const binding = require('es-git-darwin-arm64')
216
216
  const bindingPackageVersion = require('es-git-darwin-arm64/package.json').version
217
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
218
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
217
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
218
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
219
219
  }
220
220
  return binding
221
221
  } catch (e) {
@@ -234,8 +234,8 @@ function requireNative() {
234
234
  try {
235
235
  const binding = require('es-git-freebsd-x64')
236
236
  const bindingPackageVersion = require('es-git-freebsd-x64/package.json').version
237
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
238
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
237
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
238
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
239
239
  }
240
240
  return binding
241
241
  } catch (e) {
@@ -250,8 +250,8 @@ function requireNative() {
250
250
  try {
251
251
  const binding = require('es-git-freebsd-arm64')
252
252
  const bindingPackageVersion = require('es-git-freebsd-arm64/package.json').version
253
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
254
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
253
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
254
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
255
255
  }
256
256
  return binding
257
257
  } catch (e) {
@@ -271,8 +271,8 @@ function requireNative() {
271
271
  try {
272
272
  const binding = require('es-git-linux-x64-musl')
273
273
  const bindingPackageVersion = require('es-git-linux-x64-musl/package.json').version
274
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
275
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
274
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
275
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
276
276
  }
277
277
  return binding
278
278
  } catch (e) {
@@ -287,8 +287,8 @@ function requireNative() {
287
287
  try {
288
288
  const binding = require('es-git-linux-x64-gnu')
289
289
  const bindingPackageVersion = require('es-git-linux-x64-gnu/package.json').version
290
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
291
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
290
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
291
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
292
292
  }
293
293
  return binding
294
294
  } catch (e) {
@@ -305,8 +305,8 @@ function requireNative() {
305
305
  try {
306
306
  const binding = require('es-git-linux-arm64-musl')
307
307
  const bindingPackageVersion = require('es-git-linux-arm64-musl/package.json').version
308
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
309
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
308
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
309
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
310
310
  }
311
311
  return binding
312
312
  } catch (e) {
@@ -321,8 +321,8 @@ function requireNative() {
321
321
  try {
322
322
  const binding = require('es-git-linux-arm64-gnu')
323
323
  const bindingPackageVersion = require('es-git-linux-arm64-gnu/package.json').version
324
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
325
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
324
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
325
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
326
326
  }
327
327
  return binding
328
328
  } catch (e) {
@@ -339,8 +339,8 @@ function requireNative() {
339
339
  try {
340
340
  const binding = require('es-git-linux-arm-musleabihf')
341
341
  const bindingPackageVersion = require('es-git-linux-arm-musleabihf/package.json').version
342
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
343
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
342
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
343
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
344
344
  }
345
345
  return binding
346
346
  } catch (e) {
@@ -355,8 +355,8 @@ function requireNative() {
355
355
  try {
356
356
  const binding = require('es-git-linux-arm-gnueabihf')
357
357
  const bindingPackageVersion = require('es-git-linux-arm-gnueabihf/package.json').version
358
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
359
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
358
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
359
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
360
360
  }
361
361
  return binding
362
362
  } catch (e) {
@@ -373,8 +373,8 @@ function requireNative() {
373
373
  try {
374
374
  const binding = require('es-git-linux-loong64-musl')
375
375
  const bindingPackageVersion = require('es-git-linux-loong64-musl/package.json').version
376
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
377
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
376
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
377
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
378
378
  }
379
379
  return binding
380
380
  } catch (e) {
@@ -389,8 +389,8 @@ function requireNative() {
389
389
  try {
390
390
  const binding = require('es-git-linux-loong64-gnu')
391
391
  const bindingPackageVersion = require('es-git-linux-loong64-gnu/package.json').version
392
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
393
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
392
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
393
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
394
394
  }
395
395
  return binding
396
396
  } catch (e) {
@@ -407,8 +407,8 @@ function requireNative() {
407
407
  try {
408
408
  const binding = require('es-git-linux-riscv64-musl')
409
409
  const bindingPackageVersion = require('es-git-linux-riscv64-musl/package.json').version
410
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
411
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
410
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
411
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
412
412
  }
413
413
  return binding
414
414
  } catch (e) {
@@ -423,8 +423,8 @@ function requireNative() {
423
423
  try {
424
424
  const binding = require('es-git-linux-riscv64-gnu')
425
425
  const bindingPackageVersion = require('es-git-linux-riscv64-gnu/package.json').version
426
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
427
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
426
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
427
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
428
428
  }
429
429
  return binding
430
430
  } catch (e) {
@@ -440,8 +440,8 @@ function requireNative() {
440
440
  try {
441
441
  const binding = require('es-git-linux-ppc64-gnu')
442
442
  const bindingPackageVersion = require('es-git-linux-ppc64-gnu/package.json').version
443
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
444
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
443
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
444
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
445
445
  }
446
446
  return binding
447
447
  } catch (e) {
@@ -456,8 +456,8 @@ function requireNative() {
456
456
  try {
457
457
  const binding = require('es-git-linux-s390x-gnu')
458
458
  const bindingPackageVersion = require('es-git-linux-s390x-gnu/package.json').version
459
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
460
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
459
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
460
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
461
461
  }
462
462
  return binding
463
463
  } catch (e) {
@@ -476,8 +476,8 @@ function requireNative() {
476
476
  try {
477
477
  const binding = require('es-git-openharmony-arm64')
478
478
  const bindingPackageVersion = require('es-git-openharmony-arm64/package.json').version
479
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
480
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
479
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
480
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
481
481
  }
482
482
  return binding
483
483
  } catch (e) {
@@ -492,8 +492,8 @@ function requireNative() {
492
492
  try {
493
493
  const binding = require('es-git-openharmony-x64')
494
494
  const bindingPackageVersion = require('es-git-openharmony-x64/package.json').version
495
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
496
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
495
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
496
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
497
497
  }
498
498
  return binding
499
499
  } catch (e) {
@@ -508,8 +508,8 @@ function requireNative() {
508
508
  try {
509
509
  const binding = require('es-git-openharmony-arm')
510
510
  const bindingPackageVersion = require('es-git-openharmony-arm/package.json').version
511
- if (bindingPackageVersion !== '0.5.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
512
- throw new Error(`Native binding package version mismatch, expected 0.5.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
511
+ if (bindingPackageVersion !== '0.6.0' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
512
+ throw new Error(`Native binding package version mismatch, expected 0.6.0 but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
513
513
  }
514
514
  return binding
515
515
  } catch (e) {
@@ -613,6 +613,7 @@ module.exports.Tag = nativeBinding.Tag
613
613
  module.exports.Tree = nativeBinding.Tree
614
614
  module.exports.TreeEntry = nativeBinding.TreeEntry
615
615
  module.exports.TreeIter = nativeBinding.TreeIter
616
+ module.exports.Worktree = nativeBinding.Worktree
616
617
  module.exports.ApplyLocation = nativeBinding.ApplyLocation
617
618
  module.exports.AutotagOption = nativeBinding.AutotagOption
618
619
  module.exports.BranchType = nativeBinding.BranchType
@@ -647,6 +648,9 @@ module.exports.ObjectType = nativeBinding.ObjectType
647
648
  module.exports.openConfig = nativeBinding.openConfig
648
649
  module.exports.openDefaultConfig = nativeBinding.openDefaultConfig
649
650
  module.exports.openRepository = nativeBinding.openRepository
651
+ module.exports.openRepositoryFromWorktree = nativeBinding.openRepositoryFromWorktree
652
+ module.exports.openWorktreeFromRepository = nativeBinding.openWorktreeFromRepository
653
+ module.exports.PackBuilderStage = nativeBinding.PackBuilderStage
650
654
  module.exports.parseConfigBool = nativeBinding.parseConfigBool
651
655
  module.exports.parseConfigI32 = nativeBinding.parseConfigI32
652
656
  module.exports.parseConfigI64 = nativeBinding.parseConfigI64
@@ -668,4 +672,5 @@ module.exports.traceClear = nativeBinding.traceClear
668
672
  module.exports.TraceLevel = nativeBinding.TraceLevel
669
673
  module.exports.traceSet = nativeBinding.traceSet
670
674
  module.exports.TreeWalkMode = nativeBinding.TreeWalkMode
675
+ module.exports.WorktreeLockStatusType = nativeBinding.WorktreeLockStatusType
671
676
  module.exports.zeroOid = nativeBinding.zeroOid
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "es-git",
3
- "version": "0.6.0",
3
+ "version": "0.7.0",
4
4
  "main": "index.js",
5
5
  "types": "index.d.ts",
6
6
  "files": [
@@ -13,7 +13,7 @@
13
13
  "url": "https://github.com/toss/es-git.git"
14
14
  },
15
15
  "license": "MIT",
16
- "packageManager": "yarn@4.12.0",
16
+ "packageManager": "yarn@4.14.1",
17
17
  "napi": {
18
18
  "binaryName": "es-git",
19
19
  "targets": [
@@ -44,25 +44,25 @@
44
44
  "check:fix": "biome check --write --unsafe"
45
45
  },
46
46
  "devDependencies": {
47
- "@biomejs/biome": "^1.9.4",
47
+ "@biomejs/biome": "2.4.15",
48
48
  "@napi-rs/cli": "3.4.1",
49
49
  "@types/jscodeshift": "^0.12.0",
50
- "@types/node": "^22.8.4",
50
+ "@types/node": "^22.19.18",
51
51
  "fast-glob": "^3.3.3",
52
52
  "jscodeshift": "^17.1.2",
53
- "typescript": "5.8.2",
54
- "vitest": "^3.0.5"
53
+ "typescript": "6.0.3",
54
+ "vitest": "^4.1.5"
55
55
  },
56
56
  "optionalDependencies": {
57
- "es-git-darwin-x64": "0.6.0",
58
- "es-git-darwin-arm64": "0.6.0",
59
- "es-git-win32-x64-msvc": "0.6.0",
60
- "es-git-win32-arm64-msvc": "0.6.0",
61
- "es-git-linux-x64-gnu": "0.6.0",
62
- "es-git-linux-x64-musl": "0.6.0",
63
- "es-git-android-arm64": "0.6.0",
64
- "es-git-linux-arm64-gnu": "0.6.0",
65
- "es-git-linux-arm64-musl": "0.6.0",
66
- "es-git-android-arm-eabi": "0.6.0"
57
+ "es-git-darwin-x64": "0.7.0",
58
+ "es-git-darwin-arm64": "0.7.0",
59
+ "es-git-win32-x64-msvc": "0.7.0",
60
+ "es-git-win32-arm64-msvc": "0.7.0",
61
+ "es-git-linux-x64-gnu": "0.7.0",
62
+ "es-git-linux-x64-musl": "0.7.0",
63
+ "es-git-android-arm64": "0.7.0",
64
+ "es-git-linux-arm64-gnu": "0.7.0",
65
+ "es-git-linux-arm64-musl": "0.7.0",
66
+ "es-git-android-arm-eabi": "0.7.0"
67
67
  }
68
68
  }