@vryzel/file-next 0.5.2 → 0.6.0

package/dist/index.d.cts

@@ -1,9 +1,9 @@
-import { b as FileSystemConfig, C as CreateFileSystemOptions, a as FileSystem, S as S3CompatibleAdapter, c as S3Key, R as Result, M as MetadataStore } from './filesystem-C0vVDtg4.cjs';
-export { d as CopyInput, e as CopyOutput, f as CreateNodeInput, g as Credentials, D as DeleteInput, h as DeleteNodeInput, i as DeleteOutput, E as ExistsInput, j as ExistsOutput, F as FileNode, G as GetMetadataInput, k as GetMetadataOutput, l as GetNodeInput, m as GetPathInput, n as GetPathOutput, o as GetPublicUrlInput, p as GetPublicUrlOutput, L as ListChildrenInput, q as ListChildrenOutput, r as ListInput, s as ListOutput, t as MoveInput, u as MoveNodeInput, v as MoveOutput, N as NodeKind, P as Path, w as Prefix, x as PresignedDownloadInput, y as PresignedDownloadOutput, z as PresignedUploadInput, A as PresignedUploadOutput, B as R2Config, H as ReadInput, I as ReadOutput, J as ReconcileResult, K as S3Config, O as SearchInput, Q as SetMetadataInput, V as SetMetadataOutput, W as StatInput, X as StatOutput, T as TenantId, Y as UpdateMetadataInput, U as UserId, Z as WriteInput, _ as WriteOutput, $ as andThen, a0 as asPath, a1 as asPrefix, a2 as asS3Key, a3 as asTenantId, a4 as asUserId, a5 as assertPath, a6 as assertPrefix, a7 as assertS3Key, a8 as assertTenantId, a9 as assertUserId, aa as err, ab as map, ac as mapErr, ad as ok, ae as parseFileSystemConfig, af as unwrap, ag as unwrapOr } from './filesystem-C0vVDtg4.cjs';
+import { b as FileSystemConfig, C as CreateFileSystemOptions, a as FileSystem, S as S3CompatibleAdapter, c as S3Key, R as Result, M as MetadataStore } from './filesystem-CFRC-gky.cjs';
+export { d as CopyInput, e as CopyOutput, f as CreateNodeInput, g as Credentials, D as DeleteInput, h as DeleteNodeInput, i as DeleteOutput, E as ExistsInput, j as ExistsOutput, F as FileNode, G as GetMetadataInput, k as GetMetadataOutput, l as GetNodeInput, m as GetPathInput, n as GetPathOutput, o as GetPublicUrlInput, p as GetPublicUrlOutput, L as ListChildrenInput, q as ListChildrenOutput, r as ListInput, s as ListOutput, t as MoveInput, u as MoveNodeInput, v as MoveOutput, N as NodeKind, P as Path, w as Prefix, x as PresignedDownloadInput, y as PresignedDownloadOutput, z as PresignedUploadInput, A as PresignedUploadOutput, B as R2Config, H as ReadInput, I as ReadOutput, J as ReconcileResult, K as S3Config, O as SearchInput, Q as SetMetadataInput, V as SetMetadataOutput, W as StatInput, X as StatOutput, T as TenantId, Y as UpdateMetadataInput, U as UserId, Z as WriteInput, _ as WriteOutput, $ as andThen, a0 as asPath, a1 as asPrefix, a2 as asS3Key, a3 as asTenantId, a4 as asUserId, a5 as assertPath, a6 as assertPrefix, a7 as assertS3Key, a8 as assertTenantId, a9 as assertUserId, aa as err, ab as map, ac as mapErr, ad as ok, ae as parseFileSystemConfig, af as unwrap, ag as unwrapOr } from './filesystem-CFRC-gky.cjs';
 import { FileSystemError } from './errors/index.cjs';
 export { FILE_SYSTEM_ERROR_CODES, FileSystemErrorCode, FileSystemErrorJson, FileSystemErrorOptions, RETRYABLE_BY_CODE, fromAws, fromPg, fromSqlite } from './errors/index.cjs';
 import { ClassValue } from 'clsx';
