@cedarjs/storage 2.6.0 → 2.6.1-next.104

package/dist/cjs/prismaExtension.d.ts

@@ -1,6 +1,5 @@
-import { PrismaClient } from '@prisma/client';
+import type { PrismaClient } from '@prisma/client';
 import type { Prisma } from '@prisma/client';
-import type * as runtime from '@prisma/client/runtime/library';
 import type { BaseStorageAdapter } from './adapters/BaseStorageAdapter.js';
 import type { UrlSigner } from './UrlSigner.js';
 type FilterOutDollarPrefixed<T> = T extends `$${string}` ? never : T extends symbol ? never : T;
@@ -15,7 +14,7 @@ export type UploadsConfig<MNames extends ModelNames = ModelNames> = {
 type WithSignedUrlArgs = {
     expiresIn?: number;
 };
-export declare const createUploadsExtension: <MNames extends ModelNames = ModelNames>(config: UploadsConfig<MNames>, storageAdapter: BaseStorageAdapter, urlSigner?: UrlSigner) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<runtime.InternalArgs<{ [K in MNames]: {
+export declare const createUploadsExtension: <MNames extends ModelNames = ModelNames>(config: UploadsConfig<MNames>, storageAdapter: BaseStorageAdapter, urlSigner?: UrlSigner) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{ [K in MNames]: {
     withDataUri: {
         needs: Record<string, boolean>;
         compute: (modelData: Record<string, unknown>) => <T>(this: T) => Promise<T>;
@@ -24,6 +23,6 @@ export declare const createUploadsExtension: <MNames extends ModelNames = ModelN
         needs: Record<string, boolean>;
         compute: (modelData: Record<string, unknown>) => <T>(this: T, signArgs?: WithSignedUrlArgs) => T;
     };
-}; }, {}, {}, {}> & runtime.DefaultArgs>;
+}; }, {}, {}, {}> & import("@prisma/client/runtime/library").DefaultArgs>;
 export {};
 //# sourceMappingURL=prismaExtension.d.ts.map

package/dist/cjs/prismaExtension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prismaExtension.d.ts","sourceRoot":"","sources":["../../src/prismaExtension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,KAAK,OAAO,MAAM,gCAAgC,CAAA;AAE9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,EAAE,GACpD,KAAK,GACL,CAAC,SAAS,MAAM,GACd,KAAK,GACL,CAAC,CAAA;AAGP,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC,MAAM,YAAY,CAAC,CAAA;AAEpE,KAAK,iBAAiB,CAAC,KAAK,SAAS,UAAU,IAAI,MAAM,MAAM,CAAC,MAAM,CACpE,YAAY,CAAC,KAAK,CAAC,EACnB,GAAG,EACH,kBAAkB,CACnB,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,gBAAgB,SAAS,UAAU,IAAI;IACtE,MAAM,EACF,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,UAAU,GAAG,UAAU,IAAI;KACjE,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC;CACxC,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,MAAM,SAAS,UAAU,GAAG,UAAU,EAC3E,QAAQ,aAAa,CAAC,MAAM,CAAC,EAC7B,gBAAgB,kBAAkB,EAClC,YAAY,SAAS,qGAOlB,CAAC;iBACa;QACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;KAChC;mBACc;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,iBAAiB,KAAK,CAAC,CAAA;KACrD;wCA4RN,CAAA"}
+{"version":3,"file":"prismaExtension.d.ts","sourceRoot":"","sources":["../../src/prismaExtension.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAG5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,EAAE,GACpD,KAAK,GACL,CAAC,SAAS,MAAM,GACd,KAAK,GACL,CAAC,CAAA;AAGP,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC,MAAM,YAAY,CAAC,CAAA;AAEpE,KAAK,iBAAiB,CAAC,KAAK,SAAS,UAAU,IAAI,MAAM,MAAM,CAAC,MAAM,CACpE,YAAY,CAAC,KAAK,CAAC,EACnB,GAAG,EACH,kBAAkB,CACnB,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,gBAAgB,SAAS,UAAU,IAAI;IACtE,MAAM,EACF,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,UAAU,GAAG,UAAU,IAAI;KACjE,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC;CACxC,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,MAAM,SAAS,UAAU,GAAG,UAAU,EAC3E,QAAQ,aAAa,CAAC,MAAM,CAAC,EAC7B,gBAAgB,kBAAkB,EAClC,YAAY,SAAS,sIAGlB,CAAC;iBACa;QACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;KAChC;mBACc;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,iBAAiB,KAAK,CAAC,CAAA;KACrD;yEAoRN,CAAA"}

package/dist/cjs/prismaExtension.js

@@ -21,197 +21,182 @@ __export(prismaExtension_exports, {
   createUploadsExtension: () => createUploadsExtension
 });
 module.exports = __toCommonJS(prismaExtension_exports);
-var import_client = require("@prisma/client");
 var import_extension = require("@prisma/client/extension");
 var import_fileToDataUri = require("./fileToDataUri.js");
 const createUploadsExtension = (config, storageAdapter, urlSigner) => {
-  const prismaInstance = new import_client.PrismaClient();
-  const queryExtends = {};
-  const resultExtends = {};
-  for (const modelName in config) {
-    const modelConfig = config[modelName];
-    if (!modelConfig) {
-      continue;
-    }
-    const uploadFields = Array.isArray(modelConfig.fields) ? modelConfig.fields : [modelConfig.fields];
-    queryExtends[modelName] = {
-      async create({ query, args }) {
-        try {
-          const result = await query(args);
-          return result;
-        } catch (e) {
-          await removeUploadedFiles(
-            uploadFields,
-            args.data
-          );
-          throw e;
-        }
-      },
-      async createMany({ query, args }) {
-        try {
-          const result = await query(args);
-          return result;
-        } catch (e) {
-          const createDatas = args.data;
-          for (const createData of createDatas) {
-            await removeUploadedFiles(uploadFields, createData);
-          }
-          throw e;
-        }
-      },
-      async update({ query, model, args }) {
-        const uploadFieldsToUpdate = uploadFields.filter(
-          (field) => (
-            // All of this non-sense is to make typescript happy. I'm not sure how data could be anything but an object
-            typeof args.data === "object" && args.data !== null && field in args.data
-          )
-        );
-        if (uploadFieldsToUpdate.length == 0) {
-          return query(args);
-        } else {
-          const originalRecord = await prismaInstance[
-            model
-            // @ts-expect-error TS in strict mode will error due to union type. We cannot narrow it down here.
-          ].findFirstOrThrow({
-            where: args.where
-            // @TODO: should we select here to reduce the amount of data we're handling
-          });
+  return import_extension.Prisma.defineExtension((client) => {
+    const queryExtends = {};
+    const resultExtends = {};
+    for (const modelName in config) {
+      const modelConfig = config[modelName];
+      if (!modelConfig) {
+        continue;
+      }
+      const uploadFields = Array.isArray(modelConfig.fields) ? modelConfig.fields : [modelConfig.fields];
+      queryExtends[modelName] = {
+        async create({ query, args }) {
           try {
             const result = await query(args);
-            await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
             return result;
           } catch (e) {
             await removeUploadedFiles(
-              uploadFieldsToUpdate,
+              uploadFields,
               args.data
             );
             throw e;
           }
-        }
-      },
-      async updateMany({ query, model, args }) {
-        const uploadFieldsToUpdate = uploadFields.filter(
-          (field) => (
-            // All of this non-sense is to make typescript happy. I'm not sure how data could be anything but an object
-            typeof args.data === "object" && args.data !== null && field in args.data
-          )
-        );
-        if (uploadFieldsToUpdate.length == 0) {
-          return query(args);
-        } else {
-          const originalRecords = await prismaInstance[
-            model
-            // @ts-expect-error TS in strict mode will error due to union type. We cannot narrow it down here.
-          ].findMany({
-            where: args.where
-            // @TODO: should we select here to reduce the amount of data we're handling
-          });
+        },
+        async createMany({ query, args }) {
           try {
             const result = await query(args);
-            for await (const originalRecord of originalRecords) {
-              await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
-            }
             return result;
           } catch (e) {
-            await removeUploadedFiles(
-              uploadFieldsToUpdate,
-              args.data
-            );
+            const createDatas = args.data;
+            for (const createData of createDatas) {
+              await removeUploadedFiles(uploadFields, createData);
+            }
             throw e;
           }
-        }
-      },
-      async upsert({ query, model, args }) {
-        let isUpdate;
-        const uploadFieldsToUpdate = uploadFields.filter(
-          (field) => typeof args.update === "object" && args.update !== null && field in args.update
-        );
-        try {
-          let existingRecord;
-          if (args.update) {
-            existingRecord = await prismaInstance[
-              model
-              // @ts-expect-error TS in strict mode will error due to union type. We cannot narrow it down here.
-            ].findUnique({
+        },
+        async update({ query, model, args }) {
+          const uploadFieldsToUpdate = uploadFields.filter((field) => {
+            return args.data && typeof args.data === "object" && field in args.data;
+          });
+          if (uploadFieldsToUpdate.length === 0) {
+            return query(args);
+          } else {
+            const originalRecord = await client[model].findFirstOrThrow({
+              where: args.where
+              // @TODO: should we select here to reduce the amount of data we're handling
+            });
+            try {
+              const result = await query(args);
+              await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
+              return result;
+            } catch (e) {
+              await removeUploadedFiles(
+                uploadFieldsToUpdate,
+                args.data
+              );
+              throw e;
+            }
+          }
+        },
+        async updateMany({ query, model, args }) {
+          const uploadFieldsToUpdate = uploadFields.filter((field) => {
+            return args.data && typeof args.data === "object" && field in args.data;
+          });
+          if (uploadFieldsToUpdate.length === 0) {
+            return query(args);
+          } else {
+            const originalRecords = await client[model].findMany({
               where: args.where
+              // @TODO: should we select here to reduce the amount of data we're handling
             });
-            isUpdate = !!existingRecord;
+            try {
+              const result = await query(args);
+              for await (const originalRecord of originalRecords) {
+                await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
+              }
+              return result;
+            } catch (e) {
+              await removeUploadedFiles(
+                uploadFieldsToUpdate,
+                args.data
+              );
+              throw e;
+            }
           }
-          const result = await query(args);
-          if (isUpdate && existingRecord) {
-            await removeUploadedFiles(uploadFieldsToUpdate, existingRecord);
+        },
+        async upsert({ query, model, args }) {
+          let isUpdate;
+          const uploadFieldsToUpdate = uploadFields.filter(
+            (field) => typeof args.update === "object" && args.update !== null && field in args.update
+          );
+          try {
+            let existingRecord;
+            if (args.update) {
+              existingRecord = await client[model].findUnique({
+                where: args.where
+              });
+              isUpdate = !!existingRecord;
+            }
+            const result = await query(args);
+            if (isUpdate && existingRecord) {
+              await removeUploadedFiles(uploadFieldsToUpdate, existingRecord);
+            }
+            return result;
+          } catch (e) {
+            await removeUploadedFiles(
+              // Only delete files we're updating on update
+              isUpdate ? uploadFieldsToUpdate : uploadFields,
+              isUpdate ? args.update : args.create
+            );
+            throw e;
           }
-          return result;
-        } catch (e) {
+        },
+        async delete({ query, args }) {
+          const deleteResult = await query(args);
           await removeUploadedFiles(
-            // Only delete files we're updating on update
-            isUpdate ? uploadFieldsToUpdate : uploadFields,
-            isUpdate ? args.update : args.create
+            uploadFields,
+            // We don't know the exact type here
+            deleteResult
           );
-          throw e;
+          return deleteResult;
         }
-      },
-      async delete({ query, args }) {
-        const deleteResult = await query(args);
-        await removeUploadedFiles(
-          uploadFields,
-          // We don't know the exact type here
-          deleteResult
-        );
-        return deleteResult;
-      }
-    };
-    const needs = Object.fromEntries(uploadFields.map((field) => [field, true]));
-    resultExtends[modelName] = {
-      withDataUri: {
-        needs,
-        compute(modelData) {
-          return async () => {
-            const base64UploadFields = {};
-            for (const field of uploadFields) {
-              base64UploadFields[field] = await (0, import_fileToDataUri.fileToDataUri)(
-                modelData[field],
-                storageAdapter
-              );
-            }
-            return {
-              // modelData is of type unknown at this point
-              ...modelData,
-              ...base64UploadFields
+      };
+      const needs = Object.fromEntries(
+        uploadFields.map((field) => [field, true])
+      );
+      resultExtends[modelName] = {
+        withDataUri: {
+          needs,
+          compute(modelData) {
+            return async () => {
+              const base64UploadFields = {};
+              for (const field of uploadFields) {
+                base64UploadFields[field] = await (0, import_fileToDataUri.fileToDataUri)(
+                  modelData[field],
+                  storageAdapter
+                );
+              }
+              return {
+                // modelData is of type unknown at this point
+                ...modelData,
+                ...base64UploadFields
+              };
             };
-          };
-        }
-      },
-      withSignedUrl: {
-        needs,
-        compute(modelData) {
-          return ({ expiresIn } = {}) => {
-            if (!urlSigner) {
-              throw new Error(
-                "Please supply signed url settings in setupUpload()"
-              );
-            }
-            const signedUrlFields = {};
-            for (const field of uploadFields) {
-              if (!modelData[field]) {
-                continue;
+          }
+        },
+        withSignedUrl: {
+          needs,
+          compute(modelData) {
+            return ({ expiresIn } = {}) => {
+              if (!urlSigner) {
+                throw new Error(
+                  "Please supply signed url settings in setupUpload()"
+                );
               }
-              signedUrlFields[field] = urlSigner.generateSignedUrl(
-                modelData[field],
-                expiresIn
-              );
-            }
-            return {
-              // modelData is of type unknown at this point
-              ...modelData,
-              ...signedUrlFields
+              const signedUrlFields = {};
+              for (const field of uploadFields) {
+                if (!modelData[field]) {
+                  continue;
+                }
+                signedUrlFields[field] = urlSigner.generateSignedUrl(
+                  modelData[field],
+                  expiresIn
+                );
+              }
+              return {
+                // modelData is of type unknown at this point
+                ...modelData,
+                ...signedUrlFields
+              };
             };
-          };
+          }
         }
-      }
-    };
-  }
-  return import_extension.Prisma.defineExtension((client) => {
+      };
+    }
     return client.$extends({
       name: "redwood-upload-prisma-plugin",
       query: queryExtends,

package/dist/prismaExtension.d.ts

@@ -1,6 +1,5 @@
-import { PrismaClient } from '@prisma/client';
+import type { PrismaClient } from '@prisma/client';
 import type { Prisma } from '@prisma/client';
-import type * as runtime from '@prisma/client/runtime/library';
 import type { BaseStorageAdapter } from './adapters/BaseStorageAdapter.js';
 import type { UrlSigner } from './UrlSigner.js';
 type FilterOutDollarPrefixed<T> = T extends `$${string}` ? never : T extends symbol ? never : T;
@@ -15,7 +14,7 @@ export type UploadsConfig<MNames extends ModelNames = ModelNames> = {
 type WithSignedUrlArgs = {
     expiresIn?: number;
 };
-export declare const createUploadsExtension: <MNames extends ModelNames = ModelNames>(config: UploadsConfig<MNames>, storageAdapter: BaseStorageAdapter, urlSigner?: UrlSigner) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<runtime.InternalArgs<{ [K in MNames]: {
+export declare const createUploadsExtension: <MNames extends ModelNames = ModelNames>(config: UploadsConfig<MNames>, storageAdapter: BaseStorageAdapter, urlSigner?: UrlSigner) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{ [K in MNames]: {
     withDataUri: {
         needs: Record<string, boolean>;
         compute: (modelData: Record<string, unknown>) => <T>(this: T) => Promise<T>;
@@ -24,6 +23,6 @@ export declare const createUploadsExtension: <MNames extends ModelNames = ModelN
         needs: Record<string, boolean>;
         compute: (modelData: Record<string, unknown>) => <T>(this: T, signArgs?: WithSignedUrlArgs) => T;
     };
-}; }, {}, {}, {}> & runtime.DefaultArgs>;
+}; }, {}, {}, {}> & import("@prisma/client/runtime/library").DefaultArgs>;
 export {};
 //# sourceMappingURL=prismaExtension.d.ts.map

package/dist/prismaExtension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prismaExtension.d.ts","sourceRoot":"","sources":["../src/prismaExtension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,KAAK,OAAO,MAAM,gCAAgC,CAAA;AAE9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,EAAE,GACpD,KAAK,GACL,CAAC,SAAS,MAAM,GACd,KAAK,GACL,CAAC,CAAA;AAGP,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC,MAAM,YAAY,CAAC,CAAA;AAEpE,KAAK,iBAAiB,CAAC,KAAK,SAAS,UAAU,IAAI,MAAM,MAAM,CAAC,MAAM,CACpE,YAAY,CAAC,KAAK,CAAC,EACnB,GAAG,EACH,kBAAkB,CACnB,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,gBAAgB,SAAS,UAAU,IAAI;IACtE,MAAM,EACF,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,UAAU,GAAG,UAAU,IAAI;KACjE,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC;CACxC,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,MAAM,SAAS,UAAU,GAAG,UAAU,EAC3E,QAAQ,aAAa,CAAC,MAAM,CAAC,EAC7B,gBAAgB,kBAAkB,EAClC,YAAY,SAAS,qGAOlB,CAAC;iBACa;QACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;KAChC;mBACc;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,iBAAiB,KAAK,CAAC,CAAA;KACrD;wCA4RN,CAAA"}
+{"version":3,"file":"prismaExtension.d.ts","sourceRoot":"","sources":["../src/prismaExtension.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAG5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE/C,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,EAAE,GACpD,KAAK,GACL,CAAC,SAAS,MAAM,GACd,KAAK,GACL,CAAC,CAAA;AAGP,MAAM,MAAM,UAAU,GAAG,uBAAuB,CAAC,MAAM,YAAY,CAAC,CAAA;AAEpE,KAAK,iBAAiB,CAAC,KAAK,SAAS,UAAU,IAAI,MAAM,MAAM,CAAC,MAAM,CACpE,YAAY,CAAC,KAAK,CAAC,EACnB,GAAG,EACH,kBAAkB,CACnB,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,gBAAgB,SAAS,UAAU,IAAI;IACtE,MAAM,EACF,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,UAAU,GAAG,UAAU,IAAI;KACjE,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC;CACxC,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,MAAM,SAAS,UAAU,GAAG,UAAU,EAC3E,QAAQ,aAAa,CAAC,MAAM,CAAC,EAC7B,gBAAgB,kBAAkB,EAClC,YAAY,SAAS,sIAGlB,CAAC;iBACa;QACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;KAChC;mBACc;QACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC9B,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,iBAAiB,KAAK,CAAC,CAAA;KACrD;yEAoRN,CAAA"}

package/dist/prismaExtension.js

@@ -1,194 +1,179 @@
-import { PrismaClient } from "@prisma/client";
 import { Prisma as PrismaExtension } from "@prisma/client/extension";
 import { fileToDataUri } from "./fileToDataUri.js";
 const createUploadsExtension = (config, storageAdapter, urlSigner) => {
-  const prismaInstance = new PrismaClient();
-  const queryExtends = {};
-  const resultExtends = {};
-  for (const modelName in config) {
-    const modelConfig = config[modelName];
-    if (!modelConfig) {
-      continue;
-    }
-    const uploadFields = Array.isArray(modelConfig.fields) ? modelConfig.fields : [modelConfig.fields];
-    queryExtends[modelName] = {
-      async create({ query, args }) {
-        try {
-          const result = await query(args);
-          return result;
-        } catch (e) {
-          await removeUploadedFiles(
-            uploadFields,
-            args.data
-          );
-          throw e;
-        }
-      },
-      async createMany({ query, args }) {
-        try {
-          const result = await query(args);
-          return result;
-        } catch (e) {
-          const createDatas = args.data;
-          for (const createData of createDatas) {
-            await removeUploadedFiles(uploadFields, createData);
-          }
-          throw e;
-        }
-      },
-      async update({ query, model, args }) {
-        const uploadFieldsToUpdate = uploadFields.filter(
-          (field) => (
-            // All of this non-sense is to make typescript happy. I'm not sure how data could be anything but an object
-            typeof args.data === "object" && args.data !== null && field in args.data
-          )
-        );
-        if (uploadFieldsToUpdate.length == 0) {
-          return query(args);
-        } else {
-          const originalRecord = await prismaInstance[
-            model
-            // @ts-expect-error TS in strict mode will error due to union type. We cannot narrow it down here.
-          ].findFirstOrThrow({
-            where: args.where
-            // @TODO: should we select here to reduce the amount of data we're handling
-          });
+  return PrismaExtension.defineExtension((client) => {
+    const queryExtends = {};
+    const resultExtends = {};
+    for (const modelName in config) {
+      const modelConfig = config[modelName];
+      if (!modelConfig) {
+        continue;
+      }
+      const uploadFields = Array.isArray(modelConfig.fields) ? modelConfig.fields : [modelConfig.fields];
+      queryExtends[modelName] = {
+        async create({ query, args }) {
           try {
             const result = await query(args);
-            await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
             return result;
           } catch (e) {
             await removeUploadedFiles(
-              uploadFieldsToUpdate,
+              uploadFields,
               args.data
             );
             throw e;
           }
-        }
-      },
-      async updateMany({ query, model, args }) {
-        const uploadFieldsToUpdate = uploadFields.filter(
-          (field) => (
-            // All of this non-sense is to make typescript happy. I'm not sure how data could be anything but an object
-            typeof args.data === "object" && args.data !== null && field in args.data
-          )
-        );
-        if (uploadFieldsToUpdate.length == 0) {
-          return query(args);
-        } else {
-          const originalRecords = await prismaInstance[
-            model
-            // @ts-expect-error TS in strict mode will error due to union type. We cannot narrow it down here.
-          ].findMany({
-            where: args.where
-            // @TODO: should we select here to reduce the amount of data we're handling
-          });
+        },
+        async createMany({ query, args }) {
           try {
             const result = await query(args);
-            for await (const originalRecord of originalRecords) {
-              await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
-            }
             return result;
           } catch (e) {
-            await removeUploadedFiles(
-              uploadFieldsToUpdate,
-              args.data
-            );
+            const createDatas = args.data;
+            for (const createData of createDatas) {
+              await removeUploadedFiles(uploadFields, createData);
+            }
             throw e;
           }
-        }
-      },
-      async upsert({ query, model, args }) {
-        let isUpdate;
-        const uploadFieldsToUpdate = uploadFields.filter(
-          (field) => typeof args.update === "object" && args.update !== null && field in args.update
-        );
-        try {
-          let existingRecord;
-          if (args.update) {
-            existingRecord = await prismaInstance[
-              model
-              // @ts-expect-error TS in strict mode will error due to union type. We cannot narrow it down here.
-            ].findUnique({
+        },
+        async update({ query, model, args }) {
+          const uploadFieldsToUpdate = uploadFields.filter((field) => {
+            return args.data && typeof args.data === "object" && field in args.data;
+          });
+          if (uploadFieldsToUpdate.length === 0) {
+            return query(args);
+          } else {
+            const originalRecord = await client[model].findFirstOrThrow({
+              where: args.where
+              // @TODO: should we select here to reduce the amount of data we're handling
+            });
+            try {
+              const result = await query(args);
+              await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
+              return result;
+            } catch (e) {
+              await removeUploadedFiles(
+                uploadFieldsToUpdate,
+                args.data
+              );
+              throw e;
+            }
+          }
+        },
+        async updateMany({ query, model, args }) {
+          const uploadFieldsToUpdate = uploadFields.filter((field) => {
+            return args.data && typeof args.data === "object" && field in args.data;
+          });
+          if (uploadFieldsToUpdate.length === 0) {
+            return query(args);
+          } else {
+            const originalRecords = await client[model].findMany({
               where: args.where
+              // @TODO: should we select here to reduce the amount of data we're handling
             });
-            isUpdate = !!existingRecord;
+            try {
+              const result = await query(args);
+              for await (const originalRecord of originalRecords) {
+                await removeUploadedFiles(uploadFieldsToUpdate, originalRecord);
+              }
+              return result;
+            } catch (e) {
+              await removeUploadedFiles(
+                uploadFieldsToUpdate,
+                args.data
+              );
+              throw e;
+            }
           }
-          const result = await query(args);
-          if (isUpdate && existingRecord) {
-            await removeUploadedFiles(uploadFieldsToUpdate, existingRecord);
+        },
+        async upsert({ query, model, args }) {
+          let isUpdate;
+          const uploadFieldsToUpdate = uploadFields.filter(
+            (field) => typeof args.update === "object" && args.update !== null && field in args.update
+          );
+          try {
+            let existingRecord;
+            if (args.update) {
+              existingRecord = await client[model].findUnique({
+                where: args.where
+              });
+              isUpdate = !!existingRecord;
+            }
+            const result = await query(args);
+            if (isUpdate && existingRecord) {
+              await removeUploadedFiles(uploadFieldsToUpdate, existingRecord);
+            }
+            return result;
+          } catch (e) {
+            await removeUploadedFiles(
+              // Only delete files we're updating on update
+              isUpdate ? uploadFieldsToUpdate : uploadFields,
+              isUpdate ? args.update : args.create
+            );
+            throw e;
           }
-          return result;
-        } catch (e) {
+        },
+        async delete({ query, args }) {
+          const deleteResult = await query(args);
           await removeUploadedFiles(
-            // Only delete files we're updating on update
-            isUpdate ? uploadFieldsToUpdate : uploadFields,
-            isUpdate ? args.update : args.create
+            uploadFields,
+            // We don't know the exact type here
+            deleteResult
           );
-          throw e;
+          return deleteResult;
         }
-      },
-      async delete({ query, args }) {
-        const deleteResult = await query(args);
-        await removeUploadedFiles(
-          uploadFields,
-          // We don't know the exact type here
-          deleteResult
-        );
-        return deleteResult;
-      }
-    };
-    const needs = Object.fromEntries(uploadFields.map((field) => [field, true]));
-    resultExtends[modelName] = {
-      withDataUri: {
-        needs,
-        compute(modelData) {
-          return async () => {
-            const base64UploadFields = {};
-            for (const field of uploadFields) {
-              base64UploadFields[field] = await fileToDataUri(
-                modelData[field],
-                storageAdapter
-              );
-            }
-            return {
-              // modelData is of type unknown at this point
-              ...modelData,
-              ...base64UploadFields
+      };
+      const needs = Object.fromEntries(
+        uploadFields.map((field) => [field, true])
+      );
+      resultExtends[modelName] = {
+        withDataUri: {
+          needs,
+          compute(modelData) {
+            return async () => {
+              const base64UploadFields = {};
+              for (const field of uploadFields) {
+                base64UploadFields[field] = await fileToDataUri(
+                  modelData[field],
+                  storageAdapter
+                );
+              }
+              return {
+                // modelData is of type unknown at this point
+                ...modelData,
+                ...base64UploadFields
+              };
             };
-          };
-        }
-      },
-      withSignedUrl: {
-        needs,
-        compute(modelData) {
-          return ({ expiresIn } = {}) => {
-            if (!urlSigner) {
-              throw new Error(
-                "Please supply signed url settings in setupUpload()"
-              );
-            }
-            const signedUrlFields = {};
-            for (const field of uploadFields) {
-              if (!modelData[field]) {
-                continue;
+          }
+        },
+        withSignedUrl: {
+          needs,
+          compute(modelData) {
+            return ({ expiresIn } = {}) => {
+              if (!urlSigner) {
+                throw new Error(
+                  "Please supply signed url settings in setupUpload()"
+                );
               }
-              signedUrlFields[field] = urlSigner.generateSignedUrl(
-                modelData[field],
-                expiresIn
-              );
-            }
-            return {
-              // modelData is of type unknown at this point
-              ...modelData,
-              ...signedUrlFields
+              const signedUrlFields = {};
+              for (const field of uploadFields) {
+                if (!modelData[field]) {
+                  continue;
+                }
+                signedUrlFields[field] = urlSigner.generateSignedUrl(
+                  modelData[field],
+                  expiresIn
+                );
+              }
+              return {
+                // modelData is of type unknown at this point
+                ...modelData,
+                ...signedUrlFields
+              };
             };
-          };
+          }
         }
-      }
-    };
-  }
-  return PrismaExtension.defineExtension((client) => {
+      };
+    }
     return client.$extends({
       name: "redwood-upload-prisma-plugin",
       query: queryExtends,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/storage",
-  "version": "2.6.0",
+  "version": "2.6.1-next.104+6be0fa58d",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -53,13 +53,13 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "2.6.0",
+    "@cedarjs/project-config": "2.6.1-next.104+6be0fa58d",
     "mime-types": "2.1.35",
     "ulid": "3.0.2"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.2",
-    "@cedarjs/framework-tools": "0.0.0",
+    "@cedarjs/framework-tools": "2.6.1-next.104",
     "@prisma/client": "6.19.2",
     "@types/mime-types": "2.1.4",
     "concurrently": "9.2.1",
@@ -73,5 +73,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e238d88be71ec4ec6b9f329bf9c0fc7f2a069fd"
+  "gitHead": "6be0fa58d21ad717026065445aab7117e39ee3eb"
 }