fix(node): cloning

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Author: skjnldsv

lib/node/file.ts

@@ -2,20 +2,19 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import type { NodeConstructorData } from './node'
+
 import { FileType } from './fileType'
 import { Node } from './node'
 
 export class File extends Node {
 
-	get type(): FileType.File {
-		return FileType.File
+	public constructor(...[data, davService]: NodeConstructorData) {
+		super(data, davService)
 	}
 
-	/**
-	 * Returns a clone of the file
-	 */
-	clone(): File {
-		return new File(this.data)
+	get type(): FileType.File {
+		return FileType.File
 	}
 
 }

lib/node/folder.ts

@@ -2,18 +2,19 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { NodeData } from './nodeData'
+import type { NodeConstructorData } from './node'
+
 import { FileType } from './fileType'
 import { Node } from './node'
 
 export class Folder extends Node {
 
-	constructor(data: NodeData) {
+	constructor(...[data, davService]: NodeConstructorData) {
 		// enforcing mimes
 		super({
 			...data,
 			mime: 'httpd/unix-directory',
-		})
+		}, davService)
 	}
 
 	get type(): FileType.Folder {
@@ -28,13 +29,6 @@ export class Folder extends Node {
 		return 'httpd/unix-directory'
 	}
 
-	/**
-	 * Returns a clone of the folder
-	 */
-	clone(): Folder {
-		return new Folder(this.data)
-	}
-
 }
 
 /**

lib/node/node.ts

@@ -21,11 +21,14 @@ export enum NodeStatus {
 	LOCKED = 'locked',
 }
 
+type NodeConstructorData = [NodeData, RegExp?]
+
 export abstract class Node {
 
-	private _data: NodeData
 	private _attributes: Attribute
-	private _knownDavService = /(remote|public)\.php\/(web)?dav/i
+
+	protected _data: NodeData
+	protected _knownDavService = /(remote|public)\.php\/(web)?dav/i
 
 	private readonlyAttributes = Object.entries(Object.getOwnPropertyDescriptors(Node.prototype))
 		.filter(e => typeof e[1].get === 'function' && e[0] !== '__proto__')
@@ -58,7 +61,7 @@ export abstract class Node {
 		},
 	} as ProxyHandler<Attribute>
 
-	constructor(data: NodeData, davService?: RegExp) {
+	protected constructor(...[data, davService]: NodeConstructorData) {
 		if (!data.mime) {
 			data.mime = 'application/octet-stream'
 		}
@@ -346,13 +349,6 @@ export abstract class Node {
 		this._data.status = status
 	}
 
-	/**
-	 * Get the node data
-	 */
-	get data(): NodeData {
-		return structuredClone(this._data)
-	}
-
 	/**
 	 * Move the node to a new destination
 	 *
@@ -424,7 +420,10 @@ export abstract class Node {
 	/**
 	 * Returns a clone of the node
 	 */
-	abstract clone(): Node
+	clone(): this {
+		// @ts-expect-error -- this class is abstract and cannot be instantiated directly but all its children can
+		return new this.constructor(this.data, this._knownDavService)
+	}
 
 }