-export { A as AuthContext, w as withAuth } from './with-auth-Dtn57B_S.cjs';
+export { A as AuthContext, w as withAuth } from './with-auth-UBz99KZJ.cjs';
 import 'zod';
 
 /**

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { b as FileSystemConfig, C as CreateFileSystemOptions, a as FileSystem, S as S3CompatibleAdapter, c as S3Key, R as Result, M as MetadataStore } from './filesystem-Djiiu6YU.js';
-export { d as CopyInput, e as CopyOutput, f as CreateNodeInput, g as Credentials, D as DeleteInput, h as DeleteNodeInput, i as DeleteOutput, E as ExistsInput, j as ExistsOutput, F as FileNode, G as GetMetadataInput, k as GetMetadataOutput, l as GetNodeInput, m as GetPathInput, n as GetPathOutput, o as GetPublicUrlInput, p as GetPublicUrlOutput, L as ListChildrenInput, q as ListChildrenOutput, r as ListInput, s as ListOutput, t as MoveInput, u as MoveNodeInput, v as MoveOutput, N as NodeKind, P as Path, w as Prefix, x as PresignedDownloadInput, y as PresignedDownloadOutput, z as PresignedUploadInput, A as PresignedUploadOutput, B as R2Config, H as ReadInput, I as ReadOutput, J as ReconcileResult, K as S3Config, O as SearchInput, Q as SetMetadataInput, V as SetMetadataOutput, W as StatInput, X as StatOutput, T as TenantId, Y as UpdateMetadataInput, U as UserId, Z as WriteInput, _ as WriteOutput, $ as andThen, a0 as asPath, a1 as asPrefix, a2 as asS3Key, a3 as asTenantId, a4 as asUserId, a5 as assertPath, a6 as assertPrefix, a7 as assertS3Key, a8 as assertTenantId, a9 as assertUserId, aa as err, ab as map, ac as mapErr, ad as ok, ae as parseFileSystemConfig, af as unwrap, ag as unwrapOr } from './filesystem-Djiiu6YU.js';
+import { b as FileSystemConfig, C as CreateFileSystemOptions, a as FileSystem, S as S3CompatibleAdapter, c as S3Key, R as Result, M as MetadataStore } from './filesystem-CF4TFF58.js';
+export { d as CopyInput, e as CopyOutput, f as CreateNodeInput, g as Credentials, D as DeleteInput, h as DeleteNodeInput, i as DeleteOutput, E as ExistsInput, j as ExistsOutput, F as FileNode, G as GetMetadataInput, k as GetMetadataOutput, l as GetNodeInput, m as GetPathInput, n as GetPathOutput, o as GetPublicUrlInput, p as GetPublicUrlOutput, L as ListChildrenInput, q as ListChildrenOutput, r as ListInput, s as ListOutput, t as MoveInput, u as MoveNodeInput, v as MoveOutput, N as NodeKind, P as Path, w as Prefix, x as PresignedDownloadInput, y as PresignedDownloadOutput, z as PresignedUploadInput, A as PresignedUploadOutput, B as R2Config, H as ReadInput, I as ReadOutput, J as ReconcileResult, K as S3Config, O as SearchInput, Q as SetMetadataInput, V as SetMetadataOutput, W as StatInput, X as StatOutput, T as TenantId, Y as UpdateMetadataInput, U as UserId, Z as WriteInput, _ as WriteOutput, $ as andThen, a0 as asPath, a1 as asPrefix, a2 as asS3Key, a3 as asTenantId, a4 as asUserId, a5 as assertPath, a6 as assertPrefix, a7 as assertS3Key, a8 as assertTenantId, a9 as assertUserId, aa as err, ab as map, ac as mapErr, ad as ok, ae as parseFileSystemConfig, af as unwrap, ag as unwrapOr } from './filesystem-CF4TFF58.js';
 import { FileSystemError } from './errors/index.js';
 export { FILE_SYSTEM_ERROR_CODES, FileSystemErrorCode, FileSystemErrorJson, FileSystemErrorOptions, RETRYABLE_BY_CODE, fromAws, fromPg, fromSqlite } from './errors/index.js';
 import { ClassValue } from 'clsx';
-export { A as AuthContext, w as withAuth } from './with-auth-OZNiZGga.js';
+export { A as AuthContext, w as withAuth } from './with-auth-BvFHyioA.js';
 import 'zod';
 
 /**

package/dist/index.js

@@ -3077,10 +3077,16 @@ var createPresignedUploadUrl = async (client, config, input) => {
     const cmd = new PutObjectCommand({
       Bucket: config.bucket,
       Key: input.key,
-      ContentType: input.contentType
+      ContentType: input.contentType,
+      ContentLength: input.contentLength
     });
     const url = await getSignedUrl(client, cmd, { expiresIn: input.expiresIn ?? 900 });
-    return ok({ url, method: "PUT" });
+    const requiredHeaders = {};
+    if (input.contentType) requiredHeaders["Content-Type"] = input.contentType;
+    if (input.contentLength != null) {
+      requiredHeaders["Content-Length"] = String(input.contentLength);
+    }
+    return ok({ url, method: "PUT", requiredHeaders });
   } catch (e) {
     return err(fromAws(e));
   }
@@ -3387,11 +3393,17 @@ function createMemoryAdapter(options = {}) {
   };
   const createPresignedUploadUrl2 = async (input) => {
     const expiresIn = input.expiresIn ?? 900;
+    const requiredHeaders = {};
+    if (input.contentType) requiredHeaders["Content-Type"] = input.contentType;
+    if (input.contentLength != null) {
+      requiredHeaders["Content-Length"] = String(input.contentLength);
+    }
     return {
       ok: true,
       value: {
         url: `in-memory://${bucket}/${input.key}?expiresIn=${expiresIn}`,
-        method: "PUT"
+        method: "PUT",
+        requiredHeaders
       }
     };
   };
@@ -3620,6 +3632,7 @@ var assemble = (adapter, config, options) => {
     metadata: options?.store,
     tenantId,
     quotaBytes: options?.quotaBytes,
+    maxBytes: options?.maxBytes,
     forTenant
   });
   return {
@@ -3627,6 +3640,7 @@ var assemble = (adapter, config, options) => {
     config,
     metadata: options?.store,
     quotaBytes: options?.quotaBytes,
+    maxBytes: options?.maxBytes,
     forTenant
   };
 };
@@ -4476,22 +4490,22 @@ var buildInner = (Database, options) => {
   const stmtUpdateSelfMove = db.prepare(`
     UPDATE nodes
     SET parent_id = ?, name = ?, path = ?, updated_at = ?
-    WHERE id = ?
+    WHERE id = ? AND tenant_id = ?
   `);
   const stmtCascadeDescendants = db.prepare(`
     UPDATE nodes
     SET path = ? || SUBSTR(path, LENGTH(?) + 1), updated_at = ?
-    WHERE path LIKE ? || '/%'
+    WHERE tenant_id = ? AND path LIKE ? || '/%' ESCAPE '\\'
   `);
   const stmtTombstone = db.prepare(`
     UPDATE nodes
     SET deleted_at = ?, updated_at = ?
-    WHERE id = ?
+    WHERE id = ? AND tenant_id = ?
   `);
   const stmtTombstoneSubtree = db.prepare(`
     UPDATE nodes
     SET deleted_at = ?, updated_at = ?
-    WHERE (id = ? OR path LIKE ? || '/%')
+    WHERE tenant_id = ? AND (id = ? OR path LIKE ? || '/%' ESCAPE '\\')
       AND deleted_at IS NULL
   `);
   const stmtHasLiveChild = db.prepare(`
@@ -4519,7 +4533,7 @@ var buildInner = (Database, options) => {
     WHERE nodes_fts MATCH ?
       AND n.tenant_id = ?
       AND n.deleted_at IS NULL
-      AND (n.id = ? OR n.path LIKE ? || '/%')
+      AND (n.id = ? OR n.path LIKE ? || '/%' ESCAPE '\\')
     ORDER BY bm25(nodes_fts)
     LIMIT ?
   `);
@@ -4556,6 +4570,7 @@ var buildInner = (Database, options) => {
       retryable: false
     })
   );
+  const escapeLike = (s) => s.replace(/\\/g, "\\\\").replace(/%/g, "\\%").replace(/_/g, "\\_");
   return {
     async createNode(input) {
       const normalized = normalizeNodeName(input.name);
@@ -4608,7 +4623,7 @@ var buildInner = (Database, options) => {
         return err(
           new FileSystemError({
             code: "InternalError",
-            message: `createNode failed: ${e.message}`,
+            message: "createNode failed",
             retryable: false
           })
         );
@@ -4695,14 +4710,16 @@ var buildInner = (Database, options) => {
             newName,
             newPath,
             nowIso(),
-            input.id
+            input.id,
+            input.tenantId
           );
           if (current.path !== newPath) {
             stmtCascadeDescendants.run(
               newPath,
               current.path,
               nowIso(),
-              current.path
+              input.tenantId,
+              escapeLike(current.path)
             );
           }
         });
@@ -4720,7 +4737,7 @@ var buildInner = (Database, options) => {
         return err(
           new FileSystemError({
             code: "InternalError",
-            message: `moveNode failed: ${e.message}`,
+            message: "moveNode failed",
             retryable: false
           })
         );
@@ -4754,9 +4771,9 @@ var buildInner = (Database, options) => {
       }
       const now = nowIso();
       if (input.recursive || node.kind === "file") {
-        stmtTombstoneSubtree.run(now, now, input.id, node.path);
+        stmtTombstoneSubtree.run(now, now, input.tenantId, input.id, escapeLike(node.path));
       } else {
-        stmtTombstone.run(now, now, input.id);
+        stmtTombstone.run(now, now, input.id, input.tenantId);
       }
       return ok(void 0);
     },
@@ -4773,19 +4790,19 @@ var buildInner = (Database, options) => {
           })
         );
       }
-      const like = `${node.path}/%`;
+      const like = `${escapeLike(node.path)}/%`;
       const files = db.prepare(
         `SELECT s3_key FROM nodes
            WHERE tenant_id = ? AND deleted_at IS NOT NULL AND kind = 'file' AND s3_key != ''
-             AND (id = ? OR path LIKE ?)`
+             AND (id = ? OR path LIKE ? ESCAPE '\\')`
       ).all(input.tenantId, input.id, like);
       db.prepare(
         `DELETE FROM shares WHERE tenant_id = ? AND node_id IN (
-           SELECT id FROM nodes WHERE tenant_id = ? AND deleted_at IS NOT NULL AND (id = ? OR path LIKE ?)
+           SELECT id FROM nodes WHERE tenant_id = ? AND deleted_at IS NOT NULL AND (id = ? OR path LIKE ? ESCAPE '\\')
          )`
       ).run(input.tenantId, input.tenantId, input.id, like);
       db.prepare(
-        `DELETE FROM nodes WHERE tenant_id = ? AND deleted_at IS NOT NULL AND (id = ? OR path LIKE ?)`
+        `DELETE FROM nodes WHERE tenant_id = ? AND deleted_at IS NOT NULL AND (id = ? OR path LIKE ? ESCAPE '\\')`
       ).run(input.tenantId, input.id, like);
       return ok({ s3Keys: files.map((row) => row.s3_key) });
     },
@@ -4825,7 +4842,7 @@ var buildInner = (Database, options) => {
               ftsQuery,
               input.tenantId,
               input.parentId,
-              parent.path,
+              escapeLike(parent.path),
               limit
             );
           }
@@ -5297,7 +5314,7 @@ var buildInner2 = (pg, options) => {
         return err(
           new FileSystemError({
             code: "InternalError",
-            message: `createNode failed: ${e.message}`,
+            message: "createNode failed",
             retryable: false
           })
         );
@@ -5414,16 +5431,16 @@ var buildInner2 = (pg, options) => {
           await client.query(
             `UPDATE "${schema}".nodes
              SET parent_id = $1, name = $2, path = $3, updated_at = now()
-             WHERE id = $4`,
-            [input.newParentId, newName, newPath, input.id]
+             WHERE id = $4 AND tenant_id = $5`,
+            [input.newParentId, newName, newPath, input.id, input.tenantId]
           );
           if (current.path !== newPath) {
             await client.query(
               `UPDATE "${schema}".nodes
                SET path = $1 || substring(path FROM length($2) + 1),
                    updated_at = now()
-               WHERE path LIKE $2 || '/%'`,
-              [newPath, current.path]
+               WHERE tenant_id = $3 AND path LIKE $4 || '/%' ESCAPE '\\'`,
+              [newPath, current.path, input.tenantId, escapeLike(current.path)]
             );
           }
         });
@@ -5440,7 +5457,7 @@ var buildInner2 = (pg, options) => {
         return err(
           new FileSystemError({
             code: "InternalError",
-            message: `moveNode failed: ${e.message}`,
+            message: "moveNode failed",
             retryable: false
           })
         );
@@ -5495,17 +5512,17 @@ var buildInner2 = (pg, options) => {
           input.tenantId,
           `UPDATE "${schema}".nodes
            SET deleted_at = now(), updated_at = now()
-           WHERE (id = $1 OR path LIKE $2 || '/%')
+           WHERE tenant_id = $1 AND (id = $2 OR path LIKE $3 || '/%' ESCAPE '\\')
              AND deleted_at IS NULL`,
-          [input.id, node.path]
+          [input.tenantId, input.id, escapeLike(node.path)]
         );
       } else {
         await q(
           input.tenantId,
           `UPDATE "${schema}".nodes
            SET deleted_at = now(), updated_at = now()
-           WHERE id = $1`,
-          [input.id]
+           WHERE id = $1 AND tenant_id = $2`,
+          [input.id, input.tenantId]
         );
       }
       return ok(void 0);
@@ -5528,26 +5545,26 @@ var buildInner2 = (pg, options) => {
           })
         );
       }
-      const like = `${node.path}/%`;
+      const like = `${escapeLike(node.path)}/%`;
       const files = await q(
         input.tenantId,
         `SELECT s3_key FROM "${schema}".nodes
          WHERE tenant_id = $1 AND deleted_at IS NOT NULL AND kind = 'file' AND s3_key <> ''
-           AND (id = $2 OR path LIKE $3)`,
+           AND (id = $2 OR path LIKE $3 ESCAPE '\\')`,
         [input.tenantId, input.id, like]
       );
       await q(
         input.tenantId,
         `DELETE FROM "${schema}".shares WHERE tenant_id = $1 AND node_id IN (
            SELECT id FROM "${schema}".nodes
-           WHERE tenant_id = $1 AND deleted_at IS NOT NULL AND (id = $2 OR path LIKE $3)
+           WHERE tenant_id = $1 AND deleted_at IS NOT NULL AND (id = $2 OR path LIKE $3 ESCAPE '\\')
          )`,
         [input.tenantId, input.id, like]
       );
       await q(
         input.tenantId,
         `DELETE FROM "${schema}".nodes
-         WHERE tenant_id = $1 AND deleted_at IS NOT NULL AND (id = $2 OR path LIKE $3)`,
+         WHERE tenant_id = $1 AND deleted_at IS NOT NULL AND (id = $2 OR path LIKE $3 ESCAPE '\\')`,
         [input.tenantId, input.id, like]
       );
       return ok({ s3Keys: files.rows.map((row) => row.s3_key) });
@@ -5621,11 +5638,11 @@ var buildInner2 = (pg, options) => {
             input.tenantId,
             `SELECT * FROM "${schema}".nodes
              WHERE tenant_id = $1 AND deleted_at IS NULL
-               AND (id = $2 OR path LIKE $3 || '/%')
+               AND (id = $2 OR path LIKE $3 || '/%' ESCAPE '\\')
                AND name ILIKE $4 ESCAPE '\\'
              ORDER BY lower(name) ASC
              LIMIT $5`,
-            [input.tenantId, input.parentId, parent.path, pattern, limit]
+            [input.tenantId, input.parentId, escapeLike(parent.path), pattern, limit]
           );
         }
       }